)]}' { "log": [ { "commit": "0d0df599f1f11f12d589318bacb59a50fb5c0310", "tree": "084ab3d1562502ad6a056aa3fd8dd748683c8c2f", "parents": [ "370c28def65b3a5765192753a164403619b41d01" ], "author": { "name": "Christian Borntraeger", "email": "borntraeger@de.ibm.com", "time": "Mon Oct 26 16:49:34 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 07:39:25 2009 -0700" }, "message": "connector: fix regression introduced by sid connector\n\nSince commit 02b51df1b07b4e9ca823c89284e704cadb323cd1 (proc connector: add\nevent for process becoming session leader) we have the following warning:\n\nBadness at kernel/softirq.c:143\n[...]\nKrnl PSW : 0404c00180000000 00000000001481d4 (local_bh_enable+0xb0/0xe0)\n[...]\nCall Trace:\n([\u003c000000013fe04100\u003e] 0x13fe04100)\n [\u003c000000000048a946\u003e] sk_filter+0x9a/0xd0\n [\u003c000000000049d938\u003e] netlink_broadcast+0x2c0/0x53c\n [\u003c00000000003ba9ae\u003e] cn_netlink_send+0x272/0x2b0\n [\u003c00000000003baef0\u003e] proc_sid_connector+0xc4/0xd4\n [\u003c0000000000142604\u003e] __set_special_pids+0x58/0x90\n [\u003c0000000000159938\u003e] sys_setsid+0xb4/0xd8\n [\u003c00000000001187fe\u003e] sysc_noemu+0x10/0x16\n [\u003c00000041616cb266\u003e] 0x41616cb266\n\nThe warning is\n---\u003e WARN_ON_ONCE(in_irq() || irqs_disabled());\n\nThe network code must not be called with disabled interrupts but\nsys_setsid holds the tasklist_lock with spinlock_irq while calling the\nconnector.\n\nAfter a discussion we agreed that we can move proc_sid_connector from\n__set_special_pids to sys_setsid.\n\nWe also agreed that it is sufficient to change the check from\ntask_session(curr) !\u003d pid into err \u003e 0, since if we don\u0027t change the\nsession, this means we were already the leader and return -EPERM.\n\nOne last thing:\nThere is also daemonize(), and some people might want to get a\nnotification in that case. Since daemonize() is only needed if a user\nspace does kernel_thread this does not look important (and there seems\nto be no consensus if this connector should be called in daemonize). If\nwe really want this, we can add proc_sid_connector to daemonize() in an\nadditional patch (Scott?)\n\nSigned-off-by: Christian Borntraeger \u003cborntraeger@de.ibm.com\u003e\nCc: Scott James Remnant \u003cscott@ubuntu.com\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Evgeniy Polyakov \u003czbr@ioremap.net\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": "f579bbcd9bb8b688df03191b92c56ab8af4d6322", "tree": "d450f986022aab73f86f794a03c7f21ad0ece8ec", "parents": [ "e80fb7e52fd305b916a671755ca31ecf8f92e94e", "da085681014fb43d67d9bf6d14bc068e9254bd49" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 08 12:16:35 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 08 12:16:35 2009 -0700" }, "message": "Merge branch \u0027core-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 futex: fix requeue_pi key imbalance\n futex: Fix typo in FUTEX_WAIT/WAKE_BITSET_PRIVATE definitions\n rcu: Place root rcu_node structure in separate lockdep class\n rcu: Make hot-unplugged CPU relinquish its own RCU callbacks\n rcu: Move rcu_barrier() to rcutree\n futex: Move exit_pi_state() call to release_mm()\n futex: Nullify robust lists after cleanup\n futex: Fix locking imbalance\n panic: Fix panic message visibility by calling bust_spinlocks(0) before dying\n rcu: Replace the rcu_barrier enum with pointer to call_rcu*() function\n rcu: Clean up code based on review feedback from Josh Triplett, part 4\n rcu: Clean up code based on review feedback from Josh Triplett, part 3\n rcu: Fix rcu_lock_map build failure on CONFIG_PROVE_LOCKING\u003dy\n rcu: Clean up code to address Ingo\u0027s checkpatch feedback\n rcu: Clean up code based on review feedback from Josh Triplett, part 2\n rcu: Clean up code based on review feedback from Josh Triplett\n" }, { "commit": "322a2c100a8998158445599ea437fb556aa95b11", "tree": "8039af7452e0fac73f3083cb7e9c1e00d3007811", "parents": [ "fc6b177dee33365ccb29fe6d2092223cf8d679f9" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Oct 05 18:18:03 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Oct 06 17:00:01 2009 +0200" }, "message": "futex: Move exit_pi_state() call to release_mm()\n\nexit_pi_state() is called from do_exit() but not from do_execve().\nMove it to release_mm() so it gets called from do_execve() as well.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLKML-Reference: \u003cnew-submission\u003e\nCc: stable@kernel.org\nCc: Anirban Sinha \u003cani@anirban.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\n\n" }, { "commit": "801460d0cf5c5288153b722565773059b0f44348", "tree": "ff2542903572a546ac59e92f295e9a18e718afa0", "parents": [ "2fa4341074cd02fb39aa23410740764948755635" ], "author": { "name": "Hiroshi Shimamoto", "email": "h-shimamoto@ct.jp.nec.com", "time": "Wed Sep 23 15:57:41 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:21:05 2009 -0700" }, "message": "task_struct cleanup: move binfmt field to mm_struct\n\nBecause the binfmt is not different between threads in the same process,\nit can be moved from task_struct to mm_struct. And binfmt moudle is\nhandled per mm_struct instead of task_struct.\n\nSigned-off-by: Hiroshi Shimamoto \u003ch-shimamoto@ct.jp.nec.com\u003e\nAcked-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\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": "b6fe2d117e98805ee76352e6468f87d494a97292", "tree": "3de99eb7652647000b53bca1f6ea740c926ccfca", "parents": [ "dfe16dfa4ac178d9a10b489a73d535c6976e48d2" ], "author": { "name": "Vitaly Mayatskikh", "email": "v.mayatskih@gmail.com", "time": "Wed Sep 23 15:56:52 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:21:00 2009 -0700" }, "message": "wait_noreap_copyout(): check for -\u003ewo_info !\u003d NULL\n\nCurrent behaviour of sys_waitid() looks odd. If user passes infop \u003d\u003d\nNULL, sys_waitid() returns success. When user additionally specifies flag\nWNOWAIT, sys_waitid() returns -EFAULT on the same conditions. When user\ncombines WNOWAIT with WCONTINUED, sys_waitid() again returns success.\n\nThis patch adds check for -\u003ewo_info in wait_noreap_copyout().\n\nUser-visible change: starting from this commit, sys_waitid() always checks\ninfop !\u003d NULL and does not fail if it is NULL.\n\nSigned-off-by: Vitaly Mayatskikh \u003cv.mayatskih@gmail.com\u003e\nReviewed-by: Oleg Nesterov \u003coleg@redhat.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": "dfe16dfa4ac178d9a10b489a73d535c6976e48d2", "tree": "0ebd7bddf7e99915baed4955faeed2af5bba4203", "parents": [ "b6e763f07fba6243d2a553ed9a4f3e10a789932a" ], "author": { "name": "Vitaly Mayatskikh", "email": "v.mayatskih@gmail.com", "time": "Wed Sep 23 15:56:51 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:21:00 2009 -0700" }, "message": "do_wait: fix sys_waitid()-specific behaviour\n\ndo_wait() checks -\u003ewo_info to figure out who is the caller. If it\u0027s not\nNULL the caller should be sys_waitid(), in that case do_wait() fixes up\nthe retval or zeros -\u003ewo_info, depending on retval from underlying\nfunction.\n\nThis is bug: user can pass -\u003ewo_info \u003d\u003d NULL and sys_waitid() will return\nincorrect value.\n\nman 2 waitid says:\n\n\twaitid(): returns 0 on success\n\nTest-case:\n\n\tint main(void)\n\t{\n\t\tif (fork())\n\t\t\tassert(waitid(P_ALL, 0, NULL, WEXITED) \u003d\u003d 0);\n\n\t\treturn 0;\n\t}\n\nResult:\n\n\tAssertion `waitid(P_ALL, 0, ((void *)0), 4) \u003d\u003d 0\u0027 failed.\n\nMove that code to sys_waitid().\n\nUser-visible change: sys_waitid() will return 0 on success, either\ninfop is set or not.\n\nNote, there\u0027s another bug in wait_noreap_copyout() which affects\nreturn value of sys_waitid(). It will be fixed in next patch.\n\nSigned-off-by: Vitaly Mayatskikh \u003cv.mayatskih@gmail.com\u003e\nReviewed-by: Oleg Nesterov \u003coleg@redhat.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": "b6e763f07fba6243d2a553ed9a4f3e10a789932a", "tree": "10f2f4c8dc44400eb8e1ac1d4875b517f02f4f17", "parents": [ "989264f4645c183331a1279d513f4b1ddc06e1f5" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Sep 23 15:56:50 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:21:00 2009 -0700" }, "message": "wait_consider_task: kill \"parent\" argument\n\nKill the unused \"parent\" argument in wait_consider_task(), it was never used.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Ratan Nalumasu \u003crnalumasu@gmail.com\u003e\nCc: Vitaly Mayatskikh \u003cvmayatsk@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": "989264f4645c183331a1279d513f4b1ddc06e1f5", "tree": "44dc1d6ae0ba66229a6b9e85ac22a3edc87a4b8d", "parents": [ "5c01ba49e6647d86bc7576105f82027200d1f303" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Sep 23 15:56:49 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:21:00 2009 -0700" }, "message": "do_wait-wakeup-optimization: simplify task_pid_type()\n\ntask_pid_type() is only used by eligible_pid() which has to check wo_type\n!\u003d PIDTYPE_MAX anyway. Remove this check from task_pid_type() and factor\nout -\u003epids[type] access, this shrinks .text a bit and simplifies the code.\n\nThe matches the behaviour of other similar helpers, say get_task_pid().\nThe caller must ensure that pid_type is valid, not the callee.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5c01ba49e6647d86bc7576105f82027200d1f303", "tree": "700aa5dbda7c726e8b60803225587a1bc4fdbdb5", "parents": [ "b4fe51823d797d6959b2eee7868023e61606daa9" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Sep 23 15:56:48 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:21:00 2009 -0700" }, "message": "do_wait-wakeup-optimization: fix child_wait_callback()-\u003eeligible_child() usage\n\nchild_wait_callback()-\u003eeligible_child() is not right, we can miss the\nwakeup if the task was detached before __wake_up_parent() and the caller\nof do_wait() didn\u0027t use __WALL.\n\nMove -\u003ewo_pid checks from eligible_child() to the new helper,\neligible_pid(), and change child_wait_callback() to use it instead of\neligible_child().\n\nNote: actually I think it would be better to fix the __WCLONE check in\neligible_child(), it doesn\u0027t look exactly right. But it is not clear what\nis the supposed behaviour, and any change is user-visible.\n\nReported-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nTested-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.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": "b4fe51823d797d6959b2eee7868023e61606daa9", "tree": "e078feaa1cdfbbdc98b5f5f668fecc37c1907b2e", "parents": [ "0b7570e77f7c3abd43107dabc47ea89daf9a1cba" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Sep 23 15:56:47 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:21:00 2009 -0700" }, "message": "do_wait() wakeup optimization: child_wait_callback: check __WNOTHREAD case\n\nSuggested by Roland.\n\ndo_wait(__WNOTHREAD) can only succeed if the caller is either ptracer, or\nit is -\u003ereal_parent and the child is not traced. IOW, caller \u003d\u003d p-\u003eparent\notherwise we should not wake up.\n\nChange child_wait_callback() to check this. Ratan reports the workload with\nCPU load \u003e99% caused by unnecessary wakeups, should be fixed by this patch.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Ratan Nalumasu \u003crnalumasu@gmail.com\u003e\nCc: Vitaly Mayatskikh \u003cvmayatsk@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": "0b7570e77f7c3abd43107dabc47ea89daf9a1cba", "tree": "8dd93b4a189b4e98384d4470a289ecfb7818cc26", "parents": [ "a2322e1d272938d192d8c24cdacf57c0c7a2683f" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Sep 23 15:56:46 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:20:59 2009 -0700" }, "message": "do_wait() wakeup optimization: change __wake_up_parent() to use filtered wakeup\n\nRatan Nalumasu reported that in a process with many threads doing\nunnecessary wakeups. Every waiting thread in the process wakes up to loop\nthrough the children and see that the only ones it cares about are still\nnot ready.\n\nNow that we have struct wait_opts we can change do_wait/__wake_up_parent\nto use filtered wakeups.\n\nWe can make child_wait_callback() more clever later, right now it only\nchecks eligible_child().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Ratan Nalumasu \u003crnalumasu@gmail.com\u003e\nCc: Vitaly Mayatskikh \u003cvmayatsk@redhat.com\u003e\nAcked-by: James Morris \u003cjmorris@namei.org\u003e\nTested-by: Valdis Kletnieks \u003cvaldis.kletnieks@vt.edu\u003e\nAcked-by: David Howells \u003cdhowells@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": "a2322e1d272938d192d8c24cdacf57c0c7a2683f", "tree": "f53bbed32d44a190df42cddc9f3635371272e329", "parents": [ "a7f0765edfd53aed09cb7b0e15863688b39447de" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Sep 23 15:56:45 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:20:59 2009 -0700" }, "message": "do_wait() wakeup optimization: shift security_task_wait() from eligible_child() to wait_consider_task()\n\nPreparation, no functional changes.\n\neligible_child() has a single caller, wait_consider_task(). We can move\nsecurity_task_wait() out from eligible_child(), this allows us to use it\nfor filtered wake_up().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Ratan Nalumasu \u003crnalumasu@gmail.com\u003e\nCc: Vitaly Mayatskikh \u003cvmayatsk@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": "a7f0765edfd53aed09cb7b0e15863688b39447de", "tree": "c89adfe418f9988ad4044e0f22827458bdf6b155", "parents": [ "1dd3a27326d307952f8ad2499478c84dc7311517" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Sep 23 15:56:44 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:20:59 2009 -0700" }, "message": "ptrace: __ptrace_detach: do __wake_up_parent() if we reap the tracee\n\nThe bug is old, it wasn\u0027t cause by recent changes.\n\nTest case:\n\n\tstatic void *tfunc(void *arg)\n\t{\n\t\tint pid \u003d (long)arg;\n\n\t\tassert(ptrace(PTRACE_ATTACH, pid, NULL, NULL) \u003d\u003d 0);\n\t\tkill(pid, SIGKILL);\n\n\t\tsleep(1);\n\t\treturn NULL;\n\t}\n\n\tint main(void)\n\t{\n\t\tpthread_t th;\n\t\tlong pid \u003d fork();\n\n\t\tif (!pid)\n\t\t\tpause();\n\n\t\tsignal(SIGCHLD, SIG_IGN);\n\t\tassert(pthread_create(\u0026th, NULL, tfunc, (void*)pid) \u003d\u003d 0);\n\n\t\tint r \u003d waitpid(-1, NULL, __WNOTHREAD);\n\t\tprintf(\"waitpid: %d %m\\n\", r);\n\n\t\treturn 0;\n\t}\n\nBefore the patch this program hangs, after this patch waitpid() correctly\nfails with errno \u003d\u003d -ECHILD.\n\nThe problem is, __ptrace_detach() reaps the EXIT_ZOMBIE tracee if its\n-\u003ereal_parent is our sub-thread and we ignore SIGCHLD. But in this case\nwe should wake up other threads which can sleep in do_wait().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Vitaly Mayatskikh \u003cvmayatsk@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": "1f10206cf8e945220f7220a809d8bfc15c21f9a5", "tree": "4f2c48ccf9cc52dad9610df54e301e631a351288", "parents": [ "b28cfd2c0616e1b42acc6ee3c77ef6cc3873c510" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Sep 22 16:44:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 07:39:30 2009 -0700" }, "message": "getrusage: fill ru_maxrss value\n\nMake -\u003eru_maxrss value in struct rusage filled accordingly to rss hiwater\nmark. This struct is filled as a parameter to getrusage syscall.\n-\u003eru_maxrss value is set to KBs which is the way it is done in BSD\nsystems. /usr/bin/time (gnu time) application converts -\u003eru_maxrss to KBs\nwhich seems to be incorrect behavior. Maintainer of this util was\nnotified by me with the patch which corrects it and cc\u0027ed.\n\nTo make this happen we extend struct signal_struct by two fields. The\nfirst one is -\u003emaxrss which we use to store rss hiwater of the task. The\nsecond one is -\u003ecmaxrss which we use to store highest rss hiwater of all\ntask childs. These values are used in k_getrusage() to actually fill\n-\u003eru_maxrss. k_getrusage() uses current rss hiwater value directly if mm\nstruct exists.\n\nNote:\nexec() clear mm-\u003ehiwater_rss, but doesn\u0027t clear sig-\u003emaxrss.\nit is intetionally behavior. *BSD getrusage have exec() inheriting.\n\ntest programs\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\ngetrusage.c\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n #include \u003cstdio.h\u003e\n #include \u003cstdlib.h\u003e\n #include \u003cstring.h\u003e\n #include \u003csys/types.h\u003e\n #include \u003csys/time.h\u003e\n #include \u003csys/resource.h\u003e\n #include \u003csys/types.h\u003e\n #include \u003csys/wait.h\u003e\n #include \u003cunistd.h\u003e\n #include \u003csignal.h\u003e\n #include \u003csys/mman.h\u003e\n\n #include \"common.h\"\n\n #define err(str) perror(str), exit(1)\n\nint main(int argc, char** argv)\n{\n\tint status;\n\n\tprintf(\"allocate 100MB\\n\");\n\tconsume(100);\n\n\tprintf(\"testcase1: fork inherit? \\n\");\n\tprintf(\" expect: initial.self ~\u003d child.self\\n\");\n\tshow_rusage(\"initial\");\n\tif (__fork()) {\n\t\twait(\u0026status);\n\t} else {\n\t\tshow_rusage(\"fork child\");\n\t\t_exit(0);\n\t}\n\tprintf(\"\\n\");\n\n\tprintf(\"testcase2: fork inherit? (cont.) \\n\");\n\tprintf(\" expect: initial.children ~\u003d 100MB, but child.children \u003d 0\\n\");\n\tshow_rusage(\"initial\");\n\tif (__fork()) {\n\t\twait(\u0026status);\n\t} else {\n\t\tshow_rusage(\"child\");\n\t\t_exit(0);\n\t}\n\tprintf(\"\\n\");\n\n\tprintf(\"testcase3: fork + malloc \\n\");\n\tprintf(\" expect: child.self ~\u003d initial.self + 50MB\\n\");\n\tshow_rusage(\"initial\");\n\tif (__fork()) {\n\t\twait(\u0026status);\n\t} else {\n\t\tprintf(\"allocate +50MB\\n\");\n\t\tconsume(50);\n\t\tshow_rusage(\"fork child\");\n\t\t_exit(0);\n\t}\n\tprintf(\"\\n\");\n\n\tprintf(\"testcase4: grandchild maxrss\\n\");\n\tprintf(\" expect: post_wait.children ~\u003d 300MB\\n\");\n\tshow_rusage(\"initial\");\n\tif (__fork()) {\n\t\twait(\u0026status);\n\t\tshow_rusage(\"post_wait\");\n\t} else {\n\t\tsystem(\"./child -n 0 -g 300\");\n\t\t_exit(0);\n\t}\n\tprintf(\"\\n\");\n\n\tprintf(\"testcase5: zombie\\n\");\n\tprintf(\" expect: pre_wait ~\u003d initial, IOW the zombie process is not accounted.\\n\");\n\tprintf(\" post_wait ~\u003d 400MB, IOW wait() collect child\u0027s max_rss. \\n\");\n\tshow_rusage(\"initial\");\n\tif (__fork()) {\n\t\tsleep(1); /* children become zombie */\n\t\tshow_rusage(\"pre_wait\");\n\t\twait(\u0026status);\n\t\tshow_rusage(\"post_wait\");\n\t} else {\n\t\tsystem(\"./child -n 400\");\n\t\t_exit(0);\n\t}\n\tprintf(\"\\n\");\n\n\tprintf(\"testcase6: SIG_IGN\\n\");\n\tprintf(\" expect: initial ~\u003d after_zombie (child\u0027s 500MB alloc should be ignored).\\n\");\n\tshow_rusage(\"initial\");\n\tsignal(SIGCHLD, SIG_IGN);\n\tif (__fork()) {\n\t\tsleep(1); /* children become zombie */\n\t\tshow_rusage(\"after_zombie\");\n\t} else {\n\t\tsystem(\"./child -n 500\");\n\t\t_exit(0);\n\t}\n\tprintf(\"\\n\");\n\tsignal(SIGCHLD, SIG_DFL);\n\n\tprintf(\"testcase7: exec (without fork) \\n\");\n\tprintf(\" expect: initial ~\u003d exec \\n\");\n\tshow_rusage(\"initial\");\n\texecl(\"./child\", \"child\", \"-v\", NULL);\n\n\treturn 0;\n}\n\nchild.c\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n #include \u003csys/types.h\u003e\n #include \u003cunistd.h\u003e\n #include \u003csys/types.h\u003e\n #include \u003csys/wait.h\u003e\n #include \u003cstdio.h\u003e\n #include \u003cstdlib.h\u003e\n #include \u003cstring.h\u003e\n #include \u003csys/types.h\u003e\n #include \u003csys/time.h\u003e\n #include \u003csys/resource.h\u003e\n\n #include \"common.h\"\n\nint main(int argc, char** argv)\n{\n\tint status;\n\tint c;\n\tlong consume_size \u003d 0;\n\tlong grandchild_consume_size \u003d 0;\n\tint show \u003d 0;\n\n\twhile ((c \u003d getopt(argc, argv, \"n:g:v\")) !\u003d -1) {\n\t\tswitch (c) {\n\t\tcase \u0027n\u0027:\n\t\t\tconsume_size \u003d atol(optarg);\n\t\t\tbreak;\n\t\tcase \u0027v\u0027:\n\t\t\tshow \u003d 1;\n\t\t\tbreak;\n\t\tcase \u0027g\u0027:\n\n\t\t\tgrandchild_consume_size \u003d atol(optarg);\n\t\t\tbreak;\n\t\tdefault:\n\t\t\tbreak;\n\t\t}\n\t}\n\n\tif (show)\n\t\tshow_rusage(\"exec\");\n\n\tif (consume_size) {\n\t\tprintf(\"child alloc %ldMB\\n\", consume_size);\n\t\tconsume(consume_size);\n\t}\n\n\tif (grandchild_consume_size) {\n\t\tif (fork()) {\n\t\t\twait(\u0026status);\n\t\t} else {\n\t\t\tprintf(\"grandchild alloc %ldMB\\n\", grandchild_consume_size);\n\t\t\tconsume(grandchild_consume_size);\n\n\t\t\texit(0);\n\t\t}\n\t}\n\n\treturn 0;\n}\n\ncommon.c\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n #include \u003cstdio.h\u003e\n #include \u003cstdlib.h\u003e\n #include \u003cstring.h\u003e\n #include \u003csys/types.h\u003e\n #include \u003csys/time.h\u003e\n #include \u003csys/resource.h\u003e\n #include \u003csys/types.h\u003e\n #include \u003csys/wait.h\u003e\n #include \u003cunistd.h\u003e\n #include \u003csignal.h\u003e\n #include \u003csys/mman.h\u003e\n\n #include \"common.h\"\n #define err(str) perror(str), exit(1)\n\nvoid show_rusage(char *prefix)\n{\n \tint err, err2;\n \tstruct rusage rusage_self;\n \tstruct rusage rusage_children;\n\n \tprintf(\"%s: \", prefix);\n \terr \u003d getrusage(RUSAGE_SELF, \u0026rusage_self);\n \tif (!err)\n \t\tprintf(\"self %ld \", rusage_self.ru_maxrss);\n \terr2 \u003d getrusage(RUSAGE_CHILDREN, \u0026rusage_children);\n \tif (!err2)\n \t\tprintf(\"children %ld \", rusage_children.ru_maxrss);\n\n \tprintf(\"\\n\");\n}\n\n/* Some buggy OS need this worthless CPU waste. */\nvoid make_pagefault(void)\n{\n\tvoid *addr;\n\tint size \u003d getpagesize();\n\tint i;\n\n\tfor (i\u003d0; i\u003c1000; i++) {\n\t\taddr \u003d mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);\n\t\tif (addr \u003d\u003d MAP_FAILED)\n\t\t\terr(\"make_pagefault\");\n\t\tmemset(addr, 0, size);\n\t\tmunmap(addr, size);\n\t}\n}\n\nvoid consume(int mega)\n{\n \tsize_t sz \u003d mega * 1024 * 1024;\n \tvoid *ptr;\n\n \tptr \u003d malloc(sz);\n \tmemset(ptr, 0, sz);\n\tmake_pagefault();\n}\n\npid_t __fork(void)\n{\n\tpid_t pid;\n\n\tpid \u003d fork();\n\tmake_pagefault();\n\n\treturn pid;\n}\n\ncommon.h\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nvoid show_rusage(char *prefix);\nvoid make_pagefault(void);\nvoid consume(int mega);\npid_t __fork(void);\n\nFreeBSD result (expected result)\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nallocate 100MB\ntestcase1: fork inherit?\n expect: initial.self ~\u003d child.self\ninitial: self 103492 children 0\nfork child: self 103540 children 0\n\ntestcase2: fork inherit? (cont.)\n expect: initial.children ~\u003d 100MB, but child.children \u003d 0\ninitial: self 103540 children 103540\nchild: self 103564 children 0\n\ntestcase3: fork + malloc\n expect: child.self ~\u003d initial.self + 50MB\ninitial: self 103564 children 103564\nallocate +50MB\nfork child: self 154860 children 0\n\ntestcase4: grandchild maxrss\n expect: post_wait.children ~\u003d 300MB\ninitial: self 103564 children 154860\ngrandchild alloc 300MB\npost_wait: self 103564 children 308720\n\ntestcase5: zombie\n expect: pre_wait ~\u003d initial, IOW the zombie process is not accounted.\n post_wait ~\u003d 400MB, IOW wait() collect child\u0027s max_rss.\ninitial: self 103564 children 308720\nchild alloc 400MB\npre_wait: self 103564 children 308720\npost_wait: self 103564 children 411312\n\ntestcase6: SIG_IGN\n expect: initial ~\u003d after_zombie (child\u0027s 500MB alloc should be ignored).\ninitial: self 103564 children 411312\nchild alloc 500MB\nafter_zombie: self 103624 children 411312\n\ntestcase7: exec (without fork)\n expect: initial ~\u003d exec\ninitial: self 103624 children 411312\nexec: self 103624 children 411312\n\nLinux result (actual test result)\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nallocate 100MB\ntestcase1: fork inherit?\n expect: initial.self ~\u003d child.self\ninitial: self 102848 children 0\nfork child: self 102572 children 0\n\ntestcase2: fork inherit? (cont.)\n expect: initial.children ~\u003d 100MB, but child.children \u003d 0\ninitial: self 102876 children 102644\nchild: self 102572 children 0\n\ntestcase3: fork + malloc\n expect: child.self ~\u003d initial.self + 50MB\ninitial: self 102876 children 102644\nallocate +50MB\nfork child: self 153804 children 0\n\ntestcase4: grandchild maxrss\n expect: post_wait.children ~\u003d 300MB\ninitial: self 102876 children 153864\ngrandchild alloc 300MB\npost_wait: self 102876 children 307536\n\ntestcase5: zombie\n expect: pre_wait ~\u003d initial, IOW the zombie process is not accounted.\n post_wait ~\u003d 400MB, IOW wait() collect child\u0027s max_rss.\ninitial: self 102876 children 307536\nchild alloc 400MB\npre_wait: self 102876 children 307536\npost_wait: self 102876 children 410076\n\ntestcase6: SIG_IGN\n expect: initial ~\u003d after_zombie (child\u0027s 500MB alloc should be ignored).\ninitial: self 102876 children 410076\nchild alloc 500MB\nafter_zombie: self 102880 children 410076\n\ntestcase7: exec (without fork)\n expect: initial ~\u003d exec\ninitial: self 102880 children 410076\nexec: self 102880 children 410076\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\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": "02b51df1b07b4e9ca823c89284e704cadb323cd1", "tree": "c68de4809f261d742f597c686826cdc9d047fb4a", "parents": [ "88e9d34c727883d7d6f02cf1475b3ec98b8480c7" ], "author": { "name": "Scott James Remnant", "email": "scott@ubuntu.com", "time": "Tue Sep 22 16:43:44 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 07:39:29 2009 -0700" }, "message": "proc connector: add event for process becoming session leader\n\nThe act of a process becoming a session leader is a useful signal to a\nsupervising init daemon such as Upstart.\n\nWhile a daemon will normally do this as part of the process of becoming a\ndaemon, it is rare for its children to do so. When the children do, it is\nnearly always a sign that the child should be considered detached from the\nparent and not supervised along with it.\n\nThe poster-child example is OpenSSH; the per-login children call setsid()\nso that they may control the pty connected to them. If the primary daemon\ndies or is restarted, we do not want to consider the per-login children\nand want to respawn the primary daemon without killing the children.\n\nThis patch adds a new PROC_SID_EVENT and associated structure to the\nproc_event event_data union, it arranges for this to be emitted when the\nspecial PIDTYPE_SID pid is set.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Scott James Remnant \u003cscott@ubuntu.com\u003e\nAcked-by: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: Oleg Nesterov \u003coleg@tv-sign.ru\u003e\nCc: Evgeniy Polyakov \u003cjohnpol@2ka.mipt.ru\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cdd6c482c9ff9c55475ee7392ec8f672eddb7be6", "tree": "81f98a3ab46c589792057fe2392c1e10f8ad7893", "parents": [ "dfc65094d0313cc48969fa60bcf33d693aeb05a7" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Sep 21 12:02:48 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Sep 21 14:28:04 2009 +0200" }, "message": "perf: Do the big rename: Performance Counters -\u003e Performance Events\n\nBye-bye Performance Counters, welcome Performance Events!\n\nIn the past few months the perfcounters subsystem has grown out its\ninitial role of counting hardware events, and has become (and is\nbecoming) a much broader generic event enumeration, reporting, logging,\nmonitoring, analysis facility.\n\nNaming its core object \u0027perf_counter\u0027 and naming the subsystem\n\u0027perfcounters\u0027 has become more and more of a misnomer. With pending\ncode like hw-breakpoints support the \u0027counter\u0027 name is less and\nless appropriate.\n\nAll in one, we\u0027ve decided to rename the subsystem to \u0027performance\nevents\u0027 and to propagate this rename through all fields, variables\nand API names. (in an ABI compatible fashion)\n\nThe word \u0027event\u0027 is also a bit shorter than \u0027counter\u0027 - which makes\nit slightly more convenient to write/handle as well.\n\nThanks goes to Stephane Eranian who first observed this misnomer and\nsuggested a rename.\n\nUser-space tooling and ABI compatibility is not affected - this patch\nshould be function-invariant. (Also, defconfigs were not touched to\nkeep the size down.)\n\nThis patch has been generated via the following script:\n\n FILES\u003d$(find * -type f | grep -vE \u0027oprofile|[^K]config\u0027)\n\n sed -i \\\n -e \u0027s/PERF_EVENT_/PERF_RECORD_/g\u0027 \\\n -e \u0027s/PERF_COUNTER/PERF_EVENT/g\u0027 \\\n -e \u0027s/perf_counter/perf_event/g\u0027 \\\n -e \u0027s/nb_counters/nb_events/g\u0027 \\\n -e \u0027s/swcounter/swevent/g\u0027 \\\n -e \u0027s/tpcounter_event/tp_event/g\u0027 \\\n $FILES\n\n for N in $(find . -name perf_counter.[ch]); do\n M\u003d$(echo $N | sed \u0027s/perf_counter/perf_event/g\u0027)\n mv $N $M\n done\n\n FILES\u003d$(find . -name perf_event.*)\n\n sed -i \\\n -e \u0027s/COUNTER_MASK/REG_MASK/g\u0027 \\\n -e \u0027s/COUNTER/EVENT/g\u0027 \\\n -e \u0027s/\\\u003cevent\\\u003e/event_id/g\u0027 \\\n -e \u0027s/counter/event/g\u0027 \\\n -e \u0027s/Counter/Event/g\u0027 \\\n $FILES\n\n... to keep it as correct as possible. This script can also be\nused by anyone who has pending perfcounters patches - it converts\na Linux kernel tree over to the new naming. We tried to time this\nchange to the point in time where the amount of pending patches\nis the smallest: the end of the merge window.\n\nNamespace clashes were fixed up in a preparatory patch - and some\nstylistic fallout will be fixed up in a subsequent patch.\n\n( NOTE: \u0027counters\u0027 are still the proper terminology when we deal\n with hardware registers - and these sed scripts are a bit\n over-eager in renaming them. I\u0027ve undone some of that, but\n in case there\u0027s something left where \u0027counter\u0027 would be\n better than \u0027event\u0027 we can undo that on an individual basis\n instead of touching an otherwise nicely automated patch. )\n\nSuggested-by: Stephane Eranian \u003ceranian@google.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nReviewed-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "eee2775d9924b22643bd89b2e568cc5eed7e8a04", "tree": "095ad7851895c5d39596f3ff7ee1e078235a2501", "parents": [ "53e16fbd30005905168d9b75555fdc7e0a2eac58", "7db905e636f08ea5bc9825c1f73d77802e8ccad5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 11 13:20:18 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 11 13:20:18 2009 -0700" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)\n rcu: Move end of special early-boot RCU operation earlier\n rcu: Changes from reviews: avoid casts, fix/add warnings, improve comments\n rcu: Create rcutree plugins to handle hotplug CPU for multi-level trees\n rcu: Remove lockdep annotations from RCU\u0027s _notrace() API members\n rcu: Add #ifdef to suppress __rcu_offline_cpu() warning in !HOTPLUG_CPU builds\n rcu: Add CPU-offline processing for single-node configurations\n rcu: Add \"notrace\" to RCU function headers used by ftrace\n rcu: Remove CONFIG_PREEMPT_RCU\n rcu: Merge preemptable-RCU functionality into hierarchical RCU\n rcu: Simplify rcu_pending()/rcu_check_callbacks() API\n rcu: Use debugfs_remove_recursive() simplify code.\n rcu: Merge per-RCU-flavor initialization into pre-existing macro\n rcu: Fix online/offline indication for rcudata.csv trace file\n rcu: Consolidate sparse and lockdep declarations in include/linux/rcupdate.h\n rcu: Renamings to increase RCU clarity\n rcu: Move private definitions from include/linux/rcutree.h to kernel/rcutree.h\n rcu: Expunge lingering references to CONFIG_CLASSIC_RCU, optimize on !SMP\n rcu: Delay rcu_barrier() wait until beginning of next CPU-hotunplug operation.\n rcu: Fix typo in rcu_irq_exit() comment header\n rcu: Make rcupreempt_trace.c look at offline CPUs\n ...\n" }, { "commit": "e0e817392b9acf2c98d3be80c233dddb1b52003d", "tree": "ee680c020039313c9f9c40ab3542bb30a7363381", "parents": [ "ed6d76e4c32de0c2ad5f1d572b948ef49e465176" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Sep 02 09:13:40 2009 +0100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Sep 02 21:29:01 2009 +1000" }, "message": "CRED: Add some configurable debugging [try #6]\n\nAdd a config option (CONFIG_DEBUG_CREDENTIALS) to turn on some debug checking\nfor credential management. The additional code keeps track of the number of\npointers from task_structs to any given cred struct, and checks to see that\nthis number never exceeds the usage count of the cred struct (which includes\nall references, not just those from task_structs).\n\nFurthermore, if SELinux is enabled, the code also checks that the security\npointer in the cred struct is never seen to be invalid.\n\nThis attempts to catch the bug whereby inode_has_perm() faults in an nfsd\nkernel thread on seeing cred-\u003esecurity be a NULL pointer (it appears that the\ncredential struct has been previously released):\n\n\thttp://www.kerneloops.org/oops.php?number\u003d252883\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "f41d911f8c49a5d65c86504c19e8204bb605c4fd", "tree": "59bcd3048652ef290b3e19d2904409afd5c90eb3", "parents": [ "a157229cabd6dd8cfa82525fc9bf730c94cc9ac2" ], "author": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sat Aug 22 13:56:52 2009 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Aug 23 10:32:40 2009 +0200" }, "message": "rcu: Merge preemptable-RCU functionality into hierarchical RCU\n\nCreate a kernel/rcutree_plugin.h file that contains definitions\nfor preemptable RCU (or, under the #else branch of the #ifdef,\nempty definitions for the classic non-preemptable semantics).\nThese definitions fit into plugins defined in kernel/rcutree.c\nfor this purpose.\n\nThis variant of preemptable RCU uses a new algorithm whose\nread-side expense is roughly that of classic hierarchical RCU\nunder CONFIG_PREEMPT. This new algorithm\u0027s update-side expense\nis similar to that of classic hierarchical RCU, and, in absence\nof read-side preemption or blocking, is exactly that of classic\nhierarchical RCU. Perhaps more important, this new algorithm\nhas a much simpler implementation, saving well over 1,000 lines\nof code compared to mainline\u0027s implementation of preemptable\nRCU, which will hopefully be retired in favor of this new\nalgorithm.\n\nThe simplifications are obtained by maintaining per-task\nnesting state for running tasks, and using a simple\nlock-protected algorithm to handle accounting when tasks block\nwithin RCU read-side critical sections, making use of lessons\nlearned while creating numerous user-level RCU implementations\nover the past 18 months.\n\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: laijs@cn.fujitsu.com\nCc: dipankar@in.ibm.com\nCc: akpm@linux-foundation.org\nCc: mathieu.desnoyers@polymtl.ca\nCc: josht@linux.vnet.ibm.com\nCc: dvhltc@us.ibm.com\nCc: niv@us.ibm.com\nCc: peterz@infradead.org\nCc: rostedt@goodmis.org\nLKML-Reference: \u003c12509746134003-git-send-email-\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": "befca96779b0259ac8fad0183e748a62935c39cb", "tree": "ab4962e27ce10abc932de4c7a4c1c29fac2988cf", "parents": [ "e6229bec25be4ba00f31dd26e25721cc96c22262" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Jun 18 16:49:11 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 19 16:46:06 2009 -0700" }, "message": "ptrace: wait_task_zombie: do not account traced sub-threads\n\nThe bug is ancient.\n\nIf we trace the sub-thread of our natural child and this sub-thread exits,\nwe update parent-\u003esignal-\u003ecxxx fields. But we should not do this until\nthe whole thread-group exits, otherwise we account this thread (and all\nother live threads) twice.\n\nAdd the task_detached() check. No need to check thread_group_empty(),\nwait_consider_task()-\u003edelay_group_leader() already did this.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nCc: Vitaly Mayatskikh \u003cvmayatsk@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": "e1eb1ebcca871673c76caf63335c4237680040f1", "tree": "d5a1b0e667222a43ec2780787ac21011072d45f1", "parents": [ "f95d39d10fe7d47336e65172f52bf64e0096f983" ], "author": { "name": "Richard Kennedy", "email": "richard@rsk.demon.co.uk", "time": "Wed Jun 17 16:27:42 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:53 2009 -0700" }, "message": "mm: exit.c reorder wait_opts to remove padding on 64 bit builds\n\nReorder struct wait_opts to remove 8 bytes of alignment padding on 64 bit\nbuilds.\n\nSigned-off-by: Richard Kennedy \u003crichard@rsk.demon.co.uk\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\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": "f95d39d10fe7d47336e65172f52bf64e0096f983", "tree": "14b469b68455968dfd707695083ece72287dfaab", "parents": [ "a3f6dfb7295facb0505b5beca5a7ce48b0612379" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:42 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:53 2009 -0700" }, "message": "do_wait: fix the theoretical race with stop/trace/cont\n\ndo_wait:\n\n\tcurrent-\u003estate \u003d TASK_INTERRUPTIBLE;\n\n\tread_lock(\u0026tasklist_lock);\n\t... search for the task to reap ...\n\nIn theory, the -\u003estate changing can leak into the critical section. Since\nthe child can change its status under read_lock(tasklist) in parallel\n(finish_stop/ptrace_stop), we can miss the wakeup if __wake_up_parent()\nsees us in TASK_RUNNING state. Add the barrier.\n\nAlso, use __set_current_state() to set TASK_RUNNING.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\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": "a3f6dfb7295facb0505b5beca5a7ce48b0612379", "tree": "882e1103eaf759ab0e3bc53c08ff69b1f096b1bf", "parents": [ "64a16caf5e3417ee32f670debcb5857b02a9e08e" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:41 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:53 2009 -0700" }, "message": "do_wait: kill the old BUG_ON, use while_each_thread()\n\ndo_wait() does BUG_ON(tsk-\u003esignal !\u003d current-\u003esignal), this looks like a\nraher obsolete check. At least, I don\u0027t think do_wait() is the best place\nto verify that all threads have the same -\u003esignal. Remove it.\n\nAlso, change the code to use while_each_thread().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\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": "64a16caf5e3417ee32f670debcb5857b02a9e08e", "tree": "1e32f8ac1ad0d7cefeeb6bfdac995ec1ad6d7396", "parents": [ "9e8ae01d1c86dcaa6443c897662545d088036e4c" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:40 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:53 2009 -0700" }, "message": "do_wait: simplify retval/tsk_result/notask_error mess\n\nNow that we don\u0027t pass \u0026retval down to other helpers we can simplify\nthe code more.\n\n- kill tsk_result, just use retval\n\n- add the \"notask\" label right after the main loop, and\n s/got end/goto notask/ after the fastpath pid check.\n\n This way we don\u0027t need to initialize retval before this\n check and the code becomes a bit more clean, if this pid\n has no attached tasks we should just skip the list search.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\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": "9e8ae01d1c86dcaa6443c897662545d088036e4c", "tree": "d9465ffe404d318e0038d3133f76550faa3ce3c3", "parents": [ "47918025efdabd34e96b13b26eb2cf2fd6fd1f7c" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:39 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:52 2009 -0700" }, "message": "introduce \"struct wait_opts\" to simplify do_wait() patches\n\nIntroduce \"struct wait_opts\" which holds the parameters for misc helpers\nin do_wait() pathes.\n\nThis adds 13 lines to kernel/exit.c, but saves 256 bytes from .o and imho\nmakes the code much more readable.\n\nThis patch temporary uglifies rusage/siginfo code a little bit, will be\naddressed by further cleanups.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\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": "47918025efdabd34e96b13b26eb2cf2fd6fd1f7c", "tree": "bae081deabe6e955e94c5510ae408b50b930c225", "parents": [ "3b34fc5880a2dcc7e5ed9837ef8d6bae051ab266" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:39 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:52 2009 -0700" }, "message": "shift \"ptrace implies WUNTRACED\" from ptrace_do_wait() to wait_task_stopped()\n\nNo functional changes, preparation for the next patch.\n\nptrace_do_wait() adds WUNTRACED to options for wait_task_stopped() which\nshould always accept the stopped tracee, even if do_wait() was called\nwithout WUNTRACED.\n\nChange wait_task_stopped() to check \"ptrace || WUNTRACED\" instead. This\nmakes the code more explicit, and \"int options\" argument becomes const in\ndo_wait() pathes.\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": "77d1ef79568b337f599b75795acc8f78a87ba9ba", "tree": "4fc0f622c6e064e76e6fd28981c3375ee3d153a9", "parents": [ "e49612544c695117644af48bb4625264a3d2918f" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:36 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:52 2009 -0700" }, "message": "wait_task_zombie: do not use thread_group_cputime()\n\nThere is no reason for thread_group_cputime() in wait_task_zombie(), there\nmust be no other threads.\n\nThis call was previously needed to collect the per-cpu data which we do\nnot have any longer.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nCc: Vitaly Mayatskikh \u003cvmayatsk@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": "d1e98f429aa10132b3010ba3b0be47552a2eb14b", "tree": "bd4458a65ac9ff942a3ba6dfcd70c281e15e067a", "parents": [ "8053bdd5ce15dcf043d41a4dd6cac4a5567effdc" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:34 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:51 2009 -0700" }, "message": "ptrace: wait_task_zombie: s/-\u003eparent/-\u003ereal_parent/\n\nChange wait_task_zombie() to use -\u003ereal_parent instead of -\u003eparent. We\ncould even use current afaics, but -\u003ereal_parent is more clean.\n\nWe know that the child is not ptrace_reparented() and thus they are equal.\n But we should avoid using task_struct-\u003eparent, we are going to remove it.\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": "5cb11446892833e50970fb2277a9f7563b0a8bd3", "tree": "9cb858cb093c4b927601ef8a612d8dd791aeb1c8", "parents": [ "1c216279539bd65c5a3d497e25d441dbddbcf1ec" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:30 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:51 2009 -0700" }, "message": "ptrace: do not use task-\u003eptrace directly in core kernel\n\nNo functional changes.\n\n- Nobody except ptrace.c \u0026 co should use ptrace flags directly, we have\n task_ptrace() for that.\n\n- No need to specially check PT_PTRACED, we must not have other PT_ bits\n set without PT_PTRACED. And no need to know this flag exists.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.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": "dea33cfd99022d82d923a0c6a3bd895fb6683fb2", "tree": "889ea712abbbb8b8c220dd593383ec6f9ad15ffc", "parents": [ "48597760fad3d6a3e30a14241a3ce5ccb1a0e9bc" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:29 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:49 2009 -0700" }, "message": "ptrace: mm_need_new_owner: use -\u003ereal_parent to search in the siblings\n\n\"Search in the siblings\" should use -\u003ereal_parent, not -\u003eparent. If the\ntask is traced then -\u003eparent \u003d\u003d tracer, while the task\u0027s parent is always\n-\u003ereal_parent.\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": "87245135d5057edd5a8037131f81eeffd76d4fef", "tree": "9c6c695f474dfced54311467fd5c14de57f6dbb9", "parents": [ "2ffebca6aa7e1687905c842dd8c5c1e811e574e7" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:23 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:48 2009 -0700" }, "message": "allow_signal: kill the bogus -\u003emm check, add a note about CLONE_SIGHAND\n\nallow_signal() checks -\u003emm \u003d\u003d NULL. Not sure why. Perhaps to make sure\ncurrent is the kernel thread. But this helper must not be used unless we\nare the kernel thread, kill this check.\n\nAlso, document the fact that the CLONE_SIGHAND kthread must not use\nallow_signal(), unless the caller really wants to change the parent\u0027s\n-\u003esighand-\u003eaction as well.\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": "8a1ca8cedd108c8e76a6ab34079d0bbb4f244799", "tree": "636c715524f1718599209cc289908ea44b6cb859", "parents": [ "b640f042faa2a2fad6464f259a8afec06e2f6386", "940010c5a314a7bd9b498593bc6ba1718ac5aec5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 11 14:01:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 11 14:01:07 2009 -0700" }, "message": "Merge branch \u0027perfcounters-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perfcounters-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (574 commits)\n perf_counter: Turn off by default\n perf_counter: Add counter-\u003eid to the throttle event\n perf_counter: Better align code\n perf_counter: Rename L2 to LL cache\n perf_counter: Standardize event names\n perf_counter: Rename enums\n perf_counter tools: Clean up u64 usage\n perf_counter: Rename perf_counter_limit sysctl\n perf_counter: More paranoia settings\n perf_counter: powerpc: Implement generalized cache events for POWER processors\n perf_counters: powerpc: Add support for POWER7 processors\n perf_counter: Accurate period data\n perf_counter: Introduce struct for sample data\n perf_counter tools: Normalize data using per sample period data\n perf_counter: Annotate exit ctx recursion\n perf_counter tools: Propagate signals properly\n perf_counter tools: Small frequency related fixes\n perf_counter: More aggressive frequency adjustment\n perf_counter/x86: Fix the model number of Intel Core2 processors\n perf_counter, x86: Correct some event and umask values for Intel processors\n ...\n" }, { "commit": "3296ca27f50ecbd71db1d808c7a72d311027f919", "tree": "833eaa58b2013bda86d4bd95faf6efad7a2d5ca4", "parents": [ "e893123c7378192c094747dadec326b7c000c190", "73fbad283cfbbcf02939bdbda31fc4a30e729cca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 11 10:01:41 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 11 10:01:41 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (44 commits)\n nommu: Provide mmap_min_addr definition.\n TOMOYO: Add description of lists and structures.\n TOMOYO: Remove unused field.\n integrity: ima audit dentry_open failure\n TOMOYO: Remove unused parameter.\n security: use mmap_min_addr indepedently of security models\n TOMOYO: Simplify policy reader.\n TOMOYO: Remove redundant markers.\n SELinux: define audit permissions for audit tree netlink messages\n TOMOYO: Remove unused mutex.\n tomoyo: avoid get+put of task_struct\n smack: Remove redundant initialization.\n integrity: nfsd imbalance bug fix\n rootplug: Remove redundant initialization.\n smack: do not beyond ARRAY_SIZE of data\n integrity: move ima_counts_get\n integrity: path_check update\n IMA: Add __init notation to ima functions\n IMA: Minimal IMA policy and boot param for TCB IMA policy\n selinux: remove obsolete read buffer limit from sel_read_bool\n ...\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": "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": "33b2fb303fe7f6b08bbb32f708e67b96eaa94a7a", "tree": "32ab4cb3cca6c61a2d6cf351bb8f732045464e28", "parents": [ "b68f1d2e7aa21029d73c7d453a8046e95d351740" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun May 17 11:08:41 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed May 20 00:22:24 2009 +0200" }, "message": "perf_counter: fix counter freeing logic\n\nFix counter lifetime bugs which explain the crashes reported by\nMarcelo Tosatti and Arnaldo Carvalho de Melo.\n\nThe new rule is: flushing + freeing is only done for a task\u0027s\nown counters, never for other tasks.\n\n[ Impact: fix crashes/lockups with inherited counters ]\n\nReported-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nReported-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nAcked-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\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0203026b58b4299ba7281c0b4b417207c1f05d0e", "tree": "02c9f3486544b0f7db1922f05cf12e6480eaf95f", "parents": [ "856d56b9e5de650a64a6c41c17aaed702b55d578" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun May 17 11:24:08 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun May 17 11:26:57 2009 +0200" }, "message": "perf_counter: fix threaded task exit\n\nFlushing counters in __exit_signal() with irqs disabled is not\na good idea as perf_counter_exit_task() acquires mutexes. So\nflush it before acquiring the tasklist lock.\n\n(Note, we still need a fix for when the PID has been unhashed.)\n\n[ Impact: fix crash with inherited counters ]\n\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Srivatsa Vaddagiri \u003cvatsa@in.ibm.com\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: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "856d56b9e5de650a64a6c41c17aaed702b55d578", "tree": "af2fcfe19f0ab27fa220216285e4703ecc7887e1", "parents": [ "8bc2095951517e2c74b8aeeca4685ddd6b16ed4b" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri May 15 20:45:59 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun May 17 07:52:24 2009 +0200" }, "message": "perf_counter: Fix counter inheritance\n\nSrivatsa Vaddagiri reported that a Java workload triggers this\nwarning in kernel/exit.c:\n\n WARN_ON_ONCE(!list_empty(\u0026tsk-\u003eperf_counter_ctx.counter_list));\n\nAdd the inherited counter propagation on self-detach, this could\ncause counter leaks and incomplete stats in threaded code like\nthe below:\n\n #include \u003cpthread.h\u003e\n #include \u003cunistd.h\u003e\n\n void *thread(void *arg)\n {\n sleep(5);\n return NULL;\n }\n\n void main(void)\n {\n pthread_t thr;\n pthread_create(\u0026thr, NULL, thread, NULL);\n }\n\nReported-by: Srivatsa Vaddagiri \u003cvatsa@in.ibm.com\u003e\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: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d254117099d711f215e62427f55dfb8ebd5ad011", "tree": "0848ff8dd74314fec14a86497f8d288c86ba7c65", "parents": [ "07ff7a0b187f3951788f64ae1f30e8109bc8e9eb", "8c9ed899b44c19e81859fbb0e9d659fe2f8630fc" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri May 08 17:56:47 2009 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri May 08 17:56:47 2009 +1000" }, "message": "Merge branch \u0027master\u0027 into next\n" }, { "commit": "78a3d9d5654a7fd99cf8b2ab06b9497b9c7aad64", "tree": "763ab08a72b381327b2868702818d527f91bce50", "parents": [ "ecd6de3c88e8cbcad175b2eab48ba05c2014f7b6" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Apr 29 18:01:23 2009 +0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri May 01 08:49:29 2009 +1000" }, "message": "do_wait: do take security_task_wait() into account\n\nI was never able to understand what should we actually do when\nsecurity_task_wait() fails, but the current code doesn\u0027t look right.\n\nIf -\u003etask_wait() returns the error, we update *notask_error correctly.\nBut then we either reap the child (despite the fact this was forbidden)\nor clear *notask_error (and hide the securiy policy problems).\n\nThis patch assumes that \"stolen by ptrace\" doesn\u0027t matter. If selinux\ndenies the child we should ignore it but make sure we report -EACCESS\ninstead of -ECHLD if there are no other eligible children.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\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": "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": "c61b79b6ef266890954213a701d8f6021d8c1289", "tree": "9b000a7dae5a782a0d667137ab43e4f1bea70d58", "parents": [ "2b2ec7554cf7ec5e4412f89a5af6abe8ce950700", "9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 07 14:07:52 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 07 14:07:52 2009 -0700" }, "message": "Merge branch \u0027irq/threaded\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027irq/threaded\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n genirq: fix devres.o build for GENERIC_HARDIRQS\u003dn\n genirq: provide old request_irq() for CONFIG_GENERIC_HARDIRQ\u003dn\n genirq: threaded irq handlers review fixups\n genirq: add support for threaded interrupts to devres\n genirq: add threaded interrupt handler support\n" }, { "commit": "6c009ecef8cca28c7c09eb16d0802e37915a76e1", "tree": "11c773f780186fdb9fbc9c80a73fb7c8426b1fba", "parents": [ "98c2aaf8be5baf7193be37fb28bce8e7327158bc", "d508afb437daee7cf07da085b635c44a4ebf9b38" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 12:05:21 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 12:05:25 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nMerge reason: need the upstream facility added by:\n\n 7f1e2ca: hrtimer: fix rq-\u003elock inversion (again)\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "432870dab85a2f69dc417022646cb9a70acf7f94", "tree": "4c9c08d7fb77744b1fd04615a76ab0a9105fad07", "parents": [ "22ae77bc7ac115b9d518d5cbc13d39317079b2b0" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Apr 06 16:16:02 2009 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 06 14:57:23 2009 -0700" }, "message": "exit_notify: kill the wrong capable(CAP_KILL) check\n\nThe CAP_KILL check in exit_notify() looks just wrong, kill it.\n\nWhatever logic we have to reset -\u003eexit_signal, the malicious user\ncan bypass it if it execs the setuid application before exiting.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Serge Hallyn \u003cserue@us.ibm.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\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": "9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95", "tree": "7ff8833745d2f268f897f6fa4a27263b4a572245", "parents": [ "de18836e447c2dc30120c0919b8db8ddc0401cc4", "0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 06 01:41:22 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 06 01:41:22 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into irq/threaded\n\nConflicts:\n\tinclude/linux/irq.h\n\tkernel/irq/handle.c\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": "2ae448efc87df6d328f5835969076c7f9fce59c3", "tree": "f110b43fa7c6b3c80f9b18a8e4fef728ed57f448", "parents": [ "6dda81f4384b94930826eded254d8c16f89a9248" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:36 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:05:02 2009 -0700" }, "message": "pids: improve get_task_pid() to fix the unsafe sys_wait4()-\u003etask_pgrp()\n\nsys_wait4() does get_pid(task_pgrp(current)), this is not safe. We can\nadd rcu lock/unlock around, but we already have get_task_pid() which can\nbe improved to handle the special pids in more reliable manner.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Louis Rilling \u003cLouis.Rilling@kerlabs.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Pavel Emelyanov \u003cxemul@openvz.org\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": "5dfc80be73dd0c212d2e6dd8dbf5afa07e680bbe", "tree": "ac173fb3fcfe2970781591f620f22d30f4ce090c", "parents": [ "39c626ae47c469abdfd30c6e42eff884931380d6" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:19 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:05:00 2009 -0700" }, "message": "forget_original_parent: do not abuse child-\u003eptrace_entry\n\nBy discussion with Roland.\n\n- Use -\u003esibling instead of -\u003eptrace_entry to chain the need to be\n release_task\u0027d childs. Nobody else can use -\u003esibling, this task\n is EXIT_DEAD and nobody can find it on its own list.\n\n- rename ptrace_dead to dead_childs.\n\n- Now that we don\u0027t have the \"parallel\" untrace code, change back\n reparent_thread() to return void, pass dead_childs as an argument.\n\nActually, I don\u0027t understand why do we notify /sbin/init when we\nreparent a zombie, probably it is better to reap it unconditionally.\n\n[akpm@linux-foundation.org: s/childs/children/]\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: \"Metzger, Markus T\" \u003cmarkus.t.metzger@intel.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": "39c626ae47c469abdfd30c6e42eff884931380d6", "tree": "58cbe75bac79ce8ef55c94189df26448d0283918", "parents": [ "7f5d3652d469cdf9eb2365dfea7ce3fb9e1409cc" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:18 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:05:00 2009 -0700" }, "message": "forget_original_parent: split out the un-ptrace part\n\nBy discussion with Roland.\n\n- Rename ptrace_exit() to exit_ptrace(), and change it to do all the\n necessary work with -\u003eptraced list by its own.\n\n- Move this code from exit.c to ptrace.c\n\n- Update the comment in ptrace_detach() to explain the rechecking of\n the child-\u003eptrace.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: \"Metzger, Markus T\" \u003cmarkus.t.metzger@intel.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": "7f5d3652d469cdf9eb2365dfea7ce3fb9e1409cc", "tree": "590f845665e166694ba0f9ba0e6d2267e15d8aae", "parents": [ "b1442b055c154699a6a2c436f3352f71b6beede3" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:17 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:59 2009 -0700" }, "message": "reparent_thread: fix a zombie leak if /sbin/init ignores SIGCHLD\n\nIf /sbin/init ignores SIGCHLD and we re-parent a zombie, it is leaked.\nreparent_thread() does do_notify_parent() which sets -\u003eexit_signal \u003d -1 in\nthis case. This means that nobody except us can reap it, the detached\ntask is not visible to do_wait().\n\nChange reparent_thread() to return a boolean (like __pthread_detach) to\nindicate that the thread is dead and must be released. Also change\nforget_original_parent() to add the child to ptrace_dead list in this\ncase.\n\nThe naming becomes insane, the next patch does the cleanup.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b1442b055c154699a6a2c436f3352f71b6beede3", "tree": "dda315fddb15936bc74eb9c74bec29b64e65b71c", "parents": [ "0a967a044a777e8b9c739120927114ddc0094298" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:16 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:59 2009 -0700" }, "message": "reparent_thread: fix the \"is it traced\" check\n\nreparent_thread() uses ptrace_reparented() to check whether this thread is\nptraced, in that case we should not notify the new parent.\n\nBut ptrace_reparented() is not exactly correct when the reparented thread\nis traced by /sbin/init, because forget_original_parent() has already\nchanged -\u003ereal_parent.\n\nCurrently, the only problem is the false notification. But with the next\npatch the kernel crash in this (yes, pathological) case.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0a967a044a777e8b9c739120927114ddc0094298", "tree": "aa1abba4c643e0f502623870045a4c978db5683b", "parents": [ "4576145c1ecdaaea9ef8976a48335206aa1ebf91" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:15 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:59 2009 -0700" }, "message": "reparent_thread: don\u0027t call kill_orphaned_pgrp() if task_detached()\n\nIf task_detached(p) \u003d\u003d T, then either\n\n a) p is not the main thread, we will find the group leader on the\n -\u003echildren list.\n\nor\n\n b) p is the group leader but its -\u003eexit_state \u003d EXIT_DEAD. This\n can only happen when the last sub-thread has died, but in that case\n that thread has already called kill_orphaned_pgrp() from\n exit_notify().\n\nIn both cases kill_orphaned_pgrp() looks bogus.\n\nMove the task_detached() check up and simplify the code, this is also\nright from the \"common sense\" pov: we should do nothing with the detached\nchilds, except move them to the new parent\u0027s -\u003echildren list.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b1b4c6799fb59e710454bfe0ab477cb8523a8667", "tree": "1cdd19f00c584a8800ce0d3a5530b78d1cbd6e56", "parents": [ "6d69cb87f05eef3b02370b2f7bae608ad2301a00" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:13 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:59 2009 -0700" }, "message": "ptrace: reintroduce __ptrace_detach() as a callee of ptrace_exit()\n\nNo functional changes, preparation for the next patch.\n\nMove the \"should we release this child\" logic into the separate handler,\n__ptrace_detach().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Jerome Marchand \u003cjmarchan@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Denys Vlasenko \u003cdvlasenk@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": "6d69cb87f05eef3b02370b2f7bae608ad2301a00", "tree": "69f38afc49df51a1a75fc5c7792ced6888af329d", "parents": [ "95c3eb76dc07fd81289888ffc42948196b34b444" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:12 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:59 2009 -0700" }, "message": "ptrace: simplify ptrace_exit()-\u003eignoring_children() path\n\nignoring_children() takes parent-\u003esighand-\u003esiglock and checks\nk_sigaction[SIGCHLD] atomically. But this buys nothing, we can\u0027t get the\n\"really\" wrong result even if we race with sigaction(SIGCHLD). If we read\nthe \"stale\" sa_handler/sa_flags we can pretend it was changed right after\nthe check.\n\nRemove spin_lock(-\u003esiglock), and kill \"int ign\" which caches the result of\nignoring_children() which becomes rather trivial.\n\nPerhaps it makes sense to export this helper, do_notify_parent() can use\nit too.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Jerome Marchand \u003cjmarchan@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Denys Vlasenko \u003cdvlasenk@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": "90bc8d8b1a38f1ab131a2399a202e1889db95de8", "tree": "97001737dc3c1c7fd364ddd995bcbfc1c27b4c3a", "parents": [ "6d7b2f5f9e88902b19f91d0c8a7ef58a5455f1a2" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:57:58 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:57 2009 -0700" }, "message": "do_wait: fix waiting for the group stop with the dead leader\n\ndo_wait(WSTOPPED) assumes that p-\u003estate must be \u003d\u003d TASK_STOPPED, this is\nnot true if the leader is already dead. Check SIGNAL_STOP_STOPPED instead\nand use signal-\u003egroup_exit_code.\n\nTrivial test-case:\n\n\tvoid *tfunc(void *arg)\n\t{\n\t\tpause();\n\t\treturn NULL;\n\t}\n\n\tint main(void)\n\t{\n\t\tpthread_t thr;\n\t\tpthread_create(\u0026thr, NULL, tfunc, NULL);\n\t\tpthread_exit(NULL);\n\t\treturn 0;\n\t}\n\nIt doesn\u0027t react to ^Z (and then to ^C or ^\\). The task is stopped, but\nbash can\u0027t see this.\n\nThe bug is very old, and it was reported multiple times. This patch was sent\nmore than a year ago (http://marc.info/?t\u003d119713920000003) but it was ignored.\n\nThis change also fixes other oddities (but not all) in this area. For\nexample, before this patch:\n\n\t$ sleep 100\n\t^Z\n\t[1]+ Stopped sleep 100\n\t$ strace -p `pidof sleep`\n\tProcess 11442 attached - interrupt to quit\n\nstrace hangs in do_wait(), because -\u003eexit_code was already consumed by\nbash. After this patch, strace happily proceeds:\n\n\t--- SIGTSTP (Stopped) @ 0 (0) ---\n\trestart_syscall(\u003c... resuming interrupted call ...\u003e\n\nTo me, this looks much more \"natural\" and correct.\n\nAnother example. Let\u0027s suppose we have the main thread M and sub-thread\nT, the process is stopped, and its parent did wait(WSTOPPED). Now we can\nptrace T but not M. This looks at least strange to me.\n\nImho, do_wait() should not confuse the per-thread ptrace stops with the\nper-process job control stops.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Denys Vlasenko \u003cdvlasenk@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Jan Kratochvil \u003cjan.kratochvil@redhat.com\u003e\nCc: Kaz Kylheku \u003ckkylheku@gmail.com\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@googlemail.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Ulrich Drepper \u003cdrepper@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": "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": "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": "3aa551c9b4c40018f0e261a178e3d25478dc04a9", "tree": "2a696109273fcc421d774cc8fefa4180331a85ad", "parents": [ "80c5520811d3805adcb15c570ea5e2d489fa5d0b" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Mar 23 18:28:15 2009 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Mar 24 12:15:23 2009 +0100" }, "message": "genirq: add threaded interrupt handler support\n\nAdd support for threaded interrupt handlers:\n\nA device driver can request that its main interrupt handler runs in a\nthread. To achive this the device driver requests the interrupt with\nrequest_threaded_irq() and provides additionally to the handler a\nthread function. The handler function is called in hard interrupt\ncontext and needs to check whether the interrupt originated from the\ndevice. If the interrupt originated from the device then the handler\ncan either return IRQ_HANDLED or IRQ_WAKE_THREAD. IRQ_HANDLED is\nreturned when no further action is required. IRQ_WAKE_THREAD causes\nthe genirq code to invoke the threaded (main) handler. When\nIRQ_WAKE_THREAD is returned handler must have disabled the interrupt\non the device level. This is mandatory for shared interrupt handlers,\nbut we need to do it as well for obscure x86 hardware where disabling\nan interrupt on the IO_APIC level redirects the interrupt to the\nlegacy PIC interrupt lines.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n\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": "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": "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": "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": "754fe8d297bfae7b77f7ce866e2fb0c5fb186506", "tree": "b2650f728d50791fa86ecd8c49806f51db714bd4", "parents": [ "5add95d4f7cf08f6f62510f19576992912387501" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:14:09 2009 +0100" }, "committer": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:15:20 2009 +0100" }, "message": "[CVE-2009-0029] System call wrappers part 07\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\n" }, { "commit": "2ed7c03ec17779afb4fcfa3b8c61df61bd4879ba", "tree": "4e0fefd574bab5470a02edf439727f472a9663c6", "parents": [ "4c696ba7982501d43dea11dbbaabd2aa8a19cc42" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:13:54 2009 +0100" }, "committer": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:15:14 2009 +0100" }, "message": "[CVE-2009-0029] Convert all system calls to return a long\n\nConvert all system calls to return a long. This should be a NOP since all\nconverted types should have the same size anyway.\nWith the exception of sys_exit_group which returned void. But that doesn\u0027t\nmatter since the system call doesn\u0027t return.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\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": "901608d9045146aec6f14a7777ea4b1501c379f0", "tree": "0155189f48479b920855dedccba6829363376d4d", "parents": [ "67d58ac47d25f7e2a105248a4aea6113131ab874" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Jan 06 14:40:29 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:09 2009 -0800" }, "message": "mm: introduce get_mm_hiwater_xxx(), fix taskstats-\u003ehiwater_xxx accounting\n\nxacct_add_tsk() relies on do_exit()-\u003eupdate_hiwater_xxx() and uses\nmm-\u003ehiwater_xxx directly, this leads to 2 problems:\n\n- taskstats_user_cmd() can call fill_pid()-\u003exacct_add_tsk() at any\n moment before the task exits, so we should check the current values of\n rss/vm anyway.\n\n- do_exit()-\u003eupdate_hiwater_xxx() calls are racy. An exiting thread can\n be preempted right before mm-\u003ehiwater_xxx \u003d new_val, and another thread\n can use A_LOT of memory and exit in between. When the first thread\n resumes it can be the last thread in the thread group, in that case we\n report the wrong hiwater_xxx values which do not take A_LOT into\n account.\n\nIntroduce get_mm_hiwater_rss() and get_mm_hiwater_vm() helpers and change\nxacct_add_tsk() to use them. The first helper will also be used by\nrusage-\u003eru_maxrss accounting.\n\nKill do_exit()-\u003eupdate_hiwater_xxx() calls. Unless we are going to\ndecrease rss/vm there is no point to update mm-\u003ehiwater_xxx, and nobody\ncan look at this mm_struct when exit_mmap() actually unmaps the memory.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Hugh Dickins \u003chugh@veritas.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: Balbir Singh \u003cbalbir@linux.vnet.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": "e5991371ee0d1c0ce19e133c6f9075b49c5b4ae8", "tree": "3e5c9c3293c025f537ff4416660a96d33c694b5f", "parents": [ "39f0dee2d8abe902617622b71f8f6f73985ec71c" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:39:22 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:01 2009 -0800" }, "message": "mm: remove cgroup_mm_owner_callbacks\n\ncgroup_mm_owner_callbacks() was brought in to support the memrlimit\ncontroller, but sneaked into mainline ahead of it. That controller has\nnow been shelved, and the mm_owner_changed() args were inadequate for it\nanyway (they needed an mm pointer instead of a task pointer).\n\nRemove the dead code, and restore mm_update_next_owner() locking to how it\nwas before: taking mmap_sem there does nothing for memcontrol.c, now the\nonly user of mm-\u003eowner.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: Balbir Singh \u003cbalbir@in.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": "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": "1dff81f20cd55ffa5a8ee984da70ce0b99d29606", "tree": "06eb07bda250abfa8a78c3141db56862c8c7cf98", "parents": [ "179475a3b46f86e2d06f83e2312218ac3f0cf3a7", "d3f761104b097738932afcc310fbbbbfb007ef92" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 30 17:20:05 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 30 17:20:05 2008 -0800" }, "message": "Merge branch \u0027for-2.6.29\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.29\u0027 of git://git.kernel.dk/linux-2.6-block: (43 commits)\n bio: get rid of bio_vec clearing\n bounce: don\u0027t rely on a zeroed bio_vec list\n cciss: simplify parameters to deregister_disk function\n cfq-iosched: fix race between exiting queue and exiting task\n loop: Do not call loop_unplug for not configured loop device.\n loop: Flush possible running bios when loop device is released.\n alpha: remove dead BIO_VMERGE_BOUNDARY\n Get rid of CONFIG_LSF\n block: make blk_softirq_init() static\n block: use min_not_zero in blk_queue_stack_limits\n block: add one-hit cache for disk partition lookup\n cfq-iosched: remove limit of dispatch depth of max 4 times quantum\n nbd: tell the block layer that it is not a rotational device\n block: get rid of elevator_t typedef\n aio: make the lookup_ioctx() lockless\n bio: add support for inlining a number of bio_vecs inside the bio\n bio: allow individual slabs in the bio_set\n bio: move the slab pointer inside the bio_set\n bio: only mempool back the largest bio_vec slab cache\n block: don\u0027t use plugging on SSD devices\n ...\n" }, { "commit": "5f34fe1cfc1bdd8b4711bbe37421fba4ed0d1ed4", "tree": "85b21c8bb0e53005bd970d648ca093acfd0584a3", "parents": [ "eca1bf5b4fab56d2feb1572d34d59fcd92ea7df3", "6638101c1124c19c8a65b1645e4ecd09e0572f3e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 30 16:10:19 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 30 16:10:19 2008 -0800" }, "message": "Merge branch \u0027core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (63 commits)\n stacktrace: provide save_stack_trace_tsk() weak alias\n rcu: provide RCU options on non-preempt architectures too\n printk: fix discarding message when recursion_bug\n futex: clean up futex_(un)lock_pi fault handling\n \"Tree RCU\": scalable classic RCU implementation\n futex: rename field in futex_q to clarify single waiter semantics\n x86/swiotlb: add default swiotlb_arch_range_needs_mapping\n x86/swiotlb: add default phys\u003c-\u003ebus conversion\n x86: unify pci iommu setup and allow swiotlb to compile for 32 bit\n x86: add swiotlb allocation functions\n swiotlb: consolidate swiotlb info message printing\n swiotlb: support bouncing of HighMem pages\n swiotlb: factor out copy to/from device\n swiotlb: add arch hook to force mapping\n swiotlb: allow architectures to override phys\u003c-\u003ebus\u003c-\u003ephys conversions\n swiotlb: add comment where we handle the overflow of a dma mask on 32 bit\n rcu: fix rcutorture behavior during reboot\n resources: skip sanity check of busy resources\n swiotlb: move some definitions to header\n swiotlb: allow architectures to override swiotlb pool allocation\n ...\n\nFix up trivial conflicts in\n arch/x86/kernel/Makefile\n arch/x86/mm/init_32.c\n include/linux/hardirq.h\nas per Ingo\u0027s suggestions.\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": "7c0990c7ee988aa193abbb7da3faeb9279146dbf", "tree": "785708206467f03cf07c72dae65f56531bfd7449", "parents": [ "d194139c18edb7dae45e159a24f2aa72091033b8" ], "author": { "name": "Nikanth Karthikesan", "email": "knikanth@suse.de", "time": "Wed Nov 19 10:20:23 2008 +0100" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Mon Dec 29 08:28:43 2008 +0100" }, "message": "Do not free io context when taking recursive faults in do_exit\n\nWhen taking recursive faults in do_exit, if the io_context is not null,\nexit_io_context() is being called. But it might decrement the refcount\nmore than once. It is better to leave this task alone.\n\nSigned-off-by: Nikanth Karthikesan \u003cknikanth@suse.de\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": "eef6cbf5844c620d9db9be99e4908cdf92492fb9", "tree": "a4601e8d8ce64ca0f23f59b889360d578f663f5b", "parents": [ "aa9c4c0f967fdb482ea95e8473ec3d201e6e0781" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Dec 19 10:20:42 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 23 12:45:16 2008 +0100" }, "message": "perfcounters: pull inherited counters\n\nChange counter inheritance from a \u0027push\u0027 to a \u0027pull\u0027 model: instead of\nchild tasks pushing their final counts to the parent, reuse the wait4\ninfrastructure to pull counters as child tasks are exit-processed,\nmuch like how cutime/cstime is collected.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "aa9c4c0f967fdb482ea95e8473ec3d201e6e0781", "tree": "8223d34630b7d3130825e8a2197e9bb51c34b7fa", "parents": [ "7671581f1666ef4b54a1c1e598c51ac44c060a9b" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 17 14:10:57 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 23 12:45:14 2008 +0100" }, "message": "perfcounters: fix task clock counter\n\nImpact: fix per task clock counter precision\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9b51f66dcb09ac5eb6bc68fc111d5c7a1e0131d6", "tree": "f7b3482ae284c214119efe309e356fb84de126bb", "parents": [ "ee06094f8279e1312fc0a31591320cc7b6f0ab1e" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Dec 12 13:49:45 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Dec 14 20:30:49 2008 +0100" }, "message": "perfcounters: implement \"counter inheritance\"\n\nImpact: implement new performance feature\n\nCounter inheritance can be used to run performance counters in a workload,\ntransparently - and pipe back the counter results to the parent counter.\n\nInheritance for performance counters works the following way: when creating\na counter it can be marked with the .inherit\u003d1 flag. Such counters are then\n\u0027inherited\u0027 by all child tasks (be they fork()-ed or clone()-ed). These\ncounters get inherited through exec() boundaries as well (except through\nsetuid boundaries).\n\nThe counter values get added back to the parent counter(s) when the child\ntask(s) exit - much like stime/utime statistics are gathered. So inherited\ncounters are ideal to gather summary statistics about an application\u0027s\nbehavior via shell commands, without having to modify that application.\n\nThe timec.c command utilizes counter inheritance:\n\n http://redhat.com/~mingo/perfcounters/timec.c\n\nSample output:\n\n $ ./timec -e 1 -e 3 -e 5 ls -lR /usr/include/ \u003e/dev/null\n\n Performance counter stats for \u0027ls\u0027:\n\n 163516953 instructions\n 2295 cache-misses\n 2855182 branch-misses\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b19b3c74c7bbec45a848631b8f970ac110665a01", "tree": "2966e612c7b902964cf82bedc5d9e523505228b5", "parents": [ "ed313489badef16d700f5a3be50e8fd8f8294bc8", "6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b", "42569c39917a08e8de1e8b5685463be7b74baebd", "7918baa555140989eeee1270f48533987d48fdba", "29cbda77a67cf263d636feea65d3bbc9c7de2e24", "2b5fe6de58276d0b5a7c884d5dbfc300ca47db78", "b0788caf7af773b6c2374590dabd3a205f0918a8", "8dd2337470d2ead6835982ed856d988f9e062140" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Nov 24 17:44:55 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Nov 24 17:44:55 2008 +0100" }, "message": "Merge branches \u0027core/debug\u0027, \u0027core/futexes\u0027, \u0027core/locking\u0027, \u0027core/rcu\u0027, \u0027core/signal\u0027, \u0027core/urgent\u0027 and \u0027core/xen\u0027 into core/core\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": "2b5fe6de58276d0b5a7c884d5dbfc300ca47db78", "tree": "02cc368e46a795bd2c0162d278f9c5549f4e1e5a", "parents": [ "ce394471d13bf071939a9a0b48c64c297676d233" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Nov 17 15:40:08 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Nov 17 16:55:55 2008 +0100" }, "message": "thread_group_cputime: move a couple of callsites outside of -\u003esiglock\n\nImpact: relax the locking of cpu-time accounting calls\n\n-\u003esiglock buys nothing for thread_group_cputime() in do_sys_times() and\nwait_task_zombie() (which btw takes the unrelated parent\u0027s -\u003esiglock).\n\nActually I think do_sys_times() doesn\u0027t need -\u003esiglock at all.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\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": "2b828925652340277a889cbc11b2d0637f7cdaf7", "tree": "32fcb3d3e466fc419fad2d3717956a5b5ad3d35a", "parents": [ "3a3b7ce9336952ea7b9564d976d068a238976c9d", "58e20d8d344b0ee083febb18c2b021d2427e56ca" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 11:29:12 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 11:29:12 2008 +1100" }, "message": "Merge branch \u0027master\u0027 into next\n\nConflicts:\n\tsecurity/keys/internal.h\n\tsecurity/keys/process_keys.c\n\tsecurity/keys/request_key.c\n\nFixed conflicts above by using the non \u0027tsk\u0027 versions.\n\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": "c69e8d9c01db2adc503464993c358901c9af9de4", "tree": "bed94aaa9aeb7a7834d1c880f72b62a11a752c78", "parents": [ "86a264abe542cfececb4df129bc45a0338d8cdb9" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Nov 14 10:39:19 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 10:39:19 2008 +1100" }, "message": "CRED: Use RCU to access another task\u0027s creds and to release a task\u0027s own creds\n\nUse RCU to access another task\u0027s creds and to release a task\u0027s own creds.\nThis means that it will be possible for the credentials of a task to be\nreplaced without another task (a) requiring a full lock to read them, and (b)\nseeing deallocated memory.\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": "ad474caca3e2a0550b7ce0706527ad5ab389a4d4", "tree": "6d4e5cbcee3a85230317a33d66655ece0c873f5c", "parents": [ "5ac5c4d604bf894ef672a7971d03fefdc7ea7e49" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Nov 10 15:39:30 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Nov 11 08:01:43 2008 +0100" }, "message": "fix for account_group_exec_runtime(), make sure -\u003esignal can\u0027t be freed under rq-\u003elock\n\nImpact: fix hang/crash on ia64 under high load\n\nThis is ugly, but the simplest patch by far.\n\nUnlike other similar routines, account_group_exec_runtime() could be\ncalled \"implicitly\" from within scheduler after exit_notify(). This\nmeans we can race with the parent doing release_task(), we can\u0027t just\ncheck -\u003esignal !\u003d NULL.\n\nChange __exit_signal() to do spin_unlock_wait(\u0026task_rq(tsk)-\u003elock)\nbefore __cleanup_signal() to make sure -\u003esignal can\u0027t be freed under\ntask_rq(tsk)-\u003elock. Note that task_rq_unlock_wait() doesn\u0027t care\nabout the case when tsk changes cpu/rq under us, this should be OK.\n\nThanks to Ingo who nacked my previous buggy patch.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nReported-by: Doug Chapman \u003cdoug.chapman@hp.com\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" }