From: David Rientjes <rientjes@google.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: Andrey Ryabinin <a.ryabinin@samsung.com>, Dave Kleikamp <shaggy@kernel.org>, Christoph Hellwig <hch@lst.de>, Sebastian Ott <sebott@linux.vnet.ibm.com>, Mikulas Patocka <mpatocka@redhat.com>, Catalin Marinas <catalin.marinas@arm.com>, LKML <linux-kernel@vger.kernel.org>, "linux-mm@kvack.org" <linux-mm@kvack.org>, jfs-discussion@lists.sourceforge.net Subject: [patch -mm] mm, mempool: poison elements backed by page allocator fix fix Date: Thu, 2 Apr 2015 18:07:16 -0700 (PDT) [thread overview] Message-ID: <alpine.DEB.2.10.1504021804060.20229@chino.kir.corp.google.com> (raw) In-Reply-To: <alpine.DEB.2.10.1504021803170.20229@chino.kir.corp.google.com> Elements backed by the page allocator might not be directly mapped into lowmem, so do k{,un}map_atomic() before poisoning and verifying contents to map into lowmem and return the virtual adddress. Reported-by: Andrey Ryabinin <a.ryabinin@samsung.com> Signed-off-by: David Rientjes <rientjes@google.com> --- mm/mempool.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/mempool.c b/mm/mempool.c --- a/mm/mempool.c +++ b/mm/mempool.c @@ -61,9 +61,10 @@ static void check_element(mempool_t *pool, void *element) /* Mempools backed by page allocator */ if (pool->free == mempool_free_pages) { int order = (int)(long)pool->pool_data; - void *addr = page_address(element); + void *addr = kmap_atomic((struct page *)element); __check_element(pool, addr, 1UL << (PAGE_SHIFT + order)); + kunmap_atomic(addr); } } @@ -84,9 +85,10 @@ static void poison_element(mempool_t *pool, void *element) /* Mempools backed by page allocator */ if (pool->alloc == mempool_alloc_pages) { int order = (int)(long)pool->pool_data; - void *addr = page_address(element); + void *addr = kmap_atomic((struct page *)element); __poison_element(addr, 1UL << (PAGE_SHIFT + order)); + kunmap_atomic(addr); } } #else /* CONFIG_DEBUG_SLAB || CONFIG_SLUB_DEBUG_ON */
WARNING: multiple messages have this Message-ID (diff)
From: David Rientjes <rientjes@google.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: Andrey Ryabinin <a.ryabinin@samsung.com>, Dave Kleikamp <shaggy@kernel.org>, Christoph Hellwig <hch@lst.de>, Sebastian Ott <sebott@linux.vnet.ibm.com>, Mikulas Patocka <mpatocka@redhat.com>, Catalin Marinas <catalin.marinas@arm.com>, LKML <linux-kernel@vger.kernel.org>, "linux-mm@kvack.org" <linux-mm@kvack.org>, jfs-discussion@lists.sourceforge.net Subject: [patch -mm] mm, mempool: poison elements backed by page allocator fix fix Date: Thu, 2 Apr 2015 18:07:16 -0700 (PDT) [thread overview] Message-ID: <alpine.DEB.2.10.1504021804060.20229@chino.kir.corp.google.com> (raw) In-Reply-To: <alpine.DEB.2.10.1504021803170.20229@chino.kir.corp.google.com> Elements backed by the page allocator might not be directly mapped into lowmem, so do k{,un}map_atomic() before poisoning and verifying contents to map into lowmem and return the virtual adddress. Reported-by: Andrey Ryabinin <a.ryabinin@samsung.com> Signed-off-by: David Rientjes <rientjes@google.com> --- mm/mempool.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/mempool.c b/mm/mempool.c --- a/mm/mempool.c +++ b/mm/mempool.c @@ -61,9 +61,10 @@ static void check_element(mempool_t *pool, void *element) /* Mempools backed by page allocator */ if (pool->free == mempool_free_pages) { int order = (int)(long)pool->pool_data; - void *addr = page_address(element); + void *addr = kmap_atomic((struct page *)element); __check_element(pool, addr, 1UL << (PAGE_SHIFT + order)); + kunmap_atomic(addr); } } @@ -84,9 +85,10 @@ static void poison_element(mempool_t *pool, void *element) /* Mempools backed by page allocator */ if (pool->alloc == mempool_alloc_pages) { int order = (int)(long)pool->pool_data; - void *addr = page_address(element); + void *addr = kmap_atomic((struct page *)element); __poison_element(addr, 1UL << (PAGE_SHIFT + order)); + kunmap_atomic(addr); } } #else /* CONFIG_DEBUG_SLAB || CONFIG_SLUB_DEBUG_ON */ -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-04-03 1:07 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-24 23:08 [patch 1/4] fs, jfs: remove slab object constructor David Rientjes 2015-03-24 23:08 ` David Rientjes 2015-03-24 23:09 ` [patch 2/4] mm, mempool: disallow mempools based on slab caches with constructors David Rientjes 2015-03-24 23:09 ` David Rientjes 2015-03-24 23:09 ` [patch v2 3/4] mm, mempool: poison elements backed by slab allocator David Rientjes 2015-03-24 23:09 ` David Rientjes 2015-03-24 23:10 ` [patch v2 4/4] mm, mempool: poison elements backed by page allocator David Rientjes 2015-03-24 23:10 ` David Rientjes 2015-03-25 21:55 ` Andrew Morton 2015-03-25 21:55 ` Andrew Morton 2015-03-26 16:07 ` Andrey Ryabinin 2015-03-26 16:07 ` Andrey Ryabinin 2015-03-26 20:38 ` Andrey Ryabinin 2015-03-26 20:38 ` Andrey Ryabinin 2015-03-26 22:50 ` David Rientjes 2015-03-26 22:50 ` David Rientjes 2015-03-30 8:53 ` Andrey Ryabinin 2015-03-30 8:53 ` Andrey Ryabinin 2015-03-31 11:33 ` Andrey Ryabinin 2015-03-31 11:33 ` Andrey Ryabinin 2015-04-03 1:04 ` David Rientjes 2015-04-03 1:04 ` David Rientjes 2015-04-03 1:07 ` David Rientjes [this message] 2015-04-03 1:07 ` [patch -mm] mm, mempool: poison elements backed by page allocator fix fix David Rientjes 2015-03-24 23:41 ` [patch 1/4] fs, jfs: remove slab object constructor Dave Kleikamp 2015-03-24 23:41 ` Dave Kleikamp 2015-03-26 2:18 ` Mikulas Patocka 2015-03-26 2:18 ` Mikulas Patocka 2015-03-26 2:37 ` David Rientjes 2015-03-26 2:37 ` David Rientjes 2015-03-26 7:28 ` Christoph Hellwig 2015-03-26 7:28 ` Christoph Hellwig 2015-03-26 14:57 ` Dave Kleikamp 2015-03-26 14:57 ` Dave Kleikamp
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=alpine.DEB.2.10.1504021804060.20229@chino.kir.corp.google.com \ --to=rientjes@google.com \ --cc=a.ryabinin@samsung.com \ --cc=akpm@linux-foundation.org \ --cc=catalin.marinas@arm.com \ --cc=hch@lst.de \ --cc=jfs-discussion@lists.sourceforge.net \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mpatocka@redhat.com \ --cc=sebott@linux.vnet.ibm.com \ --cc=shaggy@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.