linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
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
Subject: [PATCH 20/22] kasan: Remove references to folio in __kasan_mempool_poison_object()
Date: Fri, 29 Aug 2025 16:47:24 +0100	[thread overview]
Message-ID: <20250829154728.3397606-21-willy@infradead.org> (raw)
In-Reply-To: <20250829154728.3397606-1-willy@infradead.org>

In preparation for splitting struct slab from struct page and struct
folio, remove mentions of struct folio from this function.  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>
---
 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 e3765931a31f..e90f24aa76db 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



  parent reply	other threads:[~2025-08-29 15:47 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-29 15:47 [PATCH 00/22] Prepare slab for memdescs Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 01/22] slab: Remove unnecessary test from alloc_debug_processing() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 02/22] slab: Remove unnecessary test from alloc_single_from_partial() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 03/22] slab: Remove dead code in check_slab() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 04/22] slab: Remove dead code in free_consistency_checks() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 05/22] mm: Constify compound_order() and page_size() Matthew Wilcox (Oracle)
2025-08-29 20:42   ` Zi Yan
2025-08-29 22:53     ` Matthew Wilcox
2025-08-31  1:06       ` Zi Yan
2025-09-01 15:45   ` David Hildenbrand
2025-08-29 15:47 ` [PATCH 06/22] slab: Reimplement page_slab() Matthew Wilcox (Oracle)
2025-09-01 15:50   ` David Hildenbrand
2025-08-29 15:47 ` [PATCH 07/22] slab: Remove folio references from __ksize() Matthew Wilcox (Oracle)
2025-09-03  5:23   ` Matthew Wilcox
2025-08-29 15:47 ` [PATCH 08/22] slab: Remove folio references in memcg_slab_post_charge() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 09/22] slab: Remove folio references in slab alloc/free Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 10/22] slab: Remove folio references from ___kmalloc_large_node() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 11/22] slab: Remove folio references from free_large_kmalloc() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 12/22] slab: Remove folio references from kvfree_rcu_cb() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 13/22] slab: Remove folio references from kvfree() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 14/22] slab: Remove folio references from __do_krealloc() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 15/22] slab: Remove folio references from build_detached_freelist() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 16/22] slab: Remove dead code from free_large_kmalloc() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 17/22] slab: Remove folio references from kfree_rcu_sheaf() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 18/22] usercopy: Remove folio references from check_heap_object() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 19/22] memcg: Convert mem_cgroup_from_obj_folio() to mem_cgroup_from_obj_slab() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` Matthew Wilcox (Oracle) [this message]
2025-09-01 15:47   ` [PATCH 20/22] kasan: Remove references to folio in __kasan_mempool_poison_object() David Hildenbrand
2025-08-29 15:47 ` [PATCH 21/22] slab: Remove references to folios from virt_to_slab() Matthew Wilcox (Oracle)
2025-08-29 15:47 ` [PATCH 22/22] mm: Remove redundant test in validate_page_before_insert() Matthew Wilcox (Oracle)
2025-09-01 15:46   ` David Hildenbrand
2025-08-29 17:05 ` [PATCH 00/22] Prepare slab for memdescs Matthew Wilcox

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=20250829154728.3397606-21-willy@infradead.org \
    --to=willy@infradead.org \
    --cc=akpm@linux-foundation.org \
    --cc=cl@gentwo.org \
    --cc=harry.yoo@oracle.com \
    --cc=linux-mm@kvack.org \
    --cc=rientjes@google.com \
    --cc=roman.gushchin@linux.dev \
    --cc=vbabka@suse.cz \
    /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).