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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39E50C433EF for ; Fri, 4 Feb 2022 20:00:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F9126B0099; Fri, 4 Feb 2022 14:59:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 752C98D0012; Fri, 4 Feb 2022 14:59:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0005D6B0099; Fri, 4 Feb 2022 14:59:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0001.hostedemail.com [216.40.44.1]) by kanga.kvack.org (Postfix) with ESMTP id 6D8B68D0017 for ; Fri, 4 Feb 2022 14:59:12 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 39F7A824C42A for ; Fri, 4 Feb 2022 19:59:12 +0000 (UTC) X-FDA: 79106161344.20.05B12FF Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id DDDF0180003 for ; Fri, 4 Feb 2022 19:59:11 +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=uNHbiplzAhumMjir5hW/+5QrjINzxK7Ks9sjue7Fm7I=; b=Yu+bQPGiq4F1lldZgNWaep7jd4 B0nyFdzn0XB98KUc65p6nAzFc7ffg4qx2FIt15K37OcLI3DCIKVJhV+KLwOCmLT85GxkMOGIxRBoP wD+Vw8+CL4sKwmaViXgSCwbJ2IdLKpJJNf00hceV2XOn2tOaABC6zWpVlTKMWDvmErj3vqC8F016L X+RjWgcRWm9IdfqK0zzP10ZtkWOdQmvQmcCmL4D1TRcFPgLAYxvBt3PaTvyAHWWS458syi4TEdXt0 ExkyV0vflohQ4zlYlxa/pOya+T9IjPFvFYD7D87a9b0nBdMoSZFUQx5ymN4QMjjpGDPJHJIfJ5uWW j7Lf5hhw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG4jU-007LlN-H4; Fri, 04 Feb 2022 19:59:00 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Christoph Hellwig , John Hubbard , Jason Gunthorpe , William Kucharski Subject: [PATCH 11/75] mm/gup: Remove hpage_pincount_sub() Date: Fri, 4 Feb 2022 19:57:48 +0000 Message-Id: <20220204195852.1751729-12-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220204195852.1751729-1-willy@infradead.org> References: <20220204195852.1751729-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: DDDF0180003 X-Stat-Signature: 54nnozcdfzhkygoxaxhq65kwq1bj1axj Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Yu+bQPGi; dmarc=none; 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 X-Rspam-User: nil X-HE-Tag: 1644004751-36480 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: Move the assertion (and correct it to be a cheaper variant), and inline the atomic_sub() operation. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig Reviewed-by: John Hubbard Reviewed-by: Jason Gunthorpe Reviewed-by: William Kucharski --- mm/gup.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 60168a09d52a..af623a139995 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -29,14 +29,6 @@ struct follow_page_context { unsigned int page_mask; }; =20 -static void hpage_pincount_sub(struct page *page, int refs) -{ - VM_BUG_ON_PAGE(!hpage_pincount_available(page), page); - VM_BUG_ON_PAGE(page !=3D compound_head(page), page); - - atomic_sub(refs, compound_pincount_ptr(page)); -} - /* Equivalent to calling put_page() @refs times. */ static void put_page_refs(struct page *page, int refs) { @@ -169,12 +161,13 @@ __maybe_unused struct page *try_grab_compound_head(= struct page *page, =20 static void put_compound_head(struct page *page, int refs, unsigned int = flags) { + VM_BUG_ON_PAGE(PageTail(page), page); + if (flags & FOLL_PIN) { mod_node_page_state(page_pgdat(page), NR_FOLL_PIN_RELEASED, refs); - if (hpage_pincount_available(page)) - hpage_pincount_sub(page, refs); + atomic_sub(refs, compound_pincount_ptr(page)); else refs *=3D GUP_PIN_COUNTING_BIAS; } --=20 2.34.1