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.6 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,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 91C2DC47E48 for ; Thu, 15 Jul 2021 04:25:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 434316128C for ; Thu, 15 Jul 2021 04:25:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 434316128C 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 96AA08D0035; Thu, 15 Jul 2021 00:25:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 941B96B0145; Thu, 15 Jul 2021 00:25:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 809648D0035; Thu, 15 Jul 2021 00:25:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0228.hostedemail.com [216.40.44.228]) by kanga.kvack.org (Postfix) with ESMTP id 5689F6B0144 for ; Thu, 15 Jul 2021 00:25:57 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 4DD281359C for ; Thu, 15 Jul 2021 04:25:56 +0000 (UTC) X-FDA: 78363534312.14.2853660 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id EECD260019B3 for ; Thu, 15 Jul 2021 04:25:55 +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=27gdq5o/ud7Z3GaZ8fB4o0Zc5uDnZZui0TcU+yq7Hzs=; b=hPDSWQ0uzpBbCli4cWGiX9a4/A 0ZCHMmTy2SwlZGWiApAY4AEchvaq4cErG3kVhB/bjWp2MPLC5PEz+o3SxrLipF7LyzCloryCSnN9O l+jOf+4+GIxC3dqMMq1mrYUzkDAia67LIEHYk1JApbgKa3RWA30YAOh/rqXrbe0wUvcVBVxS+9/Dv zJGKAjAGlISnMFYIMXrwq1HI+lVQCVFzR5MuhDAJQsQn8c42dj7Q45Fd7UZY1lnMBEXL7OlpD1D6r j720hhMYcwb/TBs+C4cZDZFyFR+73lH4jcSvPNVr3Wu6HRhFodBuewA06wvoHorNz8Reli8WSFftB eEO56s6w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3sv0-002xB8-A9; Thu, 15 Jul 2021 04:24:31 +0000 From: "Matthew Wilcox (Oracle)" To: linux-kernel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Christoph Hellwig Subject: [PATCH v14 059/138] mm/rmap: Add folio_mkclean() Date: Thu, 15 Jul 2021 04:35:45 +0100 Message-Id: <20210715033704.692967-60-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210715033704.692967-1-willy@infradead.org> References: <20210715033704.692967-1-willy@infradead.org> MIME-Version: 1.0 Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hPDSWQ0u; 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; dmarc=none X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: EECD260019B3 X-Stat-Signature: djm775i8gdcha9nooamrfcff6agx8ix9 X-HE-Tag: 1626323155-532437 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: Transform page_mkclean() into folio_mkclean() and add a page_mkclean() wrapper around folio_mkclean(). folio_mkclean is 15 bytes smaller than page_mkclean, but the kernel is enlarged by 33 bytes due to inlining page_folio() into each caller. This will go away once the callers are converted to use folio_mkclean(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig --- include/linux/rmap.h | 10 ++++++---- mm/rmap.c | 12 ++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 83fb86133fe1..d45584310cde 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -235,7 +235,7 @@ unsigned long page_address_in_vma(struct page *, stru= ct vm_area_struct *); * * returns the number of cleaned PTEs. */ -int page_mkclean(struct page *); +int folio_mkclean(struct folio *); =20 /* * called in munlock()/munmap() path to check for other vmas holding @@ -293,12 +293,14 @@ static inline int page_referenced(struct page *page= , int is_locked, =20 #define try_to_unmap(page, refs) false =20 -static inline int page_mkclean(struct page *page) +static inline int folio_mkclean(struct folio *folio) { return 0; } - - #endif /* CONFIG_MMU */ =20 +static inline int page_mkclean(struct page *page) +{ + return folio_mkclean(page_folio(page)); +} #endif /* _LINUX_RMAP_H */ diff --git a/mm/rmap.c b/mm/rmap.c index 1df8683c4c4c..b3aae8eeaeaf 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -980,7 +980,7 @@ static bool invalid_mkclean_vma(struct vm_area_struct= *vma, void *arg) return true; } =20 -int page_mkclean(struct page *page) +int folio_mkclean(struct folio *folio) { int cleaned =3D 0; struct address_space *mapping; @@ -990,20 +990,20 @@ int page_mkclean(struct page *page) .invalid_vma =3D invalid_mkclean_vma, }; =20 - BUG_ON(!PageLocked(page)); + BUG_ON(!folio_test_locked(folio)); =20 - if (!page_mapped(page)) + if (!folio_mapped(folio)) return 0; =20 - mapping =3D page_mapping(page); + mapping =3D folio_mapping(folio); if (!mapping) return 0; =20 - rmap_walk(page, &rwc); + rmap_walk(&folio->page, &rwc); =20 return cleaned; } -EXPORT_SYMBOL_GPL(page_mkclean); +EXPORT_SYMBOL_GPL(folio_mkclean); =20 /** * page_move_anon_rmap - move a page to our anon_vma --=20 2.30.2