)]}' { "log": [ { "commit": "e66eded8309ebf679d3d3c1f5820d1f2ca332c71", "tree": "768e1d799f6d6a4a7f85f48d9e9fc431dc8d017c", "parents": [ "6c23cbbd5056b155401b0a2b5567d530e6c750c4" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Mar 13 11:51:49 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 13 15:00:20 2013 -0700" }, "message": "userns: Don\u0027t allow CLONE_NEWUSER | CLONE_FS\n\nDon\u0027t allowing sharing the root directory with processes in a\ndifferent user namespace. There doesn\u0027t seem to be any point, and to\nallow it would require the overhead of putting a user namespace\nreference in fs_struct (for permission checks) and incrementing that\nreference count on practically every call to fork.\n\nSo just perform the inexpensive test of forbidding sharing fs_struct\nacrosss processes in different user namespaces. We already disallow\nother forms of threading when unsharing a user namespace so this\nshould be no real burden in practice.\n\nThis updates setns, clone, and unshare to disallow multiple user\nnamespaces sharing an fs_struct.\n\nCc: stable@vger.kernel.org\nSigned-off-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6f977e6b2f75fdaccfd9be82bbf72fe5c60e8807", "tree": "983e4c0c901c7cc9364e109676597347b7c4ec65", "parents": [ "5e62adef9e1d3e8e26dfd6c95be484b955ad2927" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Wed Feb 27 17:03:23 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 27 19:10:12 2013 -0800" }, "message": "fork: unshare: remove dead code\n\nIf new_nsproxy is set we will always call switch_task_namespaces and\nthen set new_nsproxy back to NULL so the reassignment and fall through\ncheck are redundant\n\nSigned-off-by: Alan Cox \u003calan@linux.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": "d895cb1af15c04c522a25c79cc429076987c089b", "tree": "895dc9157e28f603d937a58be664e4e440d5530c", "parents": [ "9626357371b519f2b955fef399647181034a77fe", "d3d009cb965eae7e002ea5badf603ea8f4c34915" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 26 20:16:07 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 26 20:16:07 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs pile (part one) from Al Viro:\n \"Assorted stuff - cleaning namei.c up a bit, fixing -\u003ed_name/-\u003ed_parent\n locking violations, etc.\n\n The most visible changes here are death of FS_REVAL_DOT (replaced with\n \"has -\u003ed_weak_revalidate()\") and a new helper getting from struct file\n to inode. Some bits of preparation to xattr method interface changes.\n\n Misc patches by various people sent this cycle *and* ocfs2 fixes from\n several cycles ago that should\u0027ve been upstream right then.\n\n PS: the next vfs pile will be xattr stuff.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (46 commits)\n saner proc_get_inode() calling conventions\n proc: avoid extra pde_put() in proc_fill_super()\n fs: change return values from -EACCES to -EPERM\n fs/exec.c: make bprm_mm_init() static\n ocfs2/dlm: use GFP_ATOMIC inside a spin_lock\n ocfs2: fix possible use-after-free with AIO\n ocfs2: Fix oops in ocfs2_fast_symlink_readpage() code path\n get_empty_filp()/alloc_file() leave both -\u003ef_pos and -\u003ef_version zero\n target: writev() on single-element vector is pointless\n export kernel_write(), convert open-coded instances\n fs: encode_fh: return FILEID_INVALID if invalid fid_type\n kill f_vfsmnt\n vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op\n nfsd: handle vfs_getattr errors in acl protocol\n switch vfs_getattr() to struct path\n default SET_PERSONALITY() in linux/elf.h\n ceph: prepopulate inodes only when request is aborted\n d_hash_and_lookup(): export, switch open-coded instances\n 9p: switch v9fs_set_create_acl() to inode+fid, do it before d_instantiate()\n 9p: split dropping the acls from v9fs_set_create_acl()\n ...\n" }, { "commit": "496ad9aa8ef448058e36ca7a787c61f2e63f0f54", "tree": "8f4abde793cd7db5bb8fde6d27ebcacd0e54379a", "parents": [ "57eccb830f1cc93d4b506ba306d8dfa685e0c88f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jan 23 17:07:38 2013 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Feb 22 23:31:31 2013 -0500" }, "message": "new helper: file_inode(file)\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "b2c77a57e4a0a7877e357dead7ee8acc19944f3e", "tree": "fa192b5a058711299c2a8ce2621df6c9bd8f3a99", "parents": [ "c3c186403c6abd32e719f005f0af950155a9e54d", "6a61671bb2f3a1bd12cd17b8fca811a624782632" ], "author": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Tue Feb 05 13:10:33 2013 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Tue Feb 05 13:10:33 2013 +0100" }, "message": "Merge tag \u0027full-dynticks-cputime-for-mingo\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into sched/core\n\nPull full-dynticks (user-space execution is undisturbed and\nreceives no timer IRQs) preparation changes that convert the\ncputime accounting code to be full-dynticks ready,\nfrom Frederic Weisbecker:\n\n \"This implements the cputime accounting on full dynticks CPUs.\n\n Typical cputime stats infrastructure relies on the timer tick and\n its periodic polling on the CPU to account the amount of time\n spent by the CPUs and the tasks per high level domains such as\n userspace, kernelspace, guest, ...\n\n Now we are preparing to implement full dynticks capability on\n Linux for Real Time and HPC users who want full CPU isolation.\n This feature requires a cputime accounting that doesn\u0027t depend\n on the timer tick.\n\n To implement it, this new cputime infrastructure plugs into\n kernel/user/guest boundaries to take snapshots of cputime and\n flush these to the stats when needed. This performs pretty\n much like CONFIG_VIRT_CPU_ACCOUNTING except that context location\n and cputime snaphots are synchronized between write and read\n side such that the latter can safely retrieve the pending tickless\n cputime of a task and add it to its latest cputime snapshot to\n return the correct result to the user.\"\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "6a61671bb2f3a1bd12cd17b8fca811a624782632", "tree": "0afc2915fb7e517472710a49a524510322dd5baa", "parents": [ "c11f11fcbdb5be790c565aed46411486a7586afc" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Dec 16 20:00:34 2012 +0100" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Jan 27 20:35:47 2013 +0100" }, "message": "cputime: Safely read cputime of full dynticks CPUs\n\nWhile remotely reading the cputime of a task running in a\nfull dynticks CPU, the values stored in utime/stime fields\nof struct task_struct may be stale. Its values may be those\nof the last kernel \u003c-\u003e user transition time snapshot and\nwe need to add the tickless time spent since this snapshot.\n\nTo fix this, flush the cputime of the dynticks CPUs on\nkernel \u003c-\u003e user transition and record the time / context\nwhere we did this. Then on top of this snapshot and the current\ntime, perform the fixup on the reader side from task_times()\naccessors.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Li Zhong \u003czhong@linux.vnet.ibm.com\u003e\nCc: Namhyung Kim \u003cnamhyung.kim@lge.com\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n[fixed kvm module related build errors]\nSigned-off-by: Sedat Dilek \u003csedat.dilek@gmail.com\u003e\n" }, { "commit": "3a142ed962958d3063f648738a3384ab90017100", "tree": "6e7e98108edf793ba012c4e2efa78deb8a2cc052", "parents": [ "edea0d03ee5f0ae0051b6adb6681ebdf976b1ca4", "b1e0318b8cd4bdbb0fbc48967b0350483ad9bd69" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 20 13:58:48 2013 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 20 13:58:48 2013 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull misc syscall fixes from Al Viro:\n\n - compat syscall fixes (discussed back in December)\n\n - a couple of \"make life easier for sigaltstack stuff by reducing\n inter-tree dependencies\"\n\n - fix up compiler/asmlinkage calling convention disagreement of\n sys_clone()\n\n - misc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:\n sys_clone() needs asmlinkage_protect\n make sure that /linuxrc has std{in,out,err}\n x32: fix sigtimedwait\n x32: fix waitid()\n switch compat_sys_wait4() and compat_sys_waitid() to COMPAT_SYSCALL_DEFINE\n switch compat_sys_sigaltstack() to COMPAT_SYSCALL_DEFINE\n CONFIG_GENERIC_SIGALTSTACK build breakage with asm-generic/syscalls.h\n Ensure that kernel_init_freeable() is not inlined into non __init code\n" }, { "commit": "b1e0318b8cd4bdbb0fbc48967b0350483ad9bd69", "tree": "c8c0eda42707c639c67c471abbc0bca6f64213d2", "parents": [ "43b16820249396aea7eb57c747106e211e54bed5" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Jan 19 22:13:34 2013 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Jan 19 22:13:34 2013 -0500" }, "message": "sys_clone() needs asmlinkage_protect\n\nCc: stable@vger.kernel.org\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "8382fcac1b813ad0a4e68a838fc7ae93fa39eda0", "tree": "a484c6a712a7361a07d9514ea86f835b70ad3414", "parents": [ "a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Dec 20 19:26:06 2012 -0800" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Dec 24 22:53:14 2012 -0800" }, "message": "pidns: Outlaw thread creation after unshare(CLONE_NEWPID)\n\nThe sequence:\nunshare(CLONE_NEWPID)\nclone(CLONE_THREAD|CLONE_SIGHAND|CLONE_VM)\n\nCreates a new process in the new pid namespace without setting\npid_ns-\u003echild_reaper. After forking this results in a NULL\npointer dereference.\n\nAvoid this and other nonsense scenarios that can show up after\ncreating a new pid namespace with unshare by adding a new\ncheck in copy_prodcess.\n\nPointed-out-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\n" }, { "commit": "54d46ea993744c5408e39ce0cb4851e13cbea716", "tree": "8e38fa92cc2ae72e0353c44e1e68be9bf5a7a058", "parents": [ "f59dc2bb5a50b26ea751f9eac1c81e4cc7de5257", "50ececcfa7d1acee085b2c518cad495062db6379" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 20 18:05:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 20 18:05:28 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull signal handling cleanups from Al Viro:\n \"sigaltstack infrastructure + conversion for x86, alpha and um,\n COMPAT_SYSCALL_DEFINE infrastructure.\n\n Note that there are several conflicts between \"unify\n SS_ONSTACK/SS_DISABLE definitions\" and UAPI patches in mainline;\n resolution is trivial - just remove definitions of SS_ONSTACK and\n SS_DISABLED from arch/*/uapi/asm/signal.h; they are all identical and\n include/uapi/linux/signal.h contains the unified variant.\"\n\nFixed up conflicts as per Al.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:\n alpha: switch to generic sigaltstack\n new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those\n generic compat_sys_sigaltstack()\n introduce generic sys_sigaltstack(), switch x86 and um to it\n new helper: compat_user_stack_pointer()\n new helper: restore_altstack()\n unify SS_ONSTACK/SS_DISABLE definitions\n new helper: current_user_stack_pointer()\n missing user_stack_pointer() instances\n Bury the conditionals from kernel_thread/kernel_execve series\n COMPAT_SYSCALL_DEFINE: infrastructure\n" }, { "commit": "ae903caae267154de7cf8576b130ff474630596b", "tree": "a39d238d7fd1742f7f20cacbd24a4d1b4957176e", "parents": [ "468366138850f20543f1d4878028900672b23dae" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Dec 14 12:44:11 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Dec 19 18:07:38 2012 -0500" }, "message": "Bury the conditionals from kernel_thread/kernel_execve series\n\nAll architectures have\n\tCONFIG_GENERIC_KERNEL_THREAD\n\tCONFIG_GENERIC_KERNEL_EXECVE\n\t__ARCH_WANT_SYS_EXECVE\nNone of them have __ARCH_WANT_KERNEL_EXECVE and there are only two callers\nof kernel_execve() (which is a trivial wrapper for do_execve() now) left.\nKill the conditionals and make both callers use do_execve().\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "2ad306b17c0ac5a1b1f250d5f772aeb87fdf1eba", "tree": "743e6092019959dd455091d75b3fab2aa7f0a2aa", "parents": [ "c8b2a36fb1597e9390cf4c1a7f2dd394dc7d7b17" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Tue Dec 18 14:22:18 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 18 15:02:13 2012 -0800" }, "message": "fork: protect architectures where THREAD_SIZE \u003e\u003d PAGE_SIZE against fork bombs\n\nBecause those architectures will draw their stacks directly from the page\nallocator, rather than the slab cache, we can directly pass __GFP_KMEMCG\nflag, and issue the corresponding free_pages.\n\nThis code path is taken when the architecture doesn\u0027t define\nCONFIG_ARCH_THREAD_INFO_ALLOCATOR (only ia64 seems to), and has\nTHREAD_SIZE \u003e\u003d PAGE_SIZE. Luckily, most - if not all - of the remaining\narchitectures fall in this category.\n\nThis will guarantee that every stack page is accounted to the memcg the\nprocess currently lives on, and will have the allocations to fail if they\ngo over limit.\n\nFor the time being, I am defining a new variant of THREADINFO_GFP, not to\nmess with the other path. Once the slab is also tracked by memcg, we can\nget rid of that flag.\n\nTested to successfully protect against :(){ :|:\u0026 };:\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@redhat.com\u003e\nAcked-by: Kamezawa Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Greg Thelen \u003cgthelen@google.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: JoonSoo Kim \u003cjs1304@gmail.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Suleiman Souhlal \u003csuleiman@google.com\u003e\nCc: Tejun Heo \u003ctj@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": "6a2b60b17b3e48a418695a94bd2420f6ab32e519", "tree": "54b7792fa68b8890f710fa6398b6ba8626a039a8", "parents": [ "9228ff90387e276ad67b10c0eb525c9d6a57d5e9", "98f842e675f96ffac96e6c50315790912b2812be" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 15:44:47 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 17 15:44:47 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace\n\nPull user namespace changes from Eric Biederman:\n \"While small this set of changes is very significant with respect to\n containers in general and user namespaces in particular. The user\n space interface is now complete.\n\n This set of changes adds support for unprivileged users to create user\n namespaces and as a user namespace root to create other namespaces.\n The tyranny of supporting suid root preventing unprivileged users from\n using cool new kernel features is broken.\n\n This set of changes completes the work on setns, adding support for\n the pid, user, mount namespaces.\n\n This set of changes includes a bunch of basic pid namespace\n cleanups/simplifications. Of particular significance is the rework of\n the pid namespace cleanup so it no longer requires sending out\n tendrils into all kinds of unexpected cleanup paths for operation. At\n least one case of broken error handling is fixed by this cleanup.\n\n The files under /proc/\u003cpid\u003e/ns/ have been converted from regular files\n to magic symlinks which prevents incorrect caching by the VFS,\n ensuring the files always refer to the namespace the process is\n currently using and ensuring that the ptrace_mayaccess permission\n checks are always applied.\n\n The files under /proc/\u003cpid\u003e/ns/ have been given stable inode numbers\n so it is now possible to see if different processes share the same\n namespaces.\n\n Through the David Miller\u0027s net tree are changes to relax many of the\n permission checks in the networking stack to allowing the user\n namespace root to usefully use the networking stack. Similar changes\n for the mount namespace and the pid namespace are coming through my\n tree.\n\n Two small changes to add user namespace support were commited here adn\n in David Miller\u0027s -net tree so that I could complete the work on the\n /proc/\u003cpid\u003e/ns/ files in this tree.\n\n Work remains to make it safe to build user namespaces and 9p, afs,\n ceph, cifs, coda, gfs2, ncpfs, nfs, nfsd, ocfs2, and xfs so the\n Kconfig guard remains in place preventing that user namespaces from\n being built when any of those filesystems are enabled.\n\n Future design work remains to allow root users outside of the initial\n user namespace to mount more than just /proc and /sys.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (38 commits)\n proc: Usable inode numbers for the namespace file descriptors.\n proc: Fix the namespace inode permission checks.\n proc: Generalize proc inode allocation\n userns: Allow unprivilged mounts of proc and sysfs\n userns: For /proc/self/{uid,gid}_map derive the lower userns from the struct file\n procfs: Print task uids and gids in the userns that opened the proc file\n userns: Implement unshare of the user namespace\n userns: Implent proc namespace operations\n userns: Kill task_user_ns\n userns: Make create_new_namespaces take a user_ns parameter\n userns: Allow unprivileged use of setns.\n userns: Allow unprivileged users to create new namespaces\n userns: Allow setting a userns mapping to your current uid.\n userns: Allow chown and setgid preservation\n userns: Allow unprivileged users to create user namespaces.\n userns: Ignore suid and sgid on binaries if the uid or gid can not be mapped\n userns: fix return value on mntns_install() failure\n vfs: Allow unprivileged manipulation of the mount namespace.\n vfs: Only support slave subtrees across different user namespaces\n vfs: Add a user namespace reference from struct mnt_namespace\n ...\n" }, { "commit": "3d59eebc5e137bd89c6351e4c70e90ba1d0dc234", "tree": "b4ddfd0b057454a7437a3b4e3074a3b8b4b03817", "parents": [ "11520e5e7c1855fc3bf202bb3be35a39d9efa034", "4fc3f1d66b1ef0d7b8dc11f4ff1cc510f78b37d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 14:33:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 16 15:18:08 2012 -0800" }, "message": "Merge tag \u0027balancenuma-v11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux-balancenuma\n\nPull Automatic NUMA Balancing bare-bones from Mel Gorman:\n \"There are three implementations for NUMA balancing, this tree\n (balancenuma), numacore which has been developed in tip/master and\n autonuma which is in aa.git.\n\n In almost all respects balancenuma is the dumbest of the three because\n its main impact is on the VM side with no attempt to be smart about\n scheduling. In the interest of getting the ball rolling, it would be\n desirable to see this much merged for 3.8 with the view to building\n scheduler smarts on top and adapting the VM where required for 3.9.\n\n The most recent set of comparisons available from different people are\n\n mel: https://lkml.org/lkml/2012/12/9/108\n mingo: https://lkml.org/lkml/2012/12/7/331\n tglx: https://lkml.org/lkml/2012/12/10/437\n srikar: https://lkml.org/lkml/2012/12/10/397\n\n The results are a mixed bag. In my own tests, balancenuma does\n reasonably well. It\u0027s dumb as rocks and does not regress against\n mainline. On the other hand, Ingo\u0027s tests shows that balancenuma is\n incapable of converging for this workloads driven by perf which is bad\n but is potentially explained by the lack of scheduler smarts. Thomas\u0027\n results show balancenuma improves on mainline but falls far short of\n numacore or autonuma. Srikar\u0027s results indicate we all suffer on a\n large machine with imbalanced node sizes.\n\n My own testing showed that recent numacore results have improved\n dramatically, particularly in the last week but not universally.\n We\u0027ve butted heads heavily on system CPU usage and high levels of\n migration even when it shows that overall performance is better.\n There are also cases where it regresses. Of interest is that for\n specjbb in some configurations it will regress for lower numbers of\n warehouses and show gains for higher numbers which is not reported by\n the tool by default and sometimes missed in treports. Recently I\n reported for numacore that the JVM was crashing with\n NullPointerExceptions but currently it\u0027s unclear what the source of\n this problem is. Initially I thought it was in how numacore batch\n handles PTEs but I\u0027m no longer think this is the case. It\u0027s possible\n numacore is just able to trigger it due to higher rates of migration.\n\n These reports were quite late in the cycle so I/we would like to start\n with this tree as it contains much of the code we can agree on and has\n not changed significantly over the last 2-3 weeks.\"\n\n* tag \u0027balancenuma-v11\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux-balancenuma: (50 commits)\n mm/rmap, migration: Make rmap_walk_anon() and try_to_unmap_anon() more scalable\n mm/rmap: Convert the struct anon_vma::mutex to an rwsem\n mm: migrate: Account a transhuge page properly when rate limiting\n mm: numa: Account for failed allocations and isolations as migration failures\n mm: numa: Add THP migration for the NUMA working set scanning fault case build fix\n mm: numa: Add THP migration for the NUMA working set scanning fault case.\n mm: sched: numa: Delay PTE scanning until a task is scheduled on a new node\n mm: sched: numa: Control enabling and disabling of NUMA balancing if !SCHED_DEBUG\n mm: sched: numa: Control enabling and disabling of NUMA balancing\n mm: sched: Adapt the scanning rate if a NUMA hinting fault does not migrate\n mm: numa: Use a two-stage filter to restrict pages being migrated for unlikely task\u003c-\u003enode relationships\n mm: numa: migrate: Set last_nid on newly allocated page\n mm: numa: split_huge_page: Transfer last_nid on tail page\n mm: numa: Introduce last_nid to the page frame\n sched: numa: Slowly increase the scanning period as NUMA faults are handled\n mm: numa: Rate limit setting of pte_numa if node is saturated\n mm: numa: Rate limit the amount of memory that is migrated between nodes\n mm: numa: Structures for Migrate On Fault per NUMA migration rate limiting\n mm: numa: Migrate pages handled during a pmd_numa hinting fault\n mm: numa: Migrate on reference policy\n ...\n" }, { "commit": "9977d9b379cb77e0f67bd6f4563618106e58e11d", "tree": "0191accfddf578edb52c69c933d64521e3dce297", "parents": [ "cf4af01221579a4e895f43dbfc47598fbfc5a731", "541880d9a2c7871f6370071d55aa6662d329c51e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 12:22:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 12:22:13 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull big execve/kernel_thread/fork unification series from Al Viro:\n \"All architectures are converted to new model. Quite a bit of that\n stuff is actually shared with architecture trees; in such cases it\u0027s\n literally shared branch pulled by both, not a cherry-pick.\n\n A lot of ugliness and black magic is gone (-3KLoC total in this one):\n\n - kernel_thread()/kernel_execve()/sys_execve() redesign.\n\n We don\u0027t do syscalls from kernel anymore for either kernel_thread()\n or kernel_execve():\n\n kernel_thread() is essentially clone(2) with callback run before we\n return to userland, the callbacks either never return or do\n successful do_execve() before returning.\n\n kernel_execve() is a wrapper for do_execve() - it doesn\u0027t need to\n do transition to user mode anymore.\n\n As a result kernel_thread() and kernel_execve() are\n arch-independent now - they live in kernel/fork.c and fs/exec.c\n resp. sys_execve() is also in fs/exec.c and it\u0027s completely\n architecture-independent.\n\n - daemonize() is gone, along with its parts in fs/*.c\n\n - struct pt_regs * is no longer passed to do_fork/copy_process/\n copy_thread/do_execve/search_binary_handler/-\u003eload_binary/do_coredump.\n\n - sys_fork()/sys_vfork()/sys_clone() unified; some architectures\n still need wrappers (ones with callee-saved registers not saved in\n pt_regs on syscall entry), but the main part of those suckers is in\n kernel/fork.c now.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (113 commits)\n do_coredump(): get rid of pt_regs argument\n print_fatal_signal(): get rid of pt_regs argument\n ptrace_signal(): get rid of unused arguments\n get rid of ptrace_signal_deliver() arguments\n new helper: signal_pt_regs()\n unify default ptrace_signal_deliver\n flagday: kill pt_regs argument of do_fork()\n death to idle_regs()\n don\u0027t pass regs to copy_process()\n flagday: don\u0027t pass regs to copy_thread()\n bfin: switch to generic vfork, get rid of pointless wrappers\n xtensa: switch to generic clone()\n openrisc: switch to use of generic fork and clone\n unicore32: switch to generic clone(2)\n score: switch to generic fork/vfork/clone\n c6x: sanitize copy_thread(), get rid of clone(2) wrapper, switch to generic clone()\n take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h\n mn10300: switch to generic fork/vfork/clone\n h8300: switch to generic fork/vfork/clone\n tile: switch to generic clone()\n ...\n\nConflicts:\n\tarch/microblaze/include/asm/Kbuild\n" }, { "commit": "d206e09036d6201f90b2719484c8a59526c46125", "tree": "84b9057919bcb8cfd1cff47baa5fc74457e77d6d", "parents": [ "fef3ff2eb777e76cfa5ae67591982d902c17139c", "15ef4ffaa797034d5ff82844daf8f595d7c6d53c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 08:18:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 12 08:18:24 2012 -0800" }, "message": "Merge branch \u0027for-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup changes from Tejun Heo:\n \"A lot of activities on cgroup side. The big changes are focused on\n making cgroup hierarchy handling saner.\n\n - cgroup_rmdir() had peculiar semantics - it allowed cgroup\n destruction to be vetoed by individual controllers and tried to\n drain refcnt synchronously. The vetoing never worked properly and\n caused good deal of contortions in cgroup. memcg was the last\n reamining user. Michal Hocko removed the usage and cgroup_rmdir()\n path has been simplified significantly. This was done in a\n separate branch so that the memcg people can base further memcg\n changes on top.\n\n - The above allowed cleaning up cgroup lifecycle management and\n implementation of generic cgroup iterators which are used to\n improve hierarchy support.\n\n - cgroup_freezer updated to allow migration in and out of a frozen\n cgroup and handle hierarchy. If a cgroup is frozen, all descendant\n cgroups are frozen.\n\n - netcls_cgroup and netprio_cgroup updated to handle hierarchy\n properly.\n\n - Various fixes and cleanups.\n\n - Two merge commits. One to pull in memcg and rmdir cleanups (needed\n to build iterators). The other pulled in cgroup/for-3.7-fixes for\n device_cgroup fixes so that further device_cgroup patches can be\n stacked on top.\"\n\nFixed up a trivial conflict in mm/memcontrol.c as per Tejun (due to\ncommit bea8c150a7 (\"memcg: fix hotplugged memory zone oops\") in master\ntouching code close to commit 2ef37d3fe4 (\"memcg: Simplify\nmem_cgroup_force_empty_list error handling\") in for-3.8)\n\n* \u0027for-3.8\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (65 commits)\n cgroup: update Documentation/cgroups/00-INDEX\n cgroup_rm_file: don\u0027t delete the uncreated files\n cgroup: remove subsystem files when remounting cgroup\n cgroup: use cgroup_addrm_files() in cgroup_clear_directory()\n cgroup: warn about broken hierarchies only after css_online\n cgroup: list_del_init() on removed events\n cgroup: fix lockdep warning for event_control\n cgroup: move list add after list head initilization\n netprio_cgroup: allow nesting and inherit config on cgroup creation\n netprio_cgroup: implement netprio[_set]_prio() helpers\n netprio_cgroup: use cgroup-\u003eid instead of cgroup_netprio_state-\u003eprioidx\n netprio_cgroup: reimplement priomap expansion\n netprio_cgroup: shorten variable names in extend_netdev_table()\n netprio_cgroup: simplify write_priomap()\n netcls_cgroup: move config inheritance to -\u003ecss_online() and remove .broken_hierarchy marking\n cgroup: remove obsolete guarantee from cgroup_task_migrate.\n cgroup: add cgroup-\u003eid\n cgroup, cpuset: remove cgroup_subsys-\u003epost_clone()\n cgroup: s/CGRP_CLONE_CHILDREN/CGRP_CPUSET_CLONE_CHILDREN/\n cgroup: rename -\u003ecreate/post_create/pre_destroy/destroy() to -\u003ecss_alloc/online/offline/free()\n ...\n" }, { "commit": "f57d54bab696133fae569c5f01352249c36fc74f", "tree": "8ebe3c6deaf95c424c86843c3d290fbf2a9e80d2", "parents": [ "da830e589a45f0c42eef6f3cbd07275f8893f181", "c1ad41f1f7270c1956da13fa8fd59d8d5929d56e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:21:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 11 18:21:38 2012 -0800" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler updates from Ingo Molnar:\n \"The biggest change affects group scheduling: we now track the runnable\n average on a per-task entity basis, allowing a smoother, exponential\n decay average based load/weight estimation instead of the previous\n binary on-the-runqueue/off-the-runqueue load weight method.\n\n This will inevitably disturb workloads that were in some sort of\n borderline balancing state or unstable equilibrium, so an eye has to\n be kept on regressions.\n\n For that reason the new load average is only limited to group\n scheduling (shares distribution) at the moment (which was also hurting\n the most from the prior, crude weight calculation and whose scheduling\n quality wins most from this change) - but we plan to extend this to\n regular SMP balancing as well in the future, which will simplify and\n speed up things a bit.\n\n Other changes involve ongoing preparatory work to extend NOHZ to the\n scheduler as well, eventually allowing completely irq-free user-space\n execution.\"\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (33 commits)\n Revert \"sched/autogroup: Fix crash on reboot when autogroup is disabled\"\n cputime: Comment cputime\u0027s adjusting code\n cputime: Consolidate cputime adjustment code\n cputime: Rename thread_group_times to thread_group_cputime_adjusted\n cputime: Move thread_group_cputime() to sched code\n vtime: Warn if irqs aren\u0027t disabled on system time accounting APIs\n vtime: No need to disable irqs on vtime_account()\n vtime: Consolidate a bit the ctx switch code\n vtime: Explicitly account pending user time on process tick\n vtime: Remove the underscore prefix invasion\n sched/autogroup: Fix crash on reboot when autogroup is disabled\n cputime: Separate irqtime accounting from generic vtime\n cputime: Specialize irq vtime hooks\n kvm: Directly account vtime to system on guest switch\n vtime: Make vtime_account_system() irqsafe\n vtime: Gather vtime declarations to their own header file\n sched: Describe CFS load-balancer\n sched: Introduce temporary FAIR_GROUP_SCHED dependency for load-tracking\n sched: Make __update_entity_runnable_avg() fast\n sched: Update_cfs_shares at period edge\n ...\n" }, { "commit": "5bca23035391928c4c7301835accca3551b96cc2", "tree": "2feb63abf318e6edfded8bb97b43ca29c3c5b312", "parents": [ "3105b86a9fee7d2c2e76edb53bbbc4027599628f" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Thu Nov 22 14:40:03 2012 +0000" }, "committer": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Tue Dec 11 14:42:56 2012 +0000" }, "message": "mm: sched: numa: Delay PTE scanning until a task is scheduled on a new node\n\nDue to the fact that migrations are driven by the CPU a task is running\non there is no point tracking NUMA faults until one task runs on a new\nnode. This patch tracks the first node used by an address space. Until\nit changes, PTE scanning is disabled and no NUMA hinting faults are\ntrapped. This should help workloads that are short-lived, do not care\nabout NUMA placement or have bound themselves to a single node.\n\nThis takes advantage of the logic in \"mm: sched: numa: Implement slow\nstart for working set sampling\" to delay when the checks are made. This\nwill take advantage of processes that set their CPU and node bindings\nearly in their lifetime. It will also potentially allow any initial load\nbalancing to take place.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\n" }, { "commit": "e80d6661c3a5caa0cebec0853c6cb0db090fb506", "tree": "efc60762bbcdf8904f9779310ac60d0131ac9f3d", "parents": [ "18c26c27ae0abe82253cb2e2363df465dbbb657e" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Oct 22 23:10:08 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Nov 29 00:01:08 2012 -0500" }, "message": "flagday: kill pt_regs argument of do_fork()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "18c26c27ae0abe82253cb2e2363df465dbbb657e", "tree": "b822ed3267443e0b4b05e852fb0d2b709b916c65", "parents": [ "62e791c1b8ea481c72c299dee4f62c04aaef765c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Oct 22 22:53:20 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Nov 28 23:43:42 2012 -0500" }, "message": "death to idle_regs()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "62e791c1b8ea481c72c299dee4f62c04aaef765c", "tree": "6fca8f880b5cd3402743b374043a79b62c613979", "parents": [ "afa86fc426ff7e7f5477f15da9c405d08d5cf790" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Oct 22 22:52:26 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Nov 28 23:43:42 2012 -0500" }, "message": "don\u0027t pass regs to copy_process()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "afa86fc426ff7e7f5477f15da9c405d08d5cf790", "tree": "0f82925269757902ce6f7c287a968f7b439d2b2d", "parents": [ "135c37b83c81b79a888108e3f7c5f64423d8a851" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Oct 22 22:51:14 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Nov 28 23:43:42 2012 -0500" }, "message": "flagday: don\u0027t pass regs to copy_thread()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d2125043aebf7f53cd1c72115c17b01d0bc06ce1", "tree": "e6d510a22905d870a612660c2da0bdb6e36bc7e6", "parents": [ "25906730ec01be664534c9439d7cf5a373e8a4e4" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Oct 23 13:17:59 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Nov 28 21:49:04 2012 -0500" }, "message": "generic sys_fork / sys_vfork / sys_clone\n\n... and get rid of idiotic struct pt_regs * in asm-generic/syscalls.h\nprototypes of the same, while we are at it. Eventually we want those\nin linux/syscalls.h, of course, but that\u0027ll have to wait a bit.\n\nNote that there are *three* variants of sys_clone() order of arguments.\nBraindamage galore...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d37f761dbd276790f70dcf73a287fde2c3464482", "tree": "302d4bda699ab2e159b3a180f253019a38bf8132", "parents": [ "e80d0a1ae8bb8fee0edd37427836f108b30f596b" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Nov 22 00:58:35 2012 +0100" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed Nov 28 17:08:10 2012 +0100" }, "message": "cputime: Consolidate cputime adjustment code\n\ntask_cputime_adjusted() and thread_group_cputime_adjusted()\nessentially share the same code. They just don\u0027t use the same\nsource:\n\n* The first function uses the cputime in the task struct and the\nprevious adjusted snapshot that ensures monotonicity.\n\n* The second adds the cputime of all tasks in the group and the\nprevious adjusted snapshot of the whole group from the signal\nstructure.\n\nJust consolidate the common code that does the adjustment. These\nfunctions just need to fetch the values from the appropriate\nsource.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "b2e0d98705e60e45bbb3c0032c48824ad7ae0704", "tree": "e187c82e1c3babd34095f2b946614131719bbb03", "parents": [ "cde1975bc242f3e1072bde623ef378e547b73f91" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Jul 26 05:15:35 2012 -0700" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Tue Nov 20 04:18:14 2012 -0800" }, "message": "userns: Implement unshare of the user namespace\n\n- Add CLONE_THREAD to the unshare flags if CLONE_NEWUSER is selected\n As changing user namespaces is only valid if all there is only\n a single thread.\n- Restore the code to add CLONE_VM if CLONE_THREAD is selected and\n the code to addCLONE_SIGHAND if CLONE_VM is selected.\n Making the constraints in the code clear.\n\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\n" }, { "commit": "5eaf563e53294d6696e651466697eb9d491f3946", "tree": "a09a97b50613493b18eba220d7e7d2bcf4d383fa", "parents": [ "3cdf5b45ffbac294bcdfac0393df72f7687c01e8" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Nov 21 17:22:31 2011 -0800" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Nov 19 05:59:24 2012 -0800" }, "message": "userns: Allow unprivileged users to create user namespaces.\n\nNow that we have been through every permission check in the kernel\nhaving uid \u003d\u003d 0 and gid \u003d\u003d 0 in your local user namespace no\nlonger adds any special privileges. Even having a full set\nof caps in your local user namespace is safe because capabilies\nare relative to your local user namespace, and do not confer\nunexpected privileges.\n\nOver the long term this should allow much more of the kernels\nfunctionality to be safely used by non-root users. Functionality\nlike unsharing the mount namespace that is only unsafe because\nit can fool applications whose privileges are raised when they\nare executed. Since those applications have no privileges in\na user namespaces it becomes safe to spoof and confuse those\napplications all you want.\n\nThose capabilities will still need to be enabled carefully because\nwe may still need things like rlimits on the number of unprivileged\nmounts but that is to avoid DOS attacks not to avoid fooling root\nowned processes.\n\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "50804fe3737ca6a5942fdc2057a18a8141d00141", "tree": "ae85d7ba1f24111f225f794e3310c39319d5a412", "parents": [ "1c4042c29bd2e85aac4110552ca8ade763762e84" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Tue Mar 02 15:41:50 2010 -0800" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Nov 19 05:59:16 2012 -0800" }, "message": "pidns: Support unsharing the pid namespace.\n\nUnsharing of the pid namespace unlike unsharing of other namespaces\ndoes not take affect immediately. Instead it affects the children\ncreated with fork and clone. The first of these children becomes the init\nprocess of the new pid namespace, the rest become oddball children\nof pid 0. From the point of view of the new pid namespace the process\nthat created it is pid 0, as it\u0027s pid does not map.\n\nA couple of different semantics were considered but this one was\nsettled on because it is easy to implement and it is usable from\npam modules. The core reasons for the existence of unshare.\n\nI took a survey of the callers of pam modules and the following\nappears to be a representative sample of their logic.\n{\n\tsetup stuff include pam\n\tchild \u003d fork();\n\tif (!child) {\n\t\tsetuid()\n exec /bin/bash\n }\n waitpid(child);\n\n pam and other cleanup\n}\n\nAs you can see there is a fork to create the unprivileged user\nspace process. Which means that the unprivileged user space\nprocess will appear as pid 1 in the new pid namespace. Further\nmost login processes do not cope with extraneous children which\nmeans shifting the duty of reaping extraneous child process to\nthe creator of those extraneous children makes the system more\ncomprehensible.\n\nThe practical reason for this set of pid namespace semantics is\nthat it is simple to implement and verify they work correctly.\nWhereas an implementation that requres changing the struct\npid on a process comes with a lot more races and pain. Not\nthe least of which is that glibc caches getpid().\n\nThese semantics are implemented by having two notions\nof the pid namespace of a proces. There is task_active_pid_ns\nwhich is the pid namspace the process was created with\nand the pid namespace that all pids are presented to\nthat process in. The task_active_pid_ns is stored\nin the struct pid of the task.\n\nThen there is the pid namespace that will be used for children\nthat pid namespace is stored in task-\u003ensproxy-\u003epid_ns.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "1c4042c29bd2e85aac4110552ca8ade763762e84", "tree": "90b34aeae51c9afa088eac37be4e8a14a038e6be", "parents": [ "57e8391d327609cbf12d843259c968b9e5c1838f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Jul 12 17:10:36 2010 -0700" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Nov 19 05:59:15 2012 -0800" }, "message": "pidns: Consolidate initialzation of special init task state\n\nInstead of setting child_reaper and SIGNAL_UNKILLABLE one way\nfor the system init process, and another way for pid namespace\ninit processes test pid-\u003enr \u003d\u003d 1 and use the same code for both.\n\nFor the global init this results in SIGNAL_UNKILLABLE being set\nmuch earlier in the initialization process.\n\nThis is a small cleanup and it paves the way for allowing unshare and\nenter of the pid namespace as that path like our global init also will\nnot set CLONE_NEWPID.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "0a01f2cc390e10633a54f72c608cc3fe19a50c3d", "tree": "e713a1c45b5ce125a5d33b61d528cd45264d47a7", "parents": [ "17cf22c33e1f1b5e435469c84e43872579497653" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Aug 01 10:33:47 2012 -0700" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Nov 19 05:59:10 2012 -0800" }, "message": "pidns: Make the pidns proc mount/umount logic obvious.\n\nTrack the number of pids in the proc hash table. When the number of\npids goes to 0 schedule work to unmount the kernel mount of proc.\n\nMove the mount of proc into alloc_pid when we allocate the pid for\ninit.\n\nRemove the surprising calls of pid_ns_release proc in fork and\nproc_flush_task. Those code paths really shouldn\u0027t know about proc\nnamespace implementation details and people have demonstrated several\ntimes that finding and understanding those code paths is difficult and\nnon-obvious.\n\nBecause of the call path detach pid is alwasy called with the\nrtnl_lock held free_pid is not allowed to sleep, so the work to\nunmounting proc is moved to a work queue. This has the side benefit\nof not blocking the entire world waiting for the unnecessary\nrcu_barrier in deactivate_locked_super.\n\nIn the process of making the code clear and obvious this fixes a bug\nreported by Gao feng \u003cgaofeng@cn.fujitsu.com\u003e where we would leak a\nmount of proc during clone(CLONE_NEWPID|CLONE_NEWNET) if copy_pid_ns\nsucceeded and copy_net_ns failed.\n\nAcked-by: \"Serge E. Hallyn\" \u003cserge@hallyn.com\u003e\nSigned-off-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\n" }, { "commit": "17cf22c33e1f1b5e435469c84e43872579497653", "tree": "c5cec307c06f7e4ddc26e04e73c8833897b67113", "parents": [ "49f4d8b93ccf9454284b6f524b96c66d8d7fbccc" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Tue Mar 02 14:51:53 2010 -0800" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Nov 19 05:59:09 2012 -0800" }, "message": "pidns: Use task_active_pid_ns where appropriate\n\nThe expressions tsk-\u003ensproxy-\u003epid_ns and task_active_pid_ns\naka ns_of_pid(task_pid(tsk)) should have the same number of\ncache line misses with the practical difference that\nns_of_pid(task_pid(tsk)) is released later in a processes life.\n\nFurthermore by using task_active_pid_ns it becomes trivial\nto write an unshare implementation for the the pid namespace.\n\nSo I have used task_active_pid_ns everywhere I can.\n\nIn fork since the pid has not yet been attached to the\nprocess I use ns_of_pid, to achieve the same effect.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "32cdba1e05418909708a17e52505e8b2ba4381d1", "tree": "63ab2edf02cbf72e71f4ba3d6c751eaf956d4e91", "parents": [ "65b6ecc03838fd263cf7fafdfa6cf13012b91d56" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Nov 14 19:03:42 2012 +0100" }, "committer": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri Nov 16 14:52:51 2012 +0100" }, "message": "uprobes: Use percpu_rw_semaphore to fix register/unregister vs dup_mmap() race\n\nThis was always racy, but 268720903f87e0b84b161626c4447b81671b5d18\n\"uprobes: Rework register_for_each_vma() to make it O(n)\" should be\nblamed anyway, it made everything worse and I didn\u0027t notice.\n\nregister/unregister call build_map_info() and then do install/remove\nbreakpoint for every mm which mmaps inode/offset. This can obviously\nrace with fork()-\u003edup_mmap() in between and we can miss the child.\n\nuprobe_register() could be easily fixed but unregister is much worse,\nthe new mm inherits \"int3\" from parent and there is no way to detect\nthis if uprobe goes away.\n\nSo this patch simply adds percpu_down_read/up_read around dup_mmap(),\nand percpu_down_write/up_write into register_for_each_vma().\n\nThis adds 2 new hooks into dup_mmap() but we can kill uprobe_dup_mmap()\nand fold it into uprobe_end_dup_mmap().\n\nReported-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nAcked-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\n" }, { "commit": "5edee61edeaaebafe584f8fb7074c1ef4658596b", "tree": "23e6ee3581eb0009b3c2a2686c25fdba538219de", "parents": [ "ddffeb8c4d0331609ef2581d84de4d763607bd37" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Oct 16 15:03:14 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Oct 16 15:03:14 2012 -0700" }, "message": "cgroup: cgroup_subsys-\u003efork() should be called after the task is added to css_set\n\ncgroup core has a bug which violates a basic rule about event\nnotifications - when a new entity needs to be added, you add that to\nthe notification list first and then make the new entity conform to\nthe current state. If done in the reverse order, an event happening\ninbetween will be lost.\n\ncgroup_subsys-\u003efork() is invoked way before the new task is added to\nthe css_set. Currently, cgroup_freezer is the only user of -\u003efork()\nand uses it to make new tasks conform to the current state of the\nfreezer. If FROZEN state is requested while fork is in progress\nbetween cgroup_fork_callbacks() and cgroup_post_fork(), the child\ncould escape freezing - the cgroup isn\u0027t frozen when -\u003efork() is\ncalled and the freezer couldn\u0027t see the new task on the css_set.\n\nThis patch moves cgroup_subsys-\u003efork() invocation to\ncgroup_post_fork() after the new task is added to the css_set.\ncgroup_fork_callbacks() is removed.\n\nBecause now a task may be migrated during cgroup_subsys-\u003efork(),\nfreezer_fork() is updated so that it adheres to the usual RCU locking\nand the rather pointless comment on why locking can be different there\nis removed (if it doesn\u0027t make anything simpler, why even bother?).\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "42859eea96ba6beabfb0369a1eeffa3c7d2bd9cb", "tree": "fa38aeda0d6e7a4c48a882b166b8643594a1ad50", "parents": [ "f59b51fe3d3092c08d7d554ecb40db24011b2ebc", "f322220d6159455da2b5a8a596d802c8695fed30" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 10 12:02:25 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 10 12:02:25 2012 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull generic execve() changes from Al Viro:\n \"This introduces the generic kernel_thread() and kernel_execve()\n functions, and switches x86, arm, alpha, um and s390 over to them.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (26 commits)\n s390: convert to generic kernel_execve()\n s390: switch to generic kernel_thread()\n s390: fold kernel_thread_helper() into ret_from_fork()\n s390: fold execve_tail() into start_thread(), convert to generic sys_execve()\n um: switch to generic kernel_thread()\n x86, um/x86: switch to generic sys_execve and kernel_execve\n x86: split ret_from_fork\n alpha: introduce ret_from_kernel_execve(), switch to generic kernel_execve()\n alpha: switch to generic kernel_thread()\n alpha: switch to generic sys_execve()\n arm: get rid of execve wrapper, switch to generic execve() implementation\n arm: optimized current_pt_regs()\n arm: introduce ret_from_kernel_execve(), switch to generic kernel_execve()\n arm: split ret_from_fork, simplify kernel_thread() [based on patch by rmk]\n generic sys_execve()\n generic kernel_execve()\n new helper: current_pt_regs()\n preparation for generic kernel_thread()\n um: kill thread-\u003eforking\n um: let signal_delivered() do SIGTRAP on singlestepping into handler\n ...\n" }, { "commit": "9826a516ff77c5820e591211e4f3e58ff36f46be", "tree": "bdec1e2fe5ff95569795069bac73977faba17d57", "parents": [ "9c079add0d0f45220f4bb37febf0621137ec2d38" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Mon Oct 08 16:31:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:40 2012 +0900" }, "message": "mm: interval tree updates\n\nUpdate the generic interval tree code that was introduced in \"mm: replace\nvma prio_tree with an interval tree\".\n\nChanges:\n\n- fixed \u0027endpoing\u0027 typo noticed by Andrew Morton\n\n- replaced include/linux/interval_tree_tmpl.h, which was used as a\n template (including it automatically defined the interval tree\n functions) with include/linux/interval_tree_generic.h, which only\n defines a preprocessor macro INTERVAL_TREE_DEFINE(), which itself\n defines the interval tree functions when invoked. Now that is a very\n long macro which is unfortunate, but it does make the usage sites\n (lib/interval_tree.c and mm/interval_tree.c) a bit nicer than previously.\n\n- make use of RB_DECLARE_CALLBACKS() in the INTERVAL_TREE_DEFINE() macro,\n instead of duplicating that code in the interval tree template.\n\n- replaced vma_interval_tree_add(), which was actually handling the\n nonlinear and interval tree cases, with vma_interval_tree_insert_after()\n which handles only the interval tree case and has an API that is more\n consistent with the other interval tree handling functions.\n The nonlinear case is now handled explicitly in kernel/fork.c dup_mmap().\n\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Daniel Santos \u003cdaniel.santos@pobox.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6b2dbba8b6ac4df26f72eda1e5ea7bab9f950e08", "tree": "422ed8d7ac2fe45069f20cfba84a9a097bf444af", "parents": [ "fff3fd8a1210a165252cd7cd01206da7a90d3a06" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Mon Oct 08 16:31:25 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:39 2012 +0900" }, "message": "mm: replace vma prio_tree with an interval tree\n\nImplement an interval tree as a replacement for the VMA prio_tree. The\nalgorithms are similar to lib/interval_tree.c; however that code can\u0027t be\ndirectly reused as the interval endpoints are not explicitly stored in the\nVMA. So instead, the common algorithm is moved into a template and the\ndetails (node type, how to get interval endpoints from the node, etc) are\nfilled in using the C preprocessor.\n\nOnce the interval tree functions are available, using them as a\nreplacement to the VMA prio tree is a relatively simple, mechanical job.\n\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "01dc52ebdf472f77cca623ca693ca24cfc0f1bbe", "tree": "2d0f35f2aff418d52a84fb50974ad3bacf68d4bd", "parents": [ "d5dc0ad928fb9e972001e552597fd0b794863f34" ], "author": { "name": "Davidlohr Bueso", "email": "dave@gnu.org", "time": "Mon Oct 08 16:29:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:24 2012 +0900" }, "message": "oom: remove deprecated oom_adj\n\nThe deprecated /proc/\u003cpid\u003e/oom_adj is scheduled for removal this month.\n\nSigned-off-by: Davidlohr Bueso \u003cdave@gnu.org\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e9714acf8c439688884234dcac2bfc38bb607d38", "tree": "2e21c88f855a9f5168a143fa9948141140ff02a2", "parents": [ "2dd8ad81e31d0d36a5d448329c646ab43eb17788" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Mon Oct 08 16:28:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:18 2012 +0900" }, "message": "mm: kill vma flag VM_EXECUTABLE and mm-\u003enum_exe_file_vmas\n\nCurrently the kernel sets mm-\u003eexe_file during sys_execve() and then tracks\nnumber of vmas with VM_EXECUTABLE flag in mm-\u003enum_exe_file_vmas, as soon\nas this counter drops to zero kernel resets mm-\u003eexe_file to NULL. Plus it\nresets mm-\u003eexe_file at last mmput() when mm-\u003emm_users drops to zero.\n\nVMA with VM_EXECUTABLE flag appears after mapping file with flag\nMAP_EXECUTABLE, such vmas can appears only at sys_execve() or after vma\nsplitting, because sys_mmap ignores this flag. Usually binfmt module sets\nmm-\u003eexe_file and mmaps executable vmas with this file, they hold\nmm-\u003eexe_file while task is running.\n\ncomment from v2.6.25-6245-g925d1c4 (\"procfs task exe symlink\"),\nwhere all this stuff was introduced:\n\n\u003e The kernel implements readlink of /proc/pid/exe by getting the file from\n\u003e the first executable VMA. Then the path to the file is reconstructed and\n\u003e reported as the result.\n\u003e\n\u003e Because of the VMA walk the code is slightly different on nommu systems.\n\u003e This patch avoids separate /proc/pid/exe code on nommu systems. Instead of\n\u003e walking the VMAs to find the first executable file-backed VMA we store a\n\u003e reference to the exec\u0027d file in the mm_struct.\n\u003e\n\u003e That reference would prevent the filesystem holding the executable file\n\u003e from being unmounted even after unmapping the VMAs. So we track the number\n\u003e of VM_EXECUTABLE VMAs and drop the new reference when the last one is\n\u003e unmapped. This avoids pinning the mounted filesystem.\n\nexe_file\u0027s vma accounting is hooked into every file mmap/unmmap and vma\nsplit/merge just to fix some hypothetical pinning fs from umounting by mm,\nwhich already unmapped all its executable files, but still alive.\n\nSeems like currently nobody depends on this behaviour. We can try to\nremove this logic and keep mm-\u003eexe_file until final mmput().\n\nmm-\u003eexe_file is still protected with mm-\u003emmap_sem, because we want to\nchange it via new sys_prctl(PR_SET_MM_EXE_FILE). Also via this syscall\ntask can change its mm-\u003eexe_file and unpin mountpoint explicitly.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Carsten Otte \u003ccotte@de.ibm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: James Morris \u003cjames.l.morris@oracle.com\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Kentaro Takeda \u003ctakedakn@nttdata.co.jp\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Robert Richter \u003crobert.richter@amd.com\u003e\nCc: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nCc: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2dd8ad81e31d0d36a5d448329c646ab43eb17788", "tree": "cd358be45ed8067673edac7f1db6b6a42a96d9db", "parents": [ "0b173bc4daa8f8ec03a85abf5e47b23502ff80af" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Mon Oct 08 16:28:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:18 2012 +0900" }, "message": "mm: use mm-\u003eexe_file instead of first VM_EXECUTABLE vma-\u003evm_file\n\nSome security modules and oprofile still uses VM_EXECUTABLE for retrieving\na task\u0027s executable file. After this patch they will use mm-\u003eexe_file\ndirectly. mm-\u003eexe_file is protected with mm-\u003emmap_sem, so locking stays\nthe same.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\t\t\t[arch/tile]\nAcked-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\t[tomoyo]\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Carsten Otte \u003ccotte@de.ibm.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nAcked-by: James Morris \u003cjames.l.morris@oracle.com\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Kentaro Takeda \u003ctakedakn@nttdata.co.jp\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Robert Richter \u003crobert.richter@amd.com\u003e\nCc: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aecdc33e111b2c447b622e287c6003726daa1426", "tree": "3e7657eae4b785e1a1fb5dfb225dbae0b2f0cfc6", "parents": [ "a20acf99f75e49271381d65db097c9763060a1e8", "a3a6cab5ea10cca64d036851fe0d932448f2fe4f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 13:38:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 13:38:27 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking changes from David Miller:\n\n 1) GRE now works over ipv6, from Dmitry Kozlov.\n\n 2) Make SCTP more network namespace aware, from Eric Biederman.\n\n 3) TEAM driver now works with non-ethernet devices, from Jiri Pirko.\n\n 4) Make openvswitch network namespace aware, from Pravin B Shelar.\n\n 5) IPV6 NAT implementation, from Patrick McHardy.\n\n 6) Server side support for TCP Fast Open, from Jerry Chu and others.\n\n 7) Packet BPF filter supports MOD and XOR, from Eric Dumazet and Daniel\n Borkmann.\n\n 8) Increate the loopback default MTU to 64K, from Eric Dumazet.\n\n 9) Use a per-task rather than per-socket page fragment allocator for\n outgoing networking traffic. This benefits processes that have very\n many mostly idle sockets, which is quite common.\n\n From Eric Dumazet.\n\n10) Use up to 32K for page fragment allocations, with fallbacks to\n smaller sizes when higher order page allocations fail. Benefits are\n a) less segments for driver to process b) less calls to page\n allocator c) less waste of space.\n\n From Eric Dumazet.\n\n11) Allow GRO to be used on GRE tunnels, from Eric Dumazet.\n\n12) VXLAN device driver, one way to handle VLAN issues such as the\n limitation of 4096 VLAN IDs yet still have some level of isolation.\n From Stephen Hemminger.\n\n13) As usual there is a large boatload of driver changes, with the scale\n perhaps tilted towards the wireless side this time around.\n\nFix up various fairly trivial conflicts, mostly caused by the user\nnamespace changes.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1012 commits)\n hyperv: Add buffer for extended info after the RNDIS response message.\n hyperv: Report actual status in receive completion packet\n hyperv: Remove extra allocated space for recv_pkt_list elements\n hyperv: Fix page buffer handling in rndis_filter_send_request()\n hyperv: Fix the missing return value in rndis_filter_set_packet_filter()\n hyperv: Fix the max_xfer_size in RNDIS initialization\n vxlan: put UDP socket in correct namespace\n vxlan: Depend on CONFIG_INET\n sfc: Fix the reported priorities of different filter types\n sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP\n sfc: Fix loopback self-test with separate_tx_channels\u003d1\n sfc: Fix MCDI structure field lookup\n sfc: Add parentheses around use of bitfield macro arguments\n sfc: Fix null function pointer in efx_sriov_channel_type\n vxlan: virtual extensible lan\n igmp: export symbol ip_mc_leave_group\n netlink: add attributes to fdb interface\n tg3: unconditionally select HWMON support when tg3 is enabled.\n Revert \"net: ti cpsw ethernet: allow reading phy interface mode from DT\"\n gre: fix sparse warning\n ...\n" }, { "commit": "0b981cb94bc63a2d0e5eccccdca75fe57643ffce", "tree": "966ad6e6807fd1041d9962c9904e032a5ab07a65", "parents": [ "4cba3335826cbb36a218c3f5a1387e2c7c7ca9aa", "fdf9c356502ae02238efcdf90cefd7b473a63fd4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 10:43:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 10:43:39 2012 -0700" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler changes from Ingo Molnar:\n \"Continued quest to clean up and enhance the cputime code by Frederic\n Weisbecker, in preparation for future tickless kernel features.\n\n Other than that, smallish changes.\"\n\nFix up trivial conflicts due to additions next to each other in arch/{x86/}Kconfig\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)\n cputime: Make finegrained irqtime accounting generally available\n cputime: Gather time/stats accounting config options into a single menu\n ia64: Reuse system and user vtime accounting functions on task switch\n ia64: Consolidate user vtime accounting\n vtime: Consolidate system/idle context detection\n cputime: Use a proper subsystem naming for vtime related APIs\n sched: cpu_power: enable ARCH_POWER\n sched/nohz: Clean up select_nohz_load_balancer()\n sched: Fix load avg vs. cpu-hotplug\n sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW\n sched: Fix nohz_idle_balance()\n sched: Remove useless code in yield_to()\n sched: Add time unit suffix to sched sysctl knobs\n sched/debug: Limit sd-\u003e*_idx range on sysctl\n sched: Remove AFFINE_WAKEUPS feature flag\n s390: Remove leftover account_tick_vtime() header\n cputime: Consolidate vtime handling on context switch\n sched: Move cputime code to its own file\n cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING\n tile: Remove SD_PREFER_LOCAL leftover\n ...\n" }, { "commit": "2aa3a7f8660355c3dddead17e224545c1a3d5a5f", "tree": "d106fcaeb6b66e09591cf8ec28c836be93f4d837", "parents": [ "a4d94ff8aa864c05b33c2de1f8c5d0176d7a4b63" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Sep 21 19:55:31 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Sep 30 13:35:55 2012 -0400" }, "message": "preparation for generic kernel_thread()\n\nLet architectures select GENERIC_KERNEL_THREAD and have their copy_thread()\ntreat NULL regs as \"it came from kernel_thread(), sp argument contains\nthe function new thread will be calling and stack_size - the argument for\nthat function\". Switching the architectures begins shortly...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "5640f7685831e088fe6c2e1f863a6805962f8e81", "tree": "fb7660173338a45c27d610eb59ba20cf5c2b91b8", "parents": [ "b98b8babd6e3370fadb7c6eaacb00eb2f6344a6c" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sun Sep 23 23:04:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 24 16:31:37 2012 -0400" }, "message": "net: use a per task frag allocator\n\nWe currently use a per socket order-0 page cache for tcp_sendmsg()\noperations.\n\nThis page is used to build fragments for skbs.\n\nIts done to increase probability of coalescing small write() into\nsingle segments in skbs still in write queue (not yet sent)\n\nBut it wastes a lot of memory for applications handling many mostly\nidle sockets, since each socket holds one page in sk-\u003esk_sndmsg_page\n\nIts also quite inefficient to build TSO 64KB packets, because we need\nabout 16 pages per skb on arches where PAGE_SIZE \u003d 4096, so we hit\npage allocator more than wanted.\n\nThis patch adds a per task frag allocator and uses bigger pages,\nif available. An automatic fallback is done in case of memory pressure.\n\n(up to 32768 bytes per frag, thats order-3 pages on x86)\n\nThis increases TCP stream performance by 20% on loopback device,\nbut also benefits on other network devices, since 8x less frags are\nmapped on transmit and unmapped on tx completion. Alexander Duyck\nmentioned a probable performance win on systems with IOMMU enabled.\n\nIts possible some SG enabled hardware cant cope with bigger fragments,\nbut their ndo_start_xmit() should already handle this, splitting a\nfragment in sub fragments, since some arches have PAGE_SIZE\u003d65536\n\nSuccessfully tested on various ethernet devices.\n(ixgbe, igb, bnx2x, tg3, mellanox mlx4)\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: Vijay Subramanian \u003csubramanian.vijay@gmail.com\u003e\nCc: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nTested-by: Vijay Subramanian \u003csubramanian.vijay@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f3e947867478af9a12b9956bcd000ac7613a8a95", "tree": "63fabb89439447e0f72c465e8b8d0852e9deff08", "parents": [ "5ed4f1d96deee82ee92cd1ac1e0108c27e80e9b0" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Sep 12 11:22:00 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Thu Sep 13 16:52:04 2012 +0200" }, "message": "sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW\n\nNow that the last architecture to use this has stopped doing so (ARM,\nthanks Catalin!) we can remove this complexity from the scheduler\ncore.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nLink: http://lkml.kernel.org/n/tip-g9p2a1w81xxbrze25v9zpzbf@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "61559a8165da2b6bab7621ac36379c6280efacb6", "tree": "22d885fda72ffadbaa735ceeeabd266177d66eab", "parents": [ "f8ac4ec9c064b330dcc49e03c450fe74298c4622" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Aug 08 17:17:46 2012 +0200" }, "committer": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Aug 28 18:21:19 2012 +0200" }, "message": "uprobes: Fold uprobe_reset_state() into uprobe_dup_mmap()\n\nNow that we have uprobe_dup_mmap() we can fold uprobe_reset_state()\ninto the new hook and remove it. mmput()-\u003euprobe_clear_state() can\u0027t\nbe called before dup_mmap().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\n" }, { "commit": "f8ac4ec9c064b330dcc49e03c450fe74298c4622", "tree": "62d53120d0289719438d27de5f868c36e136ed28", "parents": [ "78f7411668aa0b2006d331f6a288416dd91b8e5d" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Aug 08 17:11:42 2012 +0200" }, "committer": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Aug 28 18:21:18 2012 +0200" }, "message": "uprobes: Introduce MMF_HAS_UPROBES\n\nAdd the new MMF_HAS_UPROBES flag. It is set by install_breakpoint()\nand it is copied by dup_mmap(), uprobe_pre_sstep_notifier() checks\nit to avoid the slow path if the task was never probed. Perhaps it\nmakes sense to check it in valid_vma(is_register \u003d\u003e false) as well.\n\nThis needs the new dup_mmap()-\u003euprobe_dup_mmap() hook. We can\u0027t use\nuprobe_reset_state() or put MMF_HAS_UPROBES into MMF_INIT_MASK, we\nneed oldmm-\u003emmap_sem to avoid the race with uprobe_register() or\nmmap() from another thread.\n\nCurrently we never clear this bit, it can be false-positive after\nuprobe_unregister() or uprobe_munmap() or if dup_mmap() hits the\nprobed VM_DONTCOPY vma. But this is fine correctness-wise and has\nno effect unless the task hits the non-uprobe breakpoint.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\n" }, { "commit": "f1a45d023193f7d8e55e384090b645d609325393", "tree": "7f901f3dbd23a7602bf3d4bf774862a3ee5b7640", "parents": [ "647c42dfd40fec032a4c8525a755160f0765921f" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Aug 06 14:13:23 2012 +0200" }, "committer": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Aug 28 18:21:17 2012 +0200" }, "message": "uprobes: Kill dup_mmap()-\u003euprobe_mmap(), simplify uprobe_mmap/munmap\n\n1. Kill dup_mmap()-\u003euprobe_mmap(), it was only needed to calculate\n new_mm-\u003euprobes_state.count removed by the previous patch.\n\n If the forking process has a pending uprobe (int3) in vma, it will\n be copied by copy_page_range(), note that it checks vma-\u003eanon_vma\n so \"Don\u0027t copy ptes\" is not possible after install_breakpoint()\n which does anon_vma_prepare().\n\n2. Remove is_swbp_at_addr() and \"int count\" in uprobe_mmap(). Again,\n this was needed for uprobes_state.count.\n\n As a side effect this fixes the bug pointed out by Srikar,\n this code lacked the necessary put_uprobe().\n\n3. uprobe_munmap() becomes a nop after the previous patch. Remove the\n meaningless code but do not remove the helper, we will need it.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\n" }, { "commit": "c7a3a88c938fbe3d70c2278e082b80eb830d1c58", "tree": "e25070dc5141c2614fbcfaae543de4237418a623", "parents": [ "9160338de92c0305329be5163a76f849806e83de" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Sun Aug 19 19:10:42 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Tue Aug 21 11:48:12 2012 +0200" }, "message": "uprobes: Fix mmap_region()\u0027s mm-\u003emm_rb corruption if uprobe_mmap() fails\n\nThis patch fixes:\n\n https://bugzilla.redhat.com/show_bug.cgi?id\u003d843640\n\nIf mmap_region()-\u003euprobe_mmap() fails, unmap_and_free_vma path\ndoes unmap_region() but does not remove the soon-to-be-freed vma\nfrom rb tree. Actually there are more problems but this is how\nWilliam noticed this bug.\n\nPerhaps we could do do_munmap() + return in this case, but in\nfact it is simply wrong to abort if uprobe_mmap() fails. Until\nat least we move the !UPROBE_COPY_INSN code from\ninstall_breakpoint() to uprobe_register().\n\nFor example, uprobe_mmap()-\u003einstall_breakpoint() can fail if the\nprobed insn is not supported (remember, uprobe_register()\nsucceeds if nobody mmaps inode/offset), mmap() should not fail\nin this case.\n\ndup_mmap()-\u003euprobe_mmap() is wrong too by the same reason,\nfork() can race with uprobe_register() and fail for no reason if\nit wins the race and does install_breakpoint() first.\n\nAnd, if nothing else, both mmap_region() and dup_mmap() return\nsuccess if uprobe_mmap() fails. Change them to ignore the error\ncode from uprobe_mmap().\n\nReported-and-tested-by: William Cohen \u003cwcohen@redhat.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e # v3.5\nCc: Anton Arapov \u003canton@redhat.com\u003e\nCc: William Cohen \u003cwcohen@redhat.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/r/20120819171042.GB26957@redhat.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "c255a458055e459f65eb7b7f51dc5dbdd0caf1d8", "tree": "b143b1914eeb6f27f53e30f9f0275d0f1ca5480b", "parents": [ "80934513b230bfcf70265f2ef0fdae89fb391633" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Tue Jul 31 16:43:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 31 18:42:43 2012 -0700" }, "message": "memcg: rename config variables\n\nSanity:\n\nCONFIG_CGROUP_MEM_RES_CTLR -\u003e CONFIG_MEMCG\nCONFIG_CGROUP_MEM_RES_CTLR_SWAP -\u003e CONFIG_MEMCG_SWAP\nCONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED -\u003e CONFIG_MEMCG_SWAP_ENABLED\nCONFIG_CGROUP_MEM_RES_CTLR_KMEM -\u003e CONFIG_MEMCG_KMEM\n\n[mhocko@suse.cz: fix missed bits]\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "44de9d0cad41f2c51ef26916842be046b582dcc9", "tree": "a9ce576f28e5038e9e3ae2e360cadf176dc74898", "parents": [ "df858fa8276f85106f2f5c3cd49c1fa524058070" ], "author": { "name": "Huang Shijie", "email": "shijie8@gmail.com", "time": "Tue Jul 31 16:41:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 31 18:42:39 2012 -0700" }, "message": "mm: account the total_vm in the vm_stat_account()\n\nvm_stat_account() accounts the shared_vm, stack_vm and reserved_vm now.\nBut we can also account for total_vm in the vm_stat_account() which makes\nthe code tidy.\n\nEven for mprotect_fixup(), we can get the right result in the end.\n\nSigned-off-by: Huang Shijie \u003cshijie8@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": "f19b9f74b7ea3b21ddcee55d852a6488239608a4", "tree": "d57515cb110bc8b30043e1ab67c962ab78898e2f", "parents": [ "87bec58a52652e2eb2a575692a40f9466c7bd31b" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Mon Jul 30 14:42:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 30 17:25:20 2012 -0700" }, "message": "fork: fix error handling in dup_task()\n\nThe function dup_task() may fail at the following function calls in the\nfollowing order.\n\n0) alloc_task_struct_node()\n1) alloc_thread_info_node()\n2) arch_dup_task_struct()\n\nError by 0) is not a matter, it can just return. But error by 1) requires\nreleasing task_struct allocated by 0) before it returns. Likewise, error\nby 2) requires releasing task_struct and thread_info allocated by 0) and\n1).\n\nThe existing error handling calls free_task_struct() and\nfree_thread_info() which do not only release task_struct and thread_info,\nbut also call architecture specific arch_release_task_struct() and\narch_release_thread_info().\n\nThe problem is that task_struct and thread_info are not fully initialized\nyet at this point, but arch_release_task_struct() and\narch_release_thread_info() are called with them.\n\nFor example, x86 defines its own arch_release_task_struct() that releases\na task_xstate. If alloc_thread_info_node() fails in dup_task(),\narch_release_task_struct() is called with task_struct which is just\nallocated and filled with garbage in this error handling.\n\nThis actually happened with tools/testing/fault-injection/failcmd.sh\n\n\t# env FAILCMD_TYPE\u003dfail_page_alloc \\\n\t\t./tools/testing/fault-injection/failcmd.sh --times\u003d100 \\\n\t\t--min-order\u003d0 --ignore-gfp-wait\u003d0 \\\n\t\t-- make -C tools/testing/selftests/ run_tests\n\nIn order to fix this issue, make free_{task_struct,thread_info}() not to\ncall arch_release_{task_struct,thread_info}() and call\narch_release_{task_struct,thread_info}() implicitly where needed.\n\nDefault arch_release_task_struct() and arch_release_thread_info() are\ndefined as empty by default. So this change only affects the\narchitectures which implement their own arch_release_task_struct() or\narch_release_thread_info() as listed below.\n\narch_release_task_struct(): x86, sh\narch_release_thread_info(): mn10300, tile\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Koichi Yasutake \u003cyasutake.koichi@jp.panasonic.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Salman Qazi \u003csqazi@google.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "87bec58a52652e2eb2a575692a40f9466c7bd31b", "tree": "bd7d6408b61ee2c1ad6df9f0b44277fb08e75034", "parents": [ "b2412b7fa7a3816fa8633dc2ff19f1a90aabe423" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Mon Jul 30 14:42:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 30 17:25:20 2012 -0700" }, "message": "revert \"sched: Fix fork() error path to not crash\"\n\nTo make way for \"fork: fix error handling in dup_task()\", which fixes the\nerrors more completely.\n\nCc: Salman Qazi \u003csqazi@google.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Akinobu Mita \u003cakinobu.mita@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": "b2412b7fa7a3816fa8633dc2ff19f1a90aabe423", "tree": "5059c916b993726b3b208859f35c8b59761f2656", "parents": [ "bc452b4b65bd589083a7a7ba4f14f85dfc8454fa" ], "author": { "name": "Huang Shijie", "email": "shijie8@gmail.com", "time": "Mon Jul 30 14:42:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 30 17:25:20 2012 -0700" }, "message": "fork: use vma_pages() to simplify the code\n\nThe current code can be replaced by vma_pages(). So use it to simplify\nthe code.\n\n[akpm@linux-foundation.org: initialise `len\u0027 at its definition site]\nSigned-off-by: Huang Shijie \u003cshijie8@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": "a66d2c8f7ec1284206ca7c14569e2a607583f1e3", "tree": "08cf68bcef3559b370843cab8191e5cc0f740bde", "parents": [ "a6be1fcbc57f95bb47ef3c8e4ee3d83731b8f21e", "8cae6f7158ec1fa44c8a04a43db7d8020ec60437" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 23 12:27:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 23 12:27:27 2012 -0700" }, "message": "Merge branch \u0027for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull the big VFS changes from Al Viro:\n \"This one is *big* and changes quite a few things around VFS. What\u0027s in there:\n\n - the first of two really major architecture changes - death to open\n intents.\n\n The former is finally there; it was very long in making, but with\n Miklos getting through really hard and messy final push in\n fs/namei.c, we finally have it. Unlike his variant, this one\n doesn\u0027t introduce struct opendata; what we have instead is\n -\u003eatomic_open() taking preallocated struct file * and passing\n everything via its fields.\n\n Instead of returning struct file *, it returns -E... on error, 0\n on success and 1 in \"deal with it yourself\" case (e.g. symlink\n found on server, etc.).\n\n See comments before fs/namei.c:atomic_open(). That made a lot of\n goodies finally possible and quite a few are in that pile:\n -\u003elookup(), -\u003ed_revalidate() and -\u003ecreate() do not get struct\n nameidata * anymore; -\u003elookup() and -\u003ed_revalidate() get lookup\n flags instead, -\u003ecreate() gets \"do we want it exclusive\" flag.\n\n With the introduction of new helper (kern_path_locked()) we are rid\n of all struct nameidata instances outside of fs/namei.c; it\u0027s still\n visible in namei.h, but not for long. Come the next cycle,\n declaration will move either to fs/internal.h or to fs/namei.c\n itself. [me, miklos, hch]\n\n - The second major change: behaviour of final fput(). Now we have\n __fput() done without any locks held by caller *and* not from deep\n in call stack.\n\n That obviously lifts a lot of constraints on the locking in there.\n Moreover, it\u0027s legal now to call fput() from atomic contexts (which\n has immediately simplified life for aio.c). We also don\u0027t need\n anti-recursion logics in __scm_destroy() anymore.\n\n There is a price, though - the damn thing has become partially\n asynchronous. For fput() from normal process we are guaranteed\n that pending __fput() will be done before the caller returns to\n userland, exits or gets stopped for ptrace.\n\n For kernel threads and atomic contexts it\u0027s done via\n schedule_work(), so theoretically we might need a way to make sure\n it\u0027s finished; so far only one such place had been found, but there\n might be more.\n\n There\u0027s flush_delayed_fput() (do all pending __fput()) and there\u0027s\n __fput_sync() (fput() analog doing __fput() immediately). I hope\n we won\u0027t need them often; see warnings in fs/file_table.c for\n details. [me, based on task_work series from Oleg merged last\n cycle]\n\n - sync series from Jan\n\n - large part of \"death to sync_supers()\" work from Artem; the only\n bits missing here are exofs and ext4 ones. As far as I understand,\n those are going via the exofs and ext4 trees resp.; once they are\n in, we can put -\u003ewrite_super() to the rest, along with the thread\n calling it.\n\n - preparatory bits from unionmount series (from dhowells).\n\n - assorted cleanups and fixes all over the place, as usual.\n\n This is not the last pile for this cycle; there\u0027s at least jlayton\u0027s\n ESTALE work and fsfreeze series (the latter - in dire need of fixes,\n so I\u0027m not sure it\u0027ll make the cut this cycle). I\u0027ll probably throw\n symlink/hardlink restrictions stuff from Kees into the next pile, too.\n Plus there\u0027s a lot of misc patches I hadn\u0027t thrown into that one -\n it\u0027s large enough as it is...\"\n\n* \u0027for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (127 commits)\n ext4: switch EXT4_IOC_RESIZE_FS to mnt_want_write_file()\n btrfs: switch btrfs_ioctl_balance() to mnt_want_write_file()\n switch dentry_open() to struct path, make it grab references itself\n spufs: shift dget/mntget towards dentry_open()\n zoran: don\u0027t bother with struct file * in zoran_map\n ecryptfs: don\u0027t reinvent the wheels, please - use struct completion\n don\u0027t expose I_NEW inodes via dentry-\u003ed_inode\n tidy up namei.c a bit\n unobfuscate follow_up() a bit\n ext3: pass custom EOF to generic_file_llseek_size()\n ext4: use core vfs llseek code for dir seeks\n vfs: allow custom EOF in generic_file_llseek code\n vfs: Avoid unnecessary WB_SYNC_NONE writeback during sys_sync and reorder sync passes\n vfs: Remove unnecessary flushing of block devices\n vfs: Make sys_sync writeout also block device inodes\n vfs: Create function for iterating over block devices\n vfs: Reorder operations during sys_sync\n quota: Move quota syncing to -\u003esync_fs method\n quota: Split dquot_quota_sync() to writeback and cache flushing part\n vfs: Move noop_backing_dev_info check from sync into writeback\n ...\n" }, { "commit": "158e1645e07f3e9f7e4962d7a0997f5c3b98311b", "tree": "09d695b3a0410afe15f7fd6006bc6c1effee151d", "parents": [ "41f9d29f09ca0b22c3631e8a39676e74cda9bcc0" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jun 27 09:24:13 2012 +0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jul 22 23:57:55 2012 +0400" }, "message": "trim task_work: get rid of hlist\n\nlayout based on Oleg\u0027s suggestion; single-linked list,\ntask-\u003etask_works points to the last element, forward pointer\nfrom said last element points to head. I\u0027d still prefer\nmuch more regular scheme with two pointers in task_work,\nbut...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "164c33c6adee609b8b9062cce4c10f764d0dce13", "tree": "47ff40e1ae3d8206dd900e64d757ce16a3ee0774", "parents": [ "9e85a6f9dc231f3ed3c1dc1b12217505d970142a" ], "author": { "name": "Salman Qazi", "email": "sqazi@google.com", "time": "Mon Jun 25 18:18:15 2012 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Thu Jul 05 20:57:32 2012 +0200" }, "message": "sched: Fix fork() error path to not crash\n\nIn dup_task_struct(), if arch_dup_task_struct() fails, the clean up\ncode fails to clean up correctly. That\u0027s because the clean up\ncode depends on unininitalized ti-\u003etask pointer. We fix this\nby making sure that the task and thread_info know about each other\nbefore we attempt to take the error path.\n\nSigned-off-by: Salman Qazi \u003csqazi@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/20120626011815.11323.5533.stgit@dungbeetle.mtv.corp.google.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "48d212a2eecaca2e1875925837ad27b2f43f48a3", "tree": "fbd83c7b15856971f6d7297e1d23dc862ba2989c", "parents": [ "46edaedaf3842164281d0f86c41bc152f4b4d32e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 07 17:54:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 07 17:54:07 2012 -0700" }, "message": "Revert \"mm: correctly synchronize rss-counters at exit/exec\"\n\nThis reverts commit 40af1bbdca47e5c8a2044039bb78ca8fd8b20f94.\n\nIt\u0027s horribly and utterly broken for at least the following reasons:\n\n - calling sync_mm_rss() from mmput() is fundamentally wrong, because\n there\u0027s absolutely no reason to believe that the task that does the\n mmput() always does it on its own VM. Example: fork, ptrace, /proc -\n you name it.\n\n - calling it *after* having done mmdrop() on it is doubly insane, since\n the mm struct may well be gone now.\n\n - testing mm against NULL before you call it is insane too, since a\nNULL mm there would have caused oopses long before.\n\n.. and those are just the three bugs I found before I decided to give up\nlooking for me and revert it asap. I should have caught it before I\neven took it, but I trusted Andrew too much.\n\nCc: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "40af1bbdca47e5c8a2044039bb78ca8fd8b20f94", "tree": "70b5a21579f8b0137c09e54d523246d84be93430", "parents": [ "39caa0916ef27cf1da5026eb708a2b8413156f75" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Thu Jun 07 14:21:14 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 07 14:43:55 2012 -0700" }, "message": "mm: correctly synchronize rss-counters at exit/exec\n\nmm-\u003erss_stat counters have per-task delta: task-\u003erss_stat. Before\nchanging task-\u003emm pointer the kernel must flush this delta with\nsync_mm_rss().\n\ndo_exit() already calls sync_mm_rss() to flush the rss-counters before\ncommitting the rss statistics into task-\u003esignal-\u003emaxrss, taskstats,\naudit and other stuff. Unfortunately the kernel does this before\ncalling mm_release(), which can call put_user() for processing\ntask-\u003eclear_child_tid. So at this point we can trigger page-faults and\ntask-\u003erss_stat becomes non-zero again. As a result mm-\u003erss_stat becomes\ninconsistent and check_mm() will print something like this:\n\n| BUG: Bad rss-counter state mm:ffff88020813c380 idx:1 val:-1\n| BUG: Bad rss-counter state mm:ffff88020813c380 idx:2 val:1\n\nThis patch moves sync_mm_rss() into mm_release(), and moves mm_release()\nout of do_exit() and calls it earlier. After mm_release() there should\nbe no pagefaults.\n\n[akpm@linux-foundation.org: tweak comment]\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nReported-by: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t\t[3.4.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fb21affa49204acd409328415b49bfe90136653c", "tree": "3535dbe0c0aad049a38cadfcffe78409397a1b32", "parents": [ "a00b6151a2ae4c52576c35d3998e144a993d50b8", "f23ca335462e3c84f13270b9e65f83936068ec2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:47:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:47:30 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull second pile of signal handling patches from Al Viro:\n \"This one is just task_work_add() series + remaining prereqs for it.\n\n There probably will be another pull request from that tree this\n cycle - at least for helpers, to get them out of the way for per-arch\n fixes remaining in the tree.\"\n\nFix trivial conflict in kernel/irq/manage.c: the merge of Andrew\u0027s pile\nhad brought in commit 97fd75b7b8e0 (\"kernel/irq/manage.c: use the\npr_foo() infrastructure to prefix printks\") which changed one of the\npr_err() calls that this merge moves around.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:\n keys: kill task_struct-\u003ereplacement_session_keyring\n keys: kill the dummy key_replace_session_keyring()\n keys: change keyctl_session_to_parent() to use task_work_add()\n genirq: reimplement exit_irq_thread() hook via task_work_add()\n task_work_add: generic process-context callbacks\n avr32: missed _TIF_NOTIFY_RESUME on one of do_notify_resume callers\n parisc: need to check NOTIFY_RESUME when exiting from syscall\n move key_repace_session_keyring() into tracehook_notify_resume()\n TIF_NOTIFY_RESUME is defined on all targets now\n" }, { "commit": "08615d7d85e5aa02c05bf6c4dde87d940e7f85f6", "tree": "18906149d313d25914160aca21cedf54b3a7e818", "parents": [ "9fdadb2cbaf4b482dfd6086e8bd3d2db071a1702", "0a4dd35c67b144d8ef9432120105f1aab9293ee9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:10:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:10:18 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge misc patches from Andrew Morton:\n\n - the \"misc\" tree - stuff from all over the map\n\n - checkpatch updates\n\n - fatfs\n\n - kmod changes\n\n - procfs\n\n - cpumask\n\n - UML\n\n - kexec\n\n - mqueue\n\n - rapidio\n\n - pidns\n\n - some checkpoint-restore feature work. Reluctantly. Most of it\n delayed a release. I\u0027m still rather worried that we don\u0027t have a\n clear roadmap to completion for this work.\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (78 patches)\n kconfig: update compression algorithm info\n c/r: prctl: add ability to set new mm_struct::exe_file\n c/r: prctl: extend PR_SET_MM to set up more mm_struct entries\n c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat\n syscalls, x86: add __NR_kcmp syscall\n fs, proc: introduce /proc/\u003cpid\u003e/task/\u003ctid\u003e/children entry\n sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE\n aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()\n eventfd: change int to __u64 in eventfd_signal()\n fs/nls: add Apple NLS\n pidns: make killed children autoreap\n pidns: use task_active_pid_ns in do_notify_parent\n rapidio/tsi721: add DMA engine support\n rapidio: add DMA engine support for RIO data transfers\n ipc/mqueue: add rbtree node caching support\n tools/selftests: add mq_perf_tests\n ipc/mqueue: strengthen checks on mqueue creation\n ipc/mqueue: correct mq_attr_ok test\n ipc/mqueue: improve performance of send/recv\n selftests: add mq_open_tests\n ...\n" }, { "commit": "f7505d64f2db5da2d7d94873ddf2cd2524847061", "tree": "a10aee9604306826816e8e5fc689201f49d7a6d0", "parents": [ "bca15543736f9be6d84e0bbc262ea7069076b9e6" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Thu May 31 16:26:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 17:49:29 2012 -0700" }, "message": "fork: call complete_vfork_done() after clearing child_tid and flushing rss-counters\n\nChild should wake up the parent from vfork() only after finishing all\noperations with shared mm. There is no sense in using\nCLONE_CHILD_CLEARTID together with CLONE_VFORK, but it looks more accurate\nnow.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0d167518e045cc8bb63f0a8a0a85ad4fa4e0044f", "tree": "101a9b5d425d79f663e4f25f1e90b7a8cc6604f1", "parents": [ "2f83766d4b18774c856329a8fca4c9338dfeda39", "ff26eaadf4d914e397872b99885d45756104e9ae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 08:52:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 08:52:42 2012 -0700" }, "message": "Merge branch \u0027for-3.5/core\u0027 of git://git.kernel.dk/linux-block\n\nMerge block/IO core bits from Jens Axboe:\n \"This is a bit bigger on the core side than usual, but that is purely\n because we decided to hold off on parts of Tejun\u0027s submission on 3.4\n to give it a bit more time to simmer. As a consequence, it\u0027s seen a\n long cycle in for-next.\n\n It contains:\n\n - Bug fix from Dan, wrong locking type.\n - Relax splice gifting restriction from Eric.\n - A ton of updates from Tejun, primarily for blkcg. This improves\n the code a lot, making the API nicer and cleaner, and also includes\n fixes for how we handle and tie policies and re-activate on\n switches. The changes also include generic bug fixes.\n - A simple fix from Vivek, along with a fix for doing proper delayed\n allocation of the blkcg stats.\"\n\nFix up annoying conflict just due to different merge resolution in\nDocumentation/feature-removal-schedule.txt\n\n* \u0027for-3.5/core\u0027 of git://git.kernel.dk/linux-block: (92 commits)\n blkcg: tg_stats_alloc_lock is an irq lock\n vmsplice: relax alignement requirements for SPLICE_F_GIFT\n blkcg: use radix tree to index blkgs from blkcg\n blkcg: fix blkcg-\u003ecss ref leak in __blkg_lookup_create()\n block: fix elvpriv allocation failure handling\n block: collapse blk_alloc_request() into get_request()\n blkcg: collapse blkcg_policy_ops into blkcg_policy\n blkcg: embed struct blkg_policy_data in policy specific data\n blkcg: mass rename of blkcg API\n blkcg: style cleanups for blk-cgroup.h\n blkcg: remove blkio_group-\u003epath[]\n blkcg: blkg_rwstat_read() was missing inline\n blkcg: shoot down blkgs if all policies are deactivated\n blkcg: drop stuff unused after per-queue policy activation update\n blkcg: implement per-queue policy activation\n blkcg: add request_queue-\u003eroot_blkg\n blkcg: make request_queue bypassing on allocation\n blkcg: make sure blkg_lookup() returns %NULL if @q is bypassing\n blkcg: make blkg_conf_prep() take @pol and return with queue lock held\n blkcg: remove static policy ID enums\n ...\n" }, { "commit": "7edc8b0ac16cbaed7cb4ea4c6b95ce98d2997e84", "tree": "e333f72f3dc2c91385b8392bc31a44f5423d7f5c", "parents": [ "841e31e5cc6219d62054788faa289b6ed682d068" ], "author": { "name": "Siddhesh Poyarekar", "email": "siddhesh.poyarekar@gmail.com", "time": "Tue May 29 15:06:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:19 2012 -0700" }, "message": "mm/fork: fix overflow in vma length when copying mmap on clone\n\nThe vma length in dup_mmap is calculated and stored in a unsigned int,\nwhich is insufficient and hence overflows for very large maps (beyond\n16TB). The following program demonstrates this:\n\n#include \u003cstdio.h\u003e\n#include \u003cunistd.h\u003e\n#include \u003csys/mman.h\u003e\n\n#define GIG 1024 * 1024 * 1024L\n#define EXTENT 16393\n\nint main(void)\n{\n int i, r;\n void *m;\n char buf[1024];\n\n for (i \u003d 0; i \u003c EXTENT; i++) {\n m \u003d mmap(NULL, (size_t) 1 * 1024 * 1024 * 1024L,\n PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);\n\n if (m \u003d\u003d (void *)-1)\n printf(\"MMAP Failed: %d\\n\", m);\n else\n printf(\"%d : MMAP returned %p\\n\", i, m);\n\n r \u003d fork();\n\n if (r \u003d\u003d 0) {\n printf(\"%d: successed\\n\", i);\n return 0;\n } else if (r \u003c 0)\n printf(\"FORK Failed: %d\\n\", r);\n else if (r \u003e 0)\n wait(NULL);\n }\n return 0;\n}\n\nIncrease the storage size of the result to unsigned long, which is\nsufficient for storing the difference between addresses.\n\nSigned-off-by: Siddhesh Poyarekar \u003csiddhesh.poyarekar@gmail.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\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": "e709ffd6169ccd259eb5874e853303e91e94e829", "tree": "796b56c2507b8581492da73e354d651c9dd7076b", "parents": [ "edad9d2c337d43278a9d5aeb0ed531c2e838f8a6" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Tue May 29 15:06:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:19 2012 -0700" }, "message": "mm: remove swap token code\n\nThe swap token code no longer fits in with the current VM model. It\ndoes not play well with cgroups or the better NUMA placement code in\ndevelopment, since we have only one swap token globally.\n\nIt also has the potential to mess with scalability of the system, by\nincreasing the number of non-reclaimable pages on the active and\ninactive anon LRU lists.\n\nLast but not least, the swap token code has been broken for a year\nwithout complaints, as reported by Konstantin Khlebnikov. This suggests\nwe no longer have much use for it.\n\nThe days of sub-1G memory systems with heavy use of swap are over. If\nwe ever need thrashing reducing code in the future, we will have to\nimplement something that does scale.\n\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Bob Picco \u003cbpicco@meloft.net\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "654443e20dfc0617231f28a07c96a979ee1a0239", "tree": "a0dc3f093eb13892539082e663607c34b4fc2d07", "parents": [ "2c01e7bc46f10e9190818437e564f7e0db875ae9", "9cba26e66d09bf394ae5a739627a1dc8b7cae6f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:39:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:39:34 2012 -0700" }, "message": "Merge branch \u0027perf-uprobes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull user-space probe instrumentation from Ingo Molnar:\n \"The uprobes code originates from SystemTap and has been used for years\n in Fedora and RHEL kernels. This version is much rewritten, reviews\n from PeterZ, Oleg and myself shaped the end result.\n\n This tree includes uprobes support in \u0027perf probe\u0027 - but SystemTap\n (and other tools) can take advantage of user probe points as well.\n\n Sample usage of uprobes via perf, for example to profile malloc()\n calls without modifying user-space binaries.\n\n First boot a new kernel with CONFIG_UPROBE_EVENT\u003dy enabled.\n\n If you don\u0027t know which function you want to probe you can pick one\n from \u0027perf top\u0027 or can get a list all functions that can be probed\n within libc (binaries can be specified as well):\n\n\t$ perf probe -F -x /lib/libc.so.6\n\n To probe libc\u0027s malloc():\n\n\t$ perf probe -x /lib64/libc.so.6 malloc\n\tAdded new event:\n\tprobe_libc:malloc (on 0x7eac0)\n\n You can now use it in all perf tools, such as:\n\n\tperf record -e probe_libc:malloc -aR sleep 1\n\n Make use of it to create a call graph (as the flat profile is going to\n look very boring):\n\n\t$ perf record -e probe_libc:malloc -gR make\n\t[ perf record: Woken up 173 times to write data ]\n\t[ perf record: Captured and wrote 44.190 MB perf.data (~1930712\n\n\t$ perf report | less\n\n\t 32.03% git libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\n\t 29.49% cc1 libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t |--0.95%-- 0x208eb1000000000\n\t |\n\t |--0.63%-- htab_traverse_noresize\n\n\t 11.04% as libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\n\t 7.15% ld libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\n\t 5.07% sh libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t 4.99% python-config libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t 4.54% make libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t |--7.34%-- glob\n\t | |\n\t | |--93.18%-- 0x41588f\n\t | |\n\t | --6.82%-- glob\n\t | 0x41588f\n\n\t ...\n\n Or:\n\n\t$ perf report -g flat | less\n\n\t# Overhead Command Shared Object Symbol\n\t# ........ ............. ............. ..........\n\t#\n\t 32.03% git libc-2.15.so [.] malloc\n\t 27.19%\n\t malloc\n\n\t 29.49% cc1 libc-2.15.so [.] malloc\n\t 24.77%\n\t malloc\n\n\t 11.04% as libc-2.15.so [.] malloc\n\t 11.02%\n\t malloc\n\n\t 7.15% ld libc-2.15.so [.] malloc\n\t 6.57%\n\t malloc\n\n\t ...\n\n The core uprobes design is fairly straightforward: uprobes probe\n points register themselves at (inode:offset) addresses of\n libraries/binaries, after which all existing (or new) vmas that map\n that address will have a software breakpoint injected at that address.\n vmas are COW-ed to preserve original content. The probe points are\n kept in an rbtree.\n\n If user-space executes the probed inode:offset instruction address\n then an event is generated which can be recovered from the regular\n perf event channels and mmap-ed ring-buffer.\n\n Multiple probes at the same address are supported, they create a\n dynamic callback list of event consumers.\n\n The basic model is further complicated by the XOL speedup: the\n original instruction that is probed is copied (in an architecture\n specific fashion) and executed out of line when the probe triggers.\n The XOL area is a single vma per process, with a fixed number of\n entries (which limits probe execution parallelism).\n\n The API: uprobes are installed/removed via\n /sys/kernel/debug/tracing/uprobe_events, the API is integrated to\n align with the kprobes interface as much as possible, but is separate\n to it.\n\n Injecting a probe point is privileged operation, which can be relaxed\n by setting perf_paranoid to -1.\n\n You can use multiple probes as well and mix them with kprobes and\n regular PMU events or tracepoints, when instrumenting a task.\"\n\nFix up trivial conflicts in mm/memory.c due to previous cleanup of\nunmap_single_vma().\n\n* \u0027perf-uprobes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)\n perf probe: Detect probe target when m/x options are absent\n perf probe: Provide perf interface for uprobes\n tracing: Fix kconfig warning due to a typo\n tracing: Provide trace events interface for uprobes\n tracing: Extract out common code for kprobes/uprobes trace events\n tracing: Modify is_delete, is_return from int to bool\n uprobes/core: Decrement uprobe count before the pages are unmapped\n uprobes/core: Make background page replacement logic account for rss_stat counters\n uprobes/core: Optimize probe hits with the help of a counter\n uprobes/core: Allocate XOL slots for uprobes use\n uprobes/core: Handle breakpoint and singlestep exceptions\n uprobes/core: Rename bkpt to swbp\n uprobes/core: Make order of function parameters consistent across functions\n uprobes/core: Make macro names consistent\n uprobes: Update copyright notices\n uprobes/core: Move insn to arch specific structure\n uprobes/core: Remove uprobe_opcode_sz\n uprobes/core: Make instruction tables volatile\n uprobes: Move to kernel/events/\n uprobes/core: Clean up, refactor and improve the code\n ...\n" }, { "commit": "e73f8959af0439d114847eab5a8a5ce48f1217c4", "tree": "47f056093590a5e5552e3a75f163e1f798063bda", "parents": [ "62366c88b29c5a32e1531142092f98eaf49b1103" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri May 11 10:59:07 2012 +1000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 23 22:09:21 2012 -0400" }, "message": "task_work_add: generic process-context callbacks\n\nProvide a simple mechanism that allows running code in the (nonatomic)\ncontext of the arbitrary task.\n\nThe caller does task_work_add(task, task_work) and this task executes\ntask_work-\u003efunc() either from do_notify_resume() or from do_exit(). The\ncallback can rely on PF_EXITING to detect the latter case.\n\n\"struct task_work\" can be embedded in another struct, still it has \"void\n*data\" to handle the most common/simple case.\n\nThis allows us to kill the -\u003ereplacement_session_keyring hack, and\npotentially this can have more users.\n\nPerformance-wise, this adds 2 \"unlikely(!hlist_empty())\" checks into\ntracehook_notify_resume() and do_exit(). But at the same time we can\nremove the \"replacement_session_keyring !\u003d NULL\" checks from\narch/*/signal.c and exit_creds().\n\nNote: task_work_add/task_work_run abuses -\u003epi_lock. This is only because\nthis lock is already used by lookup_pi_state() to synchronize with\ndo_exit() setting PF_EXITING. Fortunately the scope of this lock in\ntask_work.c is really tiny, and the code is unlikely anyway.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Richard Kuo \u003crkuo@codeaurora.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Alexander Gordeev \u003cagordeev@redhat.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nCc: David Smith \u003cdsmith@redhat.com\u003e\nCc: \"Frank Ch. Eigler\" \u003cfche@redhat.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Larry Woodman \u003clwoodman@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ec0d7f18ab7b5097d7c0c8f3d909ca1031b9d5cd", "tree": "7d62c924592145f819ecaa5d60460a05a10dfdbd", "parents": [ "269af9a1a08d368b46d72e74126564d04c354f7e", "1dcc8d7ba235a316a056f993e88f0d18b92c60d9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 10:59:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 10:59:07 2012 -0700" }, "message": "Merge branch \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull fpu state cleanups from Ingo Molnar:\n \"This tree streamlines further aspects of FPU handling by eliminating\n the prepare_to_copy() complication and moving that logic to\n arch_dup_task_struct().\n\n It also fixes the FPU dumps in threaded core dumps, removes and old\n (and now invalid) assumption plus micro-optimizes the exit path by\n avoiding an FPU save for dead tasks.\"\n\nFixed up trivial add-add conflict in arch/sh/kernel/process.c that came\nin because we now do the FPU handling in arch_dup_task_struct() rather\nthan the legacy (and now gone) prepare_to_copy().\n\n* \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, fpu: drop the fpu state during thread exit\n x86, xsave: remove thread_has_fpu() bug check in __sanitize_i387_state()\n coredump: ensure the fpu state is flushed for proper multi-threaded core dump\n fork: move the real prepare_to_copy() users to arch_dup_task_struct()\n" }, { "commit": "cb60e3e65c1b96a4d6444a7a13dc7dd48bc15a2b", "tree": "4322be35db678f6299348a76ad60a2023954af7d", "parents": [ "99262a3dafa3290866512ddfb32609198f8973e9", "ff2bb047c4bce9742e94911eeb44b4d6ff4734ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:27:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:27:36 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates from James Morris:\n \"New notable features:\n - The seccomp work from Will Drewry\n - PR_{GET,SET}_NO_NEW_PRIVS from Andy Lutomirski\n - Longer security labels for Smack from Casey Schaufler\n - Additional ptrace restriction modes for Yama by Kees Cook\"\n\nFix up trivial context conflicts in arch/x86/Kconfig and include/linux/filter.h\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits)\n apparmor: fix long path failure due to disconnected path\n apparmor: fix profile lookup for unconfined\n ima: fix filename hint to reflect script interpreter name\n KEYS: Don\u0027t check for NULL key pointer in key_validate()\n Smack: allow for significantly longer Smack labels v4\n gfp flags for security_inode_alloc()?\n Smack: recursive tramsmute\n Yama: replace capable() with ns_capable()\n TOMOYO: Accept manager programs which do not start with / .\n KEYS: Add invalidation support\n KEYS: Do LRU discard in full keyrings\n KEYS: Permit in-place link replacement in keyring list\n KEYS: Perform RCU synchronisation on keys prior to key destruction\n KEYS: Announce key type (un)registration\n KEYS: Reorganise keys Makefile\n KEYS: Move the key config into security/keys/Kconfig\n KEYS: Use the compat keyctl() syscall wrapper on Sparc64 for Sparc32 compat\n Yama: remove an unused variable\n samples/seccomp: fix dependencies on arch macros\n Yama: add additional ptrace scopes\n ...\n" }, { "commit": "bf67f3a5c456a18f2e8d062f7e88506ef2cd9837", "tree": "2a2324b2572162059307db82f9238eeb25673a77", "parents": [ "226da0dbc84ed97f448523e2a4cb91c27fa68ed9", "203dacbdca977bedaba61ad2fca75d934060a5d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "message": "Merge branch \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull smp hotplug cleanups from Thomas Gleixner:\n \"This series is merily a cleanup of code copied around in arch/* and\n not changing any of the real cpu hotplug horrors yet. I wish I\u0027d had\n something more substantial for 3.5, but I underestimated the lurking\n horror...\"\n\nFix up trivial conflicts in arch/{arm,sparc,x86}/Kconfig and\narch/sparc/include/asm/thread_info_32.h\n\n* \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits)\n um: Remove leftover declaration of alloc_task_struct_node()\n task_allocator: Use config switches instead of magic defines\n sparc: Use common threadinfo allocator\n score: Use common threadinfo allocator\n sh-use-common-threadinfo-allocator\n mn10300: Use common threadinfo allocator\n powerpc: Use common threadinfo allocator\n mips: Use common threadinfo allocator\n hexagon: Use common threadinfo allocator\n m32r: Use common threadinfo allocator\n frv: Use common threadinfo allocator\n cris: Use common threadinfo allocator\n x86: Use common threadinfo allocator\n c6x: Use common threadinfo allocator\n fork: Provide kmemcache based thread_info allocator\n tile: Use common threadinfo allocator\n fork: Provide weak arch_release_[task_struct|thread_info] functions\n fork: Move thread info gfp flags to header\n fork: Remove the weak insanity\n sh: Remove cpu_idle_wait()\n ...\n" }, { "commit": "55ccf3fe3f9a3441731aa79cf42a628fc4ecace9", "tree": "fc1baa880f32e9da083998bda8aefc335846fd52", "parents": [ "36be50515fe2aef61533b516fa2576a2c7fe7664" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed May 16 15:03:51 2012 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Wed May 16 15:16:26 2012 -0700" }, "message": "fork: move the real prepare_to_copy() users to arch_dup_task_struct()\n\nHistorical prepare_to_copy() is mostly a no-op, duplicated for majority of\nthe architectures and the rest following the x86 model of flushing the extended\nregister state like fpu there.\n\nRemove it and use the arch_dup_task_struct() instead.\n\nSuggested-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSuggested-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nLink: http://lkml.kernel.org/r/1336692811-30576-1-git-send-email-suresh.b.siddha@intel.com\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Koichi Yasutake \u003cyasutake.koichi@jp.panasonic.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Mark Salter \u003cmsalter@redhat.com\u003e\nCc: Aurelien Jacquiot \u003ca-jacquiot@ti.com\u003e\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e\nCc: Richard Kuo \u003crkuo@codeaurora.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Jonas Bonn \u003cjonas@southpole.se\u003e\nCc: James E.J. Bottomley \u003cjejb@parisc-linux.org\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e\nCc: Lennox Wu \u003clennox.wu@gmail.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Richard Weinberger \u003crichard@nod.at\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "5e2bf0142231194d36fdc9596b36a261ed2b9fe7", "tree": "e5b411ddefaa96b29a73706f7fe407f238632573", "parents": [ "4998a6c0edce7fae9c0a5463f6ec3fa585258ee7" ], "author": { "name": "Mike Galbraith", "email": "efault@gmx.de", "time": "Thu May 10 13:01:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 10 15:06:44 2012 -0700" }, "message": "namespaces, pid_ns: fix leakage on fork() failure\n\nFork() failure post namespace creation for a child cloned with\nCLONE_NEWPID leaks pid_namespace/mnt_cache due to proc being mounted\nduring creation, but not unmounted during cleanup. Call\npid_ns_release_proc() during cleanup.\n\nSigned-off-by: Mike Galbraith \u003cefault@gmx.de\u003e\nAcked-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nReviewed-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: Louis Rilling \u003clouis.rilling@kerlabs.com\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": "f5e10287367dcffb5504d19c83e85ca041ca2596", "tree": "caa6684a16ed32809b328f858711758dc7b0c9bb", "parents": [ "66bb4cda55477efeb1be5c2cbd3785a69b088a8a" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 15:05:48 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 14:08:46 2012 +0200" }, "message": "task_allocator: Use config switches instead of magic defines\n\nReplace __HAVE_ARCH_TASK_ALLOCATOR and __HAVE_ARCH_THREAD_ALLOCATOR\nwith proper config switches.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nLink: http://lkml.kernel.org/r/20120505150142.371309416@linutronix.de\n" }, { "commit": "0d15d74a1ead10673b5b1db66d4c90552769096c", "tree": "d8eadc48f0aa1ec04172a66b2bcf78d3cb7a0ba1", "parents": [ "67ba5293f705eb1d1b98710e5ccb0f615936a6fc" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 15:05:41 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 14:08:44 2012 +0200" }, "message": "fork: Provide kmemcache based thread_info allocator\n\nSeveral architectures have their own kmemcache based thread allocator\nbecause THREAD_SIZE is smaller than PAGE_SIZE. Add it to the core code\nconditionally on THREAD_SIZE \u003c PAGE_SIZE so the private copies can go.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/20120505150141.491002124@linutronix.de\n" }, { "commit": "41101809a865dd0be1b56eff46c83fad321870b2", "tree": "be62c4da213f9ab79ac3f874f1ed8c6af0ff5b0a", "parents": [ "2889f60814e15dea644782597d897cdba943564f" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 15:05:41 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 13:55:20 2012 +0200" }, "message": "fork: Provide weak arch_release_[task_struct|thread_info] functions\n\nThese functions allow us to move most of the duplicated thread_info\nallocators to the core code.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/20120505150141.366461660@linutronix.de\n\n" }, { "commit": "2889f60814e15dea644782597d897cdba943564f", "tree": "0dab94d2c8136dc86241a7e85e5c881b03677c92", "parents": [ "6c0a9fa62feb7e9fdefa9720bcc03040c9b0b311" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 15:05:41 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 13:55:20 2012 +0200" }, "message": "fork: Move thread info gfp flags to header\n\nThese flags can be useful for extra allocations outside of the core\ncode.\n\nAdd __GFP_NOTRACK to them, so the archs which have kmemcheck do\nnot have to provide extra allocators just for that reason.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/20120505150141.428211694@linutronix.de\n" }, { "commit": "6c0a9fa62feb7e9fdefa9720bcc03040c9b0b311", "tree": "0c91586d2bfc7184ea2b13004147f3ef4753733d", "parents": [ "0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 15:05:40 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 13:55:20 2012 +0200" }, "message": "fork: Remove the weak insanity\n\nWe error out when compiling with gcc4.1.[01] as it miscompiles\n__weak. The workaround with magic defines is not longer\nnecessary. Make it __weak again.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/20120505150141.306358267@linutronix.de\n\n" }, { "commit": "6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e", "tree": "021cc9f6b477146fcebe6f3be4752abfa2ba18a9", "parents": [ "682968e0c425c60f0dde37977e5beb2b12ddc4cc", "a385ec4f11bdcf81af094c03e2444ee9b7fad2e5" ], "author": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Sat Apr 14 13:18:27 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Sat Apr 14 13:19:04 2012 +0200" }, "message": "Merge branch \u0027perf/core\u0027 into perf/uprobes\n\nMerge in latest upstream (and the latest perf development tree),\nto prepare for tooling changes, and also to pick up v3.4 MM\nchanges that the uprobes code needs to take care of.\n\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "e2cfabdfd075648216f99c2c03821cf3f47c1727", "tree": "d207e062d5b0bbd421aace9f7dfdc144aab4ed18", "parents": [ "b7456536cf9466b402b540c5588d79a4177c723a" ], "author": { "name": "Will Drewry", "email": "wad@chromium.org", "time": "Thu Apr 12 16:47:57 2012 -0500" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Sat Apr 14 11:13:20 2012 +1000" }, "message": "seccomp: add system call filtering using BPF\n\n[This patch depends on luto@mit.edu\u0027s no_new_privs patch:\n https://lkml.org/lkml/2012/1/30/264\n The whole series including Andrew\u0027s patches can be found here:\n https://github.com/redpig/linux/tree/seccomp\n Complete diff here:\n https://github.com/redpig/linux/compare/1dc65fed...seccomp\n]\n\nThis patch adds support for seccomp mode 2. Mode 2 introduces the\nability for unprivileged processes to install system call filtering\npolicy expressed in terms of a Berkeley Packet Filter (BPF) program.\nThis program will be evaluated in the kernel for each system call\nthe task makes and computes a result based on data in the format\nof struct seccomp_data.\n\nA filter program may be installed by calling:\n struct sock_fprog fprog \u003d { ... };\n ...\n prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, \u0026fprog);\n\nThe return value of the filter program determines if the system call is\nallowed to proceed or denied. If the first filter program installed\nallows prctl(2) calls, then the above call may be made repeatedly\nby a task to further reduce its access to the kernel. All attached\nprograms must be evaluated before a system call will be allowed to\nproceed.\n\nFilter programs will be inherited across fork/clone and execve.\nHowever, if the task attaching the filter is unprivileged\n(!CAP_SYS_ADMIN) the no_new_privs bit will be set on the task. This\nensures that unprivileged tasks cannot attach filters that affect\nprivileged tasks (e.g., setuid binary).\n\nThere are a number of benefits to this approach. A few of which are\nas follows:\n- BPF has been exposed to userland for a long time\n- BPF optimization (and JIT\u0027ing) are well understood\n- Userland already knows its ABI: system call numbers and desired\n arguments\n- No time-of-check-time-of-use vulnerable data accesses are possible.\n- system call arguments are loaded on access only to minimize copying\n required for system call policy decisions.\n\nMode 2 support is restricted to architectures that enable\nHAVE_ARCH_SECCOMP_FILTER. In this patch, the primary dependency is on\nsyscall_get_arguments(). The full desired scope of this feature will\nadd a few minor additional requirements expressed later in this series.\nBased on discussion, SECCOMP_RET_ERRNO and SECCOMP_RET_TRACE seem to be\nthe desired additional functionality.\n\nNo architectures are enabled in this patch.\n\nSigned-off-by: Will Drewry \u003cwad@chromium.org\u003e\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nReviewed-by: Indan Zupancic \u003cindan@nul.nu\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\nReviewed-by: Kees Cook \u003ckeescook@chromium.org\u003e\n\nv18: - rebase to v3.4-rc2\n - s/chk/check/ (akpm@linux-foundation.org,jmorris@namei.org)\n - allocate with GFP_KERNEL|__GFP_NOWARN (indan@nul.nu)\n - add a comment for get_u32 regarding endianness (akpm@)\n - fix other typos, style mistakes (akpm@)\n - added acked-by\nv17: - properly guard seccomp filter needed headers (leann@ubuntu.com)\n - tighten return mask to 0x7fff0000\nv16: - no change\nv15: - add a 4 instr penalty when counting a path to account for seccomp_filter\n size (indan@nul.nu)\n - drop the max insns to 256KB (indan@nul.nu)\n - return ENOMEM if the max insns limit has been hit (indan@nul.nu)\n - move IP checks after args (indan@nul.nu)\n - drop !user_filter check (indan@nul.nu)\n - only allow explicit bpf codes (indan@nul.nu)\n - exit_code -\u003e exit_sig\nv14: - put/get_seccomp_filter takes struct task_struct\n (indan@nul.nu,keescook@chromium.org)\n - adds seccomp_chk_filter and drops general bpf_run/chk_filter user\n - add seccomp_bpf_load for use by net/core/filter.c\n - lower max per-process/per-hierarchy: 1MB\n - moved nnp/capability check prior to allocation\n (all of the above: indan@nul.nu)\nv13: - rebase on to 88ebdda6159ffc15699f204c33feb3e431bf9bdc\nv12: - added a maximum instruction count per path (indan@nul.nu,oleg@redhat.com)\n - removed copy_seccomp (keescook@chromium.org,indan@nul.nu)\n - reworded the prctl_set_seccomp comment (indan@nul.nu)\nv11: - reorder struct seccomp_data to allow future args expansion (hpa@zytor.com)\n - style clean up, @compat dropped, compat_sock_fprog32 (indan@nul.nu)\n - do_exit(SIGSYS) (keescook@chromium.org, luto@mit.edu)\n - pare down Kconfig doc reference.\n - extra comment clean up\nv10: - seccomp_data has changed again to be more aesthetically pleasing\n (hpa@zytor.com)\n - calling convention is noted in a new u32 field using syscall_get_arch.\n This allows for cross-calling convention tasks to use seccomp filters.\n (hpa@zytor.com)\n - lots of clean up (thanks, Indan!)\n v9: - n/a\n v8: - use bpf_chk_filter, bpf_run_filter. update load_fns\n - Lots of fixes courtesy of indan@nul.nu:\n -- fix up load behavior, compat fixups, and merge alloc code,\n -- renamed pc and dropped __packed, use bool compat.\n -- Added a hidden CONFIG_SECCOMP_FILTER to synthesize non-arch\n dependencies\n v7: (massive overhaul thanks to Indan, others)\n - added CONFIG_HAVE_ARCH_SECCOMP_FILTER\n - merged into seccomp.c\n - minimal seccomp_filter.h\n - no config option (part of seccomp)\n - no new prctl\n - doesn\u0027t break seccomp on systems without asm/syscall.h\n (works but arg access always fails)\n - dropped seccomp_init_task, extra free functions, ...\n - dropped the no-asm/syscall.h code paths\n - merges with network sk_run_filter and sk_chk_filter\n v6: - fix memory leak on attach compat check failure\n - require no_new_privs || CAP_SYS_ADMIN prior to filter\n installation. (luto@mit.edu)\n - s/seccomp_struct_/seccomp_/ for macros/functions (amwang@redhat.com)\n - cleaned up Kconfig (amwang@redhat.com)\n - on block, note if the call was compat (so the # means something)\n v5: - uses syscall_get_arguments\n (indan@nul.nu,oleg@redhat.com, mcgrathr@chromium.org)\n - uses union-based arg storage with hi/lo struct to\n handle endianness. Compromises between the two alternate\n proposals to minimize extra arg shuffling and account for\n endianness assuming userspace uses offsetof().\n (mcgrathr@chromium.org, indan@nul.nu)\n - update Kconfig description\n - add include/seccomp_filter.h and add its installation\n - (naive) on-demand syscall argument loading\n - drop seccomp_t (eparis@redhat.com)\n v4: - adjusted prctl to make room for PR_[SG]ET_NO_NEW_PRIVS\n - now uses current-\u003eno_new_privs\n (luto@mit.edu,torvalds@linux-foundation.com)\n - assign names to seccomp modes (rdunlap@xenotime.net)\n - fix style issues (rdunlap@xenotime.net)\n - reworded Kconfig entry (rdunlap@xenotime.net)\n v3: - macros to inline (oleg@redhat.com)\n - init_task behavior fixed (oleg@redhat.com)\n - drop creator entry and extra NULL check (oleg@redhat.com)\n - alloc returns -EINVAL on bad sizing (serge.hallyn@canonical.com)\n - adds tentative use of \"always_unprivileged\" as per\n torvalds@linux-foundation.org and luto@mit.edu\n v2: - (patch 2 only)\nSigned-off-by: James Morris \u003cjames.l.morris@oracle.com\u003e\n" }, { "commit": "959d851caa48829eb85cb85aa949fd6b4c5d5bc6", "tree": "3ba9c94ec346275fb44c4f0d1cd2537cdff8d811", "parents": [ "a5567932fc926739e29e98487128080f40c61710", "48ddbe194623ae089cc0576e60363f2d2e85662a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 12:30:01 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 12:55:00 2012 -0700" }, "message": "Merge branch \u0027for-3.5\u0027 of ../cgroup into block/for-3.5/core-merged\n\ncgroup/for-3.5 contains the following changes which blk-cgroup needs\nto proceed with the on-going cleanup.\n\n* Dynamic addition and removal of cftypes to make config/stat file\n handling modular for policies.\n\n* cgroup removal update to not wait for css references to drain to fix\n blkcg removal hang caused by cfq caching cfqgs.\n\nPull in cgroup/for-3.5 into block/for-3.5/core. This causes the\nfollowing conflicts in block/blk-cgroup.c.\n\n* 761b3ef50e \"cgroup: remove cgroup_subsys argument from callbacks\"\n conflicts with blkiocg_pre_destroy() addition and blkiocg_attach()\n removal. Resolved by removing @subsys from all subsys methods.\n\n* 676f7c8f84 \"cgroup: relocate cftype and cgroup_subsys definitions in\n controllers\" conflicts with -\u003epre_destroy() and -\u003eattach() updates\n and removal of modular config. Resolved by dropping forward\n declarations of the methods and applying updates to the relocated\n blkio_subsys.\n\n* 4baf6e3325 \"cgroup: convert all non-memcg controllers to the new\n cftype interface\" builds upon the previous item. Resolved by adding\n -\u003ebase_cftypes to the relocated blkio_subsys.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "682968e0c425c60f0dde37977e5beb2b12ddc4cc", "tree": "875eb289aa0e08189b2cf7dc99ee522f91e647e7", "parents": [ "d4b3b6384f98f8692ad0209891ccdbc7e78bbefe" ], "author": { "name": "Srikar Dronamraju", "email": "srikar@linux.vnet.ibm.com", "time": "Fri Mar 30 23:56:46 2012 +0530" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Sat Mar 31 11:50:02 2012 +0200" }, "message": "uprobes/core: Optimize probe hits with the help of a counter\n\nMaintain a per-mm counter: number of uprobes that are inserted\non this process address space.\n\nThis counter can be used at probe hit time to determine if we\nneed a lookup in the uprobes rbtree. Everytime a probe gets\ninserted successfully, the probe count is incremented and\neverytime a probe gets removed, the probe count is decremented.\n\nThe new uprobe_munmap hook ensures the count is correct on a\nunmap or remap of a region. We expect that once a\nuprobe_munmap() is called, the vma goes away. So\nuprobe_unregister() finding a probe to unregister would either\nmean unmap event hasnt occurred yet or a mmap event on the same\nexecutable file occured after a unmap event.\n\nAdditionally, uprobe_mmap hook now also gets called:\n\n a. on every executable vma that is COWed at fork.\n b. a vma of interest is newly mapped; breakpoint insertion also\n happens at the required address.\n\nOn process creation, make sure the probes count in the child is\nset correctly.\n\nSpecial cases that are taken care include:\n\n a. mremap\n b. VM_DONTCOPY vmas on fork()\n c. insertion/removal races in the parent during fork().\n\nSigned-off-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: Jim Keniston \u003cjkenisto@linux.vnet.ibm.com\u003e\nCc: Linux-mm \u003clinux-mm@kvack.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@infradead.org\u003e\nCc: Masami Hiramatsu \u003cmasami.hiramatsu.pt@hitachi.com\u003e\nCc: Anton Arapov \u003canton@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nLink: http://lkml.kernel.org/r/20120330182646.10018.85805.sendpatchset@srdronam.in.ibm.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "d4b3b6384f98f8692ad0209891ccdbc7e78bbefe", "tree": "29c703af306a3b0e42d7ee3bdfce58db78d702b7", "parents": [ "0326f5a94ddea33fa331b2519f4172f4fb387baa" ], "author": { "name": "Srikar Dronamraju", "email": "srikar@linux.vnet.ibm.com", "time": "Fri Mar 30 23:56:31 2012 +0530" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Sat Mar 31 11:50:01 2012 +0200" }, "message": "uprobes/core: Allocate XOL slots for uprobes use\n\nUprobes executes the original instruction at a probed location\nout of line. For this, we allocate a page (per mm) upon the\nfirst uprobe hit, in the process user address space, divide it\ninto slots that are used to store the actual instructions to be\nsinglestepped. These slots are known as xol (execution out of\nline) slots.\n\nCare is taken to ensure that the allocation is in an unmapped\narea as close to the top of the user address space as possible,\nwith appropriate permission settings to keep selinux like\nframeworks happy.\n\nUpon a uprobe hit, a free slot is acquired, and is released\nafter the singlestep completes.\n\nLots of improvements courtesy suggestions/inputs from Peter and\nOleg.\n\n[ Folded a fix for build issue on powerpc fixed and reported by\n Stephen Rothwell. ]\n\nSigned-off-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: Jim Keniston \u003cjkenisto@linux.vnet.ibm.com\u003e\nCc: Linux-mm \u003clinux-mm@kvack.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@infradead.org\u003e\nCc: Masami Hiramatsu \u003cmasami.hiramatsu.pt@hitachi.com\u003e\nCc: Anton Arapov \u003canton@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nLink: http://lkml.kernel.org/r/20120330182631.10018.48175.sendpatchset@srdronam.in.ibm.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "ebec18a6d3aa1e7d84aab16225e87fd25170ec2b", "tree": "fd329dcd5173c252fc7aed64cab9c2a51575dcec", "parents": [ "953326cb60c1dff1bd3458d6468d16d75f2bcd61" ], "author": { "name": "Lennart Poettering", "email": "lennart@poettering.net", "time": "Fri Mar 23 15:01:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:32 2012 -0700" }, "message": "prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision\n\nUserspace service managers/supervisors need to track their started\nservices. Many services daemonize by double-forking and get implicitly\nre-parented to PID 1. The service manager will no longer be able to\nreceive the SIGCHLD signals for them, and is no longer in charge of\nreaping the children with wait(). All information about the children is\nlost at the moment PID 1 cleans up the re-parented processes.\n\nWith this prctl, a service manager process can mark itself as a sort of\n\u0027sub-init\u0027, able to stay as the parent for all orphaned processes\ncreated by the started services. All SIGCHLD signals will be delivered\nto the service manager.\n\nReceiving SIGCHLD and doing wait() is in cases of a service-manager much\npreferred over any possible asynchronous notification about specific\nPIDs, because the service manager has full access to the child process\ndata in /proc and the PID can not be re-used until the wait(), the\nservice-manager itself is in charge of, has happened.\n\nAs a side effect, the relevant parent PID information does not get lost\nby a double-fork, which results in a more elaborate process tree and\n\u0027ps\u0027 output:\n\nbefore:\n # ps afx\n 253 ? Ss 0:00 /bin/dbus-daemon --system --nofork\n 294 ? Sl 0:00 /usr/libexec/polkit-1/polkitd\n 328 ? S 0:00 /usr/sbin/modem-manager\n 608 ? Sl 0:00 /usr/libexec/colord\n 658 ? Sl 0:00 /usr/libexec/upowerd\n 819 ? Sl 0:00 /usr/libexec/imsettings-daemon\n 916 ? Sl 0:00 /usr/libexec/udisks-daemon\n 917 ? S 0:00 \\_ udisks-daemon: not polling any devices\n\nafter:\n # ps afx\n 294 ? Ss 0:00 /bin/dbus-daemon --system --nofork\n 426 ? Sl 0:00 \\_ /usr/libexec/polkit-1/polkitd\n 449 ? S 0:00 \\_ /usr/sbin/modem-manager\n 635 ? Sl 0:00 \\_ /usr/libexec/colord\n 705 ? Sl 0:00 \\_ /usr/libexec/upowerd\n 959 ? Sl 0:00 \\_ /usr/libexec/udisks-daemon\n 960 ? S 0:00 | \\_ udisks-daemon: not polling any devices\n 977 ? Sl 0:00 \\_ /usr/libexec/packagekitd\n\nThis prctl is orthogonal to PID namespaces. PID namespaces are isolated\nfrom each other, while a service management process usually requires the\nservices to live in the same namespace, to be able to talk to each\nother.\n\nUsers of this will be the systemd per-user instance, which provides\ninit-like functionality for the user\u0027s login session and D-Bus, which\nactivates bus services on-demand. Both need init-like capabilities to\nbe able to properly keep track of the services they start.\n\nMany thanks to Oleg for several rounds of review and insights.\n\n[akpm@linux-foundation.org: fix comment layout and spelling]\n[akpm@linux-foundation.org: add lengthy code comment from Oleg]\nReviewed-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Lennart Poettering \u003clennart@poettering.net\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nAcked-by: Valdis Kletnieks \u003cValdis.Kletnieks@vt.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "95211279c5ad00a317c98221d7e4365e02f20836", "tree": "2ddc8625378d2915b8c96392f3cf6663b705ed55", "parents": [ "5375871d432ae9fc581014ac117b96aaee3cd0c7", "12724850e8064f64b6223d26d78c0597c742c65a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:04:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:04:48 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge first batch of patches from Andrew Morton:\n \"A few misc things and all the MM queue\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (92 commits)\n memcg: avoid THP split in task migration\n thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE\n memcg: clean up existing move charge code\n mm/memcontrol.c: remove unnecessary \u0027break\u0027 in mem_cgroup_read()\n mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event()\n mm/memcontrol.c: s/stealed/stolen/\n memcg: fix performance of mem_cgroup_begin_update_page_stat()\n memcg: remove PCG_FILE_MAPPED\n memcg: use new logic for page stat accounting\n memcg: remove PCG_MOVE_LOCK flag from page_cgroup\n memcg: simplify move_account() check\n memcg: remove EXPORT_SYMBOL(mem_cgroup_update_page_stat)\n memcg: kill dead prev_priority stubs\n memcg: remove PCG_CACHE page_cgroup flag\n memcg: let css_get_next() rely upon rcu_read_lock()\n cgroup: revert ss_id_lock to spinlock\n idr: make idr_get_next() good for rcu_read_lock()\n memcg: remove unnecessary thp check in page stat accounting\n memcg: remove redundant returns\n memcg: enum lru_list lru\n ...\n" }, { "commit": "cc9a6c8776615f9c194ccf0b63a0aa5628235545", "tree": "0cbbf118e86541f8eb2fc7b717a0e08eaced986d", "parents": [ "e845e199362cc5712ba0e7eedc14eed70e144258" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Wed Mar 21 16:34:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "cpuset: mm: reduce large amounts of memory barrier related damage v3\n\nCommit c0ff7453bb5c (\"cpuset,mm: fix no node to alloc memory when\nchanging cpuset\u0027s mems\") wins a super prize for the largest number of\nmemory barriers entered into fast paths for one commit.\n\n[get|put]_mems_allowed is incredibly heavy with pairs of full memory\nbarriers inserted into a number of hot paths. This was detected while\ninvestigating at large page allocator slowdown introduced some time\nafter 2.6.32. The largest portion of this overhead was shown by\noprofile to be at an mfence introduced by this commit into the page\nallocator hot path.\n\nFor extra style points, the commit introduced the use of yield() in an\nimplementation of what looks like a spinning mutex.\n\nThis patch replaces the full memory barriers on both read and write\nsides with a sequence counter with just read barriers on the fast path\nside. This is much cheaper on some architectures, including x86. The\nmain bulk of the patch is the retry logic if the nodemask changes in a\nmanner that can cause a false failure.\n\nWhile updating the nodemask, a check is made to see if a false failure\nis a risk. If it is, the sequence number gets bumped and parallel\nallocators will briefly stall while the nodemask update takes place.\n\nIn a page fault test microbenchmark, oprofile samples from\n__alloc_pages_nodemask went from 4.53% of all samples to 1.15%. The\nactual results were\n\n 3.3.0-rc3 3.3.0-rc3\n rc3-vanilla nobarrier-v2r1\n Clients 1 UserTime 0.07 ( 0.00%) 0.08 (-14.19%)\n Clients 2 UserTime 0.07 ( 0.00%) 0.07 ( 2.72%)\n Clients 4 UserTime 0.08 ( 0.00%) 0.07 ( 3.29%)\n Clients 1 SysTime 0.70 ( 0.00%) 0.65 ( 6.65%)\n Clients 2 SysTime 0.85 ( 0.00%) 0.82 ( 3.65%)\n Clients 4 SysTime 1.41 ( 0.00%) 1.41 ( 0.32%)\n Clients 1 WallTime 0.77 ( 0.00%) 0.74 ( 4.19%)\n Clients 2 WallTime 0.47 ( 0.00%) 0.45 ( 3.73%)\n Clients 4 WallTime 0.38 ( 0.00%) 0.37 ( 1.58%)\n Clients 1 Flt/sec/cpu 497620.28 ( 0.00%) 520294.53 ( 4.56%)\n Clients 2 Flt/sec/cpu 414639.05 ( 0.00%) 429882.01 ( 3.68%)\n Clients 4 Flt/sec/cpu 257959.16 ( 0.00%) 258761.48 ( 0.31%)\n Clients 1 Flt/sec 495161.39 ( 0.00%) 517292.87 ( 4.47%)\n Clients 2 Flt/sec 820325.95 ( 0.00%) 850289.77 ( 3.65%)\n Clients 4 Flt/sec 1020068.93 ( 0.00%) 1022674.06 ( 0.26%)\n MMTests Statistics: duration\n Sys Time Running Test (seconds) 135.68 132.17\n User+Sys Time Running Test (seconds) 164.2 160.13\n Total Elapsed Time (seconds) 123.46 120.87\n\nThe overall improvement is small but the System CPU time is much\nimproved and roughly in correlation to what oprofile reported (these\nperformance figures are without profiling so skew is expected). The\nactual number of page faults is noticeably improved.\n\nFor benchmarks like kernel builds, the overall benefit is marginal but\nthe system CPU time is slightly reduced.\n\nTo test the actual bug the commit fixed I opened two terminals. The\nfirst ran within a cpuset and continually ran a small program that\nfaulted 100M of anonymous data. In a second window, the nodemask of the\ncpuset was continually randomised in a loop.\n\nWithout the commit, the program would fail every so often (usually\nwithin 10 seconds) and obviously with the commit everything worked fine.\nWith this patch applied, it also worked fine so the fix should be\nfunctionally equivalent.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c3f0327f8e9d7a503f0d64573c311eddd61f197d", "tree": "ebc59003d3bef08dd41d073eced2b53970e13662", "parents": [ "dc3f21eadeea6d9898271ff32d35d5e00c6872ea" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Wed Mar 21 16:33:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:55 2012 -0700" }, "message": "mm: add rss counters consistency check\n\nWarn about non-zero rss counters at final mmdrop.\n\nThis check will prevent reoccurences of bugs such as that fixed in \"mm:\nfix rss count leakage during migration\".\n\nI didn\u0027t hide this check under CONFIG_VM_DEBUG because it rather small and\nrss counters cover whole page-table management, so this is a good\ninvariant.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3556485f1595e3964ba539e39ea682acbb835cee", "tree": "7f5ee254f425b1427ac0059b5f347a307f8538a1", "parents": [ "b8716614a7cc2fc15ea2a518edd04755fb08d922", "09f61cdbb32a9d812c618d3922db533542736bb0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates for 3.4 from James Morris:\n \"The main addition here is the new Yama security module from Kees Cook,\n which was discussed at the Linux Security Summit last year. Its\n purpose is to collect miscellaneous DAC security enhancements in one\n place. This also marks a departure in policy for LSM modules, which\n were previously limited to being standalone access control systems.\n Chromium OS is using Yama, and I believe there are plans for Ubuntu,\n at least.\n\n This patchset also includes maintenance updates for AppArmor, TOMOYO\n and others.\"\n\nFix trivial conflict in \u003cnet/sock.h\u003e due to the jumo_label-\u003estatic_key\nrename.\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits)\n AppArmor: Fix location of const qualifier on generated string tables\n TOMOYO: Return error if fails to delete a domain\n AppArmor: add const qualifiers to string arrays\n AppArmor: Add ability to load extended policy\n TOMOYO: Return appropriate value to poll().\n AppArmor: Move path failure information into aa_get_name and rename\n AppArmor: Update dfa matching routines.\n AppArmor: Minor cleanup of d_namespace_path to consolidate error handling\n AppArmor: Retrieve the dentry_path for error reporting when path lookup fails\n AppArmor: Add const qualifiers to generated string tables\n AppArmor: Fix oops in policy unpack auditing\n AppArmor: Fix error returned when a path lookup is disconnected\n KEYS: testing wrong bit for KEY_FLAG_REVOKED\n TOMOYO: Fix mount flags checking order.\n security: fix ima kconfig warning\n AppArmor: Fix the error case for chroot relative path name lookup\n AppArmor: fix mapping of META_READ to audit and quiet flags\n AppArmor: Fix underflow in xindex calculation\n AppArmor: Fix dropping of allowed operations that are force audited\n AppArmor: Add mising end of structure test to caps unpacking\n ...\n" }, { "commit": "5f8aadd8b9966d71a77bba52b9d499cc2f38269f", "tree": "229735d79edf0c4cc82ac00ba1abaee63040ff6e", "parents": [ "ed378a52dabf77b406b447fd3238f83ea24b71fa" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Mar 14 19:55:38 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 14:16:50 2012 -0700" }, "message": "CLONE_PARENT shouldn\u0027t allow to set -\u003eexit_signal\n\nThe child must not control its -\u003eexit_signal, it is the parent who\ndecides which signal the child should use for notification.\n\nThis means that CLONE_PARENT should not use \"clone_flags \u0026 CSIGNAL\",\nthe forking task is the sibling of the new process and their parent\ndoesn\u0027t control exit_signal in this case.\n\nThis patch uses -\u003eexit_signal of the forking process, but perhaps\nwe should simply use SIGCHLD.\n\nWe read group_leader-\u003eexit_signal lockless, this can race with the\nORIGINAL_SIGNAL -\u003e SIGCHLD transition, but this is fine.\n\nPotentially this change allows to kill self_exec_id/parent_exec_id.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0326f5a94ddea33fa331b2519f4172f4fb387baa", "tree": "5485c637754a126c90852e5285842e8462d2826a", "parents": [ "ef15eda98217f5183f457e7a2de8b79555ef908b" ], "author": { "name": "Srikar Dronamraju", "email": "srikar@linux.vnet.ibm.com", "time": "Tue Mar 13 23:30:11 2012 +0530" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Mar 14 07:41:36 2012 +0100" }, "message": "uprobes/core: Handle breakpoint and singlestep exceptions\n\nUprobes uses exception notifiers to get to know if a thread hit\na breakpoint or a singlestep exception.\n\nWhen a thread hits a uprobe or is singlestepping post a uprobe\nhit, the uprobe exception notifier sets its TIF_UPROBE bit,\nwhich will then be checked on its return to userspace path\n(do_notify_resume() -\u003euprobe_notify_resume()), where the\nconsumers handlers are run (in task context) based on the\ndefined filters.\n\nUprobe hits are thread specific and hence we need to maintain\ninformation about if a task hit a uprobe, what uprobe was hit,\nthe slot where the original instruction was copied for xol so\nthat it can be singlestepped with appropriate fixups.\n\nIn some cases, special care is needed for instructions that are\nexecuted out of line (xol). These are architecture specific\nartefacts, such as handling RIP relative instructions on x86_64.\n\nSince the instruction at which the uprobe was inserted is\nexecuted out of line, architecture specific fixups are added so\nthat the thread continues normal execution in the presence of a\nuprobe.\n\nPostpone the signals until we execute the probed insn.\npost_xol() path does a recalc_sigpending() before return to\nuser-mode, this ensures the signal can\u0027t be lost.\n\nUprobes relies on DIE_DEBUG notification to notify if a\nsinglestep is complete.\n\nAdds x86 specific uprobe exception notifiers and appropriate\nhooks needed to determine a uprobe hit and subsequent post\nprocessing.\n\nAdd requisite x86 fixups for xol for uprobes. Specific cases\nneeding fixups include relative jumps (x86_64), calls, etc.\n\nWhere possible, we check and skip singlestepping the\nbreakpointed instructions. For now we skip single byte as well\nas few multibyte nop instructions. However this can be extended\nto other instructions too.\n\nCredits to Oleg Nesterov for suggestions/patches related to\nsignal, breakpoint, singlestep handling code.\n\nSigned-off-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: Jim Keniston \u003cjkenisto@linux.vnet.ibm.com\u003e\nCc: Linux-mm \u003clinux-mm@kvack.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@infradead.org\u003e\nCc: Masami Hiramatsu \u003cmasami.hiramatsu.pt@hitachi.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nLink: http://lkml.kernel.org/r/20120313180011.29771.89027.sendpatchset@srdronam.in.ibm.com\n[ Performed various cleanliness edits ]\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3d48749d93a3dce732dd30a14002ab90ec4355f3", "tree": "50ce414ec87e590493476cf644092439c5f337fd", "parents": [ "24acfc34fba0b4f62ef9d5c2616eb0faa802b606" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:25 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:24 2012 +0100" }, "message": "block: ioc_task_link() can\u0027t fail\n\nioc_task_link() is used to share %current\u0027s ioc on clone. If\n%current-\u003eio_context is set, %current is guaranteed to have refcount\non the ioc and, thus, ioc_task_link() can\u0027t fail.\n\nReplace error checking in ioc_task_link() with WARN_ON_ONCE() and make\nit just increment refcount and nr_tasks.\n\n-v2: Description typo fix (Vivek).\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "6e27f63edbd7ab893258e16500171dd1270a1369", "tree": "9c61b7c0dda37052e2285e90f914f8af5ed86f67", "parents": [ "57b59c4a1400fa6c34764eab2e35a8762dc05a09" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Mar 05 14:59:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 05 15:49:42 2012 -0800" }, "message": "vfork: kill PF_STARTING\n\nPreviously it was (ab)used by utrace. Then it was wrongly used by the\nscheduler code.\n\nCurrently it is not used, kill it before it finds the new erroneous user.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@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": "57b59c4a1400fa6c34764eab2e35a8762dc05a09", "tree": "e50e6a6f9f7fcd897856e5cdaca3d3caa18377d6", "parents": [ "d68b46fe16ad59b3a5f51ec73daaa5dc06753798" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Mar 05 14:59:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 05 15:49:42 2012 -0800" }, "message": "coredump_wait: don\u0027t call complete_vfork_done()\n\nNow that CLONE_VFORK is killable, coredump_wait() no longer needs\ncomplete_vfork_done(). zap_threads() should find and kill all tasks with\nthe same -\u003emm, this includes our parent if -\u003evfork_done is set.\n\nmm_release() becomes the only caller, unexport complete_vfork_done().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@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": "d68b46fe16ad59b3a5f51ec73daaa5dc06753798", "tree": "4bae9ddc5f5bed853d1f0936d05c30e4f7ca924d", "parents": [ "c415c3b47ea2754659d915cca387a20999044163" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Mar 05 14:59:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 05 15:49:42 2012 -0800" }, "message": "vfork: make it killable\n\nMake vfork() killable.\n\nChange do_fork(CLONE_VFORK) to do wait_for_completion_killable(). If it\nfails we do not return to the user-mode and never touch the memory shared\nwith our child.\n\nHowever, in this case we should clear child-\u003evfork_done before return, we\nuse task_lock() in do_fork()-\u003ewait_for_vfork_done() and\ncomplete_vfork_done() to serialize with each other.\n\nNote: now that we use task_lock() we don\u0027t really need completion, we\ncould turn task-\u003evfork_done into \"task_struct *wake_up_me\" but this needs\nsome complications.\n\nNOTE: this and the next patches do not affect in-kernel users of\nCLONE_VFORK, kernel threads run with all signals ignored including\nSIGKILL/SIGSTOP.\n\nHowever this is obviously the user-visible change. Not only a fatal\nsignal can kill the vforking parent, a sub-thread can do execve or\nexit_group() and kill the thread sleeping in vfork().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@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": "c415c3b47ea2754659d915cca387a20999044163", "tree": "c2cb1134f139702e06ade8aecbeff70be7ea727c", "parents": [ "880641bb9da2473e9ecf6c708d993b29928c1b3c" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Mar 05 14:59:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 05 15:49:42 2012 -0800" }, "message": "vfork: introduce complete_vfork_done()\n\nNo functional changes.\n\nMove the clear-and-complete-vfork_done code into the new trivial helper,\ncomplete_vfork_done().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@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": "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": "191c542442fdf53cc3c496c00be13367fd9cd42d", "tree": "4aef9e33a1d99e6530b704243efbe373bb314d61", "parents": [ "bbd36568594d091e682a1975ef4ee41d808de0bc" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Feb 13 03:58:52 2012 +0000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Feb 14 10:45:39 2012 +1100" }, "message": "mm: collapse security_vm_enough_memory() variants into a single function\n\nCollapse security_vm_enough_memory() variants into a single function.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "3ec1e88b33a3bdd852ce8e014052acec7a9da8b5", "tree": "4270f8f0de4e28f090cba6d6e4047aae939d6463", "parents": [ "8df54d622a120058ee8bec38743c9b8f091c8e58", "d8c66c5d59247e25a69428aced0b79d33b9c66d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 11 10:07:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 11 10:07:11 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\nSays Jens:\n\n \"Time to push off some of the pending items. I really wanted to wait\n until we had the regression nailed, but alas it\u0027s not quite there yet.\n But I\u0027m very confident that it\u0027s \"just\" a missing expire on exit, so\n fix from Tejun should be fairly trivial. I\u0027m headed out for a week on\n the slopes.\n\n - Killing the barrier part of mtip32xx. It doesn\u0027t really support\n barriers, and it doesn\u0027t need them (writes are fully ordered).\n\n - A few fixes from Dan Carpenter, preventing overflows of integer\n multiplication.\n\n - A fixup for loop, fixing a previous commit that didn\u0027t quite solve\n the partial read problem from Dave Young.\n\n - A bio integer overflow fix from Kent Overstreet.\n\n - Improvement/fix of the door \"keep locked\" part of the cdrom shared\n code from Paolo Benzini.\n\n - A few cfq fixes from Shaohua Li.\n\n - A fix for bsg sysfs warning when removing a file it did not create\n from Stanislaw Gruszka.\n\n - Two fixes for floppy from Vivek, preventing a crash.\n\n - A few block core fixes from Tejun. One killing the over-optimized\n ioc exit path, cleaning that up nicely. Two others fixing an oops\n on elevator switch, due to calling into the scheduler merge check\n code without holding the queue lock.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: fix lockdep warning on io_context release put_io_context()\n relay: prevent integer overflow in relay_open()\n loop: zero fill bio instead of return -EIO for partial read\n bio: don\u0027t overflow in bio_get_nr_vecs()\n floppy: Fix a crash during rmmod\n floppy: Cleanup disk-\u003equeue before caling put_disk() if add_disk() was never called\n cdrom: move shared static to cdrom_device_info\n bsg: fix sysfs link remove warning\n block: don\u0027t call elevator callbacks for plug merges\n block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions\n mtip32xx: removed the irrelevant argument of mtip_hw_submit_io() and the unused member of struct driver_data\n block: strip out locking optimization in put_io_context()\n cdrom: use copy_to_user() without the underscores\n block: fix ioc locking warning\n block: fix NULL icq_cache reference\n block,cfq: change code order\n" }, { "commit": "1a2a4d06e1e95260c470ebe3a945f61bbe8c1fd8", "tree": "7167d158749a7acf2ce8bbe1ecd25234b654e813", "parents": [ "9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c" ], "author": { "name": "Kees Cook", "email": "keescook@chromium.org", "time": "Wed Dec 21 12:17:03 2011 -0800" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Feb 10 09:14:51 2012 +1100" }, "message": "security: create task_free security callback\n\nThe current LSM interface to cred_free is not sufficient for allowing\nan LSM to track the life and death of a task. This patch adds the\ntask_free hook so that an LSM can clean up resources on task death.\n\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "11a3122f6cf2d988a77eb8883d0fc49cd013a6d5", "tree": "ded8ea8a2982754ff0c58448a7ed2e59487104cb", "parents": [ "822bfa51ce44f2c63c300fdb76dc99c4d5a5ca9f" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Feb 07 07:51:30 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Feb 07 07:51:30 2012 +0100" }, "message": "block: strip out locking optimization in put_io_context()\n\nput_io_context() performed a complex trylock dancing to avoid\ndeferring ioc release to workqueue. It was also broken on UP because\ntrylock was always assumed to succeed which resulted in unbalanced\npreemption count.\n\nWhile there are ways to fix the UP breakage, even the most\npathological microbench (forced ioc allocation and tight fork/exit\nloop) fails to show any appreciable performance benefit of the\noptimization. Strip it out. If there turns out to be workloads which\nare affected by this change, simpler optimization from the discussion\nthread can be applied later.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nLKML-Reference: \u003c1328514611.21268.66.camel@sli10-conroe\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "8cdb878dcb359fd1137e9abdee9322f5e9bcfdf8", "tree": "146afc01f3c1d7cbc944328484d077032bc53bfd", "parents": [ "24b36da33c64368775f4ef9386d44dce1d2bc8cf" ], "author": { "name": "Christopher Yeoh", "email": "cyeoh@au1.ibm.com", "time": "Thu Feb 02 11:34:09 2012 +1030" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 12:55:17 2012 -0800" }, "message": "Fix race in process_vm_rw_core\n\nThis fixes the race in process_vm_core found by Oleg (see\n\n http://article.gmane.org/gmane.linux.kernel/1235667/\n\nfor details).\n\nThis has been updated since I last sent it as the creation of the new\nmm_access() function did almost exactly the same thing as parts of the\nprevious version of this patch did.\n\nIn order to use mm_access() even when /proc isn\u0027t enabled, we move it to\nkernel/fork.c where other related process mm access functions already\nare.\n\nSigned-off-by: Chris Yeoh \u003cyeohc@au1.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f429ee3b808118591d1f3cdf3c0d0793911a5677", "tree": "96d848f5f677d96758ecd2aee5eb6931b75bf218", "parents": [ "22b4eb5e3174efb49791c62823d0cccc35394c36", "c158a35c8a681cf68d36f22f058f9f5466386c71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:06:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:41:31 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)\n audit: no leading space in audit_log_d_path prefix\n audit: treat s_id as an untrusted string\n audit: fix signedness bug in audit_log_execve_info()\n audit: comparison on interprocess fields\n audit: implement all object interfield comparisons\n audit: allow interfield comparison between gid and ogid\n audit: complex interfield comparison helper\n audit: allow interfield comparison in audit rules\n Kernel: Audit Support For The ARM Platform\n audit: do not call audit_getname on error\n audit: only allow tasks to set their loginuid if it is -1\n audit: remove task argument to audit_set_loginuid\n audit: allow audit matching on inode gid\n audit: allow matching on obj_uid\n audit: remove audit_finish_fork as it can\u0027t be called\n audit: reject entry,always rules\n audit: inline audit_free to simplify the look of generic code\n audit: drop audit_set_macxattr as it doesn\u0027t do anything\n audit: inline checks for not needing to collect aux records\n audit: drop some potentially inadvisable likely notations\n ...\n\nUse evil merge to fix up grammar mistakes in Kconfig file.\n\nBad speling and horrible grammar (and copious swearing) is to be\nexpected, but let\u0027s keep it to commit messages and comments, rather than\nexpose it to users in config help texts or printouts.\n" }, { "commit": "6422e78de6880c66a82af512d9bd0c85eb62e661", "tree": "9cce4d385a6508056be7645fd3511ab019b346f4", "parents": [ "7ff68e53ece8c175d2951bb8a30b3cce8f9c5579" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:59 2012 -0500" }, "message": "audit: remove audit_finish_fork as it can\u0027t be called\n\nAudit entry,always rules are not allowed and are automatically changed in\nexit,always rules in userspace. The kernel refuses to load such rules.\n\nThus a task in the middle of a syscall (and thus in audit_finish_fork())\ncan only be in one of two states: AUDIT_BUILD_CONTEXT or AUDIT_DISABLED.\nSince the current task cannot be in AUDIT_RECORD_CONTEXT we aren\u0027t every\ngoing to actually use the code in audit_finish_fork() since it will\nreturn without doing anything. Thus drop the code.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" } ], "next": "b3c9dd182ed3bdcdaf0e42625a35924b0497afdc" }