From patchwork Fri Feb 4 19:58:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12735590 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 AA393C433FE for ; Fri, 4 Feb 2022 20:21:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 782C28D000C; Fri, 4 Feb 2022 15:21:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 70A968D0007; Fri, 4 Feb 2022 15:21:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 538658D000C; Fri, 4 Feb 2022 15:21:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0066.hostedemail.com [216.40.44.66]) by kanga.kvack.org (Postfix) with ESMTP id 2E6FD8D0007 for ; Fri, 4 Feb 2022 15:21:40 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id E141918201289 for ; Fri, 4 Feb 2022 20:21:39 +0000 (UTC) X-FDA: 79106217918.27.B6AC915 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf03.hostedemail.com (Postfix) with ESMTP id 65CA820006 for ; Fri, 4 Feb 2022 20:21:39 +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=H+jlw4ue9QjQz5TCNSRpgDvnDtE889iCzjsXByGd4u8=; b=GuBfxuzooSqM5ZW4K7+hqLdHTW NnxA0DNphTowyrCXMe3zTuIFp55vQHZPjdJikSVqYLP6plwJNKt9mK3D+7H01Miuwf2IwNZ6wd8vp wVdKVw619Cp+EHOi7WSVU8n/zwcGVm1s10hGnAwqPYt9sXCUaDAKDSQyiPxejioqBJJntaTGTNtP0 T2d5NuhAqgjD/S3Vmg3kMUKh794eXYzX3rLysGc/TvNQLMJ2MpQz3bfgq1WPUYUveLgw59U3kSEBN ThvxpKmP97W4iCAsg91IqBm7jgSlProJkp+xDcj9dJYkatYmKDx13hzZQxC2Ou+XYtROk/26PTrKc b2KLbBxQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG4jV-007Llx-OJ; 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 23/75] mm/gup: Convert gup_huge_pud() to use a folio Date: Fri, 4 Feb 2022 19:58:00 +0000 Message-Id: <20220204195852.1751729-24-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-Rspam-User: nil X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 65CA820006 X-Stat-Signature: gda4fjwgf31jfra38c9dmubg9yfo7xaz Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=GuBfxuzo; dmarc=none; spf=none (imf03.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1644006099-540513 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 ca8262392ce3..6d7a2ba6790b 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2544,7 +2544,8 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned 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; if (!pud_access_permitted(orig, flags & FOLL_WRITE)) @@ -2560,17 +2561,17 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr, page = nth_page(pud_page(orig), (addr & ~PUD_MASK) >> PAGE_SHIFT); refs = record_subpages(page, addr, end, pages + *nr); - head = try_grab_compound_head(pud_page(orig), refs, flags); - if (!head) + folio = try_grab_folio(page, refs, flags); + if (!folio) return 0; if (unlikely(pud_val(orig) != pud_val(*pudp))) { - put_compound_head(head, refs, flags); + gup_put_folio(folio, refs, flags); return 0; } *nr += refs; - SetPageReferenced(head); + folio_set_referenced(folio); return 1; }