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 X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BED47C433E0 for ; Thu, 28 Jan 2021 07:04:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 420C764DCE for ; Thu, 28 Jan 2021 07:04:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 420C764DCE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7AA746B007B; Thu, 28 Jan 2021 02:04:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 734D16B007D; Thu, 28 Jan 2021 02:04:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FACE6B007E; Thu, 28 Jan 2021 02:04:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0002.hostedemail.com [216.40.44.2]) by kanga.kvack.org (Postfix) with ESMTP id 3C6FD6B007B for ; Thu, 28 Jan 2021 02:04:27 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 0A0902476 for ; Thu, 28 Jan 2021 07:04:27 +0000 (UTC) X-FDA: 77754295374.11.way30_541110a2759d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id D5B2D180F8B80 for ; Thu, 28 Jan 2021 07:04:26 +0000 (UTC) X-HE-Tag: way30_541110a2759d X-Filterd-Recvd-Size: 5689 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Thu, 28 Jan 2021 07:04:26 +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=n97BXR9ReJR0JFPjaiqobj9UIWajfLaZjYyOGUOO1bs=; b=JFvDcKFejY9Ba0JUcf+zjFkX+f Yj626KR5hm04BkAaACmrHMk49sKp2DHP5Wne/Vf0qDK0Eah5D0BJTmpZ4lSSNLIcxERpmK3btHcbm C4d3GPHAZTUvIqebHU75xEFnElWBh/gkmf3dOCbkMZvhptJhy8Y9UaHSoOrbLrWmRSM7g8zDk2RW1 x949hWRX/w3f4smBNZxZR85/JqZSTprHE+rcFNE8+78GudhWxP88E5lKPHTF3yop3Yt4igcozL7uy 9Qy4rfkvhn532wHGOvXGNSKXRdD6hhjhCQ72az99lYyyayWpv5jLVuKDMXPBEXz9WVHdHnrnStVeN TCC8ieEA==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l51Lq-00847Y-Tq; Thu, 28 Jan 2021 07:04:23 +0000 From: "Matthew Wilcox (Oracle)" To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH v3 10/25] mm/util: Add folio_mapping and folio_file_mapping Date: Thu, 28 Jan 2021 07:03:49 +0000 Message-Id: <20210128070404.1922318-11-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210128070404.1922318-1-willy@infradead.org> References: <20210128070404.1922318-1-willy@infradead.org> MIME-Version: 1.0 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: These are the folio equivalent of page_mapping() and page_file_mapping(). Adjust page_file_mapping() and page_mapping_file() to use folios internally. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 23 +++++++++++++++-------- mm/swapfile.c | 6 +++--- mm/util.c | 20 ++++++++++---------- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index d71c5776b571..c6b708007018 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1589,17 +1589,25 @@ void page_address_init(void); =20 extern void *page_rmapping(struct page *page); extern struct anon_vma *page_anon_vma(struct page *page); -extern struct address_space *page_mapping(struct page *page); +struct address_space *folio_mapping(struct folio *); +struct address_space *__folio_file_mapping(struct folio *); =20 -extern struct address_space *__page_file_mapping(struct page *); +static inline struct address_space *page_mapping(struct page *page) +{ + return folio_mapping(page_folio(page)); +} =20 -static inline -struct address_space *page_file_mapping(struct page *page) +static inline struct address_space *folio_file_mapping(struct folio *fol= io) { - if (unlikely(PageSwapCache(page))) - return __page_file_mapping(page); + if (unlikely(FolioSwapCache(folio))) + return __folio_file_mapping(folio); =20 - return page->mapping; + return folio->page.mapping; +} + +static inline struct address_space *page_file_mapping(struct page *page) +{ + return folio_file_mapping(page_folio(page)); } =20 extern pgoff_t __page_file_index(struct page *page); @@ -1616,7 +1624,6 @@ static inline pgoff_t page_index(struct page *page) } =20 bool page_mapped(struct page *page); -struct address_space *page_mapping(struct page *page); struct address_space *page_mapping_file(struct page *page); =20 /* diff --git a/mm/swapfile.c b/mm/swapfile.c index 12a18b896fce..b68e94d5b112 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3551,11 +3551,11 @@ struct swap_info_struct *page_swap_info(struct pa= ge *page) /* * out-of-line __page_file_ methods to avoid include hell. */ -struct address_space *__page_file_mapping(struct page *page) +struct address_space *__folio_file_mapping(struct folio *folio) { - return page_swap_info(page)->swap_file->f_mapping; + return page_swap_info(&folio->page)->swap_file->f_mapping; } -EXPORT_SYMBOL_GPL(__page_file_mapping); +EXPORT_SYMBOL_GPL(__folio_file_mapping); =20 pgoff_t __page_file_index(struct page *page) { diff --git a/mm/util.c b/mm/util.c index c37e24d5fa43..c052c39b9f1c 100644 --- a/mm/util.c +++ b/mm/util.c @@ -686,39 +686,39 @@ struct anon_vma *page_anon_vma(struct page *page) return __page_rmapping(page); } =20 -struct address_space *page_mapping(struct page *page) +struct address_space *folio_mapping(struct folio *folio) { struct address_space *mapping; =20 - page =3D compound_head(page); - /* This happens if someone calls flush_dcache_page on slab page */ - if (unlikely(PageSlab(page))) + if (unlikely(FolioSlab(folio))) return NULL; =20 - if (unlikely(PageSwapCache(page))) { + if (unlikely(FolioSwapCache(folio))) { swp_entry_t entry; =20 - entry.val =3D page_private(page); + entry.val =3D folio_private(folio); return swap_address_space(entry); } =20 - mapping =3D page->mapping; + mapping =3D folio->page.mapping; if ((unsigned long)mapping & PAGE_MAPPING_ANON) return NULL; =20 return (void *)((unsigned long)mapping & ~PAGE_MAPPING_FLAGS); } -EXPORT_SYMBOL(page_mapping); +EXPORT_SYMBOL(folio_mapping); =20 /* * For file cache pages, return the address_space, otherwise return NULL */ struct address_space *page_mapping_file(struct page *page) { - if (unlikely(PageSwapCache(page))) + struct folio *folio =3D page_folio(page); + + if (unlikely(FolioSwapCache(folio))) return NULL; - return page_mapping(page); + return folio_mapping(folio); } =20 /* Slow path of page_mapcount() for compound pages */ --=20 2.29.2