)]}' { "log": [ { "commit": "4ab6c08336535f8c8e42cf45d7adeda882eff06e", "tree": "a55253a82ba425e38a3f2993b04fa1e3023da25a", "parents": [ "03ef83af528899aa339e42d8024b37e2f434fba4" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Aug 26 14:29:24 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 26 20:06:52 2009 -0700" }, "message": "clone(): fix race between copy_process() and de_thread()\n\nSpotted by Hiroshi Shimamoto who also provided the test-case below.\n\ncopy_process() uses signal-\u003ecount as a reference counter, but it is not.\nThis test case\n\n\t#include \u003csys/types.h\u003e\n\t#include \u003csys/wait.h\u003e\n\t#include \u003cunistd.h\u003e\n\t#include \u003cstdio.h\u003e\n\t#include \u003cerrno.h\u003e\n\t#include \u003cpthread.h\u003e\n\n\tvoid *null_thread(void *p)\n\t{\n\t\tfor (;;)\n\t\t\tsleep(1);\n\n\t\treturn NULL;\n\t}\n\n\tvoid *exec_thread(void *p)\n\t{\n\t\texecl(\"/bin/true\", \"/bin/true\", NULL);\n\n\t\treturn null_thread(p);\n\t}\n\n\tint main(int argc, char **argv)\n\t{\n\t\tfor (;;) {\n\t\t\tpid_t pid;\n\t\t\tint ret, status;\n\n\t\t\tpid \u003d fork();\n\t\t\tif (pid \u003c 0)\n\t\t\t\tbreak;\n\n\t\t\tif (!pid) {\n\t\t\t\tpthread_t tid;\n\n\t\t\t\tpthread_create(\u0026tid, NULL, exec_thread, NULL);\n\t\t\t\tfor (;;)\n\t\t\t\t\tpthread_create(\u0026tid, NULL, null_thread, NULL);\n\t\t\t}\n\n\t\t\tdo {\n\t\t\t\tret \u003d waitpid(pid, \u0026status, 0);\n\t\t\t} while (ret \u003d\u003d -1 \u0026\u0026 errno \u003d\u003d EINTR);\n\t\t}\n\n\t\treturn 0;\n\t}\n\nquickly creates an unkillable task.\n\nIf copy_process(CLONE_THREAD) races with de_thread()\ncopy_signal()-\u003eatomic(signal-\u003ecount) breaks the signal-\u003enotify_count\nlogic, and the execing thread can hang forever in kernel space.\n\nChange copy_process() to increment count/live only when we know for sure\nwe can\u0027t fail. In this case the forked thread will take care of its\nreference to signal correctly.\n\nIf copy_process() fails, check CLONE_THREAD flag. If it it set - do\nnothing, the counters were not changed and current belongs to the same\nthread group. If it is not set, -\u003esignal must be released in any case\n(and -\u003ecount must be \u003d\u003d 1), the forked child is the only thread in the\nthread group.\n\nWe need more cleanups here, in particular signal-\u003ecount should not be used\nby de_thread/__exit_signal at all. This patch only fixes the bug.\n\nReported-by: Hiroshi Shimamoto \u003ch-shimamoto@ct.jp.nec.com\u003e\nTested-by: Hiroshi Shimamoto \u003ch-shimamoto@ct.jp.nec.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0753ba01e126020bf0f8150934903b48935b697d", "tree": "fbfd7e2d0abbe724a8c5e0e17fb9af522ed2e097", "parents": [ "89a4eb4b66e8f4d395e14a14d262dac4d6ca52f0" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Tue Aug 18 14:11:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 18 16:31:13 2009 -0700" }, "message": "mm: revert \"oom: move oom_adj value\"\n\nThe commit 2ff05b2b (oom: move oom_adj value) moveed the oom_adj value to\nthe mm_struct. It was a very good first step for sanitize OOM.\n\nHowever Paul Menage reported the commit makes regression to his job\nscheduler. Current OOM logic can kill OOM_DISABLED process.\n\nWhy? His program has the code of similar to the following.\n\n\t...\n\tset_oom_adj(OOM_DISABLE); /* The job scheduler never killed by oom */\n\t...\n\tif (vfork() \u003d\u003d 0) {\n\t\tset_oom_adj(0); /* Invoked child can be killed */\n\t\texecve(\"foo-bar-cmd\");\n\t}\n\t....\n\nvfork() parent and child are shared the same mm_struct. then above\nset_oom_adj(0) doesn\u0027t only change oom_adj for vfork() child, it\u0027s also\nchange oom_adj for vfork() parent. Then, vfork() parent (job scheduler)\nlost OOM immune and it was killed.\n\nActually, fork-setting-exec idiom is very frequently used in userland program.\nWe must not break this assumption.\n\nThen, this patch revert commit 2ff05b2b and related commit.\n\nReverted commit list\n---------------------\n- commit 2ff05b2b4e (oom: move oom_adj value from task_struct to mm_struct)\n- commit 4d8b9135c3 (oom: avoid unnecessary mm locking and scanning for OOM_DISABLE)\n- commit 8123681022 (oom: only oom kill exiting tasks with attached memory)\n- commit 933b787b57 (mm: copy over oom_adj value at fork time)\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9c8a8228d0827e0d91d28527209988f672f97d28", "tree": "795b72cfb89abe8bfae1c51dd329e0d6c2ed754f", "parents": [ "2198a64a7487aba036f71998ade8a6528070d32c" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Aug 06 15:09:28 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 07 10:39:56 2009 -0700" }, "message": "execve: must clear current-\u003eclear_child_tid\n\nWhile looking at Jens Rosenboom bug report\n(http://lkml.org/lkml/2009/7/27/35) about strange sys_futex call done from\na dying \"ps\" program, we found following problem.\n\nclone() syscall has special support for TID of created threads. This\nsupport includes two features.\n\nOne (CLONE_CHILD_SETTID) is to set an integer into user memory with the\nTID value.\n\nOne (CLONE_CHILD_CLEARTID) is to clear this same integer once the created\nthread dies.\n\nThe integer location is a user provided pointer, provided at clone()\ntime.\n\nkernel keeps this pointer value into current-\u003eclear_child_tid.\n\nAt execve() time, we should make sure kernel doesnt keep this user\nprovided pointer, as full user memory is replaced by a new one.\n\nAs glibc fork() actually uses clone() syscall with CLONE_CHILD_SETTID and\nCLONE_CHILD_CLEARTID set, chances are high that we might corrupt user\nmemory in forked processes.\n\nFollowing sequence could happen:\n\n1) bash (or any program) starts a new process, by a fork() call that\n glibc maps to a clone( ... CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID\n ...) syscall\n\n2) When new process starts, its current-\u003eclear_child_tid is set to a\n location that has a meaning only in bash (or initial program) context\n (\u0026THREAD_SELF-\u003etid)\n\n3) This new process does the execve() syscall to start a new program.\n current-\u003eclear_child_tid is left unchanged (a non NULL value)\n\n4) If this new program creates some threads, and initial thread exits,\n kernel will attempt to clear the integer pointed by\n current-\u003eclear_child_tid from mm_release() :\n\n if (tsk-\u003eclear_child_tid\n \u0026\u0026 !(tsk-\u003eflags \u0026 PF_SIGNALED)\n \u0026\u0026 atomic_read(\u0026mm-\u003emm_users) \u003e 1) {\n u32 __user * tidptr \u003d tsk-\u003eclear_child_tid;\n tsk-\u003eclear_child_tid \u003d NULL;\n\n /*\n * We don\u0027t check the error code - if userspace has\n * not set up a proper pointer then tough luck.\n */\n\u003c\u003c here \u003e\u003e put_user(0, tidptr);\n sys_futex(tidptr, FUTEX_WAKE, 1, NULL, NULL, 0);\n }\n\n5) OR : if new program is not multi-threaded, but spied by /proc/pid\n users (ps command for example), mm_users \u003e 1, and the exiting program\n could corrupt 4 bytes in a persistent memory area (shm or memory mapped\n file)\n\nIf current-\u003eclear_child_tid points to a writeable portion of memory of the\nnew program, kernel happily and silently corrupts 4 bytes of memory, with\nunexpected effects.\n\nFix is straightforward and should not break any sane program.\n\nReported-by: Jens Rosenboom \u003cjens@mcbone.net\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Sonny Rao \u003csonnyrao@us.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ulrich Drepper \u003cdrepper@redhat.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9f498cc5be7e013d8d6e4c616980ed0ffc8680d2", "tree": "25ef7a52d61ffd336c73b42dcf770424beb19cf3", "parents": [ "e53c0994709166b111fbe9162d1a16ece7dfc45b" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Jul 23 14:46:33 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Aug 02 13:47:56 2009 +0200" }, "message": "perf_counter: Full task tracing\n\nIn order to be able to distinguish between no samples due to\ninactivity and no samples due to task ended, Arjan asked for\nPERF_EVENT_EXIT events. This is useful to the boot delay\ninstrumentation (bootchart) app.\n\nThis patch changes the PERF_EVENT_FORK to be emitted on every\nclone, and adds PERF_EVENT_EXIT to be emitted on task exit,\nafter the task\u0027s counters have been closed.\n\nThis task tracing is controlled through: attr.comm || attr.mmap\nand through the new attr.task field.\n\nSuggested-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\n[ cleaned up perf_counter.h a bit ]\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "933b787b57ca8bdc0fc8fb2cbf67b5e6d21beb84", "tree": "aae84533e71c7574ab8dd6f0ca4b782de121e482", "parents": [ "6583bb64fc370842b32a87c67750c26f6d559af0" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Wed Jul 29 15:02:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 19:10:34 2009 -0700" }, "message": "mm: copy over oom_adj value at fork time\n\nFix a post-2.6.31 regression which was introduced by\n2ff05b2b4eac2e63d345fc731ea151a060247f53 (\"oom: move oom_adj value from\ntask_struct to mm_struct\").\n\nAfter moving the oom_adj value from the task struct to the mm_struct, the\noom_adj value was no longer properly inherited by child processes.\n\nCopying over the oom_adj value at fork time fixes that bug.\n\n[kosaki.motohiro@jp.fujitsu.com: test for current-\u003emm before dereferencing it]\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nReported-by: Paul Menage \u003cmanage@google.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: David Rientjes \u003crientjes@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": "3c3301083e3bea4d14c597106c7b20b4b85fc03d", "tree": "6eabdd073bdc27eb3f0dd999ea946955afca18bf", "parents": [ "612e900c286a9535cc17da5171b0d8dcf8f3a12f", "0fdc7e67dd312986e30b861adff48732bd33eb3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 11:41:56 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 11:41:56 2009 -0700" }, "message": "Merge branch \u0027perf-counters-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf\n\n* \u0027perf-counters-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf: (31 commits)\n perf_counter tools: Give perf top inherit option\n perf_counter tools: Fix vmlinux symbol generation breakage\n perf_counter: Detect debugfs location\n perf_counter: Add tracepoint support to perf list, perf stat\n perf symbol: C++ demangling\n perf: avoid structure size confusion by using a fixed size\n perf_counter: Fix throttle/unthrottle event logging\n perf_counter: Improve perf stat and perf record option parsing\n perf_counter: PERF_SAMPLE_ID and inherited counters\n perf_counter: Plug more stack leaks\n perf: Fix stack data leak\n perf_counter: Remove unused variables\n perf_counter: Make call graph option consistent\n perf_counter: Add perf record option to log addresses\n perf_counter: Log vfork as a fork event\n perf_counter: Synthesize VDSO mmap event\n perf_counter: Make sure we dont leak kernel memory to userspace\n perf_counter tools: Fix index boundary check\n perf_counter: Fix the tracepoint channel to perfcounters\n perf_counter, x86: Extend perf_counter Pentium M support\n ...\n" }, { "commit": "ed900c054b541254f0ce5cedaf75206e29bd614e", "tree": "c164aaefa1185744d4372d8ff5b11a86a8e1405a", "parents": [ "11b5f81e1b0ea0bc84fe32f0a27054e052b2bf84" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Thu Jul 16 15:44:29 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 11:21:31 2009 +0200" }, "message": "perf_counter: Log vfork as a fork event\n\nRight now we don\u0027t output vfork events. Even though we should\nalways see an exec after a vfork, we may get perfcounter\nsamples between the vfork and exec. These samples can lead to\nsome confusion when parsing perfcounter data.\n\nTo keep things consistent we should always log a fork event. It\nwill result in a little more log data, but is less confusing to\ntrace parsing tools.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c20090716104817.589309391@samba.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b43f3cbd21ffbd719fd4fa6642bfe6af255ded34", "tree": "f09372f7aa3057a4cca32d5c7fc19032bd7cda5a", "parents": [ "622f8061a68d3f7a576c20a47b7f3bae7c8cfbef" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Wed Jul 08 01:54:37 2009 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 08 09:31:56 2009 -0700" }, "message": "headers: mnt_namespace.h redux\n\nFix various silly problems wrt mnt_namespace.h:\n\n - exit_mnt_ns() isn\u0027t used, remove it\n - done that, sched.h and nsproxy.h inclusions aren\u0027t needed\n - mount.h inclusion was need for vfsmount_lock, but no longer\n - remove mnt_namespace.h inclusion from files which don\u0027t use anything\n from mnt_namespace.h\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "72a1de39f89325a834a8c70b2a0d8f71d919f640", "tree": "f79fefd4eaad9cbc381792bddb1e1f3f432ad9f6", "parents": [ "77d1ef79568b337f599b75795acc8f78a87ba9ba" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:37 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:52 2009 -0700" }, "message": "copy_process(): remove the unneeded clear_tsk_thread_flag(TIF_SIGPENDING)\n\nThe forked child can have TIF_SIGPENDING if it was copied from parent\u0027s\nti-\u003eflags. But this is harmless and actually almost never happens,\nbecause copy_process() can\u0027t succeed if signal_pending() \u003d\u003d T.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2dff440525f8faba8836e9f05297b76f23b4af30", "tree": "9f15e1dc2da06dba97cd939e41f34342caf05097", "parents": [ "f85612967c93b67b10dd240e3e8bf8a0eee9def7" ], "author": { "name": "Vegard Nossum", "email": "vegard.nossum@gmail.com", "time": "Sat May 31 15:56:17 2008 +0200" }, "committer": { "name": "Vegard Nossum", "email": "vegard.nossum@gmail.com", "time": "Mon Jun 15 12:40:03 2009 +0200" }, "message": "kmemcheck: add mm functions\n\nWith kmemcheck enabled, the slab allocator needs to do this:\n\n1. Tell kmemcheck to allocate the shadow memory which stores the status of\n each byte in the allocation proper, e.g. whether it is initialized or\n uninitialized.\n2. Tell kmemcheck which parts of memory that should be marked uninitialized.\n There are actually a few more states, such as \"not yet allocated\" and\n \"recently freed\".\n\nIf a slab cache is set up using the SLAB_NOTRACK flag, it will never return\nmemory that can take page faults because of kmemcheck.\n\nIf a slab cache is NOT set up using the SLAB_NOTRACK flag, callers can still\nrequest memory with the __GFP_NOTRACK flag. This does not prevent the page\nfaults from occuring, however, but marks the object in question as being\ninitialized so that no warnings will ever be produced for this object.\n\nIn addition to (and in contrast to) __GFP_NOTRACK, the\n__GFP_NOTRACK_FALSE_POSITIVE flag indicates that the allocation should\nnot be tracked _because_ it would produce a false positive. Their values\nare identical, but need not be so in the future (for example, we could now\nenable/disable false positives with a config option).\n\nParts of this patch were contributed by Pekka Enberg but merged for\natomicity.\n\nSigned-off-by: Vegard Nossum \u003cvegard.nossum@gmail.com\u003e\nSigned-off-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n\n[rebased for mainline inclusion]\nSigned-off-by: Vegard Nossum \u003cvegard.nossum@gmail.com\u003e\n" }, { "commit": "940010c5a314a7bd9b498593bc6ba1718ac5aec5", "tree": "d141e08ced08c40c6a8e3ab2cdecde5ff14e560f", "parents": [ "8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5", "991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 11 17:55:42 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 11 17:55:42 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/kernel/irqinit.c\n\tarch/x86/kernel/irqinit_64.c\n\tarch/x86/kernel/traps.c\n\tarch/x86/mm/fault.c\n\tinclude/linux/sched.h\n\tkernel/exit.c\n" }, { "commit": "991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d", "tree": "50b5f4e2b9f138da57f76eca44fdcc80a2fcd428", "parents": [ "862366118026a358882eefc70238dbcc3db37aac", "84047e360af0394ac5861d433f26bbcf30f77dd1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:58:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:58:10 2009 -0700" }, "message": "Merge branch \u0027tracing-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n function-graph: always initialize task ret_stack\n function-graph: move initialization of new tasks up in fork\n function-graph: add memory barriers for accessing task\u0027s ret_stack\n function-graph: enable the stack after initialization of other variables\n function-graph: only allocate init tasks if it was not already done\n\nManually fix trivial conflict in kernel/trace/ftrace.c\n" }, { "commit": "862366118026a358882eefc70238dbcc3db37aac", "tree": "4eb62bc10327a5afac064a95a091ea05ecd2acc1", "parents": [ "57eee9ae7bbcfb692dc96c739a5184adb6349733", "511b01bdf64ad8a38414096eab283c7784aebfc4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:53:40 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:53:40 2009 -0700" }, "message": "Merge branch \u0027tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (244 commits)\n Revert \"x86, bts: reenable ptrace branch trace support\"\n tracing: do not translate event helper macros in print format\n ftrace/documentation: fix typo in function grapher name\n tracing/events: convert block trace points to TRACE_EVENT(), fix !CONFIG_BLOCK\n tracing: add protection around module events unload\n tracing: add trace_seq_vprint interface\n tracing: fix the block trace points print size\n tracing/events: convert block trace points to TRACE_EVENT()\n ring-buffer: fix ret in rb_add_time_stamp\n ring-buffer: pass in lockdep class key for reader_lock\n tracing: add annotation to what type of stack trace is recorded\n tracing: fix multiple use of __print_flags and __print_symbolic\n tracing/events: fix output format of user stack\n tracing/events: fix output format of kernel stack\n tracing/trace_stack: fix the number of entries in the header\n ring-buffer: discard timestamps that are at the start of the buffer\n ring-buffer: try to discard unneeded timestamps\n ring-buffer: fix bug in ring_buffer_discard_commit\n ftrace: do not profile functions when disabled\n tracing: make trace pipe recognize latency format flag\n ...\n" }, { "commit": "087eb437051b3de817720f9c80c440fc9e7dcce8", "tree": "25a72acabe05c3e72dddd942855d4245dfae4b82", "parents": [ "b87297fb405ef13cac375f202d114323b076a56d" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Jun 04 16:29:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 04 18:07:40 2009 -0700" }, "message": "ptrace: tracehook_report_clone: fix false positives\n\nThe \"trace || CLONE_PTRACE\" check in tracehook_report_clone() is not right,\n\n- If the untraced task does clone(CLONE_PTRACE) the new child is not traced,\n we must not queue SIGSTOP.\n\n- If we forked the traced task, but the tracer exits and untraces both the\n forking task and the new child (after copy_process() drops tasklist_lock),\n we should not queue SIGSTOP too.\n\nChange the code to check task_ptrace() !\u003d 0 instead. This is still racy, but\nthe race is harmless.\n\nWe can race with another tracer attaching to this child, or the tracer can\nexit and detach in parallel. But giwen that we didn\u0027t do wake_up_new_task()\nyet, the child must have the pending SIGSTOP anyway.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\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": "60313ebed739b331e8e61079da27a11ee3b73a30", "tree": "8476fbd05be709595876360765776dd9ca20608d", "parents": [ "20c84e959ec11b1803d2b2832eef703d5fbe7f7b" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Jun 04 16:53:44 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 04 17:51:38 2009 +0200" }, "message": "perf_counter: Add fork event\n\nCreate a fork event so that we can easily clone the comm and\ndso maps without having to generate all those events.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "226f62fdd53d5b2c74e242aa11f6ad43d0285d3f", "tree": "bfe54a45e7fe85520c0675c2f8e90b7704aad4ff", "parents": [ "dcd945e0d8a6d654e3e1de51faea9f98f1504aa5" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Jun 03 11:23:56 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 03 14:14:30 2009 +0200" }, "message": "perf_counter: Add a comm hook for pure fork()s\n\nI noticed missing COMM events and found that we missed\nreporting them for pure forks.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f7e8b616ed1cc6f790b82324bce8a2a60295e5c2", "tree": "e46e50692d90ddcccf159accdcdd655d3dd0ffa5", "parents": [ "26c01624a2a40f8a4ddf6449b65c9b1c418d0e72" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Tue Jun 02 16:39:48 2009 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jun 02 16:49:57 2009 -0400" }, "message": "function-graph: move initialization of new tasks up in fork\n\nWhen the function graph tracer is enabled, all new tasks must allocate\na ret_stack to place the return address of functions. This is because\nthe function graph tracer will replace the real return address with a\ncall to the tracing of the exit function.\n\nThis initialization happens in fork, but it happens too late. If fork\nfails, then it will call free_task and that calls the freeing of this\nret_stack. But before initialization happens, the new (failed) task\npoints to its parents ret_stack. If a fork failure happens during\nthe function trace, it would be catastrophic for the parent.\n\nAlso, there\u0027s no need to call ftrace_graph_exit_task from fork, since\nit is called by free_task which fork calls on failure.\n\n[ Impact: prevent crash during failed fork running function graph tracer ]\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "bbbee90829304d156c12b171c0ac7e6e1aba8b90", "tree": "ec0a1a8c69a5c909a57227915734d1e55678eb5c", "parents": [ "665c2142a94202881a3c11cbaee6506cb10ada2d" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri May 29 14:25:58 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 29 16:21:52 2009 +0200" }, "message": "perf_counter: Ammend cleanup in fork() fail\n\nWhen fork() fails we cannot use perf_counter_exit_task() since that\nassumes to operate on current. Write a new helper that cleans up\nunused/clean contexts.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6ab423e0eaca827fbd201ca4ae7d4f8573a366b2", "tree": "072d227934bf213adf5c0dd022369e14f273dc48", "parents": [ "771d7cde144d87f2d1fbee4da3c6234d61f7e42a" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon May 25 14:45:27 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 25 14:55:01 2009 +0200" }, "message": "perf_counter: Propagate inheritance failures down the fork() path\n\nFail fork() when we fail inheritance for some reason (-ENOMEM most likely).\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nLKML-Reference: \u003c20090525124600.324656474@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e4cbb4e3ac8b09fdb11e39e5a5611bfab0a7cd1a", "tree": "987f159fe3867781460c51e3363969efaeee2c8a", "parents": [ "d94b943054721c346b0881865d645f000cd19880" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue May 19 15:50:30 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 25 13:05:06 2009 +0200" }, "message": "perf_counter: Move child perfcounter init to after scheduler init\n\nInitialize a task\u0027s perfcounters (inherit from parent, etc.) after\nthe child task\u0027s scheduler fields have been initialized already.\n\n[ Impact: cleanup ]\n\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a63eaf34ae60bdb067a354cc8def2e8f4a01f5f4", "tree": "9e81e5e0299bd524b3d07c17a05760e33c7d58a0", "parents": [ "34adc8062227f41b04ade0ff3fbd1dbe3002669e" ], "author": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Fri May 22 14:17:31 2009 +1000" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 22 12:18:19 2009 +0200" }, "message": "perf_counter: Dynamically allocate tasks\u0027 perf_counter_context struct\n\nThis replaces the struct perf_counter_context in the task_struct with\na pointer to a dynamically allocated perf_counter_context struct. The\nmain reason for doing is this is to allow us to transfer a\nperf_counter_context from one task to another when we do lazy PMU\nswitching in a later patch.\n\nThis has a few side-benefits: the task_struct becomes a little smaller,\nwe save some memory because only tasks that have perf_counters attached\nget a perf_counter_context allocated for them, and we can remove the\ninclusion of \u003clinux/perf_counter.h\u003e in sched.h, meaning that we don\u0027t\nend up recompiling nearly everything whenever perf_counter.h changes.\n\nThe perf_counter_context structures are reference-counted and freed\nwhen the last reference is dropped. A context can have references\nfrom its task and the counters on its task. Counters can outlive the\ntask so it is possible that a context will be freed well after its\ntask has exited.\n\nContexts are allocated on fork if the parent had a context, or\notherwise the first time that a per-task counter is created on a task.\nIn the latter case, we set the context pointer in the task struct\nlocklessly using an atomic compare-and-exchange operation in case we\nraced with some other task in creating a context for the subject task.\n\nThis also removes the task pointer from the perf_counter struct. The\ntask pointer was not used anywhere and would make it harder to move a\ncontext from one task to another. Anything that needed to know which\ntask a counter was attached to was already using counter-\u003ectx-\u003etask.\n\nThe __perf_counter_init_context function moves up in perf_counter.c\nso that it can be called from find_get_context, and now initializes\nthe refcount, but is otherwise unchanged.\n\nWe were potentially calling list_del_counter twice: once from\n__perf_counter_exit_task when the task exits and once from\n__perf_counter_remove_from_context when the counter\u0027s fd gets closed.\nThis adds a check in list_del_counter so it doesn\u0027t do anything if\nthe counter has already been removed from the lists.\n\nSince perf_counter_task_sched_in doesn\u0027t do anything if the task doesn\u0027t\nhave a context, and leaves cpuctx-\u003etask_ctx \u003d NULL, this adds code to\n__perf_install_in_context to set cpuctx-\u003etask_ctx if necessary, i.e. in\nthe case where the current task adds the first counter to itself and\nthus creates a context for itself.\n\nThis also adds similar code to __perf_counter_enable to handle a\nsimilar situation which can arise when the counters have been disabled\nusing prctl; that also leaves cpuctx-\u003etask_ctx \u003d NULL.\n\n[ Impact: refactor counter context management to prepare for new feature ]\n\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nLKML-Reference: \u003c18966.10075.781053.231153@cargo.ozlabs.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0ad5d703c6c0fcd385d956555460df95dff7eb7e", "tree": "4b777100f9be4fe90ca4bd043b9f98df672b5b3b", "parents": [ "44347d947f628060b92449702071bfe1d31dfb75", "1cb81b143fa8f0e4629f10690862e2e52ca792ff" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 07 11:18:34 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 07 13:36:22 2009 +0200" }, "message": "Merge branch \u0027tracing/hw-branch-tracing\u0027 into tracing/core\n\nMerge reason: this topic is ready for upstream now. It passed\n Oleg\u0027s review and Andrew had no further mm/*\n objections/observations either.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a", "tree": "4ba588631dd8189a818a91c9e3976526071178b6", "parents": [ "1130b0296184bc21806225fd06d533515a99d2db", "56a50adda49b2020156616c4eb15353e0f9ad7de" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 29 14:46:59 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 29 14:47:05 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nMerge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up\n the latest upstream fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "416dfdcdb894432547ead4fcb9fa6a36b396059e", "tree": "8033fdda07397a59c5fa98c88927040906ce6c1a", "parents": [ "56449f437add737a1e5e1cb7e00f63ac8ead1938", "091069740304c979f957ceacec39c461d0192158" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Apr 24 10:11:18 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Apr 24 10:11:23 2009 +0200" }, "message": "Merge commit \u0027v2.6.30-rc3\u0027 into tracing/hw-branch-tracing\n\nConflicts:\n\tarch/x86/kernel/ptrace.c\n\nMerge reason: fix the conflict above, and also pick up the CONFIG_BROKEN\n dependency change from upstream so that we can remove it\n\t here.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "ad8d75fff811a6a230f7f43b05a6483099349533", "tree": "764f75c0785b29067b141719b6e8000f005da7fd", "parents": [ "ecda8ae02a08ef065ff387f5cb2a2d4999da2408" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Tue Apr 14 19:39:12 2009 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Apr 14 22:05:43 2009 -0400" }, "message": "tracing/events: move trace point headers into include/trace/events\n\nImpact: clean up\n\nCreate a sub directory in include/trace called events to keep the\ntrace point headers in their own separate directory. Only headers that\ndeclare trace points should be defined in this directory.\n\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCc: Zhao Lei \u003czhaolei@cn.fujitsu.com\u003e\nCc: Eduard - Gabriel Munteanu \u003ceduard.munteanu@linux360.ro\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "a8d154b009168337494fbf345671bab74d3e4b8b", "tree": "4097612e1a5cc8bf7658542f7d0f51b815113eaf", "parents": [ "ea20d9293ce423a39717ed4375393129a2e701f9" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Fri Apr 10 09:36:00 2009 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Apr 14 12:57:28 2009 -0400" }, "message": "tracing: create automated trace defines\n\nThis patch lowers the number of places a developer must modify to add\nnew tracepoints. The current method to add a new tracepoint\ninto an existing system is to write the trace point macro in the\ntrace header with one of the macros TRACE_EVENT, TRACE_FORMAT or\nDECLARE_TRACE, then they must add the same named item into the C file\nwith the macro DEFINE_TRACE(name) and then add the trace point.\n\nThis change cuts out the needing to add the DEFINE_TRACE(name).\nEvery file that uses the tracepoint must still include the trace/\u003ctype\u003e.h\nfile, but the one C file must also add a define before the including\nof that file.\n\n #define CREATE_TRACE_POINTS\n #include \u003ctrace/mytrace.h\u003e\n\nThis will cause the trace/mytrace.h file to also produce the C code\nnecessary to implement the trace point.\n\nNote, if more than one trace/\u003ctype\u003e.h is used to create the C code\nit is best to list them all together.\n\n #define CREATE_TRACE_POINTS\n #include \u003ctrace/foo.h\u003e\n #include \u003ctrace/bar.h\u003e\n #include \u003ctrace/fido.h\u003e\n\nThanks to Mathieu Desnoyers and Christoph Hellwig for coming up with\nthe cleaner solution of the define above the includes over my first\ndesign to have the C code include a \"special\" header.\n\nThis patch converts sched, irq and lockdep and skb to use this new\nmethod.\n\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCc: Zhao Lei \u003czhaolei@cn.fujitsu.com\u003e\nCc: Eduard - Gabriel Munteanu \u003ceduard.munteanu@linux360.ro\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "422a253483aa5de71a2bcdc27b0aa023053f97f8", "tree": "3e25aaf65b8eaf275bb01982a89fb0cd631c4367", "parents": [ "91e58b6e95a9c6b9efd928ae352eae5e75ae598c", "022624a758dc9489388a99ad29577b4c8c09237c", "9756b15e1b58453a6fd54b85c1ad8515209e10bb", "8f2e586567b1bad72dac7c3810fe9a2ef7117506" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 09 10:35:30 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 09 10:35:30 2009 -0700" }, "message": "Merge branches \u0027core-fixes-for-linus\u0027, \u0027irq-fixes-for-linus\u0027 and \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n printk: fix wrong format string iter for printk\n futex: comment requeue key reference semantics\n\n* \u0027irq-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n irq: fix cpumask memory leak on offstack cpumask kernels\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n posix-timers: fix RLIMIT_CPU \u0026\u0026 setitimer(CPUCLOCK_PROF)\n posix-timers: fix RLIMIT_CPU \u0026\u0026 fork()\n timers: add missing kernel-doc\n" }, { "commit": "6279a751fe096a21dc7704e918d570d3ff06e769", "tree": "2b24e0ecf004802a890f77195489f8aa76fa745d", "parents": [ "633fe795b80693a8198e7d82f66538a72d2bbba2" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri Mar 27 01:06:07 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 08 17:51:38 2009 +0200" }, "message": "posix-timers: fix RLIMIT_CPU \u0026\u0026 fork()\n\nSee http://bugzilla.kernel.org/show_bug.cgi?id\u003d12911\n\ncopy_signal() copies signal-\u003erlim, but RLIMIT_CPU is \"lost\". Because\nposix_cpu_timers_init_group() sets cputime_expires.prof_exp \u003d 0 and thus\nfastpath_timer_check() returns false unless we have other expired cpu timers.\n\nChange copy_signal() to set cputime_expires.prof_exp if we have RLIMIT_CPU.\nAlso, set cputimer.running \u003d 1 in that case. This is not strictly necessary,\nbut imho makes sense.\n\nReported-by: Peter Lojkin \u003cia6432@inbox.ru\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Peter Lojkin \u003cia6432@inbox.ru\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: stable@kernel.org\nLKML-Reference: \u003c20090327000607.GA10104@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5ea472a77f8e4811ceee3f44a9deda6ad6e8b789", "tree": "a9ec5019e2b666a19874fc344ffb0dd5da6bce94", "parents": [ "6c009ecef8cca28c7c09eb16d0802e37915a76e1", "577c9c456f0e1371cbade38eaf91ae8e8a308555" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 08 10:35:30 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 08 10:35:30 2009 +0200" }, "message": "Merge commit \u0027v2.6.30-rc1\u0027 into perfcounters/core\n\nConflicts:\n\tarch/powerpc/include/asm/systbl.h\n\tarch/powerpc/include/asm/unistd.h\n\tinclude/linux/init_task.h\n\nMerge reason: the conflicts are non-trivial: PowerPC placement\n of sys_perf_counter_open has to be mixed with the\n\t new preadv/pwrite syscalls.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0f4814065ff8c24ca8bfd75c9b73502be152c287", "tree": "f3816ecb64ee198235d2e9c1649de3241c3f2ac2", "parents": [ "ee811517a5604aa63fae803b7c044712699e1303" ], "author": { "name": "Markus Metzger", "email": "markus.t.metzger@intel.com", "time": "Fri Apr 03 16:43:48 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 13:36:31 2009 +0200" }, "message": "x86, ptrace: add bts context unconditionally\n\nAdd the ptrace bts context field to task_struct unconditionally.\n\nInitialize the field directly in copy_process().\nRemove all the unneeded functionality used to initialize that field.\n\nSigned-off-by: Markus Metzger \u003cmarkus.t.metzger@intel.com\u003e\nCc: roland@redhat.com\nCc: eranian@googlemail.com\nCc: oleg@redhat.com\nCc: juan.villacis@intel.com\nCc: ak@linux.jf.intel.com\nLKML-Reference: \u003c20090403144603.292754000@intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5e34437840d33554f69380584311743b39e8fbeb", "tree": "e081135619ee146af5efb9ee883afca950df5757", "parents": [ "77d05632baee21b1cef8730d7c06aa69601e4dca", "d508afb437daee7cf07da085b635c44a4ebf9b38" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 11:15:40 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 11:15:40 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into core/softlockup\n\nConflicts:\n\tkernel/sysctl.c\n" }, { "commit": "f541ae326fa120fa5c57433e4d9a133df212ce41", "tree": "bdbd94ec72cfc601118051cb35e8617d55510177", "parents": [ "e255357764f92afcafafbd4879b222b8c752065a", "0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 06 09:02:57 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 06 09:02:57 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core-v2\n\nMerge reason: we have gathered quite a few conflicts, need to merge upstream\n\nConflicts:\n\tarch/powerpc/kernel/Makefile\n\tarch/x86/ia32/ia32entry.S\n\tarch/x86/include/asm/hardirq.h\n\tarch/x86/include/asm/unistd_32.h\n\tarch/x86/include/asm/unistd_64.h\n\tarch/x86/kernel/cpu/common.c\n\tarch/x86/kernel/irq.c\n\tarch/x86/kernel/syscall_table_32.S\n\tarch/x86/mm/iomap_32.c\n\tinclude/linux/sched.h\n\tkernel/Makefile\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "8fe74cf053de7ad2124a894996f84fa890a81093", "tree": "77dcd8fbf33ce53a3821942233962fb28c6f2848", "parents": [ "c2eb2fa6d2b6fe122d3479ec5b28d978418b2698", "ced117c73edc917e96dea7cca98c91383f0792f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 21:09:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 21:09:10 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n Remove two unneeded exports and make two symbols static in fs/mpage.c\n Cleanup after commit 585d3bc06f4ca57f975a5a1f698f65a45ea66225\n Trim includes of fdtable.h\n Don\u0027t crap into descriptor table in binfmt_som\n Trim includes in binfmt_elf\n Don\u0027t mess with descriptor table in load_elf_binary()\n Get rid of indirect include of fs_struct.h\n New helper - current_umask()\n check_unsafe_exec() doesn\u0027t care about signal handlers sharing\n New locking/refcounting for fs_struct\n Take fs_struct handling to new file (fs/fs_struct.c)\n Get rid of bumping fs_struct refcount in pivot_root(2)\n Kill unsharing fs_struct in __set_personality()\n" }, { "commit": "1b0f7ffd0ea27cd3a0b9ca04e3df9522048c32a3", "tree": "a8c27acdf95f55f93fe86661c6cba4cd36c8e4f1", "parents": [ "52ee2dfdd4f51cf422ea6a96a0846dc94244aa37" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:39 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:05:02 2009 -0700" }, "message": "pids: kill signal_struct-\u003e __pgrp/__session and friends\n\nWe are wasting 2 words in signal_struct without any reason to implement\ntask_pgrp_nr() and task_session_nr().\n\ntask_session_nr() has no callers since\n2e2ba22ea4fd4bb85f0fa37c521066db6775cbef, we can remove it.\n\ntask_pgrp_nr() is still (I believe wrongly) used in fs/autofsX and\nfs/coda.\n\nThis patch reimplements task_pgrp_nr() via task_pgrp_nr_ns(), and kills\n__pgrp/__session and the related helpers.\n\nThe change in drivers/char/tty_io.c is cosmetic, but hopefully makes sense\nanyway.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Alan Cox \u003cnumber6@the-village.bc.nu\u003e\t\t[tty parts]\nCc: Cedric Le Goater \u003cclg@fr.ibm.com\u003e\nCc: Dave Hansen \u003chaveblue@us.ibm.com\u003e\nCc: Eric Biederman \u003cebiederm@xmission.com\u003e\nCc: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nCc: Serge Hallyn \u003cserue@us.ibm.com\u003e\nCc: Sukadev Bhattiprolu \u003csukadev@linux.vnet.ibm.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b3bfa0cba867f23365b81658b47efd906830879b", "tree": "e54d9a9c4c23fc00bb2ff3ed57ef5317a0660ea5", "parents": [ "e4da026f980df125a4918c3bb9fe93185c7ef12a" ], "author": { "name": "Sukadev Bhattiprolu", "email": "sukadev@linux.vnet.ibm.com", "time": "Thu Apr 02 16:58:08 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:58 2009 -0700" }, "message": "signals: protect cinit from blocked fatal signals\n\nNormally SIG_DFL signals to global and container-init are dropped early.\nBut if a signal is blocked when it is posted, we cannot drop the signal\nsince the receiver may install a handler before unblocking the signal.\nOnce this signal is queued however, the receiver container-init has no way\nof knowing if the signal was sent from an ancestor or descendant\nnamespace. This patch ensures that contianer-init drops all SIG_DFL\nsignals in get_signal_to_deliver() except SIGKILL/SIGSTOP.\n\nIf SIGSTOP/SIGKILL originate from a descendant of container-init they are\nnever queued (i.e dropped in sig_ignored() in an earler patch).\n\nIf SIGSTOP/SIGKILL originate from parent namespace, the signal is queued\nand container-init processes the signal.\n\nIOW, if get_signal_to_deliver() sees a sig_kernel_only() signal for global\nor container-init, the signal must have been generated internally or must\nhave come from an ancestor ns and we process the signal.\n\nFurther, the signal_group_exit() check was needed to cover the case of a\nmulti-threaded init sending SIGKILL to other threads when doing an exit()\nor exec(). But since the new sig_kernel_only() check covers the SIGKILL,\nthe signal_group_exit() check is no longer needed and can be removed.\n\nFinally, now that we have all pieces in place, set SIGNAL_UNKILLABLE for\ncontainer-inits.\n\nSigned-off-by: Sukadev Bhattiprolu \u003csukadev@linux.vnet.ibm.com\u003e\nCc: Oleg Nesterov \u003coleg@tv-sign.ru\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Daniel Lezcano \u003cdaniel.lezcano@free.fr\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6f2c55b843836d26528c56a0968689accaedbc67", "tree": "17501e29d4b6ef3eb85da9a5d6ad3df7f19ec6a2", "parents": [ "14dd1ff0f9e75dd4ae2f1ff8e48becb76d14f4ab" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Apr 02 16:56:59 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:51 2009 -0700" }, "message": "Simplify copy_thread()\n\nFirst argument unused since 2.3.11.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "33e5d76979cf01e3834814fe0aea569d1d602c1a", "tree": "58a03e5da59db203245da10db144a4f6f61a83ba", "parents": [ "5482415a5ecc0cd791a5d885cc3db8281401078f" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Apr 02 16:56:32 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:48 2009 -0700" }, "message": "nommu: fix a number of issues with the per-MM VMA patch\n\nFix a number of issues with the per-MM VMA patch:\n\n (1) Make mmap_pages_allocated an atomic_long_t, just in case this is used on\n a NOMMU system with more than 2G pages. Makes no difference on a 32-bit\n system.\n\n (2) Report vma-\u003evm_pgoff * PAGE_SIZE as a 64-bit value, not a 32-bit value,\n lest it overflow.\n\n (3) Move the allocation of the vm_area_struct slab back for fork.c.\n\n (4) Use KMEM_CACHE() for both vm_area_struct and vm_region slabs.\n\n (5) Use BUG_ON() rather than if () BUG().\n\n (6) Make the default validate_nommu_regions() a static inline rather than a\n #define.\n\n (7) Make free_page_series()\u0027s objection to pages with a refcount !\u003d 1 more\n informative.\n\n (8) Adjust the __put_nommu_region() banner comment to indicate that the\n semaphore must be held for writing.\n\n (9) Limit the number of warnings about munmaps of non-mmapped regions.\n\nReported-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Greg Ungerer \u003cgerg@snapgear.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5ad4e53bd5406ee214ddc5a41f03f779b8b2d526", "tree": "b3dab5140284b3edf02bf2b13f74bfddb25aa62a", "parents": [ "ce3b0f8d5c2203301fc87f3aaaed73e5819e2a48" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Mar 29 19:50:06 2009 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 31 23:00:27 2009 -0400" }, "message": "Get rid of indirect include of fs_struct.h\n\nDon\u0027t pull it in sched.h; very few files actually need it and those\ncan include directly. sched.h itself only needs forward declaration\nof struct fs_struct;\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "498052bba55ecaff58db6a1436b0e25bfd75a7ff", "tree": "bd3644ac60737e3733995a203acebd70cfd1b21b", "parents": [ "3e93cd671813e204c258f1e6c797959920cf7772" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Mar 30 07:20:30 2009 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 31 23:00:26 2009 -0400" }, "message": "New locking/refcounting for fs_struct\n\n* all changes of current-\u003efs are done under task_lock and write_lock of\n old fs-\u003elock\n* refcount is not atomic anymore (same protection)\n* its decrements are done when removing reference from current; at the\n same time we decide whether to free it.\n* put_fs_struct() is gone\n* new field - -\u003ein_exec. Set by check_unsafe_exec() if we are trying to do\n execve() and only subthreads share fs_struct. Cleared when finishing exec\n (success and failure alike). Makes CLONE_FS fail with -EAGAIN if set.\n* check_unsafe_exec() may fail with -EAGAIN if another execve() from subthread\n is in progress.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "3e93cd671813e204c258f1e6c797959920cf7772", "tree": "a1e0b2d2da7d296cc1c53be9cd6efa5b94b01b5c", "parents": [ "f8ef3ed2bebd2c4cb9ece92efa185d7aead8831a" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Mar 29 19:00:13 2009 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 31 23:00:26 2009 -0400" }, "message": "Take fs_struct handling to new file (fs/fs_struct.c)\n\nPure code move; two new helper functions for nfsd and daemonize\n(unshare_fs_struct() and daemonize_fs_struct() resp.; for now -\nthe same code as used to be in callers). unshare_fs_struct()\nexported (for nfsd, as copy_fs_struct()/exit_fs() used to be),\ncopy_fs_struct() and exit_fs() don\u0027t need exports anymore.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "9489424454c93f4d225d7af47978f8c7e84bf4d4", "tree": "b97394982298e4e191b2766408ff8a3dff99266a", "parents": [ "2b17fa506c418e9fb02bbbc7f426d2bbb5b247a6" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Mar 30 22:05:12 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Mar 30 22:05:13 2009 +1030" }, "message": "cpumask: use mm_cpumask() wrapper: kernel/fork.c\n\nImpact: futureproof\n\nMakes code futureproof against the impending change to mm-\u003ecpu_vm_mask.\n\nIt\u0027s also a chance to use the new cpumask_ ops which take a pointer.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "6e15cf04860074ad032e88c306bea656bbdd0f22", "tree": "c346383bb7563e8d66b2f4a502f875b259c34870", "parents": [ "be0ea69674ed95e1e98cb3687a241badc756d228", "60db56422043aaa455ac7f858ce23c273220f9d9" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 26 21:39:17 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 27 17:28:43 2009 +0100" }, "message": "Merge branch \u0027core/percpu\u0027 into percpu-cpumask-x86-for-linus-2\n\nConflicts:\n\tarch/parisc/kernel/irq.c\n\tarch/x86/include/asm/fixmap_64.h\n\tarch/x86/include/asm/setup.h\n\tkernel/irq/handle.c\n\nSemantic merge:\n arch/x86/include/asm/fixmap.h\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "2d5516cbb9daf7d0e342a2e3b0fc6f8c39a81205", "tree": "7f3fa06b708a508f4cc0fa6ef7894ede14101c87", "parents": [ "df0b4a5080ca668636831b641a6356500fb5c637" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Mar 02 22:58:45 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 13:23:25 2009 -0700" }, "message": "copy_process: fix CLONE_PARENT \u0026\u0026 parent_exec_id interaction\n\nCLONE_PARENT can fool the -\u003eself_exec_id/parent_exec_id logic. If we\nre-use the old parent, we must also re-use -\u003eparent_exec_id to make\nsure exit_notify() sees the right -\u003exxx_exec_id\u0027s when the CLONE_PARENT\u0027ed\ntask exits.\n\nAlso, move down the \"p-\u003eparent_exec_id \u003d p-\u003eself_exec_id\" thing, to place\ntwo different cases together.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Serge E. Hallyn \u003cserge@hallyn.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f8a6b2b9cee298a9663cbe38ce1eb5240987cb62", "tree": "b356490269c9e77d164dcc1477792b882fbb8bdb", "parents": [ "ba1511bf7fbda452138e4096bf10d5a382710f4f", "071a0bc2ceace31266836801510879407a3701fa" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:44:22 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:44:22 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into x86/apic\n\nConflicts:\n\tarch/x86/kernel/acpi/boot.c\n\tarch/x86/mm/fault.c\n" }, { "commit": "e9c4ffb11f0b19005b5b9dc8481687a3637e5887", "tree": "7007f2ff846b9b057c5cd7c25e8b82e49f9b4b63", "parents": [ "4bcf349a0f90d1e69eb35c6df0fa285c886c1cd6", "071a0bc2ceace31266836801510879407a3701fa" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:34:07 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:34:07 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/kernel/acpi/boot.c\n" }, { "commit": "871cafcc962fa1655c44b4f0e54d4c5cc14e273c", "tree": "fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245", "parents": [ "cf2592f59c0e8ed4308adbdb2e0a88655379d579", "b578f3fcca1e78624dfb5f358776e63711d7fda2" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 12 13:08:57 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 12 13:08:57 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into core/softlockup\n" }, { "commit": "94dba895333a4321f27360e42b807260ae36bda4", "tree": "7b6381da7ea9fc176001dda0714725c3a1dd6cc7", "parents": [ "9ce04f9238cafcfd09a502f2bc8c13b5f44ec590", "4da94d49b2ecb0a26e716a8811c3ecc542c2a65d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 11 08:24:32 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 11 08:24:32 2009 -0800" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n timers: fix TIMER_ABSTIME for process wide cpu timers\n timers: split process wide cpu clocks/timers, fix\n x86: clean up hpet timer reinit\n timers: split process wide cpu clocks/timers, remove spurious warning\n timers: split process wide cpu clocks/timers\n signal: re-add dead task accumulation stats.\n x86: fix hpet timer reinit for x86_64\n sched: fix nohz load balancer on cpu offline\n" }, { "commit": "9ce04f9238cafcfd09a502f2bc8c13b5f44ec590", "tree": "f55b7c0ef48ea5b3bbd2971036ba54b666e8c4ce", "parents": [ "b3f2caaaa82440af06b39c2c92e4fa8122d75465", "06eb23b1ba39c61ee5d5faeb42a097635693e370" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 11 08:23:22 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 11 08:23:22 2009 -0800" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n ptrace, x86: fix the usage of ptrace_fork()\n i8327: fix outb() parameter order\n x86: fix math_emu register frame access\n x86: math_emu info cleanup\n x86: include correct %gs in a.out core dump\n x86, vmi: put a missing paravirt_release_pmd in pgd_dtor\n x86: find nr_irqs_gsi with mp_ioapic_routing\n x86: add clflush before monitor for Intel 7400 series\n x86: disable intel_iommu support by default\n x86: don\u0027t apply __supported_pte_mask to non-present ptes\n x86: fix grammar in user-visible BIOS warning\n x86/Kconfig.cpu: make Kconfig help readable in the console\n x86, 64-bit: print DMI info in the oops trace\n" }, { "commit": "06eb23b1ba39c61ee5d5faeb42a097635693e370", "tree": "a06f34d6ed32521ea32641df30732d9eb9d24757", "parents": [ "b52af40923fc91a12e3c7152d833e0c0c6a508f6" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Feb 09 02:02:33 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 11 10:32:46 2009 +0100" }, "message": "ptrace, x86: fix the usage of ptrace_fork()\n\nI noticed by pure accident we have ptrace_fork() and friends. This was\nadded by \"x86, bts: add fork and exit handling\", commit\nbf53de907dfdaac178c92d774aae7370d7b97d20.\n\nI can\u0027t test this, ds_request_bts() returns -EOPNOTSUPP, but I strongly\nbelieve this needs the fix. I think something like this program\n\n\tint main(void)\n\t{\n\t\tint pid \u003d fork();\n\n\t\tif (!pid) {\n\t\t\tptrace(PTRACE_TRACEME, 0, NULL, NULL);\n\t\t\tkill(getpid(), SIGSTOP);\n\t\t\tfork();\n\t\t} else {\n\t\t\tstruct ptrace_bts_config bts \u003d {\n\t\t\t\t.flags \u003d PTRACE_BTS_O_ALLOC,\n\t\t\t\t.size \u003d 4 * 4096,\n\t\t\t};\n\n\t\t\twait(NULL);\n\n\t\t\tptrace(PTRACE_SETOPTIONS, pid, NULL, PTRACE_O_TRACEFORK);\n\t\t\tptrace(PTRACE_BTS_CONFIG, pid, \u0026bts, sizeof(bts));\n\t\t\tptrace(PTRACE_CONT, pid, NULL, NULL);\n\n\t\t\tsleep(1);\n\t\t}\n\n\t\treturn 0;\n\t}\n\nshould crash the kernel.\n\nIf the task is traced by its natural parent ptrace_reparented() returns 0\nbut we should clear -\u003ebtsxxx anyway.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Markus Metzger \u003cmarkus.t.metzger@intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c", "tree": "aa2aac22a5b329b778a6771a87bbf1945ad49bbd", "parents": [ "d278c48435625cb6b7edcf6a547620768b175709", "8e4921515c1a379539607eb443d51c30f4f7f338" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 11 09:22:04 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 11 09:22:04 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc4\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/kernel/setup_percpu.c\n\tarch/x86/mm/fault.c\n\tdrivers/acpi/processor_idle.c\n\tkernel/irq/handle.c\n" }, { "commit": "17406b82d621930cca8ccc1272cdac9a7dae8e40", "tree": "224c8b0b7c78a5467175fe10e116bdc6b73495ea", "parents": [ "94be52dc075a32af4aa73d7e10f68734d62d6af2" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@google.com", "time": "Fri Feb 06 15:37:47 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Feb 09 11:03:49 2009 +0100" }, "message": "softlockup: remove timestamp checking from hung_task\n\nImpact: saves sizeof(long) bytes per task_struct\n\nBy guaranteeing that sysctl_hung_task_timeout_secs have elapsed between\ntasklist scans we can avoid using timestamps.\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@google.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "04ec93fe9bc98e3bd8560f79f56fed66dfae40d5", "tree": "ba7d1ca513641167f61d8d8bb56b832f63d98bca", "parents": [ "b2a740aab8f3bc2fd9f01528e39607bd9a1f0da6" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Fri Feb 06 08:17:19 2009 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 06 08:43:11 2009 -0800" }, "message": "fork.c: fix NULL pointer dereference when nr_threads \u003d\u003d threads-max\n\nI happened to forked lots of processes, and hit NULL pointer dereference.\nIt is because in copy_process() after checking max_threads, 0 is returned\nbut not -EAGAIN.\n\nThe bug is introduced by \"CRED: Detach the credentials from task_struct\"\n(commit f1752eec6145c97163dbce62d17cf5d928e28a27).\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "32bd671d6cbeda60dc73be77fa2b9037d9a9bfa0", "tree": "591c941b9f12ce9f3caefd112f0ada3c5fcc53ab", "parents": [ "83895147b702434e6f236deeca75211fd0e3da3a" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Feb 05 12:24:15 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 05 13:04:33 2009 +0100" }, "message": "signal: re-add dead task accumulation stats.\n\nWe\u0027re going to split the process wide cpu accounting into two parts:\n\n - clocks; which can take all the time they want since they run\n from user context.\n\n - timers; which need constant time tracing but can affort the overhead\n because they\u0027re default off -- and rare.\n\nThe clock readout will go back to a full sum of the thread group, for this\nwe need to re-add the exit stats that were removed in the initial itimer\nrework (f06febc9: timers: fix itimer/many thread hang).\n\nFurthermore, since that full sum can be rather slow for large thread groups\nand we have the complete dead task stats, revert the do_notify_parent time\ncomputation.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3ddeb51d9c83931c1ca6abf76a38934c5a1ed918", "tree": "fc2efb59d627135ea2199a8a68415b162646b121", "parents": [ "5a611268b69f05262936dd177205acbce4471358", "5ee810072175042775e39bdd3eaaa68884c27805" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jan 27 12:01:51 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jan 27 12:01:51 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into core/percpu\n\nConflicts:\n\tarch/x86/kernel/setup_percpu.c\n" }, { "commit": "1e70c7f7a9d4a3d2cc78b40e1d7768d99cd79899", "tree": "1218c32008412e57314f8f9db8d3b4912e2ecb25", "parents": [ "810ee58de26c9c1255d716b1db7344c4a1093fec", "1d4a7f1c4faf53eb9e822743ec8a70b3019a26d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 26 09:47:43 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 26 09:47:43 2009 -0800" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n hrtimers: fix inconsistent lock state on resume in hres_timers_resume\n time-sched.c: tick_nohz_update_jiffies should be static\n locking, hpet: annotate false positive warning\n kernel/fork.c: unused variable \u0027ret\u0027\n itimers: remove the per-cpu-ish-ness\n" }, { "commit": "bfe2a3c3b5bf479788d5d5c5561346be6b169043", "tree": "652c987279db7cd841d556f7bb1a589b57fbd6cc", "parents": [ "77835492ed489c0b870f82f4c50687bd267acc0a", "35d266a24796f02f63299cfe5009dfc0d5a0e820" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jan 23 10:20:15 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jan 23 10:20:15 2009 +0100" }, "message": "Merge branch \u0027core/percpu\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/include/asm/hardirq_32.h\n\tarch/x86/include/asm/hardirq_64.h\n\nSemantic merge:\n\tarch/x86/include/asm/hardirq.h\n\t[ added apic_perf_irqs field. ]\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "77835492ed489c0b870f82f4c50687bd267acc0a", "tree": "d80903ce1b8dd30aa44ccfc756616ad4d6c74d63", "parents": [ "af37501c792107c2bde1524bdae38d9a247b841a", "1de9e8e70f5acc441550ca75433563d91b269bbe" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 21 16:37:27 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 21 16:37:27 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc2\u0027 into perfcounters/core\n\nConflicts:\n\tinclude/linux/syscalls.h\n" }, { "commit": "198030782cedf25391e67e7c88b04f87a5eb6563", "tree": "5b7368c6bf052bcb4bb273497a57900720d36f51", "parents": [ "4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e", "92181f190b649f7ef2b79cbf5c00f26ccc66da2a" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 21 10:39:51 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 21 10:39:51 2009 +0100" }, "message": "Merge branch \u0027x86/mm\u0027 into core/percpu\n\nConflicts:\n\tarch/x86/mm/fault.c\n" }, { "commit": "b2b062b8163391c42b3219d466ca1ac9742b9c7b", "tree": "f3f920c09b8de694b1bc1d4b878cfd2b0b98c913", "parents": [ "a9de18eb761f7c1c860964b2e5addc1a35c7e861", "99937d6455cea95405ac681c86a857d0fcd530bd" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 18 18:37:14 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 18 18:37:14 2009 +0100" }, "message": "Merge branch \u0027core/percpu\u0027 into stackprotector\n\nConflicts:\n\tarch/x86/include/asm/pda.h\n\tarch/x86/include/asm/system.h\n\nAlso, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "af432eb1cc3178ec7109aca2283aafb1c12ccac1", "tree": "32b290ae6c1f07667b7e6044cc94e4efee58edfc", "parents": [ "e162b39a368f0401e41b558f430c354d12a85b37" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@google.com", "time": "Fri Jan 16 09:09:38 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jan 16 18:17:34 2009 +0100" }, "message": "softlockup: fix to allow compiling with !DETECT_HUNG_TASK\n\nFixes the following compile error:\n\n kernel/fork.c:1049: error: \u0027struct task_struct\u0027 has no member named \u0027last_switch_count\u0027\n kernel/fork.c:1050: error: \u0027struct task_struct\u0027 has no member named \u0027last_switch_timestamp\u0027\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@google.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6559eed8ca7db0531a207cd80be5e28cd6f213c5", "tree": "08d7a42d9eb8e7e9b7aa6930a07f1acecb35a282", "parents": [ "2e4d0924eb0c403ce4014fa139d1d61bf2c44fee" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:14:32 2009 +0100" }, "committer": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:15:30 2009 +0100" }, "message": "[CVE-2009-0029] System call wrappers part 30\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\n" }, { "commit": "17da2bd90abf428523de0fb98f7075e00e3ed42e", "tree": "4f2daf3cb792b7da62e6ae771b58902cc5ea24ab", "parents": [ "754fe8d297bfae7b77f7ce866e2fb0c5fb186506" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:14:10 2009 +0100" }, "committer": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:15:21 2009 +0100" }, "message": "[CVE-2009-0029] System call wrappers part 08\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\n" }, { "commit": "783adf42cf039083dd3c734c07c3bdc707e2bb15", "tree": "26bb2ff8c8e1bd285e0161154d83ce27dc459100", "parents": [ "d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a" ], "author": { "name": "Steven Noonan", "email": "steven@uplinklabs.net", "time": "Sun Jan 11 01:04:21 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 11 15:34:10 2009 +0100" }, "message": "kernel/fork.c: unused variable \u0027ret\u0027\n\nRemoved the unused variable.\n\nSigned-off-by: Steven Noonan \u003csteven@uplinklabs.net\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a", "tree": "250be7a5a29069f7d1f4524fa45ab0e988833025", "parents": [ "490dea45d00f01847ebebd007685d564aaf2cd98", "c59765042f53a79a7a65585042ff463b69cb248c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 11 15:34:05 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 11 15:34:05 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc1\u0027 into timers/urgent\n" }, { "commit": "506c10f26c481b7f8ef27c1c79290f68989b2e9e", "tree": "03de82e812f00957aa6276dac2fe51c3358e88d7", "parents": [ "e1df957670aef74ffd9a4ad93e6d2c90bf6b4845", "c59765042f53a79a7a65585042ff463b69cb248c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 11 02:42:53 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 11 02:42:53 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc1\u0027 into perfcounters/core\n\nConflicts:\n\tinclude/linux/kernel_stat.h\n" }, { "commit": "c40f6f8bbc4cbd2902671aacd587400ddca62627", "tree": "a991e5521e10943f4457fb7f494e00aec75cc7df", "parents": [ "1a7d0f0bec4be078ce2cfb11538c0f4ffbbed8e5", "cb6ff208076b5f434db1b8c983429269d719cef5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 09 14:00:58 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 09 14:00:58 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu:\n NOMMU: Support XIP on initramfs\n NOMMU: Teach kobjsize() about VMA regions.\n FLAT: Don\u0027t attempt to expand the userspace stack to fill the space allocated\n FDPIC: Don\u0027t attempt to expand the userspace stack to fill the space allocated\n NOMMU: Improve procfs output using per-MM VMAs\n NOMMU: Make mmap allocation page trimming behaviour configurable.\n NOMMU: Make VMAs per MM as for MMU-mode linux\n NOMMU: Delete askedalloc and realalloc variables\n NOMMU: Rename ARM\u0027s struct vm_region\n NOMMU: Fix cleanup handling in ramfs_nommu_get_umapped_area()\n" }, { "commit": "61bce0f1371cfff497fe85594fd39d1a0b15ebe1", "tree": "97871c4148856e39ffcc8a6ffec89495018729f1", "parents": [ "f9fb860f67b9542cd78d1558dec7058092b57d8e" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Jan 07 18:08:49 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 08:31:12 2009 -0800" }, "message": "pid: generalize task_active_pid_ns\n\nCurrently task_active_pid_ns is not safe to call after a task becomes a\nzombie and exit_task_namespaces is called, as nsproxy becomes NULL. By\nreading the pid namespace from the pid of the task we can trivially solve\nthis problem at the cost of one extra memory read in what should be the\nsame cacheline as we read the namespace from.\n\nWhen moving things around I have made task_active_pid_ns out of line\nbecause keeping it in pid_namespace.h would require adding includes of\npid.h and sched.h that I don\u0027t think we want.\n\nThis change does make task_active_pid_ns unsafe to call during\ncopy_process until we attach a pid on the task_struct which seems to be a\nreasonable trade off.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: Sukadev Bhattiprolu \u003csukadev@linux.vnet.ibm.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Bastian Blank \u003cbastian@waldi.eu.org\u003e\nCc: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nCc: Nadia Derbey \u003cNadia.Derbey@bull.net\u003e\nAcked-by: Serge Hallyn \u003cserue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8feae13110d60cc6287afabc2887366b0eb226c2", "tree": "b3188986faab70e753e00ea8670a11ba8ec844c0", "parents": [ "41836382ebb415d68d3ebc4525e78e871fe58baf" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Jan 08 12:04:47 2009 +0000" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Jan 08 12:04:47 2009 +0000" }, "message": "NOMMU: Make VMAs per MM as for MMU-mode linux\n\nMake VMAs per mm_struct as for MMU-mode linux. This solves two problems:\n\n (1) In SYSV SHM where nattch for a segment does not reflect the number of\n shmat\u0027s (and forks) done.\n\n (2) In mmap() where the VMA\u0027s vm_mm is set to point to the parent mm by an\n exec\u0027ing process when VM_EXECUTABLE is specified, regardless of the fact\n that a VMA might be shared and already have its vm_mm assigned to another\n process or a dead process.\n\nA new struct (vm_region) is introduced to track a mapped region and to remember\nthe circumstances under which it may be shared and the vm_list_struct structure\nis discarded as it\u0027s no longer required.\n\nThis patch makes the following additional changes:\n\n (1) Regions are now allocated with alloc_pages() rather than kmalloc() and\n with no recourse to __GFP_COMP, so the pages are not composite. Instead,\n each page has a reference on it held by the region. Anything else that is\n interested in such a page will have to get a reference on it to retain it.\n When the pages are released due to unmapping, each page is passed to\n put_page() and will be freed when the page usage count reaches zero.\n\n (2) Excess pages are trimmed after an allocation as the allocation must be\n made as a power-of-2 quantity of pages.\n\n (3) VMAs are added to the parent MM\u0027s R/B tree and mmap lists. As an MM may\n end up with overlapping VMAs within the tree, the VMA struct address is\n appended to the sort key.\n\n (4) Non-anonymous VMAs are now added to the backing inode\u0027s prio list.\n\n (5) Holes may be punched in anonymous VMAs with munmap(), releasing parts of\n the backing region. The VMA and region structs will be split if\n necessary.\n\n (6) sys_shmdt() only releases one attachment to a SYSV IPC shared memory\n segment instead of all the attachments at that addresss. Multiple\n shmat()\u0027s return the same address under NOMMU-mode instead of different\n virtual addresses as under MMU-mode.\n\n (7) Core dumping for ELF-FDPIC requires fewer exceptions for NOMMU-mode.\n\n (8) /proc/maps is now the global list of mapped regions, and may list bits\n that aren\u0027t actually mapped anywhere.\n\n (9) /proc/meminfo gains a line (tagged \"MmapCopy\") that indicates the amount\n of RAM currently allocated by mmap to hold mappable regions that can\u0027t be\n mapped directly. These are copies of the backing device or file if not\n anonymous.\n\nThese changes make NOMMU mode more similar to MMU mode. The downside is that\nNOMMU mode requires some extra memory to track things over NOMMU without this\npatch (VMAs are no longer shared, and there are now region structs).\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nTested-by: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "490dea45d00f01847ebebd007685d564aaf2cd98", "tree": "a1f559fd497b10c21479b378ffb262d517cb627b", "parents": [ "ede6f5aea054d3fb67c78857f7abdee602302043" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Mon Nov 24 17:06:57 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 07 18:52:44 2009 +0100" }, "message": "itimers: remove the per-cpu-ish-ness\n\nEither we bounce once cacheline per cpu per tick, yielding n^2 bounces\nor we just bounce a single..\n\nAlso, using per-cpu allocations for the thread-groups complicates the\nper-cpu allocator in that its currently aimed to be a fixed sized\nallocator and the only possible extention to that would be vmap based,\nwhich is seriously constrained on 32 bit archs.\n\nSo making the per-cpu memory requirement depend on the number of\nprocesses is an issue.\n\nLastly, it didn\u0027t deal with cpu-hotplug, although admittedly that might\nbe fixable.\n\nSigned-off-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4cb0e11b15d2badad455fcd538af0cccf05dc012", "tree": "49975df37debdb274aa1b9b09a127ad217a405c0", "parents": [ "9cd4fd10437dda6b520cb1410b28f36967a34de8" ], "author": { "name": "Hidehiro Kawai", "email": "hidehiro.kawai.ez@hitachi.com", "time": "Tue Jan 06 14:42:47 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:29 2009 -0800" }, "message": "coredump_filter: permit changing of the default filter\n\nIntroduce a new kernel parameter `coredump_filter\u0027. Setting a value to\nthis parameter causes the default bitmask of coredump_filter to be\nchanged.\n\nIt is useful for users to change coredump_filter settings for the whole\nsystem at boot time. Without this parameter, users have to change\ncoredump_filter settings for each /proc/\u003cpid\u003e/ in an initializing script.\n\nSigned-off-by: Hidehiro Kawai \u003chidehiro.kawai.ez@hitachi.com\u003e\nCc: Roland McGrath \u003croland@redhat.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": "60348802e9cb137ee86590c3e4c57c1ec2e8fc69", "tree": "0c8fb3de7410898643f992081650a307f17dea28", "parents": [ "f1883f86dea84fe47a71a39fc1afccc005915ed8" ], "author": { "name": "Zhaolei", "email": "zhaolei@cn.fujitsu.com", "time": "Tue Jan 06 14:40:46 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:11 2009 -0800" }, "message": "fork.c: cleanup for copy_sighand()\n\nCheck CLONE_SIGHAND only is enough, because combination of CLONE_THREAD and\nCLONE_SIGHAND is already done in copy_process().\n\nImpact: cleanup, no functionality changed\n\nSigned-off-by: Zhao Lei \u003czhaolei@cn.fujitsu.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a9de18eb761f7c1c860964b2e5addc1a35c7e861", "tree": "886e75fdfd09690cd262ca69cb7f5d1d42b48602", "parents": [ "b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40", "6a94cb73064c952255336cc57731904174b2c58f" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 31 08:31:57 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 31 08:31:57 2008 +0100" }, "message": "Merge branch \u0027linus\u0027 into stackprotector\n\nConflicts:\n\tarch/x86/include/asm/pda.h\n\tkernel/fork.c\n" }, { "commit": "e1df957670aef74ffd9a4ad93e6d2c90bf6b4845", "tree": "bca1fcfef55b3e3e82c9a822b4ac6428fce2b419", "parents": [ "2b583d8bc8d7105b58d7481a4a0ceb718dac49c6", "3c92ec8ae91ecf59d88c798301833d7cf83f2179" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Dec 29 09:45:15 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Dec 29 09:45:15 2008 +0100" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nConflicts:\n\tfs/exec.c\n\tinclude/linux/init_task.h\n\nSimple context conflicts.\n" }, { "commit": "abf137dd7712132ee56d5b3143c2ff61a72a5faa", "tree": "8334f03c598343bb93340f081fcde5ba659b440b", "parents": [ "392ddc32982a5c661dd90dd49a3cb37f1c68b782" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Tue Dec 09 08:11:22 2008 +0100" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Mon Dec 29 08:29:50 2008 +0100" }, "message": "aio: make the lookup_ioctx() lockless\n\nThe mm-\u003eioctx_list is currently protected by a reader-writer lock,\nso we always grab that lock on the read side for doing ioctx\nlookups. As the workload is extremely reader biased, turn this into\nan rcu hlist so we can make lookup_ioctx() lockless. Get rid of\nthe rwlock and use a spinlock for providing update side exclusion.\n\nThere\u0027s usually only 1 entry on this list, so it doesn\u0027t make sense\nto look into fancier data structures.\n\nReviewed-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "b0f4b285d7ed174804658539129a834270f4829a", "tree": "be7f8dca58075aba2c6a137fcfd4d44c5c333efc", "parents": [ "be9c5ae4eeec2e85527e95647348b8ea4eb25128", "5250d329e38cdf7580faeb9c53c17d3588d7d19c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 28 12:21:10 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 28 12:21:10 2008 -0800" }, "message": "Merge branch \u0027tracing-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (241 commits)\n sched, trace: update trace_sched_wakeup()\n tracing/ftrace: don\u0027t trace on early stage of a secondary cpu boot, v3\n Revert \"x86: disable X86_PTRACE_BTS\"\n ring-buffer: prevent false positive warning\n ring-buffer: fix dangling commit race\n ftrace: enable format arguments checking\n x86, bts: memory accounting\n x86, bts: add fork and exit handling\n ftrace: introduce tracing_reset_online_cpus() helper\n tracing: fix warnings in kernel/trace/trace_sched_switch.c\n tracing: fix warning in kernel/trace/trace.c\n tracing/ring-buffer: remove unused ring_buffer size\n trace: fix task state printout\n ftrace: add not to regex on filtering functions\n trace: better use of stack_trace_enabled for boot up code\n trace: add a way to enable or disable the stack tracer\n x86: entry_64 - introduce FTRACE_ frame macro v2\n tracing/ftrace: add the printk-msg-only option\n tracing/ftrace: use preempt_enable_no_resched_notrace in ring_buffer_time_stamp()\n x86, bts: correctly report invalid bts records\n ...\n\nFixed up trivial conflict in scripts/recordmcount.pl due to SH bits\nbeing already partly merged by the SH merge.\n" }, { "commit": "cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db", "tree": "90d1093131d2a3543a8b3b1f3364e7c6f4081a93", "parents": [ "4a6908a3a050aacc9c3a2f36b276b46c0629ad91", "74192246910ff4fb95309ba1a683215644beeb62" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Dec 25 11:40:09 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Dec 25 11:40:09 2008 +1100" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "bf53de907dfdaac178c92d774aae7370d7b97d20", "tree": "738a07a8b4b22f7bb8ec2029c9ea9c635db6c62a", "parents": [ "30cd324e9787ccc9a5ede59742d5409857550692" ], "author": { "name": "Markus Metzger", "email": "markus.t.metzger@intel.com", "time": "Fri Dec 19 15:10:24 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Dec 20 09:15:46 2008 +0100" }, "message": "x86, bts: add fork and exit handling\n\nImpact: introduce new ptrace facility\n\nAdd arch_ptrace_untrace() function that is called when the tracer\ndetaches (either voluntarily or when the tracing task dies);\nptrace_disable() is only called on a voluntary detach.\n\nAdd ptrace_fork() and arch_ptrace_fork(). They are called when a\ntraced task is forked.\n\nClear DS and BTS related fields on fork.\n\nRelease DS resources and reclaim memory in ptrace_untrace(). This\nreleases resources already when the tracing task dies. We used to do\nthat when the traced task dies.\n\nSigned-off-by: Markus Metzger \u003cmarkus.t.metzger@intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "30cd324e9787ccc9a5ede59742d5409857550692", "tree": "e53027e0283119de0ef4c3a431b1d20cd43003fb", "parents": [ "c71dd42db2c6f1637b92502a214587431c1a6ad2", "6d102bc68f3dd2ae0e305b09170b1751aa67baeb", "3d9101e92529e1ff6014f95a69afc82f37b9b13a" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Dec 19 09:42:40 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Dec 19 09:42:40 2008 +0100" }, "message": "Merge branches \u0027tracing/ftrace\u0027, \u0027tracing/ring-buffer\u0027 and \u0027tracing/urgent\u0027 into tracing/core\n\nConflicts:\n\tinclude/linux/ftrace.h\n" }, { "commit": "92bf73e90a35d40ebc1446488218f03833b36f86", "tree": "8aaae58fcb7f3e06e63a5214f910acf47f4cc9d6", "parents": [ "447557ac7ce120306b4a31d6003faef39cb1bf14", "915b0d0104b72fd36af088ba4b11b5690bc96a6c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Dec 12 12:00:02 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Dec 12 12:00:14 2008 +0100" }, "message": "Merge branch \u0027x86/irq\u0027 into perfcounters/core\n\n( with manual semantic merge of arch/x86/kernel/cpu/perf_counter.c )\n" }, { "commit": "b88ed20594db2c685555b68c52b693b75738b2f5", "tree": "a8edcf975fb8437692bf670841859d4ac9fbd2f0", "parents": [ "f4fd2c5b6f691ff71614acbc28461b3c1488c81b" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Wed Dec 10 20:48:52 2008 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 10 14:40:45 2008 -0800" }, "message": "fix mapping_writably_mapped()\n\nLee Schermerhorn noticed yesterday that I broke the mapping_writably_mapped\ntest in 2.6.7! Bad bad bug, good good find.\n\nThe i_mmap_writable count must be incremented for VM_SHARED (just as\ni_writecount is for VM_DENYWRITE, but while holding the i_mmap_lock)\nwhen dup_mmap() copies the vma for fork: it has its own more optimal\nversion of __vma_link_file(), and I missed this out. So the count\nwas later going down to 0 (dangerous) when one end unmapped, then\nwrapping negative (inefficient) when the other end unmapped.\n\nThe only impact on x86 would have been that setting a mandatory lock on\na file which has at some time been opened O_RDWR and mapped MAP_SHARED\n(but not necessarily PROT_WRITE) across a fork, might fail with -EAGAIN\nwhen it should succeed, or succeed when it should fail.\n\nBut those architectures which rely on flush_dcache_page() to flush\nuserspace modifications back into the page before the kernel reads it,\nmay in some cases have skipped the flush after such a fork - though any\nrepetitive test will soon wrap the count negative, in which case it will\nflush_dcache_page() unnecessarily.\n\nFix would be a two-liner, but mapping variable added, and comment moved.\n\nReported-by: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a64e64944f4b8ce3288519555dbaa0232414b8ac", "tree": "6b37f5444c49379580b6b4fead84a75ca474d0ab", "parents": [ "a3f07114e3359fb98683069ae397220e8992a24a" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Nov 12 18:37:41 2008 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Dec 09 02:27:38 2008 -0500" }, "message": "[PATCH] return records for fork() both to child and parent\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "0793a61d4df8daeac6492dbf8d2f3e5713caae5e", "tree": "cc9603eb8daffeb7ace521c42a6a44db164ac551", "parents": [ "b5aa97e83bcc31a96374d18f5452d53909a16c90" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Dec 04 20:12:29 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Dec 08 15:47:03 2008 +0100" }, "message": "performance counters: core code\n\nImplement the core kernel bits of Performance Counters subsystem.\n\nThe Linux Performance Counter subsystem provides an abstraction of\nperformance counter hardware capabilities. It provides per task and per\nCPU counters, and it provides event capabilities on top of those.\n\nPerformance counters are accessed via special file descriptors.\nThere\u0027s one file descriptor per virtual counter used.\n\nThe special file descriptor is opened via the perf_counter_open()\nsystem call:\n\n int\n perf_counter_open(u32 hw_event_type,\n u32 hw_event_period,\n u32 record_type,\n pid_t pid,\n int cpu);\n\nThe syscall returns the new fd. The fd can be used via the normal\nVFS system calls: read() can be used to read the counter, fcntl()\ncan be used to set the blocking mode, etc.\n\nMultiple counters can be kept open at a time, and the counters\ncan be poll()ed.\n\nSee more details in Documentation/perf-counters.txt.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "7657d90497f98426af17f0ac633a9b335bb7a8fb", "tree": "6344dc4715a85383f6492a4102ae406c6b86d79d", "parents": [ "c37bbb0fdcc01610fd55604eb6927210a1d20044" ], "author": { "name": "Serge E. Hallyn", "email": "serue@us.ibm.com", "time": "Wed Dec 03 13:17:33 2008 -0600" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Dec 08 09:16:27 2008 +1100" }, "message": "user namespaces: require cap_set{ug}id for CLONE_NEWUSER\n\nWhile ideally CLONE_NEWUSER will eventually require no\nprivilege, the required permission checks are currently\nnot there. As a result, CLONE_NEWUSER has the same effect\nas a setuid(0)+setgroups(1,\"0\"). While we already require\nCAP_SYS_ADMIN, requiring CAP_SETUID and CAP_SETGID seems\nappropriate.\n\nSigned-off-by: Serge E. Hallyn \u003cserue@us.ibm.com\u003e\nAcked-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "e8e1abe92fd7ea9d823a3aaf81d10e2cba593b6b", "tree": "9ddeaf43558b2ad13c6b4758b17b84781f0217a7", "parents": [ "0a37119d963e876ca86912497346ec50dea2541b" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Wed Dec 03 11:04:51 2008 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 03 17:15:03 2008 +0100" }, "message": "ftrace: fix race in function graph during fork\n\nImpact: graph tracer race/crash fix\n\nThere is a nasy race in startup of a new process running the\nfunction graph tracer. In fork.c:\n\n\ttotal_forks++;\n\tspin_unlock(\u0026current-\u003esighand-\u003esiglock);\n\twrite_unlock_irq(\u0026tasklist_lock);\n\tftrace_graph_init_task(p);\n\tproc_fork_connector(p);\n\tcgroup_post_fork(p);\n\treturn p;\n\nThe new task is free to run as soon as the tasklist_lock is released.\nThis is before the ftrace_graph_init_task. If the task does run\nit will be using the same ret_stack and curr_ret_stack as the parent.\nThis will cause crashes that are difficult to debug.\n\nThis patch moves the ftrace_graph_init_task to just after the alloc_pid\ncode. This fixes the above race.\n\nSigned-off-by: Steven Rostedt \u003csrostedt@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "fb52607afcd0629776f1dc9e657647ceae81dd50", "tree": "7bf43b41ff8510d3098c089913cce56a9049f0fd", "parents": [ "509dceef6470442d8c7b8a43ec34125205840b3c" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Nov 25 21:07:04 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Nov 26 01:59:45 2008 +0100" }, "message": "tracing/function-return-tracer: change the name into function-graph-tracer\n\nImpact: cleanup\n\nThis patch changes the name of the \"return function tracer\" into\nfunction-graph-tracer which is a more suitable name for a tracing\nwhich makes one able to retrieve the ordered call stack during\nthe code flow.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "18b6e0414e42d95183f07d8177e3ff0241abd825", "tree": "91ca2f2d442055e31eb7bb551bf7060f3f4c4cc7", "parents": [ "9789cfe22e5d7bc10cad841a4ea96ecedb34b267" ], "author": { "name": "Serge Hallyn", "email": "serue@us.ibm.com", "time": "Wed Oct 15 16:38:45 2008 -0500" }, "committer": { "name": "Serge E. Hallyn", "email": "serue@us.ibm.com", "time": "Mon Nov 24 18:57:41 2008 -0500" }, "message": "User namespaces: set of cleanups (v2)\n\nThe user_ns is moved from nsproxy to user_struct, so that a struct\ncred by itself is sufficient to determine access (which it otherwise\nwould not be). Corresponding ecryptfs fixes (by David Howells) are\nhere as well.\n\nFix refcounting. The following rules now apply:\n 1. The task pins the user struct.\n 2. The user struct pins its user namespace.\n 3. The user namespace pins the struct user which created it.\n\nUser namespaces are cloned during copy_creds(). Unsharing a new user_ns\nis no longer possible. (We could re-add that, but it\u0027ll cause code\nduplication and doesn\u0027t seem useful if PAM doesn\u0027t need to clone user\nnamespaces).\n\nWhen a user namespace is created, its first user (uid 0) gets empty\nkeyrings and a clean group_info.\n\nThis incorporates a previous patch by David Howells. Here\nis his original patch description:\n\n\u003eI suggest adding the attached incremental patch. It makes the following\n\u003echanges:\n\u003e\n\u003e (1) Provides a current_user_ns() macro to wrap accesses to current\u0027s user\n\u003e namespace.\n\u003e\n\u003e (2) Fixes eCryptFS.\n\u003e\n\u003e (3) Renames create_new_userns() to create_user_ns() to be more consistent\n\u003e with the other associated functions and because the \u0027new\u0027 in the name is\n\u003e superfluous.\n\u003e\n\u003e (4) Moves the argument and permission checks made for CLONE_NEWUSER to the\n\u003e beginning of do_fork() so that they\u0027re done prior to making any attempts\n\u003e at allocation.\n\u003e\n\u003e (5) Calls create_user_ns() after prepare_creds(), and gives it the new creds\n\u003e to fill in rather than have it return the new root user. I don\u0027t imagine\n\u003e the new root user being used for anything other than filling in a cred\n\u003e struct.\n\u003e\n\u003e This also permits me to get rid of a get_uid() and a free_uid(), as the\n\u003e reference the creds were holding on the old user_struct can just be\n\u003e transferred to the new namespace\u0027s creator pointer.\n\u003e\n\u003e (6) Makes create_user_ns() reset the UIDs and GIDs of the creds under\n\u003e preparation rather than doing it in copy_creds().\n\u003e\n\u003eDavid\n\n\u003eSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n\nChangelog:\n\tOct 20: integrate dhowells comments\n\t\t1. leave thread_keyring alone\n\t\t2. use current_user_ns() in set_user()\n\nSigned-off-by: Serge Hallyn \u003cserue@us.ibm.com\u003e\n" }, { "commit": "65afa5e603d507014580ead016ec887b49e1afa6", "tree": "0ee309e4193e90587b2febda09143891e0591cdc", "parents": [ "eae849ca034c7f1015f0a6f17421ebc737f0a069" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Nov 23 18:43:39 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 23 22:34:02 2008 +0100" }, "message": "tracing/function-return-tracer: free the return stack on free_task()\n\nImpact: avoid losing some traces when a task is freed\n\ndo_exit() is not the last function called when a task finishes.\nThere are still some functions which are to be called such as\nree_task(). So we delay the freeing of the return stack to the\nlast moment.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "82f60f0bc854aada696f27d863c03bef91f1509d", "tree": "521fbccfc12f6c8a36f261b20eacbc84a4a31add", "parents": [ "f201ae2356c74bcae130b2177b3dca903ea98071" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 23 09:18:56 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 23 09:19:35 2008 +0100" }, "message": "tracing/function-return-tracer: clean up task start/exit callbacks\n\nImpact: cleanup\n\nEliminate #ifdefs in core code by using empty inline functions.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f201ae2356c74bcae130b2177b3dca903ea98071", "tree": "c4b1b43fbe0a4594cb86749b2e7098fe15eb86ba", "parents": [ "a0a70c735ef714fe1b6777b571630c3d50c7b008" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sun Nov 23 06:22:56 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 23 09:17:26 2008 +0100" }, "message": "tracing/function-return-tracer: store return stack into task_struct and allocate it dynamically\n\nImpact: use deeper function tracing depth safely\n\nSome tests showed that function return tracing needed a more deeper depth\nof function calls. But it could be unsafe to store these return addresses\nto the stack.\n\nSo these arrays will now be allocated dynamically into task_struct of current\nonly when the tracer is activated.\n\nTypical scheme when tracer is activated:\n- allocate a return stack for each task in global list.\n- fork: allocate the return stack for the newly created task\n- exit: free return stack of current\n- idle init: same as fork\n\nI chose a default depth of 50. I don\u0027t have overruns anymore.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9676e73a9e0cbdc521e1ebf4e13e6e5aada34247", "tree": "b5ea1cace6c4f2f57fcebfc42418b7f53fee84e5", "parents": [ "5a209c2d58e70f9bc415b9cdf0e3b9aaefb70371", "86fa2f60674540df0b34f5c547ed0c1cf3a8f212", "6d5b43a67accf6793ed259f6534b4bd53b1e5696" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Nov 19 10:04:25 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Nov 19 10:04:25 2008 +0100" }, "message": "Merge branches \u0027tracing/ftrace\u0027 and \u0027tracing/urgent\u0027 into tracing/core\n\nConflicts:\n\tkernel/trace/ftrace.c\n\n[ We conflicted here because we backported a few fixes to\n tracing/urgent - which has different internal APIs. ]\n" }, { "commit": "f3a5c547012a09f38f7c27b17a8e3150b69cd259", "tree": "4d1d47382a4a445fc7ef7431bcf5d06b7cca8539", "parents": [ "e50a906e0200084f04f8f3b7c3a14b0442d1347f", "4e14e833ac3b97a4aa8803eea49f899adc5bb5f4" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Nov 18 18:52:37 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Nov 18 18:52:37 2008 +1100" }, "message": "Merge branch \u0027master\u0027 into next\n\nConflicts:\n\tfs/cifs/misc.c\n\nMerge to resolve above, per the patch below.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n\ndiff --cc fs/cifs/misc.c\nindex ec36410,addd1dc..0000000\n--- a/fs/cifs/misc.c\n+++ b/fs/cifs/misc.c\n@@@ -347,13 -338,13 +338,13 @@@ header_assemble(struct smb_hdr *buffer\n \t\t/* BB Add support for establishing new tCon and SMB Session */\n \t\t/* with userid/password pairs found on the smb session */\n \t\t/*\tfor other target tcp/ip addresses \t\tBB */\n -\t\t\t\tif (current-\u003efsuid !\u003d treeCon-\u003eses-\u003elinux_uid) {\n +\t\t\t\tif (current_fsuid() !\u003d treeCon-\u003eses-\u003elinux_uid) {\n \t\t\t\t\tcFYI(1, (\"Multiuser mode and UID \"\n \t\t\t\t\t\t \"did not match tcon uid\"));\n- \t\t\t\t\tread_lock(\u0026GlobalSMBSeslock);\n- \t\t\t\t\tlist_for_each(temp_item, \u0026GlobalSMBSessionList) {\n- \t\t\t\t\t\tses \u003d list_entry(temp_item, struct cifsSesInfo, cifsSessionList);\n+ \t\t\t\t\tread_lock(\u0026cifs_tcp_ses_lock);\n+ \t\t\t\t\tlist_for_each(temp_item, \u0026treeCon-\u003eses-\u003eserver-\u003esmb_ses_list) {\n+ \t\t\t\t\t\tses \u003d list_entry(temp_item, struct cifsSesInfo, smb_ses_list);\n -\t\t\t\t\t\tif (ses-\u003elinux_uid \u003d\u003d current-\u003efsuid) {\n +\t\t\t\t\t\tif (ses-\u003elinux_uid \u003d\u003d current_fsuid()) {\n \t\t\t\t\t\t\tif (ses-\u003eserver \u003d\u003d treeCon-\u003eses-\u003eserver) {\n \t\t\t\t\t\t\t\tcFYI(1, (\"found matching uid substitute right smb_uid\"));\n \t\t\t\t\t\t\t\tbuffer-\u003eUid \u003d ses-\u003eSuid;\n" }, { "commit": "7e066fb870fcd1025ec3ba7bbde5d541094f4ce1", "tree": "52acda06de25c029b9834110d7bf6b4abc50353b", "parents": [ "32f85742778dfc2c74975cf0b9f5bdb13470cb32" ], "author": { "name": "Mathieu Desnoyers", "email": "mathieu.desnoyers@polymtl.ca", "time": "Fri Nov 14 17:47:47 2008 -0500" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 16 09:01:36 2008 +0100" }, "message": "tracepoints: add DECLARE_TRACE() and DEFINE_TRACE()\n\nImpact: API *CHANGE*. Must update all tracepoint users.\n\nAdd DEFINE_TRACE() to tracepoints to let them declare the tracepoint\nstructure in a single spot for all the kernel. It helps reducing memory\nconsumption, especially when declaring a lot of tracepoints, e.g. for\nkmalloc tracing.\n\n*API CHANGE WARNING*: now, DECLARE_TRACE() must be used in headers for\ntracepoint declarations rather than DEFINE_TRACE(). This is the sane way\nto do it. The name previously used was misleading.\n\nUpdates scheduler instrumentation to follow this API change.\n\nSigned-off-by: Mathieu Desnoyers \u003cmathieu.desnoyers@polymtl.ca\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "8141c7f3e7aee618312fa1c15109e1219de784a7", "tree": "25513fc1c260af053fb9facf92df5b59bfe74c3a", "parents": [ "9c7c354645535555785eb937dd46388b55e690d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 15 10:20:36 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 15 10:20:36 2008 -0800" }, "message": "Move \"exit_robust_list\" into mm_release()\n\nWe don\u0027t want to get rid of the futexes just at exit() time, we want to\ndrop them when doing an execve() too, since that gets rid of the\nprevious VM image too.\n\nDoing it at mm_release() time means that we automatically always do it\nwhen we disassociate a VM map from the task.\n\nReported-by: pageexec@freemail.hu\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Brad Spengler \u003cspender@grsecurity.net\u003e\nCc: Alex Efros \u003cpowerman@powerman.name\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3b11a1decef07c19443d24ae926982bc8ec9f4c0", "tree": "b6555f0e5b07f4b2badd332a0a900b974920c49d", "parents": [ "98870ab0a5a3f1822aee681d2997017e1c87d026" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Nov 14 10:39:26 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 10:39:26 2008 +1100" }, "message": "CRED: Differentiate objective and effective subjective credentials on a task\n\nDifferentiate the objective and real subjective credentials from the effective\nsubjective credentials on a task by introducing a second credentials pointer\ninto the task_struct.\n\ntask_struct::real_cred then refers to the objective and apparent real\nsubjective credentials of a task, as perceived by the other tasks in the\nsystem.\n\ntask_struct::cred then refers to the effective subjective credentials of a\ntask, as used by that task when it\u0027s actually running. These are not visible\nto the other tasks in the system.\n\n__task_cred(task) then refers to the objective/real credentials of the task in\nquestion.\n\ncurrent_cred() refers to the effective subjective credentials of the current\ntask.\n\nprepare_creds() uses the objective creds as a base and commit_creds() changes\nboth pointers in the task_struct (indeed commit_creds() requires them to be the\nsame).\n\noverride_creds() and revert_creds() change the subjective creds pointer only,\nand the former returns the old subjective creds. These are used by NFSD,\nfaccessat() and do_coredump(), and will by used by CacheFiles.\n\nIn SELinux, current_has_perm() is provided as an alternative to\ntask_has_perm(). This uses the effective subjective context of current,\nwhereas task_has_perm() uses the objective/real context of the subject.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "d84f4f992cbd76e8f39c488cf0c5d123843923b1", "tree": "fc4a0349c42995715b93d0f7a3c78e9ea9b3f36e", "parents": [ "745ca2475a6ac596e3d8d37c2759c0fbe2586227" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Nov 14 10:39:23 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 10:39:23 2008 +1100" }, "message": "CRED: Inaugurate COW credentials\n\nInaugurate copy-on-write credentials management. This uses RCU to manage the\ncredentials pointer in the task_struct with respect to accesses by other tasks.\nA process may only modify its own credentials, and so does not need locking to\naccess or modify its own credentials.\n\nA mutex (cred_replace_mutex) is added to the task_struct to control the effect\nof PTRACE_ATTACHED on credential calculations, particularly with respect to\nexecve().\n\nWith this patch, the contents of an active credentials struct may not be\nchanged directly; rather a new set of credentials must be prepared, modified\nand committed using something like the following sequence of events:\n\n\tstruct cred *new \u003d prepare_creds();\n\tint ret \u003d blah(new);\n\tif (ret \u003c 0) {\n\t\tabort_creds(new);\n\t\treturn ret;\n\t}\n\treturn commit_creds(new);\n\nThere are some exceptions to this rule: the keyrings pointed to by the active\ncredentials may be instantiated - keyrings violate the COW rule as managing\nCOW keyrings is tricky, given that it is possible for a task to directly alter\nthe keys in a keyring in use by another task.\n\nTo help enforce this, various pointers to sets of credentials, such as those in\nthe task_struct, are declared const. The purpose of this is compile-time\ndiscouragement of altering credentials through those pointers. Once a set of\ncredentials has been made public through one of these pointers, it may not be\nmodified, except under special circumstances:\n\n (1) Its reference count may incremented and decremented.\n\n (2) The keyrings to which it points may be modified, but not replaced.\n\nThe only safe way to modify anything else is to create a replacement and commit\nusing the functions described in Documentation/credentials.txt (which will be\nadded by a later patch).\n\nThis patch and the preceding patches have been tested with the LTP SELinux\ntestsuite.\n\nThis patch makes several logical sets of alteration:\n\n (1) execve().\n\n This now prepares and commits credentials in various places in the\n security code rather than altering the current creds directly.\n\n (2) Temporary credential overrides.\n\n do_coredump() and sys_faccessat() now prepare their own credentials and\n temporarily override the ones currently on the acting thread, whilst\n preventing interference from other threads by holding cred_replace_mutex\n on the thread being dumped.\n\n This will be replaced in a future patch by something that hands down the\n credentials directly to the functions being called, rather than altering\n the task\u0027s objective credentials.\n\n (3) LSM interface.\n\n A number of functions have been changed, added or removed:\n\n (*) security_capset_check(), -\u003ecapset_check()\n (*) security_capset_set(), -\u003ecapset_set()\n\n \t Removed in favour of security_capset().\n\n (*) security_capset(), -\u003ecapset()\n\n \t New. This is passed a pointer to the new creds, a pointer to the old\n \t creds and the proposed capability sets. It should fill in the new\n \t creds or return an error. All pointers, barring the pointer to the\n \t new creds, are now const.\n\n (*) security_bprm_apply_creds(), -\u003ebprm_apply_creds()\n\n \t Changed; now returns a value, which will cause the process to be\n \t killed if it\u0027s an error.\n\n (*) security_task_alloc(), -\u003etask_alloc_security()\n\n \t Removed in favour of security_prepare_creds().\n\n (*) security_cred_free(), -\u003ecred_free()\n\n \t New. Free security data attached to cred-\u003esecurity.\n\n (*) security_prepare_creds(), -\u003ecred_prepare()\n\n \t New. Duplicate any security data attached to cred-\u003esecurity.\n\n (*) security_commit_creds(), -\u003ecred_commit()\n\n \t New. Apply any security effects for the upcoming installation of new\n \t security by commit_creds().\n\n (*) security_task_post_setuid(), -\u003etask_post_setuid()\n\n \t Removed in favour of security_task_fix_setuid().\n\n (*) security_task_fix_setuid(), -\u003etask_fix_setuid()\n\n \t Fix up the proposed new credentials for setuid(). This is used by\n \t cap_set_fix_setuid() to implicitly adjust capabilities in line with\n \t setuid() changes. Changes are made to the new credentials, rather\n \t than the task itself as in security_task_post_setuid().\n\n (*) security_task_reparent_to_init(), -\u003etask_reparent_to_init()\n\n \t Removed. Instead the task being reparented to init is referred\n \t directly to init\u0027s credentials.\n\n\t NOTE! This results in the loss of some state: SELinux\u0027s osid no\n\t longer records the sid of the thread that forked it.\n\n (*) security_key_alloc(), -\u003ekey_alloc()\n (*) security_key_permission(), -\u003ekey_permission()\n\n \t Changed. These now take cred pointers rather than task pointers to\n \t refer to the security context.\n\n (4) sys_capset().\n\n This has been simplified and uses less locking. The LSM functions it\n calls have been merged.\n\n (5) reparent_to_kthreadd().\n\n This gives the current thread the same credentials as init by simply using\n commit_thread() to point that way.\n\n (6) __sigqueue_alloc() and switch_uid()\n\n __sigqueue_alloc() can\u0027t stop the target task from changing its creds\n beneath it, so this function gets a reference to the currently applicable\n user_struct which it then passes into the sigqueue struct it returns if\n successful.\n\n switch_uid() is now called from commit_creds(), and possibly should be\n folded into that. commit_creds() should take care of protecting\n __sigqueue_alloc().\n\n (7) [sg]et[ug]id() and co and [sg]et_current_groups.\n\n The set functions now all use prepare_creds(), commit_creds() and\n abort_creds() to build and check a new set of credentials before applying\n it.\n\n security_task_set[ug]id() is called inside the prepared section. This\n guarantees that nothing else will affect the creds until we\u0027ve finished.\n\n The calling of set_dumpable() has been moved into commit_creds().\n\n Much of the functionality of set_user() has been moved into\n commit_creds().\n\n The get functions all simply access the data directly.\n\n (8) security_task_prctl() and cap_task_prctl().\n\n security_task_prctl() has been modified to return -ENOSYS if it doesn\u0027t\n want to handle a function, or otherwise return the return value directly\n rather than through an argument.\n\n Additionally, cap_task_prctl() now prepares a new set of credentials, even\n if it doesn\u0027t end up using it.\n\n (9) Keyrings.\n\n A number of changes have been made to the keyrings code:\n\n (a) switch_uid_keyring(), copy_keys(), exit_keys() and suid_keys() have\n \t all been dropped and built in to the credentials functions directly.\n \t They may want separating out again later.\n\n (b) key_alloc() and search_process_keyrings() now take a cred pointer\n \t rather than a task pointer to specify the security context.\n\n (c) copy_creds() gives a new thread within the same thread group a new\n \t thread keyring if its parent had one, otherwise it discards the thread\n \t keyring.\n\n (d) The authorisation key now points directly to the credentials to extend\n \t the search into rather pointing to the task that carries them.\n\n (e) Installing thread, process or session keyrings causes a new set of\n \t credentials to be created, even though it\u0027s not strictly necessary for\n \t process or session keyrings (they\u0027re shared).\n\n(10) Usermode helper.\n\n The usermode helper code now carries a cred struct pointer in its\n subprocess_info struct instead of a new session keyring pointer. This set\n of credentials is derived from init_cred and installed on the new process\n after it has been cloned.\n\n call_usermodehelper_setup() allocates the new credentials and\n call_usermodehelper_freeinfo() discards them if they haven\u0027t been used. A\n special cred function (prepare_usermodeinfo_creds()) is provided\n specifically for call_usermodehelper_setup() to call.\n\n call_usermodehelper_setkeys() adjusts the credentials to sport the\n supplied keyring as the new session keyring.\n\n(11) SELinux.\n\n SELinux has a number of changes, in addition to those to support the LSM\n interface changes mentioned above:\n\n (a) selinux_setprocattr() no longer does its check for whether the\n \t current ptracer can access processes with the new SID inside the lock\n \t that covers getting the ptracer\u0027s SID. Whilst this lock ensures that\n \t the check is done with the ptracer pinned, the result is only valid\n \t until the lock is released, so there\u0027s no point doing it inside the\n \t lock.\n\n(12) is_single_threaded().\n\n This function has been extracted from selinux_setprocattr() and put into\n a file of its own in the lib/ directory as join_session_keyring() now\n wants to use it too.\n\n The code in SELinux just checked to see whether a task shared mm_structs\n with other tasks (CLONE_VM), but that isn\u0027t good enough. We really want\n to know if they\u0027re part of the same thread group (CLONE_THREAD).\n\n(13) nfsd.\n\n The NFS server daemon now has to use the COW credentials to set the\n credentials it is going to use. It really needs to pass the credentials\n down to the functions it calls, but it can\u0027t do that until other patches\n in this series have been applied.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "bb952bb98a7e479262c7eb25d5592545a3af147d", "tree": "9a2158c07a22a5fbddcec412944d2e7534eecc8f", "parents": [ "275bb41e9d058fbb327e7642f077e1beaeac162e" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Nov 14 10:39:20 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 10:39:20 2008 +1100" }, "message": "CRED: Separate per-task-group keyrings from signal_struct\n\nSeparate per-task-group keyrings from signal_struct and dangle their anchor\nfrom the cred struct rather than the signal_struct.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nReviewed-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "f1752eec6145c97163dbce62d17cf5d928e28a27", "tree": "16bc51166d38815092de36a461b845b0b4b522f9", "parents": [ "b6dff3ec5e116e3af6f537d4caedcad6b9e5082a" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Nov 14 10:39:17 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 10:39:17 2008 +1100" }, "message": "CRED: Detach the credentials from task_struct\n\nDetach the credentials from task_struct, duplicating them in copy_process()\nand releasing them in __put_task_struct().\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: James Morris \u003cjmorris@namei.org\u003e\nAcked-by: Serge Hallyn \u003cserue@us.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "b6dff3ec5e116e3af6f537d4caedcad6b9e5082a", "tree": "9e76f972eb7ce9b84e0146c8e4126a3f86acb428", "parents": [ "15a2460ed0af7538ca8e6c610fe607a2cd9da142" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Nov 14 10:39:16 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 10:39:16 2008 +1100" }, "message": "CRED: Separate task security context from task_struct\n\nSeparate the task security context from task_struct. At this point, the\nsecurity data is temporarily embedded in the task_struct with two pointers\npointing to it.\n\nNote that the Alpha arch is altered as it refers to (E)UID and (E)GID in\nentry.S via asm-offsets.\n\nWith comment fixes Signed-off-by: Marc Dionne \u003cmarc.c.dionne@gmail.com\u003e\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: James Morris \u003cjmorris@namei.org\u003e\nAcked-by: Serge Hallyn \u003cserue@us.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "268a3dcfea2077fca60d3715caa5c96f9b5e6ea7", "tree": "c2232774508424e677e27f296090a68c775e4669", "parents": [ "c4bd822e7b12a9008241d76db45b665f2fef180c", "592aa999d6a272856c9bfbdaac0cfba1bb37c24c" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Oct 22 09:48:06 2008 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Oct 22 09:48:06 2008 +0200" }, "message": "Merge branch \u0027timers/range-hrtimers\u0027 into v28-range-hrtimers-for-linus-v2\n\nConflicts:\n\n\tkernel/time/tick-sched.c\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "92b29b86fe2e183d44eb467e5e74a5f718ef2e43", "tree": "1bac8a1aa11d47322b66d10ec3a370016d843d06", "parents": [ "b9d7ccf56be1ac77b71a284a1c0e6337f9a7aff0", "98d9c66ab07471006fd7910cb16453581c41a3e7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 13:35:07 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 13:35:07 2008 -0700" }, "message": "Merge branch \u0027tracing-v28-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-v28-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (131 commits)\n tracing/fastboot: improve help text\n tracing/stacktrace: improve help text\n tracing/fastboot: fix initcalls disposition in bootgraph.pl\n tracing/fastboot: fix bootgraph.pl initcall name regexp\n tracing/fastboot: fix issues and improve output of bootgraph.pl\n tracepoints: synchronize unregister static inline\n tracepoints: tracepoint_synchronize_unregister()\n ftrace: make ftrace_test_p6nop disassembler-friendly\n markers: fix synchronize marker unregister static inline\n tracing/fastboot: add better resolution to initcall debug/tracing\n trace: add build-time check to avoid overrunning hex buffer\n ftrace: fix hex output mode of ftrace\n tracing/fastboot: fix initcalls disposition in bootgraph.pl\n tracing/fastboot: fix printk format typo in boot tracer\n ftrace: return an error when setting a nonexistent tracer\n ftrace: make some tracers reentrant\n ring-buffer: make reentrant\n ring-buffer: move page indexes into page headers\n tracing/fastboot: only trace non-module initcalls\n ftrace: move pc counter in irqtrace\n ...\n\nManually fix conflicts:\n - init/main.c: initcall tracing\n - kernel/module.c: verbose level vs tracepoints\n - scripts/bootgraph.pl: fallout from cherry-picking commits.\n" } ], "next": "c465a76af658b443075d6efee1c3131257643020" }