From patchwork Thu Jul 20 13:01:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 123258 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3104642vqt; Thu, 20 Jul 2023 06:08:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlE/yL1mRu4IdBIjmQFLUAAaZhoWD1njalsoV3etPoi8J3WqmpK0IRbUsPveHB5dNZvUoK/P X-Received: by 2002:a17:906:cc93:b0:993:d75b:63ea with SMTP id oq19-20020a170906cc9300b00993d75b63eamr4781874ejb.16.1689858498504; Thu, 20 Jul 2023 06:08:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689858498; cv=none; d=google.com; s=arc-20160816; b=06ajMuaGrAKpevFVJnEvdDe4gkOA4GdUF70utLuQXIJFxB1adrJbY2qrwrr6C9+v8s rg6y6ndL2VauXTQCaFpcEUK+aO6EFOX860KO9T8m3dPm50CDPvDCg1tJgBMEIPfYThjj Hwdy57j0EKEdddm/9FJSR6Yv9ZLU/pgtezV0nGhgMb2foNO6sOjONsBxlRUdAT4RL3X6 U2otGBE2qQC0G5ZkwQY+8ZyRRSWhggDtHfa9CPlVaWTYEWtSoWe03A1cb53KKVac7Tmb FtzmTFnIMpDiZ8yqtULNRCDA0LEnKF1YYIit/fGXz7Y1Q0nRm0nuHiU4l8PFSI8y9PJh 8TtA== 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=4t8XLJPyanjJPYKfxZvv1GZ4bOrqT8Oez47EILxWmoc=; fh=q8rOnvZaN5Z50YvgZS1uBArX5ZcEEwPcusRFazgmNUQ=; b=C3igkK2LtffxRgk8vOmbZzmLjBFUHeJ3IfFkhWKOuP5yEbbULwfR8rg3OfKkDTJZir BdQp67QVr/BWLKAPQmEgf9ch/IvEk0wdVq134bXegUNlQwU9Ki0HmqgefMhRItNZUvBB mnMACkmM4gy+af4DEry1muNcxfEVWfHM1Q0P2u5n5ZTpnJL/hBz9/yIGQabdVosYd6L/ kIms4X9b0yjMzpogDgnlE2cFiB1zC9c1LwHJCXV62XxPfGSD0uQ4XFAX22ud0VYHf9eH mm0hoj3RyHSXSN9NrmyR7TtFNKfqSh9GXsTJg5nWl/vlkpKq5kX8Gl9u6TyZUGT1ZvGQ /2Ow== 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 o17-20020a170906861100b0098e08768a43si591370ejx.408.2023.07.20.06.07.47; Thu, 20 Jul 2023 06:08: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 S231528AbjGTNCp (ORCPT + 99 others); Thu, 20 Jul 2023 09:02:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231454AbjGTNC0 (ORCPT ); Thu, 20 Jul 2023 09:02:26 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12A1C269F for ; Thu, 20 Jul 2023 06:02:25 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R6CW44vcBzrRqs; Thu, 20 Jul 2023 21:01:36 +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; Thu, 20 Jul 2023 21:02:21 +0800 From: Peng Zhang To: , , CC: , , , , , ZhangPeng Subject: [PATCH v3 10/10] mm/page_io: convert bio_associate_blkg_from_page() to take in a folio Date: Thu, 20 Jul 2023 21:01:47 +0800 Message-ID: <20230720130147.4071649-11-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230720130147.4071649-1-zhangpeng362@huawei.com> References: <20230720130147.4071649-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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: 1771945064645494258 X-GMAIL-MSGID: 1771945064645494258 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 da3f38404585..cc2503bd511a 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -213,12 +213,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; @@ -228,7 +228,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 { @@ -336,7 +336,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); @@ -359,7 +359,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);