)]}' { "log": [ { "commit": "fabf318e5e4bda0aca2b0d617b191884fda62703", "tree": "651b2ee4fb8f393d2fe93f133a5ec6129cb7a8e8", "parents": [ "6d558c3ac9b6508d26fd5cadccce51fc9d726b1c" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Jan 21 21:04:57 2010 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jan 21 23:25:31 2010 +0100" }, "message": "sched: Fix fork vs hotplug vs cpuset namespaces\n\nThere are a number of issues:\n\n1) TASK_WAKING vs cgroup_clone (cpusets)\n\ncopy_process():\n\n sched_fork()\n child-\u003estate \u003d TASK_WAKING; /* waiting for wake_up_new_task() */\n if (current-\u003ensproxy !\u003d p-\u003ensproxy)\n ns_cgroup_clone()\n cgroup_clone()\n mutex_lock(inode-\u003ei_mutex)\n mutex_lock(cgroup_mutex)\n cgroup_attach_task()\n\t ss-\u003ecan_attach()\n ss-\u003eattach() [ -\u003e cpuset_attach() ]\n cpuset_attach_task()\n set_cpus_allowed_ptr();\n while (child-\u003estate \u003d\u003d TASK_WAKING)\n cpu_relax();\nwill deadlock the system.\n\n\n2) cgroup_clone (cpusets) vs copy_process\n\nSo even if the above would work we still have:\n\ncopy_process():\n\n if (current-\u003ensproxy !\u003d p-\u003ensproxy)\n ns_cgroup_clone()\n cgroup_clone()\n mutex_lock(inode-\u003ei_mutex)\n mutex_lock(cgroup_mutex)\n cgroup_attach_task()\n\t ss-\u003ecan_attach()\n ss-\u003eattach() [ -\u003e cpuset_attach() ]\n cpuset_attach_task()\n set_cpus_allowed_ptr();\n ...\n\n p-\u003ecpus_allowed \u003d current-\u003ecpus_allowed\n\nover-writing the modified cpus_allowed.\n\n\n3) fork() vs hotplug\n\n if we unplug the child\u0027s cpu after the sanity check when the child\n gets attached to the task_list but before wake_up_new_task() shit\n will meet with fan.\n\nSolve all these issues by moving fork cpu selection into\nwake_up_new_task().\n\nReported-by: Serge E. Hallyn \u003cserue@us.ibm.com\u003e\nTested-by: Serge E. Hallyn \u003cserue@us.ibm.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1264106190.4283.1314.camel@laptop\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "9cd80bbb07fcd6d4d037fad4297496d3b132ac6b", "tree": "322216d34b6d5ba2366f53ba0d677950c4cde766", "parents": [ "0f67b0b0392ccca98459bf40b36c0037793b5f71" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Dec 17 15:27:15 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 17 15:45:31 2009 -0800" }, "message": "do_wait() optimization: do not place sub-threads on task_struct-\u003echildren list\n\nThanks to Roland who pointed out de_thread() issues.\n\nCurrently we add sub-threads to -\u003ereal_parent-\u003echildren list. This buys\nnothing but slows down do_wait().\n\nWith this patch -\u003echildren contains only main threads (group leaders).\nThe only complication is that forget_original_parent() should iterate over\nsub-threads by hand, and de_thread() needs another list_replace() when it\nchanges -\u003egroup_leader.\n\nHenceforth do_wait_thread() can never see task_detached() \u0026\u0026 !EXIT_DEAD\ntasks, we can remove this check (and we can unify do_wait_thread() and\nptrace_do_wait()).\n\nThis change can confuse the optimistic search in mm_update_next_owner(),\nbut this is fixable and minor.\n\nPerhaps badness() and oom_kill_process() should be updated, but they\nshould be fixed in any case.\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\nCc: 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": "6580807da14c423f0d0a708108e6df6ebc8bc83d", "tree": "553e2de8f2174f9bbb6ab9a2454b1306bb5eb4fa", "parents": [ "c6a47cc2ccf9649ee09eeddd70a6d061bde69568" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Dec 15 16:47:16 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 07:20:08 2009 -0800" }, "message": "ptrace: copy_process() should disable stepping\n\nIf the tracee calls fork() after PTRACE_SINGLESTEP, the forked child\nstarts with TIF_SINGLESTEP/X86_EFLAGS_TF bits copied from ptraced parent.\nThis is not right, especially when the new child is not auto-attaced: in\nthis case it is killed by SIGTRAP.\n\nChange copy_process() to call user_disable_single_step(). Tested on x86.\n\nTest-case:\n\n\t#include \u003cstdio.h\u003e\n\t#include \u003cunistd.h\u003e\n\t#include \u003csignal.h\u003e\n\t#include \u003csys/ptrace.h\u003e\n\t#include \u003csys/wait.h\u003e\n\t#include \u003cassert.h\u003e\n\n\tint main(void)\n\t{\n\t\tint pid, status;\n\n\t\tif (!(pid \u003d fork())) {\n\t\t\tassert(ptrace(PTRACE_TRACEME) \u003d\u003d 0);\n\t\t\tkill(getpid(), SIGSTOP);\n\n\t\t\tif (!fork()) {\n\t\t\t\t/* kernel bug: this child will be killed by SIGTRAP */\n\t\t\t\tprintf(\"Hello world\\n\");\n\t\t\t\treturn 43;\n\t\t\t}\n\n\t\t\twait(\u0026status);\n\t\t\treturn WEXITSTATUS(status);\n\t\t}\n\n\t\tfor (;;) {\n\t\t\tassert(pid \u003d\u003d wait(\u0026status));\n\t\t\tif (WIFEXITED(status))\n\t\t\t\tbreak;\n\t\t\tassert(ptrace(PTRACE_SINGLESTEP, pid, 0,0) \u003d\u003d 0);\n\t\t}\n\n\t\tassert(WEXITSTATUS(status) \u003d\u003d 43);\n\t\treturn 0;\n\t}\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "569b846df54ffb2827b83ce3244c5f032394cba4", "tree": "77c5d373a5edf97710fab8777912971b99e84828", "parents": [ "cd9b45b78a61e8df250e69385c74e729e5b66abf" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Dec 15 16:47:03 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 07:20:07 2009 -0800" }, "message": "memcg: coalesce uncharge during unmap/truncate\n\nIn massive parallel enviroment, res_counter can be a performance\nbottleneck. One strong techinque to reduce lock contention is reducing\ncalls by coalescing some amount of calls into one.\n\nConsidering charge/uncharge chatacteristic,\n\t- charge is done one by one via demand-paging.\n\t- uncharge is done by\n\t\t- in chunk at munmap, truncate, exit, execve...\n\t\t- one by one via vmscan/paging.\n\nIt seems we have a chance to coalesce uncharges for improving scalability\nat unmap/truncation.\n\nThis patch is a for coalescing uncharge. For avoiding scattering memcg\u0027s\nstructure to functions under /mm, this patch adds memcg batch uncharge\ninformation to the task. A reason for per-task batching is for making use\nof caller\u0027s context information. We do batched uncharge (deleyed\nuncharge) when truncation/unmap occurs but do direct uncharge when\nuncharge is called by memory reclaim (vmscan.c).\n\nThe degree of coalescing depends on callers\n - at invalidate/trucate... pagevec size\n - at unmap ....ZAP_BLOCK_SIZE\n(memory itself will be freed in this degree.)\nThen, we\u0027ll not coalescing too much.\n\nOn x86-64 8cpu server, I tested overheads of memcg at page fault by\nrunning a program which does map/fault/unmap in a loop. Running\na task per a cpu by taskset and see sum of the number of page faults\nin 60secs.\n\n[without memcg config]\n 40156968 page-faults # 0.085 M/sec ( +- 0.046% )\n 27.67 cache-miss/faults\n[root cgroup]\n 36659599 page-faults # 0.077 M/sec ( +- 0.247% )\n 31.58 miss/faults\n[in a child cgroup]\n 18444157 page-faults # 0.039 M/sec ( +- 0.133% )\n 69.96 miss/faults\n[child with this patch]\n 27133719 page-faults # 0.057 M/sec ( +- 0.155% )\n 47.16 miss/faults\n\nWe can see some amounts of improvement.\n(root cgroup doesn\u0027t affected by this patch)\nAnother patch for \"charge\" will follow this and above will be improved more.\n\nChangelog(since 2009/10/02):\n - renamed filed of memcg_batch (as pages to bytes, memsw to memsw_bytes)\n - some clean up and commentary/description updates.\n - added initialize code to copy_process(). (possible bug fix)\n\nChangelog(old):\n - fixed !CONFIG_MEM_CGROUP case.\n - rebased onto the latest mmotm + softlimit fix patches.\n - unified patch for callers\n - added commetns.\n - make -\u003edo_batch as bool.\n - removed css_get() at el. We don\u0027t need it.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1d615482547584b9a8bb6316a58fed6ce90dd9ff", "tree": "21dae4b70acb3ce0bdaeeaee1dbd970be41d26e2", "parents": [ "fe841226bd954fba4fd79f037a876053fe9c3217" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Nov 17 14:54:03 2009 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Dec 14 23:55:33 2009 +0100" }, "message": "sched: Convert pi_lock to raw_spinlock\n\nConvert locks which cannot be sleeping locks in preempt-rt to\nraw_spinlocks.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6035ccd8e9e40bb654fbfdef325902ab531679a5", "tree": "c1810d8a4d4ef150cdf14af72e6087dfc3f4b6e0", "parents": [ "23eb3b64b5e44680c867e165fe1cd18e57fba255", "878eaddd05d251cefa9632c2b8046833c5eead66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:19:16 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:19:16 2009 -0800" }, "message": "Merge branch \u0027for-2.6.33\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.33\u0027 of git://git.kernel.dk/linux-2.6-block: (113 commits)\n cfq-iosched: Do not access cfqq after freeing it\n block: include linux/err.h to use ERR_PTR\n cfq-iosched: use call_rcu() instead of doing grace period stall on queue exit\n blkio: Allow CFQ group IO scheduling even when CFQ is a module\n blkio: Implement dynamic io controlling policy registration\n blkio: Export some symbols from blkio as its user CFQ can be a module\n block: Fix io_context leak after failure of clone with CLONE_IO\n block: Fix io_context leak after clone with CLONE_IO\n cfq-iosched: make nonrot check logic consistent\n io controller: quick fix for blk-cgroup and modular CFQ\n cfq-iosched: move IO controller declerations to a header file\n cfq-iosched: fix compile problem with !CONFIG_CGROUP\n blkio: Documentation\n blkio: Wait on sync-noidle queue even if rq_noidle \u003d 1\n blkio: Implement group_isolation tunable\n blkio: Determine async workload length based on total number of queues\n blkio: Wait for cfq queue to get backlogged if group is empty\n blkio: Propagate cgroup weight updation to cfq groups\n blkio: Drop the reference to queue once the task changes cgroup\n blkio: Provide some isolation between groups\n ...\n" }, { "commit": "ed9216c1717a3f3738a77908aff78995ea69e7ff", "tree": "c6b5ace7c333dabbf1d94074a13a98244bcdfb26", "parents": [ "d7fc02c7bae7b1cf69269992cf880a43a350cdaa", "d5696725b2a4c59503f5e0bc33adeee7f30cd45b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:02:38 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:02:38 2009 -0800" }, "message": "Merge branch \u0027kvm-updates/2.6.33\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/2.6.33\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (84 commits)\n KVM: VMX: Fix comparison of guest efer with stale host value\n KVM: s390: Fix prefix register checking in arch/s390/kvm/sigp.c\n KVM: Drop user return notifier when disabling virtualization on a cpu\n KVM: VMX: Disable unrestricted guest when EPT disabled\n KVM: x86 emulator: limit instructions to 15 bytes\n KVM: s390: Make psw available on all exits, not just a subset\n KVM: x86: Add KVM_GET/SET_VCPU_EVENTS\n KVM: VMX: Report unexpected simultaneous exceptions as internal errors\n KVM: Allow internal errors reported to userspace to carry extra data\n KVM: Reorder IOCTLs in main kvm.h\n KVM: x86: Polish exception injection via KVM_SET_GUEST_DEBUG\n KVM: only clear irq_source_id if irqchip is present\n KVM: x86: disallow KVM_{SET,GET}_LAPIC without allocated in-kernel lapic\n KVM: x86: disallow multiple KVM_CREATE_IRQCHIP\n KVM: VMX: Remove vmx-\u003emsr_offset_efer\n KVM: MMU: update invlpg handler comment\n KVM: VMX: move CR3/PDPTR update to vmx_set_cr3\n KVM: remove duplicated task_switch check\n KVM: powerpc: Fix BUILD_BUG_ON condition\n KVM: VMX: Use shared msr infrastructure\n ...\n\nTrivial conflicts due to new Kconfig options in arch/Kconfig and kernel/Makefile\n" }, { "commit": "b69f2292063d2caf37ca9aec7d63ded203701bf3", "tree": "be4acb81ea4ab7014047808ec2b2c908e8334f55", "parents": [ "61cc74fbb87af6aa551a06a370590c9bc07e29d9" ], "author": { "name": "Louis Rilling", "email": "louis.rilling@kerlabs.com", "time": "Fri Dec 04 14:52:42 2009 +0100" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Fri Dec 04 16:36:18 2009 +0100" }, "message": "block: Fix io_context leak after failure of clone with CLONE_IO\n\nWith CLONE_IO, parent\u0027s io_context-\u003enr_tasks is incremented, but never\ndecremented whenever copy_process() fails afterwards, which prevents\nexit_io_context() from calling IO schedulers exit functions.\n\nGive a task_struct to exit_io_context(), and call exit_io_context() instead of\nput_io_context() in copy_process() cleanup path.\n\nSigned-off-by: Louis Rilling \u003clouis.rilling@kerlabs.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "58988b07cfe2ebe9f9b39d973fd8a083390e749f", "tree": "f7a164abe85b8aa768c58a80c1261208372fb4b0", "parents": [ "22763c5cf3690a681551162c15d34d935308c8d7", "8e7cac79808b62f242069a6ac88d364d35621371" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Dec 03 09:30:06 2009 +0200" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Thu Dec 03 09:30:06 2009 +0200" }, "message": "Merge remote branch \u0027tip/x86/entry\u0027 into kvm-updates/2.6.33\n\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "0cf55e1ec08bb5a22e068309e2d8ba1180ab4239", "tree": "6102662a9594d51155bee11666fe8517fcbe6039", "parents": [ "d99ca3b977fc5a93141304f571475c2af9e6c1c5" ], "author": { "name": "Hidetoshi Seto", "email": "seto.hidetoshi@jp.fujitsu.com", "time": "Wed Dec 02 17:28:07 2009 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 02 17:32:40 2009 +0100" }, "message": "sched, cputime: Introduce thread_group_times()\n\nThis is a real fix for problem of utime/stime values decreasing\ndescribed in the thread:\n\n http://lkml.org/lkml/2009/11/3/522\n\nNow cputime is accounted in the following way:\n\n - {u,s}time in task_struct are increased every time when the thread\n is interrupted by a tick (timer interrupt).\n\n - When a thread exits, its {u,s}time are added to signal-\u003e{u,s}time,\n after adjusted by task_times().\n\n - When all threads in a thread_group exits, accumulated {u,s}time\n (and also c{u,s}time) in signal struct are added to c{u,s}time\n in signal struct of the group\u0027s parent.\n\nSo {u,s}time in task struct are \"raw\" tick count, while\n{u,s}time and c{u,s}time in signal struct are \"adjusted\" values.\n\nAnd accounted values are used by:\n\n - task_times(), to get cputime of a thread:\n This function returns adjusted values that originates from raw\n {u,s}time and scaled by sum_exec_runtime that accounted by CFS.\n\n - thread_group_cputime(), to get cputime of a thread group:\n This function returns sum of all {u,s}time of living threads in\n the group, plus {u,s}time in the signal struct that is sum of\n adjusted cputimes of all exited threads belonged to the group.\n\nThe problem is the return value of thread_group_cputime(),\nbecause it is mixed sum of \"raw\" value and \"adjusted\" value:\n\n group\u0027s {u,s}time \u003d foreach(thread){{u,s}time} + exited({u,s}time)\n\nThis misbehavior can break {u,s}time monotonicity.\nAssume that if there is a thread that have raw values greater\nthan adjusted values (e.g. interrupted by 1000Hz ticks 50 times\nbut only runs 45ms) and if it exits, cputime will decrease (e.g.\n-5ms).\n\nTo fix this, we could do:\n\n group\u0027s {u,s}time \u003d foreach(t){task_times(t)} + exited({u,s}time)\n\nBut task_times() contains hard divisions, so applying it for\nevery thread should be avoided.\n\nThis patch fixes the above problem in the following way:\n\n - Modify thread\u0027s exit (\u003d __exit_signal()) not to use task_times().\n It means {u,s}time in signal struct accumulates raw values instead\n of adjusted values. As the result it makes thread_group_cputime()\n to return pure sum of \"raw\" values.\n\n - Introduce a new function thread_group_times(*task, *utime, *stime)\n that converts \"raw\" values of thread_group_cputime() to \"adjusted\"\n values, in same calculation procedure as task_times().\n\n - Modify group\u0027s exit (\u003d wait_task_zombie()) to use this introduced\n thread_group_times(). It make c{u,s}time in signal struct to\n have adjusted values like before this patch.\n\n - Replace some thread_group_cputime() by thread_group_times().\n This replacements are only applied where conveys the \"adjusted\"\n cputime to users, and where already uses task_times() near by it.\n (i.e. sys_times(), getrusage(), and /proc/\u003cPID\u003e/stat.)\n\nThis patch have a positive side effect:\n\n - Before this patch, if a group contains many short-life threads\n (e.g. runs 0.9ms and not interrupted by ticks), the group\u0027s\n cputime could be invisible since thread\u0027s cputime was accumulated\n after adjusted: imagine adjustment function as adj(ticks, runtime),\n {adj(0, 0.9) + adj(0, 0.9) + ....} \u003d {0 + 0 + ....} \u003d 0.\n After this patch it will not happen because the adjustment is\n applied after accumulated.\n\nv2:\n - remove if()s, put new variables into signal_struct.\n\nSigned-off-by: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Spencer Candland \u003cspencer@bluehost.com\u003e\nCc: Americo Wang \u003cxiyou.wangcong@gmail.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nLKML-Reference: \u003c4B162517.8040909@jp.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d99ca3b977fc5a93141304f571475c2af9e6c1c5", "tree": "7665ebdafcef46c310055021562e6629f59eafd5", "parents": [ "be8147e68625a1adb111acfd6b98a492be4b74d0" ], "author": { "name": "Hidetoshi Seto", "email": "seto.hidetoshi@jp.fujitsu.com", "time": "Wed Dec 02 17:26:47 2009 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 02 17:32:39 2009 +0100" }, "message": "sched, cputime: Cleanups related to task_times()\n\n- Remove if({u,s}t)s because no one call it with NULL now.\n- Use cputime_{add,sub}().\n- Add ifndef-endif for prev_{u,s}time since they are used\n only when !VIRT_CPU_ACCOUNTING.\n\nSigned-off-by: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Spencer Candland \u003cspencer@bluehost.com\u003e\nCc: Americo Wang \u003cxiyou.wangcong@gmail.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nLKML-Reference: \u003c4B1624C7.7040302@jp.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "8e7cac79808b62f242069a6ac88d364d35621371", "tree": "b68dacc4e080ec8c4587d783a8014906e2eb2445", "parents": [ "3c912b6edaac56cb451e7571c95c15cbb6bd0c81" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Sun Nov 29 16:34:48 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Nov 29 22:03:04 2009 +0100" }, "message": "core: Fix user return notifier on fork()\n\nfork() clones all thread_info flags, including\nTIF_USER_RETURN_NOTIFY; if the new task is first scheduled on a cpu\nwhich doesn\u0027t have user return notifiers set, this causes user\nreturn notifiers to trigger without any way of clearing itself.\n\nThis is easy to trigger with a forky workload on the host in\nparallel with kvm, resulting in a cpu in an endless loop on the\nverge of returning to userspace.\n\nFix by dropping the TIF_USER_RETURN_NOTIFY immediately after fork.\n\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\nLKML-Reference: \u003c1259505288-16559-1-git-send-email-avi@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "1d510750941a53a1d3049c1d33c75d6dfcd78618", "tree": "03f501224f839aa897cf540e29595aeda8551052", "parents": [ "1c211849d893b14cc923a18708923954fdd2c63e" ], "author": { "name": "Ian Campbell", "email": "Ian.Campbell@citrix.com", "time": "Tue Nov 03 10:11:14 2009 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 03 07:52:39 2009 -0800" }, "message": "Correct nr_processes() when CPUs have been unplugged\n\nnr_processes() returns the sum of the per cpu counter process_counts for\nall online CPUs. This counter is incremented for the current CPU on\nfork() and decremented for the current CPU on exit(). Since a process\ndoes not necessarily fork and exit on the same CPU the process_count for\nan individual CPU can be either positive or negative and effectively has\nno meaning in isolation.\n\nTherefore calculating the sum of process_counts over only the online\nCPUs omits the processes which were started or stopped on any CPU which\nhas since been unplugged. Only the sum of process_counts across all\npossible CPUs has meaning.\n\nThe only caller of nr_processes() is proc_root_getattr() which\ncalculates the number of links to /proc as\n stat-\u003enlink \u003d proc_root.nlink + nr_processes();\n\nYou don\u0027t have to be all that unlucky for the nr_processes() to return a\nnegative value leading to a negative number of links (or rather, an\napparently enormous number of links). If this happens then you can get\nfailures where things like \"ls /proc\" start to fail because they got an\n-EOVERFLOW from some stat() call.\n\nExample with some debugging inserted to show what goes on:\n # ps haux|wc -l\n nr_processes: CPU0: 90\n nr_processes: CPU1: 1030\n nr_processes: CPU2: -900\n nr_processes: CPU3: -136\n nr_processes: TOTAL: 84\n proc_root_getattr. nlink 12 + nr_processes() 84 \u003d 96\n 84\n # echo 0 \u003e/sys/devices/system/cpu/cpu1/online\n # ps haux|wc -l\n nr_processes: CPU0: 85\n nr_processes: CPU2: -901\n nr_processes: CPU3: -137\n nr_processes: TOTAL: -953\n proc_root_getattr. nlink 12 + nr_processes() -953 \u003d -941\n 75\n # stat /proc/\n nr_processes: CPU0: 84\n nr_processes: CPU2: -901\n nr_processes: CPU3: -137\n nr_processes: TOTAL: -954\n proc_root_getattr. nlink 12 + nr_processes() -954 \u003d -942\n File: `/proc/\u0027\n Size: 0 Blocks: 0 IO Block: 1024 directory\n Device: 3h/3d Inode: 1 Links: 4294966354\n Access: (0555/dr-xr-xr-x) Uid: ( 0/ root) Gid: ( 0/ root)\n Access: 2009-11-03 09:06:55.000000000 +0000\n Modify: 2009-11-03 09:06:55.000000000 +0000\n Change: 2009-11-03 09:06:55.000000000 +0000\n\nI\u0027m not 100% convinced that the per_cpu regions remain valid for offline\nCPUs, although my testing suggests that they do. If not then I think the\ncorrect solution would be to aggregate the process_count for a given CPU\ninto a global base value in cpu_down().\n\nThis bug appears to pre-date the transition to git and it looks like it\nmay even have been present in linux-2.6.0-test7-bk3 since it looks like\nthe code Rusty patched in http://lwn.net/Articles/64773/ was already\nwrong.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\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": "fc6b177dee33365ccb29fe6d2092223cf8d679f9", "tree": "849fcb60282bc6c0a01c3113dfc617c7f03f97d3", "parents": [ "eaaea8036d0261d87d7072c5bc88c7ea730c18ac" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Mon Oct 05 18:17:32 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Oct 06 17:00:01 2009 +0200" }, "message": "futex: Nullify robust lists after cleanup\n\nThe robust list pointers of user space held futexes are kept intact\nover an exec() call. When the exec\u0027ed task exits exit_robust_list() is\ncalled with the stale pointer. The risk of corruption is minimal, but\nstill it is incorrect to keep the pointers valid. Actually glibc\nshould uninstall the robust list before calling exec() but we have to\ndeal with it anyway.\n\nNullify the pointers after [compat_]exit_robust_list() has been\ncalled.\n\nReported-by: Anirban Sinha \u003cani@anirban.org\u003e\nSigned-off-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLKML-Reference: \u003cnew-submission\u003e\nCc: stable@kernel.org\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": "858f09930b32c11b40fd0c5c467982ba09b10894", "tree": "43972de84d69d61904f4f24ff78f99a3a82c2ff3", "parents": [ "b873c2f34ecd4a5a69b41b852cbc365694541c5f" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Wed Sep 23 15:57:32 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:21:05 2009 -0700" }, "message": "aio: ifdef fields in mm_struct\n\n-\u003eioctx_lock and -\u003eioctx_list are used only under CONFIG_AIO.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Zach Brown \u003czach.brown@oracle.com\u003e\nCc: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "123be07b0b399670a7cc3d82fef0cb4f93ef885c", "tree": "b6edc440be85cf312f7c35ad7b01c7ce7d9241a7", "parents": [ "8d65af789f3e2cf4cfbdbf71a0f7a61ebcd41d38" ], "author": { "name": "Sukadev Bhattiprolu", "email": "sukadev@linux.vnet.ibm.com", "time": "Wed Sep 23 15:57:20 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:21:04 2009 -0700" }, "message": "fork(): disable CLONE_PARENT for init\n\nWhen global or container-init processes use CLONE_PARENT, they create a\nmulti-rooted process tree. Besides siblings of global init remain as\nzombies on exit since they are not reaped by their parent (swapper). So\nprevent global and container-inits from creating siblings.\n\nSigned-off-by: Sukadev Bhattiprolu \u003csukadev@us.ibm.com\u003e\nAcked-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: Oren Laadan \u003corenl@cs.columbia.edu\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Serge Hallyn \u003cserue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "31bbb9b58d1e8ebcf2b28c95c2250a9f8e31e397", "tree": "6bb0c0490d66d32eca43e73abb28d8b3ab0e7b91", "parents": [ "ff830b8e5f999d1ccbd0282a666520f0b557daa4", "3f0a525ebf4b8ef041a332bbe4a73aee94bb064b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 09:46:15 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 09:46:15 2009 -0700" }, "message": "Merge branch \u0027timers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n itimers: Add tracepoints for itimer\n hrtimer: Add tracepoint for hrtimers\n timers: Add tracepoints for timer_list timers\n cputime: Optimize jiffies_to_cputime(1)\n itimers: Simplify arm_timer() code a bit\n itimers: Fix periodic tics precision\n itimers: Merge ITIMER_VIRT and ITIMER_PROF\n\nTrivial header file include conflicts in kernel/fork.c\n" }, { "commit": "d899bf7b55f503ba7d3d07ed27c3a37e270fa7db", "tree": "32a5ee7816b2f0cb3261dcca8102b9cafe9251bd", "parents": [ "cba8aafe1e07dfc8bae5ba78be8e02883bd34d31" ], "author": { "name": "Stefani Seibold", "email": "stefani@seibold.net", "time": "Tue Sep 22 16:45:40 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 07:39:41 2009 -0700" }, "message": "procfs: provide stack information for threads\n\nA patch to give a better overview of the userland application stack usage,\nespecially for embedded linux.\n\nCurrently you are only able to dump the main process/thread stack usage\nwhich is showed in /proc/pid/status by the \"VmStk\" Value. But you get no\ninformation about the consumed stack memory of the the threads.\n\nThere is an enhancement in the /proc/\u003cpid\u003e/{task/*,}/*maps and which marks\nthe vm mapping where the thread stack pointer reside with \"[thread stack\nxxxxxxxx]\". xxxxxxxx is the maximum size of stack. This is a value\ninformation, because libpthread doesn\u0027t set the start of the stack to the\ntop of the mapped area, depending of the pthread usage.\n\nA sample output of /proc/\u003cpid\u003e/task/\u003ctid\u003e/maps looks like:\n\n08048000-08049000 r-xp 00000000 03:00 8312 /opt/z\n08049000-0804a000 rw-p 00001000 03:00 8312 /opt/z\n0804a000-0806b000 rw-p 00000000 00:00 0 [heap]\na7d12000-a7d13000 ---p 00000000 00:00 0\na7d13000-a7f13000 rw-p 00000000 00:00 0 [thread stack: 001ff4b4]\na7f13000-a7f14000 ---p 00000000 00:00 0\na7f14000-a7f36000 rw-p 00000000 00:00 0\na7f36000-a8069000 r-xp 00000000 03:00 4222 /lib/libc.so.6\na8069000-a806b000 r--p 00133000 03:00 4222 /lib/libc.so.6\na806b000-a806c000 rw-p 00135000 03:00 4222 /lib/libc.so.6\na806c000-a806f000 rw-p 00000000 00:00 0\na806f000-a8083000 r-xp 00000000 03:00 14462 /lib/libpthread.so.0\na8083000-a8084000 r--p 00013000 03:00 14462 /lib/libpthread.so.0\na8084000-a8085000 rw-p 00014000 03:00 14462 /lib/libpthread.so.0\na8085000-a8088000 rw-p 00000000 00:00 0\na8088000-a80a4000 r-xp 00000000 03:00 8317 /lib/ld-linux.so.2\na80a4000-a80a5000 r--p 0001b000 03:00 8317 /lib/ld-linux.so.2\na80a5000-a80a6000 rw-p 0001c000 03:00 8317 /lib/ld-linux.so.2\nafaf5000-afb0a000 rw-p 00000000 00:00 0 [stack]\nffffe000-fffff000 r-xp 00000000 00:00 0 [vdso]\n\nAlso there is a new entry \"stack usage\" in /proc/\u003cpid\u003e/{task/*,}/status\nwhich will you give the current stack usage in kb.\n\nA sample output of /proc/self/status looks like:\n\nName:\tcat\nState:\tR (running)\nTgid:\t507\nPid:\t507\n.\n.\n.\nCapBnd:\tfffffffffffffeff\nvoluntary_ctxt_switches:\t0\nnonvoluntary_ctxt_switches:\t0\nStack usage:\t12 kB\n\nI also fixed stack base address in /proc/\u003cpid\u003e/{task/*,}/stat to the base\naddress of the associated thread stack and not the one of the main\nprocess. This makes more sense.\n\n[akpm@linux-foundation.org: fs/proc/array.c now needs walk_page_range()]\nSigned-off-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "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": "28b83c5193e7ab951e402252278f2cc79dc4d298", "tree": "10080e8d3957c2a03f8419ab44c9ecb0ffcdaee0", "parents": [ "f168e1b6390e2d79cf57e48e6ae6d9b0a9e2851a" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Mon Sep 21 17:03:13 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:39 2009 -0700" }, "message": "oom: move oom_adj value from task_struct to signal_struct\n\nCurrently, OOM logic callflow is here.\n\n __out_of_memory()\n select_bad_process() for each task\n badness() calculate badness of one task\n oom_kill_process() search child\n oom_kill_task() kill target task and mm shared tasks with it\n\nexample, process-A have two thread, thread-A and thread-B and it have very\nfat memory and each thread have following oom_adj and oom_score.\n\n thread-A: oom_adj \u003d OOM_DISABLE, oom_score \u003d 0\n thread-B: oom_adj \u003d 0, oom_score \u003d very-high\n\nThen, select_bad_process() select thread-B, but oom_kill_task() refuse\nkill the task because thread-A have OOM_DISABLE. Thus __out_of_memory()\ncall select_bad_process() again. but select_bad_process() select the same\ntask. It mean kernel fall in livelock.\n\nThe fact is, select_bad_process() must select killable task. otherwise\nOOM logic go into livelock.\n\nAnd root cause is, oom_adj shouldn\u0027t be per-thread value. it should be\nper-process value because OOM-killer kill a process, not thread. Thus\nThis patch moves oomkilladj (now more appropriately named oom_adj) from\nstruct task_struct to struct signal_struct. it naturally prevent\nselect_bad_process() choose wrong task.\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1c2fb7a4c2ca7a958b02bc1e615d0254990bba8d", "tree": "489a97bd453b8002f2234f7e736548103315fa38", "parents": [ "9ba6929480088a85c1ff60a4b1f1c9fc80dbd2b7" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Mon Sep 21 17:02:22 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:32 2009 -0700" }, "message": "ksm: fix deadlock with munlock in exit_mmap\n\nRawhide users have reported hang at startup when cryptsetup is run: the\nsame problem can be simply reproduced by running a program int main() {\nmlockall(MCL_CURRENT | MCL_FUTURE); return 0; }\n\nThe problem is that exit_mmap() applies munlock_vma_pages_all() to\nclean up VM_LOCKED areas, and its current implementation (stupidly)\ntries to fault in absent pages, for example where PROT_NONE prevented\nthem being faulted in when mlocking. Whereas the \"ksm: fix oom\ndeadlock\" patch, knowing there\u0027s a race by which KSM might try to fault\nin pages after exit_mmap() had finally zapped the range, backs out of\nsuch faults doing nothing when its ksm_test_exit() notices mm_users 0.\n\nSo revert that part of \"ksm: fix oom deadlock\" which moved the\nksm_exit() call from before exit_mmap() to the middle of exit_mmap();\nand remove those ksm_test_exit() checks from the page fault paths, so\nallowing the munlocking to proceed without interference.\n\nksm_exit, if there are rmap_items still chained on this mm slot, takes\nmmap_sem write side: so preventing KSM from working on an mm while\nexit_mmap runs. And KSM will bail out as soon as it notices that\nmm_users is already zero, thanks to its internal ksm_test_exit checks.\nSo that when a task is killed by OOM killer or the user, KSM will not\nindefinitely prevent it from running exit_mmap to release its memory.\n\nThis does break a part of what \"ksm: fix oom deadlock\" was trying to\nachieve. When unmerging KSM (echo 2 \u003e/sys/kernel/mm/ksm), and even\nwhen ksmd itself has to cancel a KSM page, it is possible that the\nfirst OOM-kill victim would be the KSM process being faulted: then its\nmemory won\u0027t be freed until a second victim has been selected (freeing\nmemory for the unmerging fault to complete).\n\nBut the OOM killer is already liable to kill a second victim once the\nintended victim\u0027s p-\u003emm goes to NULL: so there\u0027s not much point in\nrejecting this KSM patch before fixing that OOM behaviour. It is very\nmuch more important to allow KSM users to boot up, than to haggle over\nan unlikely and poorly supported OOM case.\n\nWe also intend to fix munlocking to not fault pages: at which point\nthis patch _could_ be reverted; though that would be controversial, so\nwe hope to find a better solution.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Justin M. Forbes \u003cjforbes@redhat.com\u003e\nAcked-for-now-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Izik Eidus \u003cieidus@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": "9ba6929480088a85c1ff60a4b1f1c9fc80dbd2b7", "tree": "39aab8cdffae598b55e35c578f70820712286ab4", "parents": [ "cd551f97519d35855be5a8720a47cc802ee4fd06" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Sep 21 17:02:20 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:32 2009 -0700" }, "message": "ksm: fix oom deadlock\n\nThere\u0027s a now-obvious deadlock in KSM\u0027s out-of-memory handling:\nimagine ksmd or KSM_RUN_UNMERGE handling, holding ksm_thread_mutex,\ntrying to allocate a page to break KSM in an mm which becomes the\nOOM victim (quite likely in the unmerge case): it\u0027s killed and goes\nto exit, and hangs there waiting to acquire ksm_thread_mutex.\n\nClearly we must not require ksm_thread_mutex in __ksm_exit, simple\nthough that made everything else: perhaps use mmap_sem somehow?\nAnd part of the answer lies in the comments on unmerge_ksm_pages:\n__ksm_exit should also leave all the rmap_item removal to ksmd.\n\nBut there\u0027s a fundamental problem, that KSM relies upon mmap_sem to\nguarantee the consistency of the mm it\u0027s dealing with, yet exit_mmap\ntears down an mm without taking mmap_sem. And bumping mm_users won\u0027t\nhelp at all, that just ensures that the pages the OOM killer assumes\nare on their way to being freed will not be freed.\n\nThe best answer seems to be, to move the ksm_exit callout from just\nbefore exit_mmap, to the middle of exit_mmap: after the mm\u0027s pages\nhave been freed (if the mmu_gather is flushed), but before its page\ntables and vma structures have been freed; and down_write,up_write\nmmap_sem there to serialize with KSM\u0027s own reliance on mmap_sem.\n\nBut KSM then needs to be careful, whenever it downs mmap_sem, to\ncheck that the mm is not already exiting: there\u0027s a danger of using\nfind_vma on a layout that\u0027s being torn apart, or writing into page\ntables which have been freed for reuse; and even do_anonymous_page\nand __do_fault need to check they\u0027re not being called by break_ksm\nto reinstate a pte after zap_pte_range has zapped that page table.\n\nThough it might be clearer to add an exiting flag, set while holding\nmmap_sem in __ksm_exit, that wouldn\u0027t cover the issue of reinstating\na zapped pte. All we need is to check whether mm_users is 0 - but\nmust remember that ksmd may detect that before __ksm_exit is reached.\nSo, ksm_test_exit(mm) added to comment such checks on mm-\u003emm_users.\n\n__ksm_exit now has to leave clearing up the rmap_items to ksmd,\nthat needs ksm_thread_mutex; but shift the exiting mm just after the\nksm_scan cursor so that it will soon be dealt with. __ksm_enter raise\nmm_count to hold the mm_struct, ksmd\u0027s exit processing (exactly like\nits processing when it finds all VM_MERGEABLEs unmapped) mmdrop it,\nsimilar procedure for KSM_RUN_UNMERGE (which has stopped ksmd).\n\nBut also give __ksm_exit a fast path: when there\u0027s no complication\n(no rmap_items attached to mm and it\u0027s not at the ksm_scan cursor),\nit can safely do all the exiting work itself. This is not just an\noptimization: when ksmd is not running, the raised mm_count would\notherwise leak mm_structs.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nAcked-by: Izik Eidus \u003cieidus@redhat.com\u003e\nCc: Andrea Arcangeli \u003caarcange@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": "f8af4da3b4c14e7267c4ffb952079af3912c51c5", "tree": "17b0cfbd2d3d9abf9008f69e7fee5369cec7afa5", "parents": [ "d19f352484467a5e518639ddff0554669c10ffab" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Sep 21 17:01:57 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:31 2009 -0700" }, "message": "ksm: the mm interface to ksm\n\nThis patch presents the mm interface to a dummy version of ksm.c, for\nbetter scrutiny of that interface: the real ksm.c follows later.\n\nWhen CONFIG_KSM is not set, madvise(2) reject MADV_MERGEABLE and\nMADV_UNMERGEABLE with EINVAL, since that seems more helpful than\npretending that they can be serviced. But when CONFIG_KSM\u003dy, accept them\neven if KSM is not currently running, and even on areas which KSM will not\ntouch (e.g. hugetlb or shared file or special driver mappings).\n\nLike other madvices, report ENOMEM despite success if any area in the\nrange is unmapped, and use EAGAIN to report out of memory.\n\nDefine vma flag VM_MERGEABLE to identify an area on which KSM may try\nmerging pages: leave it to ksm_madvise() to decide whether to set it.\nDefine mm flag MMF_VM_MERGEABLE to identify an mm which might contain\nVM_MERGEABLE areas, to minimize callouts when forking or exiting.\n\nBased upon earlier patches by Chris Wright and Izik Eidus.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nSigned-off-by: Chris Wright \u003cchrisw@redhat.com\u003e\nSigned-off-by: Izik Eidus \u003cieidus@redhat.com\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c6a7f5728a1db45d30df55a01adc130b4ab0327c", "tree": "36649bc6ebb959841a5097c699968722cfd99c4d", "parents": [ "71de1ccbe1fb40203edd3beb473f8580d917d2ca" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Mon Sep 21 17:01:32 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:27 2009 -0700" }, "message": "mm: oom analysis: Show kernel stack usage in /proc/meminfo and OOM log output\n\nThe amount of memory allocated to kernel stacks can become significant and\ncause OOM conditions. However, we do not display the amount of memory\nconsumed by stacks.\n\nAdd code to display the amount of memory used for stacks in /proc/meminfo.\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: 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": "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": "a3c8b97396ef42edfb845788ba6f53b2a93ce980", "tree": "530c5bdbc534618311dab3e0af245835af56db0f", "parents": [ "74fca6a42863ffacaf7ba6f1936a9f228950f657", "9f0ab4a3f0fdb1ff404d150618ace2fa069bb2e1" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 11 08:04:49 2009 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Sep 11 08:04:49 2009 +1000" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "29e2035bddecce3eb584a8304528b50da8370a24", "tree": "13155df7d90a8e287b83a1cd6c0d02c3018212ab", "parents": [ "868489660dabc0c28087cca3dbc1adbbc398c6fe", "37d0892c5a94e208cf863e3b7bac014edee4346d" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Sep 04 09:28:52 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Sep 04 09:29:05 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into core/rcu\n\nMerge reason: Avoid fuzz in init/main.c and update from rc6 to rc8.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\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": "f71bb0ac5e85410601b0db29d7b1635345ea61a4", "tree": "7c3ef70ef008db87d8b71e5de0632766ecd64d2f", "parents": [ "7285dd7fd375763bfb8ab1ac9cf3f1206f503c16", "a42548a18866e87092db93b771e6c5b060d78401" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Aug 29 10:34:18 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Aug 29 10:34:29 2009 +0200" }, "message": "Merge branch \u0027timers/posixtimers\u0027 into timers/tracing\n\nMerge reason: timer tracepoint patches depend on both branches\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "4ab6c08336535f8c8e42cf45d7adeda882eff06e", "tree": "a55253a82ba425e38a3f2993b04fa1e3023da25a", "parents": [ "03ef83af528899aa339e42d8024b37e2f434fba4" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Aug 26 14:29:24 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 26 20:06:52 2009 -0700" }, "message": "clone(): fix race between copy_process() and de_thread()\n\nSpotted by Hiroshi Shimamoto who also provided the test-case below.\n\ncopy_process() uses signal-\u003ecount as a reference counter, but it is not.\nThis test case\n\n\t#include \u003csys/types.h\u003e\n\t#include \u003csys/wait.h\u003e\n\t#include \u003cunistd.h\u003e\n\t#include \u003cstdio.h\u003e\n\t#include \u003cerrno.h\u003e\n\t#include \u003cpthread.h\u003e\n\n\tvoid *null_thread(void *p)\n\t{\n\t\tfor (;;)\n\t\t\tsleep(1);\n\n\t\treturn NULL;\n\t}\n\n\tvoid *exec_thread(void *p)\n\t{\n\t\texecl(\"/bin/true\", \"/bin/true\", NULL);\n\n\t\treturn null_thread(p);\n\t}\n\n\tint main(int argc, char **argv)\n\t{\n\t\tfor (;;) {\n\t\t\tpid_t pid;\n\t\t\tint ret, status;\n\n\t\t\tpid \u003d fork();\n\t\t\tif (pid \u003c 0)\n\t\t\t\tbreak;\n\n\t\t\tif (!pid) {\n\t\t\t\tpthread_t tid;\n\n\t\t\t\tpthread_create(\u0026tid, NULL, exec_thread, NULL);\n\t\t\t\tfor (;;)\n\t\t\t\t\tpthread_create(\u0026tid, NULL, null_thread, NULL);\n\t\t\t}\n\n\t\t\tdo {\n\t\t\t\tret \u003d waitpid(pid, \u0026status, 0);\n\t\t\t} while (ret \u003d\u003d -1 \u0026\u0026 errno \u003d\u003d EINTR);\n\t\t}\n\n\t\treturn 0;\n\t}\n\nquickly creates an unkillable task.\n\nIf copy_process(CLONE_THREAD) races with de_thread()\ncopy_signal()-\u003eatomic(signal-\u003ecount) breaks the signal-\u003enotify_count\nlogic, and the execing thread can hang forever in kernel space.\n\nChange copy_process() to increment count/live only when we know for sure\nwe can\u0027t fail. In this case the forked thread will take care of its\nreference to signal correctly.\n\nIf copy_process() fails, check CLONE_THREAD flag. If it it set - do\nnothing, the counters were not changed and current belongs to the same\nthread group. If it is not set, -\u003esignal must be released in any case\n(and -\u003ecount must be \u003d\u003d 1), the forked child is the only thread in the\nthread group.\n\nWe need more cleanups here, in particular signal-\u003ecount should not be used\nby de_thread/__exit_signal at all. This patch only fixes the bug.\n\nReported-by: Hiroshi Shimamoto \u003ch-shimamoto@ct.jp.nec.com\u003e\nTested-by: Hiroshi Shimamoto \u003ch-shimamoto@ct.jp.nec.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "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": "0753ba01e126020bf0f8150934903b48935b697d", "tree": "fbfd7e2d0abbe724a8c5e0e17fb9af522ed2e097", "parents": [ "89a4eb4b66e8f4d395e14a14d262dac4d6ca52f0" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Tue Aug 18 14:11:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 18 16:31:13 2009 -0700" }, "message": "mm: revert \"oom: move oom_adj value\"\n\nThe commit 2ff05b2b (oom: move oom_adj value) moveed the oom_adj value to\nthe mm_struct. It was a very good first step for sanitize OOM.\n\nHowever Paul Menage reported the commit makes regression to his job\nscheduler. Current OOM logic can kill OOM_DISABLED process.\n\nWhy? His program has the code of similar to the following.\n\n\t...\n\tset_oom_adj(OOM_DISABLE); /* The job scheduler never killed by oom */\n\t...\n\tif (vfork() \u003d\u003d 0) {\n\t\tset_oom_adj(0); /* Invoked child can be killed */\n\t\texecve(\"foo-bar-cmd\");\n\t}\n\t....\n\nvfork() parent and child are shared the same mm_struct. then above\nset_oom_adj(0) doesn\u0027t only change oom_adj for vfork() child, it\u0027s also\nchange oom_adj for vfork() parent. Then, vfork() parent (job scheduler)\nlost OOM immune and it was killed.\n\nActually, fork-setting-exec idiom is very frequently used in userland program.\nWe must not break this assumption.\n\nThen, this patch revert commit 2ff05b2b and related commit.\n\nReverted commit list\n---------------------\n- commit 2ff05b2b4e (oom: move oom_adj value from task_struct to mm_struct)\n- commit 4d8b9135c3 (oom: avoid unnecessary mm locking and scanning for OOM_DISABLE)\n- commit 8123681022 (oom: only oom kill exiting tasks with attached memory)\n- commit 933b787b57 (mm: copy over oom_adj value at fork time)\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9c8a8228d0827e0d91d28527209988f672f97d28", "tree": "795b72cfb89abe8bfae1c51dd329e0d6c2ed754f", "parents": [ "2198a64a7487aba036f71998ade8a6528070d32c" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Aug 06 15:09:28 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 07 10:39:56 2009 -0700" }, "message": "execve: must clear current-\u003eclear_child_tid\n\nWhile looking at Jens Rosenboom bug report\n(http://lkml.org/lkml/2009/7/27/35) about strange sys_futex call done from\na dying \"ps\" program, we found following problem.\n\nclone() syscall has special support for TID of created threads. This\nsupport includes two features.\n\nOne (CLONE_CHILD_SETTID) is to set an integer into user memory with the\nTID value.\n\nOne (CLONE_CHILD_CLEARTID) is to clear this same integer once the created\nthread dies.\n\nThe integer location is a user provided pointer, provided at clone()\ntime.\n\nkernel keeps this pointer value into current-\u003eclear_child_tid.\n\nAt execve() time, we should make sure kernel doesnt keep this user\nprovided pointer, as full user memory is replaced by a new one.\n\nAs glibc fork() actually uses clone() syscall with CLONE_CHILD_SETTID and\nCLONE_CHILD_CLEARTID set, chances are high that we might corrupt user\nmemory in forked processes.\n\nFollowing sequence could happen:\n\n1) bash (or any program) starts a new process, by a fork() call that\n glibc maps to a clone( ... CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID\n ...) syscall\n\n2) When new process starts, its current-\u003eclear_child_tid is set to a\n location that has a meaning only in bash (or initial program) context\n (\u0026THREAD_SELF-\u003etid)\n\n3) This new process does the execve() syscall to start a new program.\n current-\u003eclear_child_tid is left unchanged (a non NULL value)\n\n4) If this new program creates some threads, and initial thread exits,\n kernel will attempt to clear the integer pointed by\n current-\u003eclear_child_tid from mm_release() :\n\n if (tsk-\u003eclear_child_tid\n \u0026\u0026 !(tsk-\u003eflags \u0026 PF_SIGNALED)\n \u0026\u0026 atomic_read(\u0026mm-\u003emm_users) \u003e 1) {\n u32 __user * tidptr \u003d tsk-\u003eclear_child_tid;\n tsk-\u003eclear_child_tid \u003d NULL;\n\n /*\n * We don\u0027t check the error code - if userspace has\n * not set up a proper pointer then tough luck.\n */\n\u003c\u003c here \u003e\u003e put_user(0, tidptr);\n sys_futex(tidptr, FUTEX_WAKE, 1, NULL, NULL, 0);\n }\n\n5) OR : if new program is not multi-threaded, but spied by /proc/pid\n users (ps command for example), mm_users \u003e 1, and the exiting program\n could corrupt 4 bytes in a persistent memory area (shm or memory mapped\n file)\n\nIf current-\u003eclear_child_tid points to a writeable portion of memory of the\nnew program, kernel happily and silently corrupts 4 bytes of memory, with\nunexpected effects.\n\nFix is straightforward and should not break any sane program.\n\nReported-by: Jens Rosenboom \u003cjens@mcbone.net\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Sonny Rao \u003csonnyrao@us.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ulrich Drepper \u003cdrepper@redhat.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "42c4ab41a176ee784c0f28c0b29025a8fc34f05a", "tree": "370393a0e02faa7a6a7d211205b31ceb74880359", "parents": [ "ed680c4ad478d0fee9740f7d029087f181346564" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Wed Jul 29 12:15:26 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 03 14:48:35 2009 +0200" }, "message": "itimers: Merge ITIMER_VIRT and ITIMER_PROF\n\nBoth cpu itimers have same data flow in the few places, this\npatch make unification of code related with VIRT and PROF\nitimers.\n\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nLKML-Reference: \u003c1248862529-6063-2-git-send-email-sgruszka@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9f498cc5be7e013d8d6e4c616980ed0ffc8680d2", "tree": "25ef7a52d61ffd336c73b42dcf770424beb19cf3", "parents": [ "e53c0994709166b111fbe9162d1a16ece7dfc45b" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Jul 23 14:46:33 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Aug 02 13:47:56 2009 +0200" }, "message": "perf_counter: Full task tracing\n\nIn order to be able to distinguish between no samples due to\ninactivity and no samples due to task ended, Arjan asked for\nPERF_EVENT_EXIT events. This is useful to the boot delay\ninstrumentation (bootchart) app.\n\nThis patch changes the PERF_EVENT_FORK to be emitted on every\nclone, and adds PERF_EVENT_EXIT to be emitted on task exit,\nafter the task\u0027s counters have been closed.\n\nThis task tracing is controlled through: attr.comm || attr.mmap\nand through the new attr.task field.\n\nSuggested-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\n[ cleaned up perf_counter.h a bit ]\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "933b787b57ca8bdc0fc8fb2cbf67b5e6d21beb84", "tree": "aae84533e71c7574ab8dd6f0ca4b782de121e482", "parents": [ "6583bb64fc370842b32a87c67750c26f6d559af0" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Wed Jul 29 15:02:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 29 19:10:34 2009 -0700" }, "message": "mm: copy over oom_adj value at fork time\n\nFix a post-2.6.31 regression which was introduced by\n2ff05b2b4eac2e63d345fc731ea151a060247f53 (\"oom: move oom_adj value from\ntask_struct to mm_struct\").\n\nAfter moving the oom_adj value from the task struct to the mm_struct, the\noom_adj value was no longer properly inherited by child processes.\n\nCopying over the oom_adj value at fork time fixes that bug.\n\n[kosaki.motohiro@jp.fujitsu.com: test for current-\u003emm before dereferencing it]\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nReported-by: Paul Menage \u003cmanage@google.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3c3301083e3bea4d14c597106c7b20b4b85fc03d", "tree": "6eabdd073bdc27eb3f0dd999ea946955afca18bf", "parents": [ "612e900c286a9535cc17da5171b0d8dcf8f3a12f", "0fdc7e67dd312986e30b861adff48732bd33eb3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 11:41:56 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 22 11:41:56 2009 -0700" }, "message": "Merge branch \u0027perf-counters-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf\n\n* \u0027perf-counters-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf: (31 commits)\n perf_counter tools: Give perf top inherit option\n perf_counter tools: Fix vmlinux symbol generation breakage\n perf_counter: Detect debugfs location\n perf_counter: Add tracepoint support to perf list, perf stat\n perf symbol: C++ demangling\n perf: avoid structure size confusion by using a fixed size\n perf_counter: Fix throttle/unthrottle event logging\n perf_counter: Improve perf stat and perf record option parsing\n perf_counter: PERF_SAMPLE_ID and inherited counters\n perf_counter: Plug more stack leaks\n perf: Fix stack data leak\n perf_counter: Remove unused variables\n perf_counter: Make call graph option consistent\n perf_counter: Add perf record option to log addresses\n perf_counter: Log vfork as a fork event\n perf_counter: Synthesize VDSO mmap event\n perf_counter: Make sure we dont leak kernel memory to userspace\n perf_counter tools: Fix index boundary check\n perf_counter: Fix the tracepoint channel to perfcounters\n perf_counter, x86: Extend perf_counter Pentium M support\n ...\n" }, { "commit": "ed900c054b541254f0ce5cedaf75206e29bd614e", "tree": "c164aaefa1185744d4372d8ff5b11a86a8e1405a", "parents": [ "11b5f81e1b0ea0bc84fe32f0a27054e052b2bf84" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Thu Jul 16 15:44:29 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 11:21:31 2009 +0200" }, "message": "perf_counter: Log vfork as a fork event\n\nRight now we don\u0027t output vfork events. Even though we should\nalways see an exec after a vfork, we may get perfcounter\nsamples between the vfork and exec. These samples can lead to\nsome confusion when parsing perfcounter data.\n\nTo keep things consistent we should always log a fork event. It\nwill result in a little more log data, but is less confusing to\ntrace parsing tools.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c20090716104817.589309391@samba.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b43f3cbd21ffbd719fd4fa6642bfe6af255ded34", "tree": "f09372f7aa3057a4cca32d5c7fc19032bd7cda5a", "parents": [ "622f8061a68d3f7a576c20a47b7f3bae7c8cfbef" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Wed Jul 08 01:54:37 2009 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 08 09:31:56 2009 -0700" }, "message": "headers: mnt_namespace.h redux\n\nFix various silly problems wrt mnt_namespace.h:\n\n - exit_mnt_ns() isn\u0027t used, remove it\n - done that, sched.h and nsproxy.h inclusions aren\u0027t needed\n - mount.h inclusion was need for vfsmount_lock, but no longer\n - remove mnt_namespace.h inclusion from files which don\u0027t use anything\n from mnt_namespace.h\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "72a1de39f89325a834a8c70b2a0d8f71d919f640", "tree": "f79fefd4eaad9cbc381792bddb1e1f3f432ad9f6", "parents": [ "77d1ef79568b337f599b75795acc8f78a87ba9ba" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:37 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:52 2009 -0700" }, "message": "copy_process(): remove the unneeded clear_tsk_thread_flag(TIF_SIGPENDING)\n\nThe forked child can have TIF_SIGPENDING if it was copied from parent\u0027s\nti-\u003eflags. But this is harmless and actually almost never happens,\nbecause copy_process() can\u0027t succeed if signal_pending() \u003d\u003d T.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2dff440525f8faba8836e9f05297b76f23b4af30", "tree": "9f15e1dc2da06dba97cd939e41f34342caf05097", "parents": [ "f85612967c93b67b10dd240e3e8bf8a0eee9def7" ], "author": { "name": "Vegard Nossum", "email": "vegard.nossum@gmail.com", "time": "Sat May 31 15:56:17 2008 +0200" }, "committer": { "name": "Vegard Nossum", "email": "vegard.nossum@gmail.com", "time": "Mon Jun 15 12:40:03 2009 +0200" }, "message": "kmemcheck: add mm functions\n\nWith kmemcheck enabled, the slab allocator needs to do this:\n\n1. Tell kmemcheck to allocate the shadow memory which stores the status of\n each byte in the allocation proper, e.g. whether it is initialized or\n uninitialized.\n2. Tell kmemcheck which parts of memory that should be marked uninitialized.\n There are actually a few more states, such as \"not yet allocated\" and\n \"recently freed\".\n\nIf a slab cache is set up using the SLAB_NOTRACK flag, it will never return\nmemory that can take page faults because of kmemcheck.\n\nIf a slab cache is NOT set up using the SLAB_NOTRACK flag, callers can still\nrequest memory with the __GFP_NOTRACK flag. This does not prevent the page\nfaults from occuring, however, but marks the object in question as being\ninitialized so that no warnings will ever be produced for this object.\n\nIn addition to (and in contrast to) __GFP_NOTRACK, the\n__GFP_NOTRACK_FALSE_POSITIVE flag indicates that the allocation should\nnot be tracked _because_ it would produce a false positive. Their values\nare identical, but need not be so in the future (for example, we could now\nenable/disable false positives with a config option).\n\nParts of this patch were contributed by Pekka Enberg but merged for\natomicity.\n\nSigned-off-by: Vegard Nossum \u003cvegard.nossum@gmail.com\u003e\nSigned-off-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n\n[rebased for mainline inclusion]\nSigned-off-by: Vegard Nossum \u003cvegard.nossum@gmail.com\u003e\n" }, { "commit": "940010c5a314a7bd9b498593bc6ba1718ac5aec5", "tree": "d141e08ced08c40c6a8e3ab2cdecde5ff14e560f", "parents": [ "8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5", "991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 11 17:55:42 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 11 17:55:42 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/kernel/irqinit.c\n\tarch/x86/kernel/irqinit_64.c\n\tarch/x86/kernel/traps.c\n\tarch/x86/mm/fault.c\n\tinclude/linux/sched.h\n\tkernel/exit.c\n" }, { "commit": "991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d", "tree": "50b5f4e2b9f138da57f76eca44fdcc80a2fcd428", "parents": [ "862366118026a358882eefc70238dbcc3db37aac", "84047e360af0394ac5861d433f26bbcf30f77dd1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:58:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:58:10 2009 -0700" }, "message": "Merge branch \u0027tracing-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n function-graph: always initialize task ret_stack\n function-graph: move initialization of new tasks up in fork\n function-graph: add memory barriers for accessing task\u0027s ret_stack\n function-graph: enable the stack after initialization of other variables\n function-graph: only allocate init tasks if it was not already done\n\nManually fix trivial conflict in kernel/trace/ftrace.c\n" }, { "commit": "862366118026a358882eefc70238dbcc3db37aac", "tree": "4eb62bc10327a5afac064a95a091ea05ecd2acc1", "parents": [ "57eee9ae7bbcfb692dc96c739a5184adb6349733", "511b01bdf64ad8a38414096eab283c7784aebfc4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:53:40 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 10 19:53:40 2009 -0700" }, "message": "Merge branch \u0027tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (244 commits)\n Revert \"x86, bts: reenable ptrace branch trace support\"\n tracing: do not translate event helper macros in print format\n ftrace/documentation: fix typo in function grapher name\n tracing/events: convert block trace points to TRACE_EVENT(), fix !CONFIG_BLOCK\n tracing: add protection around module events unload\n tracing: add trace_seq_vprint interface\n tracing: fix the block trace points print size\n tracing/events: convert block trace points to TRACE_EVENT()\n ring-buffer: fix ret in rb_add_time_stamp\n ring-buffer: pass in lockdep class key for reader_lock\n tracing: add annotation to what type of stack trace is recorded\n tracing: fix multiple use of __print_flags and __print_symbolic\n tracing/events: fix output format of user stack\n tracing/events: fix output format of kernel stack\n tracing/trace_stack: fix the number of entries in the header\n ring-buffer: discard timestamps that are at the start of the buffer\n ring-buffer: try to discard unneeded timestamps\n ring-buffer: fix bug in ring_buffer_discard_commit\n ftrace: do not profile functions when disabled\n tracing: make trace pipe recognize latency format flag\n ...\n" }, { "commit": "087eb437051b3de817720f9c80c440fc9e7dcce8", "tree": "25a72acabe05c3e72dddd942855d4245dfae4b82", "parents": [ "b87297fb405ef13cac375f202d114323b076a56d" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Jun 04 16:29:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 04 18:07:40 2009 -0700" }, "message": "ptrace: tracehook_report_clone: fix false positives\n\nThe \"trace || CLONE_PTRACE\" check in tracehook_report_clone() is not right,\n\n- If the untraced task does clone(CLONE_PTRACE) the new child is not traced,\n we must not queue SIGSTOP.\n\n- If we forked the traced task, but the tracer exits and untraces both the\n forking task and the new child (after copy_process() drops tasklist_lock),\n we should not queue SIGSTOP too.\n\nChange the code to check task_ptrace() !\u003d 0 instead. This is still racy, but\nthe race is harmless.\n\nWe can race with another tracer attaching to this child, or the tracer can\nexit and detach in parallel. But giwen that we didn\u0027t do wake_up_new_task()\nyet, the child must have the pending SIGSTOP anyway.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "60313ebed739b331e8e61079da27a11ee3b73a30", "tree": "8476fbd05be709595876360765776dd9ca20608d", "parents": [ "20c84e959ec11b1803d2b2832eef703d5fbe7f7b" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Jun 04 16:53:44 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jun 04 17:51:38 2009 +0200" }, "message": "perf_counter: Add fork event\n\nCreate a fork event so that we can easily clone the comm and\ndso maps without having to generate all those events.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "226f62fdd53d5b2c74e242aa11f6ad43d0285d3f", "tree": "bfe54a45e7fe85520c0675c2f8e90b7704aad4ff", "parents": [ "dcd945e0d8a6d654e3e1de51faea9f98f1504aa5" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Jun 03 11:23:56 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 03 14:14:30 2009 +0200" }, "message": "perf_counter: Add a comm hook for pure fork()s\n\nI noticed missing COMM events and found that we missed\nreporting them for pure forks.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f7e8b616ed1cc6f790b82324bce8a2a60295e5c2", "tree": "e46e50692d90ddcccf159accdcdd655d3dd0ffa5", "parents": [ "26c01624a2a40f8a4ddf6449b65c9b1c418d0e72" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Tue Jun 02 16:39:48 2009 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Jun 02 16:49:57 2009 -0400" }, "message": "function-graph: move initialization of new tasks up in fork\n\nWhen the function graph tracer is enabled, all new tasks must allocate\na ret_stack to place the return address of functions. This is because\nthe function graph tracer will replace the real return address with a\ncall to the tracing of the exit function.\n\nThis initialization happens in fork, but it happens too late. If fork\nfails, then it will call free_task and that calls the freeing of this\nret_stack. But before initialization happens, the new (failed) task\npoints to its parents ret_stack. If a fork failure happens during\nthe function trace, it would be catastrophic for the parent.\n\nAlso, there\u0027s no need to call ftrace_graph_exit_task from fork, since\nit is called by free_task which fork calls on failure.\n\n[ Impact: prevent crash during failed fork running function graph tracer ]\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "bbbee90829304d156c12b171c0ac7e6e1aba8b90", "tree": "ec0a1a8c69a5c909a57227915734d1e55678eb5c", "parents": [ "665c2142a94202881a3c11cbaee6506cb10ada2d" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri May 29 14:25:58 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 29 16:21:52 2009 +0200" }, "message": "perf_counter: Ammend cleanup in fork() fail\n\nWhen fork() fails we cannot use perf_counter_exit_task() since that\nassumes to operate on current. Write a new helper that cleans up\nunused/clean contexts.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6ab423e0eaca827fbd201ca4ae7d4f8573a366b2", "tree": "072d227934bf213adf5c0dd022369e14f273dc48", "parents": [ "771d7cde144d87f2d1fbee4da3c6234d61f7e42a" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon May 25 14:45:27 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 25 14:55:01 2009 +0200" }, "message": "perf_counter: Propagate inheritance failures down the fork() path\n\nFail fork() when we fail inheritance for some reason (-ENOMEM most likely).\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nLKML-Reference: \u003c20090525124600.324656474@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e4cbb4e3ac8b09fdb11e39e5a5611bfab0a7cd1a", "tree": "987f159fe3867781460c51e3363969efaeee2c8a", "parents": [ "d94b943054721c346b0881865d645f000cd19880" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue May 19 15:50:30 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon May 25 13:05:06 2009 +0200" }, "message": "perf_counter: Move child perfcounter init to after scheduler init\n\nInitialize a task\u0027s perfcounters (inherit from parent, etc.) after\nthe child task\u0027s scheduler fields have been initialized already.\n\n[ Impact: cleanup ]\n\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a63eaf34ae60bdb067a354cc8def2e8f4a01f5f4", "tree": "9e81e5e0299bd524b3d07c17a05760e33c7d58a0", "parents": [ "34adc8062227f41b04ade0ff3fbd1dbe3002669e" ], "author": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Fri May 22 14:17:31 2009 +1000" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri May 22 12:18:19 2009 +0200" }, "message": "perf_counter: Dynamically allocate tasks\u0027 perf_counter_context struct\n\nThis replaces the struct perf_counter_context in the task_struct with\na pointer to a dynamically allocated perf_counter_context struct. The\nmain reason for doing is this is to allow us to transfer a\nperf_counter_context from one task to another when we do lazy PMU\nswitching in a later patch.\n\nThis has a few side-benefits: the task_struct becomes a little smaller,\nwe save some memory because only tasks that have perf_counters attached\nget a perf_counter_context allocated for them, and we can remove the\ninclusion of \u003clinux/perf_counter.h\u003e in sched.h, meaning that we don\u0027t\nend up recompiling nearly everything whenever perf_counter.h changes.\n\nThe perf_counter_context structures are reference-counted and freed\nwhen the last reference is dropped. A context can have references\nfrom its task and the counters on its task. Counters can outlive the\ntask so it is possible that a context will be freed well after its\ntask has exited.\n\nContexts are allocated on fork if the parent had a context, or\notherwise the first time that a per-task counter is created on a task.\nIn the latter case, we set the context pointer in the task struct\nlocklessly using an atomic compare-and-exchange operation in case we\nraced with some other task in creating a context for the subject task.\n\nThis also removes the task pointer from the perf_counter struct. The\ntask pointer was not used anywhere and would make it harder to move a\ncontext from one task to another. Anything that needed to know which\ntask a counter was attached to was already using counter-\u003ectx-\u003etask.\n\nThe __perf_counter_init_context function moves up in perf_counter.c\nso that it can be called from find_get_context, and now initializes\nthe refcount, but is otherwise unchanged.\n\nWe were potentially calling list_del_counter twice: once from\n__perf_counter_exit_task when the task exits and once from\n__perf_counter_remove_from_context when the counter\u0027s fd gets closed.\nThis adds a check in list_del_counter so it doesn\u0027t do anything if\nthe counter has already been removed from the lists.\n\nSince perf_counter_task_sched_in doesn\u0027t do anything if the task doesn\u0027t\nhave a context, and leaves cpuctx-\u003etask_ctx \u003d NULL, this adds code to\n__perf_install_in_context to set cpuctx-\u003etask_ctx if necessary, i.e. in\nthe case where the current task adds the first counter to itself and\nthus creates a context for itself.\n\nThis also adds similar code to __perf_counter_enable to handle a\nsimilar situation which can arise when the counters have been disabled\nusing prctl; that also leaves cpuctx-\u003etask_ctx \u003d NULL.\n\n[ Impact: refactor counter context management to prepare for new feature ]\n\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Corey Ashford \u003ccjashfor@linux.vnet.ibm.com\u003e\nCc: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nLKML-Reference: \u003c18966.10075.781053.231153@cargo.ozlabs.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0ad5d703c6c0fcd385d956555460df95dff7eb7e", "tree": "4b777100f9be4fe90ca4bd043b9f98df672b5b3b", "parents": [ "44347d947f628060b92449702071bfe1d31dfb75", "1cb81b143fa8f0e4629f10690862e2e52ca792ff" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 07 11:18:34 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 07 13:36:22 2009 +0200" }, "message": "Merge branch \u0027tracing/hw-branch-tracing\u0027 into tracing/core\n\nMerge reason: this topic is ready for upstream now. It passed\n Oleg\u0027s review and Andrew had no further mm/*\n objections/observations either.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a", "tree": "4ba588631dd8189a818a91c9e3976526071178b6", "parents": [ "1130b0296184bc21806225fd06d533515a99d2db", "56a50adda49b2020156616c4eb15353e0f9ad7de" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 29 14:46:59 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 29 14:47:05 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nMerge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up\n the latest upstream fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "416dfdcdb894432547ead4fcb9fa6a36b396059e", "tree": "8033fdda07397a59c5fa98c88927040906ce6c1a", "parents": [ "56449f437add737a1e5e1cb7e00f63ac8ead1938", "091069740304c979f957ceacec39c461d0192158" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Apr 24 10:11:18 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Apr 24 10:11:23 2009 +0200" }, "message": "Merge commit \u0027v2.6.30-rc3\u0027 into tracing/hw-branch-tracing\n\nConflicts:\n\tarch/x86/kernel/ptrace.c\n\nMerge reason: fix the conflict above, and also pick up the CONFIG_BROKEN\n dependency change from upstream so that we can remove it\n\t here.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "ad8d75fff811a6a230f7f43b05a6483099349533", "tree": "764f75c0785b29067b141719b6e8000f005da7fd", "parents": [ "ecda8ae02a08ef065ff387f5cb2a2d4999da2408" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Tue Apr 14 19:39:12 2009 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Apr 14 22:05:43 2009 -0400" }, "message": "tracing/events: move trace point headers into include/trace/events\n\nImpact: clean up\n\nCreate a sub directory in include/trace called events to keep the\ntrace point headers in their own separate directory. Only headers that\ndeclare trace points should be defined in this directory.\n\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCc: Zhao Lei \u003czhaolei@cn.fujitsu.com\u003e\nCc: Eduard - Gabriel Munteanu \u003ceduard.munteanu@linux360.ro\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "a8d154b009168337494fbf345671bab74d3e4b8b", "tree": "4097612e1a5cc8bf7658542f7d0f51b815113eaf", "parents": [ "ea20d9293ce423a39717ed4375393129a2e701f9" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Fri Apr 10 09:36:00 2009 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Tue Apr 14 12:57:28 2009 -0400" }, "message": "tracing: create automated trace defines\n\nThis patch lowers the number of places a developer must modify to add\nnew tracepoints. The current method to add a new tracepoint\ninto an existing system is to write the trace point macro in the\ntrace header with one of the macros TRACE_EVENT, TRACE_FORMAT or\nDECLARE_TRACE, then they must add the same named item into the C file\nwith the macro DEFINE_TRACE(name) and then add the trace point.\n\nThis change cuts out the needing to add the DEFINE_TRACE(name).\nEvery file that uses the tracepoint must still include the trace/\u003ctype\u003e.h\nfile, but the one C file must also add a define before the including\nof that file.\n\n #define CREATE_TRACE_POINTS\n #include \u003ctrace/mytrace.h\u003e\n\nThis will cause the trace/mytrace.h file to also produce the C code\nnecessary to implement the trace point.\n\nNote, if more than one trace/\u003ctype\u003e.h is used to create the C code\nit is best to list them all together.\n\n #define CREATE_TRACE_POINTS\n #include \u003ctrace/foo.h\u003e\n #include \u003ctrace/bar.h\u003e\n #include \u003ctrace/fido.h\u003e\n\nThanks to Mathieu Desnoyers and Christoph Hellwig for coming up with\nthe cleaner solution of the define above the includes over my first\ndesign to have the C code include a \"special\" header.\n\nThis patch converts sched, irq and lockdep and skb to use this new\nmethod.\n\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCc: Zhao Lei \u003czhaolei@cn.fujitsu.com\u003e\nCc: Eduard - Gabriel Munteanu \u003ceduard.munteanu@linux360.ro\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "422a253483aa5de71a2bcdc27b0aa023053f97f8", "tree": "3e25aaf65b8eaf275bb01982a89fb0cd631c4367", "parents": [ "91e58b6e95a9c6b9efd928ae352eae5e75ae598c", "022624a758dc9489388a99ad29577b4c8c09237c", "9756b15e1b58453a6fd54b85c1ad8515209e10bb", "8f2e586567b1bad72dac7c3810fe9a2ef7117506" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 09 10:35:30 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 09 10:35:30 2009 -0700" }, "message": "Merge branches \u0027core-fixes-for-linus\u0027, \u0027irq-fixes-for-linus\u0027 and \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n printk: fix wrong format string iter for printk\n futex: comment requeue key reference semantics\n\n* \u0027irq-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n irq: fix cpumask memory leak on offstack cpumask kernels\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n posix-timers: fix RLIMIT_CPU \u0026\u0026 setitimer(CPUCLOCK_PROF)\n posix-timers: fix RLIMIT_CPU \u0026\u0026 fork()\n timers: add missing kernel-doc\n" }, { "commit": "6279a751fe096a21dc7704e918d570d3ff06e769", "tree": "2b24e0ecf004802a890f77195489f8aa76fa745d", "parents": [ "633fe795b80693a8198e7d82f66538a72d2bbba2" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri Mar 27 01:06:07 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 08 17:51:38 2009 +0200" }, "message": "posix-timers: fix RLIMIT_CPU \u0026\u0026 fork()\n\nSee http://bugzilla.kernel.org/show_bug.cgi?id\u003d12911\n\ncopy_signal() copies signal-\u003erlim, but RLIMIT_CPU is \"lost\". Because\nposix_cpu_timers_init_group() sets cputime_expires.prof_exp \u003d 0 and thus\nfastpath_timer_check() returns false unless we have other expired cpu timers.\n\nChange copy_signal() to set cputime_expires.prof_exp if we have RLIMIT_CPU.\nAlso, set cputimer.running \u003d 1 in that case. This is not strictly necessary,\nbut imho makes sense.\n\nReported-by: Peter Lojkin \u003cia6432@inbox.ru\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Peter Lojkin \u003cia6432@inbox.ru\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: stable@kernel.org\nLKML-Reference: \u003c20090327000607.GA10104@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5ea472a77f8e4811ceee3f44a9deda6ad6e8b789", "tree": "a9ec5019e2b666a19874fc344ffb0dd5da6bce94", "parents": [ "6c009ecef8cca28c7c09eb16d0802e37915a76e1", "577c9c456f0e1371cbade38eaf91ae8e8a308555" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 08 10:35:30 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 08 10:35:30 2009 +0200" }, "message": "Merge commit \u0027v2.6.30-rc1\u0027 into perfcounters/core\n\nConflicts:\n\tarch/powerpc/include/asm/systbl.h\n\tarch/powerpc/include/asm/unistd.h\n\tinclude/linux/init_task.h\n\nMerge reason: the conflicts are non-trivial: PowerPC placement\n of sys_perf_counter_open has to be mixed with the\n\t new preadv/pwrite syscalls.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0f4814065ff8c24ca8bfd75c9b73502be152c287", "tree": "f3816ecb64ee198235d2e9c1649de3241c3f2ac2", "parents": [ "ee811517a5604aa63fae803b7c044712699e1303" ], "author": { "name": "Markus Metzger", "email": "markus.t.metzger@intel.com", "time": "Fri Apr 03 16:43:48 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 13:36:31 2009 +0200" }, "message": "x86, ptrace: add bts context unconditionally\n\nAdd the ptrace bts context field to task_struct unconditionally.\n\nInitialize the field directly in copy_process().\nRemove all the unneeded functionality used to initialize that field.\n\nSigned-off-by: Markus Metzger \u003cmarkus.t.metzger@intel.com\u003e\nCc: roland@redhat.com\nCc: eranian@googlemail.com\nCc: oleg@redhat.com\nCc: juan.villacis@intel.com\nCc: ak@linux.jf.intel.com\nLKML-Reference: \u003c20090403144603.292754000@intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "5e34437840d33554f69380584311743b39e8fbeb", "tree": "e081135619ee146af5efb9ee883afca950df5757", "parents": [ "77d05632baee21b1cef8730d7c06aa69601e4dca", "d508afb437daee7cf07da085b635c44a4ebf9b38" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 11:15:40 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Apr 07 11:15:40 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into core/softlockup\n\nConflicts:\n\tkernel/sysctl.c\n" }, { "commit": "f541ae326fa120fa5c57433e4d9a133df212ce41", "tree": "bdbd94ec72cfc601118051cb35e8617d55510177", "parents": [ "e255357764f92afcafafbd4879b222b8c752065a", "0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 06 09:02:57 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Apr 06 09:02:57 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core-v2\n\nMerge reason: we have gathered quite a few conflicts, need to merge upstream\n\nConflicts:\n\tarch/powerpc/kernel/Makefile\n\tarch/x86/ia32/ia32entry.S\n\tarch/x86/include/asm/hardirq.h\n\tarch/x86/include/asm/unistd_32.h\n\tarch/x86/include/asm/unistd_64.h\n\tarch/x86/kernel/cpu/common.c\n\tarch/x86/kernel/irq.c\n\tarch/x86/kernel/syscall_table_32.S\n\tarch/x86/mm/iomap_32.c\n\tinclude/linux/sched.h\n\tkernel/Makefile\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "8fe74cf053de7ad2124a894996f84fa890a81093", "tree": "77dcd8fbf33ce53a3821942233962fb28c6f2848", "parents": [ "c2eb2fa6d2b6fe122d3479ec5b28d978418b2698", "ced117c73edc917e96dea7cca98c91383f0792f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 21:09:10 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 21:09:10 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n Remove two unneeded exports and make two symbols static in fs/mpage.c\n Cleanup after commit 585d3bc06f4ca57f975a5a1f698f65a45ea66225\n Trim includes of fdtable.h\n Don\u0027t crap into descriptor table in binfmt_som\n Trim includes in binfmt_elf\n Don\u0027t mess with descriptor table in load_elf_binary()\n Get rid of indirect include of fs_struct.h\n New helper - current_umask()\n check_unsafe_exec() doesn\u0027t care about signal handlers sharing\n New locking/refcounting for fs_struct\n Take fs_struct handling to new file (fs/fs_struct.c)\n Get rid of bumping fs_struct refcount in pivot_root(2)\n Kill unsharing fs_struct in __set_personality()\n" }, { "commit": "1b0f7ffd0ea27cd3a0b9ca04e3df9522048c32a3", "tree": "a8c27acdf95f55f93fe86661c6cba4cd36c8e4f1", "parents": [ "52ee2dfdd4f51cf422ea6a96a0846dc94244aa37" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Thu Apr 02 16:58:39 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:05:02 2009 -0700" }, "message": "pids: kill signal_struct-\u003e __pgrp/__session and friends\n\nWe are wasting 2 words in signal_struct without any reason to implement\ntask_pgrp_nr() and task_session_nr().\n\ntask_session_nr() has no callers since\n2e2ba22ea4fd4bb85f0fa37c521066db6775cbef, we can remove it.\n\ntask_pgrp_nr() is still (I believe wrongly) used in fs/autofsX and\nfs/coda.\n\nThis patch reimplements task_pgrp_nr() via task_pgrp_nr_ns(), and kills\n__pgrp/__session and the related helpers.\n\nThe change in drivers/char/tty_io.c is cosmetic, but hopefully makes sense\nanyway.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Alan Cox \u003cnumber6@the-village.bc.nu\u003e\t\t[tty parts]\nCc: Cedric Le Goater \u003cclg@fr.ibm.com\u003e\nCc: Dave Hansen \u003chaveblue@us.ibm.com\u003e\nCc: Eric Biederman \u003cebiederm@xmission.com\u003e\nCc: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nCc: Serge Hallyn \u003cserue@us.ibm.com\u003e\nCc: Sukadev Bhattiprolu \u003csukadev@linux.vnet.ibm.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b3bfa0cba867f23365b81658b47efd906830879b", "tree": "e54d9a9c4c23fc00bb2ff3ed57ef5317a0660ea5", "parents": [ "e4da026f980df125a4918c3bb9fe93185c7ef12a" ], "author": { "name": "Sukadev Bhattiprolu", "email": "sukadev@linux.vnet.ibm.com", "time": "Thu Apr 02 16:58:08 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:58 2009 -0700" }, "message": "signals: protect cinit from blocked fatal signals\n\nNormally SIG_DFL signals to global and container-init are dropped early.\nBut if a signal is blocked when it is posted, we cannot drop the signal\nsince the receiver may install a handler before unblocking the signal.\nOnce this signal is queued however, the receiver container-init has no way\nof knowing if the signal was sent from an ancestor or descendant\nnamespace. This patch ensures that contianer-init drops all SIG_DFL\nsignals in get_signal_to_deliver() except SIGKILL/SIGSTOP.\n\nIf SIGSTOP/SIGKILL originate from a descendant of container-init they are\nnever queued (i.e dropped in sig_ignored() in an earler patch).\n\nIf SIGSTOP/SIGKILL originate from parent namespace, the signal is queued\nand container-init processes the signal.\n\nIOW, if get_signal_to_deliver() sees a sig_kernel_only() signal for global\nor container-init, the signal must have been generated internally or must\nhave come from an ancestor ns and we process the signal.\n\nFurther, the signal_group_exit() check was needed to cover the case of a\nmulti-threaded init sending SIGKILL to other threads when doing an exit()\nor exec(). But since the new sig_kernel_only() check covers the SIGKILL,\nthe signal_group_exit() check is no longer needed and can be removed.\n\nFinally, now that we have all pieces in place, set SIGNAL_UNKILLABLE for\ncontainer-inits.\n\nSigned-off-by: Sukadev Bhattiprolu \u003csukadev@linux.vnet.ibm.com\u003e\nCc: Oleg Nesterov \u003coleg@tv-sign.ru\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Daniel Lezcano \u003cdaniel.lezcano@free.fr\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6f2c55b843836d26528c56a0968689accaedbc67", "tree": "17501e29d4b6ef3eb85da9a5d6ad3df7f19ec6a2", "parents": [ "14dd1ff0f9e75dd4ae2f1ff8e48becb76d14f4ab" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Apr 02 16:56:59 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:51 2009 -0700" }, "message": "Simplify copy_thread()\n\nFirst argument unused since 2.3.11.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "33e5d76979cf01e3834814fe0aea569d1d602c1a", "tree": "58a03e5da59db203245da10db144a4f6f61a83ba", "parents": [ "5482415a5ecc0cd791a5d885cc3db8281401078f" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Apr 02 16:56:32 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:48 2009 -0700" }, "message": "nommu: fix a number of issues with the per-MM VMA patch\n\nFix a number of issues with the per-MM VMA patch:\n\n (1) Make mmap_pages_allocated an atomic_long_t, just in case this is used on\n a NOMMU system with more than 2G pages. Makes no difference on a 32-bit\n system.\n\n (2) Report vma-\u003evm_pgoff * PAGE_SIZE as a 64-bit value, not a 32-bit value,\n lest it overflow.\n\n (3) Move the allocation of the vm_area_struct slab back for fork.c.\n\n (4) Use KMEM_CACHE() for both vm_area_struct and vm_region slabs.\n\n (5) Use BUG_ON() rather than if () BUG().\n\n (6) Make the default validate_nommu_regions() a static inline rather than a\n #define.\n\n (7) Make free_page_series()\u0027s objection to pages with a refcount !\u003d 1 more\n informative.\n\n (8) Adjust the __put_nommu_region() banner comment to indicate that the\n semaphore must be held for writing.\n\n (9) Limit the number of warnings about munmaps of non-mmapped regions.\n\nReported-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Greg Ungerer \u003cgerg@snapgear.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5ad4e53bd5406ee214ddc5a41f03f779b8b2d526", "tree": "b3dab5140284b3edf02bf2b13f74bfddb25aa62a", "parents": [ "ce3b0f8d5c2203301fc87f3aaaed73e5819e2a48" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Mar 29 19:50:06 2009 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 31 23:00:27 2009 -0400" }, "message": "Get rid of indirect include of fs_struct.h\n\nDon\u0027t pull it in sched.h; very few files actually need it and those\ncan include directly. sched.h itself only needs forward declaration\nof struct fs_struct;\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "498052bba55ecaff58db6a1436b0e25bfd75a7ff", "tree": "bd3644ac60737e3733995a203acebd70cfd1b21b", "parents": [ "3e93cd671813e204c258f1e6c797959920cf7772" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Mar 30 07:20:30 2009 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 31 23:00:26 2009 -0400" }, "message": "New locking/refcounting for fs_struct\n\n* all changes of current-\u003efs are done under task_lock and write_lock of\n old fs-\u003elock\n* refcount is not atomic anymore (same protection)\n* its decrements are done when removing reference from current; at the\n same time we decide whether to free it.\n* put_fs_struct() is gone\n* new field - -\u003ein_exec. Set by check_unsafe_exec() if we are trying to do\n execve() and only subthreads share fs_struct. Cleared when finishing exec\n (success and failure alike). Makes CLONE_FS fail with -EAGAIN if set.\n* check_unsafe_exec() may fail with -EAGAIN if another execve() from subthread\n is in progress.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "3e93cd671813e204c258f1e6c797959920cf7772", "tree": "a1e0b2d2da7d296cc1c53be9cd6efa5b94b01b5c", "parents": [ "f8ef3ed2bebd2c4cb9ece92efa185d7aead8831a" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Mar 29 19:00:13 2009 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 31 23:00:26 2009 -0400" }, "message": "Take fs_struct handling to new file (fs/fs_struct.c)\n\nPure code move; two new helper functions for nfsd and daemonize\n(unshare_fs_struct() and daemonize_fs_struct() resp.; for now -\nthe same code as used to be in callers). unshare_fs_struct()\nexported (for nfsd, as copy_fs_struct()/exit_fs() used to be),\ncopy_fs_struct() and exit_fs() don\u0027t need exports anymore.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "9489424454c93f4d225d7af47978f8c7e84bf4d4", "tree": "b97394982298e4e191b2766408ff8a3dff99266a", "parents": [ "2b17fa506c418e9fb02bbbc7f426d2bbb5b247a6" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Mar 30 22:05:12 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Mar 30 22:05:13 2009 +1030" }, "message": "cpumask: use mm_cpumask() wrapper: kernel/fork.c\n\nImpact: futureproof\n\nMakes code futureproof against the impending change to mm-\u003ecpu_vm_mask.\n\nIt\u0027s also a chance to use the new cpumask_ ops which take a pointer.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "6e15cf04860074ad032e88c306bea656bbdd0f22", "tree": "c346383bb7563e8d66b2f4a502f875b259c34870", "parents": [ "be0ea69674ed95e1e98cb3687a241badc756d228", "60db56422043aaa455ac7f858ce23c273220f9d9" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 26 21:39:17 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 27 17:28:43 2009 +0100" }, "message": "Merge branch \u0027core/percpu\u0027 into percpu-cpumask-x86-for-linus-2\n\nConflicts:\n\tarch/parisc/kernel/irq.c\n\tarch/x86/include/asm/fixmap_64.h\n\tarch/x86/include/asm/setup.h\n\tkernel/irq/handle.c\n\nSemantic merge:\n arch/x86/include/asm/fixmap.h\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "2d5516cbb9daf7d0e342a2e3b0fc6f8c39a81205", "tree": "7f3fa06b708a508f4cc0fa6ef7894ede14101c87", "parents": [ "df0b4a5080ca668636831b641a6356500fb5c637" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Mar 02 22:58:45 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 09 13:23:25 2009 -0700" }, "message": "copy_process: fix CLONE_PARENT \u0026\u0026 parent_exec_id interaction\n\nCLONE_PARENT can fool the -\u003eself_exec_id/parent_exec_id logic. If we\nre-use the old parent, we must also re-use -\u003eparent_exec_id to make\nsure exit_notify() sees the right -\u003exxx_exec_id\u0027s when the CLONE_PARENT\u0027ed\ntask exits.\n\nAlso, move down the \"p-\u003eparent_exec_id \u003d p-\u003eself_exec_id\" thing, to place\ntwo different cases together.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Serge E. Hallyn \u003cserge@hallyn.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f8a6b2b9cee298a9663cbe38ce1eb5240987cb62", "tree": "b356490269c9e77d164dcc1477792b882fbb8bdb", "parents": [ "ba1511bf7fbda452138e4096bf10d5a382710f4f", "071a0bc2ceace31266836801510879407a3701fa" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:44:22 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:44:22 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into x86/apic\n\nConflicts:\n\tarch/x86/kernel/acpi/boot.c\n\tarch/x86/mm/fault.c\n" }, { "commit": "e9c4ffb11f0b19005b5b9dc8481687a3637e5887", "tree": "7007f2ff846b9b057c5cd7c25e8b82e49f9b4b63", "parents": [ "4bcf349a0f90d1e69eb35c6df0fa285c886c1cd6", "071a0bc2ceace31266836801510879407a3701fa" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:34:07 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 13 09:34:07 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/kernel/acpi/boot.c\n" }, { "commit": "871cafcc962fa1655c44b4f0e54d4c5cc14e273c", "tree": "fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245", "parents": [ "cf2592f59c0e8ed4308adbdb2e0a88655379d579", "b578f3fcca1e78624dfb5f358776e63711d7fda2" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 12 13:08:57 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 12 13:08:57 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into core/softlockup\n" }, { "commit": "94dba895333a4321f27360e42b807260ae36bda4", "tree": "7b6381da7ea9fc176001dda0714725c3a1dd6cc7", "parents": [ "9ce04f9238cafcfd09a502f2bc8c13b5f44ec590", "4da94d49b2ecb0a26e716a8811c3ecc542c2a65d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 11 08:24:32 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 11 08:24:32 2009 -0800" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n timers: fix TIMER_ABSTIME for process wide cpu timers\n timers: split process wide cpu clocks/timers, fix\n x86: clean up hpet timer reinit\n timers: split process wide cpu clocks/timers, remove spurious warning\n timers: split process wide cpu clocks/timers\n signal: re-add dead task accumulation stats.\n x86: fix hpet timer reinit for x86_64\n sched: fix nohz load balancer on cpu offline\n" }, { "commit": "9ce04f9238cafcfd09a502f2bc8c13b5f44ec590", "tree": "f55b7c0ef48ea5b3bbd2971036ba54b666e8c4ce", "parents": [ "b3f2caaaa82440af06b39c2c92e4fa8122d75465", "06eb23b1ba39c61ee5d5faeb42a097635693e370" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 11 08:23:22 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 11 08:23:22 2009 -0800" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n ptrace, x86: fix the usage of ptrace_fork()\n i8327: fix outb() parameter order\n x86: fix math_emu register frame access\n x86: math_emu info cleanup\n x86: include correct %gs in a.out core dump\n x86, vmi: put a missing paravirt_release_pmd in pgd_dtor\n x86: find nr_irqs_gsi with mp_ioapic_routing\n x86: add clflush before monitor for Intel 7400 series\n x86: disable intel_iommu support by default\n x86: don\u0027t apply __supported_pte_mask to non-present ptes\n x86: fix grammar in user-visible BIOS warning\n x86/Kconfig.cpu: make Kconfig help readable in the console\n x86, 64-bit: print DMI info in the oops trace\n" }, { "commit": "06eb23b1ba39c61ee5d5faeb42a097635693e370", "tree": "a06f34d6ed32521ea32641df30732d9eb9d24757", "parents": [ "b52af40923fc91a12e3c7152d833e0c0c6a508f6" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Feb 09 02:02:33 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 11 10:32:46 2009 +0100" }, "message": "ptrace, x86: fix the usage of ptrace_fork()\n\nI noticed by pure accident we have ptrace_fork() and friends. This was\nadded by \"x86, bts: add fork and exit handling\", commit\nbf53de907dfdaac178c92d774aae7370d7b97d20.\n\nI can\u0027t test this, ds_request_bts() returns -EOPNOTSUPP, but I strongly\nbelieve this needs the fix. I think something like this program\n\n\tint main(void)\n\t{\n\t\tint pid \u003d fork();\n\n\t\tif (!pid) {\n\t\t\tptrace(PTRACE_TRACEME, 0, NULL, NULL);\n\t\t\tkill(getpid(), SIGSTOP);\n\t\t\tfork();\n\t\t} else {\n\t\t\tstruct ptrace_bts_config bts \u003d {\n\t\t\t\t.flags \u003d PTRACE_BTS_O_ALLOC,\n\t\t\t\t.size \u003d 4 * 4096,\n\t\t\t};\n\n\t\t\twait(NULL);\n\n\t\t\tptrace(PTRACE_SETOPTIONS, pid, NULL, PTRACE_O_TRACEFORK);\n\t\t\tptrace(PTRACE_BTS_CONFIG, pid, \u0026bts, sizeof(bts));\n\t\t\tptrace(PTRACE_CONT, pid, NULL, NULL);\n\n\t\t\tsleep(1);\n\t\t}\n\n\t\treturn 0;\n\t}\n\nshould crash the kernel.\n\nIf the task is traced by its natural parent ptrace_reparented() returns 0\nbut we should clear -\u003ebtsxxx anyway.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Markus Metzger \u003cmarkus.t.metzger@intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "95fd4845ed0ffcab305b4f30ce1c12dc34f1b56c", "tree": "aa2aac22a5b329b778a6771a87bbf1945ad49bbd", "parents": [ "d278c48435625cb6b7edcf6a547620768b175709", "8e4921515c1a379539607eb443d51c30f4f7f338" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 11 09:22:04 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 11 09:22:04 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc4\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/kernel/setup_percpu.c\n\tarch/x86/mm/fault.c\n\tdrivers/acpi/processor_idle.c\n\tkernel/irq/handle.c\n" }, { "commit": "17406b82d621930cca8ccc1272cdac9a7dae8e40", "tree": "224c8b0b7c78a5467175fe10e116bdc6b73495ea", "parents": [ "94be52dc075a32af4aa73d7e10f68734d62d6af2" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@google.com", "time": "Fri Feb 06 15:37:47 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Feb 09 11:03:49 2009 +0100" }, "message": "softlockup: remove timestamp checking from hung_task\n\nImpact: saves sizeof(long) bytes per task_struct\n\nBy guaranteeing that sysctl_hung_task_timeout_secs have elapsed between\ntasklist scans we can avoid using timestamps.\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@google.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "04ec93fe9bc98e3bd8560f79f56fed66dfae40d5", "tree": "ba7d1ca513641167f61d8d8bb56b832f63d98bca", "parents": [ "b2a740aab8f3bc2fd9f01528e39607bd9a1f0da6" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Fri Feb 06 08:17:19 2009 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 06 08:43:11 2009 -0800" }, "message": "fork.c: fix NULL pointer dereference when nr_threads \u003d\u003d threads-max\n\nI happened to forked lots of processes, and hit NULL pointer dereference.\nIt is because in copy_process() after checking max_threads, 0 is returned\nbut not -EAGAIN.\n\nThe bug is introduced by \"CRED: Detach the credentials from task_struct\"\n(commit f1752eec6145c97163dbce62d17cf5d928e28a27).\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "32bd671d6cbeda60dc73be77fa2b9037d9a9bfa0", "tree": "591c941b9f12ce9f3caefd112f0ada3c5fcc53ab", "parents": [ "83895147b702434e6f236deeca75211fd0e3da3a" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Feb 05 12:24:15 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 05 13:04:33 2009 +0100" }, "message": "signal: re-add dead task accumulation stats.\n\nWe\u0027re going to split the process wide cpu accounting into two parts:\n\n - clocks; which can take all the time they want since they run\n from user context.\n\n - timers; which need constant time tracing but can affort the overhead\n because they\u0027re default off -- and rare.\n\nThe clock readout will go back to a full sum of the thread group, for this\nwe need to re-add the exit stats that were removed in the initial itimer\nrework (f06febc9: timers: fix itimer/many thread hang).\n\nFurthermore, since that full sum can be rather slow for large thread groups\nand we have the complete dead task stats, revert the do_notify_parent time\ncomputation.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3ddeb51d9c83931c1ca6abf76a38934c5a1ed918", "tree": "fc2efb59d627135ea2199a8a68415b162646b121", "parents": [ "5a611268b69f05262936dd177205acbce4471358", "5ee810072175042775e39bdd3eaaa68884c27805" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jan 27 12:01:51 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jan 27 12:01:51 2009 +0100" }, "message": "Merge branch \u0027linus\u0027 into core/percpu\n\nConflicts:\n\tarch/x86/kernel/setup_percpu.c\n" }, { "commit": "1e70c7f7a9d4a3d2cc78b40e1d7768d99cd79899", "tree": "1218c32008412e57314f8f9db8d3b4912e2ecb25", "parents": [ "810ee58de26c9c1255d716b1db7344c4a1093fec", "1d4a7f1c4faf53eb9e822743ec8a70b3019a26d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 26 09:47:43 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 26 09:47:43 2009 -0800" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n hrtimers: fix inconsistent lock state on resume in hres_timers_resume\n time-sched.c: tick_nohz_update_jiffies should be static\n locking, hpet: annotate false positive warning\n kernel/fork.c: unused variable \u0027ret\u0027\n itimers: remove the per-cpu-ish-ness\n" }, { "commit": "bfe2a3c3b5bf479788d5d5c5561346be6b169043", "tree": "652c987279db7cd841d556f7bb1a589b57fbd6cc", "parents": [ "77835492ed489c0b870f82f4c50687bd267acc0a", "35d266a24796f02f63299cfe5009dfc0d5a0e820" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jan 23 10:20:15 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jan 23 10:20:15 2009 +0100" }, "message": "Merge branch \u0027core/percpu\u0027 into perfcounters/core\n\nConflicts:\n\tarch/x86/include/asm/hardirq_32.h\n\tarch/x86/include/asm/hardirq_64.h\n\nSemantic merge:\n\tarch/x86/include/asm/hardirq.h\n\t[ added apic_perf_irqs field. ]\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "77835492ed489c0b870f82f4c50687bd267acc0a", "tree": "d80903ce1b8dd30aa44ccfc756616ad4d6c74d63", "parents": [ "af37501c792107c2bde1524bdae38d9a247b841a", "1de9e8e70f5acc441550ca75433563d91b269bbe" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 21 16:37:27 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 21 16:37:27 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc2\u0027 into perfcounters/core\n\nConflicts:\n\tinclude/linux/syscalls.h\n" }, { "commit": "198030782cedf25391e67e7c88b04f87a5eb6563", "tree": "5b7368c6bf052bcb4bb273497a57900720d36f51", "parents": [ "4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e", "92181f190b649f7ef2b79cbf5c00f26ccc66da2a" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 21 10:39:51 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 21 10:39:51 2009 +0100" }, "message": "Merge branch \u0027x86/mm\u0027 into core/percpu\n\nConflicts:\n\tarch/x86/mm/fault.c\n" }, { "commit": "b2b062b8163391c42b3219d466ca1ac9742b9c7b", "tree": "f3f920c09b8de694b1bc1d4b878cfd2b0b98c913", "parents": [ "a9de18eb761f7c1c860964b2e5addc1a35c7e861", "99937d6455cea95405ac681c86a857d0fcd530bd" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 18 18:37:14 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 18 18:37:14 2009 +0100" }, "message": "Merge branch \u0027core/percpu\u0027 into stackprotector\n\nConflicts:\n\tarch/x86/include/asm/pda.h\n\tarch/x86/include/asm/system.h\n\nAlso, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "af432eb1cc3178ec7109aca2283aafb1c12ccac1", "tree": "32b290ae6c1f07667b7e6044cc94e4efee58edfc", "parents": [ "e162b39a368f0401e41b558f430c354d12a85b37" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@google.com", "time": "Fri Jan 16 09:09:38 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jan 16 18:17:34 2009 +0100" }, "message": "softlockup: fix to allow compiling with !DETECT_HUNG_TASK\n\nFixes the following compile error:\n\n kernel/fork.c:1049: error: \u0027struct task_struct\u0027 has no member named \u0027last_switch_count\u0027\n kernel/fork.c:1050: error: \u0027struct task_struct\u0027 has no member named \u0027last_switch_timestamp\u0027\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@google.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6559eed8ca7db0531a207cd80be5e28cd6f213c5", "tree": "08d7a42d9eb8e7e9b7aa6930a07f1acecb35a282", "parents": [ "2e4d0924eb0c403ce4014fa139d1d61bf2c44fee" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:14:32 2009 +0100" }, "committer": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:15:30 2009 +0100" }, "message": "[CVE-2009-0029] System call wrappers part 30\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\n" }, { "commit": "17da2bd90abf428523de0fb98f7075e00e3ed42e", "tree": "4f2daf3cb792b7da62e6ae771b58902cc5ea24ab", "parents": [ "754fe8d297bfae7b77f7ce866e2fb0c5fb186506" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:14:10 2009 +0100" }, "committer": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:15:21 2009 +0100" }, "message": "[CVE-2009-0029] System call wrappers part 08\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\n" }, { "commit": "783adf42cf039083dd3c734c07c3bdc707e2bb15", "tree": "26bb2ff8c8e1bd285e0161154d83ce27dc459100", "parents": [ "d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a" ], "author": { "name": "Steven Noonan", "email": "steven@uplinklabs.net", "time": "Sun Jan 11 01:04:21 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 11 15:34:10 2009 +0100" }, "message": "kernel/fork.c: unused variable \u0027ret\u0027\n\nRemoved the unused variable.\n\nSigned-off-by: Steven Noonan \u003csteven@uplinklabs.net\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a", "tree": "250be7a5a29069f7d1f4524fa45ab0e988833025", "parents": [ "490dea45d00f01847ebebd007685d564aaf2cd98", "c59765042f53a79a7a65585042ff463b69cb248c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 11 15:34:05 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 11 15:34:05 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc1\u0027 into timers/urgent\n" }, { "commit": "506c10f26c481b7f8ef27c1c79290f68989b2e9e", "tree": "03de82e812f00957aa6276dac2fe51c3358e88d7", "parents": [ "e1df957670aef74ffd9a4ad93e6d2c90bf6b4845", "c59765042f53a79a7a65585042ff463b69cb248c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 11 02:42:53 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 11 02:42:53 2009 +0100" }, "message": "Merge commit \u0027v2.6.29-rc1\u0027 into perfcounters/core\n\nConflicts:\n\tinclude/linux/kernel_stat.h\n" } ], "next": "c40f6f8bbc4cbd2902671aacd587400ddca62627" }