[v2,03/33] mm/slub: Make object_err() static

Message ID	20211201181510.18784-4-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 03/33] mm/slub: Make object_err() static Date: Wed, 1 Dec 2021 19:14:40 +0100 Message-Id: <20211201181510.18784-4-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-4-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 03/33] mm/slub: Make object_err() static
Date: Wed,  1 Dec 2021 19:14:40 +0100
Message-Id: <20211201181510.18784-4-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

There are no callers outside of mm/slub.c anymore.

Move freelist_corrupted() that calls object_err() to avoid a need for forward
declaration.

Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
---
 include/linux/slub_def.h |  3 ---
 mm/slub.c                | 30 +++++++++++++++---------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 0fa751b946fa..1ef68d4de9c0 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -156,9 +156,6 @@  static inline void sysfs_slab_release(struct kmem_cache *s)
 }
 #endif
 
-void object_err(struct kmem_cache *s, struct page *page,
-		u8 *object, char *reason);
-
 void *fixup_red_left(struct kmem_cache *s, void *p);
 
 static inline void *nearest_obj(struct kmem_cache *cache, struct page *page,
diff --git a/mm/slub.c b/mm/slub.c
index a8626825a829..98bf50c1c145 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -822,20 +822,6 @@  static void slab_fix(struct kmem_cache *s, char *fmt, ...)
 	va_end(args);
 }
 
-static bool freelist_corrupted(struct kmem_cache *s, struct page *page,
-			       void **freelist, void *nextfree)
-{
-	if ((s->flags & SLAB_CONSISTENCY_CHECKS) &&
-	    !check_valid_pointer(s, page, nextfree) && freelist) {
-		object_err(s, page, *freelist, "Freechain corrupt");
-		*freelist = NULL;
-		slab_fix(s, "Isolate corrupted freechain");
-		return true;
-	}
-
-	return false;
-}
-
 static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
 {
 	unsigned int off;	/* Offset of last byte */
@@ -875,7 +861,7 @@  static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
 	dump_stack();
 }
 
-void object_err(struct kmem_cache *s, struct page *page,
+static void object_err(struct kmem_cache *s, struct page *page,
 			u8 *object, char *reason)
 {
 	if (slab_add_kunit_errors())
@@ -886,6 +872,20 @@  void object_err(struct kmem_cache *s, struct page *page,
 	add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
 }
 
+static bool freelist_corrupted(struct kmem_cache *s, struct page *page,
+			       void **freelist, void *nextfree)
+{
+	if ((s->flags & SLAB_CONSISTENCY_CHECKS) &&
+	    !check_valid_pointer(s, page, nextfree) && freelist) {
+		object_err(s, page, *freelist, "Freechain corrupt");
+		*freelist = NULL;
+		slab_fix(s, "Isolate corrupted freechain");
+		return true;
+	}
+
+	return false;
+}
+
 static __printf(3, 4) void slab_err(struct kmem_cache *s, struct page *page,
 			const char *fmt, ...)
 {

[v2,03/33] mm/slub: Make object_err() static

Commit Message

Patch