)]}' { "log": [ { "commit": "42859eea96ba6beabfb0369a1eeffa3c7d2bd9cb", "tree": "fa38aeda0d6e7a4c48a882b166b8643594a1ad50", "parents": [ "f59b51fe3d3092c08d7d554ecb40db24011b2ebc", "f322220d6159455da2b5a8a596d802c8695fed30" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 10 12:02:25 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 10 12:02:25 2012 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull generic execve() changes from Al Viro:\n \"This introduces the generic kernel_thread() and kernel_execve()\n functions, and switches x86, arm, alpha, um and s390 over to them.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (26 commits)\n s390: convert to generic kernel_execve()\n s390: switch to generic kernel_thread()\n s390: fold kernel_thread_helper() into ret_from_fork()\n s390: fold execve_tail() into start_thread(), convert to generic sys_execve()\n um: switch to generic kernel_thread()\n x86, um/x86: switch to generic sys_execve and kernel_execve\n x86: split ret_from_fork\n alpha: introduce ret_from_kernel_execve(), switch to generic kernel_execve()\n alpha: switch to generic kernel_thread()\n alpha: switch to generic sys_execve()\n arm: get rid of execve wrapper, switch to generic execve() implementation\n arm: optimized current_pt_regs()\n arm: introduce ret_from_kernel_execve(), switch to generic kernel_execve()\n arm: split ret_from_fork, simplify kernel_thread() [based on patch by rmk]\n generic sys_execve()\n generic kernel_execve()\n new helper: current_pt_regs()\n preparation for generic kernel_thread()\n um: kill thread-\u003eforking\n um: let signal_delivered() do SIGTRAP on singlestepping into handler\n ...\n" }, { "commit": "9826a516ff77c5820e591211e4f3e58ff36f46be", "tree": "bdec1e2fe5ff95569795069bac73977faba17d57", "parents": [ "9c079add0d0f45220f4bb37febf0621137ec2d38" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Mon Oct 08 16:31:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:40 2012 +0900" }, "message": "mm: interval tree updates\n\nUpdate the generic interval tree code that was introduced in \"mm: replace\nvma prio_tree with an interval tree\".\n\nChanges:\n\n- fixed \u0027endpoing\u0027 typo noticed by Andrew Morton\n\n- replaced include/linux/interval_tree_tmpl.h, which was used as a\n template (including it automatically defined the interval tree\n functions) with include/linux/interval_tree_generic.h, which only\n defines a preprocessor macro INTERVAL_TREE_DEFINE(), which itself\n defines the interval tree functions when invoked. Now that is a very\n long macro which is unfortunate, but it does make the usage sites\n (lib/interval_tree.c and mm/interval_tree.c) a bit nicer than previously.\n\n- make use of RB_DECLARE_CALLBACKS() in the INTERVAL_TREE_DEFINE() macro,\n instead of duplicating that code in the interval tree template.\n\n- replaced vma_interval_tree_add(), which was actually handling the\n nonlinear and interval tree cases, with vma_interval_tree_insert_after()\n which handles only the interval tree case and has an API that is more\n consistent with the other interval tree handling functions.\n The nonlinear case is now handled explicitly in kernel/fork.c dup_mmap().\n\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Daniel Santos \u003cdaniel.santos@pobox.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6b2dbba8b6ac4df26f72eda1e5ea7bab9f950e08", "tree": "422ed8d7ac2fe45069f20cfba84a9a097bf444af", "parents": [ "fff3fd8a1210a165252cd7cd01206da7a90d3a06" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Mon Oct 08 16:31:25 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:39 2012 +0900" }, "message": "mm: replace vma prio_tree with an interval tree\n\nImplement an interval tree as a replacement for the VMA prio_tree. The\nalgorithms are similar to lib/interval_tree.c; however that code can\u0027t be\ndirectly reused as the interval endpoints are not explicitly stored in the\nVMA. So instead, the common algorithm is moved into a template and the\ndetails (node type, how to get interval endpoints from the node, etc) are\nfilled in using the C preprocessor.\n\nOnce the interval tree functions are available, using them as a\nreplacement to the VMA prio tree is a relatively simple, mechanical job.\n\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "01dc52ebdf472f77cca623ca693ca24cfc0f1bbe", "tree": "2d0f35f2aff418d52a84fb50974ad3bacf68d4bd", "parents": [ "d5dc0ad928fb9e972001e552597fd0b794863f34" ], "author": { "name": "Davidlohr Bueso", "email": "dave@gnu.org", "time": "Mon Oct 08 16:29:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:24 2012 +0900" }, "message": "oom: remove deprecated oom_adj\n\nThe deprecated /proc/\u003cpid\u003e/oom_adj is scheduled for removal this month.\n\nSigned-off-by: Davidlohr Bueso \u003cdave@gnu.org\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e9714acf8c439688884234dcac2bfc38bb607d38", "tree": "2e21c88f855a9f5168a143fa9948141140ff02a2", "parents": [ "2dd8ad81e31d0d36a5d448329c646ab43eb17788" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Mon Oct 08 16:28:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:18 2012 +0900" }, "message": "mm: kill vma flag VM_EXECUTABLE and mm-\u003enum_exe_file_vmas\n\nCurrently the kernel sets mm-\u003eexe_file during sys_execve() and then tracks\nnumber of vmas with VM_EXECUTABLE flag in mm-\u003enum_exe_file_vmas, as soon\nas this counter drops to zero kernel resets mm-\u003eexe_file to NULL. Plus it\nresets mm-\u003eexe_file at last mmput() when mm-\u003emm_users drops to zero.\n\nVMA with VM_EXECUTABLE flag appears after mapping file with flag\nMAP_EXECUTABLE, such vmas can appears only at sys_execve() or after vma\nsplitting, because sys_mmap ignores this flag. Usually binfmt module sets\nmm-\u003eexe_file and mmaps executable vmas with this file, they hold\nmm-\u003eexe_file while task is running.\n\ncomment from v2.6.25-6245-g925d1c4 (\"procfs task exe symlink\"),\nwhere all this stuff was introduced:\n\n\u003e The kernel implements readlink of /proc/pid/exe by getting the file from\n\u003e the first executable VMA. Then the path to the file is reconstructed and\n\u003e reported as the result.\n\u003e\n\u003e Because of the VMA walk the code is slightly different on nommu systems.\n\u003e This patch avoids separate /proc/pid/exe code on nommu systems. Instead of\n\u003e walking the VMAs to find the first executable file-backed VMA we store a\n\u003e reference to the exec\u0027d file in the mm_struct.\n\u003e\n\u003e That reference would prevent the filesystem holding the executable file\n\u003e from being unmounted even after unmapping the VMAs. So we track the number\n\u003e of VM_EXECUTABLE VMAs and drop the new reference when the last one is\n\u003e unmapped. This avoids pinning the mounted filesystem.\n\nexe_file\u0027s vma accounting is hooked into every file mmap/unmmap and vma\nsplit/merge just to fix some hypothetical pinning fs from umounting by mm,\nwhich already unmapped all its executable files, but still alive.\n\nSeems like currently nobody depends on this behaviour. We can try to\nremove this logic and keep mm-\u003eexe_file until final mmput().\n\nmm-\u003eexe_file is still protected with mm-\u003emmap_sem, because we want to\nchange it via new sys_prctl(PR_SET_MM_EXE_FILE). Also via this syscall\ntask can change its mm-\u003eexe_file and unpin mountpoint explicitly.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Carsten Otte \u003ccotte@de.ibm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: James Morris \u003cjames.l.morris@oracle.com\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Kentaro Takeda \u003ctakedakn@nttdata.co.jp\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Robert Richter \u003crobert.richter@amd.com\u003e\nCc: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nCc: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2dd8ad81e31d0d36a5d448329c646ab43eb17788", "tree": "cd358be45ed8067673edac7f1db6b6a42a96d9db", "parents": [ "0b173bc4daa8f8ec03a85abf5e47b23502ff80af" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Mon Oct 08 16:28:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 09 16:22:18 2012 +0900" }, "message": "mm: use mm-\u003eexe_file instead of first VM_EXECUTABLE vma-\u003evm_file\n\nSome security modules and oprofile still uses VM_EXECUTABLE for retrieving\na task\u0027s executable file. After this patch they will use mm-\u003eexe_file\ndirectly. mm-\u003eexe_file is protected with mm-\u003emmap_sem, so locking stays\nthe same.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\t\t\t[arch/tile]\nAcked-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\t[tomoyo]\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Carsten Otte \u003ccotte@de.ibm.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: Eric Paris \u003ceparis@redhat.com\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nAcked-by: James Morris \u003cjames.l.morris@oracle.com\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Kentaro Takeda \u003ctakedakn@nttdata.co.jp\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nCc: Nick Piggin \u003cnpiggin@kernel.dk\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Robert Richter \u003crobert.richter@amd.com\u003e\nCc: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aecdc33e111b2c447b622e287c6003726daa1426", "tree": "3e7657eae4b785e1a1fb5dfb225dbae0b2f0cfc6", "parents": [ "a20acf99f75e49271381d65db097c9763060a1e8", "a3a6cab5ea10cca64d036851fe0d932448f2fe4f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 13:38:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 02 13:38:27 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking changes from David Miller:\n\n 1) GRE now works over ipv6, from Dmitry Kozlov.\n\n 2) Make SCTP more network namespace aware, from Eric Biederman.\n\n 3) TEAM driver now works with non-ethernet devices, from Jiri Pirko.\n\n 4) Make openvswitch network namespace aware, from Pravin B Shelar.\n\n 5) IPV6 NAT implementation, from Patrick McHardy.\n\n 6) Server side support for TCP Fast Open, from Jerry Chu and others.\n\n 7) Packet BPF filter supports MOD and XOR, from Eric Dumazet and Daniel\n Borkmann.\n\n 8) Increate the loopback default MTU to 64K, from Eric Dumazet.\n\n 9) Use a per-task rather than per-socket page fragment allocator for\n outgoing networking traffic. This benefits processes that have very\n many mostly idle sockets, which is quite common.\n\n From Eric Dumazet.\n\n10) Use up to 32K for page fragment allocations, with fallbacks to\n smaller sizes when higher order page allocations fail. Benefits are\n a) less segments for driver to process b) less calls to page\n allocator c) less waste of space.\n\n From Eric Dumazet.\n\n11) Allow GRO to be used on GRE tunnels, from Eric Dumazet.\n\n12) VXLAN device driver, one way to handle VLAN issues such as the\n limitation of 4096 VLAN IDs yet still have some level of isolation.\n From Stephen Hemminger.\n\n13) As usual there is a large boatload of driver changes, with the scale\n perhaps tilted towards the wireless side this time around.\n\nFix up various fairly trivial conflicts, mostly caused by the user\nnamespace changes.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1012 commits)\n hyperv: Add buffer for extended info after the RNDIS response message.\n hyperv: Report actual status in receive completion packet\n hyperv: Remove extra allocated space for recv_pkt_list elements\n hyperv: Fix page buffer handling in rndis_filter_send_request()\n hyperv: Fix the missing return value in rndis_filter_set_packet_filter()\n hyperv: Fix the max_xfer_size in RNDIS initialization\n vxlan: put UDP socket in correct namespace\n vxlan: Depend on CONFIG_INET\n sfc: Fix the reported priorities of different filter types\n sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP\n sfc: Fix loopback self-test with separate_tx_channels\u003d1\n sfc: Fix MCDI structure field lookup\n sfc: Add parentheses around use of bitfield macro arguments\n sfc: Fix null function pointer in efx_sriov_channel_type\n vxlan: virtual extensible lan\n igmp: export symbol ip_mc_leave_group\n netlink: add attributes to fdb interface\n tg3: unconditionally select HWMON support when tg3 is enabled.\n Revert \"net: ti cpsw ethernet: allow reading phy interface mode from DT\"\n gre: fix sparse warning\n ...\n" }, { "commit": "0b981cb94bc63a2d0e5eccccdca75fe57643ffce", "tree": "966ad6e6807fd1041d9962c9904e032a5ab07a65", "parents": [ "4cba3335826cbb36a218c3f5a1387e2c7c7ca9aa", "fdf9c356502ae02238efcdf90cefd7b473a63fd4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 10:43:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 01 10:43:39 2012 -0700" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler changes from Ingo Molnar:\n \"Continued quest to clean up and enhance the cputime code by Frederic\n Weisbecker, in preparation for future tickless kernel features.\n\n Other than that, smallish changes.\"\n\nFix up trivial conflicts due to additions next to each other in arch/{x86/}Kconfig\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)\n cputime: Make finegrained irqtime accounting generally available\n cputime: Gather time/stats accounting config options into a single menu\n ia64: Reuse system and user vtime accounting functions on task switch\n ia64: Consolidate user vtime accounting\n vtime: Consolidate system/idle context detection\n cputime: Use a proper subsystem naming for vtime related APIs\n sched: cpu_power: enable ARCH_POWER\n sched/nohz: Clean up select_nohz_load_balancer()\n sched: Fix load avg vs. cpu-hotplug\n sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW\n sched: Fix nohz_idle_balance()\n sched: Remove useless code in yield_to()\n sched: Add time unit suffix to sched sysctl knobs\n sched/debug: Limit sd-\u003e*_idx range on sysctl\n sched: Remove AFFINE_WAKEUPS feature flag\n s390: Remove leftover account_tick_vtime() header\n cputime: Consolidate vtime handling on context switch\n sched: Move cputime code to its own file\n cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING\n tile: Remove SD_PREFER_LOCAL leftover\n ...\n" }, { "commit": "2aa3a7f8660355c3dddead17e224545c1a3d5a5f", "tree": "d106fcaeb6b66e09591cf8ec28c836be93f4d837", "parents": [ "a4d94ff8aa864c05b33c2de1f8c5d0176d7a4b63" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Sep 21 19:55:31 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Sep 30 13:35:55 2012 -0400" }, "message": "preparation for generic kernel_thread()\n\nLet architectures select GENERIC_KERNEL_THREAD and have their copy_thread()\ntreat NULL regs as \"it came from kernel_thread(), sp argument contains\nthe function new thread will be calling and stack_size - the argument for\nthat function\". Switching the architectures begins shortly...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "5640f7685831e088fe6c2e1f863a6805962f8e81", "tree": "fb7660173338a45c27d610eb59ba20cf5c2b91b8", "parents": [ "b98b8babd6e3370fadb7c6eaacb00eb2f6344a6c" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sun Sep 23 23:04:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 24 16:31:37 2012 -0400" }, "message": "net: use a per task frag allocator\n\nWe currently use a per socket order-0 page cache for tcp_sendmsg()\noperations.\n\nThis page is used to build fragments for skbs.\n\nIts done to increase probability of coalescing small write() into\nsingle segments in skbs still in write queue (not yet sent)\n\nBut it wastes a lot of memory for applications handling many mostly\nidle sockets, since each socket holds one page in sk-\u003esk_sndmsg_page\n\nIts also quite inefficient to build TSO 64KB packets, because we need\nabout 16 pages per skb on arches where PAGE_SIZE \u003d 4096, so we hit\npage allocator more than wanted.\n\nThis patch adds a per task frag allocator and uses bigger pages,\nif available. An automatic fallback is done in case of memory pressure.\n\n(up to 32768 bytes per frag, thats order-3 pages on x86)\n\nThis increases TCP stream performance by 20% on loopback device,\nbut also benefits on other network devices, since 8x less frags are\nmapped on transmit and unmapped on tx completion. Alexander Duyck\nmentioned a probable performance win on systems with IOMMU enabled.\n\nIts possible some SG enabled hardware cant cope with bigger fragments,\nbut their ndo_start_xmit() should already handle this, splitting a\nfragment in sub fragments, since some arches have PAGE_SIZE\u003d65536\n\nSuccessfully tested on various ethernet devices.\n(ixgbe, igb, bnx2x, tg3, mellanox mlx4)\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: Vijay Subramanian \u003csubramanian.vijay@gmail.com\u003e\nCc: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nTested-by: Vijay Subramanian \u003csubramanian.vijay@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f3e947867478af9a12b9956bcd000ac7613a8a95", "tree": "63fabb89439447e0f72c465e8b8d0852e9deff08", "parents": [ "5ed4f1d96deee82ee92cd1ac1e0108c27e80e9b0" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Sep 12 11:22:00 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Thu Sep 13 16:52:04 2012 +0200" }, "message": "sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW\n\nNow that the last architecture to use this has stopped doing so (ARM,\nthanks Catalin!) we can remove this complexity from the scheduler\ncore.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nLink: http://lkml.kernel.org/n/tip-g9p2a1w81xxbrze25v9zpzbf@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "61559a8165da2b6bab7621ac36379c6280efacb6", "tree": "22d885fda72ffadbaa735ceeeabd266177d66eab", "parents": [ "f8ac4ec9c064b330dcc49e03c450fe74298c4622" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Aug 08 17:17:46 2012 +0200" }, "committer": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Aug 28 18:21:19 2012 +0200" }, "message": "uprobes: Fold uprobe_reset_state() into uprobe_dup_mmap()\n\nNow that we have uprobe_dup_mmap() we can fold uprobe_reset_state()\ninto the new hook and remove it. mmput()-\u003euprobe_clear_state() can\u0027t\nbe called before dup_mmap().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\n" }, { "commit": "f8ac4ec9c064b330dcc49e03c450fe74298c4622", "tree": "62d53120d0289719438d27de5f868c36e136ed28", "parents": [ "78f7411668aa0b2006d331f6a288416dd91b8e5d" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Aug 08 17:11:42 2012 +0200" }, "committer": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Aug 28 18:21:18 2012 +0200" }, "message": "uprobes: Introduce MMF_HAS_UPROBES\n\nAdd the new MMF_HAS_UPROBES flag. It is set by install_breakpoint()\nand it is copied by dup_mmap(), uprobe_pre_sstep_notifier() checks\nit to avoid the slow path if the task was never probed. Perhaps it\nmakes sense to check it in valid_vma(is_register \u003d\u003e false) as well.\n\nThis needs the new dup_mmap()-\u003euprobe_dup_mmap() hook. We can\u0027t use\nuprobe_reset_state() or put MMF_HAS_UPROBES into MMF_INIT_MASK, we\nneed oldmm-\u003emmap_sem to avoid the race with uprobe_register() or\nmmap() from another thread.\n\nCurrently we never clear this bit, it can be false-positive after\nuprobe_unregister() or uprobe_munmap() or if dup_mmap() hits the\nprobed VM_DONTCOPY vma. But this is fine correctness-wise and has\nno effect unless the task hits the non-uprobe breakpoint.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\n" }, { "commit": "f1a45d023193f7d8e55e384090b645d609325393", "tree": "7f901f3dbd23a7602bf3d4bf774862a3ee5b7640", "parents": [ "647c42dfd40fec032a4c8525a755160f0765921f" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Aug 06 14:13:23 2012 +0200" }, "committer": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Tue Aug 28 18:21:17 2012 +0200" }, "message": "uprobes: Kill dup_mmap()-\u003euprobe_mmap(), simplify uprobe_mmap/munmap\n\n1. Kill dup_mmap()-\u003euprobe_mmap(), it was only needed to calculate\n new_mm-\u003euprobes_state.count removed by the previous patch.\n\n If the forking process has a pending uprobe (int3) in vma, it will\n be copied by copy_page_range(), note that it checks vma-\u003eanon_vma\n so \"Don\u0027t copy ptes\" is not possible after install_breakpoint()\n which does anon_vma_prepare().\n\n2. Remove is_swbp_at_addr() and \"int count\" in uprobe_mmap(). Again,\n this was needed for uprobes_state.count.\n\n As a side effect this fixes the bug pointed out by Srikar,\n this code lacked the necessary put_uprobe().\n\n3. uprobe_munmap() becomes a nop after the previous patch. Remove the\n meaningless code but do not remove the helper, we will need it.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\n" }, { "commit": "c7a3a88c938fbe3d70c2278e082b80eb830d1c58", "tree": "e25070dc5141c2614fbcfaae543de4237418a623", "parents": [ "9160338de92c0305329be5163a76f849806e83de" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Sun Aug 19 19:10:42 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Tue Aug 21 11:48:12 2012 +0200" }, "message": "uprobes: Fix mmap_region()\u0027s mm-\u003emm_rb corruption if uprobe_mmap() fails\n\nThis patch fixes:\n\n https://bugzilla.redhat.com/show_bug.cgi?id\u003d843640\n\nIf mmap_region()-\u003euprobe_mmap() fails, unmap_and_free_vma path\ndoes unmap_region() but does not remove the soon-to-be-freed vma\nfrom rb tree. Actually there are more problems but this is how\nWilliam noticed this bug.\n\nPerhaps we could do do_munmap() + return in this case, but in\nfact it is simply wrong to abort if uprobe_mmap() fails. Until\nat least we move the !UPROBE_COPY_INSN code from\ninstall_breakpoint() to uprobe_register().\n\nFor example, uprobe_mmap()-\u003einstall_breakpoint() can fail if the\nprobed insn is not supported (remember, uprobe_register()\nsucceeds if nobody mmaps inode/offset), mmap() should not fail\nin this case.\n\ndup_mmap()-\u003euprobe_mmap() is wrong too by the same reason,\nfork() can race with uprobe_register() and fail for no reason if\nit wins the race and does install_breakpoint() first.\n\nAnd, if nothing else, both mmap_region() and dup_mmap() return\nsuccess if uprobe_mmap() fails. Change them to ignore the error\ncode from uprobe_mmap().\n\nReported-and-tested-by: William Cohen \u003cwcohen@redhat.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e # v3.5\nCc: Anton Arapov \u003canton@redhat.com\u003e\nCc: William Cohen \u003cwcohen@redhat.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/r/20120819171042.GB26957@redhat.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "c255a458055e459f65eb7b7f51dc5dbdd0caf1d8", "tree": "b143b1914eeb6f27f53e30f9f0275d0f1ca5480b", "parents": [ "80934513b230bfcf70265f2ef0fdae89fb391633" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Tue Jul 31 16:43:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 31 18:42:43 2012 -0700" }, "message": "memcg: rename config variables\n\nSanity:\n\nCONFIG_CGROUP_MEM_RES_CTLR -\u003e CONFIG_MEMCG\nCONFIG_CGROUP_MEM_RES_CTLR_SWAP -\u003e CONFIG_MEMCG_SWAP\nCONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED -\u003e CONFIG_MEMCG_SWAP_ENABLED\nCONFIG_CGROUP_MEM_RES_CTLR_KMEM -\u003e CONFIG_MEMCG_KMEM\n\n[mhocko@suse.cz: fix missed bits]\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "44de9d0cad41f2c51ef26916842be046b582dcc9", "tree": "a9ce576f28e5038e9e3ae2e360cadf176dc74898", "parents": [ "df858fa8276f85106f2f5c3cd49c1fa524058070" ], "author": { "name": "Huang Shijie", "email": "shijie8@gmail.com", "time": "Tue Jul 31 16:41:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 31 18:42:39 2012 -0700" }, "message": "mm: account the total_vm in the vm_stat_account()\n\nvm_stat_account() accounts the shared_vm, stack_vm and reserved_vm now.\nBut we can also account for total_vm in the vm_stat_account() which makes\nthe code tidy.\n\nEven for mprotect_fixup(), we can get the right result in the end.\n\nSigned-off-by: Huang Shijie \u003cshijie8@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f19b9f74b7ea3b21ddcee55d852a6488239608a4", "tree": "d57515cb110bc8b30043e1ab67c962ab78898e2f", "parents": [ "87bec58a52652e2eb2a575692a40f9466c7bd31b" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Mon Jul 30 14:42:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 30 17:25:20 2012 -0700" }, "message": "fork: fix error handling in dup_task()\n\nThe function dup_task() may fail at the following function calls in the\nfollowing order.\n\n0) alloc_task_struct_node()\n1) alloc_thread_info_node()\n2) arch_dup_task_struct()\n\nError by 0) is not a matter, it can just return. But error by 1) requires\nreleasing task_struct allocated by 0) before it returns. Likewise, error\nby 2) requires releasing task_struct and thread_info allocated by 0) and\n1).\n\nThe existing error handling calls free_task_struct() and\nfree_thread_info() which do not only release task_struct and thread_info,\nbut also call architecture specific arch_release_task_struct() and\narch_release_thread_info().\n\nThe problem is that task_struct and thread_info are not fully initialized\nyet at this point, but arch_release_task_struct() and\narch_release_thread_info() are called with them.\n\nFor example, x86 defines its own arch_release_task_struct() that releases\na task_xstate. If alloc_thread_info_node() fails in dup_task(),\narch_release_task_struct() is called with task_struct which is just\nallocated and filled with garbage in this error handling.\n\nThis actually happened with tools/testing/fault-injection/failcmd.sh\n\n\t# env FAILCMD_TYPE\u003dfail_page_alloc \\\n\t\t./tools/testing/fault-injection/failcmd.sh --times\u003d100 \\\n\t\t--min-order\u003d0 --ignore-gfp-wait\u003d0 \\\n\t\t-- make -C tools/testing/selftests/ run_tests\n\nIn order to fix this issue, make free_{task_struct,thread_info}() not to\ncall arch_release_{task_struct,thread_info}() and call\narch_release_{task_struct,thread_info}() implicitly where needed.\n\nDefault arch_release_task_struct() and arch_release_thread_info() are\ndefined as empty by default. So this change only affects the\narchitectures which implement their own arch_release_task_struct() or\narch_release_thread_info() as listed below.\n\narch_release_task_struct(): x86, sh\narch_release_thread_info(): mn10300, tile\n\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Koichi Yasutake \u003cyasutake.koichi@jp.panasonic.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Salman Qazi \u003csqazi@google.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "87bec58a52652e2eb2a575692a40f9466c7bd31b", "tree": "bd7d6408b61ee2c1ad6df9f0b44277fb08e75034", "parents": [ "b2412b7fa7a3816fa8633dc2ff19f1a90aabe423" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Mon Jul 30 14:42:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 30 17:25:20 2012 -0700" }, "message": "revert \"sched: Fix fork() error path to not crash\"\n\nTo make way for \"fork: fix error handling in dup_task()\", which fixes the\nerrors more completely.\n\nCc: Salman Qazi \u003csqazi@google.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b2412b7fa7a3816fa8633dc2ff19f1a90aabe423", "tree": "5059c916b993726b3b208859f35c8b59761f2656", "parents": [ "bc452b4b65bd589083a7a7ba4f14f85dfc8454fa" ], "author": { "name": "Huang Shijie", "email": "shijie8@gmail.com", "time": "Mon Jul 30 14:42:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 30 17:25:20 2012 -0700" }, "message": "fork: use vma_pages() to simplify the code\n\nThe current code can be replaced by vma_pages(). So use it to simplify\nthe code.\n\n[akpm@linux-foundation.org: initialise `len\u0027 at its definition site]\nSigned-off-by: Huang Shijie \u003cshijie8@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a66d2c8f7ec1284206ca7c14569e2a607583f1e3", "tree": "08cf68bcef3559b370843cab8191e5cc0f740bde", "parents": [ "a6be1fcbc57f95bb47ef3c8e4ee3d83731b8f21e", "8cae6f7158ec1fa44c8a04a43db7d8020ec60437" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 23 12:27:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 23 12:27:27 2012 -0700" }, "message": "Merge branch \u0027for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull the big VFS changes from Al Viro:\n \"This one is *big* and changes quite a few things around VFS. What\u0027s in there:\n\n - the first of two really major architecture changes - death to open\n intents.\n\n The former is finally there; it was very long in making, but with\n Miklos getting through really hard and messy final push in\n fs/namei.c, we finally have it. Unlike his variant, this one\n doesn\u0027t introduce struct opendata; what we have instead is\n -\u003eatomic_open() taking preallocated struct file * and passing\n everything via its fields.\n\n Instead of returning struct file *, it returns -E... on error, 0\n on success and 1 in \"deal with it yourself\" case (e.g. symlink\n found on server, etc.).\n\n See comments before fs/namei.c:atomic_open(). That made a lot of\n goodies finally possible and quite a few are in that pile:\n -\u003elookup(), -\u003ed_revalidate() and -\u003ecreate() do not get struct\n nameidata * anymore; -\u003elookup() and -\u003ed_revalidate() get lookup\n flags instead, -\u003ecreate() gets \"do we want it exclusive\" flag.\n\n With the introduction of new helper (kern_path_locked()) we are rid\n of all struct nameidata instances outside of fs/namei.c; it\u0027s still\n visible in namei.h, but not for long. Come the next cycle,\n declaration will move either to fs/internal.h or to fs/namei.c\n itself. [me, miklos, hch]\n\n - The second major change: behaviour of final fput(). Now we have\n __fput() done without any locks held by caller *and* not from deep\n in call stack.\n\n That obviously lifts a lot of constraints on the locking in there.\n Moreover, it\u0027s legal now to call fput() from atomic contexts (which\n has immediately simplified life for aio.c). We also don\u0027t need\n anti-recursion logics in __scm_destroy() anymore.\n\n There is a price, though - the damn thing has become partially\n asynchronous. For fput() from normal process we are guaranteed\n that pending __fput() will be done before the caller returns to\n userland, exits or gets stopped for ptrace.\n\n For kernel threads and atomic contexts it\u0027s done via\n schedule_work(), so theoretically we might need a way to make sure\n it\u0027s finished; so far only one such place had been found, but there\n might be more.\n\n There\u0027s flush_delayed_fput() (do all pending __fput()) and there\u0027s\n __fput_sync() (fput() analog doing __fput() immediately). I hope\n we won\u0027t need them often; see warnings in fs/file_table.c for\n details. [me, based on task_work series from Oleg merged last\n cycle]\n\n - sync series from Jan\n\n - large part of \"death to sync_supers()\" work from Artem; the only\n bits missing here are exofs and ext4 ones. As far as I understand,\n those are going via the exofs and ext4 trees resp.; once they are\n in, we can put -\u003ewrite_super() to the rest, along with the thread\n calling it.\n\n - preparatory bits from unionmount series (from dhowells).\n\n - assorted cleanups and fixes all over the place, as usual.\n\n This is not the last pile for this cycle; there\u0027s at least jlayton\u0027s\n ESTALE work and fsfreeze series (the latter - in dire need of fixes,\n so I\u0027m not sure it\u0027ll make the cut this cycle). I\u0027ll probably throw\n symlink/hardlink restrictions stuff from Kees into the next pile, too.\n Plus there\u0027s a lot of misc patches I hadn\u0027t thrown into that one -\n it\u0027s large enough as it is...\"\n\n* \u0027for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (127 commits)\n ext4: switch EXT4_IOC_RESIZE_FS to mnt_want_write_file()\n btrfs: switch btrfs_ioctl_balance() to mnt_want_write_file()\n switch dentry_open() to struct path, make it grab references itself\n spufs: shift dget/mntget towards dentry_open()\n zoran: don\u0027t bother with struct file * in zoran_map\n ecryptfs: don\u0027t reinvent the wheels, please - use struct completion\n don\u0027t expose I_NEW inodes via dentry-\u003ed_inode\n tidy up namei.c a bit\n unobfuscate follow_up() a bit\n ext3: pass custom EOF to generic_file_llseek_size()\n ext4: use core vfs llseek code for dir seeks\n vfs: allow custom EOF in generic_file_llseek code\n vfs: Avoid unnecessary WB_SYNC_NONE writeback during sys_sync and reorder sync passes\n vfs: Remove unnecessary flushing of block devices\n vfs: Make sys_sync writeout also block device inodes\n vfs: Create function for iterating over block devices\n vfs: Reorder operations during sys_sync\n quota: Move quota syncing to -\u003esync_fs method\n quota: Split dquot_quota_sync() to writeback and cache flushing part\n vfs: Move noop_backing_dev_info check from sync into writeback\n ...\n" }, { "commit": "158e1645e07f3e9f7e4962d7a0997f5c3b98311b", "tree": "09d695b3a0410afe15f7fd6006bc6c1effee151d", "parents": [ "41f9d29f09ca0b22c3631e8a39676e74cda9bcc0" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jun 27 09:24:13 2012 +0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jul 22 23:57:55 2012 +0400" }, "message": "trim task_work: get rid of hlist\n\nlayout based on Oleg\u0027s suggestion; single-linked list,\ntask-\u003etask_works points to the last element, forward pointer\nfrom said last element points to head. I\u0027d still prefer\nmuch more regular scheme with two pointers in task_work,\nbut...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "164c33c6adee609b8b9062cce4c10f764d0dce13", "tree": "47ff40e1ae3d8206dd900e64d757ce16a3ee0774", "parents": [ "9e85a6f9dc231f3ed3c1dc1b12217505d970142a" ], "author": { "name": "Salman Qazi", "email": "sqazi@google.com", "time": "Mon Jun 25 18:18:15 2012 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Thu Jul 05 20:57:32 2012 +0200" }, "message": "sched: Fix fork() error path to not crash\n\nIn dup_task_struct(), if arch_dup_task_struct() fails, the clean up\ncode fails to clean up correctly. That\u0027s because the clean up\ncode depends on unininitalized ti-\u003etask pointer. We fix this\nby making sure that the task and thread_info know about each other\nbefore we attempt to take the error path.\n\nSigned-off-by: Salman Qazi \u003csqazi@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/20120626011815.11323.5533.stgit@dungbeetle.mtv.corp.google.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "48d212a2eecaca2e1875925837ad27b2f43f48a3", "tree": "fbd83c7b15856971f6d7297e1d23dc862ba2989c", "parents": [ "46edaedaf3842164281d0f86c41bc152f4b4d32e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 07 17:54:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 07 17:54:07 2012 -0700" }, "message": "Revert \"mm: correctly synchronize rss-counters at exit/exec\"\n\nThis reverts commit 40af1bbdca47e5c8a2044039bb78ca8fd8b20f94.\n\nIt\u0027s horribly and utterly broken for at least the following reasons:\n\n - calling sync_mm_rss() from mmput() is fundamentally wrong, because\n there\u0027s absolutely no reason to believe that the task that does the\n mmput() always does it on its own VM. Example: fork, ptrace, /proc -\n you name it.\n\n - calling it *after* having done mmdrop() on it is doubly insane, since\n the mm struct may well be gone now.\n\n - testing mm against NULL before you call it is insane too, since a\nNULL mm there would have caused oopses long before.\n\n.. and those are just the three bugs I found before I decided to give up\nlooking for me and revert it asap. I should have caught it before I\neven took it, but I trusted Andrew too much.\n\nCc: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "40af1bbdca47e5c8a2044039bb78ca8fd8b20f94", "tree": "70b5a21579f8b0137c09e54d523246d84be93430", "parents": [ "39caa0916ef27cf1da5026eb708a2b8413156f75" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Thu Jun 07 14:21:14 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 07 14:43:55 2012 -0700" }, "message": "mm: correctly synchronize rss-counters at exit/exec\n\nmm-\u003erss_stat counters have per-task delta: task-\u003erss_stat. Before\nchanging task-\u003emm pointer the kernel must flush this delta with\nsync_mm_rss().\n\ndo_exit() already calls sync_mm_rss() to flush the rss-counters before\ncommitting the rss statistics into task-\u003esignal-\u003emaxrss, taskstats,\naudit and other stuff. Unfortunately the kernel does this before\ncalling mm_release(), which can call put_user() for processing\ntask-\u003eclear_child_tid. So at this point we can trigger page-faults and\ntask-\u003erss_stat becomes non-zero again. As a result mm-\u003erss_stat becomes\ninconsistent and check_mm() will print something like this:\n\n| BUG: Bad rss-counter state mm:ffff88020813c380 idx:1 val:-1\n| BUG: Bad rss-counter state mm:ffff88020813c380 idx:2 val:1\n\nThis patch moves sync_mm_rss() into mm_release(), and moves mm_release()\nout of do_exit() and calls it earlier. After mm_release() there should\nbe no pagefaults.\n\n[akpm@linux-foundation.org: tweak comment]\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nReported-by: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t\t[3.4.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fb21affa49204acd409328415b49bfe90136653c", "tree": "3535dbe0c0aad049a38cadfcffe78409397a1b32", "parents": [ "a00b6151a2ae4c52576c35d3998e144a993d50b8", "f23ca335462e3c84f13270b9e65f83936068ec2c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:47:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:47:30 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal\n\nPull second pile of signal handling patches from Al Viro:\n \"This one is just task_work_add() series + remaining prereqs for it.\n\n There probably will be another pull request from that tree this\n cycle - at least for helpers, to get them out of the way for per-arch\n fixes remaining in the tree.\"\n\nFix trivial conflict in kernel/irq/manage.c: the merge of Andrew\u0027s pile\nhad brought in commit 97fd75b7b8e0 (\"kernel/irq/manage.c: use the\npr_foo() infrastructure to prefix printks\") which changed one of the\npr_err() calls that this merge moves around.\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:\n keys: kill task_struct-\u003ereplacement_session_keyring\n keys: kill the dummy key_replace_session_keyring()\n keys: change keyctl_session_to_parent() to use task_work_add()\n genirq: reimplement exit_irq_thread() hook via task_work_add()\n task_work_add: generic process-context callbacks\n avr32: missed _TIF_NOTIFY_RESUME on one of do_notify_resume callers\n parisc: need to check NOTIFY_RESUME when exiting from syscall\n move key_repace_session_keyring() into tracehook_notify_resume()\n TIF_NOTIFY_RESUME is defined on all targets now\n" }, { "commit": "08615d7d85e5aa02c05bf6c4dde87d940e7f85f6", "tree": "18906149d313d25914160aca21cedf54b3a7e818", "parents": [ "9fdadb2cbaf4b482dfd6086e8bd3d2db071a1702", "0a4dd35c67b144d8ef9432120105f1aab9293ee9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:10:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 18:10:18 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge misc patches from Andrew Morton:\n\n - the \"misc\" tree - stuff from all over the map\n\n - checkpatch updates\n\n - fatfs\n\n - kmod changes\n\n - procfs\n\n - cpumask\n\n - UML\n\n - kexec\n\n - mqueue\n\n - rapidio\n\n - pidns\n\n - some checkpoint-restore feature work. Reluctantly. Most of it\n delayed a release. I\u0027m still rather worried that we don\u0027t have a\n clear roadmap to completion for this work.\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (78 patches)\n kconfig: update compression algorithm info\n c/r: prctl: add ability to set new mm_struct::exe_file\n c/r: prctl: extend PR_SET_MM to set up more mm_struct entries\n c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat\n syscalls, x86: add __NR_kcmp syscall\n fs, proc: introduce /proc/\u003cpid\u003e/task/\u003ctid\u003e/children entry\n sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE\n aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()\n eventfd: change int to __u64 in eventfd_signal()\n fs/nls: add Apple NLS\n pidns: make killed children autoreap\n pidns: use task_active_pid_ns in do_notify_parent\n rapidio/tsi721: add DMA engine support\n rapidio: add DMA engine support for RIO data transfers\n ipc/mqueue: add rbtree node caching support\n tools/selftests: add mq_perf_tests\n ipc/mqueue: strengthen checks on mqueue creation\n ipc/mqueue: correct mq_attr_ok test\n ipc/mqueue: improve performance of send/recv\n selftests: add mq_open_tests\n ...\n" }, { "commit": "f7505d64f2db5da2d7d94873ddf2cd2524847061", "tree": "a10aee9604306826816e8e5fc689201f49d7a6d0", "parents": [ "bca15543736f9be6d84e0bbc262ea7069076b9e6" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Thu May 31 16:26:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 31 17:49:29 2012 -0700" }, "message": "fork: call complete_vfork_done() after clearing child_tid and flushing rss-counters\n\nChild should wake up the parent from vfork() only after finishing all\noperations with shared mm. There is no sense in using\nCLONE_CHILD_CLEARTID together with CLONE_VFORK, but it looks more accurate\nnow.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0d167518e045cc8bb63f0a8a0a85ad4fa4e0044f", "tree": "101a9b5d425d79f663e4f25f1e90b7a8cc6604f1", "parents": [ "2f83766d4b18774c856329a8fca4c9338dfeda39", "ff26eaadf4d914e397872b99885d45756104e9ae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 08:52:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 30 08:52:42 2012 -0700" }, "message": "Merge branch \u0027for-3.5/core\u0027 of git://git.kernel.dk/linux-block\n\nMerge block/IO core bits from Jens Axboe:\n \"This is a bit bigger on the core side than usual, but that is purely\n because we decided to hold off on parts of Tejun\u0027s submission on 3.4\n to give it a bit more time to simmer. As a consequence, it\u0027s seen a\n long cycle in for-next.\n\n It contains:\n\n - Bug fix from Dan, wrong locking type.\n - Relax splice gifting restriction from Eric.\n - A ton of updates from Tejun, primarily for blkcg. This improves\n the code a lot, making the API nicer and cleaner, and also includes\n fixes for how we handle and tie policies and re-activate on\n switches. The changes also include generic bug fixes.\n - A simple fix from Vivek, along with a fix for doing proper delayed\n allocation of the blkcg stats.\"\n\nFix up annoying conflict just due to different merge resolution in\nDocumentation/feature-removal-schedule.txt\n\n* \u0027for-3.5/core\u0027 of git://git.kernel.dk/linux-block: (92 commits)\n blkcg: tg_stats_alloc_lock is an irq lock\n vmsplice: relax alignement requirements for SPLICE_F_GIFT\n blkcg: use radix tree to index blkgs from blkcg\n blkcg: fix blkcg-\u003ecss ref leak in __blkg_lookup_create()\n block: fix elvpriv allocation failure handling\n block: collapse blk_alloc_request() into get_request()\n blkcg: collapse blkcg_policy_ops into blkcg_policy\n blkcg: embed struct blkg_policy_data in policy specific data\n blkcg: mass rename of blkcg API\n blkcg: style cleanups for blk-cgroup.h\n blkcg: remove blkio_group-\u003epath[]\n blkcg: blkg_rwstat_read() was missing inline\n blkcg: shoot down blkgs if all policies are deactivated\n blkcg: drop stuff unused after per-queue policy activation update\n blkcg: implement per-queue policy activation\n blkcg: add request_queue-\u003eroot_blkg\n blkcg: make request_queue bypassing on allocation\n blkcg: make sure blkg_lookup() returns %NULL if @q is bypassing\n blkcg: make blkg_conf_prep() take @pol and return with queue lock held\n blkcg: remove static policy ID enums\n ...\n" }, { "commit": "7edc8b0ac16cbaed7cb4ea4c6b95ce98d2997e84", "tree": "e333f72f3dc2c91385b8392bc31a44f5423d7f5c", "parents": [ "841e31e5cc6219d62054788faa289b6ed682d068" ], "author": { "name": "Siddhesh Poyarekar", "email": "siddhesh.poyarekar@gmail.com", "time": "Tue May 29 15:06:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:19 2012 -0700" }, "message": "mm/fork: fix overflow in vma length when copying mmap on clone\n\nThe vma length in dup_mmap is calculated and stored in a unsigned int,\nwhich is insufficient and hence overflows for very large maps (beyond\n16TB). The following program demonstrates this:\n\n#include \u003cstdio.h\u003e\n#include \u003cunistd.h\u003e\n#include \u003csys/mman.h\u003e\n\n#define GIG 1024 * 1024 * 1024L\n#define EXTENT 16393\n\nint main(void)\n{\n int i, r;\n void *m;\n char buf[1024];\n\n for (i \u003d 0; i \u003c EXTENT; i++) {\n m \u003d mmap(NULL, (size_t) 1 * 1024 * 1024 * 1024L,\n PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);\n\n if (m \u003d\u003d (void *)-1)\n printf(\"MMAP Failed: %d\\n\", m);\n else\n printf(\"%d : MMAP returned %p\\n\", i, m);\n\n r \u003d fork();\n\n if (r \u003d\u003d 0) {\n printf(\"%d: successed\\n\", i);\n return 0;\n } else if (r \u003c 0)\n printf(\"FORK Failed: %d\\n\", r);\n else if (r \u003e 0)\n wait(NULL);\n }\n return 0;\n}\n\nIncrease the storage size of the result to unsigned long, which is\nsufficient for storing the difference between addresses.\n\nSigned-off-by: Siddhesh Poyarekar \u003csiddhesh.poyarekar@gmail.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e709ffd6169ccd259eb5874e853303e91e94e829", "tree": "796b56c2507b8581492da73e354d651c9dd7076b", "parents": [ "edad9d2c337d43278a9d5aeb0ed531c2e838f8a6" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Tue May 29 15:06:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:19 2012 -0700" }, "message": "mm: remove swap token code\n\nThe swap token code no longer fits in with the current VM model. It\ndoes not play well with cgroups or the better NUMA placement code in\ndevelopment, since we have only one swap token globally.\n\nIt also has the potential to mess with scalability of the system, by\nincreasing the number of non-reclaimable pages on the active and\ninactive anon LRU lists.\n\nLast but not least, the swap token code has been broken for a year\nwithout complaints, as reported by Konstantin Khlebnikov. This suggests\nwe no longer have much use for it.\n\nThe days of sub-1G memory systems with heavy use of swap are over. If\nwe ever need thrashing reducing code in the future, we will have to\nimplement something that does scale.\n\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Bob Picco \u003cbpicco@meloft.net\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "654443e20dfc0617231f28a07c96a979ee1a0239", "tree": "a0dc3f093eb13892539082e663607c34b4fc2d07", "parents": [ "2c01e7bc46f10e9190818437e564f7e0db875ae9", "9cba26e66d09bf394ae5a739627a1dc8b7cae6f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:39:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 24 11:39:34 2012 -0700" }, "message": "Merge branch \u0027perf-uprobes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull user-space probe instrumentation from Ingo Molnar:\n \"The uprobes code originates from SystemTap and has been used for years\n in Fedora and RHEL kernels. This version is much rewritten, reviews\n from PeterZ, Oleg and myself shaped the end result.\n\n This tree includes uprobes support in \u0027perf probe\u0027 - but SystemTap\n (and other tools) can take advantage of user probe points as well.\n\n Sample usage of uprobes via perf, for example to profile malloc()\n calls without modifying user-space binaries.\n\n First boot a new kernel with CONFIG_UPROBE_EVENT\u003dy enabled.\n\n If you don\u0027t know which function you want to probe you can pick one\n from \u0027perf top\u0027 or can get a list all functions that can be probed\n within libc (binaries can be specified as well):\n\n\t$ perf probe -F -x /lib/libc.so.6\n\n To probe libc\u0027s malloc():\n\n\t$ perf probe -x /lib64/libc.so.6 malloc\n\tAdded new event:\n\tprobe_libc:malloc (on 0x7eac0)\n\n You can now use it in all perf tools, such as:\n\n\tperf record -e probe_libc:malloc -aR sleep 1\n\n Make use of it to create a call graph (as the flat profile is going to\n look very boring):\n\n\t$ perf record -e probe_libc:malloc -gR make\n\t[ perf record: Woken up 173 times to write data ]\n\t[ perf record: Captured and wrote 44.190 MB perf.data (~1930712\n\n\t$ perf report | less\n\n\t 32.03% git libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\n\t 29.49% cc1 libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t |--0.95%-- 0x208eb1000000000\n\t |\n\t |--0.63%-- htab_traverse_noresize\n\n\t 11.04% as libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\n\t 7.15% ld libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\n\t 5.07% sh libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t 4.99% python-config libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t 4.54% make libc-2.15.so [.] malloc\n\t |\n\t --- malloc\n\t |\n\t |--7.34%-- glob\n\t | |\n\t | |--93.18%-- 0x41588f\n\t | |\n\t | --6.82%-- glob\n\t | 0x41588f\n\n\t ...\n\n Or:\n\n\t$ perf report -g flat | less\n\n\t# Overhead Command Shared Object Symbol\n\t# ........ ............. ............. ..........\n\t#\n\t 32.03% git libc-2.15.so [.] malloc\n\t 27.19%\n\t malloc\n\n\t 29.49% cc1 libc-2.15.so [.] malloc\n\t 24.77%\n\t malloc\n\n\t 11.04% as libc-2.15.so [.] malloc\n\t 11.02%\n\t malloc\n\n\t 7.15% ld libc-2.15.so [.] malloc\n\t 6.57%\n\t malloc\n\n\t ...\n\n The core uprobes design is fairly straightforward: uprobes probe\n points register themselves at (inode:offset) addresses of\n libraries/binaries, after which all existing (or new) vmas that map\n that address will have a software breakpoint injected at that address.\n vmas are COW-ed to preserve original content. The probe points are\n kept in an rbtree.\n\n If user-space executes the probed inode:offset instruction address\n then an event is generated which can be recovered from the regular\n perf event channels and mmap-ed ring-buffer.\n\n Multiple probes at the same address are supported, they create a\n dynamic callback list of event consumers.\n\n The basic model is further complicated by the XOL speedup: the\n original instruction that is probed is copied (in an architecture\n specific fashion) and executed out of line when the probe triggers.\n The XOL area is a single vma per process, with a fixed number of\n entries (which limits probe execution parallelism).\n\n The API: uprobes are installed/removed via\n /sys/kernel/debug/tracing/uprobe_events, the API is integrated to\n align with the kprobes interface as much as possible, but is separate\n to it.\n\n Injecting a probe point is privileged operation, which can be relaxed\n by setting perf_paranoid to -1.\n\n You can use multiple probes as well and mix them with kprobes and\n regular PMU events or tracepoints, when instrumenting a task.\"\n\nFix up trivial conflicts in mm/memory.c due to previous cleanup of\nunmap_single_vma().\n\n* \u0027perf-uprobes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)\n perf probe: Detect probe target when m/x options are absent\n perf probe: Provide perf interface for uprobes\n tracing: Fix kconfig warning due to a typo\n tracing: Provide trace events interface for uprobes\n tracing: Extract out common code for kprobes/uprobes trace events\n tracing: Modify is_delete, is_return from int to bool\n uprobes/core: Decrement uprobe count before the pages are unmapped\n uprobes/core: Make background page replacement logic account for rss_stat counters\n uprobes/core: Optimize probe hits with the help of a counter\n uprobes/core: Allocate XOL slots for uprobes use\n uprobes/core: Handle breakpoint and singlestep exceptions\n uprobes/core: Rename bkpt to swbp\n uprobes/core: Make order of function parameters consistent across functions\n uprobes/core: Make macro names consistent\n uprobes: Update copyright notices\n uprobes/core: Move insn to arch specific structure\n uprobes/core: Remove uprobe_opcode_sz\n uprobes/core: Make instruction tables volatile\n uprobes: Move to kernel/events/\n uprobes/core: Clean up, refactor and improve the code\n ...\n" }, { "commit": "e73f8959af0439d114847eab5a8a5ce48f1217c4", "tree": "47f056093590a5e5552e3a75f163e1f798063bda", "parents": [ "62366c88b29c5a32e1531142092f98eaf49b1103" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri May 11 10:59:07 2012 +1000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed May 23 22:09:21 2012 -0400" }, "message": "task_work_add: generic process-context callbacks\n\nProvide a simple mechanism that allows running code in the (nonatomic)\ncontext of the arbitrary task.\n\nThe caller does task_work_add(task, task_work) and this task executes\ntask_work-\u003efunc() either from do_notify_resume() or from do_exit(). The\ncallback can rely on PF_EXITING to detect the latter case.\n\n\"struct task_work\" can be embedded in another struct, still it has \"void\n*data\" to handle the most common/simple case.\n\nThis allows us to kill the -\u003ereplacement_session_keyring hack, and\npotentially this can have more users.\n\nPerformance-wise, this adds 2 \"unlikely(!hlist_empty())\" checks into\ntracehook_notify_resume() and do_exit(). But at the same time we can\nremove the \"replacement_session_keyring !\u003d NULL\" checks from\narch/*/signal.c and exit_creds().\n\nNote: task_work_add/task_work_run abuses -\u003epi_lock. This is only because\nthis lock is already used by lookup_pi_state() to synchronize with\ndo_exit() setting PF_EXITING. Fortunately the scope of this lock in\ntask_work.c is really tiny, and the code is unlikely anyway.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Richard Kuo \u003crkuo@codeaurora.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Alexander Gordeev \u003cagordeev@redhat.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nCc: David Smith \u003cdsmith@redhat.com\u003e\nCc: \"Frank Ch. Eigler\" \u003cfche@redhat.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Larry Woodman \u003clwoodman@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "ec0d7f18ab7b5097d7c0c8f3d909ca1031b9d5cd", "tree": "7d62c924592145f819ecaa5d60460a05a10dfdbd", "parents": [ "269af9a1a08d368b46d72e74126564d04c354f7e", "1dcc8d7ba235a316a056f993e88f0d18b92c60d9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 10:59:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 23 10:59:07 2012 -0700" }, "message": "Merge branch \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull fpu state cleanups from Ingo Molnar:\n \"This tree streamlines further aspects of FPU handling by eliminating\n the prepare_to_copy() complication and moving that logic to\n arch_dup_task_struct().\n\n It also fixes the FPU dumps in threaded core dumps, removes and old\n (and now invalid) assumption plus micro-optimizes the exit path by\n avoiding an FPU save for dead tasks.\"\n\nFixed up trivial add-add conflict in arch/sh/kernel/process.c that came\nin because we now do the FPU handling in arch_dup_task_struct() rather\nthan the legacy (and now gone) prepare_to_copy().\n\n* \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, fpu: drop the fpu state during thread exit\n x86, xsave: remove thread_has_fpu() bug check in __sanitize_i387_state()\n coredump: ensure the fpu state is flushed for proper multi-threaded core dump\n fork: move the real prepare_to_copy() users to arch_dup_task_struct()\n" }, { "commit": "cb60e3e65c1b96a4d6444a7a13dc7dd48bc15a2b", "tree": "4322be35db678f6299348a76ad60a2023954af7d", "parents": [ "99262a3dafa3290866512ddfb32609198f8973e9", "ff2bb047c4bce9742e94911eeb44b4d6ff4734ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:27:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 20:27:36 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates from James Morris:\n \"New notable features:\n - The seccomp work from Will Drewry\n - PR_{GET,SET}_NO_NEW_PRIVS from Andy Lutomirski\n - Longer security labels for Smack from Casey Schaufler\n - Additional ptrace restriction modes for Yama by Kees Cook\"\n\nFix up trivial context conflicts in arch/x86/Kconfig and include/linux/filter.h\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits)\n apparmor: fix long path failure due to disconnected path\n apparmor: fix profile lookup for unconfined\n ima: fix filename hint to reflect script interpreter name\n KEYS: Don\u0027t check for NULL key pointer in key_validate()\n Smack: allow for significantly longer Smack labels v4\n gfp flags for security_inode_alloc()?\n Smack: recursive tramsmute\n Yama: replace capable() with ns_capable()\n TOMOYO: Accept manager programs which do not start with / .\n KEYS: Add invalidation support\n KEYS: Do LRU discard in full keyrings\n KEYS: Permit in-place link replacement in keyring list\n KEYS: Perform RCU synchronisation on keys prior to key destruction\n KEYS: Announce key type (un)registration\n KEYS: Reorganise keys Makefile\n KEYS: Move the key config into security/keys/Kconfig\n KEYS: Use the compat keyctl() syscall wrapper on Sparc64 for Sparc32 compat\n Yama: remove an unused variable\n samples/seccomp: fix dependencies on arch macros\n Yama: add additional ptrace scopes\n ...\n" }, { "commit": "bf67f3a5c456a18f2e8d062f7e88506ef2cd9837", "tree": "2a2324b2572162059307db82f9238eeb25673a77", "parents": [ "226da0dbc84ed97f448523e2a4cb91c27fa68ed9", "203dacbdca977bedaba61ad2fca75d934060a5d5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 21 19:43:57 2012 -0700" }, "message": "Merge branch \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull smp hotplug cleanups from Thomas Gleixner:\n \"This series is merily a cleanup of code copied around in arch/* and\n not changing any of the real cpu hotplug horrors yet. I wish I\u0027d had\n something more substantial for 3.5, but I underestimated the lurking\n horror...\"\n\nFix up trivial conflicts in arch/{arm,sparc,x86}/Kconfig and\narch/sparc/include/asm/thread_info_32.h\n\n* \u0027smp-hotplug-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits)\n um: Remove leftover declaration of alloc_task_struct_node()\n task_allocator: Use config switches instead of magic defines\n sparc: Use common threadinfo allocator\n score: Use common threadinfo allocator\n sh-use-common-threadinfo-allocator\n mn10300: Use common threadinfo allocator\n powerpc: Use common threadinfo allocator\n mips: Use common threadinfo allocator\n hexagon: Use common threadinfo allocator\n m32r: Use common threadinfo allocator\n frv: Use common threadinfo allocator\n cris: Use common threadinfo allocator\n x86: Use common threadinfo allocator\n c6x: Use common threadinfo allocator\n fork: Provide kmemcache based thread_info allocator\n tile: Use common threadinfo allocator\n fork: Provide weak arch_release_[task_struct|thread_info] functions\n fork: Move thread info gfp flags to header\n fork: Remove the weak insanity\n sh: Remove cpu_idle_wait()\n ...\n" }, { "commit": "55ccf3fe3f9a3441731aa79cf42a628fc4ecace9", "tree": "fc1baa880f32e9da083998bda8aefc335846fd52", "parents": [ "36be50515fe2aef61533b516fa2576a2c7fe7664" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed May 16 15:03:51 2012 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Wed May 16 15:16:26 2012 -0700" }, "message": "fork: move the real prepare_to_copy() users to arch_dup_task_struct()\n\nHistorical prepare_to_copy() is mostly a no-op, duplicated for majority of\nthe architectures and the rest following the x86 model of flushing the extended\nregister state like fpu there.\n\nRemove it and use the arch_dup_task_struct() instead.\n\nSuggested-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSuggested-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nLink: http://lkml.kernel.org/r/1336692811-30576-1-git-send-email-suresh.b.siddha@intel.com\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Koichi Yasutake \u003cyasutake.koichi@jp.panasonic.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Mark Salter \u003cmsalter@redhat.com\u003e\nCc: Aurelien Jacquiot \u003ca-jacquiot@ti.com\u003e\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e\nCc: Richard Kuo \u003crkuo@codeaurora.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Jonas Bonn \u003cjonas@southpole.se\u003e\nCc: James E.J. Bottomley \u003cjejb@parisc-linux.org\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e\nCc: Lennox Wu \u003clennox.wu@gmail.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Richard Weinberger \u003crichard@nod.at\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "5e2bf0142231194d36fdc9596b36a261ed2b9fe7", "tree": "e5b411ddefaa96b29a73706f7fe407f238632573", "parents": [ "4998a6c0edce7fae9c0a5463f6ec3fa585258ee7" ], "author": { "name": "Mike Galbraith", "email": "efault@gmx.de", "time": "Thu May 10 13:01:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 10 15:06:44 2012 -0700" }, "message": "namespaces, pid_ns: fix leakage on fork() failure\n\nFork() failure post namespace creation for a child cloned with\nCLONE_NEWPID leaks pid_namespace/mnt_cache due to proc being mounted\nduring creation, but not unmounted during cleanup. Call\npid_ns_release_proc() during cleanup.\n\nSigned-off-by: Mike Galbraith \u003cefault@gmx.de\u003e\nAcked-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nReviewed-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nCc: Louis Rilling \u003clouis.rilling@kerlabs.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f5e10287367dcffb5504d19c83e85ca041ca2596", "tree": "caa6684a16ed32809b328f858711758dc7b0c9bb", "parents": [ "66bb4cda55477efeb1be5c2cbd3785a69b088a8a" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 15:05:48 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 14:08:46 2012 +0200" }, "message": "task_allocator: Use config switches instead of magic defines\n\nReplace __HAVE_ARCH_TASK_ALLOCATOR and __HAVE_ARCH_THREAD_ALLOCATOR\nwith proper config switches.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nLink: http://lkml.kernel.org/r/20120505150142.371309416@linutronix.de\n" }, { "commit": "0d15d74a1ead10673b5b1db66d4c90552769096c", "tree": "d8eadc48f0aa1ec04172a66b2bcf78d3cb7a0ba1", "parents": [ "67ba5293f705eb1d1b98710e5ccb0f615936a6fc" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 15:05:41 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 14:08:44 2012 +0200" }, "message": "fork: Provide kmemcache based thread_info allocator\n\nSeveral architectures have their own kmemcache based thread allocator\nbecause THREAD_SIZE is smaller than PAGE_SIZE. Add it to the core code\nconditionally on THREAD_SIZE \u003c PAGE_SIZE so the private copies can go.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/20120505150141.491002124@linutronix.de\n" }, { "commit": "41101809a865dd0be1b56eff46c83fad321870b2", "tree": "be62c4da213f9ab79ac3f874f1ed8c6af0ff5b0a", "parents": [ "2889f60814e15dea644782597d897cdba943564f" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 15:05:41 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 13:55:20 2012 +0200" }, "message": "fork: Provide weak arch_release_[task_struct|thread_info] functions\n\nThese functions allow us to move most of the duplicated thread_info\nallocators to the core code.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/20120505150141.366461660@linutronix.de\n\n" }, { "commit": "2889f60814e15dea644782597d897cdba943564f", "tree": "0dab94d2c8136dc86241a7e85e5c881b03677c92", "parents": [ "6c0a9fa62feb7e9fdefa9720bcc03040c9b0b311" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 15:05:41 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 13:55:20 2012 +0200" }, "message": "fork: Move thread info gfp flags to header\n\nThese flags can be useful for extra allocations outside of the core\ncode.\n\nAdd __GFP_NOTRACK to them, so the archs which have kmemcheck do\nnot have to provide extra allocators just for that reason.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/20120505150141.428211694@linutronix.de\n" }, { "commit": "6c0a9fa62feb7e9fdefa9720bcc03040c9b0b311", "tree": "0c91586d2bfc7184ea2b13004147f3ef4753733d", "parents": [ "0a6ba092d1c8c75ae0c0617ef7f4e6f5043af311" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat May 05 15:05:40 2012 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue May 08 13:55:20 2012 +0200" }, "message": "fork: Remove the weak insanity\n\nWe error out when compiling with gcc4.1.[01] as it miscompiles\n__weak. The workaround with magic defines is not longer\nnecessary. Make it __weak again.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/r/20120505150141.306358267@linutronix.de\n\n" }, { "commit": "6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e", "tree": "021cc9f6b477146fcebe6f3be4752abfa2ba18a9", "parents": [ "682968e0c425c60f0dde37977e5beb2b12ddc4cc", "a385ec4f11bdcf81af094c03e2444ee9b7fad2e5" ], "author": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Sat Apr 14 13:18:27 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Sat Apr 14 13:19:04 2012 +0200" }, "message": "Merge branch \u0027perf/core\u0027 into perf/uprobes\n\nMerge in latest upstream (and the latest perf development tree),\nto prepare for tooling changes, and also to pick up v3.4 MM\nchanges that the uprobes code needs to take care of.\n\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "e2cfabdfd075648216f99c2c03821cf3f47c1727", "tree": "d207e062d5b0bbd421aace9f7dfdc144aab4ed18", "parents": [ "b7456536cf9466b402b540c5588d79a4177c723a" ], "author": { "name": "Will Drewry", "email": "wad@chromium.org", "time": "Thu Apr 12 16:47:57 2012 -0500" }, "committer": { "name": "James Morris", "email": "james.l.morris@oracle.com", "time": "Sat Apr 14 11:13:20 2012 +1000" }, "message": "seccomp: add system call filtering using BPF\n\n[This patch depends on luto@mit.edu\u0027s no_new_privs patch:\n https://lkml.org/lkml/2012/1/30/264\n The whole series including Andrew\u0027s patches can be found here:\n https://github.com/redpig/linux/tree/seccomp\n Complete diff here:\n https://github.com/redpig/linux/compare/1dc65fed...seccomp\n]\n\nThis patch adds support for seccomp mode 2. Mode 2 introduces the\nability for unprivileged processes to install system call filtering\npolicy expressed in terms of a Berkeley Packet Filter (BPF) program.\nThis program will be evaluated in the kernel for each system call\nthe task makes and computes a result based on data in the format\nof struct seccomp_data.\n\nA filter program may be installed by calling:\n struct sock_fprog fprog \u003d { ... };\n ...\n prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, \u0026fprog);\n\nThe return value of the filter program determines if the system call is\nallowed to proceed or denied. If the first filter program installed\nallows prctl(2) calls, then the above call may be made repeatedly\nby a task to further reduce its access to the kernel. All attached\nprograms must be evaluated before a system call will be allowed to\nproceed.\n\nFilter programs will be inherited across fork/clone and execve.\nHowever, if the task attaching the filter is unprivileged\n(!CAP_SYS_ADMIN) the no_new_privs bit will be set on the task. This\nensures that unprivileged tasks cannot attach filters that affect\nprivileged tasks (e.g., setuid binary).\n\nThere are a number of benefits to this approach. A few of which are\nas follows:\n- BPF has been exposed to userland for a long time\n- BPF optimization (and JIT\u0027ing) are well understood\n- Userland already knows its ABI: system call numbers and desired\n arguments\n- No time-of-check-time-of-use vulnerable data accesses are possible.\n- system call arguments are loaded on access only to minimize copying\n required for system call policy decisions.\n\nMode 2 support is restricted to architectures that enable\nHAVE_ARCH_SECCOMP_FILTER. In this patch, the primary dependency is on\nsyscall_get_arguments(). The full desired scope of this feature will\nadd a few minor additional requirements expressed later in this series.\nBased on discussion, SECCOMP_RET_ERRNO and SECCOMP_RET_TRACE seem to be\nthe desired additional functionality.\n\nNo architectures are enabled in this patch.\n\nSigned-off-by: Will Drewry \u003cwad@chromium.org\u003e\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nReviewed-by: Indan Zupancic \u003cindan@nul.nu\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\nReviewed-by: Kees Cook \u003ckeescook@chromium.org\u003e\n\nv18: - rebase to v3.4-rc2\n - s/chk/check/ (akpm@linux-foundation.org,jmorris@namei.org)\n - allocate with GFP_KERNEL|__GFP_NOWARN (indan@nul.nu)\n - add a comment for get_u32 regarding endianness (akpm@)\n - fix other typos, style mistakes (akpm@)\n - added acked-by\nv17: - properly guard seccomp filter needed headers (leann@ubuntu.com)\n - tighten return mask to 0x7fff0000\nv16: - no change\nv15: - add a 4 instr penalty when counting a path to account for seccomp_filter\n size (indan@nul.nu)\n - drop the max insns to 256KB (indan@nul.nu)\n - return ENOMEM if the max insns limit has been hit (indan@nul.nu)\n - move IP checks after args (indan@nul.nu)\n - drop !user_filter check (indan@nul.nu)\n - only allow explicit bpf codes (indan@nul.nu)\n - exit_code -\u003e exit_sig\nv14: - put/get_seccomp_filter takes struct task_struct\n (indan@nul.nu,keescook@chromium.org)\n - adds seccomp_chk_filter and drops general bpf_run/chk_filter user\n - add seccomp_bpf_load for use by net/core/filter.c\n - lower max per-process/per-hierarchy: 1MB\n - moved nnp/capability check prior to allocation\n (all of the above: indan@nul.nu)\nv13: - rebase on to 88ebdda6159ffc15699f204c33feb3e431bf9bdc\nv12: - added a maximum instruction count per path (indan@nul.nu,oleg@redhat.com)\n - removed copy_seccomp (keescook@chromium.org,indan@nul.nu)\n - reworded the prctl_set_seccomp comment (indan@nul.nu)\nv11: - reorder struct seccomp_data to allow future args expansion (hpa@zytor.com)\n - style clean up, @compat dropped, compat_sock_fprog32 (indan@nul.nu)\n - do_exit(SIGSYS) (keescook@chromium.org, luto@mit.edu)\n - pare down Kconfig doc reference.\n - extra comment clean up\nv10: - seccomp_data has changed again to be more aesthetically pleasing\n (hpa@zytor.com)\n - calling convention is noted in a new u32 field using syscall_get_arch.\n This allows for cross-calling convention tasks to use seccomp filters.\n (hpa@zytor.com)\n - lots of clean up (thanks, Indan!)\n v9: - n/a\n v8: - use bpf_chk_filter, bpf_run_filter. update load_fns\n - Lots of fixes courtesy of indan@nul.nu:\n -- fix up load behavior, compat fixups, and merge alloc code,\n -- renamed pc and dropped __packed, use bool compat.\n -- Added a hidden CONFIG_SECCOMP_FILTER to synthesize non-arch\n dependencies\n v7: (massive overhaul thanks to Indan, others)\n - added CONFIG_HAVE_ARCH_SECCOMP_FILTER\n - merged into seccomp.c\n - minimal seccomp_filter.h\n - no config option (part of seccomp)\n - no new prctl\n - doesn\u0027t break seccomp on systems without asm/syscall.h\n (works but arg access always fails)\n - dropped seccomp_init_task, extra free functions, ...\n - dropped the no-asm/syscall.h code paths\n - merges with network sk_run_filter and sk_chk_filter\n v6: - fix memory leak on attach compat check failure\n - require no_new_privs || CAP_SYS_ADMIN prior to filter\n installation. (luto@mit.edu)\n - s/seccomp_struct_/seccomp_/ for macros/functions (amwang@redhat.com)\n - cleaned up Kconfig (amwang@redhat.com)\n - on block, note if the call was compat (so the # means something)\n v5: - uses syscall_get_arguments\n (indan@nul.nu,oleg@redhat.com, mcgrathr@chromium.org)\n - uses union-based arg storage with hi/lo struct to\n handle endianness. Compromises between the two alternate\n proposals to minimize extra arg shuffling and account for\n endianness assuming userspace uses offsetof().\n (mcgrathr@chromium.org, indan@nul.nu)\n - update Kconfig description\n - add include/seccomp_filter.h and add its installation\n - (naive) on-demand syscall argument loading\n - drop seccomp_t (eparis@redhat.com)\n v4: - adjusted prctl to make room for PR_[SG]ET_NO_NEW_PRIVS\n - now uses current-\u003eno_new_privs\n (luto@mit.edu,torvalds@linux-foundation.com)\n - assign names to seccomp modes (rdunlap@xenotime.net)\n - fix style issues (rdunlap@xenotime.net)\n - reworded Kconfig entry (rdunlap@xenotime.net)\n v3: - macros to inline (oleg@redhat.com)\n - init_task behavior fixed (oleg@redhat.com)\n - drop creator entry and extra NULL check (oleg@redhat.com)\n - alloc returns -EINVAL on bad sizing (serge.hallyn@canonical.com)\n - adds tentative use of \"always_unprivileged\" as per\n torvalds@linux-foundation.org and luto@mit.edu\n v2: - (patch 2 only)\nSigned-off-by: James Morris \u003cjames.l.morris@oracle.com\u003e\n" }, { "commit": "959d851caa48829eb85cb85aa949fd6b4c5d5bc6", "tree": "3ba9c94ec346275fb44c4f0d1cd2537cdff8d811", "parents": [ "a5567932fc926739e29e98487128080f40c61710", "48ddbe194623ae089cc0576e60363f2d2e85662a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 12:30:01 2012 -0700" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Apr 01 12:55:00 2012 -0700" }, "message": "Merge branch \u0027for-3.5\u0027 of ../cgroup into block/for-3.5/core-merged\n\ncgroup/for-3.5 contains the following changes which blk-cgroup needs\nto proceed with the on-going cleanup.\n\n* Dynamic addition and removal of cftypes to make config/stat file\n handling modular for policies.\n\n* cgroup removal update to not wait for css references to drain to fix\n blkcg removal hang caused by cfq caching cfqgs.\n\nPull in cgroup/for-3.5 into block/for-3.5/core. This causes the\nfollowing conflicts in block/blk-cgroup.c.\n\n* 761b3ef50e \"cgroup: remove cgroup_subsys argument from callbacks\"\n conflicts with blkiocg_pre_destroy() addition and blkiocg_attach()\n removal. Resolved by removing @subsys from all subsys methods.\n\n* 676f7c8f84 \"cgroup: relocate cftype and cgroup_subsys definitions in\n controllers\" conflicts with -\u003epre_destroy() and -\u003eattach() updates\n and removal of modular config. Resolved by dropping forward\n declarations of the methods and applying updates to the relocated\n blkio_subsys.\n\n* 4baf6e3325 \"cgroup: convert all non-memcg controllers to the new\n cftype interface\" builds upon the previous item. Resolved by adding\n -\u003ebase_cftypes to the relocated blkio_subsys.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "682968e0c425c60f0dde37977e5beb2b12ddc4cc", "tree": "875eb289aa0e08189b2cf7dc99ee522f91e647e7", "parents": [ "d4b3b6384f98f8692ad0209891ccdbc7e78bbefe" ], "author": { "name": "Srikar Dronamraju", "email": "srikar@linux.vnet.ibm.com", "time": "Fri Mar 30 23:56:46 2012 +0530" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Sat Mar 31 11:50:02 2012 +0200" }, "message": "uprobes/core: Optimize probe hits with the help of a counter\n\nMaintain a per-mm counter: number of uprobes that are inserted\non this process address space.\n\nThis counter can be used at probe hit time to determine if we\nneed a lookup in the uprobes rbtree. Everytime a probe gets\ninserted successfully, the probe count is incremented and\neverytime a probe gets removed, the probe count is decremented.\n\nThe new uprobe_munmap hook ensures the count is correct on a\nunmap or remap of a region. We expect that once a\nuprobe_munmap() is called, the vma goes away. So\nuprobe_unregister() finding a probe to unregister would either\nmean unmap event hasnt occurred yet or a mmap event on the same\nexecutable file occured after a unmap event.\n\nAdditionally, uprobe_mmap hook now also gets called:\n\n a. on every executable vma that is COWed at fork.\n b. a vma of interest is newly mapped; breakpoint insertion also\n happens at the required address.\n\nOn process creation, make sure the probes count in the child is\nset correctly.\n\nSpecial cases that are taken care include:\n\n a. mremap\n b. VM_DONTCOPY vmas on fork()\n c. insertion/removal races in the parent during fork().\n\nSigned-off-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: Jim Keniston \u003cjkenisto@linux.vnet.ibm.com\u003e\nCc: Linux-mm \u003clinux-mm@kvack.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@infradead.org\u003e\nCc: Masami Hiramatsu \u003cmasami.hiramatsu.pt@hitachi.com\u003e\nCc: Anton Arapov \u003canton@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nLink: http://lkml.kernel.org/r/20120330182646.10018.85805.sendpatchset@srdronam.in.ibm.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "d4b3b6384f98f8692ad0209891ccdbc7e78bbefe", "tree": "29c703af306a3b0e42d7ee3bdfce58db78d702b7", "parents": [ "0326f5a94ddea33fa331b2519f4172f4fb387baa" ], "author": { "name": "Srikar Dronamraju", "email": "srikar@linux.vnet.ibm.com", "time": "Fri Mar 30 23:56:31 2012 +0530" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Sat Mar 31 11:50:01 2012 +0200" }, "message": "uprobes/core: Allocate XOL slots for uprobes use\n\nUprobes executes the original instruction at a probed location\nout of line. For this, we allocate a page (per mm) upon the\nfirst uprobe hit, in the process user address space, divide it\ninto slots that are used to store the actual instructions to be\nsinglestepped. These slots are known as xol (execution out of\nline) slots.\n\nCare is taken to ensure that the allocation is in an unmapped\narea as close to the top of the user address space as possible,\nwith appropriate permission settings to keep selinux like\nframeworks happy.\n\nUpon a uprobe hit, a free slot is acquired, and is released\nafter the singlestep completes.\n\nLots of improvements courtesy suggestions/inputs from Peter and\nOleg.\n\n[ Folded a fix for build issue on powerpc fixed and reported by\n Stephen Rothwell. ]\n\nSigned-off-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: Jim Keniston \u003cjkenisto@linux.vnet.ibm.com\u003e\nCc: Linux-mm \u003clinux-mm@kvack.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@infradead.org\u003e\nCc: Masami Hiramatsu \u003cmasami.hiramatsu.pt@hitachi.com\u003e\nCc: Anton Arapov \u003canton@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nLink: http://lkml.kernel.org/r/20120330182631.10018.48175.sendpatchset@srdronam.in.ibm.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "ebec18a6d3aa1e7d84aab16225e87fd25170ec2b", "tree": "fd329dcd5173c252fc7aed64cab9c2a51575dcec", "parents": [ "953326cb60c1dff1bd3458d6468d16d75f2bcd61" ], "author": { "name": "Lennart Poettering", "email": "lennart@poettering.net", "time": "Fri Mar 23 15:01:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:32 2012 -0700" }, "message": "prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision\n\nUserspace service managers/supervisors need to track their started\nservices. Many services daemonize by double-forking and get implicitly\nre-parented to PID 1. The service manager will no longer be able to\nreceive the SIGCHLD signals for them, and is no longer in charge of\nreaping the children with wait(). All information about the children is\nlost at the moment PID 1 cleans up the re-parented processes.\n\nWith this prctl, a service manager process can mark itself as a sort of\n\u0027sub-init\u0027, able to stay as the parent for all orphaned processes\ncreated by the started services. All SIGCHLD signals will be delivered\nto the service manager.\n\nReceiving SIGCHLD and doing wait() is in cases of a service-manager much\npreferred over any possible asynchronous notification about specific\nPIDs, because the service manager has full access to the child process\ndata in /proc and the PID can not be re-used until the wait(), the\nservice-manager itself is in charge of, has happened.\n\nAs a side effect, the relevant parent PID information does not get lost\nby a double-fork, which results in a more elaborate process tree and\n\u0027ps\u0027 output:\n\nbefore:\n # ps afx\n 253 ? Ss 0:00 /bin/dbus-daemon --system --nofork\n 294 ? Sl 0:00 /usr/libexec/polkit-1/polkitd\n 328 ? S 0:00 /usr/sbin/modem-manager\n 608 ? Sl 0:00 /usr/libexec/colord\n 658 ? Sl 0:00 /usr/libexec/upowerd\n 819 ? Sl 0:00 /usr/libexec/imsettings-daemon\n 916 ? Sl 0:00 /usr/libexec/udisks-daemon\n 917 ? S 0:00 \\_ udisks-daemon: not polling any devices\n\nafter:\n # ps afx\n 294 ? Ss 0:00 /bin/dbus-daemon --system --nofork\n 426 ? Sl 0:00 \\_ /usr/libexec/polkit-1/polkitd\n 449 ? S 0:00 \\_ /usr/sbin/modem-manager\n 635 ? Sl 0:00 \\_ /usr/libexec/colord\n 705 ? Sl 0:00 \\_ /usr/libexec/upowerd\n 959 ? Sl 0:00 \\_ /usr/libexec/udisks-daemon\n 960 ? S 0:00 | \\_ udisks-daemon: not polling any devices\n 977 ? Sl 0:00 \\_ /usr/libexec/packagekitd\n\nThis prctl is orthogonal to PID namespaces. PID namespaces are isolated\nfrom each other, while a service management process usually requires the\nservices to live in the same namespace, to be able to talk to each\nother.\n\nUsers of this will be the systemd per-user instance, which provides\ninit-like functionality for the user\u0027s login session and D-Bus, which\nactivates bus services on-demand. Both need init-like capabilities to\nbe able to properly keep track of the services they start.\n\nMany thanks to Oleg for several rounds of review and insights.\n\n[akpm@linux-foundation.org: fix comment layout and spelling]\n[akpm@linux-foundation.org: add lengthy code comment from Oleg]\nReviewed-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Lennart Poettering \u003clennart@poettering.net\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nAcked-by: Valdis Kletnieks \u003cValdis.Kletnieks@vt.edu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "95211279c5ad00a317c98221d7e4365e02f20836", "tree": "2ddc8625378d2915b8c96392f3cf6663b705ed55", "parents": [ "5375871d432ae9fc581014ac117b96aaee3cd0c7", "12724850e8064f64b6223d26d78c0597c742c65a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:04:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:04:48 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge first batch of patches from Andrew Morton:\n \"A few misc things and all the MM queue\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (92 commits)\n memcg: avoid THP split in task migration\n thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE\n memcg: clean up existing move charge code\n mm/memcontrol.c: remove unnecessary \u0027break\u0027 in mem_cgroup_read()\n mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event()\n mm/memcontrol.c: s/stealed/stolen/\n memcg: fix performance of mem_cgroup_begin_update_page_stat()\n memcg: remove PCG_FILE_MAPPED\n memcg: use new logic for page stat accounting\n memcg: remove PCG_MOVE_LOCK flag from page_cgroup\n memcg: simplify move_account() check\n memcg: remove EXPORT_SYMBOL(mem_cgroup_update_page_stat)\n memcg: kill dead prev_priority stubs\n memcg: remove PCG_CACHE page_cgroup flag\n memcg: let css_get_next() rely upon rcu_read_lock()\n cgroup: revert ss_id_lock to spinlock\n idr: make idr_get_next() good for rcu_read_lock()\n memcg: remove unnecessary thp check in page stat accounting\n memcg: remove redundant returns\n memcg: enum lru_list lru\n ...\n" }, { "commit": "cc9a6c8776615f9c194ccf0b63a0aa5628235545", "tree": "0cbbf118e86541f8eb2fc7b717a0e08eaced986d", "parents": [ "e845e199362cc5712ba0e7eedc14eed70e144258" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Wed Mar 21 16:34:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "cpuset: mm: reduce large amounts of memory barrier related damage v3\n\nCommit c0ff7453bb5c (\"cpuset,mm: fix no node to alloc memory when\nchanging cpuset\u0027s mems\") wins a super prize for the largest number of\nmemory barriers entered into fast paths for one commit.\n\n[get|put]_mems_allowed is incredibly heavy with pairs of full memory\nbarriers inserted into a number of hot paths. This was detected while\ninvestigating at large page allocator slowdown introduced some time\nafter 2.6.32. The largest portion of this overhead was shown by\noprofile to be at an mfence introduced by this commit into the page\nallocator hot path.\n\nFor extra style points, the commit introduced the use of yield() in an\nimplementation of what looks like a spinning mutex.\n\nThis patch replaces the full memory barriers on both read and write\nsides with a sequence counter with just read barriers on the fast path\nside. This is much cheaper on some architectures, including x86. The\nmain bulk of the patch is the retry logic if the nodemask changes in a\nmanner that can cause a false failure.\n\nWhile updating the nodemask, a check is made to see if a false failure\nis a risk. If it is, the sequence number gets bumped and parallel\nallocators will briefly stall while the nodemask update takes place.\n\nIn a page fault test microbenchmark, oprofile samples from\n__alloc_pages_nodemask went from 4.53% of all samples to 1.15%. The\nactual results were\n\n 3.3.0-rc3 3.3.0-rc3\n rc3-vanilla nobarrier-v2r1\n Clients 1 UserTime 0.07 ( 0.00%) 0.08 (-14.19%)\n Clients 2 UserTime 0.07 ( 0.00%) 0.07 ( 2.72%)\n Clients 4 UserTime 0.08 ( 0.00%) 0.07 ( 3.29%)\n Clients 1 SysTime 0.70 ( 0.00%) 0.65 ( 6.65%)\n Clients 2 SysTime 0.85 ( 0.00%) 0.82 ( 3.65%)\n Clients 4 SysTime 1.41 ( 0.00%) 1.41 ( 0.32%)\n Clients 1 WallTime 0.77 ( 0.00%) 0.74 ( 4.19%)\n Clients 2 WallTime 0.47 ( 0.00%) 0.45 ( 3.73%)\n Clients 4 WallTime 0.38 ( 0.00%) 0.37 ( 1.58%)\n Clients 1 Flt/sec/cpu 497620.28 ( 0.00%) 520294.53 ( 4.56%)\n Clients 2 Flt/sec/cpu 414639.05 ( 0.00%) 429882.01 ( 3.68%)\n Clients 4 Flt/sec/cpu 257959.16 ( 0.00%) 258761.48 ( 0.31%)\n Clients 1 Flt/sec 495161.39 ( 0.00%) 517292.87 ( 4.47%)\n Clients 2 Flt/sec 820325.95 ( 0.00%) 850289.77 ( 3.65%)\n Clients 4 Flt/sec 1020068.93 ( 0.00%) 1022674.06 ( 0.26%)\n MMTests Statistics: duration\n Sys Time Running Test (seconds) 135.68 132.17\n User+Sys Time Running Test (seconds) 164.2 160.13\n Total Elapsed Time (seconds) 123.46 120.87\n\nThe overall improvement is small but the System CPU time is much\nimproved and roughly in correlation to what oprofile reported (these\nperformance figures are without profiling so skew is expected). The\nactual number of page faults is noticeably improved.\n\nFor benchmarks like kernel builds, the overall benefit is marginal but\nthe system CPU time is slightly reduced.\n\nTo test the actual bug the commit fixed I opened two terminals. The\nfirst ran within a cpuset and continually ran a small program that\nfaulted 100M of anonymous data. In a second window, the nodemask of the\ncpuset was continually randomised in a loop.\n\nWithout the commit, the program would fail every so often (usually\nwithin 10 seconds) and obviously with the commit everything worked fine.\nWith this patch applied, it also worked fine so the fix should be\nfunctionally equivalent.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c3f0327f8e9d7a503f0d64573c311eddd61f197d", "tree": "ebc59003d3bef08dd41d073eced2b53970e13662", "parents": [ "dc3f21eadeea6d9898271ff32d35d5e00c6872ea" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Wed Mar 21 16:33:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:55 2012 -0700" }, "message": "mm: add rss counters consistency check\n\nWarn about non-zero rss counters at final mmdrop.\n\nThis check will prevent reoccurences of bugs such as that fixed in \"mm:\nfix rss count leakage during migration\".\n\nI didn\u0027t hide this check under CONFIG_VM_DEBUG because it rather small and\nrss counters cover whole page-table management, so this is a good\ninvariant.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3556485f1595e3964ba539e39ea682acbb835cee", "tree": "7f5ee254f425b1427ac0059b5f347a307f8538a1", "parents": [ "b8716614a7cc2fc15ea2a518edd04755fb08d922", "09f61cdbb32a9d812c618d3922db533542736bb0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates for 3.4 from James Morris:\n \"The main addition here is the new Yama security module from Kees Cook,\n which was discussed at the Linux Security Summit last year. Its\n purpose is to collect miscellaneous DAC security enhancements in one\n place. This also marks a departure in policy for LSM modules, which\n were previously limited to being standalone access control systems.\n Chromium OS is using Yama, and I believe there are plans for Ubuntu,\n at least.\n\n This patchset also includes maintenance updates for AppArmor, TOMOYO\n and others.\"\n\nFix trivial conflict in \u003cnet/sock.h\u003e due to the jumo_label-\u003estatic_key\nrename.\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits)\n AppArmor: Fix location of const qualifier on generated string tables\n TOMOYO: Return error if fails to delete a domain\n AppArmor: add const qualifiers to string arrays\n AppArmor: Add ability to load extended policy\n TOMOYO: Return appropriate value to poll().\n AppArmor: Move path failure information into aa_get_name and rename\n AppArmor: Update dfa matching routines.\n AppArmor: Minor cleanup of d_namespace_path to consolidate error handling\n AppArmor: Retrieve the dentry_path for error reporting when path lookup fails\n AppArmor: Add const qualifiers to generated string tables\n AppArmor: Fix oops in policy unpack auditing\n AppArmor: Fix error returned when a path lookup is disconnected\n KEYS: testing wrong bit for KEY_FLAG_REVOKED\n TOMOYO: Fix mount flags checking order.\n security: fix ima kconfig warning\n AppArmor: Fix the error case for chroot relative path name lookup\n AppArmor: fix mapping of META_READ to audit and quiet flags\n AppArmor: Fix underflow in xindex calculation\n AppArmor: Fix dropping of allowed operations that are force audited\n AppArmor: Add mising end of structure test to caps unpacking\n ...\n" }, { "commit": "5f8aadd8b9966d71a77bba52b9d499cc2f38269f", "tree": "229735d79edf0c4cc82ac00ba1abaee63040ff6e", "parents": [ "ed378a52dabf77b406b447fd3238f83ea24b71fa" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Mar 14 19:55:38 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 14:16:50 2012 -0700" }, "message": "CLONE_PARENT shouldn\u0027t allow to set -\u003eexit_signal\n\nThe child must not control its -\u003eexit_signal, it is the parent who\ndecides which signal the child should use for notification.\n\nThis means that CLONE_PARENT should not use \"clone_flags \u0026 CSIGNAL\",\nthe forking task is the sibling of the new process and their parent\ndoesn\u0027t control exit_signal in this case.\n\nThis patch uses -\u003eexit_signal of the forking process, but perhaps\nwe should simply use SIGCHLD.\n\nWe read group_leader-\u003eexit_signal lockless, this can race with the\nORIGINAL_SIGNAL -\u003e SIGCHLD transition, but this is fine.\n\nPotentially this change allows to kill self_exec_id/parent_exec_id.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0326f5a94ddea33fa331b2519f4172f4fb387baa", "tree": "5485c637754a126c90852e5285842e8462d2826a", "parents": [ "ef15eda98217f5183f457e7a2de8b79555ef908b" ], "author": { "name": "Srikar Dronamraju", "email": "srikar@linux.vnet.ibm.com", "time": "Tue Mar 13 23:30:11 2012 +0530" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Mar 14 07:41:36 2012 +0100" }, "message": "uprobes/core: Handle breakpoint and singlestep exceptions\n\nUprobes uses exception notifiers to get to know if a thread hit\na breakpoint or a singlestep exception.\n\nWhen a thread hits a uprobe or is singlestepping post a uprobe\nhit, the uprobe exception notifier sets its TIF_UPROBE bit,\nwhich will then be checked on its return to userspace path\n(do_notify_resume() -\u003euprobe_notify_resume()), where the\nconsumers handlers are run (in task context) based on the\ndefined filters.\n\nUprobe hits are thread specific and hence we need to maintain\ninformation about if a task hit a uprobe, what uprobe was hit,\nthe slot where the original instruction was copied for xol so\nthat it can be singlestepped with appropriate fixups.\n\nIn some cases, special care is needed for instructions that are\nexecuted out of line (xol). These are architecture specific\nartefacts, such as handling RIP relative instructions on x86_64.\n\nSince the instruction at which the uprobe was inserted is\nexecuted out of line, architecture specific fixups are added so\nthat the thread continues normal execution in the presence of a\nuprobe.\n\nPostpone the signals until we execute the probed insn.\npost_xol() path does a recalc_sigpending() before return to\nuser-mode, this ensures the signal can\u0027t be lost.\n\nUprobes relies on DIE_DEBUG notification to notify if a\nsinglestep is complete.\n\nAdds x86 specific uprobe exception notifiers and appropriate\nhooks needed to determine a uprobe hit and subsequent post\nprocessing.\n\nAdd requisite x86 fixups for xol for uprobes. Specific cases\nneeding fixups include relative jumps (x86_64), calls, etc.\n\nWhere possible, we check and skip singlestepping the\nbreakpointed instructions. For now we skip single byte as well\nas few multibyte nop instructions. However this can be extended\nto other instructions too.\n\nCredits to Oleg Nesterov for suggestions/patches related to\nsignal, breakpoint, singlestep handling code.\n\nSigned-off-by: Srikar Dronamraju \u003csrikar@linux.vnet.ibm.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: Jim Keniston \u003cjkenisto@linux.vnet.ibm.com\u003e\nCc: Linux-mm \u003clinux-mm@kvack.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@infradead.org\u003e\nCc: Masami Hiramatsu \u003cmasami.hiramatsu.pt@hitachi.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nLink: http://lkml.kernel.org/r/20120313180011.29771.89027.sendpatchset@srdronam.in.ibm.com\n[ Performed various cleanliness edits ]\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3d48749d93a3dce732dd30a14002ab90ec4355f3", "tree": "50ce414ec87e590493476cf644092439c5f337fd", "parents": [ "24acfc34fba0b4f62ef9d5c2616eb0faa802b606" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Mar 05 13:15:25 2012 -0800" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Mar 06 21:27:24 2012 +0100" }, "message": "block: ioc_task_link() can\u0027t fail\n\nioc_task_link() is used to share %current\u0027s ioc on clone. If\n%current-\u003eio_context is set, %current is guaranteed to have refcount\non the ioc and, thus, ioc_task_link() can\u0027t fail.\n\nReplace error checking in ioc_task_link() with WARN_ON_ONCE() and make\nit just increment refcount and nr_tasks.\n\n-v2: Description typo fix (Vivek).\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "6e27f63edbd7ab893258e16500171dd1270a1369", "tree": "9c61b7c0dda37052e2285e90f914f8af5ed86f67", "parents": [ "57b59c4a1400fa6c34764eab2e35a8762dc05a09" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Mar 05 14:59:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 05 15:49:42 2012 -0800" }, "message": "vfork: kill PF_STARTING\n\nPreviously it was (ab)used by utrace. Then it was wrongly used by the\nscheduler code.\n\nCurrently it is not used, kill it before it finds the new erroneous user.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "57b59c4a1400fa6c34764eab2e35a8762dc05a09", "tree": "e50e6a6f9f7fcd897856e5cdaca3d3caa18377d6", "parents": [ "d68b46fe16ad59b3a5f51ec73daaa5dc06753798" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Mar 05 14:59:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 05 15:49:42 2012 -0800" }, "message": "coredump_wait: don\u0027t call complete_vfork_done()\n\nNow that CLONE_VFORK is killable, coredump_wait() no longer needs\ncomplete_vfork_done(). zap_threads() should find and kill all tasks with\nthe same -\u003emm, this includes our parent if -\u003evfork_done is set.\n\nmm_release() becomes the only caller, unexport complete_vfork_done().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d68b46fe16ad59b3a5f51ec73daaa5dc06753798", "tree": "4bae9ddc5f5bed853d1f0936d05c30e4f7ca924d", "parents": [ "c415c3b47ea2754659d915cca387a20999044163" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Mar 05 14:59:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 05 15:49:42 2012 -0800" }, "message": "vfork: make it killable\n\nMake vfork() killable.\n\nChange do_fork(CLONE_VFORK) to do wait_for_completion_killable(). If it\nfails we do not return to the user-mode and never touch the memory shared\nwith our child.\n\nHowever, in this case we should clear child-\u003evfork_done before return, we\nuse task_lock() in do_fork()-\u003ewait_for_vfork_done() and\ncomplete_vfork_done() to serialize with each other.\n\nNote: now that we use task_lock() we don\u0027t really need completion, we\ncould turn task-\u003evfork_done into \"task_struct *wake_up_me\" but this needs\nsome complications.\n\nNOTE: this and the next patches do not affect in-kernel users of\nCLONE_VFORK, kernel threads run with all signals ignored including\nSIGKILL/SIGSTOP.\n\nHowever this is obviously the user-visible change. Not only a fatal\nsignal can kill the vforking parent, a sub-thread can do execve or\nexit_group() and kill the thread sleeping in vfork().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c415c3b47ea2754659d915cca387a20999044163", "tree": "c2cb1134f139702e06ade8aecbeff70be7ea727c", "parents": [ "880641bb9da2473e9ecf6c708d993b29928c1b3c" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Mon Mar 05 14:59:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 05 15:49:42 2012 -0800" }, "message": "vfork: introduce complete_vfork_done()\n\nNo functional changes.\n\nMove the clear-and-complete-vfork_done code into the new trivial helper,\ncomplete_vfork_done().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d80e731ecab420ddcb79ee9d0ac427acbc187b4b", "tree": "e96a660b75b5bee8ae2c315878ec917b9c0da446", "parents": [ "855a85f704026d5fe7de94fb1b765fe03404507f" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri Feb 24 20:07:11 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 24 11:42:50 2012 -0800" }, "message": "epoll: introduce POLLFREE to flush -\u003esignalfd_wqh before kfree()\n\nThis patch is intentionally incomplete to simplify the review.\nIt ignores ep_unregister_pollwait() which plays with the same wqh.\nSee the next change.\n\nepoll assumes that the EPOLL_CTL_ADD\u0027ed file controls everything\nf_op-\u003epoll() needs. In particular it assumes that the wait queue\ncan\u0027t go away until eventpoll_release(). This is not true in case\nof signalfd, the task which does EPOLL_CTL_ADD uses its -\u003esighand\nwhich is not connected to the file.\n\nThis patch adds the special event, POLLFREE, currently only for\nepoll. It expects that init_poll_funcptr()\u0027ed hook should do the\nnecessary cleanup. Perhaps it should be defined as EPOLLFREE in\neventpoll.\n\n__cleanup_sighand() is changed to do wake_up_poll(POLLFREE) if\n-\u003esignalfd_wqh is not empty, we add the new signalfd_cleanup()\nhelper.\n\nep_poll_callback(POLLFREE) simply does list_del_init(task_list).\nThis make this poll entry inconsistent, but we don\u0027t care. If you\nshare epoll fd which contains our sigfd with another process you\nshould blame yourself. signalfd is \"really special\". I simply do\nnot know how we can define the \"right\" semantics if it used with\nepoll.\n\nThe main problem is, epoll calls signalfd_poll() once to establish\nthe connection with the wait queue, after that signalfd_poll(NULL)\nreturns the different/inconsistent results depending on who does\nEPOLL_CTL_MOD/signalfd_read/etc. IOW: apart from sigmask, signalfd\nhas nothing to do with the file, it works with the current thread.\n\nIn short: this patch is the hack which tries to fix the symptoms.\nIt also assumes that nobody can take tasklist_lock under epoll\nlocks, this seems to be true.\n\nNote:\n\n\t- we do not have wake_up_all_poll() but wake_up_poll()\n\t is fine, poll/epoll doesn\u0027t use WQ_FLAG_EXCLUSIVE.\n\n\t- signalfd_cleanup() uses POLLHUP along with POLLFREE,\n\t we need a couple of simple changes in eventpoll.c to\n\t make sure it can\u0027t be \"lost\".\n\nReported-by: Maxime Bizon \u003cmbizon@freebox.fr\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "191c542442fdf53cc3c496c00be13367fd9cd42d", "tree": "4aef9e33a1d99e6530b704243efbe373bb314d61", "parents": [ "bbd36568594d091e682a1975ef4ee41d808de0bc" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Feb 13 03:58:52 2012 +0000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Feb 14 10:45:39 2012 +1100" }, "message": "mm: collapse security_vm_enough_memory() variants into a single function\n\nCollapse security_vm_enough_memory() variants into a single function.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "3ec1e88b33a3bdd852ce8e014052acec7a9da8b5", "tree": "4270f8f0de4e28f090cba6d6e4047aae939d6463", "parents": [ "8df54d622a120058ee8bec38743c9b8f091c8e58", "d8c66c5d59247e25a69428aced0b79d33b9c66d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 11 10:07:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 11 10:07:11 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\nSays Jens:\n\n \"Time to push off some of the pending items. I really wanted to wait\n until we had the regression nailed, but alas it\u0027s not quite there yet.\n But I\u0027m very confident that it\u0027s \"just\" a missing expire on exit, so\n fix from Tejun should be fairly trivial. I\u0027m headed out for a week on\n the slopes.\n\n - Killing the barrier part of mtip32xx. It doesn\u0027t really support\n barriers, and it doesn\u0027t need them (writes are fully ordered).\n\n - A few fixes from Dan Carpenter, preventing overflows of integer\n multiplication.\n\n - A fixup for loop, fixing a previous commit that didn\u0027t quite solve\n the partial read problem from Dave Young.\n\n - A bio integer overflow fix from Kent Overstreet.\n\n - Improvement/fix of the door \"keep locked\" part of the cdrom shared\n code from Paolo Benzini.\n\n - A few cfq fixes from Shaohua Li.\n\n - A fix for bsg sysfs warning when removing a file it did not create\n from Stanislaw Gruszka.\n\n - Two fixes for floppy from Vivek, preventing a crash.\n\n - A few block core fixes from Tejun. One killing the over-optimized\n ioc exit path, cleaning that up nicely. Two others fixing an oops\n on elevator switch, due to calling into the scheduler merge check\n code without holding the queue lock.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: fix lockdep warning on io_context release put_io_context()\n relay: prevent integer overflow in relay_open()\n loop: zero fill bio instead of return -EIO for partial read\n bio: don\u0027t overflow in bio_get_nr_vecs()\n floppy: Fix a crash during rmmod\n floppy: Cleanup disk-\u003equeue before caling put_disk() if add_disk() was never called\n cdrom: move shared static to cdrom_device_info\n bsg: fix sysfs link remove warning\n block: don\u0027t call elevator callbacks for plug merges\n block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions\n mtip32xx: removed the irrelevant argument of mtip_hw_submit_io() and the unused member of struct driver_data\n block: strip out locking optimization in put_io_context()\n cdrom: use copy_to_user() without the underscores\n block: fix ioc locking warning\n block: fix NULL icq_cache reference\n block,cfq: change code order\n" }, { "commit": "1a2a4d06e1e95260c470ebe3a945f61bbe8c1fd8", "tree": "7167d158749a7acf2ce8bbe1ecd25234b654e813", "parents": [ "9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c" ], "author": { "name": "Kees Cook", "email": "keescook@chromium.org", "time": "Wed Dec 21 12:17:03 2011 -0800" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Feb 10 09:14:51 2012 +1100" }, "message": "security: create task_free security callback\n\nThe current LSM interface to cred_free is not sufficient for allowing\nan LSM to track the life and death of a task. This patch adds the\ntask_free hook so that an LSM can clean up resources on task death.\n\nSigned-off-by: Kees Cook \u003ckeescook@chromium.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "11a3122f6cf2d988a77eb8883d0fc49cd013a6d5", "tree": "ded8ea8a2982754ff0c58448a7ed2e59487104cb", "parents": [ "822bfa51ce44f2c63c300fdb76dc99c4d5a5ca9f" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Feb 07 07:51:30 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Tue Feb 07 07:51:30 2012 +0100" }, "message": "block: strip out locking optimization in put_io_context()\n\nput_io_context() performed a complex trylock dancing to avoid\ndeferring ioc release to workqueue. It was also broken on UP because\ntrylock was always assumed to succeed which resulted in unbalanced\npreemption count.\n\nWhile there are ways to fix the UP breakage, even the most\npathological microbench (forced ioc allocation and tight fork/exit\nloop) fails to show any appreciable performance benefit of the\noptimization. Strip it out. If there turns out to be workloads which\nare affected by this change, simpler optimization from the discussion\nthread can be applied later.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nLKML-Reference: \u003c1328514611.21268.66.camel@sli10-conroe\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "8cdb878dcb359fd1137e9abdee9322f5e9bcfdf8", "tree": "146afc01f3c1d7cbc944328484d077032bc53bfd", "parents": [ "24b36da33c64368775f4ef9386d44dce1d2bc8cf" ], "author": { "name": "Christopher Yeoh", "email": "cyeoh@au1.ibm.com", "time": "Thu Feb 02 11:34:09 2012 +1030" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 12:55:17 2012 -0800" }, "message": "Fix race in process_vm_rw_core\n\nThis fixes the race in process_vm_core found by Oleg (see\n\n http://article.gmane.org/gmane.linux.kernel/1235667/\n\nfor details).\n\nThis has been updated since I last sent it as the creation of the new\nmm_access() function did almost exactly the same thing as parts of the\nprevious version of this patch did.\n\nIn order to use mm_access() even when /proc isn\u0027t enabled, we move it to\nkernel/fork.c where other related process mm access functions already\nare.\n\nSigned-off-by: Chris Yeoh \u003cyeohc@au1.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f429ee3b808118591d1f3cdf3c0d0793911a5677", "tree": "96d848f5f677d96758ecd2aee5eb6931b75bf218", "parents": [ "22b4eb5e3174efb49791c62823d0cccc35394c36", "c158a35c8a681cf68d36f22f058f9f5466386c71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:06:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:41:31 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)\n audit: no leading space in audit_log_d_path prefix\n audit: treat s_id as an untrusted string\n audit: fix signedness bug in audit_log_execve_info()\n audit: comparison on interprocess fields\n audit: implement all object interfield comparisons\n audit: allow interfield comparison between gid and ogid\n audit: complex interfield comparison helper\n audit: allow interfield comparison in audit rules\n Kernel: Audit Support For The ARM Platform\n audit: do not call audit_getname on error\n audit: only allow tasks to set their loginuid if it is -1\n audit: remove task argument to audit_set_loginuid\n audit: allow audit matching on inode gid\n audit: allow matching on obj_uid\n audit: remove audit_finish_fork as it can\u0027t be called\n audit: reject entry,always rules\n audit: inline audit_free to simplify the look of generic code\n audit: drop audit_set_macxattr as it doesn\u0027t do anything\n audit: inline checks for not needing to collect aux records\n audit: drop some potentially inadvisable likely notations\n ...\n\nUse evil merge to fix up grammar mistakes in Kconfig file.\n\nBad speling and horrible grammar (and copious swearing) is to be\nexpected, but let\u0027s keep it to commit messages and comments, rather than\nexpose it to users in config help texts or printouts.\n" }, { "commit": "6422e78de6880c66a82af512d9bd0c85eb62e661", "tree": "9cce4d385a6508056be7645fd3511ab019b346f4", "parents": [ "7ff68e53ece8c175d2951bb8a30b3cce8f9c5579" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:59 2012 -0500" }, "message": "audit: remove audit_finish_fork as it can\u0027t be called\n\nAudit entry,always rules are not allowed and are automatically changed in\nexit,always rules in userspace. The kernel refuses to load such rules.\n\nThus a task in the middle of a syscall (and thus in audit_finish_fork())\ncan only be in one of two states: AUDIT_BUILD_CONTEXT or AUDIT_DISABLED.\nSince the current task cannot be in AUDIT_RECORD_CONTEXT we aren\u0027t every\ngoing to actually use the code in audit_finish_fork() since it will\nreturn without doing anything. Thus drop the code.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "b3c9dd182ed3bdcdaf0e42625a35924b0497afdc", "tree": "ad48ad4d923fee147c736318d0fad35b3755f4f5", "parents": [ "83c2f912b43c3a7babbb6cb7ae2a5276c1ed2a3e", "5d381efb3d1f1ef10535a31ca0dd9b22fe1e1922" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:24:45 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:24:45 2012 -0800" }, "message": "Merge branch \u0027for-3.3/core\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.3/core\u0027 of git://git.kernel.dk/linux-block: (37 commits)\n Revert \"block: recursive merge requests\"\n block: Stop using macro stubs for the bio data integrity calls\n blockdev: convert some macros to static inlines\n fs: remove unneeded plug in mpage_readpages()\n block: Add BLKROTATIONAL ioctl\n block: Introduce blk_set_stacking_limits function\n block: remove WARN_ON_ONCE() in exit_io_context()\n block: an exiting task should be allowed to create io_context\n block: ioc_cgroup_changed() needs to be exported\n block: recursive merge requests\n block, cfq: fix empty queue crash caused by request merge\n block, cfq: move icq creation and rq-\u003eelv.icq association to block core\n block, cfq: restructure io_cq creation path for io_context interface cleanup\n block, cfq: move io_cq exit/release to blk-ioc.c\n block, cfq: move icq cache management to block core\n block, cfq: move io_cq lookup to blk-ioc.c\n block, cfq: move cfqd-\u003eicq_list to request_queue and add request-\u003eelv.icq\n block, cfq: reorganize cfq_io_context into generic and cfq specific parts\n block: remove elevator_queue-\u003eops\n block: reorder elevator switch sequence\n ...\n\nFix up conflicts in:\n - block/blk-cgroup.c\n\tSwitch from can_attach_task to can_attach\n - block/cfq-iosched.c\n\tconflict with now removed cic index changes (we now use q-\u003eid instead)\n" }, { "commit": "001a541ea9163ace5e8243ee0e907ad80a4c0ec2", "tree": "a76225046369c440de93739add9823f5ea060245", "parents": [ "40ba587923ae67090d9f141c1d3c951be5c1420e", "bc31b86a5923fad5f3fbb6192f767f410241ba27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:59:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:59:59 2012 -0800" }, "message": "Merge branch \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\n* \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: move MIN_WRITEBACK_PAGES to fs-writeback.c\n writeback: balanced_rate cannot exceed write bandwidth\n writeback: do strict bdi dirty_exceeded\n writeback: avoid tiny dirty poll intervals\n writeback: max, min and target dirty pause time\n writeback: dirty ratelimit - think time compensation\n btrfs: fix dirtied pages accounting on sub-page writes\n writeback: fix dirtied pages accounting on redirty\n writeback: fix dirtied pages accounting on sub-page writes\n writeback: charge leaked page dirties to active tasks\n writeback: Include all dirty inodes in background writeback\n" }, { "commit": "43d2b113241d6797b890318767e0af78e313414b", "tree": "6f25647f2660f8fca63cc8355b70ad643993dab8", "parents": [ "6bd4837de96e7d9f9bf33e59117c24fc230862ac" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Jan 10 15:08:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:44 2012 -0800" }, "message": "tracepoint: add tracepoints for debugging oom_score_adj\n\noom_score_adj is used for guarding processes from OOM-Killer. One of\nproblem is that it\u0027s inherited at fork(). When a daemon set oom_score_adj\nand make children, it\u0027s hard to know where the value is set.\n\nThis patch adds some tracepoints useful for debugging. This patch adds\n3 trace points.\n - creating new task\n - renaming a task (exec)\n - set oom_score_adj\n\nTo debug, users need to enable some trace pointer. Maybe filtering is useful as\n\n# EVENT\u003d/sys/kernel/debug/tracing/events/task/\n# echo \"oom_score_adj !\u003d 0\" \u003e $EVENT/task_newtask/filter\n# echo \"oom_score_adj !\u003d 0\" \u003e $EVENT/task_rename/filter\n# echo 1 \u003e $EVENT/enable\n# EVENT\u003d/sys/kernel/debug/tracing/events/oom/\n# echo 1 \u003e $EVENT/enable\n\noutput will be like this.\n# grep oom /sys/kernel/debug/tracing/trace\nbash-7699 [007] d..3 5140.744510: oom_score_adj_update: pid\u003d7699 comm\u003dbash oom_score_adj\u003d-1000\nbash-7699 [007] ...1 5151.818022: task_newtask: pid\u003d7729 comm\u003dbash clone_flags\u003d1200011 oom_score_adj\u003d-1000\nls-7729 [003] ...2 5151.818504: task_rename: pid\u003d7729 oldcomm\u003dbash newcomm\u003dls oom_score_adj\u003d-1000\nbash-7699 [002] ...1 5175.701468: task_newtask: pid\u003d7730 comm\u003dbash clone_flags\u003d1200011 oom_score_adj\u003d-1000\ngrep-7730 [007] ...2 5175.701993: task_rename: pid\u003d7730 oldcomm\u003dbash newcomm\u003dgrep oom_score_adj\u003d-1000\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3", "tree": "8f38957c01b18edddd44d49ecc3beeac08a20b4e", "parents": [ "ac69e0928054ff29a5049902fb477f9c7605c773", "0d19ea866562e46989412a0676412fa0983c9ce7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\n* \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)\n cgroup: fix to allow mounting a hierarchy by name\n cgroup: move assignement out of condition in cgroup_attach_proc()\n cgroup: Remove task_lock() from cgroup_post_fork()\n cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()\n cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static\n cgroup: only need to check oldcgrp\u003d\u003dnewgrp once\n cgroup: remove redundant get/put of task struct\n cgroup: remove redundant get/put of old css_set from migrate\n cgroup: Remove unnecessary task_lock before fetching css_set on migration\n cgroup: Drop task_lock(parent) on cgroup_fork()\n cgroups: remove redundant get/put of css_set from css_set_check_fetched()\n resource cgroups: remove bogus cast\n cgroup: kill subsys-\u003ecan_attach_task(), pre_attach() and attach_task()\n cgroup, cpuset: don\u0027t use ss-\u003epre_attach()\n cgroup: don\u0027t use subsys-\u003ecan_attach_task() or -\u003eattach_task()\n cgroup: introduce cgroup_taskset and use it in subsys-\u003ecan_attach(), cancel_attach() and attach()\n cgroup: improve old cgroup handling in cgroup_attach_proc()\n cgroup: always lock threadgroup during migration\n threadgroup: extend threadgroup_lock() to cover exit and exec\n threadgroup: rename signal-\u003ethreadgroup_fork_lock to -\u003egroup_rwsem\n ...\n\nFix up conflict in kernel/cgroup.c due to commit e0197aae59e5: \"cgroups:\nfix a css_set not found bug in cgroup_attach_proc\" that already\nmentioned that the bug is fixed (differently) in Tejun\u0027s cgroup\npatchset. This one, in other words.\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "83712358ba0a1497ce59a4f84ce4dd0f803fe6fc", "tree": "d17ab27a7bff50616e3b63ad137c004d9ccfbcb0", "parents": [ "32c7f202a4801252a0f3578807b75a961f792870" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Sat Jun 11 19:25:42 2011 -0600" }, "committer": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Sun Dec 18 14:20:27 2011 +0800" }, "message": "writeback: dirty ratelimit - think time compensation\n\nCompensate the task\u0027s think time when computing the final pause time,\nso that -\u003edirty_ratelimit can be executed accurately.\n\n think time :\u003d time spend outside of balance_dirty_pages()\n\nIn the rare case that the task slept longer than the 200ms period time\n(result in negative pause time), the sleep time will be compensated in\nthe following periods, too, if it\u0027s less than 1 second.\n\nAccumulated errors are carefully avoided as long as the max pause area\nis not hitted.\n\nPseudo code:\n\n period \u003d pages_dirtied / task_ratelimit;\n think \u003d jiffies - dirty_paused_when;\n pause \u003d period - think;\n\n1) normal case: period \u003e think\n\n pause \u003d period - think\n dirty_paused_when \u003d jiffies + pause\n nr_dirtied \u003d 0\n\n period time\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\u003e|\n think time pause time\n |\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003e|\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003e|\n ------|----------------|---------------|------------------------\n dirty_paused_when jiffies\n\n2) no pause case: period \u003c\u003d think\n\n don\u0027t pause; reduce future pause time by:\n dirty_paused_when +\u003d period\n nr_dirtied \u003d 0\n\n period time\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\u003e|\n think time\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\u003e|\n ------|--------------------------------+-------------------|----\n dirty_paused_when jiffies\n\nAcked-by: Jan Kara \u003cjack@suse.cz\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "648616343cdbe904c585a6c12e323d3b3c72e46f", "tree": "514bce1b52663db4ab5662b637c764cf3c2ed1eb", "parents": [ "55b02d2f4445ad625213817a1736bf2884d32547" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Thu Dec 15 14:56:09 2011 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Thu Dec 15 14:56:19 2011 +0100" }, "message": "[S390] cputime: add sparse checking and cleanup\n\nMake cputime_t and cputime64_t nocast to enable sparse checking to\ndetect incorrect use of cputime. Drop the cputime macros for simple\nscalar operations. The conversion macros are still needed.\n\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "b2efa05265d62bc29f3a64400fad4b44340eedb8", "tree": "4555f0b5f0025c099997b81f7b3f8bc48b44220d", "parents": [ "f1a4f4d35ff30a328d5ea28f6cc826b2083111d2" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Dec 14 00:33:39 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Dec 14 00:33:39 2011 +0100" }, "message": "block, cfq: unlink cfq_io_context\u0027s immediately\n\ncic is association between io_context and request_queue. A cic is\nlinked from both ioc and q and should be destroyed when either one\ngoes away. As ioc and q both have their own locks, locking becomes a\nbit complex - both orders work for removal from one but not from the\nother.\n\nCurrently, cfq tries to circumvent this locking order issue with RCU.\nioc-\u003elock nests inside queue_lock but the radix tree and cic\u0027s are\nalso protected by RCU allowing either side to walk their lists without\ngrabbing lock.\n\nThis rather unconventional use of RCU quickly devolves into extremely\nfragile convolution. e.g. The following is from cfqd going away too\nsoon after ioc and q exits raced.\n\n general protection fault: 0000 [#1] PREEMPT SMP\n CPU 2\n Modules linked in:\n [ 88.503444]\n Pid: 599, comm: hexdump Not tainted 3.1.0-rc10-work+ #158 Bochs Bochs\n RIP: 0010:[\u003cffffffff81397628\u003e] [\u003cffffffff81397628\u003e] cfq_exit_single_io_context+0x58/0xf0\n ...\n Call Trace:\n [\u003cffffffff81395a4a\u003e] call_for_each_cic+0x5a/0x90\n [\u003cffffffff81395ab5\u003e] cfq_exit_io_context+0x15/0x20\n [\u003cffffffff81389130\u003e] exit_io_context+0x100/0x140\n [\u003cffffffff81098a29\u003e] do_exit+0x579/0x850\n [\u003cffffffff81098d5b\u003e] do_group_exit+0x5b/0xd0\n [\u003cffffffff81098de7\u003e] sys_exit_group+0x17/0x20\n [\u003cffffffff81b02f2b\u003e] system_call_fastpath+0x16/0x1b\n\nThe only real hot path here is cic lookup during request\ninitialization and avoiding extra locking requires very confined use\nof RCU. This patch makes cic removal from both ioc and request_queue\nperform double-locking and unlink immediately.\n\n* From q side, the change is almost trivial as ioc-\u003elock nests inside\n queue_lock. It just needs to grab each ioc-\u003elock as it walks\n cic_list and unlink it.\n\n* From ioc side, it\u0027s a bit more difficult because of inversed lock\n order. ioc needs its lock to walk its cic_list but can\u0027t grab the\n matching queue_lock and needs to perform unlock-relock dancing.\n\n Unlinking is now wholly done from put_io_context() and fast path is\n optimized by using the queue_lock the caller already holds, which is\n by far the most common case. If the ioc accessed multiple devices,\n it tries with trylock. In unlikely cases of fast path failure, it\n falls back to full double-locking dance from workqueue.\n\nDouble-locking isn\u0027t the prettiest thing in the world but it\u0027s *far*\nsimpler and more understandable than RCU trick without adding any\nmeaningful overhead.\n\nThis still leaves a lot of now unnecessary RCU logics. Future patches\nwill trim them.\n\n-v2: Vivek pointed out that cic-\u003eq was being dereferenced after\n cic-\u003erelease() was called. Updated to use local variable @this_q\n instead.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "6e736be7f282fff705db7c34a15313281b372a76", "tree": "1683e00e073ee4bd3027798f92ae2d368404d44b", "parents": [ "42ec57a8f68311bbbf4ff96a5d33c8a2e90b9d05" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Dec 14 00:33:38 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Wed Dec 14 00:33:38 2011 +0100" }, "message": "block: make ioc get/put interface more conventional and fix race on alloction\n\nIgnoring copy_io() during fork, io_context can be allocated from two\nplaces - current_io_context() and set_task_ioprio(). The former is\nalways called from local task while the latter can be called from\ndifferent task. The synchornization between them are peculiar and\ndubious.\n\n* current_io_context() doesn\u0027t grab task_lock() and assumes that if it\n saw %NULL -\u003eio_context, it would stay that way until allocation and\n assignment is complete. It has smp_wmb() between alloc/init and\n assignment.\n\n* set_task_ioprio() grabs task_lock() for assignment and does\n smp_read_barrier_depends() between \"ioc \u003d task-\u003eio_context\" and \"if\n (ioc)\". Unfortunately, this doesn\u0027t achieve anything - the latter\n is not a dependent load of the former. ie, if ioc itself were being\n dereferenced \"ioc-\u003exxx\", it would mean something (not sure what tho)\n but as the code currently stands, the dependent read barrier is\n noop.\n\nAs only one of the the two test-assignment sequences is task_lock()\nprotected, the task_lock() can\u0027t do much about race between the two.\nNothing prevents current_io_context() and set_task_ioprio() allocating\nits own ioc for the same task and overwriting the other\u0027s.\n\nAlso, set_task_ioprio() can race with exiting task and create a new\nioc after exit_io_context() is finished.\n\nioc get/put doesn\u0027t have any reason to be complex. The only hot path\nis accessing the existing ioc of %current, which is simple to achieve\ngiven that -\u003eio_context is never destroyed as long as the task is\nalive. All other paths can happily go through task_lock() like all\nother task sub structures without impacting anything.\n\nThis patch updates ioc get/put so that it becomes more conventional.\n\n* alloc_io_context() is replaced with get_task_io_context(). This is\n the only interface which can acquire access to ioc of another task.\n On return, the caller has an explicit reference to the object which\n should be put using put_io_context() afterwards.\n\n* The functionality of current_io_context() remains the same but when\n creating a new ioc, it shares the code path with\n get_task_io_context() and always goes through task_lock().\n\n* get_io_context() now means incrementing ref on an ioc which the\n caller already has access to (be that an explicit refcnt or implicit\n %current one).\n\n* PF_EXITING inhibits creation of new io_context and once\n exit_io_context() is finished, it\u0027s guaranteed that both ioc\n acquisition functions return %NULL.\n\n* All users are updated. Most are trivial but\n smp_read_barrier_depends() removal from cfq_get_io_context() needs a\n bit of explanation. I suppose the original intention was to ensure\n ioc-\u003eioprio is visible when set_task_ioprio() allocates new\n io_context and installs it; however, this wouldn\u0027t have worked\n because set_task_ioprio() doesn\u0027t have wmb between init and install.\n There are other problems with this which will be fixed in another\n patch.\n\n* While at it, use NUMA_NO_NODE instead of -1 for wildcard node\n specification.\n\n-v2: Vivek spotted contamination from debug patch. Removed.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "257058ae2b971646b96ab3a15605ac69186e562a", "tree": "b8a462e64c4bb4b43dcc6c9d05b194f9c747c91d", "parents": [ "e25e2cbb4c6679bed5f52fb0f2cc381688297901" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Dec 12 18:12:21 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Dec 12 18:12:21 2011 -0800" }, "message": "threadgroup: rename signal-\u003ethreadgroup_fork_lock to -\u003egroup_rwsem\n\nMake the following renames to prepare for extension of threadgroup\nlocking.\n\n* s/signal-\u003ethreadgroup_fork_lock/signal-\u003egroup_rwsem/\n* s/threadgroup_fork_read_lock()/threadgroup_change_begin()/\n* s/threadgroup_fork_read_unlock()/threadgroup_change_end()/\n* s/threadgroup_fork_write_lock()/threadgroup_lock()/\n* s/threadgroup_fork_write_unlock()/threadgroup_unlock()/\n\nThis patch doesn\u0027t cause any behavior change.\n\n-v2: Rename threadgroup_change_done() to threadgroup_change_end() per\n KAMEZAWA\u0027s suggestion.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Paul Menage \u003cpaul@paulmenage.org\u003e\n" }, { "commit": "986b11c3ee9e0eace25fe74a502205f7fe8c179b", "tree": "2271bc519eac458fd92799f5731e2ef604f69341", "parents": [ "bb58dd5d1ffad6c2d21c69698ba766dad4ae54e6", "24b7ead3fb0bae267c2ee50898eb4c13aedd1e9f" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Nov 23 21:09:02 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Nov 23 21:09:02 2011 +0100" }, "message": "Merge branch \u0027pm-freezer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into pm-freezer\n\n* \u0027pm-freezer\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc: (24 commits)\n freezer: fix wait_event_freezable/__thaw_task races\n freezer: kill unused set_freezable_with_signal()\n dmatest: don\u0027t use set_freezable_with_signal()\n usb_storage: don\u0027t use set_freezable_with_signal()\n freezer: remove unused @sig_only from freeze_task()\n freezer: use lock_task_sighand() in fake_signal_wake_up()\n freezer: restructure __refrigerator()\n freezer: fix set_freezable[_with_signal]() race\n freezer: remove should_send_signal() and update frozen()\n freezer: remove now unused TIF_FREEZE\n freezer: make freezing() test freeze conditions in effect instead of TIF_FREEZE\n cgroup_freezer: prepare for removal of TIF_FREEZE\n freezer: clean up freeze_processes() failure path\n freezer: kill PF_FREEZING\n freezer: test freezable conditions while holding freezer_lock\n freezer: make freezing indicate freeze condition in effect\n freezer: use dedicated lock instead of task_lock() + memory barrier\n freezer: don\u0027t distinguish nosig tasks on thaw\n freezer: remove racy clear_freeze_flag() and set PF_NOFREEZE on dead tasks\n freezer: rename thaw_process() to __thaw_task() and simplify the implementation\n ...\n" }, { "commit": "a3201227f803ad7fd43180c5195dbe5a2bf998aa", "tree": "1845ba06346f8a8772fe1c90f8960bd1a430d05c", "parents": [ "22b4e111fa01a1147aa562ceaf18a752a928ef4e" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 21 12:32:25 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 21 12:32:25 2011 -0800" }, "message": "freezer: make freezing() test freeze conditions in effect instead of TIF_FREEZE\n\nUsing TIF_FREEZE for freezing worked when there was only single\nfreezing condition (the PM one); however, now there is also the\ncgroup_freezer and single bit flag is getting clumsy.\nthaw_processes() is already testing whether cgroup freezing in in\neffect to avoid thawing tasks which were frozen by both PM and cgroup\nfreezers.\n\nThis is racy (nothing prevents race against cgroup freezing) and\nfragile. A much simpler way is to test actual freeze conditions from\nfreezing() - ie. directly test whether PM or cgroup freezing is in\neffect.\n\nThis patch adds variables to indicate whether and what type of\nfreezing conditions are in effect and reimplements freezing() such\nthat it directly tests whether any of the two freezing conditions is\nactive and the task should freeze. On fast path, freezing() is still\nvery cheap - it only tests system_freezing_cnt.\n\nThis makes the clumsy dancing aroung TIF_FREEZE unnecessary and\nfreeze/thaw operations more usual - updating state variables for the\nnew state and nudging target tasks so that they notice the new state\nand comply. As long as the nudging happens after state update, it\u0027s\nrace-free.\n\n* This allows use of freezing() in freeze_task(). Replace the open\n coded tests with freezing().\n\n* p !\u003d current test is added to warning printing conditions in\n try_to_freeze_tasks() failure path. This is necessary as freezing()\n is now true for the task which initiated freezing too.\n\n-v2: Oleg pointed out that re-freezing FROZEN cgroup could increment\n system_freezing_cnt. Fixed.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Paul Menage \u003cpaul@paulmenage.org\u003e (for the cgroup portions)\n" }, { "commit": "468e6a20afaccb67e2a7d7f60d301f90e1c6f301", "tree": "5558e92e85decd0fa0bb95ed6e637e1f68ea2fe1", "parents": [ "1df647197c5b8aacaeb58592cba9a1df322c9000" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Wed Sep 07 10:41:32 2011 -0600" }, "committer": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Thu Nov 17 20:49:06 2011 +0800" }, "message": "writeback: remove vm_dirties and task-\u003edirties\n\nThey are not used any more.\n\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "208bca0860406d16398145ddd950036a737c3c9d", "tree": "7797a16c17d8bd155120126fa7976727fc6de013", "parents": [ "6aad3738f6a79fd0ca480eaceefe064cc471f6eb", "0e175a1835ffc979e55787774e58ec79e41957d7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:02:23 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:02:23 2011 -0800" }, "message": "Merge branch \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux\n\n* \u0027writeback-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:\n writeback: Add a \u0027reason\u0027 to wb_writeback_work\n writeback: send work item to queue_io, move_expired_inodes\n writeback: trace event balance_dirty_pages\n writeback: trace event bdi_dirty_ratelimit\n writeback: fix ppc compile warnings on do_div(long long, unsigned long)\n writeback: per-bdi background threshold\n writeback: dirty position control - bdi reserve area\n writeback: control dirty pause time\n writeback: limit max dirty pause time\n writeback: IO-less balance_dirty_pages()\n writeback: per task dirty rate limit\n writeback: stabilize bdi-\u003edirty_ratelimit\n writeback: dirty rate control\n writeback: add bg_threshold parameter to __bdi_update_bandwidth()\n writeback: dirty position control\n writeback: account per-bdi accumulated dirtied pages\n" }, { "commit": "c9f01245b6a7d77d17deaa71af10f6aca14fa24e", "tree": "13ffde591a5bcefba39cb6393f09b27f1ebc1a30", "parents": [ "7b0d44fa49b1dcfdcf4897f12ddd12ddeab1a9d7" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Mon Oct 31 17:07:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:30:45 2011 -0700" }, "message": "oom: remove oom_disable_count\n\nThis removes mm-\u003eoom_disable_count entirely since it\u0027s unnecessary and\ncurrently buggy. The counter was intended to be per-process but it\u0027s\ncurrently decremented in the exit path for each thread that exits, causing\nit to underflow.\n\nThe count was originally intended to prevent oom killing threads that\nshare memory with threads that cannot be killed since it doesn\u0027t lead to\nfuture memory freeing. The counter could be fixed to represent all\nthreads sharing the same mm, but it\u0027s better to remove the count since:\n\n - it is possible that the OOM_DISABLE thread sharing memory with the\n victim is waiting on that thread to exit and will actually cause\n future memory freeing, and\n\n - there is no guarantee that a thread is disabled from oom killing just\n because another thread sharing its mm is oom disabled.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nReported-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nReviewed-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9d823e8f6b1b7b39f952d7d1795f29162143a433", "tree": "2ef4c0d29353452dd2f894e7dbd240a31bdd0a02", "parents": [ "7381131cbcf7e15d201a0ffd782a4698efe4e740" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Sat Jun 11 18:10:12 2011 -0600" }, "committer": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Mon Oct 03 21:08:57 2011 +0800" }, "message": "writeback: per task dirty rate limit\n\nAdd two fields to task_struct.\n\n1) account dirtied pages in the individual tasks, for accuracy\n2) per-task balance_dirty_pages() call intervals, for flexibility\n\nThe balance_dirty_pages() call interval (ie. nr_dirtied_pause) will\nscale near-sqrt to the safety gap between dirty pages and threshold.\n\nThe main problem of per-task nr_dirtied is, if 1k+ tasks start dirtying\npages at exactly the same time, each task will be assigned a large\ninitial nr_dirtied_pause, so that the dirty threshold will be exceeded\nlong before each task reached its nr_dirtied_pause and hence call\nbalance_dirty_pages().\n\nThe solution is to watch for the number of pages dirtied on each CPU in\nbetween the calls into balance_dirty_pages(). If it exceeds ratelimit_pages\n(3% dirty threshold), force call balance_dirty_pages() for a chance to\nset bdi-\u003edirty_exceeded. In normal situations, this safeguarding\ncondition is not expected to trigger at all.\n\nOn the sqrt in dirty_poll_interval():\n\nIt will serve as an initial guess when dirty pages are still in the\nfreerun area.\n\nWhen dirty pages are floating inside the dirty control scope [freerun,\nlimit], a followup patch will use some refined dirty poll interval to\nget the desired pause time.\n\n thresh-dirty (MB) sqrt\n\t\t 1 16\n\t\t 2 22\n\t\t 4 32\n\t\t 8 45\n\t\t 16 64\n\t\t 32 90\n\t\t 64 128\n\t\t 128 181\n\t\t 256 256\n\t\t 512 362\n\t\t1024 512\n\nThe above table means, given 1MB (or 1GB) gap and the dd tasks polling\nbalance_dirty_pages() on every 16 (or 512) pages, the dirty limit won\u0027t\nbe exceeded as long as there are less than 16 (or 512) concurrent dd\u0027s.\n\nSo sqrt naturally leads to less overheads and more safe concurrent tasks\nfor large memory servers, which have large (thresh-freerun) gaps.\n\npeter: keep the per-CPU ratelimit for safeguarding the 1k+ tasks case\n\nCC: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nReviewed-by: Andrea Righi \u003candrea@betterlinux.com\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\n" }, { "commit": "72fa59970f8698023045ab0713d66f3f4f96945c", "tree": "ed9a5eaf8212270d464c6d4396ae5a568352a997", "parents": [ "1d229d54dbc26971142f61c3d271a68db236d178" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Mon Aug 08 19:02:04 2011 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 11 11:24:42 2011 -0700" }, "message": "move RLIMIT_NPROC check from set_user() to do_execve_common()\n\nThe patch http://lkml.org/lkml/2003/7/13/226 introduced an RLIMIT_NPROC\ncheck in set_user() to check for NPROC exceeding via setuid() and\nsimilar functions.\n\nBefore the check there was a possibility to greatly exceed the allowed\nnumber of processes by an unprivileged user if the program relied on\nrlimit only. But the check created new security threat: many poorly\nwritten programs simply don\u0027t check setuid() return code and believe it\ncannot fail if executed with root privileges. So, the check is removed\nin this patch because of too often privilege escalations related to\nbuggy programs.\n\nThe NPROC can still be enforced in the common code flow of daemons\nspawning user processes. Most of daemons do fork()+setuid()+execve().\nThe check introduced in execve() (1) enforces the same limit as in\nsetuid() and (2) doesn\u0027t create similar security issues.\n\nNeil Brown suggested to track what specific process has exceeded the\nlimit by setting PF_NPROC_EXCEEDED process flag. With the change only\nthis process would fail on execve(), and other processes\u0027 execve()\nbehaviour is not changed.\n\nSolar Designer suggested to re-check whether NPROC limit is still\nexceeded at the moment of execve(). If the process was sleeping for\ndays between set*uid() and execve(), and the NPROC counter step down\nunder the limit, the defered execve() failure because NPROC limit was\nexceeded days ago would be unexpected. If the limit is not exceeded\nanymore, we clear the flag on successful calls to execve() and fork().\n\nThe flag is also cleared on successful calls to set_user() as the limit\nwas exceeded for the previous user, not the current one.\n\nSimilar check was introduced in -ow patches (without the process flag).\n\nv3 - clear PF_NPROC_EXCEEDED on successful calls to set_user().\n\nReviewed-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nAcked-by: NeilBrown \u003cneilb@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fb0a685cb95a0267a96153af2f72486f27be5847", "tree": "99ffae5ab7733ce8a1819fec51ca137a3af48d37", "parents": [ "293eb1e7772b25a93647c798c7b89bf26c2da2e0" ], "author": { "name": "Daniel Rebelo de Oliveira", "email": "psykon@gmail.com", "time": "Tue Jul 26 16:08:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:44 2011 -0700" }, "message": "kernel/fork.c: fix a few coding style issues\n\nSigned-off-by: Daniel Rebelo de Oliveira \u003cpsykon@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "778d3b0ff0654ad7092bf823fd32010066b12365", "tree": "cd0073d8c513e1c56fd6950c4ec985f16fd004ad", "parents": [ "8521fc50d433507a7cdc96bec280f9e5888a54cc" ], "author": { "name": "Michal Hocko", "email": "mhocko@suse.cz", "time": "Tue Jul 26 16:08:30 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:43 2011 -0700" }, "message": "cpusets: randomize node rotor used in cpuset_mem_spread_node()\n\n[ This patch has already been accepted as commit 0ac0c0d0f837 but later\n reverted (commit 35926ff5fba8) because it itroduced arch specific\n __node_random which was defined only for x86 code so it broke other\n archs. This is a followup without any arch specific code. Other than\n that there are no functional changes.]\n\nSome workloads that create a large number of small files tend to assign\ntoo many pages to node 0 (multi-node systems). Part of the reason is\nthat the rotor (in cpuset_mem_spread_node()) used to assign nodes starts\nat node 0 for newly created tasks.\n\nThis patch changes the rotor to be initialized to a random node number\nof the cpuset.\n\n[akpm@linux-foundation.org: fix layout]\n[Lee.Schermerhorn@hp.com: Define stub numa_random() for !NUMA configuration]\n[mhocko@suse.cz: Make it arch independent]\n[akpm@linux-foundation.org: fix CONFIG_NUMA\u003dy, MAX_NUMNODES\u003e1 build]\nSigned-off-by: Jack Steiner \u003csteiner@sgi.com\u003e\nSigned-off-by: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nSigned-off-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: Jack Steiner \u003csteiner@sgi.com\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Jack Steiner \u003csteiner@sgi.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "096a705bbc080a4041636d07514560da8d78acbe", "tree": "38c3c01225709ffa53419083ea6332f8a72610de", "parents": [ "fea80311a939a746533a6d7e7c3183729d6a3faf", "5757a6d76cdf6dda2a492c09b985c015e86779b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 10:33:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 10:33:36 2011 -0700" }, "message": "Merge branch \u0027for-3.1/core\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.1/core\u0027 of git://git.kernel.dk/linux-block: (24 commits)\n block: strict rq_affinity\n backing-dev: use synchronize_rcu_expedited instead of synchronize_rcu\n block: fix patch import error in max_discard_sectors check\n block: reorder request_queue to remove 64 bit alignment padding\n CFQ: add think time check for group\n CFQ: add think time check for service tree\n CFQ: move think time check variables to a separate struct\n fixlet: Remove fs_excl from struct task.\n cfq: Remove special treatment for metadata rqs.\n block: document blk_plug list access\n block: avoid building too big plug list\n compat_ioctl: fix make headers_check regression\n block: eliminate potential for infinite loop in blkdev_issue_discard\n compat_ioctl: fix warning caused by qemu\n block: flush MEDIA_CHANGE from drivers on close(2)\n blk-throttle: Make total_nr_queued unsigned\n block: Add __attribute__((format(printf...) and fix fallout\n fs/partitions/check.c: make local symbols static\n block:remove some spare spaces in genhd.c\n block:fix the comment error in blkdev.h\n ...\n" }, { "commit": "bbd9d6f7fbb0305c9a592bf05a32e87eb364a4ff", "tree": "12b2bb4202b05f6ae6a43c6ce830a0472043dbe5", "parents": [ "8e204874db000928e37199c2db82b7eb8966cc3c", "5a9a43646cf709312d71eca71cef90ad802f28f9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 19:02:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 19:02:39 2011 -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: (107 commits)\n vfs: use ERR_CAST for err-ptr tossing in lookup_instantiate_filp\n isofs: Remove global fs lock\n jffs2: fix IN_DELETE_SELF on overwriting rename() killing a directory\n fix IN_DELETE_SELF on overwriting rename() on ramfs et.al.\n mm/truncate.c: fix build for CONFIG_BLOCK not enabled\n fs:update the NOTE of the file_operations structure\n Remove dead code in dget_parent()\n AFS: Fix silly characters in a comment\n switch d_add_ci() to d_splice_alias() in \"found negative\" case as well\n simplify gfs2_lookup()\n jfs_lookup(): don\u0027t bother with . or ..\n get rid of useless dget_parent() in btrfs rename() and link()\n get rid of useless dget_parent() in fs/btrfs/ioctl.c\n fs: push i_mutex and filemap_write_and_wait down into -\u003efsync() handlers\n drivers: fix up various -\u003ellseek() implementations\n fs: handle SEEK_HOLE/SEEK_DATA properly in all fs\u0027s that define their own llseek\n Ext4: handle SEEK_HOLE/SEEK_DATA generically\n Btrfs: implement our own -\u003ellseek\n fs: add SEEK_HOLE and SEEK_DATA flags\n reiserfs: make reiserfs default to barrier\u003dflush\n ...\n\nFix up trivial conflicts in fs/xfs/linux-2.6/xfs_super.c due to the new\nshrinker callout for the inode cache, that clashed with the xfs code to\nstart the periodic workers later.\n" }, { "commit": "75b56ec294b074d70f8a676ab02611a3fea76cab", "tree": "d5299adb43ac6fc8dcc50c3e438c7f0cdd452b1c", "parents": [ "6d16d6d9bb6f93e6f8506cfb3e91795d6443d54f", "efbe2eee6dc0f179be84292bf269528b3ec365e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:43:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 16:43:21 2011 -0700" }, "message": "Merge branch \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-locking-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n lockdep: Fix lockdep_no_validate against IRQ states\n mutex: Make mutex_destroy() an inline function\n plist: Remove the need to supply locks to plist heads\n lockup detector: Fix reference to the non-existent CONFIG_DETECT_SOFTLOCKUP option\n" }, { "commit": "6657719390cd05be45f4e3b501d8bb46889c0a19", "tree": "8d2d97f645b05badd134526659f5d9adc7ab9234", "parents": [ "1ba106818615faddb63ba782f85f3498b9eb61c6" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jun 28 15:41:10 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jul 20 01:44:07 2011 -0400" }, "message": "make sure that nsproxy_cache is initialized early enough\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "dcace06cc29df927a74a6bc0e57b9bef87704377", "tree": "9a04518032869b1ed79933026379ea0d7081e43a", "parents": [ "6634ae1033ceaeca5877dd75723210f8c2648c17" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Fri Jul 08 19:13:54 2011 +0200" }, "committer": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Sun Jul 17 20:23:51 2011 +0200" }, "message": "ptrace: mv send-SIGSTOP from do_fork() to ptrace_init_task()\n\nIf the new child is traced, do_fork() adds the pending SIGSTOP.\nIt assumes that either it is traced because of auto-attach or the\ntracer attached later, in both cases sigaddset/set_thread_flag is\ncorrect even if SIGSTOP is already pending.\n\nNow that we have PTRACE_SEIZE this is no longer right in the latter\ncase. If the tracer does PTRACE_SEIZE after copy_process() makes the\nchild visible the queued SIGSTOP is wrong.\n\nWe could check PT_SEIZED bit and change ptrace_attach() to set both\nPT_PTRACED and PT_SEIZED bits simultaneously but see the next patch,\nwe need to know whether this child was auto-attached or not anyway.\n\nSo this patch simply moves this code to ptrace_init_task(), this\nway we can never race with ptrace_attach().\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "4aede84b33d6beb401136a3deca0651ae07c5e99", "tree": "831266dbb15227584da5011ae4bb1e5038a69677", "parents": [ "a07405b7802691d29ab3b23bdc76ee6d006aad0b" ], "author": { "name": "Justin TerAvest", "email": "teravest@google.com", "time": "Tue Jul 12 08:31:45 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Jul 12 08:35:10 2011 +0200" }, "message": "fixlet: Remove fs_excl from struct task.\n\nfs_excl is a poor man\u0027s priority inheritance for filesystems to hint to\nthe block layer that an operation is important. It was never clearly\nspecified, not widely adopted, and will not prevent starvation in many\ncases (like across cgroups).\n\nfs_excl was introduced with the time sliced CFQ IO scheduler, to\nindicate when a process held FS exclusive resources and thus needed\na boost.\n\nIt doesn\u0027t cover all file systems, and it was never fully complete.\nLets kill it.\n\nSigned-off-by: Justin TerAvest \u003cteravest@google.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "732375c6a5a4cc825b676c922d547aba96b8ce15", "tree": "35002255d0e52ad478ffa7134b73c35452c502a0", "parents": [ "8edbb83e5bc3c7d5d76861fc61872105288d2610" ], "author": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 17:27:59 2011 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jul 08 14:02:53 2011 +0200" }, "message": "plist: Remove the need to supply locks to plist heads\n\nThis was legacy code brought over from the RT tree and\nis no longer necessary.\n\nSigned-off-by: Dima Zavin \u003cdima@android.com\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Daniel Walker \u003cdwalker@codeaurora.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nLink: http://lkml.kernel.org/r/1310084879-10351-2-git-send-email-dima@android.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4b9d33e6d83cc05a8005a8f9a8b9677fa0f53626", "tree": "250b740d22f9604326ecfd769dd2f74d60187a19", "parents": [ "a288eecce5253cc1565d400a52b9b476a157e040" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Jun 17 16:50:38 2011 +0200" }, "committer": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 22 19:26:29 2011 +0200" }, "message": "ptrace: kill clone/exec tracehooks\n\nAt this point, tracehooks aren\u0027t useful to mainline kernel and mostly\njust add an extra layer of obfuscation. Although they have comments,\nwithout actual in-kernel users, it is difficult to tell what are their\nassumptions and they\u0027re actually trying to achieve. To mainline\nkernel, they just aren\u0027t worth keeping around.\n\nThis patch kills the following clone and exec related tracehooks.\n\n\ttracehook_prepare_clone()\n\ttracehook_finish_clone()\n\ttracehook_report_clone()\n\ttracehook_report_clone_complete()\n\ttracehook_unsafe_exec()\n\nThe changes are mostly trivial - logic is moved to the caller and\ncomments are merged and adjusted appropriately.\n\nThe only exception is in check_unsafe_exec() where LSM_UNSAFE_PTRACE*\nare OR\u0027d to bprm-\u003eunsafe instead of setting it, which produces the\nsame result as the field is always zero on entry. It also tests\np-\u003eptrace instead of (p-\u003eptrace \u0026 PT_PTRACED) for consistency, which\nalso gives the same result.\n\nThis doesn\u0027t introduce any behavior change.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\n" }, { "commit": "a288eecce5253cc1565d400a52b9b476a157e040", "tree": "a933dd8c9791be83b7a67a33502c79e7b441960e", "parents": [ "f3c04b934d429b1ace21866f011b66de328c0dc9" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Jun 17 16:50:37 2011 +0200" }, "committer": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 22 19:26:28 2011 +0200" }, "message": "ptrace: kill trivial tracehooks\n\nAt this point, tracehooks aren\u0027t useful to mainline kernel and mostly\njust add an extra layer of obfuscation. Although they have comments,\nwithout actual in-kernel users, it is difficult to tell what are their\nassumptions and they\u0027re actually trying to achieve. To mainline\nkernel, they just aren\u0027t worth keeping around.\n\nThis patch kills the following trivial tracehooks.\n\n* Ones testing whether task is ptraced. Replace with -\u003eptrace test.\n\n\ttracehook_expect_breakpoints()\n\ttracehook_consider_ignored_signal()\n\ttracehook_consider_fatal_signal()\n\n* ptrace_event() wrappers. Call directly.\n\n\ttracehook_report_exec()\n\ttracehook_report_exit()\n\ttracehook_report_vfork_done()\n\n* ptrace_release_task() wrapper. Call directly.\n\n\ttracehook_finish_release_task()\n\n* noop\n\n\ttracehook_prepare_release_task()\n\ttracehook_report_death()\n\nThis doesn\u0027t introduce any behavior change.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\n" }, { "commit": "6345d24daf0c1fffe6642081d783cdf653ebaa5c", "tree": "415a253621279111bd481d48cbb86174c70b952a", "parents": [ "cab0d85c8dfcad4d799f9c294571440c6f1db091" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:32:28 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:32:28 2011 -0700" }, "message": "mm: Fix boot crash in mm_alloc()\n\nThomas Gleixner reports that we now have a boot crash triggered by\nCONFIG_CPUMASK_OFFSTACK\u003dy:\n\n BUG: unable to handle kernel NULL pointer dereference at (null)\n IP: [\u003cc11ae035\u003e] find_next_bit+0x55/0xb0\n Call Trace:\n [\u003cc11addda\u003e] cpumask_any_but+0x2a/0x70\n [\u003cc102396b\u003e] flush_tlb_mm+0x2b/0x80\n [\u003cc1022705\u003e] pud_populate+0x35/0x50\n [\u003cc10227ba\u003e] pgd_alloc+0x9a/0xf0\n [\u003cc103a3fc\u003e] mm_init+0xec/0x120\n [\u003cc103a7a3\u003e] mm_alloc+0x53/0xd0\n\nwhich was introduced by commit de03c72cfce5 (\"mm: convert\nmm-\u003ecpu_vm_cpumask into cpumask_var_t\"), and is due to wrong ordering of\nmm_init() vs mm_init_cpumask\n\nThomas wrote a patch to just fix the ordering of initialization, but I\nhate the new double allocation in the fork path, so I ended up instead\ndoing some more radical surgery to clean it all up.\n\nReported-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3864601387cf4196371e3c1897fdffa5228296f9", "tree": "1c517a970194f9e49ef98ef434c650771ffa31e1", "parents": [ "63ab25ebbc50f74550bd8d164a34724b498f6fb9" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Thu May 26 16:25:46 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:36 2011 -0700" }, "message": "mm: extract exe_file handling from procfs\n\nSetup and cleanup of mm_struct-\u003eexe_file is currently done in fs/proc/.\nThis was because exe_file was needed only for /proc/\u003cpid\u003e/exe. Since we\nwill need the exe_file functionality also for core dumps (so core name can\ncontain full binary path), built this functionality always into the\nkernel.\n\nTo achieve that move that out of proc FS to the kernel/ where in fact it\nshould belong. By doing that we can make dup_mm_exe_file static. Also we\ncan drop linux/proc_fs.h inclusion in fs/exec.c and kernel/fork.c.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a77aea92010acf54ad785047234418d5d68772e2", "tree": "c7cb57b62fd02bee2baceb79251923f7caec6139", "parents": [ "d846687d7f84e45f23ecf3846dbb43312a1206dd" ], "author": { "name": "Daniel Lezcano", "email": "daniel.lezcano@free.fr", "time": "Thu May 26 16:25:23 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:34 2011 -0700" }, "message": "cgroup: remove the ns_cgroup\n\nThe ns_cgroup is an annoying cgroup at the namespace / cgroup frontier and\nleads to some problems:\n\n * cgroup creation is out-of-control\n * cgroup name can conflict when pids are looping\n * it is not possible to have a single process handling a lot of\n namespaces without falling in a exponential creation time\n * we may want to create a namespace without creating a cgroup\n\n The ns_cgroup was replaced by a compatibility flag \u0027clone_children\u0027,\n where a newly created cgroup will copy the parent cgroup values.\n The userspace has to manually create a cgroup and add a task to\n the \u0027tasks\u0027 file.\n\nThis patch removes the ns_cgroup as suggested in the following thread:\n\nhttps://lists.linux-foundation.org/pipermail/containers/2009-June/018616.html\n\nThe \u0027cgroup_clone\u0027 function is removed because it is no longer used.\n\nThis is a userspace-visible change. Commit 45531757b45c (\"cgroup: notify\nns_cgroup deprecated\") (merged into 2.6.27) caused the kernel to emit a\nprintk warning users that the feature is planned for removal. Since that\ntime we have heard from XXX users who were affected by this.\n\nSigned-off-by: Daniel Lezcano \u003cdaniel.lezcano@free.fr\u003e\nSigned-off-by: Serge E. Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nCc: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Paul Menage \u003cmenage@google.com\u003e\nAcked-by: Matt Helsley \u003cmatthltc@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": "4714d1d32d97239fb5ae3e10521d3f133a899b66", "tree": "fb50707cefc386bf4e87cac9661a38dcfe3192df", "parents": [ "dcb3a08e69629ea65a3e9647da730bfaf670497d" ], "author": { "name": "Ben Blum", "email": "bblum@andrew.cmu.edu", "time": "Thu May 26 16:25:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 17:12:34 2011 -0700" }, "message": "cgroups: read-write lock CLONE_THREAD forking per threadgroup\n\nAdds functionality to read/write lock CLONE_THREAD fork()ing per-threadgroup\n\nAdd an rwsem that lives in a threadgroup\u0027s signal_struct that\u0027s taken for\nreading in the fork path, under CONFIG_CGROUPS. If another part of the\nkernel later wants to use such a locking mechanism, the CONFIG_CGROUPS\nifdefs should be changed to a higher-up flag that CGROUPS and the other\nsystem would both depend on.\n\nThis is a pre-patch for cgroup-procs-write.patch.\n\nSigned-off-by: Ben Blum \u003cbblum@andrew.cmu.edu\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Matt Helsley \u003cmatthltc@us.ibm.com\u003e\nReviewed-by: Paul Menage \u003cmenage@google.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "de03c72cfce5b263a674d04348b58475ec50163c" }