From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC595C433FE for ; Mon, 4 Oct 2021 14:41:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 90BB66115B for ; Mon, 4 Oct 2021 14:41:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 90BB66115B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 1D755940045; Mon, 4 Oct 2021 10:41:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 186F994000B; Mon, 4 Oct 2021 10:41:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07678940045; Mon, 4 Oct 2021 10:41:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0086.hostedemail.com [216.40.44.86]) by kanga.kvack.org (Postfix) with ESMTP id ECC8094000B for ; Mon, 4 Oct 2021 10:41:40 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 9A9F12C687 for ; Mon, 4 Oct 2021 14:41:40 +0000 (UTC) X-FDA: 78659018760.17.7048789 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf01.hostedemail.com (Postfix) with ESMTP id 623795071818 for ; Mon, 4 Oct 2021 14:41:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=FvJWTd9k9lSKs6uvJ381PRrh6tayArFgy81W9O2SvVU=; b=g/5a+5Mz2Oa+g7DboktlQPIiAq fdIU50Kqa1TfoGLPY0jXwhOgFk95EEnbQZx2IgVwPVRbtNzJyqiaRTIdI7cQO9TyemeOmCvOeLJpv fW9aefomC0jr2cQcQevrAn8PAQWIUlpQ/RovVaFtpSx0lx7sj8zhSTDDPr/Wb8m4E+7i0swoWFDmm uzK9wEuQGar+wuthRqZxM6KWtIRbty7zZhYHnORi2abdA3MFs0fyoajRVxJstkocP2bYF4rEdeaao 5xRxJ7mBSHZ4Fak7RrdYi8TvcId1KvHJxvoryoXMOjkYjwEua9Uuj5tTMy15t3t1UNSm5257W6opg ti7pRCTQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXP8I-00H0tC-N4; Mon, 04 Oct 2021 14:40:13 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 41/62] mm/slub: Convert check_slab() to struct slab Date: Mon, 4 Oct 2021 14:46:29 +0100 Message-Id: <20211004134650.4031813-42-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004134650.4031813-1-willy@infradead.org> References: <20211004134650.4031813-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 623795071818 X-Stat-Signature: oonjd8i3upa78ta5aauktab87zynharo Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="g/5a+5Mz"; spf=none (imf01.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-HE-Tag: 1633358500-324111 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Also convert slab_pad_check() to struct slab. Improves type safety and pushes down a few calls to slab_page(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/slub.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 10db0ce7fe2a..b1122b8cb36f 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -992,8 +992,8 @@ static int check_pad_bytes(struct kmem_cache *s, stru= ct slab *slab, u8 *p) p + off, POISON_INUSE, size_from_object(s) - off); } =20 -/* Check the pad bytes at the end of a slab page */ -static int slab_pad_check(struct kmem_cache *s, struct page *page) +/* Check the pad bytes at the end of a slab */ +static int slab_pad_check(struct kmem_cache *s, struct slab *slab) { u8 *start; u8 *fault; @@ -1005,8 +1005,8 @@ static int slab_pad_check(struct kmem_cache *s, str= uct page *page) if (!(s->flags & SLAB_POISON)) return 1; =20 - start =3D page_address(page); - length =3D page_size(page); + start =3D slab_address(slab); + length =3D slab_size(slab); end =3D start + length; remainder =3D length % s->size; if (!remainder) @@ -1021,7 +1021,7 @@ static int slab_pad_check(struct kmem_cache *s, str= uct page *page) while (end > fault && end[-1] =3D=3D POISON_INUSE) end--; =20 - slab_err(s, page, "Padding overwritten. 0x%p-0x%p @offset=3D%tu", + slab_err(s, slab_page(slab), "Padding overwritten. 0x%p-0x%p @offset=3D= %tu", fault, end - 1, fault - start); print_section(KERN_ERR, "Padding ", pad, remainder); =20 @@ -1085,28 +1085,28 @@ static int check_object(struct kmem_cache *s, str= uct slab *slab, return 1; } =20 -static int check_slab(struct kmem_cache *s, struct page *page) +static int check_slab(struct kmem_cache *s, struct slab *slab) { int maxobj; =20 - if (!PageSlab(page)) { - slab_err(s, page, "Not a valid slab page"); + if (!slab_test_cache(slab)) { + slab_err(s, slab_page(slab), "Not a valid slab page"); return 0; } =20 - maxobj =3D order_objects(compound_order(page), s->size); - if (page->objects > maxobj) { - slab_err(s, page, "objects %u > max %u", - page->objects, maxobj); + maxobj =3D order_objects(slab_order(slab), s->size); + if (slab->objects > maxobj) { + slab_err(s, slab_page(slab), "objects %u > max %u", + slab->objects, maxobj); return 0; } - if (page->inuse > page->objects) { - slab_err(s, page, "inuse %u > max %u", - page->inuse, page->objects); + if (slab->inuse > slab->objects) { + slab_err(s, slab_page(slab), "inuse %u > max %u", + slab->inuse, slab->objects); return 0; } - /* Slab_pad_check fixes things up after itself */ - slab_pad_check(s, page); + /* slab_pad_check fixes things up after itself */ + slab_pad_check(s, slab); return 1; } =20 @@ -1263,7 +1263,7 @@ void setup_page_debug(struct kmem_cache *s, struct = page *page, void *addr) static inline int alloc_consistency_checks(struct kmem_cache *s, struct slab *slab, void *object) { - if (!check_slab(s, slab_page(slab))) + if (!check_slab(s, slab)) return 0; =20 if (!check_valid_pointer(s, slab_page(slab), object)) { @@ -1355,7 +1355,7 @@ static noinline int free_debug_processing( slab_lock(slab_page(slab), &flags2); =20 if (s->flags & SLAB_CONSISTENCY_CHECKS) { - if (!check_slab(s, slab_page(slab))) + if (!check_slab(s, slab)) goto out; } =20 @@ -1611,7 +1611,7 @@ static inline int free_debug_processing( void *head, void *tail, int bulk_cnt, unsigned long addr) { return 0; } =20 -static inline int slab_pad_check(struct kmem_cache *s, struct page *page= ) +static inline int slab_pad_check(struct kmem_cache *s, struct slab *slab= ) { return 1; } static inline int check_object(struct kmem_cache *s, struct slab *slab, void *object, u8 val) { return 1; } @@ -1969,7 +1969,7 @@ static void __free_slab(struct kmem_cache *s, struc= t slab *slab) if (kmem_cache_debug_flags(s, SLAB_CONSISTENCY_CHECKS)) { void *p; =20 - slab_pad_check(s, slab_page(slab)); + slab_pad_check(s, slab); for_each_object(p, s, slab_address(slab), slab->objects) check_object(s, slab, p, SLUB_RED_INACTIVE); } @@ -4959,7 +4959,7 @@ static void validate_slab(struct kmem_cache *s, str= uct slab *slab, =20 slab_lock(slab_page(slab), &flags); =20 - if (!check_slab(s, slab_page(slab)) || !on_freelist(s, slab, NULL)) + if (!check_slab(s, slab) || !on_freelist(s, slab, NULL)) goto unlock; =20 /* Now we know that a valid freelist exists */ --=20 2.32.0