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,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 69162C433DB for ; Fri, 5 Mar 2021 04:27:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1113864FE4 for ; Fri, 5 Mar 2021 04:27:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1113864FE4 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 9AF116B000A; Thu, 4 Mar 2021 23:27:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9866D6B000D; Thu, 4 Mar 2021 23:27:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 828786B000E; Thu, 4 Mar 2021 23:27:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0087.hostedemail.com [216.40.44.87]) by kanga.kvack.org (Postfix) with ESMTP id 65A9B6B000A for ; Thu, 4 Mar 2021 23:27:14 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 2BD30365D for ; Fri, 5 Mar 2021 04:27:14 +0000 (UTC) X-FDA: 77884535988.11.8AB7B86 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf21.hostedemail.com (Postfix) with ESMTP id 0960AE0011E3 for ; Fri, 5 Mar 2021 04:27:12 +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=zWeB6aqDwj65PTFEYVpI7YPXR8x4bwFky9HOKv5MiL0=; b=LLWyhqLGjwShJrcyau7YFLyoZm JK4v5iTnEt2pgVKNSSpd28WJZebmAJvbBCSpYzRytFLx1A0yVR9j+NtlmCDCHYkRyVVmv6tCxSUwG XB4Xvv5fFCXDdDaKVXX4bJE6XQkg3incAQVqkXsgf7CtKHPeE8664Jo/uFpTbXuznhd7CaznfhbPJ 7YFQw1wO/q31+PBPaFxI0P/lm/tcKF6YQ/Yb41iVJdU9DxonpL/Qw55a0S5lIhev7sE0fW1ioqLm4 nhWmgAXLaBE/EDICf11R5An6v77/W9FrXeJSgfMljBf7yuYNLM13bkEbUK88X+cP+dz2fAtXDpAdP AG+vd6Jw==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1lI231-00A4pJ-TB; Fri, 05 Mar 2021 04:26:48 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v4 23/25] mm/page-writeback: Convert test_clear_page_writeback to take a folio Date: Fri, 5 Mar 2021 04:18:59 +0000 Message-Id: <20210305041901.2396498-24-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210305041901.2396498-1-willy@infradead.org> References: <20210305041901.2396498-1-willy@infradead.org> MIME-Version: 1.0 X-Stat-Signature: fupgb6k9c3okwjcj5uw7cdibaao3cwyi X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 0960AE0011E3 Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf21; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614918432-276554 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: The one caller of test_clear_page_writeback() already has a folio, so rename it to test_clear_folio_writeback() to make it clear that it operates on the entire folio. This removes a few calls to compound_head(= ) but actually grows the function by 49 bytes because it now accounts for the number of pages in the folio. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/page-flags.h | 2 +- mm/filemap.c | 2 +- mm/page-writeback.c | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 90381858d901..01aa4a71bf14 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -594,7 +594,7 @@ static __always_inline void SetPageUptodate(struct pa= ge *page) =20 CLEARPAGEFLAG(Uptodate, uptodate, PF_NO_TAIL) =20 -int test_clear_page_writeback(struct page *page); +int test_clear_folio_writeback(struct folio *folio); int __test_set_page_writeback(struct page *page, bool keep_write); =20 #define test_set_page_writeback(page) \ diff --git a/mm/filemap.c b/mm/filemap.c index e91fa14c86c7..57f46ff2f230 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1446,7 +1446,7 @@ void end_folio_writeback(struct folio *folio) * reused before the wake_up_folio(). */ get_folio(folio); - if (!test_clear_page_writeback(&folio->page)) + if (!test_clear_folio_writeback(folio)) BUG(); =20 smp_mb__after_atomic(); diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 6c1b4737c383..fa3411ea4cd3 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -589,7 +589,7 @@ static void wb_domain_writeout_inc(struct wb_domain *= dom, =20 /* * Increment @wb's writeout completion count and the global writeout - * completion count. Called from test_clear_page_writeback(). + * completion count. Called from test_clear_folio_writeback(). */ static inline void __wb_writeout_inc(struct bdi_writeback *wb) { @@ -2719,24 +2719,24 @@ int clear_page_dirty_for_io(struct page *page) } EXPORT_SYMBOL(clear_page_dirty_for_io); =20 -int test_clear_page_writeback(struct page *page) +int test_clear_folio_writeback(struct folio *folio) { - struct address_space *mapping =3D page_mapping(page); + struct address_space *mapping =3D folio_mapping(folio); struct mem_cgroup *memcg; struct lruvec *lruvec; int ret; =20 - memcg =3D lock_page_memcg(page); - lruvec =3D mem_cgroup_page_lruvec(page, page_pgdat(page)); + memcg =3D lock_folio_memcg(folio); + lruvec =3D mem_cgroup_folio_lruvec(folio, folio_pgdat(folio)); if (mapping && mapping_use_writeback_tags(mapping)) { struct inode *inode =3D mapping->host; struct backing_dev_info *bdi =3D inode_to_bdi(inode); unsigned long flags; =20 xa_lock_irqsave(&mapping->i_pages, flags); - ret =3D TestClearPageWriteback(page); + ret =3D TestClearFolioWriteback(folio); if (ret) { - __xa_clear_mark(&mapping->i_pages, page_index(page), + __xa_clear_mark(&mapping->i_pages, folio_index(folio), PAGECACHE_TAG_WRITEBACK); if (bdi->capabilities & BDI_CAP_WRITEBACK_ACCT) { struct bdi_writeback *wb =3D inode_to_wb(inode); @@ -2752,12 +2752,12 @@ int test_clear_page_writeback(struct page *page) =20 xa_unlock_irqrestore(&mapping->i_pages, flags); } else { - ret =3D TestClearPageWriteback(page); + ret =3D TestClearFolioWriteback(folio); } if (ret) { dec_lruvec_state(lruvec, NR_WRITEBACK); - dec_zone_page_state(page, NR_ZONE_WRITE_PENDING); - inc_node_page_state(page, NR_WRITTEN); + dec_zone_folio_stat(folio, NR_ZONE_WRITE_PENDING); + inc_node_folio_stat(folio, NR_WRITTEN); } __unlock_page_memcg(memcg); return ret; --=20 2.30.0