From patchwork Mon Oct 4 13:46:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12534135 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 19A7AC433F5 for ; Mon, 4 Oct 2021 14:28:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4100761251 for ; Mon, 4 Oct 2021 14:28:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4100761251 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 DA7BF940039; Mon, 4 Oct 2021 10:28:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D55BC94000B; Mon, 4 Oct 2021 10:28:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C455B940039; Mon, 4 Oct 2021 10:28:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0254.hostedemail.com [216.40.44.254]) by kanga.kvack.org (Postfix) with ESMTP id B0DA594000B for ; Mon, 4 Oct 2021 10:28:50 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 772873016F for ; Mon, 4 Oct 2021 14:28:50 +0000 (UTC) X-FDA: 78658986420.08.2381821 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id EF243F0013B2 for ; Mon, 4 Oct 2021 14:28:49 +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=y5HMCCBu/sfusCANeFIy7iYhPlqD1LZaeiw9o0MqC/I=; b=pe6nSmf1H4EWbKp81rAPeyddVU 2Fcj3Cn6NF+fojW9D/X20jDXifB+/93UOkoccYKaMtxch54wnWEISPuDjY7goYvyNnZ1AEA3D02JX T83SUFeh3aEGcvuY2sw84z0IkqREWWUd74T+L4WzchTGRTWtWDSkxAq0T7Evl3XWfmQFTjp9cx7XE E01aO+mLLQPTVb0OO/LvACJuERFqXcHpueZrzA3D3vN6kxuxL6grbVhVDS3xNm87+17aUb6Tmj1Hd PGfdWfk0+VEbm7t16qGm4XZPULh7+oAjo1shb1i6p1hNTV2IIuoaS1pYlSpU7Vpjz+srn0Wc0iNjf hz4m4J9A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXOvK-00GzNs-Ug; Mon, 04 Oct 2021 14:27:00 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 31/62] mm/slub: Convert slab freeing to struct slab Date: Mon, 4 Oct 2021 14:46:19 +0100 Message-Id: <20211004134650.4031813-32-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: EF243F0013B2 X-Stat-Signature: k3qmhntwsdrnhifqtkrujyqnb975dhfm Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=pe6nSmf1; spf=none (imf16.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: 1633357729-859267 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: Improve type safety by passing a slab pointer through discard_slab() to free_slab() and __free_slab(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/slub.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index e3c8893f9bd5..75a411d6b76e 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1964,49 +1964,48 @@ static struct slab *new_slab(struct kmem_cache *s, gfp_t flags, int node) flags & (GFP_RECLAIM_MASK | GFP_CONSTRAINT_MASK), node); } -static void __free_slab(struct kmem_cache *s, struct page *page) +static void __free_slab(struct kmem_cache *s, struct slab *slab) { - int order = compound_order(page); + struct page *page = slab_page(slab); + int order = slab_order(slab); int pages = 1 << order; if (kmem_cache_debug_flags(s, SLAB_CONSISTENCY_CHECKS)) { void *p; - slab_pad_check(s, page); - for_each_object(p, s, page_address(page), - page->objects) - check_object(s, page, p, SLUB_RED_INACTIVE); + slab_pad_check(s, slab_page(slab)); + for_each_object(p, s, slab_address(slab), slab->objects) + check_object(s, slab_page(slab), p, SLUB_RED_INACTIVE); } - __ClearPageSlabPfmemalloc(page); + __slab_clear_pfmemalloc(slab); __ClearPageSlab(page); - /* In union with page->mapping where page allocator expects NULL */ - page->slab_cache = NULL; + page->mapping = NULL; if (current->reclaim_state) current->reclaim_state->reclaimed_slab += pages; - unaccount_slab_page(page, order, s); + unaccount_slab(slab, order, s); __free_pages(page, order); } static void rcu_free_slab(struct rcu_head *h) { - struct page *page = container_of(h, struct page, rcu_head); + struct slab *slab = container_of(h, struct slab, rcu_head); - __free_slab(page->slab_cache, page); + __free_slab(slab->slab_cache, slab); } -static void free_slab(struct kmem_cache *s, struct page *page) +static void free_slab(struct kmem_cache *s, struct slab *slab) { if (unlikely(s->flags & SLAB_TYPESAFE_BY_RCU)) { - call_rcu(&page->rcu_head, rcu_free_slab); + call_rcu(&slab->rcu_head, rcu_free_slab); } else - __free_slab(s, page); + __free_slab(s, slab); } -static void discard_slab(struct kmem_cache *s, struct page *page) +static void discard_slab(struct kmem_cache *s, struct slab *slab) { - dec_slabs_node(s, page_to_nid(page), page->objects); - free_slab(s, page); + dec_slabs_node(s, slab_nid(slab), slab->objects); + free_slab(s, slab); } /* @@ -2431,7 +2430,7 @@ static void deactivate_slab(struct kmem_cache *s, struct slab *slab, stat(s, DEACTIVATE_FULL); else if (m == M_FREE) { stat(s, DEACTIVATE_EMPTY); - discard_slab(s, slab_page(slab)); + discard_slab(s, slab); stat(s, FREE_SLAB); } } @@ -2492,7 +2491,7 @@ static void __unfreeze_partials(struct kmem_cache *s, struct slab *partial_slab) unusable = unusable->next; stat(s, DEACTIVATE_EMPTY); - discard_slab(s, slab_page(slab)); + discard_slab(s, slab); stat(s, FREE_SLAB); } } @@ -3387,7 +3386,7 @@ static void __slab_free(struct kmem_cache *s, struct slab *slab, spin_unlock_irqrestore(&n->list_lock, flags); stat(s, FREE_SLAB); - discard_slab(s, slab_page(slab)); + discard_slab(s, slab); } /* @@ -4257,7 +4256,7 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n) spin_unlock_irq(&n->list_lock); list_for_each_entry_safe(slab, h, &discard, slab_list) - discard_slab(s, slab_page(slab)); + discard_slab(s, slab); } bool __kmem_cache_empty(struct kmem_cache *s) @@ -4606,7 +4605,7 @@ static int __kmem_cache_do_shrink(struct kmem_cache *s) /* Release empty slabs */ list_for_each_entry_safe(slab, t, &discard, slab_list) - discard_slab(s, slab_page(slab)); + discard_slab(s, slab); if (slabs_node(s, node)) ret = 1;