)]}' { "log": [ { "commit": "d06063cc221fdefcab86589e79ddfdb7c0e14b63", "tree": "00ccaf8c1992b57a4445d78b9eae25fde0b3ab31", "parents": [ "30c9f3a9fae79517bca595826a19c6855fbb6d32" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 10 09:01:23 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 21 13:08:22 2009 -0700" }, "message": "Move FAULT_FLAG_xyz into handle_mm_fault() callers\n\nThis allows the callers to now pass down the full set of FAULT_FLAG_xyz\nflags to handle_mm_fault(). All callers have been (mechanically)\nconverted to the new calling convention, there\u0027s almost certainly room\nfor architectures to clean up their code and then add FAULT_FLAG_RETRY\nwhen that support is added.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "30c9f3a9fae79517bca595826a19c6855fbb6d32", "tree": "f7eb9588fe38dc1b045e97409e25c57c516aaf44", "parents": [ "232086b19964d0e13359d30d74b11ca31b0751cb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 10 08:43:11 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 21 13:06:05 2009 -0700" }, "message": "Remove internal use of \u0027write_access\u0027 in mm/memory.c\n\nThe fault handling routines really want more fine-grained flags than a\nsingle \"was it a write fault\" boolean - the callers will want to set\nflags like \"you can return a retry error\" etc.\n\nAnd that\u0027s actually how the VM works internally, but right now the\ntop-level fault handling functions in mm/memory.c all pass just the\n\u0027write_access\u0027 boolean around.\n\nThis switches them over to pass around the FAULT_FLAG_xyzzy \u0027flags\u0027\nvariable instead. The \u0027write_access\u0027 calling convention still exists\nfor the exported \u0027handle_mm_fault()\u0027 function, but that is next.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3b6748e2dd69906af3835db4dc9d1c8a3ee4c68c", "tree": "5d5476844f8e29e31684ce8ccf7e163ab3182ad6", "parents": [ "03668a4debf4f50de55c34b6e66dae63e1c73716" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Tue Jun 16 15:32:35 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:40 2009 -0700" }, "message": "mm: introduce follow_pfn()\n\nAnaloguous to follow_phys(), add a helper that looks up the PFN at a\nuser virtual address in an IO mapping or a raw PFN mapping.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nAcked-by: Magnus Damm \u003cmagnus.damm@gmail.com\u003e\nCc: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\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": "03668a4debf4f50de55c34b6e66dae63e1c73716", "tree": "d4fedb9feb056b8383b0d75e2cad5bf8ceeb8c8c", "parents": [ "f8ad0f499fad5cdbcaaa2d97542b2db869b5a770" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Tue Jun 16 15:32:34 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:40 2009 -0700" }, "message": "mm: use generic follow_pte() in follow_phys()\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nAcked-by: Magnus Damm \u003cmagnus.damm@gmail.com\u003e\nCc: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\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": "f8ad0f499fad5cdbcaaa2d97542b2db869b5a770", "tree": "f1b5e91072238c2a303940bd522485484dc22105", "parents": [ "e9bb35df6f813ca46f8e6273add657643c7df73f" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Tue Jun 16 15:32:33 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:39 2009 -0700" }, "message": "mm: introduce follow_pte()\n\nA generic readonly page table lookup helper to map an address space and an\naddress from it to a pte.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nAcked-by: Magnus Damm \u003cmagnus.damm@gmail.com\u003e\nCc: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\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": "d2bf6be8ab63aa84e6149aac934649aadf3828b1", "tree": "65e7f74f1ed6fd9516f1615b0f293d2aaeede07b", "parents": [ "7ffc59b4d0bdfa00e882339f85b8a969bb7021e2" ], "author": { "name": "Nick Piggin", "email": "nickpiggin@yahoo.com.au", "time": "Tue Jun 16 15:31:39 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:30 2009 -0700" }, "message": "mm: clean up get_user_pages_fast() documentation\n\nMove more documentation for get_user_pages_fast into the new kerneldoc comment.\nAdd some comments for get_user_pages as well.\n\nAlso, move get_user_pages_fast declaration up to get_user_pages. It wasn\u0027t\nthere initially because it was once a static inline function.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Andy Grover \u003candy.grover@oracle.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b827e496c893de0c0f142abfaeb8730a2fd6b37f", "tree": "a86aecd5d811f9306b9662ceb5a5a45091b62b97", "parents": [ "a5fc1abe438b87a9d128beebc377f78e2681a76d" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Thu Apr 30 15:08:16 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 02 15:36:09 2009 -0700" }, "message": "mm: close page_mkwrite races\n\nChange page_mkwrite to allow implementations to return with the page\nlocked, and also change it\u0027s callers (in page fault paths) to hold the\nlock until the page is marked dirty. This allows the filesystem to have\nfull control of page dirtying events coming from the VM.\n\nRather than simply hold the page locked over the page_mkwrite call, we\ncall page_mkwrite with the page unlocked and allow callers to return with\nit locked, so filesystems can avoid LOR conditions with page lock.\n\nThe problem with the current scheme is this: a filesystem that wants to\nassociate some metadata with a page as long as the page is dirty, will\nperform this manipulation in its -\u003epage_mkwrite. It currently then must\nreturn with the page unlocked and may not hold any other locks (according\nto existing page_mkwrite convention).\n\nIn this window, the VM could write out the page, clearing page-dirty. The\nfilesystem has no good way to detect that a dirty pte is about to be\nattached, so it will happily write out the page, at which point, the\nfilesystem may manipulate the metadata to reflect that the page is no\nlonger dirty.\n\nIt is not always possible to perform the required metadata manipulation in\n-\u003eset_page_dirty, because that function cannot block or fail. The\nfilesystem may need to allocate some data structure, for example.\n\nAnd the VM cannot mark the pte dirty before page_mkwrite, because\npage_mkwrite is allowed to fail, so we must not allow any window where the\npage could be written to if page_mkwrite does fail.\n\nThis solution of holding the page locked over the 3 critical operations\n(page_mkwrite, setting the pte dirty, and finally setting the page dirty)\ncloses out races nicely, preventing page cleaning for writeout being\ninitiated in that window. This provides the filesystem with a strong\nsynchronisation against the VM here.\n\n- Sage needs this race closed for ceph filesystem.\n- Trond for NFS (http://bugzilla.kernel.org/show_bug.cgi?id\u003d12913).\n- I need it for fsblock.\n- I suspect other filesystems may need it too (eg. btrfs).\n- I have converted buffer.c to the new locking. Even simple block allocation\n under dirty pages might be susceptible to i_size changing under partial page\n at the end of file (we also have a buffer.c-side problem here, but it cannot\n be fixed properly without this patch).\n- Other filesystems (eg. NFS, maybe btrfs) will need to change their\n page_mkwrite functions themselves.\n\n[ This also moves page_mkwrite another step closer to fault, which should\n eventually allow page_mkwrite to be moved into -\u003efault, and thus avoiding a\n filesystem calldown and page lock/unlock cycle in __do_fault. ]\n\n[akpm@linux-foundation.org: fix derefs of NULL -\u003emapping]\nCc: Sage Weil \u003csage@newdream.net\u003e\nCc: Trond Myklebust \u003ctrond.myklebust@fys.uio.no\u003e\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Valdis Kletnieks \u003cValdis.Kletnieks@vt.edu\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": "bc43f75cd9815833b27831600ccade672edb5e43", "tree": "87ded2ff291b63259ac3df846a09d8348174f636", "parents": [ "53951bd57dfe2da58f86cdf276719082d80d8485" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Thu Apr 30 15:08:08 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 02 15:36:09 2009 -0700" }, "message": "mm: fix pageref leak in do_swap_page()\n\nBy the time the memory cgroup code is notified about a swapin we\nalready hold a reference on the fault page.\n\nIf the cgroup callback fails make sure to unlock AND release the page\nreference which was taken by lookup_swap_cach(), or we leak the reference.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nAcked-by: 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": "c2ec175c39f62949438354f603f4aa170846aabb", "tree": "f2c9bf1bec2deabe2d3a5092405b027637b6ead3", "parents": [ "c2fdf3a9b2d52842808a8e551b53b55dd9b45030" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Tue Mar 31 15:23:21 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:14 2009 -0700" }, "message": "mm: page_mkwrite change prototype to match fault\n\nChange the page_mkwrite prototype to take a struct vm_fault, and return\nVM_FAULT_xxx flags. There should be no functional change.\n\nThis makes it possible to return much more detailed error information to\nthe VM (and also can provide more information eg. virtual_address to the\ndriver, which might be important in some special cases).\n\nThis is required for a subsequent fix. And will also make it easier to\nmerge page_mkwrite() with fault() in future.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: Trond Myklebust \u003ctrond.myklebust@fys.uio.no\u003e\nCc: Miklos Szeredi \u003cmiklos@szeredi.hu\u003e\nCc: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjoel.becker@oracle.com\u003e\nCc: Artem Bityutskiy \u003cdedekind@infradead.org\u003e\nCc: Felix Blyakher \u003cfelixb@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bd775c42ea5f7c766d03a287083837cf05e7e738", "tree": "40084f399068bed56c3061afd5e1175c679160df", "parents": [ "9786bf841da57fac3457a1dac41acb4c1f2eced6" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Tue Mar 31 15:19:37 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:12 2009 -0700" }, "message": "mm: add comment why mark_page_accessed() would be better than pte_mkyoung() in follow_page()\n\nAt first look, mark_page_accessed() in follow_page() seems a bit strange.\nIt seems pte_mkyoung() would be better consistent with other kernel code.\n\nHowever, it is intentional. The commit log said:\n\n ------------------------------------------------\n commit 9e45f61d69be9024a2e6bef3831fb04d90fac7a8\n Author: akpm \u003cakpm\u003e\n Date: Fri Aug 15 07:24:59 2003 +0000\n\n [PATCH] Use mark_page_accessed() in follow_page()\n\n Touching a page via follow_page() counts as a reference so we should be\n either setting the referenced bit in the pte or running mark_page_accessed().\n\n Altering the pte is tricky because we haven\u0027t implemented an atomic\n pte_mkyoung(). And mark_page_accessed() is better anyway because it has more\n aging state: it can move the page onto the active list.\n\n BKrev: 3f3c8acbplT8FbwBVGtth7QmnqWkIw\n ------------------------------------------------\n\nThe atomic issue is still true nowadays. adding comment help to understand\ncode intention and it would be better.\n\n[akpm@linux-foundation.org: clarify text]\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0a0dd05dd7e1a800241888cbf515bf8d3dc2e59c", "tree": "1b6a4bb52465330fd106eb810f25bb631deed6c6", "parents": [ "ee99c71c59f897436ec65debb99372b3146f9985" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Tue Mar 31 15:19:33 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 01 08:59:11 2009 -0700" }, "message": "mm: don\u0027t call mark_page_accessed() in do_swap_page()\n\ncommit bf3f3bc5e734706730c12a323f9b2068052aa1f0 (mm: don\u0027t\nmark_page_accessed in fault path) only remove the mark_page_accessed() in\nfilemap_fault().\n\nTherefore, swap-backed pages and file-backed pages have inconsistent\nbehavior. mark_page_accessed() should be removed from do_swap_page().\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Hugh Dickins \u003chugh@veritas.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": "895791dac6946d535991edd11341046f8e85ea77", "tree": "4ad589460b0d7c039f5d5a42666c6bd572255049", "parents": [ "4bb9c5c02153dfc89a6c73a6f32091413805ad7d" ], "author": { "name": "Pallipadi, Venkatesh", "email": "venkatesh.pallipadi@intel.com", "time": "Fri Mar 13 16:35:44 2009 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Mar 14 09:47:44 2009 +0100" }, "message": "VM, x86, PAT: add a new vm flag to track full pfnmap at mmap\n\nImpact: cleanup\n\nAdd a new vm flag VM_PFN_AT_MMAP to identify a PFNMAP that is\nfully mapped with remap_pfn_range. Patch removes the overloading\nof VM_INSERTPAGE from the earlier patch.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nAcked-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nLKML-Reference: \u003c20090313233543.GA19909@linux-os.sc.intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4bb9c5c02153dfc89a6c73a6f32091413805ad7d", "tree": "408dee350cab80fbe7884b6640d651ef8ec44601", "parents": [ "6a5c05f002c3e4f24887a5fe8e7df757d339d368" ], "author": { "name": "Pallipadi, Venkatesh", "email": "venkatesh.pallipadi@intel.com", "time": "Thu Mar 12 17:45:27 2009 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Mar 13 04:28:50 2009 +0100" }, "message": "VM, x86, PAT: Change is_linear_pfn_mapping to not use vm_pgoff\n\nImpact: fix false positive PAT warnings - also fix VirtalBox hang\n\nUse of vma-\u003evm_pgoff to identify the pfnmaps that are fully\nmapped at mmap time is broken. vm_pgoff is set by generic mmap\ncode even for cases where drivers are setting up the mappings\nat the fault time.\n\nThe problem was originally reported here:\n\n http://marc.info/?l\u003dlinux-kernel\u0026m\u003d123383810628583\u0026w\u003d2\n\nChange is_linear_pfn_mapping logic to overload VM_INSERTPAGE\nflag along with VM_PFNMAP to mean full PFNMAP setup at mmap\ntime.\n\nProblem also tracked at:\n\n http://bugzilla.kernel.org/show_bug.cgi?id\u003d12800\n\nReported-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nTested-by: Frans Pop \u003celendil@planet.nl\u003e\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha\u003e@intel.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: \"ebiederm@xmission.com\" \u003cebiederm@xmission.com\u003e\nCc: \u003cstable@kernel.org\u003e # only for 2.6.29.1, not .28\nLKML-Reference: \u003c20090313004527.GA7176@linux-os.sc.intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "ab92661d5d9514647346047f30f67a7f35ffea67", "tree": "3ed67a71d7cce6dbd5b6bd559966f7fc137c8f00", "parents": [ "777c6c5f1f6e757ae49ecca2ed72d6b1f523c007" ], "author": { "name": "Carsten Otte", "email": "cotte@de.ibm.com", "time": "Wed Feb 04 15:12:16 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 05 12:56:48 2009 -0800" }, "message": "do_wp_page: fix regression with execute in place\n\nFix do_wp_page for VM_MIXEDMAP mappings.\n\nIn the case where pfn_valid returns 0 for a pfn at the beginning of\ndo_wp_page and the mapping is not shared writable, the code branches to\nlabel `gotten:\u0027 with old_page \u003d\u003d NULL.\n\nIn case the vma is locked (vma-\u003evm_flags \u0026 VM_LOCKED), lock_page,\nclear_page_mlock, and unlock_page try to access the old_page.\n\nThis patch checks whether old_page is valid before it is dereferenced.\n\nThe regression was introduced by \"mlock: mlocked pages are unevictable\"\n(commit b291f000393f5a0b679012b39d79fbc85c018233).\n\nSigned-off-by: Carsten Otte \u003ccotte@de.ibm.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[2.6.28.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e4b866ed197cef9989348e0479fed8d864ea465b", "tree": "0420e59a2312f6d1156ec85e6895cf6f322e0c6f", "parents": [ "afc7d20c8429f32f19d47367fdc36eeed2334ec3" ], "author": { "name": "venkatesh.pallipadi@intel.com", "email": "venkatesh.pallipadi@intel.com", "time": "Fri Jan 09 16:13:11 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jan 13 19:13:01 2009 +0100" }, "message": "x86 PAT: change track_pfn_vma_new to take pgprot_t pointer param\n\nImpact: cleanup\n\nChange the protection parameter for track_pfn_vma_new() into a pgprot_t pointer.\nSubsequent patch changes the x86 PAT handling to return a compatible\nmemtype in pgprot_t, if what was requested cannot be allowed due to conflicts.\nNo fuctionality change in this patch.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a36706131182f5507d1e2cfbf391b0fa8d72203c", "tree": "46aede534e494045b7cbe4df42b780ca138e6d3e", "parents": [ "e0b325d310a6b11f1538413fd557d2eb98f2fae5" ], "author": { "name": "venkatesh.pallipadi@intel.com", "email": "venkatesh.pallipadi@intel.com", "time": "Fri Jan 09 16:13:09 2009 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jan 13 19:12:59 2009 +0100" }, "message": "x86 PAT: remove PFNMAP type on track_pfn_vma_new() error\n\nImpact: fix (harmless) double-free of memtype entries and avoid warning\n\nOn track_pfn_vma_new() failure, reset the vm_flags so that there will be\nno second cleanup happening when upper level routines call unmap_vmas().\n\nThis patch fixes part of the bug reported here:\n\n http://marc.info/?l\u003dlinux-kernel\u0026m\u003d123108883716357\u0026w\u003d2\n\nSpecifically the error message:\n\n X:5010 freeing invalid memtype d0000000-d0101000\n\nIs due to multiple frees on error path, will not happen with the patch below.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "95156f0051cba60ec674bbaa5cf7dc74a74c5612", "tree": "b2927d543b7b8e89e8dcb7ebf7f37d07afdc62f0", "parents": [ "9d0793370987b98708d2f75ee3bba7c1008d8512" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Jan 12 13:02:11 2009 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jan 12 13:09:18 2009 +0100" }, "message": "lockdep, mm: fix might_fault() annotation\n\nSome code (nfs/sunrpc) uses socket ops on kernel memory while holding\nthe mmap_sem, this is safe because kernel memory doesn\u0027t get paged out,\ntherefore we\u0027ll never actually fault, and the might_fault() annotations\nwill generate false positives.\n\nReported-by: \"J. Bruce Fields\" \u003cbfields@fieldses.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "03f3c433648a97ae7c86be789edba67690f6ea60", "tree": "d92a17f6fe9d90d3a6b46762742ef239bf5ecc44", "parents": [ "42e9abb628def2c335a4ecf130bb6c88d916d885" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Jan 07 18:08:31 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 08:31:10 2009 -0800" }, "message": "memcg: fix swap accounting leak\n\nFix swapin charge operation of memcg.\n\nNow, memcg has hooks to swap-out operation and checks SwapCache is really\nunused or not. That check depends on contents of struct page. I.e. If\nPageAnon(page) \u0026\u0026 page_mapped(page), the page is recoginized as\nstill-in-use.\n\nNow, reuse_swap_page() calles delete_from_swap_cache() before establishment\nof any rmap. Then, in followinig sequence\n\n\t(Page fault with WRITE)\n\ttry_charge() (charge +\u003d PAGESIZE)\n\tcommit_charge() (Check page_cgroup is used or not..)\n\treuse_swap_page()\n\t\t-\u003e delete_from_swapcache()\n\t\t\t-\u003e mem_cgroup_uncharge_swapcache() (charge -\u003d PAGESIZE)\n\t......\nNew charge is uncharged soon....\nTo avoid this, move commit_charge() after page_mapcount() goes up to 1.\nBy this,\n\n\ttry_charge()\t\t(usage +\u003d PAGESIZE)\n\treuse_swap_page()\t(may usage -\u003d PAGESIZE if PCG_USED is set)\n\tcommit_charge()\t\t(If page_cgroup is not marked as PCG_USED,\n\t\t\t\t add new charge.)\nAccounting will be correct.\n\nChangelog (v2) -\u003e (v3)\n - fixed invalid charge to swp_entry\u003d\u003d0.\n - updated documentation.\nChangelog (v1) -\u003e (v2)\n - fixed comment.\n\n[nishimura@mxp.nes.nec.co.jp: swap accounting leak doc fix]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nTested-by: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nSigned-off-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": "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" }, { "commit": "8c7c6e34a1256a5082d38c8e9bd1474476912715", "tree": "09f53c7c4bac5532a9ecbdadb4450702c744ea6f", "parents": [ "27a7faa0779dd13729196c1a818c294f44bbd1ee" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Jan 07 18:08:00 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 08:31:05 2009 -0800" }, "message": "memcg: mem+swap controller core\n\nThis patch implements per cgroup limit for usage of memory+swap. However\nthere are SwapCache, double counting of swap-cache and swap-entry is\navoided.\n\nMem+Swap controller works as following.\n - memory usage is limited by memory.limit_in_bytes.\n - memory + swap usage is limited by memory.memsw_limit_in_bytes.\n\nThis has following benefits.\n - A user can limit total resource usage of mem+swap.\n\n Without this, because memory resource controller doesn\u0027t take care of\n usage of swap, a process can exhaust all the swap (by memory leak.)\n We can avoid this case.\n\n And Swap is shared resource but it cannot be reclaimed (goes back to memory)\n until it\u0027s used. This characteristic can be trouble when the memory\n is divided into some parts by cpuset or memcg.\n Assume group A and group B.\n After some application executes, the system can be..\n\n Group A -- very large free memory space but occupy 99% of swap.\n Group B -- under memory shortage but cannot use swap...it\u0027s nearly full.\n\n Ability to set appropriate swap limit for each group is required.\n\nMaybe someone wonder \"why not swap but mem+swap ?\"\n\n - The global LRU(kswapd) can swap out arbitrary pages. Swap-out means\n to move account from memory to swap...there is no change in usage of\n mem+swap.\n\n In other words, when we want to limit the usage of swap without affecting\n global LRU, mem+swap limit is better than just limiting swap.\n\nAccounting target information is stored in swap_cgroup which is\nper swap entry record.\n\nCharge is done as following.\n map\n - charge page and memsw.\n\n unmap\n - uncharge page/memsw if not SwapCache.\n\n swap-out (__delete_from_swap_cache)\n - uncharge page\n - record mem_cgroup information to swap_cgroup.\n\n swap-in (do_swap_page)\n - charged as page and memsw.\n record in swap_cgroup is cleared.\n memsw accounting is decremented.\n\n swap-free (swap_free())\n - if swap entry is freed, memsw is uncharged by PAGE_SIZE.\n\nThere are people work under never-swap environments and consider swap as\nsomething bad. For such people, this mem+swap controller extension is just an\noverhead. This overhead is avoided by config or boot option.\n(see Kconfig. detail is not in this patch.)\n\nTODO:\n - maybe more optimization can be don in swap-in path. (but not very safe.)\n But we just do simple accounting at this stage.\n\n[nishimura@mxp.nes.nec.co.jp: make resize limit hold mutex]\n[hugh@veritas.com: memswap controller core swapcache fixes]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bced0520fe462bb94021dcabd32e99630c171be2", "tree": "6fa234f4a25bc8231742aea13e7cc2664b0a69a6", "parents": [ "7a81b88cb53e335ff7d019e6398c95792c817d93" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Jan 07 18:07:49 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 08:31:04 2009 -0800" }, "message": "memcg: fix gfp_mask of callers of charge\n\nFix misuse of gfp_kernel.\n\nNow, most of callers of mem_cgroup_charge_xxx functions uses GFP_KERNEL.\n\nI think that this is from the fact that page_cgroup *was* dynamically\nallocated.\n\nBut now, we allocate all page_cgroup at boot. And\nmem_cgroup_try_to_free_pages() reclaim memory from GFP_HIGHUSER_MOVABLE +\nspecified GFP_RECLAIM_MASK.\n\n * This is because we just want to reduce memory usage.\n \"Where we should reclaim from ?\" is not a problem in memcg.\n\nThis patch modifies gfp masks to be GFP_HIGUSER_MOVABLE if possible.\n\nNote: This patch is not for fixing behavior but for showing sane information\n in source code.\n\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": "7a81b88cb53e335ff7d019e6398c95792c817d93", "tree": "6ebca4d509a541ac707e10f9369916549e90c0ad", "parents": [ "0b82ac37b889ec881b645860da3775118effb3ca" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Jan 07 18:07:48 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 08:31:04 2009 -0800" }, "message": "memcg: introduce charge-commit-cancel style of functions\n\nThere is a small race in do_swap_page(). When the page swapped-in is\ncharged, the mapcount can be greater than 0. But, at the same time some\nprocess (shares it ) call unmap and make mapcount 1-\u003e0 and the page is\nuncharged.\n\n CPUA \t\t\tCPUB\n mapcount \u003d\u003d 1.\n (1) charge if mapcount\u003d\u003d0 zap_pte_range()\n (2) mapcount 1 \u003d\u003e 0.\n\t\t\t (3) uncharge(). (success)\n (4) set page\u0027s rmap()\n mapcount 0\u003d\u003e1\n\nThen, this swap page\u0027s account is leaked.\n\nFor fixing this, I added a new interface.\n - charge\n account to res_counter by PAGE_SIZE and try to free pages if necessary.\n - commit\n register page_cgroup and add to LRU if necessary.\n - cancel\n uncharge PAGE_SIZE because of do_swap_page failure.\n\n CPUA\n (1) charge (always)\n (2) set page\u0027s rmap (mapcount \u003e 0)\n (3) commit charge was necessary or not after set_pte().\n\nThis protocol uses PCG_USED bit on page_cgroup for avoiding over accounting.\nUsual mem_cgroup_charge_common() does charge -\u003e commit at a time.\n\nAnd this patch also adds following function to clarify all charges.\n\n - mem_cgroup_newpage_charge() ....replacement for mem_cgroup_charge()\n\tcalled against newly allocated anon pages.\n\n - mem_cgroup_charge_migrate_fixup()\n called only from remove_migration_ptes().\n\twe\u0027ll have to rewrite this later.(this patch just keeps old behavior)\n\tThis function will be removed by additional patch to make migration\n\tclearer.\n\nGood for clarifying \"what we do\"\n\nThen, we have 4 following charge points.\n - newpage\n - swap-in\n - add-to-cache.\n - migration.\n\n[akpm@linux-foundation.org: add missing inline directives to stubs]\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": "4779280d1ea4d361af13ae77ba55217fbcd16d4c", "tree": "1abb35d85f2280aebb9cd565cc223d14b8731203", "parents": [ "91bf189c3a766927694ce9de7d545e96b23f20fc" ], "author": { "name": "Ying Han", "email": "yinghan@google.com", "time": "Tue Jan 06 14:40:18 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:08 2009 -0800" }, "message": "mm: make get_user_pages() interruptible\n\nThe initial implementation of checking TIF_MEMDIE covers the cases of OOM\nkilling. If the process has been OOM killed, the TIF_MEMDIE is set and it\nreturn immediately. This patch includes:\n\n1. add the case that the SIGKILL is sent by user processes. The\n process can try to get_user_pages() unlimited memory even if a user\n process has sent a SIGKILL to it(maybe a monitor find the process\n exceed its memory limit and try to kill it). In the old\n implementation, the SIGKILL won\u0027t be handled until the get_user_pages()\n returns.\n\n2. change the return value to be ERESTARTSYS. It makes no sense to\n return ENOMEM if the get_user_pages returned by getting a SIGKILL\n signal. Considering the general convention for a system call\n interrupted by a signal is ERESTARTNOSYS, so the current return value\n is consistant to that.\n\nLee:\n\nAn unfortunate side effect of \"make-get_user_pages-interruptible\" is that\nit prevents a SIGKILL\u0027d task from munlock-ing pages that it had mlocked,\nresulting in freeing of mlocked pages. Freeing of mlocked pages, in\nitself, is not so bad. We just count them now--altho\u0027 I had hoped to\nremove this stat and add PG_MLOCKED to the free pages flags check.\n\nHowever, consider pages in shared libraries mapped by more than one task\nthat a task mlocked--e.g., via mlockall(). If the task that mlocked the\npages exits via SIGKILL, these pages would be left mlocked and\nunevictable.\n\nProposed fix:\n\nAdd another GUP flag to ignore sigkill when calling get_user_pages from\nmunlock()--similar to Kosaki Motohiro\u0027s \u0027IGNORE_VMA_PERMISSIONS flag for\nthe same purpose. We are not actually allocating memory in this case,\nwhich \"make-get_user_pages-interruptible\" intends to avoid. We\u0027re just\nmunlocking pages that are already resident and mapped, and we\u0027re reusing\nget_user_pages() to access those pages.\n\n?? Maybe we should combine \u0027IGNORE_VMA_PERMISSIONS and \u0027_IGNORE_SIGKILL\ninto a single flag: GUP_FLAGS_MUNLOCK ???\n\n[Lee.Schermerhorn@hp.com: ignore sigkill in get_user_pages during munlock]\nSigned-off-by: Paul Menage \u003cmenage@google.com\u003e\nSigned-off-by: Ying Han \u003cyinghan@google.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Oleg Nesterov \u003coleg@tv-sign.ru\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Rohit Seth \u003crohitseth@google.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1e9e63650d6cb88e6d6d2ca6cc3ee276c26de4a3", "tree": "2fd95051128ef2ebfaad421ee919dab9e25459b2", "parents": [ "d936cf9b39b06c8d2e0d7fb5e7b4f176e18dec69" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:40:13 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:08 2009 -0800" }, "message": "badpage: KERN_ALERT BUG instead of KERN_EMERG\n\nbad_page() and rmap Eeek messages have said KERN_EMERG for a few years,\nwhich I\u0027ve followed in print_bad_pte(). These are serious system errors,\non a par with BUGs, but they\u0027re not quite emergencies, and we do our best\nto carry on: say KERN_ALERT \"BUG: \" like the x86 oops does.\n\nAnd remove the \"Trying to fix it up, but a reboot is needed\" line: it\u0027s\nnot untrue, but I hope the KERN_ALERT \"BUG: \" conveys as much.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\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": "d936cf9b39b06c8d2e0d7fb5e7b4f176e18dec69", "tree": "db691451bc77e90b980b62674519731c6ece72db", "parents": [ "edc315fd222497ae4f4b959a9e31ada1e68a4755" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:40:12 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:07 2009 -0800" }, "message": "badpage: ratelimit print_bad_pte and bad_page\n\nprint_bad_pte() and bad_page() might each need ratelimiting - especially\nfor their dump_stacks, almost never of interest, yet not quite\ndispensible. Correlating corruption across neighbouring entries can be\nvery helpful, so allow a burst of 60 reports before keeping quiet for the\nremainder of that minute (or allow a steady drip of one report per\nsecond).\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\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": "edc315fd222497ae4f4b959a9e31ada1e68a4755", "tree": "aaf1a6b015368c52097ed0c362a24bf18e40897f", "parents": [ "2509ef26db4699a5d9fa876e90ddfc107afcab84" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:40:11 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:07 2009 -0800" }, "message": "badpage: remove vma from page_remove_rmap\n\nRemove page_remove_rmap()\u0027s vma arg, which was only for the Eeek message.\nAnd remove the BUG_ON(page_mapcount(page) \u003d\u003d 0) from CONFIG_DEBUG_VM\u0027s\npage_dup_rmap(): we\u0027re trying to be more resilient about that than BUGs.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\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": "2509ef26db4699a5d9fa876e90ddfc107afcab84", "tree": "09e65185142c60b5d766d8b75f3cbc8a65de6a39", "parents": [ "22b31eec63e5f2e219a3ee15f456897272bc73e8" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:40:10 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:07 2009 -0800" }, "message": "badpage: zap print_bad_pte on swap and file\n\nComplete zap_pte_range()\u0027s coverage of bad pagetable entries by calling\nprint_bad_pte() on a pte_file in a linear vma and on a bad swap entry.\nThat needs free_swap_and_cache() to tell it, which will also have shown\none of those \"swap_free\" errors (but with much less information).\n\nSimilar checks in fork\u0027s copy_one_pte()? No, that would be more noisy\nthan helpful: we\u0027ll see them when parent and child exec or exit.\n\nWhere do_nonlinear_fault() calls print_bad_pte(): omit !VM_CAN_NONLINEAR\ncase, that could only be a bug in sys_remap_file_pages(), not a bad pte.\nVM_FAULT_OOM rather than VM_FAULT_SIGBUS? Well, okay, that is consistent\nwith what happens if do_swap_page() operates a bad swap entry; but don\u0027t\nwe have patches to be more careful about killing when VM_FAULT_OOM?\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\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": "22b31eec63e5f2e219a3ee15f456897272bc73e8", "tree": "906e4975a0e2cdef15ef071b4890e3b28e36cf39", "parents": [ "3dc147414ccad81dc33edb80774b1fed12a38c08" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:40:09 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:07 2009 -0800" }, "message": "badpage: vm_normal_page use print_bad_pte\n\nprint_bad_pte() is so far being called only when zap_pte_range() finds\nnegative page_mapcount, or there\u0027s a fault on a pte_file where it does not\nbelong. That\u0027s weak coverage when we suspect pagetable corruption.\n\nOriginally, it was called when vm_normal_page() found an invalid pfn: but\npfn_valid is expensive on some architectures and configurations, so 2.6.24\nput that under CONFIG_DEBUG_VM (which doesn\u0027t help in the field), then\n2.6.26 replaced it by a VM_BUG_ON (likewise).\n\nReinstate the print_bad_pte() in vm_normal_page(), but use a cheaper test\nthan pfn_valid(): memmap_init_zone() (used in bootup and hotplug) keep a\n__read_mostly note of the highest_memmap_pfn, vm_normal_page() then check\npfn against that. We could call this pfn_plausible() or pfn_sane(), but I\ndoubt we\u0027ll need it elsewhere: of course it\u0027s not reliable, but gives much\nstronger pagetable validation on many boxes.\n\nAlso use print_bad_pte() when the pte_special bit is found outside a\nVM_PFNMAP or VM_MIXEDMAP area, instead of VM_BUG_ON.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\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": "3dc147414ccad81dc33edb80774b1fed12a38c08", "tree": "bdcfd37fa47d6617490fa276ddfcc5a6ab0c731b", "parents": [ "8cc3b39221b0ecbd83a338948a8396df097fc656" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:40:08 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:07 2009 -0800" }, "message": "badpage: replace page_remove_rmap Eeek and BUG\n\nNow that bad pages are kept out of circulation, there is no need for the\ninfamous page_remove_rmap() BUG() - once that page is freed, its negative\nmapcount will issue a \"Bad page state\" message and the page won\u0027t be\nfreed. Removing the BUG() allows more info, on subsequent pages, to be\ngathered.\n\nWe do have more info about the page at this point than bad_page() can know\n- notably, what the pmd is, which might pinpoint something like low 64kB\ncorruption - but page_remove_rmap() isn\u0027t given the address to find that.\n\nIn practice, there is only one call to page_remove_rmap() which has ever\nreported anything, that from zap_pte_range() (usually on exit, sometimes\non munmap). It has all the info, so remove page_remove_rmap()\u0027s \"Eeek\"\nmessage and leave it all to zap_pte_range().\n\nmm/memory.c already has a hardly used print_bad_pte() function, showing\nsome of the appropriate info: extend it to show what we want for the rmap\ncase: pte info, page info (when there is a page) and vma info to compare.\nzap_pte_range() already knows the pmd, but print_bad_pte() is easier to\nuse if it works that out for itself.\n\nSome of this info is also shown in bad_page()\u0027s \"Bad page state\" message.\nKeep them separate, but adjust them to match each other as far as\npossible. Say \"Bad page map\" in print_bad_pte(), and add a TAINT_BAD_PAGE\nthere too.\n\nprint_bad_pte() show current-\u003ecomm unconditionally (though it should get\nrepeated in the usually irrelevant stack trace): sorry, I misled Nick\nPiggin to make it conditional on vm_mm \u003d\u003d current-\u003emm, but current-\u003emm is\nalready NULL in the exit case. Usually current-\u003ecomm is good, though\nexceptionally it may not be that of the mm (when \"swapoff\" for example).\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\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": "2bc7273b0e3a509fb598abfc5b9fe50158b830d2", "tree": "e8cd456eb0cdc537f195e93fc0090b970dec7308", "parents": [ "feb166948876e2ff8f70b2da273b2a8e86957578" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Tue Jan 06 14:39:43 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:04 2009 -0800" }, "message": "mm: make maddr __iomem\n\nsparse output following warnings.\n\nmm/memory.c:2936:8: warning: incorrect type in assignment (different address spaces)\nmm/memory.c:2936:8: expected void *maddr\nmm/memory.c:2936:8: got void [noderef] \u003casn:2\u003e\n\ncleanup here.\n\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": "a2c43eed8334e878702fca713b212ae2a11d84b9", "tree": "4eb3f9b9153df5e7a638b15a6f7c9aa924066a94", "parents": [ "7b1fe59793e61f826bef053107b57b23954833bb" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:39:36 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:03 2009 -0800" }, "message": "mm: try_to_free_swap replaces remove_exclusive_swap_page\n\nremove_exclusive_swap_page(): its problem is in living up to its name.\n\nIt doesn\u0027t matter if someone else has a reference to the page (raised\npage_count); it doesn\u0027t matter if the page is mapped into userspace\n(raised page_mapcount - though that hints it may be worth keeping the\nswap): all that matters is that there be no more references to the swap\n(and no writeback in progress).\n\nswapoff (try_to_unuse) has been removing pages from swapcache for years,\nwith no concern for page count or page mapcount, and we used to have a\ncomment in lookup_swap_cache() recognizing that: if you go for a page of\nswapcache, you\u0027ll get the right page, but it could have been removed from\nswapcache by the time you get page lock.\n\nSo, give up asking for exclusivity: get rid of\nremove_exclusive_swap_page(), and remove_exclusive_swap_page_ref() and\nremove_exclusive_swap_page_count() which were spawned for the recent LRU\nwork: replace them by the simpler try_to_free_swap() which just checks\npage_swapcount().\n\nSimilarly, remove the page_count limitation from free_swap_and_count(),\nbut assume that it\u0027s worth holding on to the swap if page is mapped and\nswap nowhere near full. Add a vm_swap_full() test in free_swap_cache()?\nIt would be consistent, but I think we probably have enough for now.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7b1fe59793e61f826bef053107b57b23954833bb", "tree": "0ac769c48123c5d0770b0a0f88bad9e6318b83ed", "parents": [ "ab967d86015a19777955370deebc8262d50fed63" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:39:34 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:03 2009 -0800" }, "message": "mm: reuse_swap_page replaces can_share_swap_page\n\nA good place to free up old swap is where do_wp_page(), or do_swap_page(),\nis about to redirty the page: the data on disk is then stale and won\u0027t be\nread again; and if we do decide to write the page out later, using the\nprevious swap location makes an unnecessary disk seek very likely.\n\nSo give can_share_swap_page() the side-effect of delete_from_swap_cache()\nwhen it safely can. And can_share_swap_page() was always a misleading\nname, the more so if it has a side-effect: rename it reuse_swap_page().\n\nIrrelevant cleanup nearby: remove swap_token_default_timeout definition\nfrom swap.h: it\u0027s used nowhere.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ab967d86015a19777955370deebc8262d50fed63", "tree": "be0807bef32c0d28ac6dbcf7c8b938840d2f2a3f", "parents": [ "878b63ac889df706d01048f2c110e322ad2f996d" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:39:33 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:03 2009 -0800" }, "message": "mm: wp lock page before deciding cow\n\nAn application may rely on get_user_pages() to give it pages writable from\nuserspace and shared with a driver, GUP breaking COW if necessary. It may\nmprotect() the pages\u0027 writability, off and on, from time to time.\n\nNormally this works fine (so long as the app does not fork); but just\noccasionally, under memory pressure, a readonly pte in a newly writable\narea is COWed unnecessarily, breaking the link with the driver: because\ndo_wp_page() does trylock_page, and falls back to COW whenever that fails.\n\nFor reliable behaviour in the unshared case, when the trylock_page fails,\nnow unlock pagetable, lock page and relock pagetable, before deciding\nwhether Copy-On-Write is really necessary.\n\nReported-by: Zhou Yingchao\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "878b63ac889df706d01048f2c110e322ad2f996d", "tree": "e0bd69b890fda939fc190675d977dd0fd75e0427", "parents": [ "2da02997e08d3efe8174c7a47696e6f7cbe69ba9" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:39:32 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:03 2009 -0800" }, "message": "mm: gup persist for write permission\n\ndo_wp_page()\u0027s VM_FAULT_WRITE return value tells __get_user_pages() that\nCOW has been done if necessary, though it may be leaving the pte without\nwrite permission - for the odd case of forced writing to a readonly vma\nfor ptrace. At present GUP then retries the follow_page() without asking\nfor write permission, to escape an endless loop when forced.\n\nBut an application may be relying on GUP to guarantee a writable page\nwhich won\u0027t be COWed again when written from userspace, whereas a race\nhere might leave a readonly pte in place? Change the VM_FAULT_WRITE\nhandling to ask follow_page() for write permission again, except in that\nodd case of forced writing to a readonly vma.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cbf84b7add8103b92aaa84928e335df726bfc8da", "tree": "04e3ef2b3f70e5bf647f4f4c8c3ce50dd12e8474", "parents": [ "2afd1c928f1132b8d0099866e75ce8ad713a1180" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:39:27 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:02 2009 -0800" }, "message": "mm: further cleanup page_add_new_anon_rmap\n\nMoving lru_cache_add_active_or_unevictable() into page_add_new_anon_rmap()\nwas good but stupid: we can and should SetPageSwapBacked() there too; and\nwe know for sure that this anonymous, swap-backed page is not file cache.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\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": "b5934c531849ff4a51ce0f290141efe564290e40", "tree": "0c741a5bd6178db11f1147875f59e7a1a9d1754d", "parents": [ "51726b1222863852c46ca21ed0115b85d1edfd89" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Jan 06 14:39:25 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:02 2009 -0800" }, "message": "mm: add_active_or_unevictable into rmap\n\nlru_cache_add_active_or_unevictable() and page_add_new_anon_rmap() always\nappear together. Save some symbol table space and some jumping around by\nremoving lru_cache_add_active_or_unevictable(), folding its code into\npage_add_new_anon_rmap(): like how we add file pages to lru just after\nadding them to page cache.\n\nRemove the nearby \"TODO: is this safe?\" comments (yes, it is safe), and\nchange page_add_new_anon_rmap()\u0027s address BUG_ON to VM_BUG_ON as\noriginally intended.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "38e0edb15bd07c6a0caf0cfe39f8f90bd98601b2", "tree": "1ba874020bb20412ba312abef199a8668c5b99a6", "parents": [ "cd52858c73f9f7df859a08fb08496ca39b9b3d8d" ], "author": { "name": "Jeremy Fitzhardinge", "email": "jeremy@goop.org", "time": "Tue Jan 06 14:39:21 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:01 2009 -0800" }, "message": "mm/apply_to_range: call pte function with lazy updates\n\nMake the pte-level function in apply_to_range be called in lazy mmu mode,\nso that any pagetable modifications can be batched.\n\nSigned-off-by: Jeremy Fitzhardinge \u003cjeremy.fitzhardinge@citrix.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4917e5d0499b5ae7b26b56fccaefddf9aec9369c", "tree": "78f55c2d3019d1811b5447cae130c0f647916a37", "parents": [ "64cdd548ffe26849d4cd113ac640f60606063b14" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Tue Jan 06 14:39:17 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:59:00 2009 -0800" }, "message": "mm: more likely reclaim MADV_SEQUENTIAL mappings\n\nFile pages mapped only in sequentially read mappings are perfect reclaim\ncanditates.\n\nThis patch makes these mappings behave like weak references, their pages\nwill be reclaimed unless they have a strong reference from a normal\nmapping as well.\n\nIt changes the reclaim and the unmap path where they check if the page has\nbeen referenced. In both cases, accesses through sequentially read\nmappings will be ignored.\n\nBenchmark results from KOSAKI Motohiro:\n\n http://marc.info/?l\u003dlinux-mm\u0026m\u003d122485301925098\u0026w\u003d2\n\nSigned-off-by: Johannes Weiner \u003channes@saeurebad.de\u003e\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bf3f3bc5e734706730c12a323f9b2068052aa1f0", "tree": "d93fb6beb0916cc10aeb5674578bfa3ac40371c9", "parents": [ "3340289ddf29ca75c3acfb3a6b72f234b2f74d5c" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Tue Jan 06 14:38:55 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 06 15:58:58 2009 -0800" }, "message": "mm: don\u0027t mark_page_accessed in fault path\n\nDoing a mark_page_accessed at fault-time, then doing SetPageReferenced at\nunmap-time if the pte is young has a number of problems.\n\nmark_page_accessed is supposed to be roughly the equivalent of a young pte\nfor unmapped references. Unfortunately it doesn\u0027t come with any context:\nafter being called, reclaim doesn\u0027t know who or why the page was touched.\n\nSo calling mark_page_accessed not only adds extra lru or PG_referenced\nmanipulations for pages that are already going to have pte_young ptes anyway,\nbut it also adds these references which are difficult to work with from the\ncontext of vma specific references (eg. MADV_SEQUENTIAL pte_young may not\nwish to contribute to the page being referenced).\n\nThen, simply doing SetPageReferenced when zapping a pte and finding it is\nyoung, is not a really good solution either. SetPageReferenced does not\ncorrectly promote the page to the active list for example. So after removing\nmark_page_accessed from the fault path, several mmap()+touch+munmap() would\nhave a very different result from several read(2) calls for example, which\nis not really desirable.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: Johannes Weiner \u003channes@saeurebad.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "acfa4380efe77e290d3a96b11cd4c9f24f4fbb18", "tree": "d656232c7ef39c83681c2de4c8e28ba439242f66", "parents": [ "9742df331deb3fce95b321f38d4ea0c4e75edb63" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 04 10:06:33 2008 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 05 11:54:28 2009 -0500" }, "message": "inode-\u003ei_op is never NULL\n\nWe used to have rather schizophrenic set of checks for NULL -\u003ei_op even\nthough it had been eliminated years ago. You\u0027d need to go out of your\nway to set it to NULL explicitly _and_ a bunch of code would die on\nsuch inodes anyway. After killing two remaining places that still\ndid that bogosity, all that crap can go away.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "5f34fe1cfc1bdd8b4711bbe37421fba4ed0d1ed4", "tree": "85b21c8bb0e53005bd970d648ca093acfd0584a3", "parents": [ "eca1bf5b4fab56d2feb1572d34d59fcd92ea7df3", "6638101c1124c19c8a65b1645e4ecd09e0572f3e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 30 16:10:19 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 30 16:10:19 2008 -0800" }, "message": "Merge branch \u0027core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (63 commits)\n stacktrace: provide save_stack_trace_tsk() weak alias\n rcu: provide RCU options on non-preempt architectures too\n printk: fix discarding message when recursion_bug\n futex: clean up futex_(un)lock_pi fault handling\n \"Tree RCU\": scalable classic RCU implementation\n futex: rename field in futex_q to clarify single waiter semantics\n x86/swiotlb: add default swiotlb_arch_range_needs_mapping\n x86/swiotlb: add default phys\u003c-\u003ebus conversion\n x86: unify pci iommu setup and allow swiotlb to compile for 32 bit\n x86: add swiotlb allocation functions\n swiotlb: consolidate swiotlb info message printing\n swiotlb: support bouncing of HighMem pages\n swiotlb: factor out copy to/from device\n swiotlb: add arch hook to force mapping\n swiotlb: allow architectures to override phys\u003c-\u003ebus\u003c-\u003ephys conversions\n swiotlb: add comment where we handle the overflow of a dma mask on 32 bit\n rcu: fix rcutorture behavior during reboot\n resources: skip sanity check of busy resources\n swiotlb: move some definitions to header\n swiotlb: allow architectures to override swiotlb pool allocation\n ...\n\nFix up trivial conflicts in\n arch/x86/kernel/Makefile\n arch/x86/mm/init_32.c\n include/linux/hardirq.h\nas per Ingo\u0027s suggestions.\n" }, { "commit": "34801ba9bf0381fcf0e2b08179d2c07f2c6ede74", "tree": "e14d979cb9abf9220d0c60b04505851805975398", "parents": [ "982d789ab76c8a11426852fec2fdf2f412e21c0c" ], "author": { "name": "venkatesh.pallipadi@intel.com", "email": "venkatesh.pallipadi@intel.com", "time": "Fri Dec 19 13:47:29 2008 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Dec 19 15:40:30 2008 -0800" }, "message": "x86: PAT: move track untrack pfnmap stubs to asm-generic\n\nImpact: Cleanup and branch hints only.\n\nMove the track and untrack pfn stub routines from memory.c to asm-generic.\nAlso add unlikely to pfnmap related calls in fork and exit path.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "982d789ab76c8a11426852fec2fdf2f412e21c0c", "tree": "41e6932764facecb11bc9ca831ffd67ded384d68", "parents": [ "d87fe6607c31944f7572f965c1507ae77026c133" ], "author": { "name": "venkatesh.pallipadi@intel.com", "email": "venkatesh.pallipadi@intel.com", "time": "Fri Dec 19 13:47:28 2008 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Dec 19 15:40:30 2008 -0800" }, "message": "x86: PAT: remove follow_pfnmap_pte in favor of follow_phys\n\nImpact: Cleanup - removes a new function in favor of a recently modified older one.\n\nReplace follow_pfnmap_pte in pat code with follow_phys. follow_phys lso\nreturns protection eliminating the need of pte_pgprot call. Using follow_phys\nalso eliminates the need for pte_pa.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "d87fe6607c31944f7572f965c1507ae77026c133", "tree": "56e41312b33ca3fe2bca50252f436e5f19e256a8", "parents": [ "6bd9cd50c830eb88d571c492ec370a30bf999e15" ], "author": { "name": "venkatesh.pallipadi@intel.com", "email": "venkatesh.pallipadi@intel.com", "time": "Fri Dec 19 13:47:27 2008 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Dec 19 15:40:30 2008 -0800" }, "message": "x86: PAT: modify follow_phys to return phys_addr prot and return value\n\nImpact: Changes and globalizes an existing static interface.\n\nFollow_phys does similar things as follow_pfnmap_pte. Make a minor change\nto follow_phys so that it can be used in place of follow_pfnmap_pte.\nPhysical address return value with 0 as error return does not work in\nfollow_phys as the actual physical address 0 mapping may exist in pte.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "2ab640379a0ab4cef746ced1d7e04a0941774bcb", "tree": "53837aaa257f463a0b40c4d00a80fec936558f49", "parents": [ "e121e418441525b5636321fe03d16f0193ad218e" ], "author": { "name": "venkatesh.pallipadi@intel.com", "email": "venkatesh.pallipadi@intel.com", "time": "Thu Dec 18 11:41:29 2008 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Dec 18 13:30:15 2008 -0800" }, "message": "x86: PAT: hooks in generic vm code to help archs to track pfnmap regions - v3\n\nImpact: Introduces new hooks, which are currently null.\n\nIntroduce generic hooks in remap_pfn_range and vm_insert_pfn and\ncorresponding copy and free routines with reserve and free tracking.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "e121e418441525b5636321fe03d16f0193ad218e", "tree": "d9f54fef9c4f137c2e8327edbf3ba8110dfb968d", "parents": [ "3c8bb73ace6249bd089b70c941440441940e3365" ], "author": { "name": "venkatesh.pallipadi@intel.com", "email": "venkatesh.pallipadi@intel.com", "time": "Thu Dec 18 11:41:28 2008 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Dec 18 13:30:15 2008 -0800" }, "message": "x86: PAT: add follow_pfnmp_pte routine to help tracking pfnmap pages - v3\n\nImpact: New currently unused interface.\n\nAdd a generic interface to follow pfn in a pfnmap vma range. This is used by\none of the subsequent x86 PAT related patch to keep track of memory types\nfor vma regions across vma copy and free.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "3c8bb73ace6249bd089b70c941440441940e3365", "tree": "974c8b86fa68c26daa76e5122bab3cf5651a51dd", "parents": [ "55dac3a5553b13891f0ae4bbd11920619b5436d4" ], "author": { "name": "venkatesh.pallipadi@intel.com", "email": "venkatesh.pallipadi@intel.com", "time": "Thu Dec 18 11:41:27 2008 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Thu Dec 18 13:30:15 2008 -0800" }, "message": "x86: PAT: store vm_pgoff for all linear_over_vma_region mappings - v3\n\nImpact: Code transformation, new functions added should have no effect.\n\nDrivers use mmap followed by pgprot_* and remap_pfn_range or vm_insert_pfn,\nin order to export reserved memory to userspace. Currently, such mappings are\nnot tracked and hence not kept consistent with other mappings (/dev/mem,\npci resource, ioremap) for the sme memory, that may exist in the system.\n\nThe following patchset adds x86 PAT attribute tracking and untracking for\npfnmap related APIs.\n\nFirst three patches in the patchset are changing the generic mm code to fit\nin this tracking. Last four patches are x86 specific to make things work\nwith x86 PAT code. The patchset aso introduces pgprot_writecombine interface,\nwhich gives writecombine mapping when enabled, falling back to\npgprot_noncached otherwise.\n\nThis patch:\n\nWhile working on x86 PAT, we faced some hurdles with trackking\nremap_pfn_range() regions, as we do not have any information to say\nwhether that PFNMAP mapping is linear for the entire vma range or\nit is smaller granularity regions within the vma.\n\nA simple solution to this is to use vm_pgoff as an indicator for\nlinear mapping over the vma region. Currently, remap_pfn_range\nonly sets vm_pgoff for COW mappings. Below patch changes the\nlogic and sets the vm_pgoff irrespective of COW. This will still not\nbe enough for the case where pfn is zero (vma region mapped to\nphysical address zero). But, for all the other cases, we can look at\npfnmap VMAs and say whether the mappng is for the entire vma region\nor not.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenkatesh.pallipadi@intel.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "d1a76187a5be4f89c6cb19d800cb5fb7aac735c5", "tree": "2fac3ffbfffc7560eeef8364b541d0d7a0057920", "parents": [ "c7e78cff6b7518212247fb20b1dc6411540dc9af", "0173a3265b228da319ceb9c1ec6a5682fd1b2d92" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Oct 28 16:54:49 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Oct 28 16:54:49 2008 +0100" }, "message": "Merge commit \u0027v2.6.28-rc2\u0027 into core/locking\n\nConflicts:\n\tarch/um/include/asm/system.h\n" }, { "commit": "a50c22eed593f474e75f693381e4d42e81762de8", "tree": "1190f39419d8068a6b735c0d9761ef80f1a12543", "parents": [ "e798ba57e9f423dddbf1bdeb20a62bdd0593890f" ], "author": { "name": "Huang Weiyi", "email": "weiyi.huang@gmail.com", "time": "Tue Oct 21 06:43:33 2008 +0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 16:17:42 2008 -0700" }, "message": "mm: remove duplicated #include\u0027s\n\nRemoved duplicated #include \u003clinux/vmalloc.h\u003e in mm/vmalloc.c and\n\"internal.h\" in mm/memory.c.\n\nSigned-off-by: Huang Weiyi \u003cweiyi.huang@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5b4e655e948d8b6e9b0d001616d4c9d7e7ffe924", "tree": "2822f944d1bdbc8414a65cd94b982c51b5032b50", "parents": [ "b7abea9630bc8ffc663a751e46680db25c4cdf8d" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Sat Oct 18 20:28:10 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 08:52:38 2008 -0700" }, "message": "memcg: avoid accounting special pages\n\nThere are not-on-LRU pages which can be mapped and they are not worth to\nbe accounted. (becasue we can\u0027t shrink them and need dirty codes to\nhandle specical case) We\u0027d like to make use of usual objrmap/radix-tree\u0027s\nprotcol and don\u0027t want to account out-of-vm\u0027s control pages.\n\nWhen special_mapping_fault() is called, page-\u003emapping is tend to be NULL\nand it\u0027s charged as Anonymous page. insert_page() also handles some\nspecial pages from drivers.\n\nThis patch is for avoiding to account special pages.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: 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": "073e587ec2cc377867e53d8b8959738a8e16cff6", "tree": "856aac72b818de4f52ce38448b852930554b3efa", "parents": [ "47c59803becb55b72b26cdab3838d621a15badc8" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Sat Oct 18 20:28:08 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 08:52:38 2008 -0700" }, "message": "memcg: move charge swapin under lock\n\nWhile page-cache\u0027s charge/uncharge is done under page_lock(), swap-cache\nisn\u0027t. (anonymous page is charged when it\u0027s newly allocated.)\n\nThis patch moves do_swap_page()\u0027s charge() call under lock. I don\u0027t see\nany bad problem *now* but this fix will be good for future for avoiding\nunnecessary racy state.\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@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": "9978ad583e100945b74e4f33e73317983ea32df9", "tree": "132d3a06664e04cac4635ddba55a0ec36ff2a001", "parents": [ "c11d69d8c830e09a0e7b3935c952afb26c48bba8" ], "author": { "name": "Lee Schermerhorn", "email": "lee.schermerhorn@hp.com", "time": "Sat Oct 18 20:26:56 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 08:52:31 2008 -0700" }, "message": "mlock: make mlock error return Posixly Correct\n\nRework Posix error return for mlock().\n\nPosix requires error code for mlock*() system calls for some conditions\nthat differ from what kernel low level functions, such as\nget_user_pages(), return for those conditions. For more info, see:\n\nhttp://marc.info/?l\u003dlinux-kernel\u0026m\u003d121750892930775\u0026w\u003d2\n\nThis patch provides the same translation of get_user_pages()\nerror codes to posix specified error codes in the context\nof the mlock rework for unevictable lru.\n\n[akpm@linux-foundation.org: fix build]\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c11d69d8c830e09a0e7b3935c952afb26c48bba8", "tree": "c419910614bf29a77b3491014e13a7089093993a", "parents": [ "e0f79b8f1f3394bb344b7b83d6f121ac2af327de" ], "author": { "name": "Lee Schermerhorn", "email": "lee.schermerhorn@hp.com", "time": "Sat Oct 18 20:26:56 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 08:52:31 2008 -0700" }, "message": "mlock: revert mainline handling of mlock error return\n\nThis change is intended to make mlock() error returns correct.\nmake_page_present() is a lower level function used by more than mlock().\nSubsequent patch[es] will add this error return fixup in an mlock specific\npath.\n\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "64d6519dda3905dfb94d3f93c07c5f263f41813f", "tree": "62cae88edcb858c42a5b4b568eb77801299250bb", "parents": [ "5344b7e648980cc2ca613ec03a56a8222ff48820" ], "author": { "name": "Lee Schermerhorn", "email": "lee.schermerhorn@hp.com", "time": "Sat Oct 18 20:26:52 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 08:52:31 2008 -0700" }, "message": "swap: cull unevictable pages in fault path\n\nIn the fault paths that install new anonymous pages, check whether the\npage is evictable or not using lru_cache_add_active_or_unevictable(). If\nthe page is evictable, just add it to the active lru list [via the pagevec\ncache], else add it to the unevictable list.\n\nThis \"proactive\" culling in the fault path mimics the handling of mlocked\npages in Nick Piggin\u0027s series to keep mlocked pages off the lru lists.\n\nNotes:\n\n1) This patch is optional--e.g., if one is concerned about the\n additional test in the fault path. We can defer the moving of\n nonreclaimable pages until when vmscan [shrink_*_list()]\n encounters them. Vmscan will only need to handle such pages\n once, but if there are a lot of them it could impact system\n performance.\n\n2) The \u0027vma\u0027 argument to page_evictable() is require to notice that\n we\u0027re faulting a page into an mlock()ed vma w/o having to scan the\n page\u0027s rmap in the fault path. Culling mlock()ed anon pages is\n currently the only reason for this patch.\n\n3) We can\u0027t cull swap pages in read_swap_cache_async() because the\n vma argument doesn\u0027t necessarily correspond to the swap cache\n offset passed in by swapin_readahead(). This could [did!] result\n in mlocking pages in non-VM_LOCKED vmas if [when] we tried to\n cull in this path.\n\n4) Move set_pte_at() to after where we add page to lru to keep it\n hidden from other tasks that might walk the page table.\n We already do it in this order in do_anonymous() page. And,\n these are COW\u0027d anon pages. Is this safe?\n\n[riel@redhat.com: undo an overzealous code cleanup]\nSigned-off-by: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nSigned-off-by: Rik van Riel \u003criel@redhat.com\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": "b291f000393f5a0b679012b39d79fbc85c018233", "tree": "28eb785d4d157d3396e4377294e6054635a4bd90", "parents": [ "89e004ea55abe201b29e2d6e35124101f1288ef7" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Sat Oct 18 20:26:44 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 08:52:30 2008 -0700" }, "message": "mlock: mlocked pages are unevictable\n\nMake sure that mlocked pages also live on the unevictable LRU, so kswapd\nwill not scan them over and over again.\n\nThis is achieved through various strategies:\n\n1) add yet another page flag--PG_mlocked--to indicate that\n the page is locked for efficient testing in vmscan and,\n optionally, fault path. This allows early culling of\n unevictable pages, preventing them from getting to\n page_referenced()/try_to_unmap(). Also allows separate\n accounting of mlock\u0027d pages, as Nick\u0027s original patch\n did.\n\n Note: Nick\u0027s original mlock patch used a PG_mlocked\n flag. I had removed this in favor of the PG_unevictable\n flag + an mlock_count [new page struct member]. I\n restored the PG_mlocked flag to eliminate the new\n count field.\n\n2) add the mlock/unevictable infrastructure to mm/mlock.c,\n with internal APIs in mm/internal.h. This is a rework\n of Nick\u0027s original patch to these files, taking into\n account that mlocked pages are now kept on unevictable\n LRU list.\n\n3) update vmscan.c:page_evictable() to check PageMlocked()\n and, if vma passed in, the vm_flags. Note that the vma\n will only be passed in for new pages in the fault path;\n and then only if the \"cull unevictable pages in fault\n path\" patch is included.\n\n4) add try_to_unlock() to rmap.c to walk a page\u0027s rmap and\n ClearPageMlocked() if no other vmas have it mlocked.\n Reuses as much of try_to_unmap() as possible. This\n effectively replaces the use of one of the lru list links\n as an mlock count. If this mechanism let\u0027s pages in mlocked\n vmas leak through w/o PG_mlocked set [I don\u0027t know that it\n does], we should catch them later in try_to_unmap(). One\n hopes this will be rare, as it will be relatively expensive.\n\nOriginal mm/internal.h, mm/rmap.c and mm/mlock.c changes:\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\n\nsplitlru: introduce __get_user_pages():\n\n New munlock processing need to GUP_FLAGS_IGNORE_VMA_PERMISSIONS.\n because current get_user_pages() can\u0027t grab PROT_NONE pages theresore it\n cause PROT_NONE pages can\u0027t munlock.\n\n[akpm@linux-foundation.org: fix this for pagemap-pass-mm-into-pagewalkers.patch]\n[akpm@linux-foundation.org: untangle patch interdependencies]\n[akpm@linux-foundation.org: fix things after out-of-order merging]\n[hugh@veritas.com: fix page-flags mess]\n[lee.schermerhorn@hp.com: fix munlock page table walk - now requires \u0027mm\u0027]\n[kosaki.motohiro@jp.fujitsu.com: build fix]\n[kosaki.motohiro@jp.fujitsu.com: fix truncate race and sevaral comments]\n[kosaki.motohiro@jp.fujitsu.com: splitlru: introduce __get_user_pages()]\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Dave Hansen \u003cdave@linux.vnet.ibm.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4f98a2fee8acdb4ac84545df98cccecfd130f8db", "tree": "035a2937f4c3e2f7b4269412041c073ac646937c", "parents": [ "b2e185384f534781fd22f5ce170b2ad26f97df70" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Sat Oct 18 20:26:32 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 08:50:25 2008 -0700" }, "message": "vmscan: split LRU lists into anon \u0026 file sets\n\nSplit the LRU lists in two, one set for pages that are backed by real file\nsystems (\"file\") and one for pages that are backed by memory and swap\n(\"anon\"). The latter includes tmpfs.\n\nThe advantage of doing this is that the VM will not have to scan over lots\nof anonymous pages (which we generally do not want to swap out), just to\nfind the page cache pages that it should evict.\n\nThis patch has the infrastructure and a basic policy to balance how much\nwe scan the anon lists and how much we scan the file lists. The big\npolicy changes are in separate patches.\n\n[lee.schermerhorn@hp.com: collect lru meminfo statistics from correct offset]\n[kosaki.motohiro@jp.fujitsu.com: prevent incorrect oom under split_lru]\n[kosaki.motohiro@jp.fujitsu.com: fix pagevec_move_tail() doesn\u0027t treat unevictable page]\n[hugh@veritas.com: memcg swapbacked pages active]\n[hugh@veritas.com: splitlru: BDI_CAP_SWAP_BACKED]\n[akpm@linux-foundation.org: fix /proc/vmstat units]\n[nishimura@mxp.nes.nec.co.jp: memcg: fix handling of shmem migration]\n[kosaki.motohiro@jp.fujitsu.com: adjust Quicklists field of /proc/meminfo]\n[kosaki.motohiro@jp.fujitsu.com: fix style issue of get_scan_ratio()]\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-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": "b2e185384f534781fd22f5ce170b2ad26f97df70", "tree": "3096b8250302c5a9f71b1b5122345f7cf62606cc", "parents": [ "68a22394c286a2daf06ee8d65d8835f738faefa5" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Sat Oct 18 20:26:30 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 20 08:50:25 2008 -0700" }, "message": "define page_file_cache() function\n\nDefine page_file_cache() function to answer the question:\n\tis page backed by a file?\n\nOriginally part of Rik van Riel\u0027s split-lru patch. Extracted to make\navailable for other, independent reclaim patches.\n\nMoved inline function to linux/mm_inline.h where it will be needed by\nsubsequent \"split LRU\" and \"noreclaim\" patches.\n\nUnfortunately this needs to use a page flag, since the PG_swapbacked state\nneeds to be preserved all the way to the point where the page is last\nremoved from the LRU. Trying to derive the status from other info in the\npage resulted in wrong VM statistics in earlier split VM patchsets.\n\nThe total number of page flags in use on a 32 bit machine after this patch\nis 19.\n\n[akpm@linux-foundation.org: fix up out-of-order merge fallout]\n[hugh@veritas.com: splitlru: shmem_getpage SetPageSwapBacked sooner[\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nSigned-off-by: MinChan Kim \u003cminchan.kim@gmail.com\u003e\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3ee1afa308f2a38e5d1e2ad3752ad7abcf480da1", "tree": "914e0f3bbd32a387cf6095c6955369fa8da7ebf6", "parents": [ "c10d38dda1774ed4540380333cabd229eff37094" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Wed Sep 10 13:37:17 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Sep 11 09:44:21 2008 +0200" }, "message": "x86: some lock annotations for user copy paths, v2\n\n - introduce might_fault()\n - handle the atomic user copy paths correctly\n\n[ mingo@elte.hu: move might_sleep() outside of in_atomic(). ]\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "529ae9aaa08378cfe2a4350bded76f32cc8ff0ce", "tree": "d3ae998f9876c72a83a022805103a92111852b21", "parents": [ "e9ba9698187ddbc0c5bfcf41de0349a662d23d02" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Sat Aug 02 12:01:03 2008 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 21:31:34 2008 -0700" }, "message": "mm: rename page trylock\n\nConverting page lock to new locking bitops requires a change of page flag\noperation naming, so we might as well convert it to something nicer\n(!TestSetPageLocked_Lock \u003d\u003e trylock_page, SetPageLocked \u003d\u003e set_page_locked).\n\nThis also facilitates lockdeping of page lock.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a477097d9c37c1cf289c7f0257dffcfa42d50197", "tree": "9c8a0b2ec1de35ae01c807c8da603f1868f86885", "parents": [ "dc329442b9fd365bec95718013586c07ff600c34" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Mon Aug 04 13:41:14 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 16:58:45 2008 -0700" }, "message": "mlock() fix return values\n\nHalesh says:\n\nPlease find the below testcase provide to test mlock.\n\nTest Case :\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\n\n#include \u003csys/resource.h\u003e\n#include \u003cstdio.h\u003e\n#include \u003csys/stat.h\u003e\n#include \u003csys/types.h\u003e\n#include \u003cunistd.h\u003e\n#include \u003csys/mman.h\u003e\n#include \u003cfcntl.h\u003e\n#include \u003cerrno.h\u003e\n#include \u003cstdlib.h\u003e\n\nint main(void)\n{\n int fd,ret, i \u003d 0;\n char *addr, *addr1 \u003d NULL;\n unsigned int page_size;\n struct rlimit rlim;\n\n if (0 !\u003d geteuid())\n {\n printf(\"Execute this pgm as root\\n\");\n exit(1);\n }\n\n /* create a file */\n if ((fd \u003d open(\"mmap_test.c\",O_RDWR|O_CREAT,0755)) \u003d\u003d -1)\n {\n printf(\"cant create test file\\n\");\n exit(1);\n }\n\n page_size \u003d sysconf(_SC_PAGE_SIZE);\n\n /* set the MEMLOCK limit */\n rlim.rlim_cur \u003d 2000;\n rlim.rlim_max \u003d 2000;\n\n if ((ret \u003d setrlimit(RLIMIT_MEMLOCK,\u0026rlim)) !\u003d 0)\n {\n printf(\"Cant change limit values\\n\");\n exit(1);\n }\n\n addr \u003d 0;\n while (1)\n {\n /* map a page into memory each time*/\n if ((addr \u003d (char *) mmap(addr,page_size, PROT_READ |\nPROT_WRITE,MAP_SHARED,fd,0)) \u003d\u003d MAP_FAILED)\n {\n printf(\"cant do mmap on file\\n\");\n exit(1);\n }\n\n if (0 \u003d\u003d i)\n addr1 \u003d addr;\n i++;\n errno \u003d 0;\n /* lock the mapped memory pagewise*/\n if ((ret \u003d mlock((char *)addr, 1500)) \u003d\u003d -1)\n {\n printf(\"errno value is %d\\n\", errno);\n printf(\"cant lock maped region\\n\");\n exit(1);\n }\n addr \u003d addr + page_size;\n }\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\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nThis testcase results in an mlock() failure with errno 14 that is EFAULT,\nbut it has nowhere been specified that mlock() will return EFAULT. When I\ntested the same on older kernels like 2.6.18, I got the correct result i.e\nerrno 12 (ENOMEM).\n\nI think in source code mlock(2), setting errno ENOMEM has been missed in\ndo_mlock() , on mlock_fixup() failure.\n\nSUSv3 requires the following behavior frmo mlock(2).\n\n[ENOMEM]\n Some or all of the address range specified by the addr and\n len arguments does not correspond to valid mapped pages\n in the address space of the process.\n\n[EAGAIN]\n Some or all of the memory identified by the operation could not\n be locked when the call was made.\n\nThis rule isn\u0027t so nice and slighly strange. but many people think\nPOSIX/SUS compliance is important.\n\nReported-by: Halesh Sadashiv \u003chalesh.sadashiv@ap.sony.com\u003e\nTested-by: Halesh Sadashiv \u003chalesh.sadashiv@ap.sony.com\u003e\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[2.6.25.x, 2.6.26.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3669bc143fb3d389918379547f4a6b28a757b7fe", "tree": "38b0d90e3ee3f975dfd0b469ffdcad21953313cd", "parents": [ "a97762a77f927577525868e39661084170ce3605" ], "author": { "name": "Jack Steiner", "email": "steiner@sgi.com", "time": "Fri Aug 01 15:08:15 2008 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 01 13:19:16 2008 -0700" }, "message": "Remove EXPORTS of follow_page \u0026 zap_page_range\n\nDelete 2 EXPORTs that were accidentally sent upstream.\n\nSigned-off-by: Jack Steiner \u003csteiner@sgi.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0d39741a27d86d305cc75ba626392be410dcbab9", "tree": "3234c7004288ced685c5471820fd52fda89d161e", "parents": [ "3c45f6928322773b1810fbec1ece77056f914114" ], "author": { "name": "Jack Steiner", "email": "steiner@sgi.com", "time": "Tue Jul 29 22:34:01 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 30 09:41:48 2008 -0700" }, "message": "GRU Driver: export is_uv_system(), zap_page_range() \u0026 follow_page()\n\nExports needed by the GRU driver.\n\nSigned-off-by: Jack Steiner \u003csteiner@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c627f9cc046c7cd93b4525d89377fb409e170a18", "tree": "851913d2ebd2946b577592fb410f750e6fdc943b", "parents": [ "f718cd4add5aea9d379faff92f162571e356cc5f" ], "author": { "name": "Jack Steiner", "email": "steiner@sgi.com", "time": "Tue Jul 29 22:33:53 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 30 09:41:47 2008 -0700" }, "message": "mm: add zap_vma_ptes(): a library function to unmap driver ptes\n\nzap_vma_ptes() is intended to be used by drivers to unmap ptes assigned to the\ndriver private vmas. This interface is similar to zap_page_range() but is\nless general \u0026 less likely to be abused.\n\nNeeded by the GRU driver.\n\nSigned-off-by: Jack Steiner \u003csteiner@sgi.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cddb8a5c14aa89810b40495d94d3d2a0faee6619", "tree": "d0b47b071f7d2dd1d6f9c36084aa8cfcef90d1da", "parents": [ "7906d00cd1f687268f0a3599442d113767795ae6" ], "author": { "name": "Andrea Arcangeli", "email": "andrea@qumranet.com", "time": "Mon Jul 28 15:46:29 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 28 16:30:21 2008 -0700" }, "message": "mmu-notifiers: core\n\nWith KVM/GFP/XPMEM there isn\u0027t just the primary CPU MMU pointing to pages.\n There are secondary MMUs (with secondary sptes and secondary tlbs) too.\nsptes in the kvm case are shadow pagetables, but when I say spte in\nmmu-notifier context, I mean \"secondary pte\". In GRU case there\u0027s no\nactual secondary pte and there\u0027s only a secondary tlb because the GRU\nsecondary MMU has no knowledge about sptes and every secondary tlb miss\nevent in the MMU always generates a page fault that has to be resolved by\nthe CPU (this is not the case of KVM where the a secondary tlb miss will\nwalk sptes in hardware and it will refill the secondary tlb transparently\nto software if the corresponding spte is present). The same way\nzap_page_range has to invalidate the pte before freeing the page, the spte\n(and secondary tlb) must also be invalidated before any page is freed and\nreused.\n\nCurrently we take a page_count pin on every page mapped by sptes, but that\nmeans the pages can\u0027t be swapped whenever they\u0027re mapped by any spte\nbecause they\u0027re part of the guest working set. Furthermore a spte unmap\nevent can immediately lead to a page to be freed when the pin is released\n(so requiring the same complex and relatively slow tlb_gather smp safe\nlogic we have in zap_page_range and that can be avoided completely if the\nspte unmap event doesn\u0027t require an unpin of the page previously mapped in\nthe secondary MMU).\n\nThe mmu notifiers allow kvm/GRU/XPMEM to attach to the tsk-\u003emm and know\nwhen the VM is swapping or freeing or doing anything on the primary MMU so\nthat the secondary MMU code can drop sptes before the pages are freed,\navoiding all page pinning and allowing 100% reliable swapping of guest\nphysical address space. Furthermore it avoids the code that teardown the\nmappings of the secondary MMU, to implement a logic like tlb_gather in\nzap_page_range that would require many IPI to flush other cpu tlbs, for\neach fixed number of spte unmapped.\n\nTo make an example: if what happens on the primary MMU is a protection\ndowngrade (from writeable to wrprotect) the secondary MMU mappings will be\ninvalidated, and the next secondary-mmu-page-fault will call\nget_user_pages and trigger a do_wp_page through get_user_pages if it\ncalled get_user_pages with write\u003d1, and it\u0027ll re-establishing an updated\nspte or secondary-tlb-mapping on the copied page. Or it will setup a\nreadonly spte or readonly tlb mapping if it\u0027s a guest-read, if it calls\nget_user_pages with write\u003d0. This is just an example.\n\nThis allows to map any page pointed by any pte (and in turn visible in the\nprimary CPU MMU), into a secondary MMU (be it a pure tlb like GRU, or an\nfull MMU with both sptes and secondary-tlb like the shadow-pagetable layer\nwith kvm), or a remote DMA in software like XPMEM (hence needing of\nschedule in XPMEM code to send the invalidate to the remote node, while no\nneed to schedule in kvm/gru as it\u0027s an immediate event like invalidating\nprimary-mmu pte).\n\nAt least for KVM without this patch it\u0027s impossible to swap guests\nreliably. And having this feature and removing the page pin allows\nseveral other optimizations that simplify life considerably.\n\nDependencies:\n\n1) mm_take_all_locks() to register the mmu notifier when the whole VM\n isn\u0027t doing anything with \"mm\". This allows mmu notifier users to keep\n track if the VM is in the middle of the invalidate_range_begin/end\n critical section with an atomic counter incraese in range_begin and\n decreased in range_end. No secondary MMU page fault is allowed to map\n any spte or secondary tlb reference, while the VM is in the middle of\n range_begin/end as any page returned by get_user_pages in that critical\n section could later immediately be freed without any further\n -\u003einvalidate_page notification (invalidate_range_begin/end works on\n ranges and -\u003einvalidate_page isn\u0027t called immediately before freeing\n the page). To stop all page freeing and pagetable overwrites the\n mmap_sem must be taken in write mode and all other anon_vma/i_mmap\n locks must be taken too.\n\n2) It\u0027d be a waste to add branches in the VM if nobody could possibly\n run KVM/GRU/XPMEM on the kernel, so mmu notifiers will only enabled if\n CONFIG_KVM\u003dm/y. In the current kernel kvm won\u0027t yet take advantage of\n mmu notifiers, but this already allows to compile a KVM external module\n against a kernel with mmu notifiers enabled and from the next pull from\n kvm.git we\u0027ll start using them. And GRU/XPMEM will also be able to\n continue the development by enabling KVM\u003dm in their config, until they\n submit all GRU/XPMEM GPLv2 code to the mainline kernel. Then they can\n also enable MMU_NOTIFIERS in the same way KVM does it (even if KVM\u003dn).\n This guarantees nobody selects MMU_NOTIFIER\u003dy if KVM and GRU and XPMEM\n are all \u003dn.\n\nThe mmu_notifier_register call can fail because mm_take_all_locks may be\ninterrupted by a signal and return -EINTR. Because mmu_notifier_reigster\nis used when a driver startup, a failure can be gracefully handled. Here\nan example of the change applied to kvm to register the mmu notifiers.\nUsually when a driver startups other allocations are required anyway and\n-ENOMEM failure paths exists already.\n\n struct kvm *kvm_arch_create_vm(void)\n {\n struct kvm *kvm \u003d kzalloc(sizeof(struct kvm), GFP_KERNEL);\n+ int err;\n\n if (!kvm)\n return ERR_PTR(-ENOMEM);\n\n INIT_LIST_HEAD(\u0026kvm-\u003earch.active_mmu_pages);\n\n+ kvm-\u003earch.mmu_notifier.ops \u003d \u0026kvm_mmu_notifier_ops;\n+ err \u003d mmu_notifier_register(\u0026kvm-\u003earch.mmu_notifier, current-\u003emm);\n+ if (err) {\n+ kfree(kvm);\n+ return ERR_PTR(err);\n+ }\n+\n return kvm;\n }\n\nmmu_notifier_unregister returns void and it\u0027s reliable.\n\nThe patch also adds a few needed but missing includes that would prevent\nkernel to compile after these changes on non-x86 archs (x86 didn\u0027t need\nthem by luck).\n\n[akpm@linux-foundation.org: coding-style fixes]\n[akpm@linux-foundation.org: fix mm/filemap_xip.c build]\n[akpm@linux-foundation.org: fix mm/mmu_notifier.c build]\nSigned-off-by: Andrea Arcangeli \u003candrea@qumranet.com\u003e\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Jack Steiner \u003csteiner@sgi.com\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Kanoj Sarcar \u003ckanojsarcar@yahoo.com\u003e\nCc: Roland Dreier \u003crdreier@cisco.com\u003e\nCc: Steve Wise \u003cswise@opengridcomputing.com\u003e\nCc: Avi Kivity \u003cavi@qumranet.com\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Anthony Liguori \u003caliguori@us.ibm.com\u003e\nCc: Chris Wright \u003cchrisw@redhat.com\u003e\nCc: Marcelo Tosatti \u003cmarcelo@kvack.org\u003e\nCc: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nCc: \"Paul E. McKenney\" \u003cpaulmck@us.ibm.com\u003e\nCc: Izik Eidus \u003cizike@qumranet.com\u003e\nCc: Anthony Liguori \u003caliguori@us.ibm.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": "15f59adae001766a2c7f7fe4f196387bb04bcff5", "tree": "941f7a7c38af5783d55560ce303f3432fcffc01b", "parents": [ "9d8fddfb17aaee4ffc5e3d0560620d0fa8b50a42" ], "author": { "name": "Adrian Bunk", "email": "bunk@kernel.org", "time": "Fri Jul 25 19:46:23 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 26 12:00:12 2008 -0700" }, "message": "make mm/memory.c:print_bad_pte() static\n\nThis patch makes the needlessly global print_bad_pte() static.\n\nSigned-off-by: Adrian Bunk \u003cbunk@kernel.org\u003e\nReviewed-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": "ceb868796181dc95ea01a110e123afd391639873", "tree": "991be618e5195b05c31974a19adb4b9602315013", "parents": [ "4abd32dbab201c3ced0b0af12accea77cd9eeffc" ], "author": { "name": "Andi Kleen", "email": "ak@suse.de", "time": "Wed Jul 23 21:27:50 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 24 10:47:18 2008 -0700" }, "message": "hugetlb: introduce pud_huge\n\nStraight forward extensions for huge pages located in the PUD instead of\nPMDs.\n\nSigned-off-by: Andi Kleen \u003cak@suse.de\u003e\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.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": "a137e1cc6d6e7d315fef03962a2a5a113348b13b", "tree": "b47e195c392abaa3640cc2f9187d99d58cee664a", "parents": [ "e5ff215941d59f8ae6bf58f6428dc5c26745a612" ], "author": { "name": "Andi Kleen", "email": "ak@suse.de", "time": "Wed Jul 23 21:27:43 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 24 10:47:17 2008 -0700" }, "message": "hugetlbfs: per mount huge page sizes\n\nAdd the ability to configure the hugetlb hstate used on a per mount basis.\n\n- Add a new pagesize\u003d option to the hugetlbfs mount that allows setting\n the page size\n- This option causes the mount code to find the hstate corresponding to the\n specified size, and sets up a pointer to the hstate in the mount\u0027s\n superblock.\n- Change the hstate accessors to use this information rather than the\n global_hstate they were using (requires a slight change in mm/memory.c\n so we don\u0027t NULL deref in the error-unmap path -- see comments).\n\n[np: take hstate out of hugetlbfs inode and vma-\u003evm_private_data]\n\nAcked-by: Adam Litke \u003cagl@us.ibm.com\u003e\nAcked-by: Nishanth Aravamudan \u003cnacc@us.ibm.com\u003e\nSigned-off-by: Andi Kleen \u003cak@suse.de\u003e\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a5516438959d90b071ff0a484ce4f3f523dc3152", "tree": "e356ba9364c76b93c176b4d4a262b7aca3ee8f91", "parents": [ "b7ba30c679ed1eb7ed3ed8f281f6493282042bd4" ], "author": { "name": "Andi Kleen", "email": "ak@suse.de", "time": "Wed Jul 23 21:27:41 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 24 10:47:17 2008 -0700" }, "message": "hugetlb: modular state for hugetlb page size\n\nThe goal of this patchset is to support multiple hugetlb page sizes. This\nis achieved by introducing a new struct hstate structure, which\nencapsulates the important hugetlb state and constants (eg. huge page\nsize, number of huge pages currently allocated, etc).\n\nThe hstate structure is then passed around the code which requires these\nfields, they will do the right thing regardless of the exact hstate they\nare operating on.\n\nThis patch adds the hstate structure, with a single global instance of it\n(default_hstate), and does the basic work of converting hugetlb to use the\nhstate.\n\nFuture patches will add more hstate structures to allow for different\nhugetlbfs mounts to have different page sizes.\n\n[akpm@linux-foundation.org: coding-style fixes]\nAcked-by: Adam Litke \u003cagl@us.ibm.com\u003e\nAcked-by: Nishanth Aravamudan \u003cnacc@us.ibm.com\u003e\nSigned-off-by: Andi Kleen \u003cak@suse.de\u003e\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "04f2cbe35699d22dbf428373682ead85ca1240f5", "tree": "1987a2c704cc97d8adf603054c9d89d18b9b30e0", "parents": [ "a1e78772d72b2616ed20e54896e68e0e7044854e" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Wed Jul 23 21:27:25 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 24 10:47:16 2008 -0700" }, "message": "hugetlb: guarantee that COW faults for a process that called mmap(MAP_PRIVATE) on hugetlbfs will succeed\n\nAfter patch 2 in this series, a process that successfully calls mmap() for\na MAP_PRIVATE mapping will be guaranteed to successfully fault until a\nprocess calls fork(). At that point, the next write fault from the parent\ncould fail due to COW if the child still has a reference.\n\nWe only reserve pages for the parent but a copy must be made to avoid\nleaking data from the parent to the child after fork(). Reserves could be\ntaken for both parent and child at fork time to guarantee faults but if\nthe mapping is large it is highly likely we will not have sufficient pages\nfor the reservation, and it is common to fork only to exec() immediatly\nafter. A failure here would be very undesirable.\n\nNote that the current behaviour of mainline with MAP_PRIVATE pages is\npretty bad. The following situation is allowed to occur today.\n\n1. Process calls mmap(MAP_PRIVATE)\n2. Process calls mlock() to fault all pages and makes sure it succeeds\n3. Process forks()\n4. Process writes to MAP_PRIVATE mapping while child still exists\n5. If the COW fails at this point, the process gets SIGKILLed even though it\n had taken care to ensure the pages existed\n\nThis patch improves the situation by guaranteeing the reliability of the\nprocess that successfully calls mmap(). When the parent performs COW, it\nwill try to satisfy the allocation without using reserves. If that fails\nthe parent will steal the page leaving any children without a page.\nFaults from the child after that point will result in failure. If the\nchild COW happens first, an attempt will be made to allocate the page\nwithout reserves and the child will get SIGKILLed on failure.\n\nTo summarise the new behaviour:\n\n1. If the original mapper performs COW on a private mapping with multiple\n references, it will attempt to allocate a hugepage from the pool or\n the buddy allocator without using the existing reserves. On fail, VMAs\n mapping the same area are traversed and the page being COW\u0027d is unmapped\n where found. It will then steal the original page as the last mapper in\n the normal way.\n\n2. The VMAs the pages were unmapped from are flagged to note that pages\n with data no longer exist. Future no-page faults on those VMAs will\n terminate the process as otherwise it would appear that data was corrupted.\n A warning is printed to the console that this situation occured.\n\n2. If the child performs COW first, it will attempt to satisfy the COW\n from the pool if there are enough pages or via the buddy allocator if\n overcommit is allowed and the buddy allocator can satisfy the request. If\n it fails, the child will be killed.\n\nIf the pool is large enough, existing applications will not notice that\nthe reserves were a factor. Existing applications depending on the\nno-reserves been set are unlikely to exist as for much of the history of\nhugetlbfs, pages were prefaulted at mmap(), allocating the pages at that\npoint or failing the mmap().\n\n[npiggin@suse.de: fix CONFIG_HUGETLB\u003dn build]\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: Adam Litke \u003cagl@us.ibm.com\u003e\nCc: Andy Whitcroft \u003capw@shadowen.org\u003e\nCc: William Lee Irwin III \u003cwli@holomorphy.com\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "42b7772812d15b86543a23b82bd6070eef9a08b1", "tree": "10665ee01fe82ce17c68a6278d044531b1ed64c0", "parents": [ "a352894d07059649398c4769dc8b645e1a1dad88" ], "author": { "name": "Jan Beulich", "email": "jbeulich@novell.com", "time": "Wed Jul 23 21:27:10 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 24 10:47:15 2008 -0700" }, "message": "mm: remove double indirection on tlb parameter to free_pgd_range() \u0026 Co\n\nThe double indirection here is not needed anywhere and hence (at least)\nconfusing.\n\nSigned-off-by: Jan Beulich \u003cjbeulich@novell.com\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nAcked-by: Jeremy Fitzhardinge \u003cjeremy@goop.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "28b2ee20c7cba812b6f2ccf6d722cf86d00a84dc", "tree": "e8f1efd05c38c1cb26ca3ee051a454eb685fd122", "parents": [ "0d71d10a4252a3938e6b70189bc776171c02e076" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Wed Jul 23 21:27:05 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 24 10:47:15 2008 -0700" }, "message": "access_process_vm device memory infrastructure\n\nIn order to be able to debug things like the X server and programs using\nthe PPC Cell SPUs, the debugger needs to be able to access device memory\nthrough ptrace and /proc/pid/mem.\n\nThis patch:\n\nAdd the generic_access_phys access function and put the hooks in place\nto allow access_process_vm to access device or PPC Cell SPU memory.\n\n[riel@redhat.com: Add documentation for the vm_ops-\u003eaccess function]\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Benjamin Herrensmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Dave Airlie \u003cairlied@linux.ie\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0d71d10a4252a3938e6b70189bc776171c02e076", "tree": "2bdaddc5eb5de1543368508e63d8859a94354073", "parents": [ "a969e903a944f69309ee5cc9e7c7b08310d1151e" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Wed Jul 23 21:27:05 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 24 10:47:15 2008 -0700" }, "message": "mm: remove nopfn\n\nThere are no users of nopfn in the tree. Remove it.\n\n[hugh@veritas.com: fix build error]\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7a36a752d006f6874049da510297eeb7f09d92a7", "tree": "764d02c44b95e34deb9cd3ed9d7bdc03c35ef172", "parents": [ "7ca796f492a11f9408e661c8f22cd8c4f486b8e5" ], "author": { "name": "Oleg Nesterov", "email": "oleg@tv-sign.ru", "time": "Fri Jul 04 09:59:28 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 04 10:40:04 2008 -0700" }, "message": "get_user_pages(): fix possible page leak on oom\n\nget_user_pages() must not return the error when i !\u003d 0. When pages !\u003d\nNULL we have i get_page()\u0027ed pages.\n\nSigned-off-by: Oleg Nesterov \u003coleg@tv-sign.ru\u003e\nAcked-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "251b97f552b1ad414cc5a9ccc8e4e94503edd5fc", "tree": "5d7559154edb8eb2069f39b6be99ffc2484580cd", "parents": [ "cde53535991fbb5c34a1566f25955297c1487b8d" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Jul 04 09:59:24 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 04 10:40:04 2008 -0700" }, "message": "mm: dirty page accounting vs VM_MIXEDMAP\n\nDirty page accounting accurately measures the amound of dirty pages in\nwritable shared mappings by mapping the pages RO (as indicated by\nvma_wants_writenotify). We then trap on first write and call\nset_page_dirty() on the page, after which we map the page RW and\ncontinue execution.\n\nWhen we launder dirty pages, we call clear_page_dirty_for_io() which\nclears both the dirty flag, and maps the page RO again before we start\nwriteout so that the story can repeat itself.\n\nvma_wants_writenotify() excludes VM_PFNMAP on the basis that we cannot\ndo the regular dirty page stuff on raw PFNs and the memory isn\u0027t going\nanywhere anyway.\n\nThe recently introduced VM_MIXEDMAP mixes both !pfn_valid() and\npfn_valid() pages in a single mapping.\n\nWe can\u0027t do dirty page accounting on !pfn_valid() pages as stated\nabove, and mapping them RO causes them to be COW\u0027ed on write, which\nbreaks VM_SHARED semantics.\n\nExcluding VM_MIXEDMAP in vma_wants_writenotify() would mean we don\u0027t do\nthe regular dirty page accounting for the pfn_valid() pages, which\nwould bring back all the head-aches from inaccurate dirty page\naccounting.\n\nSo instead, we let the !pfn_valid() pages get mapped RO, but fix them\nup unconditionally in the fault path.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nAcked-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: \"Jared Hulbert\" \u003cjaredeh@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": "945754a1754f9d4c2974a8241ad4f92fad7f3a6a", "tree": "d310dc918d8094a1a6e00e15b24f7953616d7a82", "parents": [ "672ca28e300c17bf8d792a2a7a8631193e580c74" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Mon Jun 23 14:30:30 2008 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 23 11:28:32 2008 -0700" }, "message": "mm: fix race in COW logic\n\nThere is a race in the COW logic. It contains a shortcut to avoid the\nCOW and reuse the page if we have the sole reference on the page,\nhowever it is possible to have two racing do_wp_page()ers with one\ncausing the other to mistakenly believe it is safe to take the shortcut\nwhen it is not. This could lead to data corruption.\n\nProcess 1 and process2 each have a wp pte of the same anon page (ie.\none forked the other). The page\u0027s mapcount is 2. Then they both\nattempt to write to it around the same time...\n\n proc1\t\t\t\tproc2 thr1\t\t\tproc2 thr2\n CPU0\t\t\t\tCPU1\t\t\t\tCPU3\n do_wp_page()\t\t\tdo_wp_page()\n\t\t\t\t trylock_page()\n\t\t\t\t can_share_swap_page()\n\t\t\t\t load page mapcount (\u003d\u003d2)\n\t\t\t\t reuse \u003d 0\n\t\t\t\t pte unlock\n\t\t\t\t copy page to new_page\n\t\t\t\t pte lock\n\t\t\t\t page_remove_rmap(page);\n trylock_page()\n can_share_swap_page()\n load page mapcount (\u003d\u003d1)\n reuse \u003d 1\n ptep_set_access_flags (allow W)\n\n write private key into page\n\t\t\t\t\t\t\t\tread from page\n\t\t\t\tptep_clear_flush()\n\t\t\t\tset_pte_at(pte of new_page)\n\nFix this by moving the page_remove_rmap of the old page after the pte\nclear and flush. Potentially the entire branch could be moved down\nhere, but in order to stay consistent, I won\u0027t (should probably move all\nthe *_mm_counter stuff with one patch).\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "672ca28e300c17bf8d792a2a7a8631193e580c74", "tree": "73b414f017d15cd404528e2fdd555a93bdb69b61", "parents": [ "96a331b1d6426726c37242ddbe939ee14b255790" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 23 11:21:37 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 23 11:21:37 2008 -0700" }, "message": "Fix ZERO_PAGE breakage with vmware\n\nCommit 89f5b7da2a6bad2e84670422ab8192382a5aeb9f (\"Reinstate ZERO_PAGE\noptimization in \u0027get_user_pages()\u0027 and fix XIP\") broke vmware, as\nreported by Jeff Chua:\n\n \"This broke vmware 6.0.4.\n Jun 22 14:53:03.845: vmx| NOT_IMPLEMENTED\n /build/mts/release/bora-93057/bora/vmx/main/vmmonPosix.c:774\"\n\nand the reason seems to be that there\u0027s an old bug in how we handle do\nFOLL_ANON on VM_SHARED areas in get_user_pages(), but since it only\ntriggered if the whole page table was missing, nobody had apparently hit\nit before.\n\nThe recent changes to \u0027follow_page()\u0027 made the FOLL_ANON logic trigger\nnot just for whole missing page tables, but for individual pages as\nwell, and exposed this problem.\n\nThis fixes it by making the test for when FOLL_ANON is used more\ncareful, and also makes the code easier to read and understand by moving\nthe logic to a separate inline function.\n\nReported-and-tested-by: Jeff Chua \u003cjeff.chua.linux@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "89f5b7da2a6bad2e84670422ab8192382a5aeb9f", "tree": "4f55cf9ef8a76d4b9a960e1b443ed015e63e713f", "parents": [ "9bedbcb207ed9a571b239231d99c8fd4a34ae24d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 20 11:18:25 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 20 11:18:25 2008 -0700" }, "message": "Reinstate ZERO_PAGE optimization in \u0027get_user_pages()\u0027 and fix XIP\n\nKAMEZAWA Hiroyuki and Oleg Nesterov point out that since the commit\n557ed1fa2620dc119adb86b34c614e152a629a80 (\"remove ZERO_PAGE\") removed\nthe ZERO_PAGE from the VM mappings, any users of get_user_pages() will\ngenerally now populate the VM with real empty pages needlessly.\n\nWe used to get the ZERO_PAGE when we did the \"handle_mm_fault()\", but\nsince fault handling no longer uses ZERO_PAGE for new anonymous pages,\nwe now need to handle that special case in follow_page() instead.\n\nIn particular, the removal of ZERO_PAGE effectively removed the core\nfile writing optimization where we would skip writing pages that had not\nbeen populated at all, and increased memory pressure a lot by allocating\nall those useless newly zeroed pages.\n\nThis reinstates the optimization by making the unmapped PTE case the\nsame as for a non-existent page table, which already did this correctly.\n\nWhile at it, this also fixes the XIP case for follow_page(), where the\ncaller could not differentiate between the case of a page that simply\ncould not be used (because it had no \"struct page\" associated with it)\nand a page that just wasn\u0027t mapped.\n\nWe do that by simply returning an error pointer for pages that could not\nbe turned into a \"struct page *\". The error is arbitrarily picked to be\nEFAULT, since that was what get_user_pages() already used for the\nequivalent IO-mapped page case.\n\n[ Also removed an impossible test for pte_offset_map_lock() failing:\n that\u0027s not how that function works ]\n\nAcked-by: Oleg Nesterov \u003coleg@tv-sign.ru\u003e\nAcked-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "42172d751b4596b8ca4346a1c251b5f1c661ab0c", "tree": "f9149aee9349c43bd8e253b407acae920e041d00", "parents": [ "c2448278e3be3a43fe0343e138444742af1e99ae" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Fri May 23 13:04:18 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 24 09:56:07 2008 -0700" }, "message": "mm: allow pfnmap -\u003efault()s\n\nTake out an assertion to allow -\u003efault handlers to service PFNMAP regions.\nThis is required to reimplement .nopfn handlers with .fault handlers and\nsubsequently remove nopfn.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: Jes Sorensen \u003cjes@sgi.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "362a61ad61199e19a61b8e432015e2586b288f5b", "tree": "b766e454928eea0db1ec6e301340c27ef5f5244f", "parents": [ "73f10281ea96d7e8b4fc1c5d755a7c8eb484155b" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Wed May 14 06:37:36 2008 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 14 10:05:18 2008 -0700" }, "message": "fix SMP data race in pagetable setup vs walking\n\nThere is a possible data race in the page table walking code. After the split\nptlock patches, it actually seems to have been introduced to the core code, but\neven before that I think it would have impacted some architectures (powerpc\nand sparc64, at least, walk the page tables without taking locks eg. see\nfind_linux_pte()).\n\nThe race is as follows:\nThe pte page is allocated, zeroed, and its struct page gets its spinlock\ninitialized. The mm-wide ptl is then taken, and then the pte page is inserted\ninto the pagetables.\n\nAt this point, the spinlock is not guaranteed to have ordered the previous\nstores to initialize the pte page with the subsequent store to put it in the\npage tables. So another Linux page table walker might be walking down (without\nany locks, because we have split-leaf-ptls), and find that new pte we\u0027ve\ninserted. It might try to take the spinlock before the store from the other\nCPU initializes it. And subsequently it might read a pte_t out before stores\nfrom the other CPU have cleared the memory.\n\nThere are also similar races in higher levels of the page tables. They\nobviously don\u0027t involve the spinlock, but could see uninitialized memory.\n\nArch code and hardware pagetable walkers that walk the pagetables without\nlocks could see similar uninitialized memory problems, regardless of whether\nsplit ptes are enabled or not.\n\nI prefer to put the barriers in core code, because that\u0027s where the higher\nlevel logic happens, but the page table accessors are per-arch, and open-coding\nthem everywhere I don\u0027t think is an option. I\u0027ll put the read-side barriers\nin alpha arch code for now (other architectures perform data-dependent loads\nin order).\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aeed5fce37196e09b4dac3a1c00d8b7122e040ce", "tree": "d16a8f824ad06ac5dea6052f1986165a0d7fc865", "parents": [ "bb78be8397d3b0900af3d717672218ee3ea07985" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue May 06 20:49:23 2008 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 06 13:08:58 2008 -0700" }, "message": "x86: fix PAE pmd_bad bootup warning\n\nFix warning from pmd_bad() at bootup on a HIGHMEM64G HIGHPTE x86_32.\n\nThat came from 9fc34113f6880b215cbea4e7017fc818700384c2 x86: debug pmd_bad();\nbut we understand now that the typecasting was wrong for PAE in the previous\nversion: pagetable pages above 4GB looked bad and stopped Arjan from booting.\n\nAnd revert that cded932b75ab0a5f9181ee3da34a0a488d1a14fd x86: fix pmd_bad\nand pud_bad to support huge pages. It was the wrong way round: we shouldn\u0027t\nweaken every pmd_bad and pud_bad check to let huge pages slip through - in\npart they check that we _don\u0027t_ have a huge page where it\u0027s not expected.\n\nPut the x86 pmd_bad() and pud_bad() definitions back to what they have long\nbeen: they can be improved (x86_32 should use PTE_MASK, to stop PAE thinking\njunk in the upper word is good; and x86_64 should follow x86_32\u0027s stricter\ncomparison, to stop thinking any subset of required bits is good); but that\nshould be a later patch.\n\nFix Hans\u0027 good observation that follow_page() will never find pmd_huge()\nbecause that would have already failed the pmd_bad test: test pmd_huge in\nbetween the pmd_none and pmd_bad tests. Tighten x86\u0027s pmd_huge() check?\nNo, once it\u0027s a hugepage entry, it can get quite far from a good pmd: for\nexample, PROT_NONE leaves it with only ACCESSED of the KERN_PGTABLE bits.\n\nHowever... though follow_page() contains this and another test for huge\npages, so it\u0027s nice to keep it working on them, where does it actually get\ncalled on a huge page? get_user_pages() checks is_vm_hugetlb_page(vma) to\nto call alternative hugetlb processing, as does unmap_vmas() and others.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nEarlier-version-tested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Jeff Chua \u003cjeff.chua.linux@gmail.com\u003e\nCc: Hans Rosenfeld \u003chans.rosenfeld@amd.com\u003e\nCc: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "423bad600443c590f34ed7ce357591f76f48f137", "tree": "79487f811bf1097f2592c4d20f688d1b1ec41e25", "parents": [ "7e675137a8e1a4d45822746456dd389b65745bf6" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Mon Apr 28 02:13:01 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 28 08:58:23 2008 -0700" }, "message": "mm: add vm_insert_mixed\n\nvm_insert_mixed will insert either a raw pfn or a refcounted struct page into\nthe page tables, depending on whether vm_normal_page() will return the page or\nnot. With the introduction of the new pte bit, this is now a too tricky for\ndrivers to be doing themselves.\n\nfilemap_xip uses this in a subsequent patch.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Jared Hulbert \u003cjaredeh@gmail.com\u003e\nCc: Carsten Otte \u003ccotte@de.ibm.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.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": "7e675137a8e1a4d45822746456dd389b65745bf6", "tree": "5df01d23ea1b6b212d18f2136ff82913fcbe7718", "parents": [ "b379d790197cdf8a95fb67507d75a24ac0a1678d" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Mon Apr 28 02:13:00 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 28 08:58:23 2008 -0700" }, "message": "mm: introduce pte_special pte bit\n\ns390 for one, cannot implement VM_MIXEDMAP with pfn_valid, due to their memory\nmodel (which is more dynamic than most). Instead, they had proposed to\nimplement it with an additional path through vm_normal_page(), using a bit in\nthe pte to determine whether or not the page should be refcounted:\n\nvm_normal_page()\n{\n\t...\n if (unlikely(vma-\u003evm_flags \u0026 (VM_PFNMAP|VM_MIXEDMAP))) {\n if (vma-\u003evm_flags \u0026 VM_MIXEDMAP) {\n#ifdef s390\n\t\t\tif (!mixedmap_refcount_pte(pte))\n\t\t\t\treturn NULL;\n#else\n if (!pfn_valid(pfn))\n return NULL;\n#endif\n goto out;\n }\n\t...\n}\n\nThis is fine, however if we are allowed to use a bit in the pte to determine\nrefcountedness, we can use that to _completely_ replace all the vma based\nschemes. So instead of adding more cases to the already complex vma-based\nscheme, we can have a clearly seperate and simple pte-based scheme (and get\nslightly better code generation in the process):\n\nvm_normal_page()\n{\n#ifdef s390\n\tif (!mixedmap_refcount_pte(pte))\n\t\treturn NULL;\n\treturn pte_page(pte);\n#else\n\t...\n#endif\n}\n\nAnd finally, we may rather make this concept usable by any architecture rather\nthan making it s390 only, so implement a new type of pte state for this.\nUnfortunately the old vma based code must stay, because some architectures may\nnot be able to spare pte bits. This makes vm_normal_page a little bit more\nugly than we would like, but the 2 cases are clearly seperate.\n\nSo introduce a pte_special pte state, and use it in mm/memory.c. It is\ncurrently a noop for all architectures, so this doesn\u0027t actually result in any\ncompiled code changes to mm/memory.o.\n\nBTW:\nI haven\u0027t put vm_normal_page() into arch code as-per an earlier suggestion.\nThe reason is that, regardless of where vm_normal_page is actually\nimplemented, the *abstraction* is still exactly the same. Also, while it\ndepends on whether the architecture has pte_special or not, that is the\nonly two possible cases, and it really isn\u0027t an arch specific function --\nthe role of the arch code should be to provide primitive functions and\naccessors with which to build the core code; pte_special does that. We do\nnot want architectures to know or care about vm_normal_page itself, and\nwe definitely don\u0027t want them being able to invent something new there\nout of sight of mm/ code. If we made vm_normal_page an arch function, then\nwe have to make vm_insert_mixed (next patch) an arch function too. So I\ndon\u0027t think moving it to arch code fundamentally improves any abstractions,\nwhile it does practically make the code more difficult to follow, for both\nmm and arch developers, and easier to misuse.\n\n[akpm@linux-foundation.org: build fix]\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: Carsten Otte \u003ccotte@de.ibm.com\u003e\nCc: Jared Hulbert \u003cjaredeh@gmail.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.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": "b379d790197cdf8a95fb67507d75a24ac0a1678d", "tree": "8ea36c9a0766aca3cfd69cd33aa8a5d2ca8dd2d4", "parents": [ "214e471ff99064726b2d8af3aa0e24a73c775531" ], "author": { "name": "Jared Hulbert", "email": "jaredeh@gmail.com", "time": "Mon Apr 28 02:12:58 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 28 08:58:22 2008 -0700" }, "message": "mm: introduce VM_MIXEDMAP\n\nThis series introduces some important infrastructure work. The overall result\nis that:\n\n1. We now support XIP backed filesystems using memory that have no\n struct page allocated to them. And patches 6 and 7 actually implement\n this for s390.\n\n This is pretty important in a number of cases. As far as I understand,\n in the case of virtualisation (eg. s390), each guest may mount a\n readonly copy of the same filesystem (eg. the distro). Currently,\n guests need to allocate struct pages for this image. So if you have\n 100 guests, you already need to allocate more memory for the struct\n pages than the size of the image. I think. (Carsten?)\n\n For other (eg. embedded) systems, you may have a very large non-\n volatile filesystem. If you have to have struct pages for this, then\n your RAM consumption will go up proportionally to fs size. Even\n though it is just a small proportion, the RAM can be much more costly\n eg in terms of power, so every KB less that Linux uses makes it more\n attractive to a lot of these guys.\n\n2. VM_MIXEDMAP allows us to support mappings where you actually do want\n to refcount _some_ pages in the mapping, but not others, and support\n COW on arbitrary (non-linear) mappings. Jared needs this for his NVRAM\n filesystem in progress. Future iterations of this filesystem will\n most likely want to migrate pages between pagecache and XIP backing,\n which is where the requirement for mixed (some refcounted, some not)\n comes from.\n\n3. pte_special also has a peripheral usage that I need for my lockless\n get_user_pages patch. That was shown to speed up \"oltp\" on db2 by\n 10% on a 2 socket system, which is kind of significant because they\n scrounge for months to try to find 0.1% improvement on these\n workloads. I\u0027m hoping we might finally be faster than AIX on\n pSeries with this :). My reference to lockless get_user_pages is not\n meant to justify this patchset (which doesn\u0027t include lockless gup),\n but just to show that pte_special is not some s390 specific thing that\n should be hidden in arch code or xip code: I definitely want to use it\n on at least x86 and powerpc as well.\n\nThis patch:\n\nIntroduce a new type of mapping, VM_MIXEDMAP. This is unlike VM_PFNMAP in\nthat it can support COW mappings of arbitrary ranges including ranges without\nstruct page *and* ranges with a struct page that we actually want to refcount\n(PFNMAP can only support COW in those cases where the un-COW-ed translations\nare mapped linearly in the virtual address, and can only support non\nrefcounted ranges).\n\nVM_MIXEDMAP achieves this by refcounting all pfn_valid pages, and not\nrefcounting !pfn_valid pages (which is not an option for VM_PFNMAP, because it\nneeds to avoid refcounting pfn_valid pages eg. for /dev/mem mappings).\n\nSigned-off-by: Jared Hulbert \u003cjaredeh@gmail.com\u003e\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: Carsten Otte \u003ccotte@de.ibm.com\u003e\nCc: Jared Hulbert \u003cjaredeh@gmail.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.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": "3c18ddd160d1fcd46d1131d9ad6c594dd8e9af99", "tree": "7307ba1ae4bdb99d1363eb59b1ebefcf5295c8ef", "parents": [ "4d3d5b41a72b52555d43efbfc4ccde6ba6e5444f" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Mon Apr 28 02:12:10 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 28 08:58:18 2008 -0700" }, "message": "mm: remove nopage\n\nNothing in the tree uses nopage any more. Remove support for it in the\ncore mm code and documentation (and a few stray references to it in\ncomments).\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "61469f1d51777fc3b6d8d70da8373ee77ee13349", "tree": "cdcde89af7b998c340414f305a2a723106770c17", "parents": [ "6dbf6d3bb955d5a92005b6ecd6ffad2c5b95b963" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Mar 04 14:29:04 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:14 2008 -0800" }, "message": "memcg: when do_swap\u0027s do_wp_page fails\n\nDon\u0027t uncharge when do_swap_page\u0027s call to do_wp_page fails: the page which\nwas charged for is there in the pagetable, and will be correctly uncharged\nwhen that area is unmapped - it was only its COWing which failed.\n\nAnd while we\u0027re here, remove earlier XXX comment: yes, OR in do_wp_page\u0027s\nreturn value (maybe VM_FAULT_WRITE) with do_swap_page\u0027s there; but if it\nfails, mask out success bits, which might confuse some arches e.g. sparc.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hirokazu Takahashi \u003ctaka@valinux.co.jp\u003e\nCc: YAMAMOTO Takashi \u003cyamamoto@valinux.co.jp\u003e\nCc: Paul Menage \u003cmenage@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": "6dbf6d3bb955d5a92005b6ecd6ffad2c5b95b963", "tree": "429960ea7e804a2454eb76271f4f58621a62e456", "parents": [ "427d5416f317681498337ab19218d195edea02d6" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Tue Mar 04 14:29:04 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Mar 04 16:35:14 2008 -0800" }, "message": "memcg: page_cache_release not __free_page\n\nThere\u0027s nothing wrong with mem_cgroup_charge failure in do_wp_page and\ndo_anonymous page using __free_page, but it does look odd when nearby code\nuses page_cache_release: use that instead (while turning a blind eye to\nancient inconsistencies of page_cache_release versus put_page).\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hirokazu Takahashi \u003ctaka@valinux.co.jp\u003e\nCc: YAMAMOTO Takashi \u003cyamamoto@valinux.co.jp\u003e\nCc: Paul Menage \u003cmenage@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": "664a1566df81b44f7e5e234d55e3bc8c6c0be211", "tree": "17eb4b827091279a60f60a36b34e0437ba804dc1", "parents": [ "b9e222904ce92e1b277f2b85411d1eb6bfe27410", "f8d8406bcb58ff70e97b71c35ff5be90c54fc3d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Thu Feb 14 21:23:19 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Thu Feb 14 21:23:19 2008 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:\n x86: cpa, fix out of date comment\n KVM is not seen under X86 config with latest git (32 bit compile)\n x86: cpa: ensure page alignment\n x86: include proper prototypes for rodata_test\n x86: fix gart_iommu_init()\n x86: EFI set_memory_x()/set_memory_uc() fixes\n x86: make dump_pagetable() static\n x86: fix \"BUG: sleeping function called from invalid context\" in print_vma_addr()\n" }, { "commit": "cf28b4863f9ee8f122e8ff3ac0d403e07ba9c6d9", "tree": "65c91f6911b34c32e517938289621ce0e7baeaf3", "parents": [ "c32c2f63a9d6c953aaf168c0b2551da9734f76d2" ], "author": { "name": "Jan Blunck", "email": "jblunck@suse.de", "time": "Thu Feb 14 19:38:44 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Thu Feb 14 21:17:09 2008 -0800" }, "message": "d_path: Make d_path() use a struct path\n\nd_path() is used on a \u003cdentry,vfsmount\u003e pair. Lets use a struct path to\nreflect this.\n\n[akpm@linux-foundation.org: fix build in mm/memory.c]\nSigned-off-by: Jan Blunck \u003cjblunck@suse.de\u003e\nAcked-by: Bryan Wu \u003cbryan.wu@analog.com\u003e\nAcked-by: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: \"J. Bruce Fields\" \u003cbfields@fieldses.org\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nCc: Michael Halcrow \u003cmhalcrow@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e8bff74afbdb4ad72bf6135c84289c47cf557892", "tree": "46b560c1f055a1fe7dbb9ad6b42b19f521e1ec27", "parents": [ "e760e716d47b48caf98da348368fd41b4a9b9e7e" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 13 20:21:06 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Feb 14 23:30:19 2008 +0100" }, "message": "x86: fix \"BUG: sleeping function called from invalid context\" in print_vma_addr()\n\nJiri Kosina reported the following deadlock scenario with\nshow_unhandled_signals enabled:\n\n [ 68.379022] gnome-settings-[2941] trap int3 ip:3d2c840f34\n sp:7fff36f5d100 error:0\u003c3\u003eBUG: sleeping function called from invalid\n context at kernel/rwsem.c:21\n [ 68.379039] in_atomic():1, irqs_disabled():0\n [ 68.379044] no locks held by gnome-settings-/2941.\n [ 68.379050] Pid: 2941, comm: gnome-settings- Not tainted 2.6.25-rc1 #30\n [ 68.379054]\n [ 68.379056] Call Trace:\n [ 68.379061] \u003c#DB\u003e [\u003cffffffff81064883\u003e] ? __debug_show_held_locks+0x13/0x30\n [ 68.379109] [\u003cffffffff81036765\u003e] __might_sleep+0xe5/0x110\n [ 68.379123] [\u003cffffffff812f2240\u003e] down_read+0x20/0x70\n [ 68.379137] [\u003cffffffff8109cdca\u003e] print_vma_addr+0x3a/0x110\n [ 68.379152] [\u003cffffffff8100f435\u003e] do_trap+0xf5/0x170\n [ 68.379168] [\u003cffffffff8100f52b\u003e] do_int3+0x7b/0xe0\n [ 68.379180] [\u003cffffffff812f4a6f\u003e] int3+0x9f/0xd0\n [ 68.379203] \u003c\u003cEOE\u003e\u003e\n [ 68.379229] in libglib-2.0.so.0.1505.0[3d2c800000+dc000]\n\nand tracked it down to:\n\n commit 03252919b79891063cf99145612360efbdf9500b\n Author: Andi Kleen \u003cak@suse.de\u003e\n Date: Wed Jan 30 13:33:18 2008 +0100\n\n x86: print which shared library/executable faulted in segfault etc. messages\n\nthe problem is that we call down_read() from an atomic context.\n\nSolve this by returning from print_vma_addr() if the preempt count is\nelevated. Update preempt_conditional_sti / preempt_conditional_cli to\nunconditionally lift the preempt count even on !CONFIG_PREEMPT.\n\nReported-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "900cf086fd2fbad07f72f4575449e0d0958f860f", "tree": "9d48ca4463111c074ea8688fd8041115387156e1", "parents": [ "b1292b17dc03fcd90f3301974cea1b7c61371ba5" ], "author": { "name": "Jonathan Corbet", "email": "corbet@lwn.net", "time": "Mon Feb 11 16:17:33 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Mon Feb 11 20:44:44 2008 -0800" }, "message": "Be more robust about bad arguments in get_user_pages()\n\nSo I spent a while pounding my head against my monitor trying to figure\nout the vmsplice() vulnerability - how could a failure to check for\n*read* access turn into a root exploit? It turns out that it\u0027s a buffer\noverflow problem which is made easy by the way get_user_pages() is\ncoded.\n\nIn particular, \"len\" is a signed int, and it is only checked at the\n*end* of a do {} while() loop. So, if it is passed in as zero, the loop\nwill execute once and decrement len to -1. At that point, the loop will\nproceed until the next invalid address is found; in the process, it will\nlikely overflow the pages array passed in to get_user_pages().\n\nI think that, if get_user_pages() has been asked to grab zero pages,\nthat\u0027s what it should do. Thus this patch; it is, among other things,\nenough to block the (already fixed) root exploit and any others which\nmight be lurking in similar code. I also think that the number of pages\nshould be unsigned, but changing the prototype of this function probably\nrequires some more careful review.\n\nSigned-off-by: Jonathan Corbet \u003ccorbet@lwn.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2f569afd9ced9ebec9a6eb3dbf6f83429be0a7b4", "tree": "23a31763887d9505e62e9d7cc8ec2fa4b86bd380", "parents": [ "13214adf738abc92b0a00c0763fd3be79eebaa7c" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Fri Feb 08 04:22:04 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Fri Feb 08 09:22:42 2008 -0800" }, "message": "CONFIG_HIGHPTE vs. sub-page page tables.\n\nBackground: I\u0027ve implemented 1K/2K page tables for s390. These sub-page\npage tables are required to properly support the s390 virtualization\ninstruction with KVM. The SIE instruction requires that the page tables\nhave 256 page table entries (pte) followed by 256 page status table entries\n(pgste). The pgstes are only required if the process is using the SIE\ninstruction. The pgstes are updated by the hardware and by the hypervisor\nfor a number of reasons, one of them is dirty and reference bit tracking.\nTo avoid wasting memory the standard pte table allocation should return\n1K/2K (31/64 bit) and 2K/4K if the process is using SIE.\n\nProblem: Page size on s390 is 4K, page table size is 1K or 2K. That means\nthe s390 version for pte_alloc_one cannot return a pointer to a struct\npage. Trouble is that with the CONFIG_HIGHPTE feature on x86 pte_alloc_one\ncannot return a pointer to a pte either, since that would require more than\n32 bit for the return value of pte_alloc_one (and the pte * would not be\naccessible since its not kmapped).\n\nSolution: The only solution I found to this dilemma is a new typedef: a\npgtable_t. For s390 pgtable_t will be a (pte *) - to be introduced with a\nlater patch. For everybody else it will be a (struct page *). The\nadditional problem with the initialization of the ptl lock and the\nNR_PAGETABLE accounting is solved with a constructor pgtable_page_ctor and\na destructor pgtable_page_dtor. The page table allocation and free\nfunctions need to call these two whenever a page table page is allocated or\nfreed. pmd_populate will get a pgtable_t instead of a struct page pointer.\n To get the pgtable_t back from a pmd entry that has been installed with\npmd_populate a new function pmd_pgtable is added. It replaces the pmd_page\ncall in free_pte_range and apply_to_pte_range.\n\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e1a1cd590e3fcb0d2e230128daf2337ea55387dc", "tree": "eb660ab340c657a1eb595b2d4d8e8b62783bf6fb", "parents": [ "bed7161a519a2faef53e1bce1b47595e297c1d14" ], "author": { "name": "Balbir Singh", "email": "balbir@linux.vnet.ibm.com", "time": "Thu Feb 07 00:14:02 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Thu Feb 07 08:42:19 2008 -0800" }, "message": "Memory controller: make charging gfp mask aware\n\nNick Piggin pointed out that swap cache and page cache addition routines\ncould be called from non GFP_KERNEL contexts. This patch makes the\ncharging routine aware of the gfp context. Charging might fail if the\ncgroup is over it\u0027s limit, in which case a suitable error is returned.\n\nThis patch was tested on a Powerpc box. I am still looking at being able\nto test the path, through which allocations happen in non GFP_KERNEL\ncontexts.\n\n[kamezawa.hiroyu@jp.fujitsu.com: problem with ZONE_MOVABLE]\nSigned-off-by: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nCc: Pavel Emelianov \u003cxemul@openvz.org\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Kirill Korotaev \u003cdev@sw.ru\u003e\nCc: Herbert Poetzl \u003cherbert@13thfloor.at\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Vaidyanathan Srinivasan \u003csvaidy@linux.vnet.ibm.com\u003e\nSigned-off-by: 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": "8a9f3ccd24741b50200c3f33d62534c7271f3dfc", "tree": "066aabd8d2952299501f067a91cbfd6f47ee62f6", "parents": [ "78fb74669e80883323391090e4d26d17fe29488f" ], "author": { "name": "Balbir Singh", "email": "balbir@linux.vnet.ibm.com", "time": "Thu Feb 07 00:13:53 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Thu Feb 07 08:42:18 2008 -0800" }, "message": "Memory controller: memory accounting\n\nAdd the accounting hooks. The accounting is carried out for RSS and Page\nCache (unmapped) pages. There is now a common limit and accounting for both.\nThe RSS accounting is accounted at page_add_*_rmap() and page_remove_rmap()\ntime. Page cache is accounted at add_to_page_cache(),\n__delete_from_page_cache(). Swap cache is also accounted for.\n\nEach page\u0027s page_cgroup is protected with the last bit of the\npage_cgroup pointer, this makes handling of race conditions involving\nsimultaneous mappings of a page easier. A reference count is kept in the\npage_cgroup to deal with cases where a page might be unmapped from the RSS\nof all tasks, but still lives in the page cache.\n\nCredits go to Vaidyanathan Srinivasan for helping with reference counting work\nof the page cgroup. Almost all of the page cache accounting code has help\nfrom Vaidyanathan Srinivasan.\n\n[hugh@veritas.com: fix swapoff breakage]\n[akpm@linux-foundation.org: fix locking]\nSigned-off-by: Vaidyanathan Srinivasan \u003csvaidy@linux.vnet.ibm.com\u003e\nSigned-off-by: Balbir Singh \u003cbalbir@linux.vnet.ibm.com\u003e\nCc: Pavel Emelianov \u003cxemul@openvz.org\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Kirill Korotaev \u003cdev@sw.ru\u003e\nCc: Herbert Poetzl \u003cherbert@13thfloor.at\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: \u003cValdis.Kletnieks@vt.edu\u003e\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "32a932332c8bad842804842eaf9651ad6268e637", "tree": "58f187409029f089f788c5c35ad5c200b4a555af", "parents": [ "4cc6028d4040f95cdb590a87db478b42b8be0508" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 06 22:39:44 2008 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Feb 06 22:39:44 2008 +0100" }, "message": "brk randomization: introduce CONFIG_COMPAT_BRK\n\nbased on similar patch from: Pavel Machek \u003cpavel@ucw.cz\u003e\n\nIntroduce CONFIG_COMPAT_BRK. If disabled then the kernel is free\n(but not obliged to) randomize the brk area.\n\nHeap randomization breaks ancient binaries, so we keep COMPAT_BRK\nenabled by default.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0ed361dec36945f3116ee1338638ada9a8920905", "tree": "3e0fc6319ef49f6cac82e8203a8aa199302ab9c5", "parents": [ "62e1c55300f306e06478f460a7eefba085206e0b" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Mon Feb 04 22:29:34 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Feb 05 09:44:19 2008 -0800" }, "message": "mm: fix PageUptodate data race\n\nAfter running SetPageUptodate, preceeding stores to the page contents to\nactually bring it uptodate may not be ordered with the store to set the\npage uptodate.\n\nTherefore, another CPU which checks PageUptodate is true, then reads the\npage contents can get stale data.\n\nFix this by having an smp_wmb before SetPageUptodate, and smp_rmb after\nPageUptodate.\n\nMany places that test PageUptodate, do so with the page locked, and this\nwould be enough to ensure memory ordering in those places if\nSetPageUptodate were only called while the page is locked. Unfortunately\nthat is not always the case for some filesystems, but it could be an idea\nfor the future.\n\nAlso bring the handling of anonymous page uptodateness in line with that of\nfile backed page management, by marking anon pages as uptodate when they\n_are_ uptodate, rather than when our implementation requires that they be\nmarked as such. Doing allows us to get rid of the smp_wmb\u0027s in the page\ncopying functions, which were especially added for anonymous pages for an\nanalogous memory ordering problem. Both file and anonymous pages are\nhandled with the same barriers.\n\nFAQ:\nQ. Why not do this in flush_dcache_page?\nA. Firstly, flush_dcache_page handles only one side (the smb side) of the\nordering protocol; we\u0027d still need smp_rmb somewhere. Secondly, hiding away\nmemory barriers in a completely unrelated function is nasty; at least in the\nPageUptodate macros, they are located together with (half) the operations\ninvolved in the ordering. Thirdly, the smp_wmb is only required when first\nbringing the page uptodate, wheras flush_dcache_page should be called each time\nit is written to through the kernel mapping. It is logically the wrong place to\nput it.\n\nQ. Why does this increase my text size / reduce my performance / etc.\nA. Because it is adding the necessary instructions to eliminate the data-race.\n\nQ. Can it be improved?\nA. Yes, eg. if you were to create a rule that all SetPageUptodate operations\nrun under the page lock, we could avoid the smp_rmb places where PageUptodate\nis queried under the page lock. Requires audit of all filesystems and at least\nsome would need reworking. That\u0027s great you\u0027re interested, I\u0027m eagerly awaiting\nyour patches.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "920c7a5d0c94b8ce740f1d76fa06422f2a95a757", "tree": "74ab4b9b5a6f4279b9b9d2a463c6700546ba0011", "parents": [ "1e548deb5d1630ca14ba04da04e3b6b3766178c7" ], "author": { "name": "Harvey Harrison", "email": "harvey.harrison@gmail.com", "time": "Mon Feb 04 22:29:26 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Feb 05 09:44:18 2008 -0800" }, "message": "mm: remove fastcall from mm/\n\nfastcall is always defined to be empty, remove it\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Harvey Harrison \u003charvey.harrison@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": "5e5419734c8719cbc01af959ad9c0844002c0df5", "tree": "a075dca3f719946689efa0245464855cbf2a20ce", "parents": [ "9f8f2172537de7af0b0fbd33502d18d52b1339bc" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Feb 04 22:29:14 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Feb 05 09:44:18 2008 -0800" }, "message": "add mm argument to pte/pmd/pud/pgd_free\n\n(with Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e)\n\nThe pgd/pud/pmd/pte page table allocation functions get a mm_struct pointer as\nfirst argument. The free functions do not get the mm_struct argument. This\nis 1) asymmetrical and 2) to do mm related page table allocations the mm\nargument is needed on the free function as well.\n\n[kamalesh@linux.vnet.ibm.com: i386 fix]\n[akpm@linux-foundation.org: coding-syle fixes]\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Kamalesh Babulal \u003ckamalesh@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": "61d5048f149572434daee0cce5e1374a8a7cf3e8", "tree": "97ac9c25bc44a58145a750a99887195df31cbe40", "parents": [ "1b1b32f2c6f6bb32535d2da62075b51c980880eb" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Mon Feb 04 22:28:56 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Feb 05 09:44:16 2008 -0800" }, "message": "clean up vmtruncate\n\nvmtruncate is a twisted maze of gotos, this patch cleans it up to have a\nproper if else for the two major cases of extending and truncating truncate\nand thus makes it a lot more readable while keeping exactly the same\nfunctinality.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "02098feaa42b2e0087fbbe6c6ab9a23e4653b16a", "tree": "494eaf13f204c9384d4316202fd76cd1b5d960ad", "parents": [ "46017e954826ac59e91df76341a3f76b45467847" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Mon Feb 04 22:28:42 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Feb 05 09:44:14 2008 -0800" }, "message": "swapin needs gfp_mask for loop on tmpfs\n\nBuilding in a filesystem on a loop device on a tmpfs file can hang when\nswapping, the loop thread caught in that infamous throttle_vm_writeout.\n\nIn theory this is a long standing problem, which I\u0027ve either never seen in\npractice, or long ago suppressed the recollection, after discounting my load\nand my tmpfs size as unrealistically high. But now, with the new aops, it has\nbecome easy to hang on one machine.\n\nLoop used to grab_cache_page before the old prepare_write to tmpfs, which\nseems to have been enough to free up some memory for any swapin needed; but\nthe new write_begin lets tmpfs find or allocate the page (much nicer, since\ngrab_cache_page missed tmpfs pages in swapcache).\n\nWhen allocating a fresh page, tmpfs respects loop\u0027s mapping_gfp_mask, which\nhas __GFP_IO|__GFP_FS stripped off, and throttle_vm_writeout is designed to\nbreak out when __GFP_IO or GFP_FS is unset; but when tmfps swaps in,\nread_swap_cache_async allocates with GFP_HIGHUSER_MOVABLE regardless of the\nmapping_gfp_mask - hence the hang.\n\nSo, pass gfp_mask down the line from shmem_getpage to shmem_swapin to\nswapin_readahead to read_swap_cache_async to add_to_swap_cache.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "46017e954826ac59e91df76341a3f76b45467847", "tree": "711a35e3936118665d0eac2afeef8758b4f4e95f", "parents": [ "c4cc6d07b2f465fbf5efd99bbe772a49c515f3f2" ], "author": { "name": "Hugh Dickins", "email": "hugh@veritas.com", "time": "Mon Feb 04 22:28:41 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@woody.linux-foundation.org", "time": "Tue Feb 05 09:44:14 2008 -0800" }, "message": "swapin_readahead: move and rearrange args\n\nswapin_readahead has never sat well in mm/memory.c: move it to mm/swap_state.c\nbeside its kindred read_swap_cache_async. Why were its args in a different\norder? rearrange them. And since it was always followed by a\nread_swap_cache_async of the target page, fold that in and return struct\npage*. Then CONFIG_SWAP\u003dn no longer needs valid_swaphandles and\nread_swap_cache_async stubs.\n\nSigned-off-by: Hugh Dickins \u003chugh@veritas.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" } ], "next": "c4cc6d07b2f465fbf5efd99bbe772a49c515f3f2" }