diff mbox series

[RFC,05/32] mm: Convert virt_to_cache() to use struct slab

Message ID	20211116001628.24216-6-vbabka@suse.cz (mailing list archive)
State	New
Headers	show Return-Path: <SRS0=fDmo=QD=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6472863238 From: Vlastimil Babka <vbabka@suse.cz> To: Matthew Wilcox <willy@infradead.org>, linux-mm@kvack.org, Christoph Lameter <cl@linux.com>, David Rientjes <rientjes@google.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Pekka Enberg <penberg@kernel.org> Cc: Vlastimil Babka <vbabka@suse.cz> Subject: [RFC PATCH 05/32] mm: Convert virt_to_cache() to use struct slab Date: Tue, 16 Nov 2021 01:16:01 +0100 Message-Id: <20211116001628.24216-6-vbabka@suse.cz> In-Reply-To: <20211116001628.24216-1-vbabka@suse.cz> References: <20211116001628.24216-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 [RFC,00/32] Separate struct slab from struct page [RFC,01/32] mm/slab: Dissolve slab_map_pages() in its caller [RFC,02/32] mm/slub: Make object_err() static [RFC,03/32] mm: Split slab into its own type [RFC,04/32] mm: Add account_slab() and unaccount_slab() [RFC,05/32] mm: Convert virt_to_cache() to use struct slab [RFC,06/32] mm: Convert __ksize() to struct slab [RFC,07/32] mm: Use struct slab in kmem_obj_info() [RFC,08/32] mm: Convert check_heap_object() to use struct slab [RFC,09/32] mm/slub: Convert detached_freelist to use a struct slab [RFC,10/32] mm/slub: Convert kfree() to use a struct slab [RFC,11/32] mm/slub: Convert __slab_lock() and __slab_unlock() to struct slab [RFC,12/32] mm/slub: Convert print_page_info() to print_slab_info() [RFC,13/32] mm/slub: Convert alloc_slab_page() to return a struct slab [RFC,14/32] mm/slub: Convert __free_slab() to use struct slab [RFC,15/32] mm/slub: Convert pfmemalloc_match() to take a struct slab [RFC,16/32] mm/slub: Convert most struct page to struct slab by spatch [RFC,17/32] mm/slub: Finish struct page to struct slab conversion [RFC,18/32] mm/slab: Convert kmem_getpages() and kmem_freepages() to struct slab [RFC,19/32] mm/slab: Convert most struct page to struct slab by spatch [RFC,20/32] mm/slab: Finish struct page to struct slab conversion [RFC,21/32] mm: Convert struct page to struct slab in functions used by other subsystems [RFC,22/32] mm/memcg: Convert slab objcgs from struct page to struct slab [RFC,23/32] mm/slob: Convert SLOB to use struct slab [RFC,24/32] mm/kasan: Convert to struct slab [RFC,25/32] mm/kfence: Convert kfence_guarded_alloc() to struct slab [RFC,26/32] zsmalloc: Stop using slab fields in struct page [RFC,27/32] bootmem: Use page->index instead of page->freelist [RFC,28/32] iommu: Use put_pages_list [RFC,29/32] mm: Remove slab from struct page [RFC,30/32] mm/slb: Differentiate struct slab fields by slb implementations [RFC,31/32] mm/slub: Simplify struct slab slabs field definition [RFC,32/32] mm/slub: Define struct slab fields for CONFIG_SLUB_CPU_PARTIAL only when enabled

Commit Message

Vlastimil Babka Nov. 16, 2021, 12:16 a.m. UTC

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

This function is entirely self-contained, so can be converted from
page to slab.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
---
 mm/slab.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/mm/slab.h b/mm/slab.h
index be42a467eeac..5203d19922b9 100644
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -574,13 +574,13 @@  static inline void memcg_slab_free_hook(struct kmem_cache *s,
 
 static inline struct kmem_cache *virt_to_cache(const void *obj)
 {
-	struct page *page;
+	struct slab *slab;
 
-	page = virt_to_head_page(obj);
-	if (WARN_ONCE(!PageSlab(page), "%s: Object is not a Slab page!\n",
+	slab = virt_to_slab(obj);
+	if (WARN_ONCE(!slab, "%s: Object is not a Slab page!\n",
 					__func__))
 		return NULL;
-	return page->slab_cache;
+	return slab->slab_cache;
 }
 
 static __always_inline void account_slab(struct slab *slab, int order,