[v2,07/33] mm: Convert __ksize() to struct slab

Message ID	20211201181510.18784-8-vbabka@suse.cz (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> From: Vlastimil Babka <vbabka@suse.cz> To: Matthew Wilcox <willy@infradead.org>, Christoph Lameter <cl@linux.com>, David Rientjes <rientjes@google.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Pekka Enberg <penberg@kernel.org> Cc: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>, patches@lists.linux.dev, Vlastimil Babka <vbabka@suse.cz> Subject: [PATCH v2 07/33] mm: Convert __ksize() to struct slab Date: Wed, 1 Dec 2021 19:14:44 +0100 Message-Id: <20211201181510.18784-8-vbabka@suse.cz> In-Reply-To: <20211201181510.18784-1-vbabka@suse.cz> References: <20211201181510.18784-1-vbabka@suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	Separate struct slab from struct page \| expand [v2,00/33] Separate struct slab from struct page [v2,01/33] mm: add virt_to_folio() and folio_address() [v2,02/33] mm/slab: Dissolve slab_map_pages() in its caller [v2,03/33] mm/slub: Make object_err() static [v2,04/33] mm: Split slab into its own type [v2,05/33] mm: Add account_slab() and unaccount_slab() [v2,06/33] mm: Convert virt_to_cache() to use struct slab [v2,07/33] mm: Convert __ksize() to struct slab [v2,08/33] mm: Use struct slab in kmem_obj_info() [v2,09/33] mm: Convert check_heap_object() to use struct slab [v2,10/33] mm/slub: Convert detached_freelist to use a struct slab [v2,11/33] mm/slub: Convert kfree() to use a struct slab [v2,12/33] mm/slub: Convert __slab_lock() and __slab_unlock() to struct slab [v2,13/33] mm/slub: Convert print_page_info() to print_slab_info() [v2,14/33] mm/slub: Convert alloc_slab_page() to return a struct slab [v2,15/33] mm/slub: Convert __free_slab() to use struct slab [v2,16/33] mm/slub: Convert pfmemalloc_match() to take a struct slab [v2,17/33] mm/slub: Convert most struct page to struct slab by spatch [v2,18/33] mm/slub: Finish struct page to struct slab conversion [v2,19/33] mm/slab: Convert kmem_getpages() and kmem_freepages() to struct slab [v2,20/33] mm/slab: Convert most struct page to struct slab by spatch [v2,21/33] mm/slab: Finish struct page to struct slab conversion [v2,22/33] mm: Convert struct page to struct slab in functions used by other subsystems [v2,23/33] mm/memcg: Convert slab objcgs from struct page to struct slab [v2,24/33] mm/slob: Convert SLOB to use struct slab [v2,25/33] mm/kasan: Convert to struct folio and struct slab [v2,26/33] mm/kfence: Convert kfence_guarded_alloc() to struct slab [v2,27/33] zsmalloc: Stop using slab fields in struct page [v2,28/33] bootmem: Use page->index instead of page->freelist [v2,29/33] iommu: Use put_pages_list [v2,30/33] mm: Remove slab from struct page [v2,31/33] mm/slb: Differentiate struct slab fields by slb implementations [v2,32/33] mm/slub: Simplify struct slab slabs field definition [v2,33/33] mm/slub: Define struct slab fields for CONFIG_SLUB_CPU_PARTIAL only when enabled

Message ID

20211201181510.18784-8-vbabka@suse.cz (mailing list archive)

State

New

Headers

From: Vlastimil Babka <vbabka@suse.cz>
To: Matthew Wilcox <willy@infradead.org>,
	Christoph Lameter <cl@linux.com>,
	David Rientjes <rientjes@google.com>,
	Joonsoo Kim <iamjoonsoo.kim@lge.com>,
	Pekka Enberg <penberg@kernel.org>
Cc: linux-mm@kvack.org,
	Andrew Morton <akpm@linux-foundation.org>,
	patches@lists.linux.dev,
	Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH v2 07/33] mm: Convert __ksize() to struct slab
Date: Wed,  1 Dec 2021 19:14:44 +0100
Message-Id: <20211201181510.18784-8-vbabka@suse.cz>
In-Reply-To: <20211201181510.18784-1-vbabka@suse.cz>
References: <20211201181510.18784-1-vbabka@suse.cz>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

Separate struct slab from struct page | expand

Commit Message

Vlastimil Babka Dec. 1, 2021, 6:14 p.m. UTC

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

In SLUB, use folios, and struct slab to access slab_cache field.
In SLOB, use folios to properly resolve pointers beyond
PAGE_SIZE offset of the object.

[ vbabka@suse.cz: use folios, and only convert folio_test_slab() == true folios
  to struct slab ]

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
---
 mm/slob.c |  8 ++++----
 mm/slub.c | 12 +++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

Comments

Johannes Weiner Dec. 14, 2021, 2:28 p.m. UTC | #1

On Wed, Dec 01, 2021 at 07:14:44PM +0100, Vlastimil Babka wrote:
> From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
> 
> In SLUB, use folios, and struct slab to access slab_cache field.
> In SLOB, use folios to properly resolve pointers beyond
> PAGE_SIZE offset of the object.
> 
> [ vbabka@suse.cz: use folios, and only convert folio_test_slab() == true folios
>   to struct slab ]
> 
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

Awesome.

Acked-by: Johannes Weiner <hannes@cmpxchg.org>

diff --git a/mm/slob.c b/mm/slob.c
index 03deee1e6a94..c8a4290012a6 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -570,7 +570,7 @@  EXPORT_SYMBOL(kfree);
 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
 size_t __ksize(const void *block)
 {
-	struct page *sp;
+	struct folio *folio;
 	int align;
 	unsigned int *m;
 
@@ -578,9 +578,9 @@  size_t __ksize(const void *block)
 	if (unlikely(block == ZERO_SIZE_PTR))
 		return 0;
 
-	sp = virt_to_page(block);
-	if (unlikely(!PageSlab(sp)))
-		return page_size(sp);
+	folio = virt_to_folio(block);
+	if (unlikely(!folio_test_slab(folio)))
+		return folio_size(folio);
 
 	align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
 	m = (unsigned int *)(block - align);
diff --git a/mm/slub.c b/mm/slub.c
index 8b172de26c67..6ae7c63cedc0 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4527,19 +4527,17 @@  void __check_heap_object(const void *ptr, unsigned long n, struct page *page,
 
 size_t __ksize(const void *object)
 {
-	struct page *page;
+	struct folio *folio;
 
 	if (unlikely(object == ZERO_SIZE_PTR))
 		return 0;
 
-	page = virt_to_head_page(object);
+	folio = virt_to_folio(object);
 
-	if (unlikely(!PageSlab(page))) {
-		WARN_ON(!PageCompound(page));
-		return page_size(page);
-	}
+	if (unlikely(!folio_test_slab(folio)))
+		return folio_size(folio);
 
-	return slab_ksize(page->slab_cache);
+	return slab_ksize(folio_slab(folio)->slab_cache);
 }
 EXPORT_SYMBOL(__ksize);

[v2,07/33] mm: Convert __ksize() to struct slab

Commit Message

Comments

Patch