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 355EBC433F5 for ; Fri, 4 Feb 2022 20:00:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 27CA18D0014; Fri, 4 Feb 2022 14:59:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 335CB6B00A1; Fri, 4 Feb 2022 14:59:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7A3A78D0001; Fri, 4 Feb 2022 14:59:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id 848228D0006 for ; Fri, 4 Feb 2022 14:59:11 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 523439274B for ; Fri, 4 Feb 2022 19:59:11 +0000 (UTC) X-FDA: 79106161302.19.F6AFBE6 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf15.hostedemail.com (Postfix) with ESMTP id 151E8A0003 for ; Fri, 4 Feb 2022 19:59:10 +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=/Ikry4i7/ZyLiR01kDRIl2Fp5MVRfbfZzjepJkLAh+0=; b=Jry3eUpw8gdjuiAaSLNyXabMrN rb7RLT8kpU03ec6D9LninNI6dY3ilkFxVCsbHb+tELhsY157eG4dtEUVYOIHYxOfhaQKZlx/Q5lqe VDfwjYsBc+K8qkTGEmUzqO91B2eMHPu67mPeMymZY8rhpCSEtnlzX5BEpFZRO0X7QFne8UTqTqyYT OZPX1lC3mtsKl9nq7+/M3O71JVLmQ3h//U4e8BqQFcvyoiN8QU7K/YihrDvD2O7u33PsAJvMyZPOK f62eS1ryqorEdGvRGehE+qkMXPmWNwexe10PFRY0efjEJVnYM+m296lr4S4Q5ak06G/6ce1mN67Qs 7fRATzbA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG4jV-007Llz-R7; 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 24/75] mm/gup: Convert gup_huge_pgd() to use a folio Date: Fri, 4 Feb 2022 19:58:01 +0000 Message-Id: <20220204195852.1751729-25-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-Queue-Id: 151E8A0003 X-Rspam-User: nil Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Jry3eUpw; dmarc=none; spf=none (imf15.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Stat-Signature: n4bfdbhuex3tk5mk8cno41yc48kgqejw X-Rspamd-Server: rspam08 X-HE-Tag: 1644004750-53514 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. This was the last user of try_grab_compound_head(), so remove it. 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 | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 6d7a2ba6790b..bf196219c189 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -133,12 +133,6 @@ struct folio *try_grab_folio(struct page *page, int = refs, unsigned int flags) return NULL; } =20 -static inline struct page *try_grab_compound_head(struct page *page, - int refs, unsigned int flags) -{ - return &try_grab_folio(page, refs, flags)->page; -} - static void gup_put_folio(struct folio *folio, int refs, unsigned int fl= ags) { if (flags & FOLL_PIN) { @@ -2580,7 +2574,8 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, un= signed long addr, struct page **pages, int *nr) { int refs; - struct page *head, *page; + struct page *page; + struct folio *folio; =20 if (!pgd_access_permitted(orig, flags & FOLL_WRITE)) return 0; @@ -2590,17 +2585,17 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, = unsigned long addr, page =3D nth_page(pgd_page(orig), (addr & ~PGDIR_MASK) >> PAGE_SHIFT); refs =3D record_subpages(page, addr, end, pages + *nr); =20 - head =3D try_grab_compound_head(pgd_page(orig), refs, flags); - if (!head) + folio =3D try_grab_folio(page, refs, flags); + if (!folio) return 0; =20 if (unlikely(pgd_val(orig) !=3D pgd_val(*pgdp))) { - 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