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 82BEBC4361B for ; Wed, 16 Dec 2020 18:46:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1BC42233F6 for ; Wed, 16 Dec 2020 18:46:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1BC42233F6 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 A3DF76B006E; Wed, 16 Dec 2020 13:46:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F3416B0070; Wed, 16 Dec 2020 13:46:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8DE5A6B0072; Wed, 16 Dec 2020 13:46:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0062.hostedemail.com [216.40.44.62]) by kanga.kvack.org (Postfix) with ESMTP id 776606B006E for ; Wed, 16 Dec 2020 13:46:46 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 4044D824999B for ; Wed, 16 Dec 2020 18:46:46 +0000 (UTC) X-FDA: 77600026812.08.grade26_5c150212742e Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 30D701819E798 for ; Wed, 16 Dec 2020 18:46:46 +0000 (UTC) X-HE-Tag: grade26_5c150212742e X-Filterd-Recvd-Size: 3600 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Wed, 16 Dec 2020 18:46:45 +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=wgSLUQVGs2mzK29oI4B8XueV4kSBF9PQMmHMnOv+VpU=; b=CnY/hkQUJgs4MRuYLidMJcab1L SspioDLyhuvuidzcKpZW06yDf+tytY2a7/hGBj5gTrXx/Wq/OULF/j52VUC6ohh9Rh1kcQ3cYYpd5 x35DOjymVH5/PpkbpenmXQxsKteFDbzTKwtc5bMmfY7CW0sehxqQGr5vldSjrIROAejtWYRDOSMbN fxdp21DFwvrYxkDVTr57Ss6eyR0zsca5/03pwrR8JOLfpZ2kS2d19RiurLBWTCAX1DOu6NxeM7Mgl fTWYGx1xuP+XJEpwjvmE9/LFXrbNQl2+wcaScqkDXtvHr4y/57DLACo25Px8RmMNVjlxstZtinB2q PfGMUgzA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpbSe-00076u-1i; Wed, 16 Dec 2020 18:23:40 +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 10/25] mm/filemap: Convert end_page_writeback to use a folio Date: Wed, 16 Dec 2020 18:23:20 +0000 Message-Id: <20201216182335.27227-11-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201216182335.27227-1-willy@infradead.org> References: <20201216182335.27227-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: With my config, this function shrinks from 480 bytes to 240 bytes due to elimination of repeated calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/filemap.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 6012e8a7bd6c..654bba53442a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1148,11 +1148,11 @@ static void wake_up_page_bit(struct page *page, i= nt bit_nr) spin_unlock_irqrestore(&q->lock, flags); } =20 -static void wake_up_page(struct page *page, int bit) +static void wake_up_folio(struct folio *folio, int bit) { - if (!PageWaiters(page)) + if (!FolioWaiters(folio)) return; - wake_up_page_bit(page, bit); + wake_up_page_bit(&folio->page, bit); } =20 /* @@ -1466,6 +1466,8 @@ EXPORT_SYMBOL(unlock_folio); */ void end_page_writeback(struct page *page) { + struct folio *folio =3D page_folio(page); + /* * TestClearPageReclaim could be used here but it is an atomic * operation and overkill in this particular case. Failing to @@ -1473,9 +1475,9 @@ void end_page_writeback(struct page *page) * justify taking an atomic operation penalty at the end of * ever page writeback. */ - if (PageReclaim(page)) { - ClearPageReclaim(page); - rotate_reclaimable_page(page); + if (FolioReclaim(folio)) { + ClearFolioReclaim(folio); + rotate_reclaimable_page(&folio->page); } =20 /* @@ -1484,13 +1486,13 @@ void end_page_writeback(struct page *page) * But here we must make sure that the page is not freed and * reused before the wake_up_page(). */ - get_page(page); - if (!test_clear_page_writeback(page)) + get_folio(folio); + if (!test_clear_page_writeback(&folio->page)) BUG(); =20 smp_mb__after_atomic(); - wake_up_page(page, PG_writeback); - put_page(page); + wake_up_folio(folio, PG_writeback); + put_folio(folio); } EXPORT_SYMBOL(end_page_writeback); =20 --=20 2.29.2