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 07/22] slab: Remove folio references from __ksize()
Date: Fri, 29 Aug 2025 16:47:11 +0100	[thread overview]
Message-ID: <20250829154728.3397606-8-willy@infradead.org> (raw)
In-Reply-To: <20250829154728.3397606-1-willy@infradead.org>

In the future, we will separate slab, folio and page from each other
and calling virt_to_folio() on an address allocated from slab will
return NULL.  Delay the conversion from struct page to struct slab
until we know we're not dealing with a large kmalloc allocation.

This deprecates calling ksize() on memory allocated by alloc_pages().
Today it becomes a warning and support will be removed entirely in
the future.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 include/linux/page-flags.h |  2 +-
 mm/slab.h                  | 10 ++++++++++
 mm/slab_common.c           | 24 ++++++++++++++++--------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 39ed2f243279..f0f7b536b9e5 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -1068,7 +1068,7 @@ PAGE_TYPE_OPS(Zsmalloc, zsmalloc, zsmalloc)
  * Serialized with zone lock.
  */
 PAGE_TYPE_OPS(Unaccepted, unaccepted, unaccepted)
-FOLIO_TYPE_OPS(large_kmalloc, large_kmalloc)
+PAGE_TYPE_OPS(LargeKmalloc, large_kmalloc, large_kmalloc)
 
 /**
  * PageHuge - Determine if the page belongs to hugetlbfs
diff --git a/mm/slab.h b/mm/slab.h
index 084231394250..e3a85318a6e5 100644
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -595,6 +595,16 @@ static inline size_t slab_ksize(const struct kmem_cache *s)
 	return s->size;
 }
 
+static inline unsigned int large_kmalloc_order(const struct page *page)
+{
+	return page[1].flags.f & 0xff;
+}
+
+static inline size_t large_kmalloc_size(const struct page *page)
+{
+	return PAGE_SIZE << large_kmalloc_order(page);
+}
+
 #ifdef CONFIG_SLUB_DEBUG
 void dump_unreclaimable_slab(void);
 #else
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 08f5baee1309..e017ed0cd438 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -994,26 +994,34 @@ void __init create_kmalloc_caches(void)
  */
 size_t __ksize(const void *object)
 {
-	struct folio *folio;
+	const struct page *page;
+	const struct slab *slab;
 
 	if (unlikely(object == ZERO_SIZE_PTR))
 		return 0;
 
-	folio = virt_to_folio(object);
+	page = virt_to_page(object);
+
+	if (unlikely(PageLargeKmalloc(page))) {
+		size_t size = large_kmalloc_size(page);
 
-	if (unlikely(!folio_test_slab(folio))) {
-		if (WARN_ON(folio_size(folio) <= KMALLOC_MAX_CACHE_SIZE))
+		if (WARN_ON(size <= KMALLOC_MAX_CACHE_SIZE))
 			return 0;
-		if (WARN_ON(object != folio_address(folio)))
+		if (WARN_ON(object != page_address(page)))
 			return 0;
-		return folio_size(folio);
+		return size;
 	}
 
+	/* Delete this after we're sure there are no users */
+	if (WARN_ON(!PageSlab(page)))
+		return page_size(page);
+
+	slab = page_slab(page);
 #ifdef CONFIG_SLUB_DEBUG
-	skip_orig_size_check(folio_slab(folio)->slab_cache, object);
+	skip_orig_size_check(slab->slab_cache, object);
 #endif
 
-	return slab_ksize(folio_slab(folio)->slab_cache);
+	return slab_ksize(slab->slab_cache);
 }
 
 gfp_t kmalloc_fix_flags(gfp_t flags)
-- 
2.47.2



  parent reply	other threads:[~2025-08-29 19:10 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 ` Matthew Wilcox (Oracle) [this message]
2025-09-03  5:23   ` [PATCH 07/22] slab: Remove folio references from __ksize() 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 ` [PATCH 20/22] kasan: Remove references to folio in __kasan_mempool_poison_object() Matthew Wilcox (Oracle)
2025-09-01 15:47   ` 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-8-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).