)]}' { "log": [ { "commit": "754421c8cab1a568be844a7069fe04c1cf6391b8", "tree": "71fa1f54e664ff45289fccfa946747a18e20727f", "parents": [ "fb21affa49204acd409328415b49bfe90136653c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Apr 26 18:31:00 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jun 01 12:58:46 2012 -0400" }, "message": "HAVE_RESTORE_SIGMASK is defined on all architectures now\n\nEveryone either defines it in arch thread_info.h or has TIF_RESTORE_SIGMASK\nand picks default set_restore_sigmask() in linux/thread_info.h. Kill the\nifdefs, slap #error in linux/thread_info.h to catch breakage when new ones\nget merged.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a8159414d7e3af7233e7a5a82d1c5d85379bd75c", "tree": "ad8642afda03a50c2e536afc2ffd906acd44c72c", "parents": [ "2df83fa4bce421f8176932142f1004adfba0f9dd" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon May 21 21:20:48 2012 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 22 20:57:06 2012 +0200" }, "message": "epoll: Fix user space breakage related to EPOLLWAKEUP\n\nCommit 4d7e30d (epoll: Add a flag, EPOLLWAKEUP, to prevent\nsuspend while epoll events are ready) caused some applications to\nmalfunction, because they set the bit corresponding to the new\nEPOLLWAKEUP flag in their eventpoll flags and they don\u0027t have the\nnew CAP_EPOLLWAKEUP capability.\n\nTo prevent that from happening, change epoll_ctl() to clear\nEPOLLWAKEUP in epds.events if the caller doesn\u0027t have the\nCAP_EPOLLWAKEUP capability instead of failing and returning an\nerror code, which allows the affected applications to function\nnormally.\n\nReported-and-tested-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "4d7e30d98939a0340022ccd49325a3d70f7e0238", "tree": "45307bd3a0b7fafc71aea41fc518f42e2e810e76", "parents": [ "b86ff9820fd5df69295273b9aa68e58786ffc23f" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Tue May 01 21:33:34 2012 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat May 05 21:50:41 2012 +0200" }, "message": "epoll: Add a flag, EPOLLWAKEUP, to prevent suspend while epoll events are ready\n\nWhen an epoll_event, that has the EPOLLWAKEUP flag set, is ready, a\nwakeup_source will be active to prevent suspend. This can be used to\nhandle wakeup events from a driver that support poll, e.g. input, if\nthat driver wakes up the waitqueue passed to epoll before allowing\nsuspend.\n\nSigned-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\nReviewed-by: NeilBrown \u003cneilb@suse.de\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "13d518074a952d33d47c428419693f63389547e9", "tree": "75ccd438b6579840f51b96eed7a5e760e6caf2eb", "parents": [ "b1c12cbcd0a02527c180a862e8971e249d3b347d" ], "author": { "name": "Jason Baron", "email": "jbaron@redhat.com", "time": "Wed Apr 25 16:01:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:33 2012 -0700" }, "message": "epoll: clear the tfile_check_list on -ELOOP\n\nAn epoll_ctl(,EPOLL_CTL_ADD,,) operation can return \u0027-ELOOP\u0027 to prevent\ncircular epoll dependencies from being created. However, in that case we\ndo not properly clear the \u0027tfile_check_list\u0027. Thus, add a call to\nclear_tfile_check_list() for the -ELOOP case.\n\nSigned-off-by: Jason Baron \u003cjbaron@redhat.com\u003e\nReported-by: Yurij M. Plotnikov \u003cYurij.Plotnikov@oktetlabs.ru\u003e\nCc: Nelson Elhage \u003cnelhage@nelhage.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nTested-by: Alexandra N. Kossovsky \u003cAlexandra.Kossovsky@oktetlabs.ru\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0195c00244dc2e9f522475868fa278c473ba7339", "tree": "f97ca98ae64ede2c33ad3de05ed7bbfa4f4495ed", "parents": [ "f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5", "141124c02059eee9dbc5c86ea797b1ca888e77f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "message": "Merge tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system\n\nPull \"Disintegrate and delete asm/system.h\" from David Howells:\n \"Here are a bunch of patches to disintegrate asm/system.h into a set of\n separate bits to relieve the problem of circular inclusion\n dependencies.\n\n I\u0027ve built all the working defconfigs from all the arches that I can\n and made sure that they don\u0027t break.\n\n The reason for these patches is that I recently encountered a circular\n dependency problem that came about when I produced some patches to\n optimise get_order() by rewriting it to use ilog2().\n\n This uses bitops - and on the SH arch asm/bitops.h drags in\n asm-generic/get_order.h by a circuituous route involving asm/system.h.\n\n The main difficulty seems to be asm/system.h. It holds a number of\n low level bits with no/few dependencies that are commonly used (eg.\n memory barriers) and a number of bits with more dependencies that\n aren\u0027t used in many places (eg. switch_to()).\n\n These patches break asm/system.h up into the following core pieces:\n\n (1) asm/barrier.h\n\n Move memory barriers here. This already done for MIPS and Alpha.\n\n (2) asm/switch_to.h\n\n Move switch_to() and related stuff here.\n\n (3) asm/exec.h\n\n Move arch_align_stack() here. Other process execution related bits\n could perhaps go here from asm/processor.h.\n\n (4) asm/cmpxchg.h\n\n Move xchg() and cmpxchg() here as they\u0027re full word atomic ops and\n frequently used by atomic_xchg() and atomic_cmpxchg().\n\n (5) asm/bug.h\n\n Move die() and related bits.\n\n (6) asm/auxvec.h\n\n Move AT_VECTOR_SIZE_ARCH here.\n\n Other arch headers are created as needed on a per-arch basis.\"\n\nFixed up some conflicts from other header file cleanups and moving code\naround that has happened in the meantime, so David\u0027s testing is somewhat\nweakened by that. We\u0027ll find out anything that got broken and fix it..\n\n* tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)\n Delete all instances of asm/system.h\n Remove all #inclusions of asm/system.h\n Add #includes needed to permit the removal of asm/system.h\n Move all declarations of free_initmem() to linux/mm.h\n Disintegrate asm/system.h for OpenRISC\n Split arch_align_stack() out from asm-generic/system.h\n Split the switch_to() wrapper out of asm-generic/system.h\n Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\n Create asm-generic/barrier.h\n Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h\n Disintegrate asm/system.h for Xtensa\n Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]\n Disintegrate asm/system.h for Tile\n Disintegrate asm/system.h for Sparc\n Disintegrate asm/system.h for SH\n Disintegrate asm/system.h for Score\n Disintegrate asm/system.h for S390\n Disintegrate asm/system.h for PowerPC\n Disintegrate asm/system.h for PA-RISC\n Disintegrate asm/system.h for MN10300\n ...\n" }, { "commit": "9ffc93f203c18a70623f21950f1dd473c9ec48cd", "tree": "1eb3536ae183b0bfbf7f5152a6fe4f430ae881c2", "parents": [ "96f951edb1f1bdbbc99b0cd458f9808bb83d58ae" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Remove all #inclusions of asm/system.h\n\nRemove all #inclusions of asm/system.h preparatory to splitting and killing\nit. Performed with the following command:\n\nperl -p -i -e \u0027s!^#\\s*include\\s*\u003casm/system[.]h\u003e.*\\n!!\u0027 `grep -Irl \u0027^#\\s*include\\s*\u003casm/system[.]h\u003e\u0027 *`\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "da0503aae07f0410b6ff0a9e1d1d011701eb2758", "tree": "2912b9b6342a450b1d4cd9df09b0bc1de02235bb", "parents": [ "02edc6fc4d5feb3357aa44ba521e5504b4ff0b60" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Mar 23 15:02:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:38 2012 -0700" }, "message": "epoll: remove unneeded variable in reverse_path_check()\n\nWe never use the length variable.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "02edc6fc4d5feb3357aa44ba521e5504b4ff0b60", "tree": "20c5f006dee327e42335b4f020452d11f26b78b7", "parents": [ "626cf236608505d376e4799adb4f7eb00a8594af" ], "author": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Fri Mar 23 15:02:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:38 2012 -0700" }, "message": "epoll: comment the funky #ifdef\n\nLooking for a bug in -rt, I stumbled across this code here from: commit\n2dfa4eeab0fc (\"epoll keyed wakeups: teach epoll about hints coming with\nthe wakeup key\"), specifically:\n\n #ifdef CONFIG_DEBUG_LOCK_ALLOC\n static inline void ep_wake_up_nested(wait_queue_head_t *wqueue,\n unsigned long events, int subclass)\n {\n unsigned long flags;\n\n spin_lock_irqsave_nested(\u0026wqueue-\u003elock, flags, subclass);\n wake_up_locked_poll(wqueue, events);\n spin_unlock_irqrestore(\u0026wqueue-\u003elock, flags);\n }\n #else\n static inline void ep_wake_up_nested(wait_queue_head_t *wqueue,\n unsigned long events, int subclass)\n {\n wake_up_poll(wqueue, events);\n }\n #endif\n\nYou change the function of ep_wake_up_nested() depending on whether\nCONFIG_DEBUG_LOCK_ALLOC is set or not. This looks awfully suspicious,\nand there\u0027s no comment to explain why. I initially thought that this\nwas trying to fool lockdep, and hiding a real bug.\n\nInvestigating it, I found the creation of wake_up_nested() (which no\nlonger exists) but was created for the sole purpose of epoll and its\nstrange wake ups, as explained in commit 0ccf831cbee9 (\"lockdep:\nannotate epoll\")\n\nAlthough the commit message says \"annotate epoll\" the change log is much\nbetter at explaining what is happening than what is in the actual code.\nThus a comment is really necessary here. And to save the time of other\ndevelopers from having to go trudging through the git logs trying to\nfigure out why this code exists.\n\nI took parts of the change log and placed it into a comment above the\naffected code. This will make the description of what is happening more\nvisible to new developers that have to look at this code for the first\ntime.\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "626cf236608505d376e4799adb4f7eb00a8594af", "tree": "eb0421fec1a7fed05cd9ea785bd18b5f40c80971", "parents": [ "5cde7656d0dd222170eb0250bd1f70c9018fd438" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Fri Mar 23 15:02:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:38 2012 -0700" }, "message": "poll: add poll_requested_events() and poll_does_not_wait() functions\n\nIn some cases the poll() implementation in a driver has to do different\nthings depending on the events the caller wants to poll for. An example\nis when a driver needs to start a DMA engine if the caller polls for\nPOLLIN, but doesn\u0027t want to do that if POLLIN is not requested but instead\nonly POLLOUT or POLLPRI is requested. This is something that can happen\nin the video4linux subsystem among others.\n\nUnfortunately, the current epoll/poll/select implementation doesn\u0027t\nprovide that information reliably. The poll_table_struct does have it: it\nhas a key field with the event mask. But once a poll() call matches one\nor more bits of that mask any following poll() calls are passed a NULL\npoll_table pointer.\n\nAlso, the eventpoll implementation always left the key field at ~0 instead\nof using the requested events mask.\n\nThis was changed in eventpoll.c so the key field now contains the actual\nevents that should be polled for as set by the caller.\n\nThe solution to the NULL poll_table pointer is to set the qproc field to\nNULL in poll_table once poll() matches the events, not the poll_table\npointer itself. That way drivers can obtain the mask through a new\npoll_requested_events inline.\n\nThe poll_table_struct can still be NULL since some kernel code calls it\ninternally (netfs_state_poll() in ./drivers/staging/pohmelfs/netfs.h). In\nthat case poll_requested_events() returns ~0 (i.e. all events).\n\nVery rarely drivers might want to know whether poll_wait will actually\nwait. If another earlier file descriptor in the set already matched the\nevents the caller wanted to wait for, then the kernel will return from the\nselect() call without waiting. This might be useful information in order\nto avoid doing expensive work.\n\nA new helper function poll_does_not_wait() is added that drivers can use\nto detect this situation. This is now used in sock_poll_wait() in\ninclude/net/sock.h. This was the only place in the kernel that needed\nthis information.\n\nDrivers should no longer access any of the poll_table internals, but use\nthe poll_requested_events() and poll_does_not_wait() access functions\ninstead. In order to enforce that the poll_table fields are now prepended\nwith an underscore and a comment was added warning against using them\ndirectly.\n\nThis required a change in unix_dgram_poll() in unix/af_unix.c which used\nthe key field to get the requested events. It\u0027s been replaced by a call\nto poll_requested_events().\n\nFor qproc it was especially important to change its name since the\nbehavior of that field changes with this patch since this function pointer\ncan now be NULL when that wasn\u0027t possible in the past.\n\nAny driver accessing the qproc or key fields directly will now fail to compile.\n\nSome notes regarding the correctness of this patch: the driver\u0027s poll()\nfunction is called with a \u0027struct poll_table_struct *wait\u0027 argument. This\npointer may or may not be NULL, drivers can never rely on it being one or\nthe other as that depends on whether or not an earlier file descriptor in\nthe select()\u0027s fdset matched the requested events.\n\nThere are only three things a driver can do with the wait argument:\n\n1) obtain the key field:\n\n\tevents \u003d wait ? wait-\u003ekey : ~0;\n\n This will still work although it should be replaced with the new\n poll_requested_events() function (which does exactly the same).\n This will now even work better, since wait is no longer set to NULL\n unnecessarily.\n\n2) use the qproc callback. This could be deadly since qproc can now be\n NULL. Renaming qproc should prevent this from happening. There are no\n kernel drivers that actually access this callback directly, BTW.\n\n3) test whether wait \u003d\u003d NULL to determine whether poll would return without\n waiting. This is no longer sufficient as the correct test is now\n wait \u003d\u003d NULL || wait-\u003e_qproc \u003d\u003d NULL.\n\n However, the worst that can happen here is a slight performance hit in\n the case where wait !\u003d NULL and wait-\u003e_qproc \u003d\u003d NULL. In that case the\n driver will assume that poll_wait() will actually add the fd to the set\n of waiting file descriptors. Of course, poll_wait() will not do that\n since it tests for wait-\u003e_qproc. This will not break anything, though.\n\n There is only one place in the whole kernel where this happens\n (sock_poll_wait() in include/net/sock.h) and that code will be replaced\n by a call to poll_does_not_wait() in the next patch.\n\n Note that even if wait-\u003e_qproc !\u003d NULL drivers cannot rely on poll_wait()\n actually waiting. The next file descriptor from the set might match the\n event mask and thus any possible waits will never happen.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nReviewed-by: Jonathan Corbet \u003ccorbet@lwn.net\u003e\nReviewed-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@infradead.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "93dc6107a76daed81c07f50215fa6ae77691634f", "tree": "b104aeb2798f60f06fd9f7abda5ae9ef5219e0bb", "parents": [ "c579bc7e316e7e3f3b56df5e17f623325caa9783" ], "author": { "name": "Jason Baron", "email": "jbaron@redhat.com", "time": "Fri Mar 16 16:34:03 2012 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 18 12:25:04 2012 -0700" }, "message": "Don\u0027t limit non-nested epoll paths\n\nCommit 28d82dc1c4ed (\"epoll: limit paths\") that I did to limit the\nnumber of possible wakeup paths in epoll is causing a few applications\nto longer work (dovecot for one).\n\nThe original patch is really about limiting the amount of epoll nesting\n(since epoll fds can be attached to other fds). Thus, we probably can\nallow an unlimited number of paths of depth 1. My current patch limits\nit at 1000. And enforce the limits on paths that have a greater depth.\n\nThis is captured in: https://bugzilla.redhat.com/show_bug.cgi?id\u003d681578\n\nSigned-off-by: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "971316f0503a5c50633d07b83b6db2f15a3a5b00", "tree": "d833e48aed1b20d8677e9391250d8948966d6f4d", "parents": [ "d80e731ecab420ddcb79ee9d0ac427acbc187b4b" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri Feb 24 20:07:29 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 24 11:42:50 2012 -0800" }, "message": "epoll: ep_unregister_pollwait() can use the freed pwq-\u003ewhead\n\nsignalfd_cleanup() ensures that -\u003esignalfd_wqh is not used, but\nthis is not enough. eppoll_entry-\u003ewhead still points to the memory\nwe are going to free, ep_unregister_pollwait()-\u003eremove_wait_queue()\nis obviously unsafe.\n\nChange ep_poll_callback(POLLFREE) to set eppoll_entry-\u003ewhead \u003d NULL,\nchange ep_unregister_pollwait() to check pwq-\u003ewhead !\u003d NULL under\nrcu_read_lock() before remove_wait_queue(). We add the new helper,\nep_remove_wait_queue(), for this.\n\nThis works because sighand_cachep is SLAB_DESTROY_BY_RCU and because\n-\u003esignalfd_wqh is initialized in sighand_ctor(), not in copy_sighand.\nep_unregister_pollwait()-\u003eremove_wait_queue() can play with already\nfreed and potentially reused -\u003esighand, but this is fine. This memory\nmust have the valid -\u003esignalfd_wqh until rcu_read_unlock().\n\nReported-by: Maxime Bizon \u003cmbizon@freebox.fr\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d80e731ecab420ddcb79ee9d0ac427acbc187b4b", "tree": "e96a660b75b5bee8ae2c315878ec917b9c0da446", "parents": [ "855a85f704026d5fe7de94fb1b765fe03404507f" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri Feb 24 20:07:11 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 24 11:42:50 2012 -0800" }, "message": "epoll: introduce POLLFREE to flush -\u003esignalfd_wqh before kfree()\n\nThis patch is intentionally incomplete to simplify the review.\nIt ignores ep_unregister_pollwait() which plays with the same wqh.\nSee the next change.\n\nepoll assumes that the EPOLL_CTL_ADD\u0027ed file controls everything\nf_op-\u003epoll() needs. In particular it assumes that the wait queue\ncan\u0027t go away until eventpoll_release(). This is not true in case\nof signalfd, the task which does EPOLL_CTL_ADD uses its -\u003esighand\nwhich is not connected to the file.\n\nThis patch adds the special event, POLLFREE, currently only for\nepoll. It expects that init_poll_funcptr()\u0027ed hook should do the\nnecessary cleanup. Perhaps it should be defined as EPOLLFREE in\neventpoll.\n\n__cleanup_sighand() is changed to do wake_up_poll(POLLFREE) if\n-\u003esignalfd_wqh is not empty, we add the new signalfd_cleanup()\nhelper.\n\nep_poll_callback(POLLFREE) simply does list_del_init(task_list).\nThis make this poll entry inconsistent, but we don\u0027t care. If you\nshare epoll fd which contains our sigfd with another process you\nshould blame yourself. signalfd is \"really special\". I simply do\nnot know how we can define the \"right\" semantics if it used with\nepoll.\n\nThe main problem is, epoll calls signalfd_poll() once to establish\nthe connection with the wait queue, after that signalfd_poll(NULL)\nreturns the different/inconsistent results depending on who does\nEPOLL_CTL_MOD/signalfd_read/etc. IOW: apart from sigmask, signalfd\nhas nothing to do with the file, it works with the current thread.\n\nIn short: this patch is the hack which tries to fix the symptoms.\nIt also assumes that nobody can take tasklist_lock under epoll\nlocks, this seems to be true.\n\nNote:\n\n\t- we do not have wake_up_all_poll() but wake_up_poll()\n\t is fine, poll/epoll doesn\u0027t use WQ_FLAG_EXCLUSIVE.\n\n\t- signalfd_cleanup() uses POLLHUP along with POLLFREE,\n\t we need a couple of simple changes in eventpoll.c to\n\t make sure it can\u0027t be \"lost\".\n\nReported-by: Maxime Bizon \u003cmbizon@freebox.fr\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "28d82dc1c4edbc352129f97f4ca22624d1fe61de", "tree": "a6fbd269d17134ff42597b4e02eba4345bf6d901", "parents": [ "2ccd4f4d4737b37e21dd92c8c584c23cd87740a2" ], "author": { "name": "Jason Baron", "email": "jbaron@redhat.com", "time": "Thu Jan 12 17:17:43 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:04 2012 -0800" }, "message": "epoll: limit paths\n\nThe current epoll code can be tickled to run basically indefinitely in\nboth loop detection path check (on ep_insert()), and in the wakeup paths.\nThe programs that tickle this behavior set up deeply linked networks of\nepoll file descriptors that cause the epoll algorithms to traverse them\nindefinitely. A couple of these sample programs have been previously\nposted in this thread: https://lkml.org/lkml/2011/2/25/297.\n\nTo fix the loop detection path check algorithms, I simply keep track of\nthe epoll nodes that have been already visited. Thus, the loop detection\nbecomes proportional to the number of epoll file descriptor and links.\nThis dramatically decreases the run-time of the loop check algorithm. In\none diabolical case I tried it reduced the run-time from 15 mintues (all\nin kernel time) to .3 seconds.\n\nFixing the wakeup paths could be done at wakeup time in a similar manner\nby keeping track of nodes that have already been visited, but the\ncomplexity is harder, since there can be multiple wakeups on different\ncpus...Thus, I\u0027ve opted to limit the number of possible wakeup paths when\nthe paths are created.\n\nThis is accomplished, by noting that the end file descriptor points that\nare found during the loop detection pass (from the newly added link), are\nactually the sources for wakeup events. I keep a list of these file\ndescriptors and limit the number and length of these paths that emanate\nfrom these \u0027source file descriptors\u0027. In the current implemetation I\nallow 1000 paths of length 1, 500 of length 2, 100 of length 3, 50 of\nlength 4 and 10 of length 5. Note that it is sufficient to check the\n\u0027source file descriptors\u0027 reachable from the newly added link, since no\nother \u0027source file descriptors\u0027 will have newly added links. This allows\nus to check only the wakeup paths that may have gotten too long, and not\nre-check all possible wakeup paths on the system.\n\nIn terms of the path limit selection, I think its first worth noting that\nthe most common case for epoll, is probably the model where you have 1\nepoll file descriptor that is monitoring n number of \u0027source file\ndescriptors\u0027. In this case, each \u0027source file descriptor\u0027 has a 1 path of\nlength 1. Thus, I believe that the limits I\u0027m proposing are quite\nreasonable and in fact may be too generous. Thus, I\u0027m hoping that the\nproposed limits will not prevent any workloads that currently work to\nfail.\n\nIn terms of locking, I have extended the use of the \u0027epmutex\u0027 to all\nepoll_ctl add and remove operations. Currently its only used in a subset\nof the add paths. I need to hold the epmutex, so that we can correctly\ntraverse a coherent graph, to check the number of paths. I believe that\nthis additional locking is probably ok, since its in the setup/teardown\npaths, and doesn\u0027t affect the running paths, but it certainly is going to\nadd some extra overhead. Also, worth noting is that the epmuex was\nrecently added to the ep_ctl add operations in the initial path loop\ndetection code using the argument that it was not on a critical path.\n\nAnother thing to note here, is the length of epoll chains that is allowed.\nCurrently, eventpoll.c defines:\n\n/* Maximum number of nesting allowed inside epoll sets */\n#define EP_MAX_NESTS 4\n\nThis basically means that I am limited to a graph depth of 5 (EP_MAX_NESTS\n+ 1). However, this limit is currently only enforced during the loop\ncheck detection code, and only when the epoll file descriptors are added\nin a certain order. Thus, this limit is currently easily bypassed. The\nnewly added check for wakeup paths, stricly limits the wakeup paths to a\nlength of 5, regardless of the order in which ep\u0027s are linked together.\nThus, a side-effect of the new code is a more consistent enforcement of\nthe graph depth.\n\nThus far, I\u0027ve tested this, using the sample programs previously\nmentioned, which now either return quickly or return -EINVAL. I\u0027ve also\ntesting using the piptest.c epoll tester, which showed no difference in\nperformance. I\u0027ve also created a number of different epoll networks and\ntested that they behave as expectded.\n\nI believe this solves the original diabolical test cases, while still\npreserving the sane epoll nesting.\n\nSigned-off-by: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Nelson Elhage \u003cnelhage@ksplice.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d8805e633e054c816c47cb6e727c81f156d9253d", "tree": "8f7151e635a38593d68eae40586449627d835965", "parents": [ "15662b3e8644905032c2e26808401a487d4e90c1" ], "author": { "name": "Nelson Elhage", "email": "nelhage@nelhage.com", "time": "Mon Oct 31 17:13:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:30:57 2011 -0700" }, "message": "epoll: fix spurious lockdep warnings\n\nepoll can acquire recursively acquire ep-\u003emtx on multiple \"struct\neventpoll\"s at once in the case where one epoll fd is monitoring another\nepoll fd. This is perfectly OK, since we\u0027re careful about the lock\nordering, but it causes spurious lockdep warnings. Annotate the recursion\nusing mutex_lock_nested, and add a comment explaining the nesting rules\nfor good measure.\n\nRecent versions of systemd are triggering this, and it can also be\ndemonstrated with the following trivial test program:\n\n--------------------8\u003c--------------------\n\nint main(void) {\n int e1, e2;\n struct epoll_event evt \u003d {\n .events \u003d EPOLLIN\n };\n\n e1 \u003d epoll_create1(0);\n e2 \u003d epoll_create1(0);\n epoll_ctl(e1, EPOLL_CTL_ADD, e2, \u0026evt);\n return 0;\n}\n--------------------8\u003c--------------------\n\nReported-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nTested-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Nelson Elhage \u003cnelhage@nelhage.com\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: \u003cstable@kernel.org\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e060c38434b2caa78efe7cedaff4191040b65a15", "tree": "407361230bf6733f63d8e788e4b5e6566ee04818", "parents": [ "10e4ac572eeffe5317019bd7330b6058a400dfc2", "cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 15:08:05 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Sep 15 15:08:18 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nFast-forward merge with Linus to be able to merge patches\nbased on more recent version of the tree.\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "10bd2473b10b394eed7ed6c94248be47ab6ed369", "tree": "266d4c2f0c9908ce221f932844c278c998fef417", "parents": [ "e08dc1325feaf49eec392ee52feb2974ec3f5155" ], "author": { "name": "Paul Bolle", "email": "pebolle@tiscali.nl", "time": "Sun Jul 24 17:58:46 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Jul 26 11:44:54 2011 +0200" }, "message": "eventpoll: fix comment typo \u0027evenpoll\u0027\n\nSigned-off-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "f4d93ad74c18143abd3067ca3c8ffba7d00addf4", "tree": "470d7e53e696c9ff2f8e62caabb50e365ac9ca8c", "parents": [ "3fb0e584a68cd1c5085e69be441f2ad032aaee72" ], "author": { "name": "Shawn Bohrer", "email": "shawn.bohrer@gmail.com", "time": "Tue Mar 22 16:34:47 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:15 2011 -0700" }, "message": "epoll: fix compiler warning and optimize the non-blocking path\n\nAdd a comment to ep_poll(), rename labels a bit clearly, fix a warning of\nunused variable from gcc and optimize the non-blocking path a little.\n\nHinted-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\n\nhannes@cmpxchg.org:\n\n: The non-blocking ep_poll path optimization introduced skipping over the\n: return value setup.\n:\n: Initialize it properly, my userspace gets upset by epoll_wait() returning\n: random things.\n:\n: In addition, remove the reinitialization at the fetch_events label, the\n: return value is garuanteed to be zero when execution reaches there.\n\n[hannes@cmpxchg.org: fix initialization]\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Shawn Bohrer \u003cshawn.bohrer@gmail.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3fb0e584a68cd1c5085e69be441f2ad032aaee72", "tree": "8cf550c8fabf54aeca48d76538357b7211a18c83", "parents": [ "d03e1617f089c0bcbc22b9d4739e04a0b43b14fa" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue Mar 22 16:34:46 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:15 2011 -0700" }, "message": "epoll: move ready event check into proper inline\n\nMove the event readiness check into a proper inline, and use it uniformly\ninside ep_poll() code. Events in the -\u003eovflist are no less ready than the\nones in -\u003erdllist.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Shawn Bohrer \u003cshawn.bohrer@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e16b396ce314b2bcdfe6c173fe075bf8e3432368", "tree": "640f0f56f2ea676647af4eb42d32fa56be2ee549", "parents": [ "7fd23a24717a327a66f3c32d11a20a2f169c824f", "e6e8dd5055a974935af1398c8648d4a9359b0ecb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:37:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:37:40 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)\n doc: CONFIG_UNEVICTABLE_LRU doesn\u0027t exist anymore\n Update cpuset info \u0026 webiste for cgroups\n dcdbas: force SMI to happen when expected\n arch/arm/Kconfig: remove one to many l\u0027s in the word.\n asm-generic/user.h: Fix spelling in comment\n drm: fix printk typo \u0027sracth\u0027\n Remove one to many n\u0027s in a word\n Documentation/filesystems/romfs.txt: fixing link to genromfs\n drivers:scsi Change printk typo initate -\u003e initiate\n serial, pch uart: Remove duplicate inclusion of linux/pci.h header\n fs/eventpoll.c: fix spelling\n mm: Fix out-of-date comments which refers non-existent functions\n drm: Fix printk typo \u0027failled\u0027\n coh901318.c: Change initate to initiate.\n mbox-db5500.c Change initate to initiate.\n edac: correct i82975x error-info reported\n edac: correct i82975x mci initialisation\n edac: correct commented info\n fs: update comments to point correct document\n target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c\n ...\n\nTrivial conflict in fs/eventpoll.c (spelling vs addition)\n" }, { "commit": "22bacca48a1755f79b7e0f192ddb9fbb7fc6e64e", "tree": "7762c2923b3bded3f6c01f9fc509b4726401794f", "parents": [ "6366213ee3355278a90d1c20a1971c68fa3af68b" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Fri Feb 25 14:44:12 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 25 15:07:36 2011 -0800" }, "message": "epoll: prevent creating circular epoll structures\n\nIn several places, an epoll fd can call another file\u0027s -\u003ef_op-\u003epoll()\nmethod with ep-\u003emtx held. This is in general unsafe, because that other\nfile could itself be an epoll fd that contains the original epoll fd.\n\nThe code defends against this possibility in its own -\u003epoll() method using\nep_call_nested, but there are several other unsafe calls to -\u003epoll\nelsewhere that can be made to deadlock. For example, the following simple\nprogram causes the call in ep_insert recursively call the original fd\u0027s\n-\u003epoll, leading to deadlock:\n\n #include \u003cunistd.h\u003e\n #include \u003csys/epoll.h\u003e\n\n int main(void) {\n int e1, e2, p[2];\n struct epoll_event evt \u003d {\n .events \u003d EPOLLIN\n };\n\n e1 \u003d epoll_create(1);\n e2 \u003d epoll_create(2);\n pipe(p);\n\n epoll_ctl(e2, EPOLL_CTL_ADD, e1, \u0026evt);\n epoll_ctl(e1, EPOLL_CTL_ADD, p[0], \u0026evt);\n write(p[1], p, sizeof p);\n epoll_ctl(e1, EPOLL_CTL_ADD, e2, \u0026evt);\n\n return 0;\n }\n\nOn insertion, check whether the inserted file is itself a struct epoll,\nand if so, do a recursive walk to detect whether inserting this file would\ncreate a loop of epoll structures, which could lead to deadlock.\n\n[nelhage@ksplice.com: Use epmutex to serialize concurrent inserts]\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Nelson Elhage \u003cnelhage@ksplice.com\u003e\nReported-by: Nelson Elhage \u003cnelhage@ksplice.com\u003e\nTested-by: Nelson Elhage \u003cnelhage@ksplice.com\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[2.6.34+, possibly earlier]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bf6a41db7726e6c09b9c6ac993457b7260473406", "tree": "e29b98f1ccc3bb84a4c87bdbaca3eea846711eb9", "parents": [ "a335b2e17301afae9e794f21071a2fcdd5879c1e" ], "author": { "name": "Daniel Baluta", "email": "daniel.baluta@gmail.com", "time": "Sun Jan 30 23:42:29 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Feb 17 17:38:09 2011 +0100" }, "message": "fs/eventpoll.c: fix spelling\n\neventpoll.c has wonderful comments but some annoying typos\nsneaked in:\n\t* toepoll_ctl -\u003e to epoll_ctl\n\t* rapresent -\u003e represents\n\t* sructure -\u003e structure\n\t* machanism -\u003e mechanism\n\t* trasfering -\u003e transferring\n\nSigned-off-by: Daniel Baluta \u003cdaniel.baluta@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "0781b909b5586f4db720b5d1838b78f9d8e42f14", "tree": "767e53bf2cd3bebbc1a94f64632b53fdad31828d", "parents": [ "48db54ee2f41e8ae2faf330b55db34a9fffb5b3c" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Feb 01 15:52:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 02 16:03:18 2011 -0800" }, "message": "epoll: epoll_wait() should not use timespec_add_ns()\n\ncommit 95aac7b1cd224f (\"epoll: make epoll_wait() use the hrtimer range\nfeature\") added a performance regression because it uses timespec_add_ns()\nwith potential very large \u0027ns\u0027 values.\n\n[akpm@linux-foundation.org: s/epoll_set_mstimeout/ep_set_mstimeout/, per Davide]\nReported-by: Simon Kirby \u003csim@hostway.ca\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Shawn Bohrer \u003cshawn.bohrer@gmail.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[2.6.37.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "52bd19f7691b2ea6433aef0ef94c08c57efd7e79", "tree": "daaa39ee774fb4fe56ca61247eb930ed4f6e1ef1", "parents": [ "65329bf46bf9ddc37845c9a6823a8e8022d305b9" ], "author": { "name": "Robin Holt", "email": "holt@sgi.com", "time": "Wed Jan 12 17:00:01 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 08:03:12 2011 -0800" }, "message": "epoll: convert max_user_watches to long\n\nOn a 16TB machine, max_user_watches has an integer overflow. Convert it\nto use a long and handle the associated fallout.\n\nSigned-off-by: Robin Holt \u003cholt@sgi.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "95aac7b1cd224f568fb83937044cd303ff11b029", "tree": "24c08cfe031ecc0549cf3f7900e992a27044c4ad", "parents": [ "231f3d393f63f6e3b505afa179999bba491d0f08" ], "author": { "name": "Shawn Bohrer", "email": "shawn.bohrer@gmail.com", "time": "Wed Oct 27 15:34:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 27 18:03:18 2010 -0700" }, "message": "epoll: make epoll_wait() use the hrtimer range feature\n\nThis make epoll use hrtimers for the timeout value which prevents\nepoll_wait() from timing out up to a millisecond early.\n\nThis mirrors the behavior of select() and poll().\n\nSigned-off-by: Shawn Bohrer \u003cshawn.bohrer@gmail.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6038f373a3dc1f1c26496e60b6c40b164716f07e", "tree": "a0d3bbd026eea41b9fc36b8c722cbaf56cd9f825", "parents": [ "1ec5584e3edf9c4bf2c88c846534d19cf986ba11" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Aug 15 18:52:59 2010 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Oct 15 15:53:27 2010 +0200" }, "message": "llseek: automatically add .llseek fop\n\nAll file_operations should get a .llseek operation so we can make\nnonseekable_open the default for future file operations without a\n.llseek pointer.\n\nThe three cases that we can automatically detect are no_llseek, seq_lseek\nand default_llseek. For cases where we can we can automatically prove that\nthe file offset is always ignored, we use noop_llseek, which maintains\nthe current behavior of not returning an error from a seek.\n\nNew drivers should normally not use noop_llseek but instead use no_llseek\nand call nonseekable_open at open time. Existing drivers can be converted\nto do the same when the maintainer knows for certain that no user code\nrelies on calling seek on the device file.\n\nThe generated code is often incorrectly indented and right now contains\ncomments that clarify for each added line why a specific variant was\nchosen. In the version that gets submitted upstream, the comments will\nbe gone and I will manually fix the indentation, because there does not\nseem to be a way to do that using coccinelle.\n\nSome amount of new code is currently sitting in linux-next that should get\nthe same modifications, which I will do at the end of the merge window.\n\nMany thanks to Julia Lawall for helping me learn to write a semantic\npatch that does all this.\n\n\u003d\u003d\u003d\u003d\u003d begin semantic patch \u003d\u003d\u003d\u003d\u003d\n// This adds an llseek\u003d method to all file operations,\n// as a preparation for making no_llseek the default.\n//\n// The rules are\n// - use no_llseek explicitly if we do nonseekable_open\n// - use seq_lseek for sequential files\n// - use default_llseek if we know we access f_pos\n// - use noop_llseek if we know we don\u0027t access f_pos,\n// but we still want to allow users to call lseek\n//\n@ open1 exists @\nidentifier nested_open;\n@@\nnested_open(...)\n{\n\u003c+...\nnonseekable_open(...)\n...+\u003e\n}\n\n@ open exists@\nidentifier open_f;\nidentifier i, f;\nidentifier open1.nested_open;\n@@\nint open_f(struct inode *i, struct file *f)\n{\n\u003c+...\n(\nnonseekable_open(...)\n|\nnested_open(...)\n)\n...+\u003e\n}\n\n@ read disable optional_qualifier exists @\nidentifier read_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\nexpression E;\nidentifier func;\n@@\nssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)\n{\n\u003c+...\n(\n *off \u003d E\n|\n *off +\u003d E\n|\n func(..., off, ...)\n|\n E \u003d *off\n)\n...+\u003e\n}\n\n@ read_no_fpos disable optional_qualifier exists @\nidentifier read_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\n@@\nssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)\n{\n... when !\u003d off\n}\n\n@ write @\nidentifier write_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\nexpression E;\nidentifier func;\n@@\nssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)\n{\n\u003c+...\n(\n *off \u003d E\n|\n *off +\u003d E\n|\n func(..., off, ...)\n|\n E \u003d *off\n)\n...+\u003e\n}\n\n@ write_no_fpos @\nidentifier write_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\n@@\nssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)\n{\n... when !\u003d off\n}\n\n@ fops0 @\nidentifier fops;\n@@\nstruct file_operations fops \u003d {\n ...\n};\n\n@ has_llseek depends on fops0 @\nidentifier fops0.fops;\nidentifier llseek_f;\n@@\nstruct file_operations fops \u003d {\n...\n .llseek \u003d llseek_f,\n...\n};\n\n@ has_read depends on fops0 @\nidentifier fops0.fops;\nidentifier read_f;\n@@\nstruct file_operations fops \u003d {\n...\n .read \u003d read_f,\n...\n};\n\n@ has_write depends on fops0 @\nidentifier fops0.fops;\nidentifier write_f;\n@@\nstruct file_operations fops \u003d {\n...\n .write \u003d write_f,\n...\n};\n\n@ has_open depends on fops0 @\nidentifier fops0.fops;\nidentifier open_f;\n@@\nstruct file_operations fops \u003d {\n...\n .open \u003d open_f,\n...\n};\n\n// use no_llseek if we call nonseekable_open\n////////////////////////////////////////////\n@ nonseekable1 depends on !has_llseek \u0026\u0026 has_open @\nidentifier fops0.fops;\nidentifier nso ~\u003d \"nonseekable_open\";\n@@\nstruct file_operations fops \u003d {\n... .open \u003d nso, ...\n+.llseek \u003d no_llseek, /* nonseekable */\n};\n\n@ nonseekable2 depends on !has_llseek @\nidentifier fops0.fops;\nidentifier open.open_f;\n@@\nstruct file_operations fops \u003d {\n... .open \u003d open_f, ...\n+.llseek \u003d no_llseek, /* open uses nonseekable */\n};\n\n// use seq_lseek for sequential files\n/////////////////////////////////////\n@ seq depends on !has_llseek @\nidentifier fops0.fops;\nidentifier sr ~\u003d \"seq_read\";\n@@\nstruct file_operations fops \u003d {\n... .read \u003d sr, ...\n+.llseek \u003d seq_lseek, /* we have seq_read */\n};\n\n// use default_llseek if there is a readdir\n///////////////////////////////////////////\n@ fops1 depends on !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier readdir_e;\n@@\n// any other fop is used that changes pos\nstruct file_operations fops \u003d {\n... .readdir \u003d readdir_e, ...\n+.llseek \u003d default_llseek, /* readdir is present */\n};\n\n// use default_llseek if at least one of read/write touches f_pos\n/////////////////////////////////////////////////////////////////\n@ fops2 depends on !fops1 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read.read_f;\n@@\n// read fops use offset\nstruct file_operations fops \u003d {\n... .read \u003d read_f, ...\n+.llseek \u003d default_llseek, /* read accesses f_pos */\n};\n\n@ fops3 depends on !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier write.write_f;\n@@\n// write fops use offset\nstruct file_operations fops \u003d {\n... .write \u003d write_f, ...\n+\t.llseek \u003d default_llseek, /* write accesses f_pos */\n};\n\n// Use noop_llseek if neither read nor write accesses f_pos\n///////////////////////////////////////////////////////////\n\n@ fops4 depends on !fops1 \u0026\u0026 !fops2 \u0026\u0026 !fops3 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read_no_fpos.read_f;\nidentifier write_no_fpos.write_f;\n@@\n// write fops use offset\nstruct file_operations fops \u003d {\n...\n .write \u003d write_f,\n .read \u003d read_f,\n...\n+.llseek \u003d noop_llseek, /* read and write both use no f_pos */\n};\n\n@ depends on has_write \u0026\u0026 !has_read \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier write_no_fpos.write_f;\n@@\nstruct file_operations fops \u003d {\n... .write \u003d write_f, ...\n+.llseek \u003d noop_llseek, /* write uses no f_pos */\n};\n\n@ depends on has_read \u0026\u0026 !has_write \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read_no_fpos.read_f;\n@@\nstruct file_operations fops \u003d {\n... .read \u003d read_f, ...\n+.llseek \u003d noop_llseek, /* read uses no f_pos */\n};\n\n@ depends on !has_read \u0026\u0026 !has_write \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\n@@\nstruct file_operations fops \u003d {\n...\n+.llseek \u003d noop_llseek, /* no read or write fn */\n};\n\u003d\u003d\u003d\u003d\u003d End semantic patch \u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Julia Lawall \u003cjulia@diku.dk\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\n" }, { "commit": "a93d2f1744206827ccf416e2cdc5018aa503314e", "tree": "c4c9daf16536d8d58db275617e19898f6c5bdbd7", "parents": [ "af507ae8a0512a83728b17d8f8c5fa1561669f50" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Fri May 07 14:33:26 2010 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue May 11 17:43:58 2010 +0200" }, "message": "sched, wait: Use wrapper functions\n\nepoll should not touch flags in wait_queue_t. This patch introduces a new\nfunction __add_wait_queue_exclusive(), for the users, who use wait queue as a\nLIFO queue.\n\n__add_wait_queue_tail_exclusive() is introduced too instead of\nadd_wait_queue_exclusive_locked(). remove_wait_queue_locked() is removed, as\nit is a duplicate of __remove_wait_queue(), disliked by users, and with less\nusers.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: \u003ccontainers@lists.linux-foundation.org\u003e\nLKML-Reference: \u003c1273214006-2979-1-git-send-email-xiaosuo@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "628ff7c1d8d8466a5ad8078bd0206a130f8b8a51", "tree": "cc7ab0c90849be38e200fc6ff6a3a09e3caf0405", "parents": [ "ed2617585f39dd12fae38c657bba68b9779ea10d" ], "author": { "name": "Roland Dreier", "email": "rdreier@cisco.com", "time": "Fri Dec 18 09:41:24 2009 -0800" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Dec 22 12:27:34 2009 -0500" }, "message": "anonfd: Allow making anon files read-only\n\nIt seems a couple places such as arch/ia64/kernel/perfmon.c and\ndrivers/infiniband/core/uverbs_main.c could use anon_inode_getfile()\ninstead of a private pseudo-fs + alloc_file(), if only there were a way\nto get a read-only file. So provide this by having anon_inode_getfile()\ncreate a read-only file if we pass O_RDONLY in flags.\n\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6d4561110a3e9fa742aeec6717248a491dfb1878", "tree": "689e2abf19940416ce597ba56ed31026ff59bd21", "parents": [ "86926d0096279b9739ceeff40f68d3c33b9119a9" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Nov 16 03:11:48 2009 -0800" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Nov 18 08:37:40 2009 -0800" }, "message": "sysctl: Drop \u0026 in front of every proc_handler.\n\nFor consistency drop \u0026 in front of every proc_handler. Explicity\ntaking the address is unnecessary and it prevents optimizations\nlike stubbing the proc_handlers to NULL.\n\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "ab09203e302b6e526f6930f3e460064b0f253ae9", "tree": "bc95bfaba78ba30613d57c676eca42818b8a3293", "parents": [ "2bc4657c15e4a33d9a192579c7627a397dbcbebc" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Nov 05 14:25:10 2009 -0800" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Nov 12 02:04:55 2009 -0800" }, "message": "sysctl fs: Remove dead binary sysctl support\n\nNow that sys_sysctl is a generic wrapper around /proc/sys .ctl_name\nand .strategy members of sysctl tables are dead code. Remove them.\n\nCc: Jan Harkes \u003cjaharkes@cs.cmu.edu\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "3fe4a975d662f11037cb710f8b4b158a3e38f9c0", "tree": "07986fcbf75f9a85c177aa3e7a2472e9833e4565", "parents": [ "36025a812eebb34a478cfc1d3a538472591498b0" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Wed Jun 17 16:25:58 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:41 2009 -0700" }, "message": "epoll: fix nested calls support\n\nThis fixes a regression in 2.6.30.\n\nI unfortunately accepted a patch time ago, to drop the \"current\" usage\nfrom possible IRQ context, w/out proper thought over it. The patch\nswitched to using the CPU id by bounding the nested call callback with a\nget_cpu()/put_cpu().\n\nUnfortunately the ep_call_nested() function can be called with a callback\nthat grabs sleepy locks (from own f_op-\u003epoll()), that results in epic\nfails. The following patch uses the proper \"context\" depending on the\npath where it is called, and on the kind of callback.\n\nThis has been reported by Stefan Richter, that has also verified the patch\nis his previously failing environment.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nReported-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bfe3891a5f5d3b78146a45f40e435d14f5ae39dd", "tree": "96e55f37ddf575c20f98bcdfa0902eacdab89978", "parents": [ "ee1ef82c7e6d073f881952348960bbc639687482" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue May 12 13:19:44 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 12 14:11:35 2009 -0700" }, "message": "epoll: fix size check in epoll_create()\n\nFix a size check WRT the manual pages. This was inadvertently broken by\ncommit 9fe5ad9c8cef9ad5873d8ee55d1cf00d9b607df0 (\"flag parameters\nadd-on: remove epoll_create size param\").\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: \u003cHiroyuki.Mach@gmail.com\u003e\nCc: rohit verma \u003crohit.170309@gmail.com\u003e\nCc: Ulrich Drepper \u003cdrepper@redhat.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2dfa4eeab0fc7e8633974f2770945311b31eedf6", "tree": "de372dc3955bb8ab2dec1b50f4292f367fa4e22f", "parents": [ "37e5540b3c9d838eb20f2ca8ea2eb8072271e403" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue Mar 31 15:24:22 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:20 2009 -0700" }, "message": "epoll keyed wakeups: teach epoll about hints coming with the wakeup key\n\nUse the events hint now sent by some devices, to avoid unnecessary wakeups\nfor events that are of no interest for the caller. This code handles both\ndevices that are sending keyed events, and the ones that are not (and\nevent the ones that sometimes send events, and sometimes don\u0027t).\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: William Lee Irwin III \u003cwli@movementarian.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4f0989dbfa8d18dd17c32120aac1eb3e906a62a2", "tree": "8b81c45c23ff2a598ed67c5732dfb0ca69693aa0", "parents": [ "e057e15ff66a620eda4c407486cbb8f8fbb7d878" ], "author": { "name": "Tony Battersby", "email": "tonyb@cybernetics.com", "time": "Tue Mar 31 15:24:16 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:20 2009 -0700" }, "message": "epoll: use real type instead of void *\n\neventpoll.c uses void * in one place for no obvious reason; change it to\nuse the real type instead.\n\nSigned-off-by: Tony Battersby \u003ctonyb@cybernetics.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e057e15ff66a620eda4c407486cbb8f8fbb7d878", "tree": "aa9e15c13ce5882ca0f0b442eec71d99fec8a4ff", "parents": [ "d1bc90dd5d037079f96b3327f943eb6ae8ef7491" ], "author": { "name": "Tony Battersby", "email": "tonyb@cybernetics.com", "time": "Tue Mar 31 15:24:15 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:19 2009 -0700" }, "message": "epoll: clean up ep_modify\n\nep_modify() doesn\u0027t need to set event.data from within the ep-\u003elock\nspinlock as the comment suggests. The only place event.data is used is\nep_send_events_proc(), and this is protected by ep-\u003emtx instead of\nep-\u003elock. Also update the comment for mutex_lock() at the top of\nep_scan_ready_list(), which mentions epoll_ctl(EPOLL_CTL_DEL) but not\nepoll_ctl(EPOLL_CTL_MOD).\n\nep_modify() can also use spin_lock_irq() instead of spin_lock_irqsave().\n\nSigned-off-by: Tony Battersby \u003ctonyb@cybernetics.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d1bc90dd5d037079f96b3327f943eb6ae8ef7491", "tree": "0380bd32cee23815b214d81a12b618140c544799", "parents": [ "d0305882825784e74f68a56eee6c3a812a99f235" ], "author": { "name": "Tony Battersby", "email": "tonyb@cybernetics.com", "time": "Tue Mar 31 15:24:15 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:19 2009 -0700" }, "message": "epoll: remove unnecessary xchg\n\nxchg in ep_unregister_pollwait() is unnecessary because it is protected by\neither epmutex or ep-\u003emtx (the same protection as ep_remove()).\n\nIf xchg was necessary, it would be insufficient to protect against\nproblems: if multiple concurrent calls to ep_unregister_pollwait() were\npossible then a second caller that returns without doing anything because\nnwait \u003d\u003d 0 could return before the waitqueues are removed by the first\ncaller, which looks like it could lead to problematic races with\nep_poll_callback().\n\nSo remove xchg and add comments about the locking.\n\nSigned-off-by: Tony Battersby \u003ctonyb@cybernetics.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d0305882825784e74f68a56eee6c3a812a99f235", "tree": "a4dcfea753279e1f8f4e7cc8256a8f5c195341ce", "parents": [ "abff55cee1039b5a3b96f7a5eb6e65b9f247a274" ], "author": { "name": "Tony Battersby", "email": "tonyb@cybernetics.com", "time": "Tue Mar 31 15:24:14 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:19 2009 -0700" }, "message": "epoll: remember the event if epoll_wait returns -EFAULT\n\nIf epoll_wait returns -EFAULT, the event that was being returned when the\nfault was encountered will be forgotten. This is not a big deal since\nEFAULT will happen only if a buggy userspace program passes in a bad\naddress, in which case what happens later usually doesn\u0027t matter.\nHowever, it is easy to remember the event for later, and this patch makes\na simple change to do that.\n\nSigned-off-by: Tony Battersby \u003ctonyb@cybernetics.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "abff55cee1039b5a3b96f7a5eb6e65b9f247a274", "tree": "dfbcc71256c2129d2e0ee3e077461103338b9591", "parents": [ "bb57c3edcd2fc51d95914c39448f36e43af9d6af" ], "author": { "name": "Tony Battersby", "email": "tonyb@cybernetics.com", "time": "Tue Mar 31 15:24:13 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:19 2009 -0700" }, "message": "epoll: don\u0027t use current in irq context\n\nep_call_nested() (formerly ep_poll_safewake()) uses \"current\" (without\ndereferencing it) to detect callback recursion, but it may be called from\nirq context where the use of current is generally discouraged. It would\nbe better to use get_cpu() and put_cpu() to detect the callback recursion.\n\nSigned-off-by: Tony Battersby \u003ctonyb@cybernetics.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bb57c3edcd2fc51d95914c39448f36e43af9d6af", "tree": "8d38edcdc5ef1f2694c3607829952f04ce266292", "parents": [ "296e236e96dddef351a1809c0d414bcddfcf3800" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue Mar 31 15:24:12 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:19 2009 -0700" }, "message": "epoll: remove debugging code\n\nRemove debugging code from epoll. There\u0027s no need for it to be included\ninto mainline code.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "296e236e96dddef351a1809c0d414bcddfcf3800", "tree": "279d6eb3f0114a49897cd4bbc0eaf43fffd46c6e", "parents": [ "5071f97ec6d74f006072de0ce89b67c8792fe5a1" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue Mar 31 15:24:11 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:19 2009 -0700" }, "message": "epoll: fix epoll\u0027s own poll (update)\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Pavel Pisa \u003cpisa@cmp.felk.cvut.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5071f97ec6d74f006072de0ce89b67c8792fe5a1", "tree": "cb20ebd79c6c146c73d321b4558f8176a0cf06c9", "parents": [ "3cdbbeebb77348176bd6a03fd86e11bc281c529e" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue Mar 31 15:24:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:18 2009 -0700" }, "message": "epoll: fix epoll\u0027s own poll\n\nFix a bug inside the epoll\u0027s f_op-\u003epoll() code, that returns POLLIN even\nthough there are no actual ready monitored fds. The bug shows up if you\nadd an epoll fd inside another fd container (poll, select, epoll).\n\nThe problem is that callback-based wake ups used by epoll does not carry\n(patches will follow, to fix this) any information about the events that\nactually happened. So the callback code, since it can\u0027t call the file*\n-\u003epoll() inside the callback, chains the file* into a ready-list.\n\nSo, suppose you added an fd with EPOLLOUT only, and some data shows up on\nthe fd, the file* mapped by the fd will be added into the ready-list (via\nwakeup callback). During normal epoll_wait() use, this condition is\nsorted out at the time we\u0027re actually able to call the file*\u0027s\nf_op-\u003epoll().\n\nInside the old epoll\u0027s f_op-\u003epoll() though, only a quick check\n!list_empty(ready-list) was performed, and this could have led to\nreporting POLLIN even though no ready fds would show up at a following\nepoll_wait(). In order to correctly report the ready status for an epoll\nfd, the ready-list must be checked to see if any really available fd+event\nwould be ready in a following epoll_wait().\n\nOperation (calling f_op-\u003epoll() from inside f_op-\u003epoll()) that, like wake\nups, must be handled with care because of the fact that epoll fds can be\nadded to other epoll fds.\n\nTest code:\n\n/*\n * epoll_test by Davide Libenzi (Simple code to test epoll internals)\n * Copyright (C) 2008 Davide Libenzi\n *\n * This program is free software; you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation; either version 2 of the License, or\n * (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n *\n * Davide Libenzi \u003cdavidel@xmailserver.org\u003e\n *\n */\n\n#include \u003csys/types.h\u003e\n#include \u003cunistd.h\u003e\n#include \u003cstdio.h\u003e\n#include \u003cstdlib.h\u003e\n#include \u003cstring.h\u003e\n#include \u003cerrno.h\u003e\n#include \u003csignal.h\u003e\n#include \u003climits.h\u003e\n#include \u003cpoll.h\u003e\n#include \u003csys/epoll.h\u003e\n#include \u003csys/wait.h\u003e\n\n#define EPWAIT_TIMEO\t(1 * 1000)\n#ifndef POLLRDHUP\n#define POLLRDHUP 0x2000\n#endif\n\n#define EPOLL_MAX_CHAIN\t100L\n\n#define EPOLL_TF_LOOP (1 \u003c\u003c 0)\n\nstruct epoll_test_cfg {\n\tlong size;\n\tlong flags;\n};\n\nstatic int xepoll_create(int n) {\n\tint epfd;\n\n\tif ((epfd \u003d epoll_create(n)) \u003d\u003d -1) {\n\t\tperror(\"epoll_create\");\n\t\texit(2);\n\t}\n\n\treturn epfd;\n}\n\nstatic void xepoll_ctl(int epfd, int cmd, int fd, struct epoll_event *evt) {\n\tif (epoll_ctl(epfd, cmd, fd, evt) \u003c 0) {\n\t\tperror(\"epoll_ctl\");\n\t\texit(3);\n\t}\n}\n\nstatic void xpipe(int *fds) {\n\tif (pipe(fds)) {\n\t\tperror(\"pipe\");\n\t\texit(4);\n\t}\n}\n\nstatic pid_t xfork(void) {\n\tpid_t pid;\n\n\tif ((pid \u003d fork()) \u003d\u003d (pid_t) -1) {\n\t\tperror(\"pipe\");\n\t\texit(5);\n\t}\n\n\treturn pid;\n}\n\nstatic int run_forked_proc(int (*proc)(void *), void *data) {\n\tint status;\n\tpid_t pid;\n\n\tif ((pid \u003d xfork()) \u003d\u003d 0)\n\t\texit((*proc)(data));\n\tif (waitpid(pid, \u0026status, 0) !\u003d pid) {\n\t\tperror(\"waitpid\");\n\t\treturn -1;\n\t}\n\n\treturn WIFEXITED(status) ? WEXITSTATUS(status): -2;\n}\n\nstatic int check_events(int fd, int timeo) {\n\tstruct pollfd pfd;\n\n\tfprintf(stdout, \"Checking events for fd %d\\n\", fd);\n\tmemset(\u0026pfd, 0, sizeof(pfd));\n\tpfd.fd \u003d fd;\n\tpfd.events \u003d POLLIN | POLLOUT;\n\tif (poll(\u0026pfd, 1, timeo) \u003c 0) {\n\t\tperror(\"poll()\");\n\t\treturn 0;\n\t}\n\tif (pfd.revents \u0026 POLLIN)\n\t\tfprintf(stdout, \"\\tPOLLIN\\n\");\n\tif (pfd.revents \u0026 POLLOUT)\n\t\tfprintf(stdout, \"\\tPOLLOUT\\n\");\n\tif (pfd.revents \u0026 POLLERR)\n\t\tfprintf(stdout, \"\\tPOLLERR\\n\");\n\tif (pfd.revents \u0026 POLLHUP)\n\t\tfprintf(stdout, \"\\tPOLLHUP\\n\");\n\tif (pfd.revents \u0026 POLLRDHUP)\n\t\tfprintf(stdout, \"\\tPOLLRDHUP\\n\");\n\n\treturn pfd.revents;\n}\n\nstatic int epoll_test_tty(void *data) {\n\tint epfd, ifd \u003d fileno(stdin), res;\n\tstruct epoll_event evt;\n\n\tif (check_events(ifd, 0) !\u003d POLLOUT) {\n\t\tfprintf(stderr, \"Something is cooking on STDIN (%d)\\n\", ifd);\n\t\treturn 1;\n\t}\n\tepfd \u003d xepoll_create(1);\n\tfprintf(stdout, \"Created epoll fd (%d)\\n\", epfd);\n\tmemset(\u0026evt, 0, sizeof(evt));\n\tevt.events \u003d EPOLLIN;\n\txepoll_ctl(epfd, EPOLL_CTL_ADD, ifd, \u0026evt);\n\tif (check_events(epfd, 0) \u0026 POLLIN) {\n\t\tres \u003d epoll_wait(epfd, \u0026evt, 1, 0);\n\t\tif (res \u003d\u003d 0) {\n\t\t\tfprintf(stderr, \"Epoll fd (%d) is ready when it shouldn\u0027t!\\n\",\n\t\t\t\tepfd);\n\t\t\treturn 2;\n\t\t}\n\t}\n\n\treturn 0;\n}\n\nstatic int epoll_wakeup_chain(void *data) {\n\tstruct epoll_test_cfg *tcfg \u003d data;\n\tint i, res, epfd, bfd, nfd, pfds[2];\n\tpid_t pid;\n\tstruct epoll_event evt;\n\n\tmemset(\u0026evt, 0, sizeof(evt));\n\tevt.events \u003d EPOLLIN;\n\n\tepfd \u003d bfd \u003d xepoll_create(1);\n\n\tfor (i \u003d 0; i \u003c tcfg-\u003esize; i++) {\n\t\tnfd \u003d xepoll_create(1);\n\t\txepoll_ctl(bfd, EPOLL_CTL_ADD, nfd, \u0026evt);\n\t\tbfd \u003d nfd;\n\t}\n\txpipe(pfds);\n\tif (tcfg-\u003eflags \u0026 EPOLL_TF_LOOP)\n\t{\n\t\txepoll_ctl(bfd, EPOLL_CTL_ADD, epfd, \u0026evt);\n\t\t/*\n\t\t * If we\u0027re testing for loop, we want that the wakeup\n\t\t * triggered by the write to the pipe done in the child\n\t\t * process, triggers a fake event. So we add the pipe\n\t\t * read size with EPOLLOUT events. This will trigger\n\t\t * an addition to the ready-list, but no real events\n\t\t * will be there. The the epoll kernel code will proceed\n\t\t * in calling f_op-\u003epoll() of the epfd, triggering the\n\t\t * loop we want to test.\n\t\t */\n\t\tevt.events \u003d EPOLLOUT;\n\t}\n\txepoll_ctl(bfd, EPOLL_CTL_ADD, pfds[0], \u0026evt);\n\n\t/*\n\t * The pipe write must come after the poll(2) call inside\n\t * check_events(). This tests the nested wakeup code in\n\t * fs/eventpoll.c:ep_poll_safewake()\n\t * By having the check_events() (hence poll(2)) happens first,\n\t * we have poll wait queue filled up, and the write(2) in the\n\t * child will trigger the wakeup chain.\n\t */\n\tif ((pid \u003d xfork()) \u003d\u003d 0) {\n\t\tsleep(1);\n\t\twrite(pfds[1], \"w\", 1);\n\t\texit(0);\n\t}\n\n\tres \u003d check_events(epfd, 2000) \u0026 POLLIN;\n\n\tif (waitpid(pid, NULL, 0) !\u003d pid) {\n\t\tperror(\"waitpid\");\n\t\treturn -1;\n\t}\n\n\treturn res;\n}\n\nstatic int epoll_poll_chain(void *data) {\n\tstruct epoll_test_cfg *tcfg \u003d data;\n\tint i, res, epfd, bfd, nfd, pfds[2];\n\tpid_t pid;\n\tstruct epoll_event evt;\n\n\tmemset(\u0026evt, 0, sizeof(evt));\n\tevt.events \u003d EPOLLIN;\n\n\tepfd \u003d bfd \u003d xepoll_create(1);\n\n\tfor (i \u003d 0; i \u003c tcfg-\u003esize; i++) {\n\t\tnfd \u003d xepoll_create(1);\n\t\txepoll_ctl(bfd, EPOLL_CTL_ADD, nfd, \u0026evt);\n\t\tbfd \u003d nfd;\n\t}\n\txpipe(pfds);\n\tif (tcfg-\u003eflags \u0026 EPOLL_TF_LOOP)\n\t{\n\t\txepoll_ctl(bfd, EPOLL_CTL_ADD, epfd, \u0026evt);\n\t\t/*\n\t\t * If we\u0027re testing for loop, we want that the wakeup\n\t\t * triggered by the write to the pipe done in the child\n\t\t * process, triggers a fake event. So we add the pipe\n\t\t * read size with EPOLLOUT events. This will trigger\n\t\t * an addition to the ready-list, but no real events\n\t\t * will be there. The the epoll kernel code will proceed\n\t\t * in calling f_op-\u003epoll() of the epfd, triggering the\n\t\t * loop we want to test.\n\t\t */\n\t\tevt.events \u003d EPOLLOUT;\n\t}\n\txepoll_ctl(bfd, EPOLL_CTL_ADD, pfds[0], \u0026evt);\n\n\t/*\n\t * The pipe write mush come before the poll(2) call inside\n\t * check_events(). This tests the nested f_op-\u003epoll calls code in\n\t * fs/eventpoll.c:ep_eventpoll_poll()\n\t * By having the pipe write(2) happen first, we make the kernel\n\t * epoll code to load the ready lists, and the following poll(2)\n\t * done inside check_events() will test nested poll code in\n\t * ep_eventpoll_poll().\n\t */\n\tif ((pid \u003d xfork()) \u003d\u003d 0) {\n\t\twrite(pfds[1], \"w\", 1);\n\t\texit(0);\n\t}\n\tsleep(1);\n\tres \u003d check_events(epfd, 1000) \u0026 POLLIN;\n\n\tif (waitpid(pid, NULL, 0) !\u003d pid) {\n\t\tperror(\"waitpid\");\n\t\treturn -1;\n\t}\n\n\treturn res;\n}\n\nint main(int ac, char **av) {\n\tint error;\n\tstruct epoll_test_cfg tcfg;\n\n\tfprintf(stdout, \"\\n********** Testing TTY events\\n\");\n\terror \u003d run_forked_proc(epoll_test_tty, NULL);\n\tfprintf(stdout, error \u003d\u003d 0 ?\n\t\t\"********** OK\\n\": \"********** FAIL (%d)\\n\", error);\n\n\ttcfg.size \u003d 3;\n\ttcfg.flags \u003d 0;\n\tfprintf(stdout, \"\\n********** Testing short wakeup chain\\n\");\n\terror \u003d run_forked_proc(epoll_wakeup_chain, \u0026tcfg);\n\tfprintf(stdout, error \u003d\u003d POLLIN ?\n\t\t\"********** OK\\n\": \"********** FAIL (%d)\\n\", error);\n\n\ttcfg.size \u003d EPOLL_MAX_CHAIN;\n\ttcfg.flags \u003d 0;\n\tfprintf(stdout, \"\\n********** Testing long wakeup chain (HOLD ON)\\n\");\n\terror \u003d run_forked_proc(epoll_wakeup_chain, \u0026tcfg);\n\tfprintf(stdout, error \u003d\u003d 0 ?\n\t\t\"********** OK\\n\": \"********** FAIL (%d)\\n\", error);\n\n\ttcfg.size \u003d 3;\n\ttcfg.flags \u003d 0;\n\tfprintf(stdout, \"\\n********** Testing short poll chain\\n\");\n\terror \u003d run_forked_proc(epoll_poll_chain, \u0026tcfg);\n\tfprintf(stdout, error \u003d\u003d POLLIN ?\n\t\t\"********** OK\\n\": \"********** FAIL (%d)\\n\", error);\n\n\ttcfg.size \u003d EPOLL_MAX_CHAIN;\n\ttcfg.flags \u003d 0;\n\tfprintf(stdout, \"\\n********** Testing long poll chain (HOLD ON)\\n\");\n\terror \u003d run_forked_proc(epoll_poll_chain, \u0026tcfg);\n\tfprintf(stdout, error \u003d\u003d 0 ?\n\t\t\"********** OK\\n\": \"********** FAIL (%d)\\n\", error);\n\n\ttcfg.size \u003d 3;\n\ttcfg.flags \u003d EPOLL_TF_LOOP;\n\tfprintf(stdout, \"\\n********** Testing loopy wakeup chain (HOLD ON)\\n\");\n\terror \u003d run_forked_proc(epoll_wakeup_chain, \u0026tcfg);\n\tfprintf(stdout, error \u003d\u003d 0 ?\n\t\t\"********** OK\\n\": \"********** FAIL (%d)\\n\", error);\n\n\ttcfg.size \u003d 3;\n\ttcfg.flags \u003d EPOLL_TF_LOOP;\n\tfprintf(stdout, \"\\n********** Testing loopy poll chain (HOLD ON)\\n\");\n\terror \u003d run_forked_proc(epoll_poll_chain, \u0026tcfg);\n\tfprintf(stdout, error \u003d\u003d 0 ?\n\t\t\"********** OK\\n\": \"********** FAIL (%d)\\n\", error);\n\n\treturn 0;\n}\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Pavel Pisa \u003cpisa@cmp.felk.cvut.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "684999149002dd046269666a390458e0acb38280", "tree": "b12ea4a953ba2bd90428092e7f35a222a4109510", "parents": [ "041b62374c7fedc11a8a1eeda2868612d3d1436c" ], "author": { "name": "Jonathan Corbet", "email": "corbet@lwn.net", "time": "Fri Feb 06 13:52:43 2009 -0700" }, "committer": { "name": "Jonathan Corbet", "email": "corbet@lwn.net", "time": "Mon Mar 16 08:32:27 2009 -0600" }, "message": "Rename struct file-\u003ef_ep_lock\n\nThis lock moves out of the CONFIG_EPOLL ifdef and becomes f_lock. For now,\nepoll remains the only user, but a future patch will use it to protect\nf_flags as well.\n\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jonathan Corbet \u003ccorbet@lwn.net\u003e\n" }, { "commit": "9df04e1f25effde823a600e755b51475d438f56b", "tree": "57a207adf5e4bfb010000724dc1482e421933be4", "parents": [ "3095eb87bb36ae880608fe3fc46cfd59ced1f319" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Thu Jan 29 14:25:26 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 29 18:04:45 2009 -0800" }, "message": "epoll: drop max_user_instances and rely only on max_user_watches\n\nLinus suggested to put limits where the money is, and max_user_watches\nalready does that w/out the need of max_user_instances. That has the\nadvantage to mitigate the potential DoS while allowing pretty generous\ndefault behavior.\n\nAllowing top 4% of low memory (per user) to be allocated in epoll watches,\nwe have:\n\nLOMEM MAX_WATCHES (per user)\n512MB ~178000\n1GB ~356000\n2GB ~712000\n\nA box with 512MB of lomem, will meet some challenge in hitting 180K\nwatches, socket buffers math teaches us. No more max_user_instances\nlimits then.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Willy Tarreau \u003cw@1wt.eu\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@googlemail.com\u003e\nCc: Bron Gondwana \u003cbrong@fastmail.fm\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5a8a82b1d306a325d899b67715618413657efda4", "tree": "ac599eb041a3cdcbbb3ba0a67ff2f14e251371f5", "parents": [ "3e0fa65f8ba4fd24b3dcfaf14d5b15eaab0fdc61" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:14:25 2009 +0100" }, "committer": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:15:28 2009 +0100" }, "message": "[CVE-2009-0029] System call wrappers part 23\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\n" }, { "commit": "7ef9964e6d1b911b78709f144000aacadd0ebc21", "tree": "30667d0a2f8e53973ff48d2c02df48bbc6fe74aa", "parents": [ "b7d271df873c5121a4ca1c70dea126b5920ec2f1" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Mon Dec 01 13:13:55 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 01 19:55:24 2008 -0800" }, "message": "epoll: introduce resource usage limits\n\nIt has been thought that the per-user file descriptors limit would also\nlimit the resources that a normal user can request via the epoll\ninterface. Vegard Nossum reported a very simple program (a modified\nversion attached) that can make a normal user to request a pretty large\namount of kernel memory, well within the its maximum number of fds. To\nsolve such problem, default limits are now imposed, and /proc based\nconfiguration has been introduced. A new directory has been created,\nnamed /proc/sys/fs/epoll/ and inside there, there are two configuration\npoints:\n\n max_user_instances \u003d Maximum number of devices - per user\n\n max_user_watches \u003d Maximum number of \"watched\" fds - per user\n\nThe current default for \"max_user_watches\" limits the memory used by epoll\nto store \"watches\", to 1/32 of the amount of the low RAM. As example, a\n256MB 32bit machine, will have \"max_user_watches\" set to roughly 90000.\nThat should be enough to not break existing heavy epoll users. The\ndefault value for \"max_user_instances\" is set to 128, that should be\nenough too.\n\nThis also changes the userspace, because a new error code can now come out\nfrom EPOLL_CTL_ADD (-ENOSPC). The EMFILE from epoll_create() was already\nlisted, so that should be ok.\n\n[akpm@linux-foundation.org: use get_current_user()]\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nCc: \u003cstable@kernel.org\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@gmail.com\u003e\nReported-by: Vegard Nossum \u003cvegardno@ifi.uio.no\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9ce209d64d820a6d5ed6b952e2c0f917faad6031", "tree": "817c5bd01e6666c8269d29d3d8292b5e75ea7fb3", "parents": [ "4d36a9e65d4966b433b2f3424d9457468bc80e00" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Fri Oct 17 16:17:40 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 26 12:09:49 2008 -0700" }, "message": "epoll: avoid double-inserts in case of EFAULT\n\nIn commit f337b9c58332bdecde965b436e47ea4c94d30da0 (\"epoll: drop\nunnecessary test\") Thomas found that there is an unnecessary (always\ntrue) test in ep_send_events(). The callback never inserts into\n-\u003erdllink while the send loop is performed, and also does the\n~EP_PRIVATE_BITS test. Given we\u0027re holding the mutex during this time,\nthe conditions tested inside the loop are always true.\n\nHOWEVER.\n\nThe test \"!ep_is_linked(\u0026epi-\u003erdllink)\" wasn\u0027t there because we insert\ninto -\u003erdllink, but because the send-events loop might terminate before\nthe whole list is scanned (-EFAULT).\n\nIn such cases, when the loop terminates early, and when a (leftover)\nfile received an event while we\u0027re performing the lockless loop, we need\nsuch test to avoid to double insert the epoll items. The list_splice()\ndone a few steps below, will correctly re-insert the ones that were left\non \"txlist\".\n\nThis should fix the kenrel.org bugzilla entry 11831.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f337b9c58332bdecde965b436e47ea4c94d30da0", "tree": "0b630e4cd2cc19f29d56716162defa301f82bf65", "parents": [ "8b6e47ad062e6ac993fb80256344fc499c1e827b" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Wed Oct 15 22:01:56 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 16 11:21:32 2008 -0700" }, "message": "epoll: drop unnecessary test\n\nThomas found that there is an unnecessary (always true) test in\nep_send_events(). The callback never inserts into -\u003erdllink while the\nsend loop is performed, and also does the ~EP_PRIVATE_BITS test. Given\nwe\u0027re holding the mutex during this time, the conditions tested inside the\nloop are always true. This patch drops the test done inside the\nre-insertion loop.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "523723bb5032f291272f9732713713b9b82ccfe0", "tree": "115afcf1a051bbfb24fba3f416efbd20065198fc", "parents": [ "98b0da43079740ecd07197dacd9720d54bb4dce0" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Tue Aug 12 15:09:01 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 16:07:30 2008 -0700" }, "message": "fs/eventpoll.c: fix sys_epoll_create1() comment\n\nThe `size\u0027 argument was removed.\n\nReported-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Ulrich Drepper \u003cdrepper@redhat.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9fe5ad9c8cef9ad5873d8ee55d1cf00d9b607df0", "tree": "49fb04cf552192e566d2aa6e18f40585230cba5a", "parents": [ "e38b36f325153eaadd1c2a7abc5762079233e540" ], "author": { "name": "Ulrich Drepper", "email": "drepper@redhat.com", "time": "Wed Jul 23 21:29:43 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 24 10:47:29 2008 -0700" }, "message": "flag parameters add-on: remove epoll_create size param\n\nRemove the size parameter from the new epoll_create syscall and renames the\nsyscall itself. The updated test program follows.\n\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n#include \u003cfcntl.h\u003e\n#include \u003cstdio.h\u003e\n#include \u003ctime.h\u003e\n#include \u003cunistd.h\u003e\n#include \u003csys/syscall.h\u003e\n\n#ifndef __NR_epoll_create2\n# ifdef __x86_64__\n# define __NR_epoll_create2 291\n# elif defined __i386__\n# define __NR_epoll_create2 329\n# else\n# error \"need __NR_epoll_create2\"\n# endif\n#endif\n\n#define EPOLL_CLOEXEC O_CLOEXEC\n\nint\nmain (void)\n{\n int fd \u003d syscall (__NR_epoll_create2, 0);\n if (fd \u003d\u003d -1)\n {\n puts (\"epoll_create2(0) failed\");\n return 1;\n }\n int coe \u003d fcntl (fd, F_GETFD);\n if (coe \u003d\u003d -1)\n {\n puts (\"fcntl failed\");\n return 1;\n }\n if (coe \u0026 FD_CLOEXEC)\n {\n puts (\"epoll_create2(0) set close-on-exec flag\");\n return 1;\n }\n close (fd);\n\n fd \u003d syscall (__NR_epoll_create2, EPOLL_CLOEXEC);\n if (fd \u003d\u003d -1)\n {\n puts (\"epoll_create2(EPOLL_CLOEXEC) failed\");\n return 1;\n }\n coe \u003d fcntl (fd, F_GETFD);\n if (coe \u003d\u003d -1)\n {\n puts (\"fcntl failed\");\n return 1;\n }\n if ((coe \u0026 FD_CLOEXEC) \u003d\u003d 0)\n {\n puts (\"epoll_create2(EPOLL_CLOEXEC) set close-on-exec flag\");\n return 1;\n }\n close (fd);\n\n puts (\"OK\");\n\n return 0;\n}\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\nSigned-off-by: Ulrich Drepper \u003cdrepper@redhat.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@googlemail.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e38b36f325153eaadd1c2a7abc5762079233e540", "tree": "92cfc9855e41c5328d91456f5e373c00ecb8d383", "parents": [ "510df2dd482496083e1c3b1a8c9b6afd5fa4c7d7" ], "author": { "name": "Ulrich Drepper", "email": "drepper@redhat.com", "time": "Wed Jul 23 21:29:42 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 24 10:47:29 2008 -0700" }, "message": "flag parameters: check magic constants\n\nThis patch adds test that ensure the boundary conditions for the various\nconstants introduced in the previous patches is met. No code is generated.\n\n[akpm@linux-foundation.org: fix alpha]\nSigned-off-by: Ulrich Drepper \u003cdrepper@redhat.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@googlemail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a0998b50c3f0b8fdd265c63e0032f86ebe377dbf", "tree": "9132ecb7ef925374edabcaeea44e0287eb5043f4", "parents": [ "11fcb6c14676023d0bd437841f5dcd670e7990a0" ], "author": { "name": "Ulrich Drepper", "email": "drepper@redhat.com", "time": "Wed Jul 23 21:29:27 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 24 10:47:28 2008 -0700" }, "message": "flag parameters: epoll_create\n\nThis patch adds the new epoll_create2 syscall. It extends the old epoll_create\nsyscall by one parameter which is meant to hold a flag value. In this\npatch the only flag support is EPOLL_CLOEXEC which causes the close-on-exec\nflag for the returned file descriptor to be set.\n\nA new name EPOLL_CLOEXEC is introduced which in this implementation must\nhave the same value as O_CLOEXEC.\n\nThe following test must be adjusted for architectures other than x86 and\nx86-64 and in case the syscall numbers changed.\n\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n#include \u003cfcntl.h\u003e\n#include \u003cstdio.h\u003e\n#include \u003ctime.h\u003e\n#include \u003cunistd.h\u003e\n#include \u003csys/syscall.h\u003e\n\n#ifndef __NR_epoll_create2\n# ifdef __x86_64__\n# define __NR_epoll_create2 291\n# elif defined __i386__\n# define __NR_epoll_create2 329\n# else\n# error \"need __NR_epoll_create2\"\n# endif\n#endif\n\n#define EPOLL_CLOEXEC O_CLOEXEC\n\nint\nmain (void)\n{\n int fd \u003d syscall (__NR_epoll_create2, 1, 0);\n if (fd \u003d\u003d -1)\n {\n puts (\"epoll_create2(0) failed\");\n return 1;\n }\n int coe \u003d fcntl (fd, F_GETFD);\n if (coe \u003d\u003d -1)\n {\n puts (\"fcntl failed\");\n return 1;\n }\n if (coe \u0026 FD_CLOEXEC)\n {\n puts (\"epoll_create2(0) set close-on-exec flag\");\n return 1;\n }\n close (fd);\n\n fd \u003d syscall (__NR_epoll_create2, 1, EPOLL_CLOEXEC);\n if (fd \u003d\u003d -1)\n {\n puts (\"epoll_create2(EPOLL_CLOEXEC) failed\");\n return 1;\n }\n coe \u003d fcntl (fd, F_GETFD);\n if (coe \u003d\u003d -1)\n {\n puts (\"fcntl failed\");\n return 1;\n }\n if ((coe \u0026 FD_CLOEXEC) \u003d\u003d 0)\n {\n puts (\"epoll_create2(EPOLL_CLOEXEC) set close-on-exec flag\");\n return 1;\n }\n close (fd);\n\n puts (\"OK\");\n\n return 0;\n}\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\nSigned-off-by: Ulrich Drepper \u003cdrepper@redhat.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@googlemail.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7d9dbca34240ebb6ff88d8a29c6c7bffd098f0c1", "tree": "7e3226a4d885f5e4444fbe01a08c51b0b33b2cc7", "parents": [ "c019bbc612f6633ede7ed67725cbf68de45ae8a4" ], "author": { "name": "Ulrich Drepper", "email": "drepper@redhat.com", "time": "Wed Jul 23 21:29:22 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 24 10:47:27 2008 -0700" }, "message": "flag parameters: anon_inode_getfd extension\n\nThis patch just extends the anon_inode_getfd interface to take an additional\nparameter with a flag value. The flag value is passed on to\nget_unused_fd_flags in anticipation for a use with the O_CLOEXEC flag.\n\nNo actual semantic changes here, the changed callers all pass 0 for now.\n\n[akpm@linux-foundation.org: KVM fix]\nSigned-off-by: Ulrich Drepper \u003cdrepper@redhat.com\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@googlemail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2030a42cecd4dd1985a2ab03e25f3cd6106a5ca8", "tree": "7cb4710c3f7a4e034a20890f0df99bc42f9bbcee", "parents": [ "9f3acc3140444a900ab280de942291959f0f615d" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Feb 23 06:46:49 2008 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu May 01 13:08:50 2008 -0400" }, "message": "[PATCH] sanitize anon_inode_getfd()\n\na) none of the callers even looks at inode or file returned by anon_inode_getfd()\nb) any caller that would try to look at those would be racy, since by the time\nit returns we might have raced with close() from another thread and that\nfile would be pining for fjords.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f3de272b821accbc8387211977c2de4f38468d05", "tree": "775b5b3db5a09176447d4e62e04077b63640a4d7", "parents": [ "49eaeb4bc4c901c327ee259c7768be20fd020a30" ], "author": { "name": "Roland McGrath", "email": "roland@redhat.com", "time": "Wed Apr 30 00:53:09 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 30 08:29:37 2008 -0700" }, "message": "signals: use HAVE_SET_RESTORE_SIGMASK\n\nChange all the #ifdef TIF_RESTORE_SIGMASK conditionals in non-arch code to\n#ifdef HAVE_SET_RESTORE_SIGMASK. If arch code defines it first, the generic\nset_restore_sigmask() using TIF_RESTORE_SIGMASK is not defined.\n\nSigned-off-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: Oleg Nesterov \u003coleg@tv-sign.ru\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4e4c22c71144c1b2e22c257ec6cf08ccb5be1165", "tree": "0a41fb405ab60654f70ead9698d5ce414a066c37", "parents": [ "80fe728d593e3a048a56610de932919f7d6d968a" ], "author": { "name": "Roland McGrath", "email": "roland@redhat.com", "time": "Wed Apr 30 00:53:06 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 30 08:29:37 2008 -0700" }, "message": "signals: add set_restore_sigmask\n\nThis adds the set_restore_sigmask() inline in \u003clinux/thread_info.h\u003e and\nreplaces every set_thread_flag(TIF_RESTORE_SIGMASK) with a call to it. No\nchange, but abstracts the details of the flag protocol from all the calls.\n\nSigned-off-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: Oleg Nesterov \u003coleg@tv-sign.ru\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cdac75e6f2fec9abc21d0abb4e5d80720eeebb10", "tree": "0962ee591a96d5ebbd8e572b4aa05fe725754eb2", "parents": [ "b781ecb6a379f155568ef7093e38c6c1d857fe53" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue Apr 29 00:58:34 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 29 08:05:59 2008 -0700" }, "message": "epoll: avoid kmemcheck warning\n\nEpoll calls rb_set_parent(n, n) to initialize the rb-tree node, but\nrb_set_parent() accesses node\u0027s pointer in its code. This creates a\nwarning in kmemcheck (reported by Vegard Nossum) about an uninitialized\nmemory access. The warning is harmless since the following rb-tree node\ninsert is going to overwrite the node data. In any case I think it\u0027s\nbetter to not have that happening at all, and fix it by simplifying the\ncode to get rid of a few lines that became superfluous after the previous\nepoll changes.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Vegard Nossum \u003cvegard.nossum@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0ccf831cbee94df9c5006dd46248c0f07847dd7c", "tree": "4de8d53c51dc4aff80f35a95cdd185229f0df79e", "parents": [ "96cf49a2c13e8dcf442abaadf6645f6a1fb3ae92" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Feb 04 22:27:20 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Feb 05 09:44:07 2008 -0800" }, "message": "lockdep: annotate epoll\n\nOn Sat, 2008-01-05 at 13:35 -0800, Davide Libenzi wrote:\n\n\u003e I remember I talked with Arjan about this time ago. Basically, since 1)\n\u003e you can drop an epoll fd inside another epoll fd 2) callback-based wakeups\n\u003e are used, you can see a wake_up() from inside another wake_up(), but they\n\u003e will never refer to the same lock instance.\n\u003e Think about:\n\u003e\n\u003e \tdfd \u003d socket(...);\n\u003e \tefd1 \u003d epoll_create();\n\u003e \tefd2 \u003d epoll_create();\n\u003e \tepoll_ctl(efd1, EPOLL_CTL_ADD, dfd, ...);\n\u003e \tepoll_ctl(efd2, EPOLL_CTL_ADD, efd1, ...);\n\u003e\n\u003e When a packet arrives to the device underneath \"dfd\", the net code will\n\u003e issue a wake_up() on its poll wake list. Epoll (efd1) has installed a\n\u003e callback wakeup entry on that queue, and the wake_up() performed by the\n\u003e \"dfd\" net code will end up in ep_poll_callback(). At this point epoll\n\u003e (efd1) notices that it may have some event ready, so it needs to wake up\n\u003e the waiters on its poll wait list (efd2). So it calls ep_poll_safewake()\n\u003e that ends up in another wake_up(), after having checked about the\n\u003e recursion constraints. That are, no more than EP_MAX_POLLWAKE_NESTS, to\n\u003e avoid stack blasting. Never hit the same queue, to avoid loops like:\n\u003e\n\u003e \tepoll_ctl(efd2, EPOLL_CTL_ADD, efd1, ...);\n\u003e \tepoll_ctl(efd3, EPOLL_CTL_ADD, efd2, ...);\n\u003e \tepoll_ctl(efd4, EPOLL_CTL_ADD, efd3, ...);\n\u003e \tepoll_ctl(efd1, EPOLL_CTL_ADD, efd4, ...);\n\u003e\n\u003e The code \"if (tncur-\u003ewq \u003d\u003d wq || ...\" prevents re-entering the same\n\u003e queue/lock.\n\nSince the epoll code is very careful to not nest same instance locks\nallow the recursion.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nTested-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4a6e9e2ce822c9f597b3036887f6cf5fa3a79375", "tree": "b0659479debfe0824022665e399b552bb4bb2415", "parents": [ "ceaeee6ad6c2a24bf37d9f426414cf3007432352" ], "author": { "name": "Matthew Wilcox", "email": "matthew@wil.cx", "time": "Thu Aug 30 16:10:22 2007 -0400" }, "committer": { "name": "Matthew Wilcox", "email": "willy@linux.intel.com", "time": "Thu Dec 06 17:07:16 2007 -0500" }, "message": "Use wake_up_locked() in eventpoll\n\nReplace the uses of __wake_up_locked with wake_up_locked\n\nSigned-off-by: Matthew Wilcox \u003cmatthew@wil.cx\u003e\n" }, { "commit": "b70c394099851c1398e9fd0fd64cf13ef2d093a1", "tree": "f030f8eed8ea257765f18f43dc3200dad054d3ea", "parents": [ "cfdaf9e5f95993264b5aee7cbb9dd16977bc11ed" ], "author": { "name": "Matthias Kaehlcke", "email": "matthias.kaehlcke@gmail.com", "time": "Thu Oct 18 23:39:56 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Fri Oct 19 11:53:38 2007 -0700" }, "message": "fs/eventpoll.c: use list_for_each_entry() instead of list_for_each()\n\nfs/eventpoll.c: use list_for_each_entry() instead of list_for_each()\nin ep_poll_safewake()\n\nSigned-off-by: Matthias Kaehlcke \u003cmatthias.kaehlcke@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c80544dc0b87bb65038355e7aafdc30be16b26ab", "tree": "176349304bec88a9de16e650c9919462e0dd453c", "parents": [ "0e9663ee452ffce0d429656ebbcfe69417a30e92" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@linux-foundation.org", "time": "Thu Oct 18 03:07:05 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Thu Oct 18 14:37:31 2007 -0700" }, "message": "sparse pointer use of zero as null\n\nGet rid of sparse related warnings from places that use integer as NULL\npointer.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Stephen Hemminger \u003cshemminger@linux-foundation.org\u003e\nCc: Andi Kleen \u003cak@suse.de\u003e\nCc: Jeff Garzik \u003cjeff@garzik.org\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Ian Kent \u003craven@themaw.net\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Stephen Smalley \u003csds@tycho.nsa.gov\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "20c2df83d25c6a95affe6157a4c9cac4cf5ffaac", "tree": "415c4453d2b17a50abe7a3e515177e1fa337bd67", "parents": [ "64fb98fc40738ae1a98bcea9ca3145b89fb71524" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Jul 20 10:11:58 2007 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Jul 20 10:11:58 2007 +0900" }, "message": "mm: Remove slab destructors from kmem_cache_create().\n\nSlab destructors were no longer supported after Christoph\u0027s\nc59def9f222d44bb7e2f0a559f2906191a0862d7 change. They\u0027ve been\nBUGs for both slab and slub, and slob never supported them\neither.\n\nThis rips out support for the dtor pointer from kmem_cache_create()\ncompletely and fixes up every single callsite in the kernel (there were\nabout 224, not including the slab allocator definitions themselves,\nor the documentation references).\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "f0ee9aabb0520adea5937855a9575c08a97b16e7", "tree": "9dd47c449b3de44302bc023f64d14c1fe18266b4", "parents": [ "67647d0fb8bc03609d045a9cce85f7ef6d763036" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue May 15 01:40:57 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue May 15 08:54:00 2007 -0700" }, "message": "epoll: move kfree inside ep_free\n\nMove the kfree() call inside the ep_free() function.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "67647d0fb8bc03609d045a9cce85f7ef6d763036", "tree": "d5d7361799b17daca0ce12a0164469a00d7acbbe", "parents": [ "c7ea76302547f81e4583d0d7c52a1c37c6747f5d" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue May 15 01:40:52 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue May 15 08:54:00 2007 -0700" }, "message": "epoll: fix some comments\n\nFixes some epoll code comments.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c7ea76302547f81e4583d0d7c52a1c37c6747f5d", "tree": "96dc2002a93a99cd3d43f1c1ca0e825a95f6448d", "parents": [ "d47de16c7221968d3eab899d7540efa5ba77af5a" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue May 15 01:40:47 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue May 15 08:53:59 2007 -0700" }, "message": "epoll locks changes and cleanups\n\nChanges the rwlock to a spinlock, and drops the use-count variable.\nOperations are always bound by the mutex now, so the use-count is no more\nneeded. For the same reason, the rwlock can become a simple spinlock.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d47de16c7221968d3eab899d7540efa5ba77af5a", "tree": "289c3dc8e4b3121a9a4b1846ae9acbd355b4b541", "parents": [ "faa8b6c3c2e1454175609167a25ae525d075f045" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue May 15 01:40:41 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue May 15 08:53:59 2007 -0700" }, "message": "fix epoll single pass code and add wait-exclusive flag\n\nFixes the epoll single pass code. During the unlocked event delivery (to\nuserspace) code, the poll callback can re-issue new events, and we must\nreceive them correctly. Since we loop in a lockless fashion, we want to be\nO(nready), and we don\u0027t want to flash on/off the spinlock for every event, we\nhave the poll callback to use a secondary list to queue events while we\u0027re\ninside the event delivery loop. The rw_semaphore has been turned into a\nmutex. This patch also adds the wait-exclusive flag, as suggested by Davi\nArnaut.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7699acd1341c63fdbcfc56994fb2989ec59d2a43", "tree": "ccb434eca7111edc906a96a59b299fdba6d47f12", "parents": [ "cea69241870e55638156a026814551d6c575fd7f" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Thu May 10 22:23:23 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Fri May 11 08:29:37 2007 -0700" }, "message": "epoll cleanups: epoll remove static pre-declarations and akpm-ize the code\n\nRe-arrange epoll code to avoid static functions pre-declarations, and apply\nakpm-filter on it.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cea69241870e55638156a026814551d6c575fd7f", "tree": "50954e635d67092260f898d5f601997643bd5a63", "parents": [ "da66f7cb0f69ab27dbf5b9d0b85c4b97716c44d1" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Thu May 10 22:23:22 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Fri May 11 08:29:37 2007 -0700" }, "message": "epoll cleanups: epoll no module\n\nEpoll is either compiled it, or not (if EMBEDDED). Remove the module code\nand use fs_initcall().\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "da66f7cb0f69ab27dbf5b9d0b85c4b97716c44d1", "tree": "3d2dc033eb92d18f8b2debe2fd472d6f3a7b6b9f", "parents": [ "9c3060bedd84144653a2ad7bea32389f65598d40" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Thu May 10 22:23:21 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Fri May 11 08:29:37 2007 -0700" }, "message": "epoll: use anonymous inodes\n\nCut out lots of code from epoll, by reusing the anonymous inode source\npatch (fs/anon_inodes.c).\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b5e618181a927210f8be1d3d2249d31904ba358d", "tree": "731f1ae4ff1ba56d402bb329182b7d935bb439a1", "parents": [ "db9c02fa8bd50eb104781a9f78cae923d8da1e74" ], "author": { "name": "Pavel Emelianov", "email": "xemul@sw.ru", "time": "Tue May 08 00:30:19 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue May 08 11:15:11 2007 -0700" }, "message": "Introduce a handy list_first_entry macro\n\nThere are many places in the kernel where the construction like\n\n foo \u003d list_entry(head-\u003enext, struct foo_struct, list);\n\nare used.\nThe code might look more descriptive and neat if using the macro\n\n list_first_entry(head, type, member) \\\n list_entry((head)-\u003enext, type, member)\n\nHere is the macro itself and the examples of its usage in the generic code.\n If it will turn out to be useful, I can prepare the set of patches to\ninject in into arch-specific code, drivers, networking, etc.\n\nSigned-off-by: Pavel Emelianov \u003cxemul@openvz.org\u003e\nSigned-off-by: Kirill Korotaev \u003cdev@openvz.org\u003e\nCc: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Zach Brown \u003czach.brown@oracle.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: John McCutchan \u003cttb@tentacle.dhs.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: john stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Ram Pai \u003clinuxram@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e63340ae6b6205fef26b40a75673d1c9c0c8bb90", "tree": "8d3212705515edec73c3936bb9e23c71d34a7b41", "parents": [ "04c9167f91e309c9c4ea982992aa08e83b2eb42e" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue May 08 00:28:08 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue May 08 11:15:07 2007 -0700" }, "message": "header cleaning: don\u0027t include smp_lock.h when not used\n\nRemove includes of \u003clinux/smp_lock.h\u003e where it is not used/needed.\nSuggested by Al Viro.\n\nBuilds cleanly on x86_64, i386, alpha, ia64, powerpc, sparc,\nsparc64, and arm (all 59 defconfigs).\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6192bd536f96c6a0d969081bc71ae24f9319bfdc", "tree": "07056ed061df4070d22198b5b6692d102aeacc00", "parents": [ "44171df8e944f0bc8f7fa3f6d080f3e671431989" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue May 08 00:25:41 2007 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue May 08 11:15:01 2007 -0700" }, "message": "epoll: optimizations and cleanups\n\nEpoll is doing multiple passes over the ready set at the moment, because of\nthe constraints over the f_op-\u003epoll() call. Looking at the code again, I\nnoticed that we already hold the epoll semaphore in read, and this\n(together with other locking conditions that hold while doing an\nepoll_wait()) can lead to a smarter way [1] to \"ship\" events to userspace\n(in a single pass).\n\nThis is a stress application that can be used to test the new code. It\nspwans multiple thread and call epoll_wait() and epoll_ctl() from many\nthreads. Stress tested on my dual Opteron 254 w/out any problems.\n\nhttp://www.xmailserver.org/totalmess.c\n\nThis is not a benchmark, just something that tries to stress and exploit\npossible problems with the new code.\nAlso, I made a stupid micro-benchmark:\n\nhttp://www.xmailserver.org/epwbench.c\n\n[1] Considering that epoll must be thread-safe, there are five ways we can\n be hit during an epoll_wait() transfer loop (ep_send_events()):\n\n 1) The epoll fd going away and calling ep_free\n This just can\u0027t happen, since we did an fget() in sys_epoll_wait\n\n 2) An epoll_ctl(EPOLL_CTL_DEL)\n This can\u0027t happen because epoll_ctl() gets ep-\u003esem in write, and\n we\u0027re holding it in read during ep_send_events()\n\n 3) An fd stored inside the epoll fd going away\n This can\u0027t happen because in eventpoll_release_file() we get\n ep-\u003esem in write, and we\u0027re holding it in read during\n ep_send_events()\n\n 4) Another epoll_wait() happening on another thread\n They both can be inside ep_send_events() at the same time, we get\n (splice) the ready-list under the spinlock, so each one will get\n its own ready list. Note that an fd cannot be at the same time\n inside more than one ready list, because ep_poll_callback() will\n not re-queue it if it sees it already linked:\n\n if (ep_is_linked(\u0026epi-\u003erdllink))\n goto is_linked;\n\n Another case that can happen, is two concurrent epoll_wait(),\n coming in with a userspace event buffer of size, say, ten.\n Suppose there are 50 event ready in the list. The first\n epoll_wait() will \"steal\" the whole list, while the second, seeing\n no events, will go to sleep. But at the end of ep_send_events() in\n the first epoll_wait(), we will re-inject surplus ready fds, and we\n will trigger the proper wake_up to the second epoll_wait().\n\n 5) ep_poll_callback() hitting us asyncronously\n This is the tricky part. As I said above, the ep_is_linked() test\n done inside ep_poll_callback(), will guarantee us that until the\n item will result linked to a list, ep_poll_callback() will not try\n to re-queue it again (read, write data on any of its members). When\n we do a list_del() in ep_send_events(), the item will still satisfy\n the ep_is_linked() test (whatever data is written in prev/next,\n it\u0027ll never be its own pointer), so ep_poll_callback() will still\n leave us alone. It\u0027s only after the eventual smp_mb()+INIT_LIST_HEAD(\u0026epi-\u003erdllink)\n that it\u0027ll become visible to ep_poll_callback(), but at the point\n we\u0027re already past it.\n\n[akpm@osdl.org: 80 cols]\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0f7fc9e4d03987fe29f6dd4aa67e4c56eb7ecb05", "tree": "51763269e44eb9bf4d0f8c529577489902850cf9", "parents": [ "b65d34fd465f19fbe2f32f2205a9a06ca7c2bdeb" ], "author": { "name": "Josef \"Jeff\" Sipek", "email": "jsipek@cs.sunysb.edu", "time": "Fri Dec 08 02:36:35 2006 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.osdl.org", "time": "Fri Dec 08 08:28:41 2006 -0800" }, "message": "[PATCH] VFS: change struct file to use struct path\n\nThis patch changes struct file to use struct path instead of having\nindependent pointers to struct dentry and struct vfsmount, and converts all\nusers of f_{dentry,vfsmnt} in fs/ to use f_path.{dentry,mnt}.\n\nAdditionally, it adds two #define\u0027s to make the transition easier for users of\nthe f_dentry and f_vfsmnt.\n\nSigned-off-by: Josef \"Jeff\" Sipek \u003cjsipek@cs.sunysb.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "e18b890bb0881bbab6f4f1a6cd20d9c60d66b003", "tree": "4828be07e1c24781c264b42c5a75bcd968223c3f", "parents": [ "441e143e95f5aa1e04026cb0aa71c801ba53982f" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Wed Dec 06 20:33:20 2006 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.osdl.org", "time": "Thu Dec 07 08:39:25 2006 -0800" }, "message": "[PATCH] slab: remove kmem_cache_t\n\nReplace all uses of kmem_cache_t with struct kmem_cache.\n\nThe patch was generated using the following script:\n\n\t#!/bin/sh\n\t#\n\t# Replace one string by another in all the kernel sources.\n\t#\n\n\tset -e\n\n\tfor file in `find * -name \"*.c\" -o -name \"*.h\"|xargs grep -l $1`; do\n\t\tquilt add $file\n\t\tsed -e \"1,\\$s/$1/$2/g\" $file \u003e/tmp/$$\n\t\tmv /tmp/$$ $file\n\t\tquilt refresh\n\tdone\n\nThe script was run like this\n\n\tsh replace kmem_cache_t \"struct kmem_cache\"\n\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "e94b1766097d53e6f3ccfb36c8baa562ffeda3fc", "tree": "93fa0a8ab84976d4e89c50768ca8b8878d642a0d", "parents": [ "54e6ecb23951b195d02433a741c7f7cb0b796c78" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Wed Dec 06 20:33:17 2006 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.osdl.org", "time": "Thu Dec 07 08:39:24 2006 -0800" }, "message": "[PATCH] slab: remove SLAB_KERNEL\n\nSLAB_KERNEL is an alias of GFP_KERNEL.\n\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "b611967de4dc5c52049676c4369dcac622a7cdfe", "tree": "8c19038c8bbaa4851dcb99bed33707deaf5170d1", "parents": [ "0f836e5fecf59d0d0353e9af11fd14a32a3001ae" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Wed Oct 11 01:21:44 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Wed Oct 11 11:14:21 2006 -0700" }, "message": "[PATCH] epoll_pwait()\n\nImplement the epoll_pwait system call, that extend the event wait mechanism\nwith the same logic ppoll and pselect do. The definition of epoll_pwait\nis:\n\nint epoll_pwait(int epfd, struct epoll_event *events, int maxevents,\n int timeout, const sigset_t *sigmask, size_t sigsetsize);\n\nThe difference between the vanilla epoll_wait and epoll_pwait is that the\nlatter allows the caller to specify a signal mask to be set while waiting\nfor events. Hence epoll_pwait will wait until either one monitored event,\nor an unmasked signal happen. If sigmask is NULL, the epoll_pwait system\ncall will act exactly like epoll_wait. For the POSIX definition of\npselect, information is available here:\n\nhttp://www.opengroup.org/onlinepubs/009695399/functions/select.html\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Andi Kleen \u003cak@muc.de\u003e\nCc: Michael Kerrisk \u003cmtk-manpages@gmx.net\u003e\nCc: Ulrich Drepper \u003cdrepper@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "c3b6571384024be31e8b3442c0e7c3b127110d9b", "tree": "24281e244579d97eb944d7b48e0036f27db4fe3c", "parents": [ "e1ca66d1b990b23e7753c729332c0ada61f4f38d" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Oct 03 01:13:52 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Oct 03 08:03:41 2006 -0700" }, "message": "[PATCH] fs/eventpoll: error handling micro-cleanup\n\nWhile reviewing the \u0027may be used uninitialized\u0027 bogus gcc warnings, I\nnoticed that an error code assignment was only needed if an error had\nactually occured.\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "ba52de123d454b57369f291348266d86f4b35070", "tree": "3973f3f3c853b5857b6b64a027cadd4fe954e3b9", "parents": [ "577c4eb09d1034d0739e3135fd2cff50588024be" ], "author": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Wed Sep 27 01:50:49 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Wed Sep 27 08:26:18 2006 -0700" }, "message": "[PATCH] inode-diet: Eliminate i_blksize from the inode structure\n\nThis eliminates the i_blksize field from struct inode. Filesystems that want\nto provide a per-inode st_blksize can do so by providing their own getattr\nroutine instead of using the generic_fillattr() function.\n\nNote that some filesystems were providing pretty much random (and incorrect)\nvalues for i_blksize.\n\n[bunk@stusta.de: cleanup]\n[akpm@osdl.org: generic_fillattr() fix]\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nSigned-off-by: Adrian Bunk \u003cbunk@stusta.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "45f17e0c2ae05c133a348452690de0e5fa863293", "tree": "4c00cf9666bd0293165d5afa13753120e8329621", "parents": [ "e88d78f6ba50d773096e26ca3f5c2464853c682d" ], "author": { "name": "Masoud Asgharifard Sharbiani", "email": "masouds@google.com", "time": "Sun Aug 27 01:23:48 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Aug 27 11:01:31 2006 -0700" }, "message": "[PATCH] eventpoll.c compile fix\n\nFix two compile failures in eventpoll.c code which would happen if\nDEBUG_EPOLL is bigger than zero.\n\nSigned-off-by: Masoud Sharbiani \u003cmasouds@google.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "36c8b586896f60cb91a4fd526233190b34316baf", "tree": "003246e1e676de33703daa979b3e3109ca202a89", "parents": [ "48f24c4da1ee7f3f22289cb85e8b8a73e4df4db5" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jul 03 00:25:41 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Jul 03 15:27:11 2006 -0700" }, "message": "[PATCH] sched: cleanup, remove task_t, convert to struct task_struct\n\ncleanup: remove task_t and convert all the uses to struct task_struct. I\nintroduced it for the scheduler anno and it was a mistake.\n\nConversion was mostly scripted, the result was reviewed and all\nsecondary whitespace and style impact (if any) was fixed up by hand.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "3419b23a919698f75944d3e0d97eb1d9c51e4bb6", "tree": "e1b4b6aad754c6a40137c0a563d823074501da2d", "parents": [ "4ad3bcf3146aa12f41262bb5dd1d9f1778e085b1" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Sun Jun 25 05:48:14 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Jun 25 10:01:13 2006 -0700" }, "message": "[PATCH] epoll: use unlocked wqueue operations\n\nA few days ago Arjan signaled a lockdep red flag on epoll locks, and\nprecisely between the epoll\u0027s device structure lock (-\u003elock) and the wait\nqueue head lock (-\u003elock).\n\nLike I explained in another email, and directly to Arjan, this can\u0027t happen\nin reality because of the explicit check at eventpoll.c:592, that does not\nallow to drop an epoll fd inside the same epoll fd. Since lockdep is\nworking on per-structure locks, it will never be able to know of policies\nenforced in other parts of the code.\n\nIt was decided time ago of having the ability to drop epoll fds inside\nother epoll fds, that triggers a very trick wakeup operations (due to\npossibly reentrant callback-driven wakeups) handled by the\nep_poll_safewake() function. While looking again at the code though, I\nnoticed that all the operations done on the epoll\u0027s main structure wait\nqueue head (-\u003ewq) are already protected by the epoll lock (-\u003elock), so that\nlocked-style functions can be used to manipulate the -\u003ewq member. This\nmakes both a lock-acquire save, and lockdep happy.\n\nRunning totalmess on my dual opteron for a while did not reveal any problem\nso far:\n\nhttp://www.xmailserver.org/totalmess.c\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "454e2398be9b9fa30433fccc548db34d19aa9958", "tree": "1f61cb0c3716a33b661cfc8977e9beeb480a322c", "parents": [ "1ad5544098a69d7dc1fa508cbb17e13a7a952fd8" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Jun 23 02:02:57 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Fri Jun 23 07:42:45 2006 -0700" }, "message": "[PATCH] VFS: Permit filesystem to override root dentry on mount\n\nExtend the get_sb() filesystem operation to take an extra argument that\npermits the VFS to pass in the target vfsmount that defines the mountpoint.\n\nThe filesystem is then required to manually set the superblock and root dentry\npointers. For most filesystems, this should be done with simple_set_mnt()\nwhich will set the superblock pointer and then set the root dentry to the\nsuperblock\u0027s s_root (as per the old default behaviour).\n\nThe get_sb() op now returns an integer as there\u0027s now no need to return the\nsuperblock pointer.\n\nThis patch permits a superblock to be implicitly shared amongst several mount\npoints, such as can be done with NFS to avoid potential inode aliasing. In\nsuch a case, simple_set_mnt() would not be called, and instead the mnt_root\nand mnt_sb would be set directly.\n\nThe patch also makes the following changes:\n\n (*) the get_sb_*() convenience functions in the core kernel now take a vfsmount\n pointer argument and return an integer, so most filesystems have to change\n very little.\n\n (*) If one of the convenience function is not used, then get_sb() should\n normally call simple_set_mnt() to instantiate the vfsmount. This will\n always return 0, and so can be tail-called from get_sb().\n\n (*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the\n dcache upon superblock destruction rather than shrink_dcache_anon().\n\n This is required because the superblock may now have multiple trees that\n aren\u0027t actually bound to s_root, but that still need to be cleaned up. The\n currently called functions assume that the whole tree is rooted at s_root,\n and that anonymous dentries are not the roots of trees which results in\n dentries being left unculled.\n\n However, with the way NFS superblock sharing are currently set to be\n implemented, these assumptions are violated: the root of the filesystem is\n simply a dummy dentry and inode (the real inode for \u0027/\u0027 may well be\n inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries\n with child trees.\n\n [*] Anonymous until discovered from another tree.\n\n (*) The documentation has been adjusted, including the additional bit of\n changing ext2_* into foo_* in the documentation.\n\n[akpm@osdl.org: convert ipath_fs, do other stuff]\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Nathan Scott \u003cnathans@sgi.com\u003e\nCc: Roland Dreier \u003crolandd@cisco.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "c569882b2e70a0c4eac99acdb39b493549041ba1", "tree": "2c405fa9d5c0bc29a1b7edc1bd92cb3db749a8d2", "parents": [ "fed306f2baa170220b0299198a39c6be2a91bf19" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Fri Apr 21 13:17:24 2006 +0100" }, "committer": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Fri Apr 21 13:17:24 2006 +0100" }, "message": "[RBTREE] Update eventpoll.c to use rb_parent() accessor macro.\n\nSigned-off-by: David Woodhouse \u003cdwmw2@infradead.org\u003e\n" }, { "commit": "2395140ee2bffe38b1c8a59318f62882b797f5e6", "tree": "b8e8f6d6db2f1aa417bb32b8a5a376d0c0a478b2", "parents": [ "0f6c840d774d669baf4727c0499ab0674826429f" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Mon Apr 10 22:54:12 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Apr 11 06:18:42 2006 -0700" }, "message": "[PATCH] uniform POLLRDHUP handling between epoll and poll/select\n\nAs reported by Michael Kerrisk, POLLRDHUP handling was not consistent\nbetween epoll and poll/select, since in epoll it was unmaskeable. This\npatch brings uniformity in POLLRDHUP handling.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: Michael Kerrisk \u003cmtk-manpages@gmx.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "4b6f5d20b04dcbc3d888555522b90ba6d36c4106", "tree": "420f271eaef7d3def7d4433b151c3cb6d7a54770", "parents": [ "99ac48f54a91d02140c497edc31dc57d4bc5c85d" ], "author": { "name": "Arjan van de Ven", "email": "arjan@infradead.org", "time": "Tue Mar 28 01:56:42 2006 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Mar 28 09:16:06 2006 -0800" }, "message": "[PATCH] Make most file operations structs in fs/ const\n\nThis is a conversion to make the various file_operations structs in fs/\nconst. Basically a regexp job, with a few manual fixups\n\nThe goal is both to increase correctness (harder to accidentally write to\nshared datastructures) and reducing the false sharing of cachelines with\nthings that get dirty in .data (while .rodata is nicely read only and thus\ncache clean)\n\nSigned-off-by: Arjan van de Ven \u003carjan@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "fa3536cc144c1298f2ed9416c33f3b77fa2cd37a", "tree": "5484541319b86ae7dac0def4db7925f7cc7008e7", "parents": [ "878a9f30d7b13015f3aa4534d7877d985f150183" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Sun Mar 26 01:37:24 2006 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Mar 26 08:56:56 2006 -0800" }, "message": "[PATCH] Use __read_mostly on some hot fs variables\n\nI discovered on oprofile hunting on a SMP platform that dentry lookups were\nslowed down because d_hash_mask, d_hash_shift and dentry_hashtable were in\na cache line that contained inodes_stat. So each time inodes_stats is\nchanged by a cpu, other cpus have to refill their cache line.\n\nThis patch moves some variables to the __read_mostly section, in order to\navoid false sharing. RCU dentry lookups can go full speed.\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "f348d70a324e15afc701a494f32ec468abb7d1eb", "tree": "a4cb43429f7f08a6621c581bd99e4a03198e8c67", "parents": [ "501f2499b897ca4be68b1acc7a4bc8cf66f5fd24" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Sat Mar 25 03:07:39 2006 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sat Mar 25 08:22:56 2006 -0800" }, "message": "[PATCH] POLLRDHUP/EPOLLRDHUP handling for half-closed devices notifications\n\nImplement the half-closed devices notifiation, by adding a new POLLRDHUP\n(and its alias EPOLLRDHUP) bit to the existing poll/select sets. Since the\nexisting POLLHUP handling, that does not report correctly half-closed\ndevices, was feared to be changed, this implementation leaves the current\nPOLLHUP reporting unchanged and simply add a new bit that is set in the few\nplaces where it makes sense. The same thing was discussed and conceptually\nagreed quite some time ago:\n\nhttp://lkml.org/lkml/2003/7/12/116\n\nSince this new event bit is added to the existing Linux poll infrastruture,\neven the existing poll/select system calls will be able to use it. As far\nas the existing POLLHUP handling, the patch leaves it as is. The\npollrdhup-2.6.16.rc5-0.10.diff defines the POLLRDHUP for all the existing\narchs and sets the bit in the six relevant files. The other attached diff\nis the simple change required to sys/epoll.h to add the EPOLLRDHUP\ndefinition.\n\nThere is \"a stupid program\" to test POLLRDHUP delivery here:\n\n http://www.xmailserver.org/pollrdhup-test.c\n\nIt tests poll(2), but since the delivery is same epoll(2) will work equally.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Michael Kerrisk \u003cmtk-manpages@gmx.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "5a6b7951bfcca7f45f44269ea87417c74558daf8", "tree": "f9cc8b3f89c89802e81b37d77c6f698e373bfe51", "parents": [ "0b2fcfdb8b4e7e379192f24ea2203163ddf5df1d" ], "author": { "name": "Benjamin LaHaise", "email": "bcrl@linux.intel.com", "time": "Thu Mar 23 03:01:03 2006 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu Mar 23 07:38:17 2006 -0800" }, "message": "[PATCH] get_empty_filp tweaks, inline epoll_init_file()\n\nEliminate a handful of cache references by keeping current in a register\ninstead of reloading (helps x86) and avoiding the overhead of a function\ncall. Inlining eventpoll_init_file() saves 24 bytes. Also reorder file\ninitialization to make writes occur more sequentially.\n\nSigned-off-by: Benjamin LaHaise \u003cbcrl@linux.intel.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "144efe3e3e5ad57af549bf800fa4560d7c74e9fe", "tree": "332dd6364fe5122f489ab4352817f11737e7a258", "parents": [ "70522e121a521aa09bd0f4e62e1aa68708b798e1" ], "author": { "name": "Arjan van de Ven", "email": "arjan@infradead.org", "time": "Thu Mar 23 03:00:32 2006 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Thu Mar 23 07:38:12 2006 -0800" }, "message": "[PATCH] sem2mutex: eventpoll\n\nSemaphore to mutex conversion.\n\nThe conversion was generated via scripts, and the result was validated\nautomatically via a script as well.\n\nSigned-off-by: Arjan van de Ven \u003carjan@infradead.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "e3306dd5f7eb2e699f36a4a313fca4b48b18d5e1", "tree": "2b9a02d3b5b4fdd421267ff7c925222a5caddb79", "parents": [ "f2d613799af915da1fd78463ba8ec5086a0d6f92" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Tue Sep 27 21:45:33 2005 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Wed Sep 28 07:46:41 2005 -0700" }, "message": "[PATCH] epoll: handle timeout overflow\n\nHandle the timeout upper boundary for epoll.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "53d2be79d5981b7efc8c5ec1169613bba95bde20", "tree": "0827b66ad3ffb70f0e7503c3db3b01d6d7a1037b", "parents": [ "dda8577fb5a00507e5aea737833190a10516b257" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Fri Sep 16 19:28:06 2005 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sat Sep 17 11:50:02 2005 -0700" }, "message": "[PATCH] epoll: fix delayed initialization bug\n\nAl found a potential problem in epoll_create(), where the\nfile-\u003eprivate_data member was set after fd_install(). This is obviously\nwrong since another thread might do a close() on that fd# before we set the\nfile-\u003eprivate_data member. This goes over 2.6.13 and passes a few basic\ntests I\u0027ve done here.\n\n(akpm: snuck in a kzalloc() cleanup too)\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "b030a4dd609e167da7f73c2d1fa5af864a0aea17", "tree": "543d65bcf9b0de3c69c8882e9eb6d8eae6556af8", "parents": [ "46c271bedd2c8444b1d05bc44928beec0c07debc" ], "author": { "name": "Pekka Enberg", "email": "penberg@cs.helsinki.fi", "time": "Thu Jun 23 00:10:03 2005 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@ppc970.osdl.org", "time": "Thu Jun 23 09:45:30 2005 -0700" }, "message": "[PATCH] Remove eventpoll macro obfuscation\n\nThis patch gets rid of some macro obfuscation from fs/eventpoll.c by\nremoving slab allocator wrappers and converting macros to static inline\nfunctions.\n\nSigned-off-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nAcked-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "75c96f85845a6707b0f9916cb263cb3584f7d48f", "tree": "45a64d1c9bb71d7093db3a11e0f21465c2e3dec6", "parents": [ "5e198d94dd0c3ec7f6138229e2e412c2c6268c38" ], "author": { "name": "Adrian Bunk", "email": "bunk@stusta.de", "time": "Thu May 05 16:16:09 2005 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@ppc970.osdl.org", "time": "Thu May 05 16:36:47 2005 -0700" }, "message": "[PATCH] make some things static\n\nThis patch makes some needlessly global identifiers static.\n\nSigned-off-by: Adrian Bunk \u003cbunk@stusta.de\u003e\nAcked-by: Arjan van de Ven \u003carjanv@infradead.org\u003e\nAcked-by: Trond Myklebust \u003ctrond.myklebust@fys.uio.no\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "1da177e4c3f41524e886b7f1b8a0c1fc7321cac2", "tree": "0bba044c4ce775e45a88a51686b5d9f90697ea9d", "parents": [], "author": { "name": "Linus Torvalds", "email": "torvalds@ppc970.osdl.org", "time": "Sat Apr 16 15:20:36 2005 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@ppc970.osdl.org", "time": "Sat Apr 16 15:20:36 2005 -0700" }, "message": "Linux-2.6.12-rc2\n\nInitial git repository build. I\u0027m not bothering with the full history,\neven though we have it. We can create a separate \"historical\" git\narchive of that later if we want to, and in the meantime it\u0027s about\n3.2GB when imported into git - space that would just make the early\ngit days unnecessarily complicated, when we don\u0027t have a lot of good\ninfrastructure for it.\n\nLet it rip!\n" } ] }