From patchwork Mon Jul 17 13:25:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 121335 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1125779vqt; Mon, 17 Jul 2023 06:55:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlHKArgR1HgwsCf0X1PJfc1hN2T9G+fN/DMITu+oUulc/AQr9S25oe1CTkJhOFeXplXzO+oV X-Received: by 2002:a17:907:96ac:b0:985:259f:6f50 with SMTP id hd44-20020a17090796ac00b00985259f6f50mr11857438ejc.34.1689602139052; Mon, 17 Jul 2023 06:55:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689602139; cv=none; d=google.com; s=arc-20160816; b=09mlohnjf9Xwnt4oKzubUPJYa2C4vcSy/1fgAKwvcYTnYcRBzeqjeMcX4nY+/gkMLf FEfaV5wvqeeHLju4IY/KaYk1I2pFaXxrKgx2wGmNgdwKFsYNp2ib40O++SQr4wOYf2PN 6JLuHSvQJnZKGEwj+MRsGooVP3aB3pV49L8Yorx0Zl1hDPfNqIgvgoFEJwIfeqqY2SnY gX5qDcvQc09uVUr9jUrxFhQBgVUvv3PQoNcBnjUIpi7/VSPfPbIg6lznUgbHJ2Bj3gYC w/OZmWL8xT2hEOGZj/xEYfU422VV4SLh35ZH9MUhkarxGGKbH/V+s+BiNlfN1JBx6ziL cRMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=IYxz/hwKzYk9uuwe3O6nxmJnxJXAWQADQD0MlDZJ4Kw=; fh=VDvXH+NlXsy4uKRcyz6yvnpRC6UQTLJqNZtREhJ4J58=; b=jOlj2Jjql2N5F5tjk1hNF4xfhFJf2Hf0Vc4b6xP0ZfeGbgfMf1PaVZhe+7F51ptjo9 yp/ZH5ycXOBkvlax0gaoS37WyCcE6cE++NM9TD9zfXFo33hEkmhUturlkOCjjarbKUhm VsffipZL4dTNDNrmK0y+/C/AQeE2yOGOOsVinFs4F1dB9uCKwrbOl7OIHD/QskHpah0V 3omI9cjF1VnMhSeNa4uaNjjjF1h4og6INWT4h1vpblxYrhZT5x3KFG0jCwPDPlcgkUzt Pz27FzdoXzVBuzkqYuubX0gyF1bKs0MlQUrHFW09DbfBYkzd/OTpDr4gYQgOFEz5d/fW FdcA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a10-20020a1709062b0a00b00992a9b22b7fsi12905211ejg.668.2023.07.17.06.55.14; Mon, 17 Jul 2023 06:55:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231701AbjGQN1P (ORCPT + 99 others); Mon, 17 Jul 2023 09:27:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231623AbjGQN07 (ORCPT ); Mon, 17 Jul 2023 09:26:59 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E186CC for ; Mon, 17 Jul 2023 06:26:37 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R4N9z6YCzzrRmJ; Mon, 17 Jul 2023 21:25:27 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 17 Jul 2023 21:26:09 +0800 From: Peng Zhang To: , CC: , , , , , ZhangPeng Subject: [PATCH 1/6] mm/page_io: use a folio in __end_swap_bio_read() Date: Mon, 17 Jul 2023 21:25:57 +0800 Message-ID: <20230717132602.2202147-2-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717132602.2202147-1-zhangpeng362@huawei.com> References: <20230717132602.2202147-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771676252228152299 X-GMAIL-MSGID: 1771676252228152299 From: ZhangPeng Saves three implicit call to compound_head(). Signed-off-by: ZhangPeng --- mm/page_io.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 684cd3c7b59b..ebf431e5f538 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -58,18 +58,18 @@ static void end_swap_bio_write(struct bio *bio) static void __end_swap_bio_read(struct bio *bio) { - struct page *page = bio_first_page_all(bio); + struct folio *folio = page_folio(bio_first_page_all(bio)); if (bio->bi_status) { - SetPageError(page); - ClearPageUptodate(page); + folio_set_error(folio); + folio_clear_uptodate(folio); pr_alert_ratelimited("Read-error on swap-device (%u:%u:%llu)\n", MAJOR(bio_dev(bio)), MINOR(bio_dev(bio)), (unsigned long long)bio->bi_iter.bi_sector); } else { - SetPageUptodate(page); + folio_mark_uptodate(folio); } - unlock_page(page); + folio_unlock(folio); } static void end_swap_bio_read(struct bio *bio) From patchwork Mon Jul 17 13:25:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 121349 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1139225vqt; Mon, 17 Jul 2023 07:15:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlEzmI3czjYjFhEl3BFC3G2f2P8xP3+y9fjuaOOyRfAQcLHw3BtBjU5rSrAHQ80pwU21SmKq X-Received: by 2002:a17:90a:cb04:b0:263:3386:9da8 with SMTP id z4-20020a17090acb0400b0026333869da8mr8693566pjt.49.1689603311589; Mon, 17 Jul 2023 07:15:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689603311; cv=none; d=google.com; s=arc-20160816; b=ccXNP/IBJ1KEMCYF16TQXYjwoPtkeenixPufmL3rWoxexZ0kj5KG7FIqwNC0NuTndo M/F9Udu2Vov7EsIq/uZ9n3GZBtN1PRCf8pmvxcIoDVfCGR6ejRBmzlFmyILksNpZMewZ NAeUaWzV1RSlmz6UhrTBmg7KLZguERcDv8VuZqWuIgHOQcbx2EffanwjHnVTxSyiddLw SIAdRtXcGAvu7rmb4H4rggUaAehGwfr/OH8AwYB0ToiuV/fiVTsebymZonMvjdEma8xc L+Ff4VMUTHbA6n3FBGWCv9QeG4K4BM6PpEir1Vh/ToNvRSviYm2U+IkyFG5v7UyQ8qmq 8wFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=V7vHzbTqeW7JilGe8vNV9ImKVDt34goczj++N2ksBns=; fh=VDvXH+NlXsy4uKRcyz6yvnpRC6UQTLJqNZtREhJ4J58=; b=doo6C/jDktqcRoe2CHRaHE8GBAj5zPHzshcYxU8PIpaPcqPZntUsAkr8kDuweM9+Gg tggDX6lN3ZImj9kghEoQzXqOgvHuKR48Cru2XdJBy6exwV6MFSV3OQ+qOtgU71bX3xtk SCL703mTadGF7NpFgnH9wj2cpFMwWPuBGWE8uU6dcvweYMaKNmTe58xU+rG2ZsaEwvsT DaytWyyUtkQJ4xu850HsTTh6molVFyB1xc0mvycR7AA5TGyMElgd3DfL4PE5U5yGYfY6 BVjyMdSSxiIlXqKF42gCfTgCdEZaPNqyuV+bJo9tQmwZRqzmxhfgwh7s5ccjnBQnNXag o56Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o19-20020a17090aac1300b0025653dc2881si5723813pjq.23.2023.07.17.07.14.57; Mon, 17 Jul 2023 07:15:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231245AbjGQN13 (ORCPT + 99 others); Mon, 17 Jul 2023 09:27:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231518AbjGQN06 (ORCPT ); Mon, 17 Jul 2023 09:26:58 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F42C2115 for ; Mon, 17 Jul 2023 06:26:36 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4R4N810KhdzLngj; Mon, 17 Jul 2023 21:23:45 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 17 Jul 2023 21:26:09 +0800 From: Peng Zhang To: , CC: , , , , , ZhangPeng Subject: [PATCH 2/6] mm/page_io: use a folio in sio_read_complete() Date: Mon, 17 Jul 2023 21:25:58 +0800 Message-ID: <20230717132602.2202147-3-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717132602.2202147-1-zhangpeng362@huawei.com> References: <20230717132602.2202147-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771677358561725291 X-GMAIL-MSGID: 1771677481974728295 From: ZhangPeng Saves three implicit call to compound_head(). Signed-off-by: ZhangPeng --- mm/page_io.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index ebf431e5f538..438d0c7c2194 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -406,19 +406,19 @@ static void sio_read_complete(struct kiocb *iocb, long ret) if (ret == sio->len) { for (p = 0; p < sio->pages; p++) { - struct page *page = sio->bvec[p].bv_page; + struct folio *folio = page_folio(sio->bvec[p].bv_page); - SetPageUptodate(page); - unlock_page(page); + folio_mark_uptodate(folio); + folio_unlock(folio); } count_vm_events(PSWPIN, sio->pages); } else { for (p = 0; p < sio->pages; p++) { - struct page *page = sio->bvec[p].bv_page; + struct folio *folio = page_folio(sio->bvec[p].bv_page); - SetPageError(page); - ClearPageUptodate(page); - unlock_page(page); + folio_set_error(folio); + folio_clear_uptodate(folio); + folio_unlock(folio); } pr_alert_ratelimited("Read-error on swap-device\n"); } From patchwork Mon Jul 17 13:25:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 121327 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1121588vqt; Mon, 17 Jul 2023 06:46:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlFVIP3FicBynd99hwY/YTnPJi9kWWjlycpdExqV15zA6INLWS3DCa7lpW4sKibpBinpr7Fg X-Received: by 2002:a05:6a00:1492:b0:682:140c:245b with SMTP id v18-20020a056a00149200b00682140c245bmr12762793pfu.5.1689601615996; Mon, 17 Jul 2023 06:46:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689601615; cv=none; d=google.com; s=arc-20160816; b=sJ2+PAJO1UhxpKZi7HZ8iRj+9XVPsW6c2HnY9PaIjTrzI1oIpRaEcHTssGpV0vJHVd AXk7lWCxEJhaNRw0fyF29Bht2nfiVTZ0+IUKN92aeM3k5WcI0d8E9pE6hPDhWjsK7PID FrzHS+1uz8gXzlKeN7mmzTJDOuF9tfiYxXLmpzftcnMuWGLyALoPx3C+at2Isey2Ks8j SwF41FMrGR+zy/ncm1Om4ljarMpEadtI/VkR3LzhgI/1hkgGTaezCL1AVT+dQq4Xre+x UyYUmN5orha1SJLeURqQUvpLE1kyPbt5HZogLSLh9ARH0W4zxSWjlrQ1AuR1HSQSmP+k mxqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=1sq7sILf+rIS36Fm062bRML42UHcoJOwmUD0+cxBZK0=; fh=VDvXH+NlXsy4uKRcyz6yvnpRC6UQTLJqNZtREhJ4J58=; b=i60cqEaog8UffEXEeavRWhdtZGJoatnrm3/vTJsRJ1m9S7FGm0NDSnTtrcoDp/dekO VDLy6+DlvCoAdU1wFiPcDUI4ZEGk5m0qmHxchJhyKn/jsF1qyadMCSLnpfvYmV4M0TUH linRiFc0B8VoU+U8n9ove7BeunNkGWO8rG8yWvlUP3OqaFtST54nxLH2wAuhiSwOci8Z lxxbp630LttcvqBU+WcoCS/B9FxIQrJltn+eP9HDwkGaZ3nhonLo+I2ckHguDiZi2myX Y5NbGFr+ysFzL+GcDPfoSpaSPbr/ITdPBFwmuyDCviDRObmO87UTU+fESPeTkczXCF4G w/gg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y11-20020a056a00190b00b0065290aa261dsi11659647pfi.22.2023.07.17.06.46.42; Mon, 17 Jul 2023 06:46:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231638AbjGQN1b (ORCPT + 99 others); Mon, 17 Jul 2023 09:27:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231837AbjGQN06 (ORCPT ); Mon, 17 Jul 2023 09:26:58 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 817A38F for ; Mon, 17 Jul 2023 06:26:37 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4R4N701MT9zNmP6; Mon, 17 Jul 2023 21:22:52 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 17 Jul 2023 21:26:10 +0800 From: Peng Zhang To: , CC: , , , , , ZhangPeng Subject: [PATCH 3/6] mm/page_io: use a folio in swap_writepage_bdev_sync() Date: Mon, 17 Jul 2023 21:25:59 +0800 Message-ID: <20230717132602.2202147-4-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717132602.2202147-1-zhangpeng362@huawei.com> References: <20230717132602.2202147-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771675704302557798 X-GMAIL-MSGID: 1771675704302557798 From: ZhangPeng Saves one implicit call to compound_head(). Signed-off-by: ZhangPeng Reviewed-by: Matthew Wilcox (Oracle) --- mm/page_io.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 438d0c7c2194..f24f814b8dca 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -334,6 +334,7 @@ static void swap_writepage_bdev_sync(struct page *page, { struct bio_vec bv; struct bio bio; + struct folio *folio = page_folio(page); bio_init(&bio, sis->bdev, &bv, 1, REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc)); @@ -343,8 +344,8 @@ static void swap_writepage_bdev_sync(struct page *page, bio_associate_blkg_from_page(&bio, page); count_swpout_vm_event(page); - set_page_writeback(page); - unlock_page(page); + folio_start_writeback(folio); + folio_unlock(folio); submit_bio_wait(&bio); __end_swap_bio_write(&bio); From patchwork Mon Jul 17 13:26:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 121362 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1145251vqt; Mon, 17 Jul 2023 07:25:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlHHYKuG/nujB2yi2WxtZKNXk5aUR1+oJeuTiI/jjpHIkwXZGKT0WgimEXDayFfhOwsqsBXK X-Received: by 2002:a05:6a20:9144:b0:131:f504:a631 with SMTP id x4-20020a056a20914400b00131f504a631mr13678833pzc.51.1689603918602; Mon, 17 Jul 2023 07:25:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689603918; cv=none; d=google.com; s=arc-20160816; b=eP+c++gLb/zXfdsgr82QUzAEII6Z+Uqn4DLGXM2G1BMUt8PqnI4KA0icYfdNEEBY4M zW1CO9TlvBdLYcL5a9/grQuilxrAsPfrwxVxfUIxn0xU11KwWYvTCyJ2vUaWUtiqu0ip Xxe12YC5BTbuVCTgnEO68phKdw4ueDYp3/K9YVjyrCD/l7ZeNsj67c3NGgL7yrZDq/D4 MwC+oK9OD+zNRoCYo2Mc7pgzkedX6+RHzT4V+HRehcBmqOIPs87CgrR8OyZABIsMOMQB FBHLSGbZskRI7I6pKkPMlYmAHZChCfe9Og2r6i3TFSTM/tfB/JUWiJlcuGtmcjFz+JVs BBKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=z1m3qTju++wCcczvOgKEj14bvT/wRWlf9L7jQUe5zb0=; fh=VDvXH+NlXsy4uKRcyz6yvnpRC6UQTLJqNZtREhJ4J58=; b=F9+U5WaaUDdwL4/nQrvrxHmdCJ3KB99YhfeJ9LKgNbBeZptnkfhoBoS7mZKzu0dgTE WdRQprg+VBXM5bz/CHgcj4j5LJjyNxuN/YuWbtx/i+9bMwCO4RtOxux6XO13330O5xgo gmVNJKbu+kDNZLTH8PvS6lAFyHrq8f6z3MdxVpCLjb76ktkFdIn04nc8FtnJuZWdX1z2 iC0fI0r2+xdaO4GsBsAnv+kcGhriQ6JfcjNuVhobneNwCOkWFPVn9+aVOGbWi4GGTlCU uLlMsu3zuF6+cpjeDpSZIxzA8Cw2zDOzBo6Q1UY5g4j5FJF0nWJOz0aXGv3YLCgqqnDw WeeA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ds13-20020a056a004acd00b0067b2f265d2asi11540792pfb.262.2023.07.17.07.25.06; Mon, 17 Jul 2023 07:25:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230266AbjGQN10 (ORCPT + 99 others); Mon, 17 Jul 2023 09:27:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231844AbjGQN07 (ORCPT ); Mon, 17 Jul 2023 09:26:59 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE260BD for ; Mon, 17 Jul 2023 06:26:37 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R4NB16bzXzrRlh; Mon, 17 Jul 2023 21:25:29 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 17 Jul 2023 21:26:11 +0800 From: Peng Zhang To: , CC: , , , , , ZhangPeng Subject: [PATCH 4/6] mm/page_io: use a folio in swap_writepage_bdev_async() Date: Mon, 17 Jul 2023 21:26:00 +0800 Message-ID: <20230717132602.2202147-5-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717132602.2202147-1-zhangpeng362@huawei.com> References: <20230717132602.2202147-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771677497833463836 X-GMAIL-MSGID: 1771678118395181578 From: ZhangPeng Saves one implicit call to compound_head(). Signed-off-by: ZhangPeng --- mm/page_io.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index f24f814b8dca..84cc9e652451 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -355,6 +355,7 @@ static void swap_writepage_bdev_async(struct page *page, struct writeback_control *wbc, struct swap_info_struct *sis) { struct bio *bio; + struct folio *folio = page_folio(page); bio = bio_alloc(sis->bdev, 1, REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc), @@ -365,8 +366,8 @@ static void swap_writepage_bdev_async(struct page *page, bio_associate_blkg_from_page(bio, page); count_swpout_vm_event(page); - set_page_writeback(page); - unlock_page(page); + folio_start_writeback(folio); + folio_unlock(folio); submit_bio(bio); } From patchwork Mon Jul 17 13:26:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 121363 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1145435vqt; Mon, 17 Jul 2023 07:25:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlFX4zVaAE27hFDzeLnaqMlx5qs9zKwhNy6OBksSgqo/6qpTbFXGOc3SRATWIU/NpUVmXKGN X-Received: by 2002:a17:902:cec3:b0:1b7:e49f:1d with SMTP id d3-20020a170902cec300b001b7e49f001dmr11800386plg.62.1689603940201; Mon, 17 Jul 2023 07:25:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689603940; cv=none; d=google.com; s=arc-20160816; b=qiQhAQzqmnyPlAkgV1wzGobLzRdP+MJ/QWJg0w2A/HcGCdptOmL6IQy7As2UKF7V3M 7Ug7vZLWL9wUOCMxBt3qEdGk4TxhNgWyblfedFx19shWJ9dp+2ki2uzfDaoPpRPKkjnr o9STVf8+/EtKye5DiTINXNmzbDQ+42q76nhU2NR4Q1kxyK31QQxi0yWcQ17OpAfRi+MD x1VckiHf3C0T9gAnYyk2/ZlHIqjKKzP7YLSNevVaaAxzardOePlmprfViEBdFETHYw0e Prs1AksltVjpW8Jz5+2TOJM4+AmCiq4s+IQqO8lAzwJhlqXc9d73KDUQBq+bRwXRSqjD 5PEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=vJ+qedAJ3nl0orQtqLDDbaTMpVKcZimuaXBGhCdSkuU=; fh=VDvXH+NlXsy4uKRcyz6yvnpRC6UQTLJqNZtREhJ4J58=; b=B8nviYtgIBEdei6w5A6+wpBScLmKTMrbWVaH8L4X0+uKofYYe3sYbhuLxKEmxdINZh +WrpGBOJbbqW+UTl5PjOrW4BsJxbd0VKckm34b7Hcd5sjvpoBtm4GRUrqA6FMICz1K6o nnvmwRgNe8tpozgZBQL6LgVKIpNSWhz3fJrnPcF3/x/hE0L7KaOd3pEDlLVKq8yR8+BH T+CXW/OvBV+2PW8R6G218HGGChKnUu869vM3iesCcCR7bBdkLyTikED1t3wN6GidwBLl ejYkO0WPRr1fi9HdPgmjaT41dwdCvL8OhjdfdrGLwLXm2+EEeRC8oKbnX+oAvpOh4q9H dRsg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o11-20020a170902d4cb00b001b3dacdf717si5106048plg.608.2023.07.17.07.25.27; Mon, 17 Jul 2023 07:25:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231484AbjGQN1d (ORCPT + 99 others); Mon, 17 Jul 2023 09:27:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231737AbjGQN1A (ORCPT ); Mon, 17 Jul 2023 09:27:00 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 076322117 for ; Mon, 17 Jul 2023 06:26:40 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R4NB24P85zrRlt; Mon, 17 Jul 2023 21:25:30 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 17 Jul 2023 21:26:11 +0800 From: Peng Zhang To: , CC: , , , , , ZhangPeng Subject: [PATCH 5/6] mm/page_io: convert count_swpout_vm_event() to take in a folio Date: Mon, 17 Jul 2023 21:26:01 +0800 Message-ID: <20230717132602.2202147-6-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717132602.2202147-1-zhangpeng362@huawei.com> References: <20230717132602.2202147-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771677334579913390 X-GMAIL-MSGID: 1771678141177597330 From: ZhangPeng Convert count_swpout_vm_event() to take in a folio. We can remove five implicit calls to compound_head() by taking in a folio. Signed-off-by: ZhangPeng --- mm/page_io.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 84cc9e652451..66e8403bf96e 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -208,13 +208,13 @@ int swap_writepage(struct page *page, struct writeback_control *wbc) return 0; } -static inline void count_swpout_vm_event(struct page *page) +static inline void count_swpout_vm_event(struct folio *folio) { #ifdef CONFIG_TRANSPARENT_HUGEPAGE - if (unlikely(PageTransHuge(page))) + if (unlikely(folio_test_large(folio))) count_vm_event(THP_SWPOUT); #endif - count_vm_events(PSWPOUT, thp_nr_pages(page)); + count_vm_events(PSWPOUT, folio_nr_pages(folio)); } #if defined(CONFIG_MEMCG) && defined(CONFIG_BLK_CGROUP) @@ -283,7 +283,7 @@ static void sio_write_complete(struct kiocb *iocb, long ret) } } else { for (p = 0; p < sio->pages; p++) - count_swpout_vm_event(sio->bvec[p].bv_page); + count_swpout_vm_event(page_folio(sio->bvec[p].bv_page)); } for (p = 0; p < sio->pages; p++) @@ -342,7 +342,7 @@ static void swap_writepage_bdev_sync(struct page *page, __bio_add_page(&bio, page, thp_size(page), 0); bio_associate_blkg_from_page(&bio, page); - count_swpout_vm_event(page); + count_swpout_vm_event(folio); folio_start_writeback(folio); folio_unlock(folio); @@ -365,7 +365,7 @@ static void swap_writepage_bdev_async(struct page *page, __bio_add_page(bio, page, thp_size(page), 0); bio_associate_blkg_from_page(bio, page); - count_swpout_vm_event(page); + count_swpout_vm_event(folio); folio_start_writeback(folio); folio_unlock(folio); submit_bio(bio); From patchwork Mon Jul 17 13:26:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 121331 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1123484vqt; Mon, 17 Jul 2023 06:50:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlHx/k+m/29uWFwA2aBPUEnJ31ldHZYyKVTiI/v5w62iyQPHI4rkJ5mdBeQIyOOtLc9E79gM X-Received: by 2002:a05:6a00:392a:b0:67a:52a7:b278 with SMTP id fh42-20020a056a00392a00b0067a52a7b278mr12066184pfb.9.1689601843694; Mon, 17 Jul 2023 06:50:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689601843; cv=none; d=google.com; s=arc-20160816; b=NOd8PbFN5hv2hbJpt8C2pkxgn3suwzBAqDKbF8JSmmo4VF6PbUXF6J3DvrsewdQnma Nx0NRPXwTsu+N7ik1xh+fd+zPQqKdm8bxEuvJXkODdoxdI8J9R/rOseMGInEi8DL00uM DQLn9r2uifI9EnsH78As9+DPpFRl0P20kj3BKLrBaMfAq3VbByHDIEPcUZOfylMDS3Yh bfBX02fRW6qkNC7gTdZ9LR9nToZDow8cxlf7CNPigyjbrnreejFLFgoxxgj1ckawSroS sGLCwd1rff2jrIJ4d0/Rz22DS9seta9dSLTgpViJPMm4Rc3vKMmMkxDGOAwRcRaKRHZM hSEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=4sSpnbOCGI0f8tYl5oWsmEUitL7U2pCM9ujFaXA0EZk=; fh=VDvXH+NlXsy4uKRcyz6yvnpRC6UQTLJqNZtREhJ4J58=; b=tOUt43JnYLtElOiSA80/FQBBv7OPZ9JTzu7JmubCnabgI1wI/WqKAg/jCkO1mzbOWt 6mmk6ij6ZWgl1TJuQL/4ipktjmPJFXcDkshg16s+AgVnlumwc2sf4cWnuRXlRCSbflmV G1e+wkjyaMG5x9yJ5G10NIuBvpC/OCrOIYyhphrZBIAsjl7KiJT3f9QJsR1mHveBio+1 ebcHJPjMEi5HqkLktzsVnSO+/NpGo0aYEl3NG6rRlMEGR+0sglFiD2uccXd6Krx/Hypi xn5mUGfBXnC8le89KfmPZTbAhcZ1m9V5pKxPW6Xn+jJ8LIvUaL21qTZ6682pBIX+ynF8 SUlQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fd35-20020a056a002ea300b0067a39a4c158si11733590pfb.2.2023.07.17.06.50.30; Mon, 17 Jul 2023 06:50:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231712AbjGQN1f (ORCPT + 99 others); Mon, 17 Jul 2023 09:27:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230274AbjGQN1B (ORCPT ); Mon, 17 Jul 2023 09:27:01 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A330619B2 for ; Mon, 17 Jul 2023 06:26:40 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4R4NB406HGz18Lnb; Mon, 17 Jul 2023 21:25:31 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 17 Jul 2023 21:26:12 +0800 From: Peng Zhang To: , CC: , , , , , ZhangPeng Subject: [PATCH 6/6] mm/page_io: convert bio_associate_blkg_from_page() to take in a folio Date: Mon, 17 Jul 2023 21:26:02 +0800 Message-ID: <20230717132602.2202147-7-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230717132602.2202147-1-zhangpeng362@huawei.com> References: <20230717132602.2202147-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771675942868577916 X-GMAIL-MSGID: 1771675942868577916 From: ZhangPeng Convert bio_associate_blkg_from_page() to take in a folio. We can remove two implicit calls to compound_head() by taking in a folio. Signed-off-by: ZhangPeng Reviewed-by: Matthew Wilcox (Oracle) --- mm/page_io.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 66e8403bf96e..3c1fede46bd9 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -218,12 +218,12 @@ static inline void count_swpout_vm_event(struct folio *folio) } #if defined(CONFIG_MEMCG) && defined(CONFIG_BLK_CGROUP) -static void bio_associate_blkg_from_page(struct bio *bio, struct page *page) +static void bio_associate_blkg_from_page(struct bio *bio, struct folio *folio) { struct cgroup_subsys_state *css; struct mem_cgroup *memcg; - memcg = page_memcg(page); + memcg = folio_memcg(folio); if (!memcg) return; @@ -233,7 +233,7 @@ static void bio_associate_blkg_from_page(struct bio *bio, struct page *page) rcu_read_unlock(); } #else -#define bio_associate_blkg_from_page(bio, page) do { } while (0) +#define bio_associate_blkg_from_page(bio, folio) do { } while (0) #endif /* CONFIG_MEMCG && CONFIG_BLK_CGROUP */ struct swap_iocb { @@ -341,7 +341,7 @@ static void swap_writepage_bdev_sync(struct page *page, bio.bi_iter.bi_sector = swap_page_sector(page); __bio_add_page(&bio, page, thp_size(page), 0); - bio_associate_blkg_from_page(&bio, page); + bio_associate_blkg_from_page(&bio, folio); count_swpout_vm_event(folio); folio_start_writeback(folio); @@ -364,7 +364,7 @@ static void swap_writepage_bdev_async(struct page *page, bio->bi_end_io = end_swap_bio_write; __bio_add_page(bio, page, thp_size(page), 0); - bio_associate_blkg_from_page(bio, page); + bio_associate_blkg_from_page(bio, folio); count_swpout_vm_event(folio); folio_start_writeback(folio); folio_unlock(folio);