From patchwork Mon Oct 4 13:46:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12534155 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 E1AA9C433F5 for ; Mon, 4 Oct 2021 14:32:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 96CE361002 for ; Mon, 4 Oct 2021 14:32:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 96CE361002 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 3427594003D; Mon, 4 Oct 2021 10:32:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F1B394000B; Mon, 4 Oct 2021 10:32:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1934594003D; Mon, 4 Oct 2021 10:32:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0188.hostedemail.com [216.40.44.188]) by kanga.kvack.org (Postfix) with ESMTP id 0AB6B94000B for ; Mon, 4 Oct 2021 10:32:38 -0400 (EDT) Received: from smtpin31.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id BBE0582499A8 for ; Mon, 4 Oct 2021 14:32:37 +0000 (UTC) X-FDA: 78658995954.31.4AAEDB5 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf01.hostedemail.com (Postfix) with ESMTP id 7DE3B5070E49 for ; Mon, 4 Oct 2021 14:32: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=gYbWY4AiHY4gtCFDUVHX4fZwYoYyhYSqm8lU9ZCB0Ks=; b=crfmohcyGZbR5w64GcciBI/gY5 wUjQ57BA91CcSNRLztzWURlgU2esJS2TPTGAzIFgsA1lp11pErBNKUbw4wxMO4Sv/zeFbzM7O/kqB m4M/M0DK4ZnqIZIo1GvZd8AoumoJDZ60rxuxCtjxK2sXLya1ADO1nzTemXFG+sC3YZ7FCUAqx0c5j mo8XuaMKUGRkjqdcvo1JFtWSf/wE/kKw6abLtYWnVxUqhKM7SMezDk06zMOEW+6YmG9vAUEswuW6j xRsz8LGfrKTU12dUfeGFnDfAy29hBzNn3xsWnt9okHP9mHQUH0ja+yAQVX0KCBZ6VSgTAZb7Ihzwv zP/0EuEA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXOyc-00GzyZ-2Y; Mon, 04 Oct 2021 14:30:13 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 34/62] mm/slub: Remove struct page argument from setup_object() Date: Mon, 4 Oct 2021 14:46:22 +0100 Message-Id: <20211004134650.4031813-35-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: 7DE3B5070E49 X-Stat-Signature: shbjxhuam9a5n8xgogb8btw89o8shray Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=crfmohcy; 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: 1633357957-672588 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: Neither setup_object() nor setup_object_debug() used their struct page argument, so delete it instead of converting to struct slab. Signed-off-by: Matthew Wilcox (Oracle) --- mm/slub.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 14a423250611..16ce9aeccdc8 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1240,8 +1240,7 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node, int objects) } /* Object debug checks for alloc/free paths */ -static void setup_object_debug(struct kmem_cache *s, struct page *page, - void *object) +static void setup_object_debug(struct kmem_cache *s, void *object) { if (!kmem_cache_debug_flags(s, SLAB_STORE_USER|SLAB_RED_ZONE|__OBJECT_POISON)) return; @@ -1600,8 +1599,7 @@ slab_flags_t kmem_cache_flags(unsigned int object_size, return flags | slub_debug_local; } #else /* !CONFIG_SLUB_DEBUG */ -static inline void setup_object_debug(struct kmem_cache *s, - struct page *page, void *object) {} +static inline void setup_object_debug(struct kmem_cache *s, void *object) {} static inline void setup_page_debug(struct kmem_cache *s, struct page *page, void *addr) {} @@ -1737,10 +1735,9 @@ static inline bool slab_free_freelist_hook(struct kmem_cache *s, return *head != NULL; } -static void *setup_object(struct kmem_cache *s, struct page *page, - void *object) +static void *setup_object(struct kmem_cache *s, void *object) { - setup_object_debug(s, page, object); + setup_object_debug(s, object); object = kasan_init_slab_obj(s, object); if (unlikely(s->ctor)) { kasan_unpoison_object_data(s, object); @@ -1849,13 +1846,13 @@ static bool shuffle_freelist(struct kmem_cache *s, struct slab *slab) /* First entry is used as the base of the freelist */ cur = next_freelist_entry(s, &pos, start, slab_limit, freelist_count); - cur = setup_object(s, slab_page(slab), cur); + cur = setup_object(s, cur); slab->freelist = cur; for (idx = 1; idx < slab->objects; idx++) { next = next_freelist_entry(s, &pos, start, slab_limit, freelist_count); - next = setup_object(s, slab_page(slab), next); + next = setup_object(s, next); set_freepointer(s, cur, next); cur = next; } @@ -1929,11 +1926,11 @@ static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) if (!shuffle) { start = fixup_red_left(s, start); - start = setup_object(s, slab_page(slab), start); + start = setup_object(s, start); slab->freelist = start; for (idx = 0, p = start; idx < slab->objects - 1; idx++) { next = p + s->size; - next = setup_object(s, slab_page(slab), next); + next = setup_object(s, next); set_freepointer(s, p, next); p = next; }