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 C19ECC433EF for ; Mon, 4 Oct 2021 14:38:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6A1876136F for ; Mon, 4 Oct 2021 14:38:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6A1876136F 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 07B88940041; Mon, 4 Oct 2021 10:38:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 02B3494000B; Mon, 4 Oct 2021 10:38:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5C12940041; Mon, 4 Oct 2021 10:38:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0206.hostedemail.com [216.40.44.206]) by kanga.kvack.org (Postfix) with ESMTP id D393A94000B for ; Mon, 4 Oct 2021 10:38:37 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 89ED92BFAA for ; Mon, 4 Oct 2021 14:38:37 +0000 (UTC) X-FDA: 78659011074.01.AD88FD0 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id 48A9CB00154E for ; Mon, 4 Oct 2021 14:38:37 +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=4W8Ur02zWVOUVXpmjYLLTbiz1bBmz3cyKywKDzFgU4k=; b=hznbWmGbdHGzSd0p2WWxH3lFeG yCy+/1JDdkhqA5U8XCoyAtvI4iMari+vmu0me0h8wsbdL/ut36eK4MZEFKUr6kBcj/frUFqO6viKa +EXLLeIejAihz2mmRzAg4mvPmaUGg3YCvtlKUfpop7K7brXnebeLH9/B5lj3ugkIoMSKrHwOno5ze Ie24LDV+RamQIFo3Ev3h+0PGnURN7TaX3zy9BjQ7dHZ9SDn2qFwOXu9nK9Oc3FUre1VVNaf+VXaIC BkWKwWGRhGRZjzUKVNEEDfbF6jO2PTx7bynrKXfIuWtlSpJFoQDtjPK7N/6TFep8+djsI6L3Vin4E mz2mGuig==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXP3q-00H0OP-V7; Mon, 04 Oct 2021 14:35:54 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 37/62] mm/slub: Convert free_consistency_checks() to take a struct slab Date: Mon, 4 Oct 2021 14:46:25 +0100 Message-Id: <20211004134650.4031813-38-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: rspam03 X-Rspamd-Queue-Id: 48A9CB00154E X-Stat-Signature: oyqkcx89mzu3pw411gm6i6oz5jur974g Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hznbWmGb; dmarc=none; spf=none (imf24.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1633358317-848992 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: Provides a little more type safety, but mostly this is just pushing slab_page() calls down. Signed-off-by: Matthew Wilcox (Oracle) --- mm/slub.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 32a1bd4c8a88..a8ea2779edf4 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1308,32 +1308,32 @@ static noinline int alloc_debug_processing(struct= kmem_cache *s, } =20 static inline int free_consistency_checks(struct kmem_cache *s, - struct page *page, void *object, unsigned long addr) + struct slab *slab, void *object, unsigned long addr) { - if (!check_valid_pointer(s, page, object)) { - slab_err(s, page, "Invalid object pointer 0x%p", object); + if (!check_valid_pointer(s, slab_page(slab), object)) { + slab_err(s, slab_page(slab), "Invalid object pointer 0x%p", object); return 0; } =20 - if (on_freelist(s, page, object)) { - object_err(s, page, object, "Object already free"); + if (on_freelist(s, slab_page(slab), object)) { + object_err(s, slab_page(slab), object, "Object already free"); return 0; } =20 - if (!check_object(s, page, object, SLUB_RED_ACTIVE)) + if (!check_object(s, slab_page(slab), object, SLUB_RED_ACTIVE)) return 0; =20 - if (unlikely(s !=3D page->slab_cache)) { - if (!PageSlab(page)) { - slab_err(s, page, "Attempt to free object(0x%p) outside of slab", + if (unlikely(s !=3D slab->slab_cache)) { + if (!slab_test_cache(slab)) { + slab_err(s, slab_page(slab), "Attempt to free object(0x%p) outside of= slab", object); - } else if (!page->slab_cache) { + } else if (!slab->slab_cache) { pr_err("SLUB : no slab for object 0x%p.\n", object); dump_stack(); } else - object_err(s, page, object, - "page slab pointer corrupt."); + object_err(s, slab_page(slab), object, + "slab pointer corrupt."); return 0; } return 1; @@ -1363,7 +1363,7 @@ static noinline int free_debug_processing( cnt++; =20 if (s->flags & SLAB_CONSISTENCY_CHECKS) { - if (!free_consistency_checks(s, slab_page(slab), object, addr)) + if (!free_consistency_checks(s, slab, object, addr)) goto out; } =20 --=20 2.32.0