From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Vlastimil Babka <vbabka@suse.cz>,
Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
Christoph Lameter <cl@gentwo.org>,
David Rientjes <rientjes@google.com>,
Roman Gushchin <roman.gushchin@linux.dev>,
Harry Yoo <harry.yoo@oracle.com>,
linux-mm@kvack.org, David Hildenbrand <david@redhat.com>,
Alexander Potapenko <glider@google.com>,
Andrey Konovalov <andreyknvl@gmail.com>,
Dmitry Vyukov <dvyukov@google.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
kasan-dev <kasan-dev@googlegroups.com>
Subject: [PATCH v4 15/16] kasan: Remove references to folio in __kasan_mempool_poison_object()
Date: Thu, 13 Nov 2025 00:09:29 +0000 [thread overview]
Message-ID: <20251113000932.1589073-16-willy@infradead.org> (raw)
In-Reply-To: <20251113000932.1589073-1-willy@infradead.org>
In preparation for splitting struct slab from struct page and struct
folio, remove mentions of struct folio from this function. There is a
mild improvement for large kmalloc objects as we will avoid calling
compound_head() for them. We can discard the comment as using
PageLargeKmalloc() rather than !folio_test_slab() makes it obvious.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: kasan-dev <kasan-dev@googlegroups.com>
---
mm/kasan/common.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 22e5d67ff064..1d27f1bd260b 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -517,24 +517,20 @@ void __kasan_mempool_unpoison_pages(struct page *page, unsigned int order,
bool __kasan_mempool_poison_object(void *ptr, unsigned long ip)
{
- struct folio *folio = virt_to_folio(ptr);
+ struct page *page = virt_to_page(ptr);
struct slab *slab;
- /*
- * This function can be called for large kmalloc allocation that get
- * their memory from page_alloc. Thus, the folio might not be a slab.
- */
- if (unlikely(!folio_test_slab(folio))) {
+ if (unlikely(PageLargeKmalloc(page))) {
if (check_page_allocation(ptr, ip))
return false;
- kasan_poison(ptr, folio_size(folio), KASAN_PAGE_FREE, false);
+ kasan_poison(ptr, page_size(page), KASAN_PAGE_FREE, false);
return true;
}
if (is_kfence_address(ptr))
return true;
- slab = folio_slab(folio);
+ slab = page_slab(page);
if (check_slab_allocation(slab->slab_cache, ptr, ip))
return false;
--
2.47.2
next prev parent reply other threads:[~2025-11-13 0:09 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-13 0:09 [PATCH v4 00/16] Prepare slab for memdescs Matthew Wilcox (Oracle)
2025-11-13 0:09 ` [PATCH v4 01/16] slab: Reimplement page_slab() Matthew Wilcox (Oracle)
2025-11-13 12:31 ` David Hildenbrand (Red Hat)
2025-11-13 14:02 ` Marco Elver
2025-11-24 2:03 ` Harry Yoo
2025-11-13 0:09 ` [PATCH v4 02/16] slab: Remove folio references from __ksize() Matthew Wilcox (Oracle)
2025-11-13 12:32 ` David Hildenbrand (Red Hat)
2025-11-24 2:31 ` Harry Yoo
2025-11-24 4:28 ` Matthew Wilcox
2025-11-24 5:18 ` Harry Yoo
2025-11-13 0:09 ` [PATCH v4 03/16] slab: Remove folio references in memcg_slab_post_charge() Matthew Wilcox (Oracle)
2025-11-13 0:09 ` [PATCH v4 04/16] slab: Remove folio references in slab alloc/free Matthew Wilcox (Oracle)
2025-11-13 0:09 ` [PATCH v4 05/16] slab: Remove folio references from ___kmalloc_large_node() Matthew Wilcox (Oracle)
2025-11-13 0:09 ` [PATCH v4 06/16] slab: Remove folio references from free_large_kmalloc() Matthew Wilcox (Oracle)
2025-11-13 0:09 ` [PATCH v4 07/16] slab: Remove folio references from kvfree_rcu_cb() Matthew Wilcox (Oracle)
2025-11-24 5:22 ` Harry Yoo
2025-11-13 0:09 ` [PATCH v4 08/16] slab: Remove folio references from kfree() Matthew Wilcox (Oracle)
2025-11-24 5:39 ` Harry Yoo
2025-11-24 13:53 ` Matthew Wilcox
2025-11-13 0:09 ` [PATCH v4 09/16] slab: Remove folio references from __do_krealloc() Matthew Wilcox (Oracle)
2025-11-24 5:55 ` Harry Yoo
2025-11-13 0:09 ` [PATCH v4 10/16] slab: Remove folio references from build_detached_freelist() Matthew Wilcox (Oracle)
2025-11-24 5:55 ` Harry Yoo
2025-11-13 0:09 ` [PATCH v4 11/16] slab: Remove folio references from kfree_rcu_sheaf() Matthew Wilcox (Oracle)
2025-11-24 5:58 ` Harry Yoo
2025-11-13 0:09 ` [PATCH v4 12/16] slab: Remove folio references from kfree_nolock() Matthew Wilcox (Oracle)
2025-11-24 5:59 ` Harry Yoo
2025-11-13 0:09 ` [PATCH v4 13/16] usercopy: Remove folio references from check_heap_object() Matthew Wilcox (Oracle)
2025-11-24 6:14 ` Harry Yoo
2025-11-24 21:06 ` Kees Cook
2025-11-13 0:09 ` [PATCH v4 14/16] memcg: Convert mem_cgroup_from_obj_folio() to mem_cgroup_from_obj_slab() Matthew Wilcox (Oracle)
2025-11-13 16:14 ` Johannes Weiner
2025-11-13 16:28 ` Vlastimil Babka
2025-11-13 19:42 ` Shakeel Butt
2025-11-13 20:33 ` Matthew Wilcox
2025-11-13 21:54 ` Shakeel Butt
2025-11-13 16:39 ` Matthew Wilcox
2025-11-13 19:16 ` Johannes Weiner
2025-11-13 19:26 ` Vlastimil Babka
2025-11-24 6:44 ` Harry Yoo
2025-11-13 0:09 ` Matthew Wilcox (Oracle) [this message]
2025-11-24 7:02 ` [PATCH v4 15/16] kasan: Remove references to folio in __kasan_mempool_poison_object() Harry Yoo
2025-11-13 0:09 ` [PATCH v4 16/16] slab: Remove references to folios from virt_to_slab() Matthew Wilcox (Oracle)
2025-11-24 7:09 ` Harry Yoo
2025-11-24 14:12 ` Matthew Wilcox
2025-11-13 11:28 ` [PATCH v4 00/16] Prepare slab for memdescs Vlastimil Babka
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=20251113000932.1589073-16-willy@infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@gmail.com \
--cc=cl@gentwo.org \
--cc=david@redhat.com \
--cc=dvyukov@google.com \
--cc=glider@google.com \
--cc=harry.yoo@oracle.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-mm@kvack.org \
--cc=rientjes@google.com \
--cc=roman.gushchin@linux.dev \
--cc=vbabka@suse.cz \
--cc=vincenzo.frascino@arm.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).