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 55F1FC433FE for ; Fri, 4 Feb 2022 20:00:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 587186B009D; Fri, 4 Feb 2022 14:59:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 863EF8D0005; Fri, 4 Feb 2022 14:59:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D21318D0005; Fri, 4 Feb 2022 14:59:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0244.hostedemail.com [216.40.44.244]) by kanga.kvack.org (Postfix) with ESMTP id BE6B38D0005 for ; Fri, 4 Feb 2022 14:59:08 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 78D5118265283 for ; Fri, 4 Feb 2022 19:59:08 +0000 (UTC) X-FDA: 79106161176.07.5652107 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 1190A100005 for ; Fri, 4 Feb 2022 19:59:07 +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=70COZ8CZm/Bsc1YB1cyqOpiJaL2hrqAd74yKJp7p4oc=; b=YJLl+0ZC7MeQqUdK+NLha6/3Iw oh7csIrxrIDv5v/BUoQ7Do8V3M/xx+cpHIrjZaKqLzDAZueMNsFguiqEUZtpUJgP972C8dIw8uOod 3HP2mKS6bUPpcL7IzjCTQ7rgt8yTYyR5emKW0Ogs+ZLx2B0EyN2MyJ9/sLlNl6IcEM/JBs+iJTLgG J6dNIf8CKqLlHMFfHQLmoeJ4r2ANMdkpgngATn+5dH0sGK4HDn99RHsc59h7RaumvrXSmccGnj6dX GncAOHJ+mVzGdAuZxLE0eyT+fKU8HKXSyGmNvE3evqSwnnltZMY2lrf8qzWgkDgNLTeHWe0uP5eWL bWlgSsrA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG4jV-007Llv-HZ; Fri, 04 Feb 2022 19:59:01 +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 22/75] mm/gup: Convert gup_huge_pmd() to use a folio Date: Fri, 4 Feb 2022 19:57:59 +0000 Message-Id: <20220204195852.1751729-23-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: 1190A100005 X-Stat-Signature: wbc6ogans7dt17g78f8tp1h6w8zeidxz Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=YJLl+0ZC; dmarc=none; spf=none (imf14.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: 1644004747-818672 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: Use the new folio-based APIs. 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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 6faf8beb4cd9..ca8262392ce3 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2509,7 +2509,8 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, un= signed long addr, unsigned long end, unsigned int flags, struct page **pages, int *nr) { - struct page *head, *page; + struct page *page; + struct folio *folio; int refs; =20 if (!pmd_access_permitted(orig, flags & FOLL_WRITE)) @@ -2525,17 +2526,17 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, = unsigned long addr, page =3D nth_page(pmd_page(orig), (addr & ~PMD_MASK) >> PAGE_SHIFT); refs =3D record_subpages(page, addr, end, pages + *nr); =20 - head =3D try_grab_compound_head(pmd_page(orig), refs, flags); - if (!head) + folio =3D try_grab_folio(page, refs, flags); + if (!folio) return 0; =20 if (unlikely(pmd_val(orig) !=3D pmd_val(*pmdp))) { - put_compound_head(head, refs, flags); + gup_put_folio(folio, refs, flags); return 0; } =20 *nr +=3D refs; - SetPageReferenced(head); + folio_set_referenced(folio); return 1; } =20 --=20 2.34.1