From patchwork Mon Oct 4 13:46:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12534161 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 0E66EC433EF for ; Mon, 4 Oct 2021 14:35:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 96EF261360 for ; Mon, 4 Oct 2021 14:35:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 96EF261360 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 0F45094003F; Mon, 4 Oct 2021 10:35:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 07D4E94000B; Mon, 4 Oct 2021 10:35:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E60BB94003F; Mon, 4 Oct 2021 10:35:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0173.hostedemail.com [216.40.44.173]) by kanga.kvack.org (Postfix) with ESMTP id CF6DB94000B for ; Mon, 4 Oct 2021 10:35:17 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 60FA38249980 for ; Mon, 4 Oct 2021 14:35:17 +0000 (UTC) X-FDA: 78659002674.06.7826736 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP id 19619D0389E9 for ; Mon, 4 Oct 2021 14:35:16 +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=IdyZS3/GUVLZnLZb2TccyhOnfKIZ83B7fFj/ZA0FCDM=; b=rNxAjFvPyY9LIJH1sP7F4qUDzX 8mfilbhpzokaOW2MLVxneeuf3yIn2jNnZf0YBWYEabQanGLVTA7C+TTqZHxf67DwvUywwZtJls0om wdEBhZGiOqo5RmuiZRZN8S9q1/UTuKMoxWRgS/q3nhBTMMzwB+9DNrEwJI281qlHbaSk9r4zEf1Yh pBxn+9OpR/iAd6VYQCmPJ5eS83q22ZHk3afUuAAk2nfheDpTac/kcTU8oHgrvJycnhyweuOfwUUx/ 2OyWkdLk5sBCqj2n3n5pGez6Ai2XlmY/bRP71LEC6Ikb4dNNcOV7bOEVcYBsvaoLxLDY/SE2eNNZB jkkLb0lw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXOzg-00H04u-Q4; Mon, 04 Oct 2021 14:31:44 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 35/62] mm/slub: Convert freelist_corrupted() to struct slab Date: Mon, 4 Oct 2021 14:46:23 +0100 Message-Id: <20211004134650.4031813-36-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 Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rNxAjFvP; spf=none (imf21.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-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 19619D0389E9 X-Stat-Signature: 3wn1q377wz8rejxqngtt37w19sc856ki X-HE-Tag: 1633358116-721403 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: Move slab_page() call down a level. Signed-off-by: Matthew Wilcox (Oracle) --- mm/slub.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 16ce9aeccdc8..6d81e54e61df 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -799,12 +799,12 @@ static void slab_fix(struct kmem_cache *s, char *fmt, ...) va_end(args); } -static bool freelist_corrupted(struct kmem_cache *s, struct page *page, +static bool freelist_corrupted(struct kmem_cache *s, struct slab *slab, void **freelist, void *nextfree) { if ((s->flags & SLAB_CONSISTENCY_CHECKS) && - !check_valid_pointer(s, page, nextfree) && freelist) { - object_err(s, page, *freelist, "Freechain corrupt"); + !check_valid_pointer(s, slab_page(slab), nextfree) && freelist) { + object_err(s, slab_page(slab), *freelist, "Freechain corrupt"); *freelist = NULL; slab_fix(s, "Isolate corrupted freechain"); return true; @@ -1637,7 +1637,7 @@ static inline void inc_slabs_node(struct kmem_cache *s, int node, static inline void dec_slabs_node(struct kmem_cache *s, int node, int objects) {} -static bool freelist_corrupted(struct kmem_cache *s, struct page *page, +static bool freelist_corrupted(struct kmem_cache *s, struct slab *slab, void **freelist, void *nextfree) { return false; @@ -2330,7 +2330,7 @@ static void deactivate_slab(struct kmem_cache *s, struct slab *slab, * 'freelist_iter' is already corrupted. So isolate all objects * starting at 'freelist_iter' by skipping them. */ - if (freelist_corrupted(s, slab_page(slab), &freelist_iter, nextfree)) + if (freelist_corrupted(s, slab, &freelist_iter, nextfree)) break; freelist_tail = freelist_iter;