)]}' { "log": [ { "commit": "a3fe778c7895cd847d23c25ad566d83346282a77", "tree": "53ba1b736dac08680a08753f7163a1890d7a0d03", "parents": [ "9171c670b4915e30360c2aed530b8377fbbcc852", "165c8aed5bbc6bdddbccae0ba9db451732558ff9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 04 12:28:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 04 12:28:45 2012 -0700" }, "message": "Merge tag \u0027stable/frontswap.v16-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm\n\nPull frontswap feature from Konrad Rzeszutek Wilk:\n \"Frontswap provides a \"transcendent memory\" interface for swap pages.\n In some environments, dramatic performance savings may be obtained\n because swapped pages are saved in RAM (or a RAM-like device) instead\n of a swap disk. This tag provides the basic infrastructure along with\n some changes to the existing backends.\"\n\nFix up trivial conflict in mm/Makefile due to removal of swap token code\nchanging a line next to the new frontswap entry.\n\nThis pull request came in before the merge window even opened, it got\ndelayed to after the merge window by me just wanting to make sure it had\nactual users. Apparently IBM is using this on their embedded side, and\nJan Beulich says that it\u0027s already made available for SLES and OpenSUSE\nusers.\n\nAlso acked by Rik van Riel, and Konrad points to other people liking it\ntoo. So in it goes.\n\nBy Dan Magenheimer (4) and Konrad Rzeszutek Wilk (2)\nvia Konrad Rzeszutek Wilk\n* tag \u0027stable/frontswap.v16-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:\n frontswap: s/put_page/store/g s/get_page/load\n MAINTAINER: Add myself for the frontswap API\n mm: frontswap: config and doc files\n mm: frontswap: core frontswap functionality\n mm: frontswap: core swap subsystem hooks and headers\n mm: frontswap: add frontswap header file\n" }, { "commit": "4b91355e9dc9ac1eb3d69e56de093899ff2677ef", "tree": "b6d18618013eadd3b3e3144c90b16d0d5f07b3af", "parents": [ "181eb39425f2b9275afcb015eaa547d11f71a02f" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue May 29 15:06:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:24 2012 -0700" }, "message": "memcg: fix/change behavior of shared anon at moving task\n\nThis patch changes memcg\u0027s behavior at task_move().\n\nAt task_move(), the kernel scans a task\u0027s page table and move the changes\nfor mapped pages from source cgroup to target cgroup. There has been a\nbug at handling shared anonymous pages for a long time.\n\nBefore patch:\n - The spec says \u0027shared anonymous pages are not moved.\u0027\n - The implementation was \u0027shared anonymoys pages may be moved\u0027.\n If page_mapcount \u003c\u003d2, shared anonymous pages\u0027s charge were moved.\n\nAfter patch:\n - The spec says \u0027all anonymous pages are moved\u0027.\n - The implementation is \u0027all anonymous pages are moved\u0027.\n\nConsidering usage of memcg, this will not affect user\u0027s experience.\n\u0027shared anonymous\u0027 pages only exists between a tree of processes which\ndon\u0027t do exec(). Moving one of process without exec() seems not sane.\nFor example, libcgroup will not be affected by this change. (Anyway, no\none noticed the implementation for a long time...)\n\nBelow is a discussion log:\n\n - current spec/implementation are complex\n - Now, shared file caches are moved\n - It adds unclear check as page_mapcount(). To do correct check,\n we should check swap users, etc.\n - No one notice this implementation behavior. So, no one get benefit\n from the design.\n - In general, once task is moved to a cgroup for running, it will not\n be moved....\n - Finally, we have control knob as memory.move_charge_at_immigrate.\n\nHere is a patch to allow moving shared pages, completely. This makes\nmemcg simpler and fix current broken code.\n\nSuggested-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bde05d1ccd512696b09db9dd2e5f33ad19152605", "tree": "affa2c836136cac6ec0e503ce8996670d385ebbb", "parents": [ "5ceb9ce6fe9462a298bb2cd5c9f1ca6cb80a0199" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Tue May 29 15:06:38 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 29 16:22:22 2012 -0700" }, "message": "shmem: replace page if mapping excludes its zone\n\nThe GMA500 GPU driver uses GEM shmem objects, but with a new twist: the\nbacking RAM has to be below 4GB. Not a problem while the boards\nsupported only 4GB: but now Intel\u0027s D2700MUD boards support 8GB, and\ntheir GMA3600 is managed by the GMA500 driver.\n\nshmem/tmpfs has never pretended to support hardware restrictions on the\nbacking memory, but it might have appeared to do so before v3.1, and\neven now it works fine until a page is swapped out then back in. When\nread_cache_page_gfp() supplied a freshly allocated page for copy, that\ncompensated for whatever choice might have been made by earlier swapin\nreadahead; but swapoff was likely to destroy the illusion.\n\nWe\u0027d like to continue to support GMA500, so now add a new\nshmem_should_replace_page() check on the zone when about to move a page\nfrom swapcache to filecache (in swapin and swapoff cases), with\nshmem_replace_page() to allocate and substitute a suitable page (given\ngma500/gem.c\u0027s mapping_set_gfp_mask GFP_KERNEL | __GFP_DMA32).\n\nThis does involve a minor extension to mem_cgroup_replace_page_cache()\n(the page may or may not have already been charged); and I\u0027ve removed a\ncomment and call to mem_cgroup_uncharge_cache_page(), which in fact is\nalways a no-op while PageSwapCache.\n\nAlso removed optimization of an unlikely path in shmem_getpage_gfp(),\nnow that we need to check PageSwapCache more carefully (a racing caller\nmight already have made the copy). And at one point shmem_unuse_inode()\nneeds to use the hitherto private page_swapcount(), to guard against\nracing with inode eviction.\n\nIt would make sense to extend shmem_should_replace_page(), to cover\ncpuset and NUMA mempolicy restrictions too, but set that aside for now:\nneeds a cleanup of shmem mempolicy handling, and more testing, and ought\nto handle swap faults in do_swap_page() as well as shmem.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Stephane Marchesin \u003cmarcheu@chromium.org\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Dave Airlie \u003cairlied@gmail.com\u003e\nCc: Daniel Vetter \u003cdaniel@ffwll.ch\u003e\nCc: Rob Clark \u003crob.clark@linaro.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "38b5faf4b178d5279b1fca5d7dadc68881342660", "tree": "1a5d10ff709abcefa96034d3f89739be8d7ef0c2", "parents": [ "c3ba9698152b17fdc2c7cd0f7cbeb571e3367e9d" ], "author": { "name": "Dan Magenheimer", "email": "dan.magenheimer@oracle.com", "time": "Mon Apr 09 17:08:06 2012 -0600" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Tue May 15 11:33:58 2012 -0400" }, "message": "mm: frontswap: core swap subsystem hooks and headers\n\nThis patch, 2of4, contains the changes to the core swap subsystem.\nThis includes:\n\n(1) makes available core swap data structures (swap_lock, swap_list and\nswap_info) that are needed by frontswap.c but we don\u0027t need to expose them\nto the dozens of files that include swap.h so we create a new swapfile.h\njust to extern-ify these and modify their declarations to non-static\n\n(2) adds frontswap-related elements to swap_info_struct. Frontswap_map\npoints to vzalloc\u0027ed one-bit-per-swap-page metadata that indicates\nwhether the swap page is in frontswap or in the device and frontswap_pages\ncounts how many pages are in frontswap.\n\n(3) adds hooks in the swap subsystem and extends try_to_unuse so that\nfrontswap_shrink can do a \"partial swapoff\".\n\nNote that a failed frontswap_map allocation is safe... failure is noted\nby lack of \"FS\" in the subsequent printk.\n\n---\n\n[v14: rebase to 3.4-rc2]\n[v10: no change]\n[v9: akpm@linux-foundation.org: mark some statics __read_mostly]\n[v9: akpm@linux-foundation.org: add clarifying comments]\n[v9: akpm@linux-foundation.org: no need to loop repeating try_to_unuse]\n[v9: error27@gmail.com: remove superfluous check for NULL]\n[v8: rebase to 3.0-rc4]\n[v8: kamezawa.hiroyu@jp.fujitsu.com: change counter to atomic_t to avoid races]\n[v8: kamezawa.hiroyu@jp.fujitsu.com: comment to clarify informational counters]\n[v7: rebase to 3.0-rc3]\n[v7: JBeulich@novell.com: add new swap struct elements only if config\u0027d]\n[v6: rebase to 3.0-rc1]\n[v6: lliubbo@gmail.com: fix null pointer deref if vzalloc fails]\n[v6: konrad.wilk@oracl.com: various checks and code clarifications/comments]\n[v5: no change from v4]\n[v4: rebase to 2.6.39]\nSigned-off-by: Dan Magenheimer \u003cdan.magenheimer@oracle.com\u003e\nReviewed-by: Kamezawa Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Jan Beulich \u003cJBeulich@novell.com\u003e\nAcked-by: Seth Jennings \u003csjenning@linux.vnet.ibm.com\u003e\nCc: Jeremy Fitzhardinge \u003cjeremy@goop.org\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\nCc: Matthew Wilcox \u003cmatthew@wil.cx\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: Rik Riel \u003criel@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n[v11: Rebased, fixed mm/swapfile.c context change]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "d15cab975459fb6092eeba1be72c13621337784f", "tree": "5c1d8d18c65a34eb738c97d75f2c44becdff1de3", "parents": [ "29fd66d289f2981e11c550f8b411a6d3d38be0cf" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Mar 28 14:42:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 17:14:35 2012 -0700" }, "message": "swapon: check validity of swap_flags\n\nMost system calls taking flags first check that the flags passed in are\nvalid, and that helps userspace to detect when new flags are supported.\n\nBut swapon never did so: start checking now, to help if we ever want to\nsupport more swap_flags in future.\n\nIt\u0027s difficult to get stray bits set in an int, and swapon is not widely\nused, so this is most unlikely to break any userspace; but we can just\nrevert if it turns out to do so.\n\nSigned-off-by: 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": "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": "052b1987faca3606109d88d96bce124851f7c4c2", "tree": "879df883edb01ea6e0da880e391b06bb69058129", "parents": [ "1480de0340a8d5f094b74d7c4b902456c9a06903" ], "author": { "name": "Shaohua Li", "email": "shli@kernel.org", "time": "Wed Mar 21 16:34:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:00 2012 -0700" }, "message": "swap: don\u0027t do discard if no discard option added\n\nWhen swapon() was not passed the SWAP_FLAG_DISCARD option, sys_swapon()\nwill still perform a discard operation. This can cause problems if\ndiscard is slow or buggy.\n\nReverse the order of the check so that a discard operation is performed\nonly if the sys_swapon() caller is attempting to enable discard.\n\nSigned-off-by: Shaohua Li \u003cshli@fusionio.com\u003e\nReported-by: Holger Kiehl \u003cHolger.Kiehl@dwd.de\u003e\nTested-by: Holger Kiehl \u003cHolger.Kiehl@dwd.de\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": "67f96aa252e606cdf6c3cf1032952ec207ec0cf0", "tree": "a5a4299dd32789831eda558b51c0120272846664", "parents": [ "c38446cc65e1f2b3eb8630c53943b94c4f65f670" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Wed Mar 21 16:33:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:56 2012 -0700" }, "message": "mm: make swapin readahead skip over holes\n\nEver since abandoning the virtual scan of processes, for scalability\nreasons, swap space has been a little more fragmented than before. This\ncan lead to the situation where a large memory user is killed, swap space\nends up full of \"holes\" and swapin readahead is totally ineffective.\n\nOn my home system, after killing a leaky firefox it took over an hour to\npage just under 2GB of memory back in, slowing the virtual machines down\nto a crawl.\n\nThis patch makes swapin readahead simply skip over holes, instead of\nstopping at them. This allows the system to swap things back in at rates\nof several MB/second, instead of a few hundred kB/second.\n\nThe checks done in valid_swaphandles are already done in\nread_swap_cache_async as well, allowing us to remove a fair amount of\ncode.\n\n[akpm@linux-foundation.org: fix it for page_cluster \u003e\u003d 32]\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@gmail.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Adrian Drzewiecki \u003cz@drze.net\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": "1a5a9906d4e8d1976b701f889d8f35d54b928f25", "tree": "e51912e725f224663a738045a4d0528d08da4572", "parents": [ "31f6765266417c0d99f0e922fe82848a7c9c2ae9" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Mar 21 16:33:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:54 2012 -0700" }, "message": "mm: thp: fix pmd_bad() triggering in code paths holding mmap_sem read mode\n\nIn some cases it may happen that pmd_none_or_clear_bad() is called with\nthe mmap_sem hold in read mode. In those cases the huge page faults can\nallocate hugepmds under pmd_none_or_clear_bad() and that can trigger a\nfalse positive from pmd_bad() that will not like to see a pmd\nmaterializing as trans huge.\n\nIt\u0027s not khugepaged causing the problem, khugepaged holds the mmap_sem\nin write mode (and all those sites must hold the mmap_sem in read mode\nto prevent pagetables to go away from under them, during code review it\nseems vm86 mode on 32bit kernels requires that too unless it\u0027s\nrestricted to 1 thread per process or UP builds). The race is only with\nthe huge pagefaults that can convert a pmd_none() into a\npmd_trans_huge().\n\nEffectively all these pmd_none_or_clear_bad() sites running with\nmmap_sem in read mode are somewhat speculative with the page faults, and\nthe result is always undefined when they run simultaneously. This is\nprobably why it wasn\u0027t common to run into this. For example if the\nmadvise(MADV_DONTNEED) runs zap_page_range() shortly before the page\nfault, the hugepage will not be zapped, if the page fault runs first it\nwill be zapped.\n\nAltering pmd_bad() not to error out if it finds hugepmds won\u0027t be enough\nto fix this, because zap_pmd_range would then proceed to call\nzap_pte_range (which would be incorrect if the pmd become a\npmd_trans_huge()).\n\nThe simplest way to fix this is to read the pmd in the local stack\n(regardless of what we read, no need of actual CPU barriers, only\ncompiler barrier needed), and be sure it is not changing under the code\nthat computes its value. Even if the real pmd is changing under the\nvalue we hold on the stack, we don\u0027t care. If we actually end up in\nzap_pte_range it means the pmd was not none already and it was not huge,\nand it can\u0027t become huge from under us (khugepaged locking explained\nabove).\n\nAll we need is to enforce that there is no way anymore that in a code\npath like below, pmd_trans_huge can be false, but pmd_none_or_clear_bad\ncan run into a hugepmd. The overhead of a barrier() is just a compiler\ntweak and should not be measurable (I only added it for THP builds). I\ndon\u0027t exclude different compiler versions may have prevented the race\ntoo by caching the value of *pmd on the stack (that hasn\u0027t been\nverified, but it wouldn\u0027t be impossible considering\npmd_none_or_clear_bad, pmd_bad, pmd_trans_huge, pmd_none are all inlines\nand there\u0027s no external function called in between pmd_trans_huge and\npmd_none_or_clear_bad).\n\n\t\tif (pmd_trans_huge(*pmd)) {\n\t\t\tif (next-addr !\u003d HPAGE_PMD_SIZE) {\n\t\t\t\tVM_BUG_ON(!rwsem_is_locked(\u0026tlb-\u003emm-\u003emmap_sem));\n\t\t\t\tsplit_huge_page_pmd(vma-\u003evm_mm, pmd);\n\t\t\t} else if (zap_huge_pmd(tlb, vma, pmd, addr))\n\t\t\t\tcontinue;\n\t\t\t/* fall through */\n\t\t}\n\t\tif (pmd_none_or_clear_bad(pmd))\n\nBecause this race condition could be exercised without special\nprivileges this was reported in CVE-2012-1179.\n\nThe race was identified and fully explained by Ulrich who debugged it.\nI\u0027m quoting his accurate explanation below, for reference.\n\n\u003d\u003d\u003d\u003d\u003d\u003d start quote \u003d\u003d\u003d\u003d\u003d\u003d\u003d\n mapcount 0 page_mapcount 1\n kernel BUG at mm/huge_memory.c:1384!\n\n At some point prior to the panic, a \"bad pmd ...\" message similar to the\n following is logged on the console:\n\n mm/memory.c:145: bad pmd ffff8800376e1f98(80000000314000e7).\n\n The \"bad pmd ...\" message is logged by pmd_clear_bad() before it clears\n the page\u0027s PMD table entry.\n\n 143 void pmd_clear_bad(pmd_t *pmd)\n 144 {\n -\u003e 145 pmd_ERROR(*pmd);\n 146 pmd_clear(pmd);\n 147 }\n\n After the PMD table entry has been cleared, there is an inconsistency\n between the actual number of PMD table entries that are mapping the page\n and the page\u0027s map count (_mapcount field in struct page). When the page\n is subsequently reclaimed, __split_huge_page() detects this inconsistency.\n\n 1381 if (mapcount !\u003d page_mapcount(page))\n 1382 printk(KERN_ERR \"mapcount %d page_mapcount %d\\n\",\n 1383 mapcount, page_mapcount(page));\n -\u003e 1384 BUG_ON(mapcount !\u003d page_mapcount(page));\n\n The root cause of the problem is a race of two threads in a multithreaded\n process. Thread B incurs a page fault on a virtual address that has never\n been accessed (PMD entry is zero) while Thread A is executing an madvise()\n system call on a virtual address within the same 2 MB (huge page) range.\n\n virtual address space\n .---------------------.\n | |\n | |\n .-|---------------------|\n | | |\n | | |\u003c-- B(fault)\n | | |\n 2 MB | |/////////////////////|-.\n huge \u003c |/////////////////////| \u003e A(range)\n page | |/////////////////////|-\u0027\n | | |\n | | |\n \u0027-|---------------------|\n | |\n | |\n \u0027---------------------\u0027\n\n - Thread A is executing an madvise(..., MADV_DONTNEED) system call\n on the virtual address range \"A(range)\" shown in the picture.\n\n sys_madvise\n // Acquire the semaphore in shared mode.\n down_read(\u0026current-\u003emm-\u003emmap_sem)\n ...\n madvise_vma\n switch (behavior)\n case MADV_DONTNEED:\n madvise_dontneed\n zap_page_range\n unmap_vmas\n unmap_page_range\n zap_pud_range\n zap_pmd_range\n //\n // Assume that this huge page has never been accessed.\n // I.e. content of the PMD entry is zero (not mapped).\n //\n if (pmd_trans_huge(*pmd)) {\n // We don\u0027t get here due to the above assumption.\n }\n //\n // Assume that Thread B incurred a page fault and\n .---------\u003e // sneaks in here as shown below.\n | //\n | if (pmd_none_or_clear_bad(pmd))\n | {\n | if (unlikely(pmd_bad(*pmd)))\n | pmd_clear_bad\n | {\n | pmd_ERROR\n | // Log \"bad pmd ...\" message here.\n | pmd_clear\n | // Clear the page\u0027s PMD entry.\n | // Thread B incremented the map count\n | // in page_add_new_anon_rmap(), but\n | // now the page is no longer mapped\n | // by a PMD entry (-\u003e inconsistency).\n | }\n | }\n |\n v\n - Thread B is handling a page fault on virtual address \"B(fault)\" shown\n in the picture.\n\n ...\n do_page_fault\n __do_page_fault\n // Acquire the semaphore in shared mode.\n down_read_trylock(\u0026mm-\u003emmap_sem)\n ...\n handle_mm_fault\n if (pmd_none(*pmd) \u0026\u0026 transparent_hugepage_enabled(vma))\n // We get here due to the above assumption (PMD entry is zero).\n do_huge_pmd_anonymous_page\n alloc_hugepage_vma\n // Allocate a new transparent huge page here.\n ...\n __do_huge_pmd_anonymous_page\n ...\n spin_lock(\u0026mm-\u003epage_table_lock)\n ...\n page_add_new_anon_rmap\n // Here we increment the page\u0027s map count (starts at -1).\n atomic_set(\u0026page-\u003e_mapcount, 0)\n set_pmd_at\n // Here we set the page\u0027s PMD entry which will be cleared\n // when Thread A calls pmd_clear_bad().\n ...\n spin_unlock(\u0026mm-\u003epage_table_lock)\n\n The mmap_sem does not prevent the race because both threads are acquiring\n it in shared mode (down_read). Thread B holds the page_table_lock while\n the page\u0027s map count and PMD table entry are updated. However, Thread A\n does not synchronize on that lock.\n\n\u003d\u003d\u003d\u003d\u003d\u003d end quote \u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\n[akpm@linux-foundation.org: checkpatch fixes]\nReported-by: Ulrich Obergfell \u003cuobergfe@redhat.com\u003e\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nAcked-by: Larry Woodman \u003clwoodman@redhat.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t\t[2.6.38+]\nCc: Mark Salter \u003cmsalter@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "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": "9b04c5fec43c0da610a2c37f70c5b013101a6ad7", "tree": "f04767281b7067fba91cf0d37440bf454c492e38", "parents": [ "c3eede8e0a1292d95c051cf947738687b9c42322" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Fri Nov 25 23:14:39 2011 +0800" }, "committer": { "name": "Cong Wang", "email": "xiyou.wangcong@gmail.com", "time": "Tue Mar 20 21:48:27 2012 +0800" }, "message": "mm: remove the second argument of k[un]map_atomic()\n\nSigned-off-by: Cong Wang \u003camwang@redhat.com\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": "72835c86ca15d0126354b73d5f29ce9194931c9b", "tree": "369f31168b405e4d597b3cd067a1fd0ac2025dbc", "parents": [ "ec0fffd84b162e0563a28a81aa049f946b31a8e2" ], "author": { "name": "Johannes Weiner", "email": "jweiner@redhat.com", "time": "Thu Jan 12 17:18:32 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:06 2012 -0800" }, "message": "mm: unify remaining mem_cont, mem, etc. variable names to memcg\n\nSigned-off-by: Johannes Weiner \u003cjweiner@redhat.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.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": "f90ac3982a78d36f894824636beeef13361d7c59", "tree": "64bbe3b415bdfc151dc44f6b4c216c65351eb53c", "parents": [ "938929f14cb595f43cd1a4e63e22d36cab1e4a1f" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Tue Jan 10 15:07:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:42 2012 -0800" }, "message": "mm: avoid livelock on !__GFP_FS allocations\n\nColin Cross reported;\n\n Under the following conditions, __alloc_pages_slowpath can loop forever:\n gfp_mask \u0026 __GFP_WAIT is true\n gfp_mask \u0026 __GFP_FS is false\n reclaim and compaction make no progress\n order \u003c\u003d PAGE_ALLOC_COSTLY_ORDER\n\n These conditions happen very often during suspend and resume,\n when pm_restrict_gfp_mask() effectively converts all GFP_KERNEL\n allocations into __GFP_WAIT.\n\n The oom killer is not run because gfp_mask \u0026 __GFP_FS is false,\n but should_alloc_retry will always return true when order is less\n than PAGE_ALLOC_COSTLY_ORDER.\n\nIn his fix, he avoided retrying the allocation if reclaim made no progress\nand __GFP_FS was not set. The problem is that this would result in\nGFP_NOIO allocations failing that previously succeeded which would be very\nunfortunate.\n\nThe big difference between GFP_NOIO and suspend converting GFP_KERNEL to\nbehave like GFP_NOIO is that normally flushers will be cleaning pages and\nkswapd reclaims pages allowing GFP_NOIO to succeed after a short delay.\nThe same does not necessarily apply during suspend as the storage device\nmay be suspended.\n\nThis patch special cases the suspend case to fail the page allocation if\nreclaim cannot make progress and adds some documentation on how\ngfp_allowed_mask is currently used. Failing allocations like this may\ncause suspend to abort but that is better than a livelock.\n\n[mgorman@suse.de: Rework fix to be suspend specific]\n[rientjes@google.com: Move suspended device check to should_alloc_retry]\nReported-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "43362a4977e37db46f86f7e6ab935f0006956632", "tree": "5ab7070237ebd3f40d7fcfc0066586422da8310a", "parents": [ "c9f01245b6a7d77d17deaa71af10f6aca14fa24e" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Mon Oct 31 17:07:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:30:45 2011 -0700" }, "message": "oom: fix race while temporarily setting current\u0027s oom_score_adj\n\ntest_set_oom_score_adj() was introduced in 72788c385604 (\"oom: replace\nPF_OOM_ORIGIN with toggling oom_score_adj\") to temporarily elevate\ncurrent\u0027s oom_score_adj for ksm and swapoff without requiring an\nadditional per-process flag.\n\nUsing that function to both set oom_score_adj to OOM_SCORE_ADJ_MAX and\nthen reinstate the previous value is racy since it\u0027s possible that\nuserspace can set the value to something else itself before the old value\nis reinstated. That results in userspace setting current\u0027s oom_score_adj\nto a different value and then the kernel immediately setting it back to\nits previous value without notification.\n\nTo fix this, a new compare_swap_oom_score_adj() function is introduced\nwith the same semantics as the compare and swap CAS instruction, or\nCMPXCHG on x86. It is used to reinstate the previous value of\noom_score_adj if and only if the present value is the same as the old\nvalue.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: 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": "e25934a51772f47edd94d7b7d08b0e167769639c", "tree": "c72dd84e95178d1e5e5223bf5a736e75430f1305", "parents": [ "9a418455134f5dc23f124d2818b2e8e1cea997a1" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu May 26 15:58:15 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 09:20:11 2011 -0400" }, "message": "mm: delete various needless include \u003clinux/module.h\u003e\n\nThere is nothing modular in these files, and no reason to drag\nin all the 357 headers that module.h brings with it, since\nit just slows down compiles.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "a2c16d6cb0e478812829ca84aeabd02e36af35eb", "tree": "7803a522da5deee7ce753dc5404dca01f42aa176", "parents": [ "6328650bb4d854a7dc1498d1c0048b838b0d340c" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Aug 03 16:21:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 03 14:25:22 2011 -1000" }, "message": "mm: let swap use exceptional entries\n\nIf swap entries are to be stored along with struct page pointers in a\nradix tree, they need to be distinguished as exceptional entries.\n\nMost of the handling of swap entries in radix tree will be contained in\nshmem.c, but a few functions in filemap.c\u0027s common code need to check\nfor their appearance: find_get_page(), find_lock_page(),\nfind_get_pages() and find_get_pages_contig().\n\nSo as not to slow their fast paths, tuck those checks inside the\nexisting checks for unlikely radix_tree_deref_slot(); except for\nfind_lock_page(), where it is an added test. And make it a BUG in\nfind_get_pages_tag(), which is not applied to tmpfs files.\n\nA part of the reason for eliminating shmem_readpage() earlier, was to\nminimize the places where common code would need to allow for swap\nentries.\n\nThe swp_entry_t known to swapfile.c must be massaged into a slightly\ndifferent form when stored in the radix tree, just as it gets massaged\ninto a pte_t when stored in page tables.\n\nIn an i386 kernel this limits its information (type and page offset) to\n30 bits: given 32 \"types\" of swapfile and 4kB pagesize, that\u0027s a maximum\nswapfile size of 128GB. Which is less than the 512GB we previously\nallowed with X86_PAE (where the swap entry can occupy the entire upper\n32 bits of a pte_t), but not a new limitation on 32-bit without PAE; and\nthere\u0027s not a new limitation on 64-bit (where swap filesize is already\nlimited to 16TB by a 32-bit page offset). Thirty areas of 128GB is\nprobably still enough swap for a 64GB 32-bit machine.\n\nProvide swp_to_radix_entry() and radix_to_swp_entry() conversions, and\nenforce filesize limit in read_swap_header(), just as for ptes.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f15146380d28b746df3c8b81b392812eb982382a", "tree": "bf43b38b60c21bd01b007c9636062783d406eb29", "parents": [ "72c5052ddc3956d847f21c2b8d55c93664a51b2c" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Tue Jul 12 20:48:39 2011 +0200" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Jul 20 20:47:50 2011 -0400" }, "message": "fs: seq_file - add event counter to simplify poll() support\n\nMoving the event counter into the dynamically allocated \u0027struc seq_file\u0027\nallows poll() support without the need to allocate its own tracking\nstructure.\n\nAll current users are switched over to use the new counter.\n\nRequested-by: Andrew Morton akpm@linux-foundation.org\nAcked-by: NeilBrown \u003cneilb@suse.de\u003e\nTested-by: Lucas De Marchi lucas.demarchi@profusion.mobi\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "072441e21ddcd1140606b7d4ef6eab579a86b0b3", "tree": "6f059ad83c09dfbeb1def29e805839db3e5bf85f", "parents": [ "5b8ba10198a109f8a02380648c5d29000caa9c55" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "mm: move shmem prototypes to shmem_fs.h\n\nBefore adding any more global entry points into shmem.c, gather such\nprototypes into shmem_fs.h. Remove mm\u0027s own declarations from swap.h,\nbut for now leave the ones in mm.h: because shmem_file_setup() and\nshmem_zero_setup() are called from various places, and we should not\nforce other subsystems to update immediately.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@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": "72788c385604523422592249c19cba0187021e9b", "tree": "3552a4b6ae4adb77e723d8a8d1d2669bfb04a8bb", "parents": [ "c6a140bf164829769499b5e50d380893da39b29e" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Tue May 24 17:11:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:10 2011 -0700" }, "message": "oom: replace PF_OOM_ORIGIN with toggling oom_score_adj\n\nThere\u0027s a kernel-wide shortage of per-process flags, so it\u0027s always\nhelpful to trim one when possible without incurring a significant penalty.\n It\u0027s even more important when you\u0027re planning on adding a per- process\nflag yourself, which I plan to do shortly for transparent hugepages.\n\nPF_OOM_ORIGIN is used by ksm and swapoff to prefer current since it has a\ntendency to allocate large amounts of memory and should be preferred for\nkilling over other tasks. We\u0027d rather immediately kill the task making\nthe errant syscall rather than penalizing an innocent task.\n\nThis patch removes PF_OOM_ORIGIN since its behavior is equivalent to\nsetting the process\u0027s oom_score_adj to OOM_SCORE_ADJ_MAX.\n\nThe process\u0027s old oom_score_adj is stored and then set to\nOOM_SCORE_ADJ_MAX during the time it used to have PF_OOM_ORIGIN. The old\nvalue is then reinstated when the process should no longer be considered a\nhigh priority for oom killing.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Izik Eidus \u003cieidus@redhat.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6c5103890057b1bb781b26b7aae38d33e4c517d8", "tree": "e6e57961dcddcb5841acb34956e70b9dc696a880", "parents": [ "3dab04e6978e358ad2307bca563fabd6c5d2c58b", "9d2e157d970a73b3f270b631828e03eb452d525e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 10:16:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 10:16:26 2011 -0700" }, "message": "Merge branch \u0027for-2.6.39/core\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.39/core\u0027 of git://git.kernel.dk/linux-2.6-block: (65 commits)\n Documentation/iostats.txt: bit-size reference etc.\n cfq-iosched: removing unnecessary think time checking\n cfq-iosched: Don\u0027t clear queue stats when preempt.\n blk-throttle: Reset group slice when limits are changed\n blk-cgroup: Only give unaccounted_time under debug\n cfq-iosched: Don\u0027t set active queue in preempt\n block: fix non-atomic access to genhd inflight structures\n block: attempt to merge with existing requests on plug flush\n block: NULL dereference on error path in __blkdev_get()\n cfq-iosched: Don\u0027t update group weights when on service tree\n fs: assign sb-\u003es_bdi to default_backing_dev_info if the bdi is going away\n block: Require subsystems to explicitly allocate bio_set integrity mempool\n jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging\n jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging\n fs: make fsync_buffers_list() plug\n mm: make generic_writepages() use plugging\n blk-cgroup: Add unaccounted time to timeslice_used.\n block: fixup plugging stubs for !CONFIG_BLOCK\n block: remove obsolete comments for blkdev_issue_zeroout.\n blktrace: Use rq-\u003ecmd_flags directly in blk_add_trace_rq.\n ...\n\nFix up conflicts in fs/{aio.c,super.c}\n" }, { "commit": "56039efa18f2530fc23e8ef19e716b65ee2a1d1e", "tree": "a61cbd2f760e93363657622de2cd1591db028458", "parents": [ "6c191cd01a935e5b53ef43c9403c771bb7a32b60" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Mar 23 16:42:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 19:46:22 2011 -0700" }, "message": "memcg: fix ugly initialization of return value is in caller\n\nRemove initialization of vaiable in caller of memory cgroup function.\nActually, it\u0027s return value of memcg function but it\u0027s initialized in\ncaller.\n\nSome memory cgroup uses following style to bring the result of start\nfunction to the end function for avoiding races.\n\n mem_cgroup_start_A(\u0026(*ptr))\n /* Something very complicated can happen here. */\n mem_cgroup_end_A(*ptr)\n\nIn some calls, *ptr should be initialized to NULL be caller. But it\u0027s\nugly. This patch fixes that *ptr is initialized by _start function.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2130781e2aaab66e5a9f2fdc8af35da0153f405c", "tree": "ccd654b948587a39b219f74e6cfd73ef6daa3658", "parents": [ "04948c7f80b9446009c1c4791bb93e79729724fb" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 23:03:13 2011 -0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 23 07:54:22 2011 -0700" }, "message": "sys_swapon: fix inode locking\n\nA conflict between 52c50567d8ab (\"mm: swap: unlock swapfile inode mutex\nbefore closing file on bad swapfiles\") and 83ef99befc32 (\"sys_swapon:\nremove did_down variable\") caused a double unlock of the inode mutex\n(once in bad_swap: before the filp_close, once at the end just before\nreturning).\n\nThe patch which added the extra unlock cleared did_down to avoid\nunlocking twice, but the other patch removed the did_down variable.\n\nTo fix, set inode to NULL after the first unlock, since it will be used\nafter that point only for the final unlock.\n\nWhile checking this patch, I found a path which could unlock without\nlocking, in case the same inode was added as a swapfile twice. To fix,\nmove the setting of the inode variable further down, to just before\nclaim_swapfile, which will lock the inode before doing anything else.\n\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Eric B Munson \u003cemunson@mgebm.net\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "24b8ff7c27d9e975540656e377de44a2a181a01f", "tree": "cab32a01878ce32b46f41b71317421e894f183ea", "parents": [ "40531542e2832419566c997af0808513f6f2815d" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:38 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:09 2011 -0700" }, "message": "mm: remove inline from scan_swap_map()\n\nscan_swap_map() is a large function (224 lines), with several loops and a\ncomplex control flow involving several gotos.\n\nGiven all that, it is a bit silly that it is marked as inline. The\ncompiler agrees with me: on a x86-64 compile, it did not inline the\nfunction.\n\nRemove the \"inline\" and let the compiler decide instead.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@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": "40531542e2832419566c997af0808513f6f2815d", "tree": "06e0bb32e53447f58a1821af1c4e960edbd97b0d", "parents": [ "c6a2b64ba5d09a1e281e85988ffd650655fa0f39" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:37 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:08 2011 -0700" }, "message": "sys_swapon: separate final enabling of the swapfile\n\nThe block in sys_swapon which does the final adjustments to the\nswap_info_struct and to swap_list is the same as the block which\nre-inserts it again at sys_swapoff on failure of try_to_unuse(). Move\nthis code to a separate function, and use it both in sys_swapon and\nsys_swapoff.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "c6a2b64ba5d09a1e281e85988ffd650655fa0f39", "tree": "5d3787b45e2e4ad7377c47cd601a1fcb1fec0bde", "parents": [ "c69dbfb84e88503468b6c481aecdb48d76ad5bc6" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:08 2011 -0700" }, "message": "sys_swapoff: change order to match sys_swapon\n\nThe block in sys_swapon which does the final adjustments to the\nswap_info_struct and to swap_list is the same as the block which\nre-inserts it again at sys_swapoff on failure of try_to_unuse(), except\nfor the order of the operations within the lock. Since the order should\nnot matter, arbitrarily change sys_swapoff to match sys_swapon, in\npreparation to making both share the same code.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "c69dbfb84e88503468b6c481aecdb48d76ad5bc6", "tree": "ade74b75b80a0481ae6309c9cb0bc7298db13ad7", "parents": [ "9c8100ef26ba9012b8677a383179a0cf169fc7f3" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:08 2011 -0700" }, "message": "sys_swapon: move printk outside lock\n\nThe block in sys_swapon which does the final adjustments to the\nswap_info_struct and to swap_list is the same as the block which\nre-inserts it again at sys_swapoff on failure of try_to_unuse(). To be\nable to make both share the same code, move the printk() call in the\nmiddle of it to just after it.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "9c8100ef26ba9012b8677a383179a0cf169fc7f3", "tree": "6ff570c8373dbb90b47345b2adc0b0c9c9b11001", "parents": [ "bdb8e3f68320f897de3f3a4c363fe2802037f21d" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:08 2011 -0700" }, "message": "sys_swapon: remove nr_good_pages variable\n\nIt still exists within setup_swap_map_and_extents(), but after it\nnr_good_pages \u003d\u003d p-\u003epages.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "bdb8e3f68320f897de3f3a4c363fe2802037f21d", "tree": "0eeb4907e05daa418ec8e98c2492b4177ab67e3c", "parents": [ "915d4d7bc0d719f2f0907273c01967d38751c625" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:08 2011 -0700" }, "message": "sys_swapon: simplify error flow in setup_swap_map_and_extents()\n\nSince there is no cleanup to do, there is no reason to jump to a label.\nReturn directly instead.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "915d4d7bc0d719f2f0907273c01967d38751c625", "tree": "deeab9a10407fa37dedb24d1adc5a83626f740f6", "parents": [ "1421ef3cd15b87ef949e965efeb1e527479d3f75" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:08 2011 -0700" }, "message": "sys_swapon: separate parsing of bad blocks and extents\n\nMove the code which parses the bad block list and the extents to a\nseparate function. Only code movement, no functional changes.\n\nThis change uses the fact that, after the success path, nr_good_pages \u003d\u003d\np-\u003epages.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "1421ef3cd15b87ef949e965efeb1e527479d3f75", "tree": "8bcc6d1047905b205a7061c00bda40197fad2328", "parents": [ "38719025384cf7121331bd6d41c062d3c5f7bb91" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:08 2011 -0700" }, "message": "sys_swapon: call swap_cgroup_swapon() earlier\n\nThe call to swap_cgroup_swapon is in the middle of loading the swap map\nand extents. As it only does memory allocation and does not depend on\nthe swapfile layout (map/extents), it can be called earlier (or later).\n\nMove it to just after the allocation of swap_map, since it is\nconceptually similar (allocates a map).\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "38719025384cf7121331bd6d41c062d3c5f7bb91", "tree": "8848283db6cd61b426491f17de38d9bc15697514", "parents": [ "ca8bd38bf6f05481c4155fc444178151884f65d0" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:30 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:08 2011 -0700" }, "message": "sys_swapon: simplify error flow in read_swap_header()\n\nSince there is no cleanup to do, there is no reason to jump to a label.\nReturn directly instead.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "ca8bd38bf6f05481c4155fc444178151884f65d0", "tree": "efb917f23834153878a8f9f4c5f784e9cb900f66", "parents": [ "5de771e41f0fc2243c39585357b73f0ff757b280" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:07 2011 -0700" }, "message": "sys_swapon: separate parsing of swapfile header\n\nMove the code which parses and checks the swapfile header (except for\nthe bad block list) to a separate function. Only code movement, no\nfunctional changes.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "5de771e41f0fc2243c39585357b73f0ff757b280", "tree": "a807bb46f4334b6697c0dba7dc80075e8dccae5f", "parents": [ "87ade72a799a9a895b4a60918c32b43d3dfc3324" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:28 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:07 2011 -0700" }, "message": "sys_swapon: move setting of swapfilepages near use\n\nThere is no reason I can see to read inode-\u003ei_size long before it is\nneeded. Move its read to just before it is needed, to reduce the\nvariable lifetime.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "87ade72a799a9a895b4a60918c32b43d3dfc3324", "tree": "3110f7526fc3581962232b39567fee2fb95c44aa", "parents": [ "4d0e1e10752ca487d83d1ab2a1d4ae6d664e1cc0" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:07 2011 -0700" }, "message": "sys_swapon: simplify error flow in claim_swapfile()\n\nSince there is no cleanup to do, there is no reason to jump to a label.\nReturn directly instead.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "4d0e1e10752ca487d83d1ab2a1d4ae6d664e1cc0", "tree": "57f0c09fd4e61a02e4ad5cd86b1dbda7029b2806", "parents": [ "bd69010b042a60ca41a890df1b10019e94746c2f" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:07 2011 -0700" }, "message": "sys_swapon: separate bdev claim and inode lock\n\nMove the code which claims the bdev (S_ISBLK) or locks the inode\n(S_ISREG) to a separate function. Only code movement, no functional\nchanges.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "bd69010b042a60ca41a890df1b10019e94746c2f", "tree": "4064703903170911b09919f89b74a5bbe0d5ebfe", "parents": [ "9b01c350af4fb00fe2ab66ff9bf16058c50b69bd" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:07 2011 -0700" }, "message": "sys_swapon: use a single error label\n\nsys_swapon currently has two error labels, bad_swap and bad_swap_2.\nbad_swap does the same as bad_swap_2 plus destroy_swap_extents() and\nswap_cgroup_swapoff(); both are noops in the places where bad_swap_2 is\njumped to. With a single extra test for inode (matching the one in the\nS_ISREG case below), all the error paths in the function can go to\nbad_swap.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "9b01c350af4fb00fe2ab66ff9bf16058c50b69bd", "tree": "246a4e93384acaca2ae91826448bfed5da08cb07", "parents": [ "f2090d2df51d7cdb2f952dcfdcd8baaac0aec444" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:24 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:07 2011 -0700" }, "message": "sys_swapon: do only cleanup in the cleanup blocks\n\nThe only way error is 0 in the cleanup blocks is when the function is\nreturning successfully. In this case, the cleanup blocks were setting\nS_SWAPFILE in the S_ISREG case. But this is not a cleanup.\n\nMove the setting of S_SWAPFILE to just before the \"goto out;\" to make\nthis more clear. At this point, we do not need to test for inode because\nit will never be NULL.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "f2090d2df51d7cdb2f952dcfdcd8baaac0aec444", "tree": "474daba281f890d44ee22b23137d99cb5021f381", "parents": [ "7de7fb6b3422e6d1dac00666a992834085e745dc" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:23 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:07 2011 -0700" }, "message": "sys_swapon: remove bdev variable\n\nThe bdev variable is always equivalent to (S_ISBLK(inode-\u003ei_mode) ?\np-\u003ebdev : NULL), as long as it being set is moved to a bit earlier. Use\nthis fact to remove the bdev variable.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "7de7fb6b3422e6d1dac00666a992834085e745dc", "tree": "4dd93f9871c1ff05212652a1e4709414a4881f1d", "parents": [ "83ef99befc324803a54cf2a5fab5a322df3a99d6" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:07 2011 -0700" }, "message": "sys_swapon: move setting of error nearer use\n\nMove the setting of the error variable nearer the goto in a few places.\n\nAvoids calling PTR_ERR() if not IS_ERR() in two places, and makes the\nerror condition more explicit in two other places.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "83ef99befc324803a54cf2a5fab5a322df3a99d6", "tree": "d56035f4683a387ac8bf0d37b21b15f7d04de672", "parents": [ "28b36bd741bd44db30e12b1048a659aa346e9b76" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:07 2011 -0700" }, "message": "sys_swapon: remove did_down variable\n\nSince mutex_lock(\u0026inode-\u003ei_mutex) is called just after setting inode,\ndid_down is always equivalent to (inode \u0026\u0026 S_ISREG(inode-\u003ei_mode)).\n\nUse this fact to remove the did_down variable.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "28b36bd741bd44db30e12b1048a659aa346e9b76", "tree": "7843ec3dd5f4db132c4808b08daf98d795074dea", "parents": [ "730c0581c82dbc5be2f41a2d85bde6bad11bc8a4" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:07 2011 -0700" }, "message": "sys_swapon: remove initial value of name variable\n\nNow there is nothing which jumps to the cleanup blocks before the name\nvariable is set. There is no need to set it initially to NULL anymore.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "730c0581c82dbc5be2f41a2d85bde6bad11bc8a4", "tree": "de06f9f0e12ec8fe963a0bca3835ef0a72dd9191", "parents": [ "2542e5134d2c19a9e6a4e641ef78cac6bccebd9b" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:06 2011 -0700" }, "message": "sys_swapon: simplify error flow in alloc_swap_info()\n\nSince there is no cleanup to do, there is no reason to jump to a label.\nReturn directly instead.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "2542e5134d2c19a9e6a4e641ef78cac6bccebd9b", "tree": "bcab086064e082d2b2275766327bb5518b81318f", "parents": [ "53cbb2435f161f2a8b36af8f6d2c46dc59d0d757" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:06 2011 -0700" }, "message": "sys_swapon: simplify error return from swap_info allocation\n\nAt this point in sys_swapon, there is nothing to free. Return directly\ninstead of jumping to the cleanup block at the end of the function.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "53cbb2435f161f2a8b36af8f6d2c46dc59d0d757", "tree": "e32652c07e3a65bbe29d04df8daf3cc753945c51", "parents": [ "e8e6c2ec403ecfaa226857d8204344c98fe12b7b" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:06 2011 -0700" }, "message": "sys_swapon: separate swap_info allocation\n\nMove the swap_info allocation to its own function. Only code movement,\nno functional changes.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "e8e6c2ec403ecfaa226857d8204344c98fe12b7b", "tree": "93a3cdaf385c72ba1f98add399b34ba65608efff", "parents": [ "80b0df12b808bf8e8391afae1b43f5e529f76d89" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:06 2011 -0700" }, "message": "sys_swapon: do not depend on \"type\" after allocation\n\nWithin sys_swapon, after the swap_info entry has been allocated, we\nalways have type \u003d\u003d p-\u003etype and swap_info[type] \u003d\u003d p. Use this fact to\nreduce the dependency on the \"type\" local variable within the function,\nas a preparation to move the allocation of the swap_info entry to a\nseparate function.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujisu.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": "80b0df12b808bf8e8391afae1b43f5e529f76d89", "tree": "1d71923d9e693f3dfb9dbc28b3ddcec80e6b2eff", "parents": [ "803d0c8351b47b72b8b018457a33b342557b90a2" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:05 2011 -0700" }, "message": "sys_swapon: remove changelog from function comment\n\nChangelogs belong in the git history instead of in the source code.\n\nAlso, \"The swapon system call\" is redundant with\n\"SYSCALL_DEFINE2(swapon, ...)\".\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n[ Gaah. That\u0027s a _historical_ comment. But the patch-series depends on removal ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "803d0c8351b47b72b8b018457a33b342557b90a2", "tree": "feb660ed5b7b6fd3dfba9ec3e6f121c777ba6252", "parents": [ "cc5d462f7777c06c5cf0b55d736be325cda747b3" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Tue Mar 22 16:33:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:44:05 2011 -0700" }, "message": "sys_swapon: use vzalloc() instead of vmalloc/memset\n\nThis patch series refactors the sys_swapon function.\n\nsys_swapon is currently a very large function, with 313 lines (more than\n12 25-line screens), which can make it a bit hard to read. This patch\nseries reduces this size by half, by extracting large chunks of related\ncode to new helper functions.\n\nOne of these chunks of code was nearly identical to the part of\nsys_swapoff which is used in case of a failure return from\ntry_to_unuse(), so this patch series also makes both share the same\ncode.\n\nAs a side effect of all this refactoring, the compiled code gets a bit\nsmaller (from v1 of this patch series):\n\n text data bss dec hex filename\n 14012 944 276 15232 3b80 mm/swapfile.o.before\n 13941 944 276 15161 3b39 mm/swapfile.o.after\n\nThis patch:\n\nUse vzalloc() instead of vmalloc/memset.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nTested-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nAcked-by: Eric B Munson \u003cemunson@mgebm.net\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nReviewed-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.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": "52c50567d8ab0a0a87f12cceaa4194967854f0bd", "tree": "11644ba2fd533fdd39631254fc9cfc2699dfb8ae", "parents": [ "c7a1fcd8e6e0c3c8f4f8f74fc926ff04da3bf7a7" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Tue Mar 22 16:30:08 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 22 17:43:58 2011 -0700" }, "message": "mm: swap: unlock swapfile inode mutex before closing file on bad swapfiles\n\nIf an administrator tries to swapon a file backed by NFS, the inode mutex is\ntaken (as it is for any swapfile) but later identified to be a bad swapfile\ndue to the lack of bmap and tries to cleanup. During cleanup, an attempt is\nmade to close the file but with inode-\u003ei_mutex still held. Closing an NFS\nfile syncs it which tries to acquire the inode mutex leading to deadlock. If\nlockdep is enabled the following appears on the console;\n\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\n [ INFO: possible recursive locking detected ]\n 2.6.38-rc8-autobuild #1\n ---------------------------------------------\n swapon/2192 is trying to acquire lock:\n (\u0026sb-\u003es_type-\u003ei_mutex_key#13){+.+.+.}, at: vfs_fsync_range+0x47/0x7c\n\n but task is already holding lock:\n (\u0026sb-\u003es_type-\u003ei_mutex_key#13){+.+.+.}, at: sys_swapon+0x28d/0xae7\n\n other info that might help us debug this:\n 1 lock held by swapon/2192:\n #0: (\u0026sb-\u003es_type-\u003ei_mutex_key#13){+.+.+.}, at: sys_swapon+0x28d/0xae7\n\n stack backtrace:\n Pid: 2192, comm: swapon Not tainted 2.6.38-rc8-autobuild #1\n Call Trace:\n __lock_acquire+0x2eb/0x1623\n find_get_pages_tag+0x14a/0x174\n pagevec_lookup_tag+0x25/0x2e\n vfs_fsync_range+0x47/0x7c\n lock_acquire+0xd3/0x100\n vfs_fsync_range+0x47/0x7c\n nfs_flush_one+0x0/0xdf [nfs]\n mutex_lock_nested+0x40/0x2b1\n vfs_fsync_range+0x47/0x7c\n vfs_fsync_range+0x47/0x7c\n vfs_fsync+0x1c/0x1e\n nfs_file_flush+0x64/0x69 [nfs]\n filp_close+0x43/0x72\n sys_swapon+0xa39/0xae7\n sysret_check+0x2e/0x69\n system_call_fastpath+0x16/0x1b\n\nThis patch releases the mutex if its held before calling filep_close()\nso swapon fails as expected without deadlock when the swapfile is backed\nby NFS. If accepted for 2.6.39, it should also be considered a -stable\ncandidate for 2.6.38 and 2.6.37.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[2.6.37+]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4c63f5646e405b5010cc9499419060bf2e838f5b", "tree": "df91ba315032c8ec4aafeb3ab96fdfa7c6c656e1", "parents": [ "cafb0bfca1a73efd6d8a4a6a6a716e6134b96c24", "69d60eb96ae8a73cf9b79cf28051caf973006011" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:58:35 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:58:35 2011 +0100" }, "message": "Merge branch \u0027for-2.6.39/stack-plug\u0027 into for-2.6.39/core\n\nConflicts:\n\tblock/blk-core.c\n\tblock/blk-flush.c\n\tdrivers/md/raid1.c\n\tdrivers/md/raid10.c\n\tdrivers/md/raid5.c\n\tfs/nilfs2/btnode.c\n\tfs/nilfs2/mdt.c\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "7eaceaccab5f40bbfda044629a6298616aeaed50", "tree": "33954d12f63e25a47eb6d86ef3d3d0a5e62bf752", "parents": [ "73c101011926c5832e6e141682180c4debe2cf45" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:52:07 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:52:07 2011 +0100" }, "message": "block: remove per-queue plugging\n\nCode has been converted over to the new explicit on-stack plugging,\nand delay users have been converted to use the new API for that.\nSo lets kill off the old plugging along with aops-\u003esync_page().\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "8074b26f67165bf045d92e778c9c10dc5e207fc6", "tree": "7f4870224b54121fbfea83cd77ea41f7ab3a00d8", "parents": [ "3c522cedb572bb8d2e4867f358bdaa7d0c53d88c" ], "author": { "name": "Miklos Szeredi", "email": "mszeredi@suse.cz", "time": "Thu Feb 24 15:49:53 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 24 08:55:01 2011 -0800" }, "message": "mm: fix refcounting in swapon\n\nGrab a reference to bdev before calling blkdev_get(), which expects\nthe refcount to be already incremented and either returns success or\ndecrements the refcount and returns an error.\n\nThe bug was introduced by e525fd89 (block: make blkdev_get/put()\nhandle exclusive access), which didn\u0027t take into account this behavior\nof blkdev_get().\n\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3f04f62f90d46a82dd73027c5fd7a15daed5c33d", "tree": "c267f1bdde3f3a7b2a8b52347fa5ad6053cff435", "parents": [ "bae9c19bf12bb2a914a8e530270f41d36cc87c63" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Thu Jan 13 15:46:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 17:32:41 2011 -0800" }, "message": "thp: split_huge_page paging\n\nPaging logic that splits the page before it is unmapped and added to swap\nto ensure backwards compatibility with the legacy swap code. Eventually\nswap should natively pageout the hugepages to increase performance and\ndecrease seeking and fragmentation of swap space. swapoff can just skip\nover huge pmd as they cannot be part of swap yet. In add_to_swap be\ncareful to split the page only if we got a valid swap entry so we don\u0027t\nsplit hugepages with a full swap.\n\nIn theory we could split pages before isolating them during the lru scan,\nbut for khugepaged to be safe, I\u0027m relying on either mmap_sem write mode,\nor PG_lock taken, so split_huge_page has to run either with mmap_sem\nread/write mode or PG_lock taken. Calling it from isolate_lru_page would\nmake locking more complicated, in addition to that split_huge_page would\ndeadlock if called by __isolate_lru_page because it has to take the lru\nlock to add the tail pages.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e525fd89d380c4a94c0d63913a1dd1a593ed25e7", "tree": "d226ef40d3f99e42fcf272ad432585cbd641ebec", "parents": [ "e09b457bdb7e8d23fc54dcef0930ac697d8de895" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Nov 13 11:55:17 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Nov 13 11:55:17 2010 +0100" }, "message": "block: make blkdev_get/put() handle exclusive access\n\nOver time, block layer has accumulated a set of APIs dealing with bdev\nopen, close, claim and release.\n\n* blkdev_get/put() are the primary open and close functions.\n\n* bd_claim/release() deal with exclusive open.\n\n* open/close_bdev_exclusive() are combination of open and claim and\n the other way around, respectively.\n\n* bd_link/unlink_disk_holder() to create and remove holder/slave\n symlinks.\n\n* open_by_devnum() wraps bdget() + blkdev_get().\n\nThe interface is a bit confusing and the decoupling of open and claim\nmakes it impossible to properly guarantee exclusive access as\nin-kernel open + claim sequence can disturb the existing exclusive\nopen even before the block layer knows the current open if for another\nexclusive access. Reorganize the interface such that,\n\n* blkdev_get() is extended to include exclusive access management.\n @holder argument is added and, if is @FMODE_EXCL specified, it will\n gain exclusive access atomically w.r.t. other exclusive accesses.\n\n* blkdev_put() is similarly extended. It now takes @mode argument and\n if @FMODE_EXCL is set, it releases an exclusive access. Also, when\n the last exclusive claim is released, the holder/slave symlinks are\n removed automatically.\n\n* bd_claim/release() and close_bdev_exclusive() are no longer\n necessary and either made static or removed.\n\n* bd_link_disk_holder() remains the same but bd_unlink_disk_holder()\n is no longer necessary and removed.\n\n* open_bdev_exclusive() becomes a simple wrapper around lookup_bdev()\n and blkdev_get(). It also has an unexpected extra bdev_read_only()\n test which probably should be moved into blkdev_get().\n\n* open_by_devnum() is modified to take @holder argument and pass it to\n blkdev_get().\n\nMost of bdev open/close operations are unified into blkdev_get/put()\nand most exclusive accesses are tested atomically at the open time (as\nit should). This cleans up code and removes some, both valid and\ninvalid, but unnecessary all the same, corner cases.\n\nopen_bdev_exclusive() and open_by_devnum() can use further cleanup -\nrename to blkdev_get_by_path() and blkdev_get_by_devt() and drop\nspecial features. Well, let\u0027s leave them for another day.\n\nMost conversions are straight-forward. drbd conversion is a bit more\ninvolved as there was some reordering, but the logic should stay the\nsame.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Neil Brown \u003cneilb@suse.de\u003e\nAcked-by: Ryusuke Konishi \u003ckonishi.ryusuke@lab.ntt.co.jp\u003e\nAcked-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nAcked-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nCc: Peter Osterlund \u003cpetero2@telia.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Andreas Dilger \u003cadilger.kernel@dilger.ca\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjoel.becker@oracle.com\u003e\nCc: Alex Elder \u003caelder@sgi.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: dm-devel@redhat.com\nCc: drbd-dev@lists.linbit.com\nCc: Leo Chen \u003cleochen@broadcom.com\u003e\nCc: Scott Branden \u003csbranden@broadcom.com\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\nCc: Dave Kleikamp \u003cshaggy@linux.vnet.ibm.com\u003e\nCc: Joern Engel \u003cjoern@logfs.org\u003e\nCc: reiserfs-devel@vger.kernel.org\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "66d7dd518ae413a383ab2c6c263cc30617329842", "tree": "8e16f734aebba063e0df052825ac375aefeeab5a", "parents": [ "e1ca7788dec6773b1a2bce51b7141948f2b8bccf" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Tue Oct 26 14:22:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 16:52:11 2010 -0700" }, "message": "/proc/swaps: support polling\n\nSystem management wants to subscribe to changes in swap configuration.\nMake /proc/swaps pollable like /proc/mounts.\n\n[akpm@linux-foundation.org: document proc_poll_event]\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nAcked-by: Greg KH \u003cgreg@kroah.com\u003e\nCc: Jonathan Corbet \u003ccorbet@lwn.net\u003e\nCc: Peter Zijlstra \u003cpeterz@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": "fa251f89903d73989e2f63e13d0eaed1e07ce0da", "tree": "3f7fe779941e3b6d67754dd7c44a32f48ea47c74", "parents": [ "dd3932eddf428571762596e17b65f5dc92ca361b", "cd07202cc8262e1669edff0d97715f3dd9260917" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Oct 19 09:13:04 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Tue Oct 19 09:13:04 2010 +0200" }, "message": "Merge branch \u0027v2.6.36-rc8\u0027 into for-2.6.37/barrier\n\nConflicts:\n\tblock/blk-core.c\n\tdrivers/block/loop.c\n\tmm/swapfile.c\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "dd3932eddf428571762596e17b65f5dc92ca361b", "tree": "57cec5ae2f862037f78b7e993323d77955bb6463", "parents": [ "8786fb70ccb36c7cff64680bb80c46d3a09d44db" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Thu Sep 16 20:51:46 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Sep 16 20:52:58 2010 +0200" }, "message": "block: remove BLKDEV_IFL_WAIT\n\nAll the blkdev_issue_* helpers can only sanely be used for synchronous\ncaller. To issue cache flushes or barriers asynchronously the caller needs\nto set up a bio by itself with a completion callback to move the asynchronous\nstate machine ahead. So drop the BLKDEV_IFL_WAIT flag that is always\nspecified when calling blkdev_issue_* and also remove the now unused flags\nargument to blkdev_issue_flush and blkdev_issue_zeroout. For\nblkdev_issue_discard we need to keep it for the secure discard flag, which\ngains a more descriptive name and loses the bitops vs flag confusion.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "349f429eec36cb743fee20f4c193ecde97a3ed2e", "tree": "c4618700a2bbb4b7954f048155a095808d69dc45", "parents": [ "e045db80d07250312500b2ed707b84dc703189d6" ], "author": { "name": "Christoph Hellwig", "email": "hch@infradead.org", "time": "Wed Aug 18 05:29:20 2010 -0400" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Fri Sep 10 12:35:39 2010 +0200" }, "message": "swap: do not send discards as barriers\n\nThe swap code already uses synchronous discards, no need to add I/O barriers.\n\ntj: superflous newlines removed.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nTested-by: Nigel Cunningham \u003cnigel@tuxonice.net\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "3399446632739fcd05fd8b272b476a69c6e6d14a", "tree": "986d5b880aa69a16c8f3a6bded68cb50f9418d29", "parents": [ "8f2ae0faa3a119158c4dcfe89926d6fad5f5332c" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Thu Sep 09 16:38:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:25 2010 -0700" }, "message": "swap: discard while swapping only if SWAP_FLAG_DISCARD\n\nTests with recent firmware on Intel X25-M 80GB and OCZ Vertex 60GB SSDs\nshow a shift since I last tested in December: in part because of firmware\nupdates, in part because of the necessary move from barriers to awaiting\ncompletion at the block layer. While discard at swapon still shows as\nslightly beneficial on both, discarding 1MB swap cluster when allocating\nis now disadvanteous: adds 25% overhead on Intel, adds 230% on OCZ (YMMV).\n\nSurrender: discard as presently implemented is more hindrance than help\nfor swap; but might prove useful on other devices, or with improvements.\nSo continue to do the discard at swapon, but make discard while swapping\nconditional on a SWAP_FLAG_DISCARD to sys_swapon() (which has been using\nonly the lower 16 bits of int flags).\n\nWe can add a --discard or -d to swapon(8), and a \"discard\" to swap in\n/etc/fstab: matching the mount option for btrfs, ext4, fat, gfs2, nilfs2.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Nigel Cunningham \u003cnigel@tuxonice.net\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nCc: James Bottomley \u003cJames.Bottomley@hansenpartnership.com\u003e\nCc: \"Martin K. Petersen\" \u003cmartin.petersen@oracle.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8f2ae0faa3a119158c4dcfe89926d6fad5f5332c", "tree": "720272512fd0dfd1d865d2dc64b30fed811f2d13", "parents": [ "b73d7fcecd93dc15eaa3c45c8c587b613f6673c4" ], "author": { "name": "Christoph Hellwig", "email": "hch@infradead.org", "time": "Thu Sep 09 16:38:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:25 2010 -0700" }, "message": "swap: do not send discards as barriers\n\nThe swap code already uses synchronous discards, no need to add I/O\nbarriers.\n\nThis fixes the worst of the terrible slowdown in swap allocation for\nhibernation, reported on 2.6.35 by Nigel Cunningham; but does not entirely\neliminate that regression.\n\n[tj@kernel.org: superflous newlines removed]\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nTested-by: Nigel Cunningham \u003cnigel@tuxonice.net\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nCc: James Bottomley \u003cJames.Bottomley@hansenpartnership.com\u003e\nCc: \"Martin K. Petersen\" \u003cmartin.petersen@oracle.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b73d7fcecd93dc15eaa3c45c8c587b613f6673c4", "tree": "ebf5a5e10fb246237807317a81f6f40c3eebcd9c", "parents": [ "910321ea817a202ff70fac666e37e2c8e2f88823" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Thu Sep 09 16:38:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:25 2010 -0700" }, "message": "swap: prevent reuse during hibernation\n\nMove the hibernation check from scan_swap_map() into try_to_free_swap():\nto catch not only the common case when hibernation\u0027s allocation itself\ntriggers swap reuse, but also the less likely case when concurrent page\nreclaim (shrink_page_list) might happen to try_to_free_swap from a page.\n\nHibernation already clears __GFP_IO from the gfp_allowed_mask, to stop\nreclaim from going to swap: check that to prevent swap reuse too.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nCc: Andrea Gelmini \u003candrea.gelmini@gmail.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Nigel Cunningham \u003cnigel@tuxonice.net\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "910321ea817a202ff70fac666e37e2c8e2f88823", "tree": "aaead29e7797986e2b804746b565bb5d05117c54", "parents": [ "ac8456d6f9a3011c824176bd6084d39e5f70a382" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Thu Sep 09 16:38:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 09 18:57:25 2010 -0700" }, "message": "swap: revert special hibernation allocation\n\nPlease revert 2.6.36-rc commit d2997b1042ec150616c1963b5e5e919ffd0b0ebf\n\"hibernation: freeze swap at hibernation\". It complicated matters by\nadding a second swap allocation path, just for hibernation; without in any\nway fixing the issue that it was intended to address - page reclaim after\nfixing the hibernation image might free swap from a page already imaged as\nswapcache, letting its swap be reallocated to store a different page of\nthe image: resulting in data corruption if the imaged page were freed as\nclean then swapped back in. Pages freed to si-\u003eswap_map were still in\ndanger of being reallocated by the alternative allocation path.\n\nI guess it inadvertently fixed slow SSD swap allocation for hibernation,\nas reported by Nigel Cunningham: by missing out the discards that occur on\nthe usual swap allocation path; but that was unintentional, and needs a\nseparate fix.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nCc: Andrea Gelmini \u003candrea.gelmini@gmail.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Nigel Cunningham \u003cnigel@tuxonice.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d2997b1042ec150616c1963b5e5e919ffd0b0ebf", "tree": "c970746ad3d5c3e0ccbd1695d07144dbe4534ec4", "parents": [ "966cca029f739716fbcc8068b8c6dfe381f86fc3" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Mon Aug 09 17:20:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 20:45:04 2010 -0700" }, "message": "hibernation: freeze swap at hibernation\n\nWhen taking a memory snapshot in hibernate_snapshot(), all (directly\ncalled) memory allocations use GFP_ATOMIC. Hence swap misusage during\nhibernation never occurs.\n\nBut from a pessimistic point of view, there is no guarantee that no page\nallcation has __GFP_WAIT. It is better to have a global indication \"we\nenter hibernation, don\u0027t use swap!\".\n\nThis patch tries to freeze new-swap-allocation during hibernation. (All\nuser processes are frozenm so swapin is not a concern).\n\nThis way, no updates will happen to swap_map[] between\nhibernate_snapshot() and save_image(). Swap is thawed when swsusp_free()\nis called. We can be assured that swap corruption will not occur.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "966cca029f739716fbcc8068b8c6dfe381f86fc3", "tree": "838686762076c262c425e3dc09d0cda4e9e5e83d", "parents": [ "979f867191f80e74713394cf8c0a3c1b3662b648" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Mon Aug 09 17:20:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 20:45:04 2010 -0700" }, "message": "mm: fix corruption of hibernation caused by reusing swap during image saving\n\nSince 2.6.31, swap_map[]\u0027s refcounting was changed to show that a used\nswap entry is just for swap-cache, can be reused. Then, while scanning\nfree entry in swap_map[], a swap entry may be able to be reclaimed and\nreused. It was caused by commit c9e444103b5e7a5 (\"mm: reuse unused swap\nentry if necessary\").\n\nBut this caused deta corruption at resume. The scenario is\n\n- Assume a clean-swap cache, but mapped.\n\n- at hibernation_snapshot[], clean-swap-cache is saved as\n clean-swap-cache and swap_map[] is marked as SWAP_HAS_CACHE.\n\n- then, save_image() is called. And reuse SWAP_HAS_CACHE entry to save\n image, and break the contents.\n\nAfter resume:\n\n- the memory reclaim runs and finds clean-not-referenced-swap-cache and\n discards it because it\u0027s marked as clean. But here, the contents on\n disk and swap-cache is inconsistent.\n\nHance memory is corrupted.\n\nThis patch avoids the bug by not reclaiming swap-entry during hibernation.\nThis is a quick fix for backporting.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReported-by: Ondreg Zary \u003clinux@rainbow-software.org\u003e\nTested-by: Ondreg Zary \u003clinux@rainbow-software.org\u003e\nTested-by: Andrea Gelmini \u003candrea.gelmini@gmail.com\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d79df0b1eda0099a22cbcece01ce5e7d222450de", "tree": "eb9c938fa5faf285fb091d7446508a32229ceea4", "parents": [ "6e80e8ed5eb92d0112674aabe82951266a6a1051", "c8d1a126924fcbc1d61ceb830226e0c7afdcc841" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 15:26:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 15:26:46 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (577 commits)\n Staging: ramzswap: Handler for swap slot free callback\n swap: Add swap slot free callback to block_device_operations\n swap: Add flag to identify block swap devices\n Staging: vt6655: use ETH_FRAME_LEN macro instead of custom one\n Staging: vt6655: use ETH_DATA_LEN macro instead of custom one\n Staging: vt6655: use ETH_FCS_LEN macro instead of custom one\n Staging: vt6656: use ETH_HLEN macro instead of custom one\n Staging: comedi: quatech_daqp_cs.c Replace eos semaphore with a completion.\n Staging: dt3155v4l: remove private memory allocator\n Staging: crystalhd: Remove typedefs from driver\n Staging: winbond: Fix for pointer name format issue in mds.c\n Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs\n Staging: vt6656: removed custom CHAR/SHORT/INT/LONG typedefs\n Staging: comedi: Altered the way printk is used in 8255.c\n staging: iio: adis16350 and similar IMU driver\n Staging: iio: max1363 Fix two bugs in single_channel_from_ring\n Staging: iio: adis16220 extract bin_attribute structures from state\n Staging: iio: adis16220 vibration sensor driver\n Staging: comedi: Kconfig dependancy fixes\n Staging: comedi: fix up build error from last Kconfig changes\n ...\n" }, { "commit": "b3a27d0529c6e5206f1b60f60263e3ecfd0d77cb", "tree": "50ce5c6ce06ed700160491f2cd0e93d318ccc7fd", "parents": [ "b27256439568950f30864ccecaeb6dfb588089d5" ], "author": { "name": "Nitin Gupta", "email": "ngupta@vflare.org", "time": "Mon May 17 11:02:43 2010 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue May 18 15:07:52 2010 -0700" }, "message": "swap: Add swap slot free callback to block_device_operations\n\nThis callback is required when RAM based devices are used as swap disks.\nOne such device is ramzswap which is used as compressed in-memory swap\ndisk. For such devices, we need a callback as soon as a swap slot is no\nlonger used to allow freeing memory allocated for this slot. Without this\ncallback, stale data can quickly accumulate in memory defeating the whole\npurpose of such devices.\n\nSigned-off-by: Nitin Gupta \u003cngupta@vflare.org\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nAcked-by: Nigel Cunningham \u003cnigel@tuxonice.net\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "b27256439568950f30864ccecaeb6dfb588089d5", "tree": "03aaf3a415b65d5f8aa4eefb06f4cddaeb00f4b5", "parents": [ "f4a68b9388c7f647ba2fd43faf69cad26ca03206" ], "author": { "name": "Nitin Gupta", "email": "ngupta@vflare.org", "time": "Mon May 17 11:02:42 2010 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue May 18 15:07:52 2010 -0700" }, "message": "swap: Add flag to identify block swap devices\n\nAdded SWP_BLKDEV flag to distinguish block and regular file backed\nswap devices. We could also check if a swap is entire block device,\nrather than a file, by:\nS_ISBLK(swap_info_struct-\u003eswap_file-\u003ef_mapping-\u003ehost-\u003ei_mode)\nbut, I think, simply checking this flag is more convenient.\n\nSigned-off-by: Nitin Gupta \u003cngupta@vflare.org\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nAcked-by: Nigel Cunningham \u003cnigel@tuxonice.net\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "fbd9b09a177a481eda256447c881f014f29034fe", "tree": "ef7e213045382f82a1e3e3cf134d196a1045dd7a", "parents": [ "6b4517a7913a09d3259bb1d21c9cb300f12294bd" ], "author": { "name": "Dmitry Monakhov", "email": "dmonakhov@openvz.org", "time": "Wed Apr 28 17:55:06 2010 +0400" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Wed Apr 28 19:47:36 2010 +0200" }, "message": "blkdev: generalize flags for blkdev_issue_fn functions\n\nThe patch just convert all blkdev_issue_xxx function to common\nset of flags. Wait/allocation semantics preserved.\n\nSigned-off-by: Dmitry Monakhov \u003cdmonakhov@openvz.org\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "024914477e15ef8b17f271ec47f1bb8a589f0806", "tree": "9a6a8b4224c94fcdd1b8c3127b301ee3537f8cc2", "parents": [ "8033b97c9b5ef063e3f4bf2efe1cd0a22093aaff" ], "author": { "name": "Daisuke Nishimura", "email": "nishimura@mxp.nes.nec.co.jp", "time": "Wed Mar 10 15:22:17 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:36 2010 -0800" }, "message": "memcg: move charges of anonymous swap\n\nThis patch is another core part of this move-charge-at-task-migration\nfeature. It enables moving charges of anonymous swaps.\n\nTo move the charge of swap, we need to exchange swap_cgroup\u0027s record.\n\nIn current implementation, swap_cgroup\u0027s record is protected by:\n\n - page lock: if the entry is on swap cache.\n - swap_lock: if the entry is not on swap cache.\n\nThis works well in usual swap-in/out activity.\n\nBut this behavior make the feature of moving swap charge check many\nconditions to exchange swap_cgroup\u0027s record safely.\n\nSo I changed modification of swap_cgroup\u0027s recored(swap_cgroup_record())\nto use xchg, and define a new function to cmpxchg swap_cgroup\u0027s record.\n\nThis patch also enables moving charge of non pte_present but not uncharged\nswap caches, which can be exist on swap-out path, by getting the target\npages via find_get_page() as do_mincore() does.\n\n[kosaki.motohiro@jp.fujitsu.com: fix ia64 build]\n[akpm@linux-foundation.org: fix typos]\nSigned-off-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nSigned-off-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": "08259d58e4fa12ceaece82193c5816152f638cca", "tree": "8c032914139c5aec362a73b8316cf81f020f9f8f", "parents": [ "c08c6e1f54c85fc299cf9f88cf330d6dd28a9a1d" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Fri Mar 05 13:42:25 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 06 11:26:27 2010 -0800" }, "message": "mm: add comment on swap_duplicate\u0027s error code\n\nswap_duplicate()\u0027s loop appears to miss out on returning the error code\nfrom __swap_duplicate(), except when that\u0027s -ENOMEM. In fact this is\nintentional: prior to -ENOMEM for swap_count_continuation,\nswap_duplicate() was void (and the case only occurs when copy_one_pte()\nhits a corrupt pte). But that\u0027s surprising behaviour, which certainly\ndeserves a comment.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nReported-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": "ad2bd7e0e9647cd48593a6b3a2be07dc2c2d28ed", "tree": "247c1c46e4c6948d482878f1c85c99cf180ff024", "parents": [ "fc148a5f7e0532750c312385c7ee9fa3e9311f34" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Fri Mar 05 13:42:12 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 06 11:26:26 2010 -0800" }, "message": "mm/swapfile.c: fix swapon size off-by-one\n\nThere\u0027s an off-by-one disagreement between mkswap and swapon about the\nmeaning of swap_header last_page: mkswap (in all versions I\u0027ve looked at:\nutil-linux-ng and BusyBox and old util-linux; probably as far back as\n1999) consistently means the offset (in page units) of the last page of\nthe swap area, whereas kernel sys_swapon (as far back as 2.2 and 2.3)\nstrangely takes it to mean the size (in page units) of the swap area.\n\nThis disagreement is the safe way round; but it\u0027s worrying people, and\nloses us one page of swap.\n\nThe fix is not just to add one to nr_good_pages: we need to get maxpages\n(the size of the swap_map array) right before that; and though that is an\nunsigned long, be careful not to overflow the unsigned int p-\u003emax which\nlater holds it (probably why header uses __u32 last_page instead of size).\n\nWhy did we subtract one from the maximum swp_offset to calculate maxpages?\n Though it was probably me who made that change in 2.4.10, I don\u0027t get it:\nand now we should be adding one (without risk of overflow in this case).\n\nFix the handling of swap_header badpages: it could have overrun the\nswap_map when very large swap area used on a more limited architecture.\n\nRemove pre-initializations of swap_header, nr_good_pages and maxpages:\nthose date from when sys_swapon was supporting other versions of header.\n\nReported-by: Nitin Gupta \u003cngupta@vflare.org\u003e\nReported-by: Jarkko Lavinen \u003cjarkko.lavinen@nokia.com\u003e\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b084d4353ff99d824d3bc5a5c2c22c70b1fba722", "tree": "8178db2b337fc8a36e6ca2e1fc2e7d7473957e27", "parents": [ "34e55232e59f7b19050267a05ff1226e5cd122a5" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Fri Mar 05 13:41:42 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 06 11:26:24 2010 -0800" }, "message": "mm: count swap usage\n\nA frequent questions from users about memory management is what numbers of\nswap ents are user for processes. And this information will give some\nhints to oom-killer.\n\nBesides we can count the number of swapents per a process by scanning\n/proc/\u003cpid\u003e/smaps, this is very slow and not good for usual process\ninformation handler which works like \u0027ps\u0027 or \u0027top\u0027. (ps or top is now\nenough slow..)\n\nThis patch adds a counter of swapents to mm_counter and update is at each\nswap events. Information is exported via /proc/\u003cpid\u003e/status file as\n\n[kamezawa@bluextal memory]$ cat /proc/self/status\nName: cat\nState: R (running)\nTgid: 2910\nPid: 2910\nPPid: 2823\nTracerPid: 0\nUid: 500 500 500 500\nGid: 500 500 500 500\nFDSize: 256\nGroups: 500\nVmPeak: 82696 kB\nVmSize: 82696 kB\nVmLck: 0 kB\nVmHWM: 432 kB\nVmRSS: 432 kB\nVmData: 172 kB\nVmStk: 84 kB\nVmExe: 48 kB\nVmLib: 1568 kB\nVmPTE: 40 kB\nVmSwap: 0 kB \u003c\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d this.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nReviewed-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d559db086ff5be9bcc259e5aa50bf3d881eaf1d1", "tree": "aa968c8a4093234e4623a34c0415bf9d8683671c", "parents": [ "19b629f581320999ddb9f6597051b79cdb53459c" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Fri Mar 05 13:41:39 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 06 11:26:23 2010 -0800" }, "message": "mm: clean up mm_counter\n\nPresently, per-mm statistics counter is defined by macro in sched.h\n\nThis patch modifies it to\n - defined in mm.h as inlinf functions\n - use array instead of macro\u0027s name creation.\n\nThis patch is for reducing patch size in future patch to modify\nimplementation of per-mm counter.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5ad6468801d28c4d4ac9f48ec19297817c915f6a", "tree": "edd8dc48693f43278d6fe1614aca2bf660d4dc10", "parents": [ "73848b4684e84a84cfd1555af78d41158f31e16b" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Dec 14 17:59:24 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:19 2009 -0800" }, "message": "ksm: let shared pages be swappable\n\nInitial implementation for swapping out KSM\u0027s shared pages: add\npage_referenced_ksm() and try_to_unmap_ksm(), which rmap.c calls when\nfaced with a PageKsm page.\n\nMost of what\u0027s needed can be got from the rmap_items listed from the\nstable_node of the ksm page, without discovering the actual vma: so in\nthis patch just fake up a struct vma for page_referenced_one() or\ntry_to_unmap_one(), then refine that in the next patch.\n\nAdd VM_NONLINEAR to ksm_madvise()\u0027s list of exclusions: it has always been\nimplicit there (being only set with VM_SHARED, already excluded), but\nlet\u0027s make it explicit, to help justify the lack of nonlinear unmap.\n\nRely on the page lock to protect against concurrent modifications to that\npage\u0027s node of the stable tree.\n\nThe awkward part is not swapout but swapin: do_swap_page() and\npage_add_anon_rmap() now have to allow for new possibilities - perhaps a\nksm page still in swapcache, perhaps a swapcache page associated with one\nlocation in one anon_vma now needed for another location or anon_vma.\n(And the vma might even be no longer VM_MERGEABLE when that happens.)\n\nksm_might_need_to_copy() checks for that case, and supplies a duplicate\npage when necessary, simply leaving it to a subsequent pass of ksmd to\nrediscover the identity and merge them back into one ksm page.\nDisappointingly primitive: but the alternative would have to accumulate\nunswappable info about the swapped out ksm pages, limiting swappability.\n\nRemove page_add_ksm_rmap(): page_add_anon_rmap() now has to allow for the\nparticular case it was handling, so just use it instead.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Izik Eidus \u003cieidus@redhat.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Chris Wright \u003cchrisw@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3ca7b3c5b64d35fe02c35b5d44c2c58b49499fee", "tree": "bb6af24d3683788ef658282f8794af19d2232663", "parents": [ "bb3ab596832b920c703d1aea1ce76d69c0f71fb7" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Dec 14 17:58:57 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:17 2009 -0800" }, "message": "mm: define PAGE_MAPPING_FLAGS\n\nAt present we define PageAnon(page) by the low PAGE_MAPPING_ANON bit set\nin page-\u003emapping, with the higher bits a pointer to the anon_vma; and have\ndefined PageKsm(page) as that with NULL anon_vma.\n\nBut KSM swapping will need to store a pointer there: so in preparation for\nthat, now define PAGE_MAPPING_FLAGS as the low two bits, including\nPAGE_MAPPING_KSM (always set along with PAGE_MAPPING_ANON, until some\nother use for the bit emerges).\n\nDeclare page_rmapping(page) to return the pointer part of page-\u003emapping,\nand page_anon_vma(page) to return the anon_vma pointer when that\u0027s what it\nis. Use these in a few appropriate places: notably, unuse_vma() has been\ntesting page-\u003emapping, but is better to be testing page_anon_vma() (cases\nmay be added in which flag bits are set without any pointer).\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Izik Eidus \u003cieidus@redhat.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Minchan Kim \u003cminchan.kim@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": "d4906e1aa516cc965292b43b5a26122dd4344e7e", "tree": "78c19149282e93200d90f380a40f1e1192354936", "parents": [ "7509765a29cfb1a4c506c09b304aaf3b4111c653" ], "author": { "name": "Lee Schermerhorn", "email": "Lee.Schermerhorn@hp.com", "time": "Mon Dec 14 17:58:49 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:16 2009 -0800" }, "message": "swap: rework map_swap_page() again\n\nSeems that page_io.c doesn\u0027t really need to know that page_private(page)\nis the swp_entry \u0027val\u0027. Rework map_swap_page() to do what its name says\nand map a page to a page offset in the swap space.\n\nThe only other caller of map_swap_page() is internal to mm/swapfile.c and\nit does want to map a swap entry to the \u0027sector\u0027. So rename\nmap_swap_page() to map_swap_entry(), make it \u0027static\u0027 and and implement\nmap_swap_page() as a wrapper around that.\n\nSigned-off-by: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aaa468653b4a0d11c603c48d716f765177a5a9e4", "tree": "3cb8c9232dd405001fa38d5519937c5e6c6f32ab", "parents": [ "570a335b8e22579e2a51a68136d2b1f907a20eec" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Dec 14 17:58:47 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:16 2009 -0800" }, "message": "swap_info: note SWAP_MAP_SHMEM\n\nWhile we\u0027re fiddling with the swap_map values, let\u0027s assign a particular\nvalue to shmem/tmpfs swap pages: their swap counts are never incremented,\nand it helps swapoff\u0027s try_to_unuse() a little if it can immediately\ndistinguish those pages from process pages.\n\nSince we\u0027ve no use for SWAP_MAP_BAD | COUNT_CONTINUED,\nwe might as well use that 0xbf value for SWAP_MAP_SHMEM.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "570a335b8e22579e2a51a68136d2b1f907a20eec", "tree": "c5312383e948d2e7ac60c2fa410fee98e8b38a70", "parents": [ "8d69aaee80c123b460918816cbfa2e83224c3646" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Dec 14 17:58:46 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:15 2009 -0800" }, "message": "swap_info: swap count continuations\n\nSwap is duplicated (reference count incremented by one) whenever the same\nswap page is inserted into another mm (when forking finds a swap entry in\nplace of a pte, or when reclaim unmaps a pte to insert the swap entry).\n\nswap_info_struct\u0027s vmalloc\u0027ed swap_map is the array of these reference\ncounts: but what happens when the unsigned short (or unsigned char since\nthe preceding patch) is full? (and its high bit is kept for a cache flag)\n\nWe then lose track of it, never freeing, leaving it in use until swapoff:\nat which point we _hope_ that a single pass will have found all instances,\nassume there are no more, and will lose user data if we\u0027re wrong.\n\nSwapping of KSM pages has not yet been enabled; but it is implemented,\nand makes it very easy for a user to overflow the maximum swap count:\npossible with ordinary process pages, but unlikely, even when pid_max\nhas been raised from PID_MAX_DEFAULT.\n\nThis patch implements swap count continuations: when the count overflows,\na continuation page is allocated and linked to the original vmalloc\u0027ed\nmap page, and this used to hold the continuation counts for that entry\nand its neighbours. These continuation pages are seldom referenced:\nthe common paths all work on the original swap_map, only referring to\na continuation page when the low \"digit\" of a count is incremented or\ndecremented through SWAP_MAP_MAX.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8d69aaee80c123b460918816cbfa2e83224c3646", "tree": "899a69417dbd81f9b53926d7076629cc9b394ae5", "parents": [ "253d553ba75ab26b3e9e2f70cbf6fbf0813f7e86" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Dec 14 17:58:45 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:15 2009 -0800" }, "message": "swap_info: swap_map of chars not shorts\n\nHalve the vmalloc\u0027ed swap_map array from unsigned shorts to unsigned\nchars: it\u0027s still very unusual to reach a swap count of 126, and the\nnext patch allows it to be extended indefinitely.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "253d553ba75ab26b3e9e2f70cbf6fbf0813f7e86", "tree": "57c448fad45820c0eb984297fbef120b689381a0", "parents": [ "73c34b6accc8427584f5d7db4d5acb230ed8c912" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Dec 14 17:58:44 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:15 2009 -0800" }, "message": "swap_info: SWAP_HAS_CACHE cleanups\n\nThough swap_count() is useful, I\u0027m finding that swap_has_cache() and\nencode_swapmap() obscure what happens in the swap_map entry, just at\nthose points where I need to understand it. Remove them, and pass\nmore usable \"usage\" values to scan_swap_map(), swap_entry_free() and\n__swap_duplicate(), instead of the SWAP_MAP and SWAP_CACHE enum.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "73c34b6accc8427584f5d7db4d5acb230ed8c912", "tree": "6f7c445c9547b6ee78130c176cce32fc13f7efdd", "parents": [ "9625a5f289f7c3c100b59c317e2bcc3c7e2e51fb" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Dec 14 17:58:43 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:15 2009 -0800" }, "message": "swap_info: miscellaneous minor cleanups\n\nMove CONFIG_HIBERNATION\u0027s swapdev_block() into the main CONFIG_HIBERNATION\nblock, remove extraneous whitespace and return, fix typo in a comment.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9625a5f289f7c3c100b59c317e2bcc3c7e2e51fb", "tree": "88fecfbed0eaf627e8e08a9e196d1d2849737f0a", "parents": [ "efa90a981bbc891efad96db2a75b5487e00852ca" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Dec 14 17:58:42 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:15 2009 -0800" }, "message": "swap_info: include first_swap_extent\n\nMake better use of the space by folding first swap_extent into its\nswap_info_struct, instead of just the list_head: swap partitions need\nonly that one, and for others it\u0027s used as a circular list anyway.\n\n[jirislaby@gmail.com: fix crash on double swapon]\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Jiri Slaby \u003cjirislaby@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": "efa90a981bbc891efad96db2a75b5487e00852ca", "tree": "fc64a5d5b71e84eb1eec2810fb0568a79a361827", "parents": [ "f29ad6a99b596b8169744d107bf088e8be9e8d0d" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Dec 14 17:58:41 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:15 2009 -0800" }, "message": "swap_info: change to array of pointers\n\nThe swap_info_struct is only 76 or 104 bytes, but it does seem wrong\nto reserve an array of about 30 of them in bss, when most people will\nwant only one. Change swap_info[] to an array of pointers.\n\nThat does need a \"type\" field in the structure: pack it as a char with\nnext type and short prio (aha, char is unsigned by default on PowerPC).\nUse the (admittedly peculiar) name \"type\" throughout for this index.\n\n/proc/swaps does not take swap_lock: I wouldn\u0027t want it to, but do take\ncare with barriers when adding a new item to the array (never removed).\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f29ad6a99b596b8169744d107bf088e8be9e8d0d", "tree": "e138bf9eeb751defd358eb5aca8113e2645ded3d", "parents": [ "976d6dfbb0175d136fc098854bbce0c028a3924b" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Dec 14 17:58:40 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 15 08:53:13 2009 -0800" }, "message": "swap_info: private to swapfile.c\n\nThe swap_info_struct is mostly private to mm/swapfile.c, with only\none other in-tree user: get_swap_bio(). Adjust its interface to\nmap_swap_page(), so that we can then remove get_swap_info_struct().\n\nBut there is a popular user out-of-tree, TuxOnIce: so leave the\ndeclaration of swap_info_struct in linux/swap.h.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Nigel Cunningham \u003cncunningham@crca.org.au\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "32c5fc10e79a7053ac5728b01a0bff55cbcb9d49", "tree": "7a392ac3196770c49622d5d5cb41f77c46a35f83", "parents": [ "c9354c85c1c7bac788ce57d3c17f2016c1c45b1d" ], "author": { "name": "Bo Liu", "email": "bo-liu@hotmail.com", "time": "Mon Nov 02 16:50:33 2009 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 02 09:44:41 2009 -0800" }, "message": "mm: remove incorrect swap_count() from try_to_unuse()\n\nIn try_to_unuse(), swcount is a local copy of *swap_map, including the\nSWAP_HAS_CACHE bit; but a wrong comparison against swap_count(*swap_map),\nwhich masks off the SWAP_HAS_CACHE bit, succeeded where it should fail.\n\nThat had the effect of resetting the mm from which to start searching\nfor the next swap page, to an irrelevant mm instead of to an mm in which\nthis swap page had been found: which may increase search time by ~20%.\nBut we\u0027re used to swapoff being slow, so never noticed the slowdown.\n\nRemove that one spurious use of swap_count(): Bo Liu thought it merely\nredundant, Hugh rewrote the description since it was measurably wrong.\n\nSigned-off-by: Bo Liu \u003cbo-liu@hotmail.com\u003e\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3bd0f0c763e497c8674b28e3df2732f48683dabd", "tree": "fd3bb8635291ad8c0b4e302e40cc776fd1644ada", "parents": [ "a112a71d45b5e40c3cf07371d20a4a5079a72610" ], "author": { "name": "Suresh Jayaraman", "email": "sjayaraman@suse.de", "time": "Wed Sep 30 10:53:48 2009 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Oct 01 21:15:46 2009 +0200" }, "message": "swapfile: avoid NULL pointer dereference in swapon when s_bdev is NULL\n\nWhile testing Swap over NFS patchset, I noticed an oops that was triggered\nduring swapon. Investigating further, the NULL pointer deference is due to the\nSSD device check/optimization in the swapon code that assumes s_bdev could never\nbe NULL.\n\ninode-\u003ei_sb-\u003es_bdev could be NULL in a few cases. For e.g. one such case is\nloopback NFS mount, there could be others as well. Fix this by ensuring s_bdev\nis not NULL before we try to deference s_bdev.\n\nSigned-off-by: Suresh Jayaraman \u003csjayaraman@suse.de\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "db16826367fefcb0ddb93d76b66adc52eb4e6339", "tree": "626224c1eb1eb79c522714591f208b4fdbdcd9d4", "parents": [ "cd6045138ed1bb5d8773e940d51c34318eef3ef2", "465fdd97cbe16ef8727221857e96ef62dd352017" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:53:22 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:53:22 2009 -0700" }, "message": "Merge branch \u0027hwpoison\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6\n\n* \u0027hwpoison\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6: (21 commits)\n HWPOISON: Enable error_remove_page on btrfs\n HWPOISON: Add simple debugfs interface to inject hwpoison on arbitary PFNs\n HWPOISON: Add madvise() based injector for hardware poisoned pages v4\n HWPOISON: Enable error_remove_page for NFS\n HWPOISON: Enable .remove_error_page for migration aware file systems\n HWPOISON: The high level memory error handler in the VM v7\n HWPOISON: Add PR_MCE_KILL prctl to control early kill behaviour per process\n HWPOISON: shmem: call set_page_dirty() with locked page\n HWPOISON: Define a new error_remove_page address space op for async truncation\n HWPOISON: Add invalidate_inode_page\n HWPOISON: Refactor truncate to allow direct truncating of page v2\n HWPOISON: check and isolate corrupted free pages v2\n HWPOISON: Handle hardware poisoned pages in try_to_unmap\n HWPOISON: Use bitmask/action code for try_to_unmap behaviour\n HWPOISON: x86: Add VM_FAULT_HWPOISON handling to x86 page fault handler v2\n HWPOISON: Add poison check to page fault handling\n HWPOISON: Add basic support for poisoned pages in fault handler v3\n HWPOISON: Add new SIGBUS error codes for hardware poison signals\n HWPOISON: Add support for poison swap entries v2\n HWPOISON: Export some rmap vma locking to outside world\n ...\n" }, { "commit": "35451beecbd7c86ce3249d543594517a5fe9a0cd", "tree": "e72759e6e6fcd142ab85c607a9b3dd3e1c016eed", "parents": [ "a913e182ab9484308e870af37a14d372742d53b0" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Sep 21 17:02:27 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:33 2009 -0700" }, "message": "ksm: unmerge is an origin of OOMs\n\nJust as the swapoff system call allocates many pages of RAM to various\nprocesses, perhaps triggering OOM, so \"echo 2 \u003e/sys/kernel/mm/ksm/run\"\n(unmerge) is liable to allocate many pages of RAM to various processes,\nperhaps triggering OOM; and each is normally run from a modest admin\nprocess (swapoff or shell), easily repeated until it succeeds.\n\nSo treat unmerge_and_remove_all_rmap_items() in the same way that we treat\ntry_to_unuse(): generalize PF_SWAPOFF to PF_OOM_ORIGIN, and bracket both\nwith that, to ask the OOM killer to kill them first, to prevent them from\nspawning more and more OOM kills.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nAcked-by: Izik Eidus \u003cieidus@redhat.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a7420aa54dbf699a5a05feba3c859b6baaa3938c", "tree": "97119d311149c902b3bd3a6157e70fb79c876462", "parents": [ "10be22dfe1e6ad978269dc275147e0ed049187bb" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Wed Sep 16 11:50:05 2009 +0200" }, "committer": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Wed Sep 16 11:50:05 2009 +0200" }, "message": "HWPOISON: Add support for poison swap entries v2\n\nMemory migration uses special swap entry types to trigger special actions on\npage faults. Extend this mechanism to also support poisoned swap entries, to\ntrigger poison handling on page faults. This allows follow-on patches to\nprevent processes from faulting in poisoned pages again.\n\nv2: Fix overflow in MAX_SWAPFILES (Fengguang Wu)\nv3: Better overflow fix (Hidehiro Kawai)\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\n" }, { "commit": "746cd1e7e4a555ddaee53b19a46e05c9c61eaf09", "tree": "d129194669e0122113a5cc86003a4a7711450284", "parents": [ "3d2257f157c2324acbc0fa0fa54e8626a987edd2" ], "author": { "name": "Christoph Hellwig", "email": "hch@infradead.org", "time": "Sat Sep 12 07:35:43 2009 +0200" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Mon Sep 14 08:24:53 2009 +0200" }, "message": "block: use blkdev_issue_discard in blk_ioctl_discard\n\nblk_ioctl_discard duplicates large amounts of code from blkdev_issue_discard,\nthe only difference between the two is that blkdev_issue_discard needs to\nsend a barrier discard request and blk_ioctl_discard a non-barrier one,\nand blk_ioctl_discard needs to wait on the request. To facilitates this\nadd a flags argument to blkdev_issue_discard to control both aspects of the\nbehaviour. This will be very useful later on for using the waiting\nfuncitonality for other callers.\n\nBased on an earlier patch from Matthew Wilcox \u003cmatthew@wil.cx\u003e.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "dddac6a7b445de95515f64fdf82fe5dc36c02f26", "tree": "39651610292d6b0c17f210f253a0dd16b022727d", "parents": [ "ec79be26875f6c1468784876cb99192b7f41c7a5" ], "author": { "name": "Alan Jenkins", "email": "alan-jenkins@tuffmail.co.uk", "time": "Wed Jul 29 21:07:55 2009 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Jul 29 21:07:55 2009 +0200" }, "message": "PM / Hibernate: Replace bdget call with simple atomic_inc of i_count\n\nCreate bdgrab(). This function copies an existing reference to a\nblock_device. It is safe to call from any context.\n\nHibernation code wishes to copy a reference to the active swap device.\nRight now it calls bdget() under a spinlock, but this is wrong because\nbdget() can sleep. It doesn\u0027t need a full bdget() because we already\nhold a reference to active swap devices (and the spinlock protects\nagainst swapoff).\n\nFixes http://bugzilla.kernel.org/show_bug.cgi?id\u003d13827\n\nSigned-off-by: Alan Jenkins \u003calan-jenkins@tuffmail.co.uk\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "8a9478ca7f4bcb8945cec7f95d52dae2d5e50cbd", "tree": "935e6ee3340ebe999374b54967cc2fa14e8d0060", "parents": [ "20ebcdda78a282d1d5266887ddf8a2d670182576" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Jun 17 16:27:17 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:47 2009 -0700" }, "message": "memcg: fix swap accounting\n\nThis patch fixes mis-accounting of swap usage in memcg.\n\nIn the current implementation, memcg\u0027s swap account is uncharged only when\nswap is completely freed. But there are several cases where swap cannot\nbe freed cleanly. For handling that, this patch changes that memcg\nuncharges swap account when swap has no references other than cache.\n\nBy this, memcg\u0027s swap entry accounting can be fully synchronous with the\napplication\u0027s behavior.\n\nThis patch also changes memcg\u0027s hooks for swap-out.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nAcked-by: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Dhaval Giani \u003cdhaval@linux.vnet.ibm.com\u003e\nCc: YAMAMOTO Takashi \u003cyamamoto@valinux.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c9e444103b5e7a5a3519f9913f59767f92e33baf", "tree": "6b14020dc9271b5ef22ba34daf5494ef6572abb9", "parents": [ "355cfa73ddff2fb8fa14e93bd94a057cc022512e" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Jun 16 15:32:54 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:42 2009 -0700" }, "message": "mm: reuse unused swap entry if necessary\n\nPresently we can know a swap entry is just used as SwapCache via swap_map,\nwithout looking up swap cache.\n\nThen, we have a chance to reuse swap-cache-only swap entries in\nget_swap_pages().\n\nThis patch tries to free swap-cache-only swap entries if swap is not\nenough.\n\nNote: We hit following path when swap_cluster code cannot find a free\ncluster. Then, vm_swap_full() is not only condition to allow the kernel\nto reclaim unused swap.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Dhaval Giani \u003cdhaval@linux.vnet.ibm.com\u003e\nCc: YAMAMOTO Takashi \u003cyamamoto@valinux.co.jp\u003e\nTested-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "355cfa73ddff2fb8fa14e93bd94a057cc022512e", "tree": "7ff70cd56d533070d50b06db6ba0086e8aab0d71", "parents": [ "cb4b86ba47bb0937b71fb825b3ed88adf7a190f0" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Jun 16 15:32:53 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:42 2009 -0700" }, "message": "mm: modify swap_map and add SWAP_HAS_CACHE flag\n\nThis is a part of the patches for fixing memcg\u0027s swap accountinf leak.\nBut, IMHO, not a bad patch even if no memcg.\n\nThere are 2 kinds of references to swap.\n - reference from swap entry\n - reference from swap cache\n\nThen,\n\n - If there is swap cache \u0026\u0026 swap\u0027s refcnt is 1, there is only swap cache.\n (*) swapcount(entry) \u003d\u003d 1 \u0026\u0026 find_get_page(swapper_space, entry) !\u003d NULL\n\nThis counting logic have worked well for a long time. But considering\nthat we cannot know there is a _real_ reference or not by swap_map[],\ncurrent usage of counter is not very good.\n\nThis patch adds a flag SWAP_HAS_CACHE and recored information that a swap\nentry has a cache or not. This will remove -1 magic used in swapfile.c\nand be a help to avoid unnecessary find_get_page().\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nTested-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Dhaval Giani \u003cdhaval@linux.vnet.ibm.com\u003e\nCc: YAMAMOTO Takashi \u003cyamamoto@valinux.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cb4b86ba47bb0937b71fb825b3ed88adf7a190f0", "tree": "4b8528ba914a315e5857e7fe2a6e7d415f2e6650", "parents": [ "6837765963f1723e80ca97b1fae660f3a60d77df" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Jun 16 15:32:52 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:42 2009 -0700" }, "message": "mm: add swap cache interface for swap reference\n\nIn a following patch, the usage of swap cache is recorded into swap_map.\nThis patch is for necessary interface changes to do that.\n\n2 interfaces:\n\n - swapcache_prepare()\n - swapcache_free()\n\nare added for allocating/freeing refcnt from swap-cache to existing swap\nentries. But implementation itself is not changed under this patch. At\nadding swapcache_free(), memcg\u0027s hook code is moved under\nswapcache_free(). This is better than using scattered hooks.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nAcked-by: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Dhaval Giani \u003cdhaval@linux.vnet.ibm.com\u003e\nCc: YAMAMOTO Takashi \u003cyamamoto@valinux.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a1bb7d61233ba5fb5cd865f907a9ddcc8f8c02bd", "tree": "bd0877610aaa2e33a7ff76c684a51a65765c78fb", "parents": [ "eed3ee08292d821282169708e5e8e89a0d0a0c63" ], "author": { "name": "Alan Jenkins", "email": "alan-jenkins@tuffmail.co.uk", "time": "Sat Feb 14 02:01:14 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 21 14:17:17 2009 -0800" }, "message": "PM/hibernate: fix \"swap breaks after hibernation failures\"\n\nhttp://bugzilla.kernel.org/show_bug.cgi?id\u003d12239\n\nThe image writing code dropped a reference to the current swap device.\nThis doesn\u0027t show up if the hibernation succeeds - because it doesn\u0027t\naffect the image which gets resumed. But it means multiple _failed_\nhibernations end up freeing the swap device while it is still use!\n\nswsusp_write() finds the block device for the swap file using swap_type_of().\nIt then uses blkdev_get() / blkdev_put() to open and close the block device.\n\nUnfortunately, blkdev_get() assumes ownership of the inode of the block_device\npassed to it. So blkdev_put() calls iput() on the inode. This is by design\nand other callers expect this behaviour. The fix is for swap_type_of() to take\na reference on the inode using bdget().\n\nSigned-off-by: Alan Jenkins \u003calan-jenkins@tuffmail.co.uk\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "85d9fc89fb0f0703df6444f260187c088a8d59ff", "tree": "ba034e2b8bff6b7f3b62a826a0106dc0e1391b46", "parents": [ "7460db567bbca76bf087d1694d792a1a96bdaa26" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Thu Jan 29 14:25:13 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 29 18:04:43 2009 -0800" }, "message": "memcg: fix refcnt handling at swapoff\n\nNow, at swapoff, even while try_charge() fails, commit is executed. This\nis a bug which turns the refcnt of cgroup_subsys_state negative.\n\nReported-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nTested-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nTested-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c4ea37c26a691ad0b7e86aa5884aab27830e95c9", "tree": "4a3bd25e61cd3782f535ad2140a01bf3835dca4f", "parents": [ "d5460c9974a321a194aded4a8c4daaac68ea8171" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:14:28 2009 +0100" }, "committer": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Wed Jan 14 14:15:29 2009 +0100" }, "message": "[CVE-2009-0029] System call wrappers part 26\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\n" }, { "commit": "2c26fdd70c3094fa3e84caf9ef434911933d5477", "tree": "06a3bafc12f5f8fd91d9ed1fca5ea0a632ef2004", "parents": [ "887007561ae58628f03aa9046949747c04f63be8" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Jan 07 18:08:10 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 08:31:06 2009 -0800" }, "message": "memcg: revert gfp mask fix\n\nMy patch, memcg-fix-gfp_mask-of-callers-of-charge.patch changed gfp_mask\nof callers of charge to be GFP_HIGHUSER_MOVABLE for showing what will\nhappen at memory reclaim.\n\nBut in recent discussion, it\u0027s NACKed because it sounds ugly.\n\nThis patch is for reverting it and add some clean up to gfp_mask of\ncallers of charge. No behavior change but need review before generating\nHUNK in deep queue.\n\nThis patch also adds explanation to meaning of gfp_mask passed to charge\nfunctions in memcontrol.h.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Hugh Dickins \u003chugh@veritas.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" } ], "next": "8c7c6e34a1256a5082d38c8e9bd1474476912715" }