From patchwork Wed Jul 19 09:58: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: 122502 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2326318vqt; Wed, 19 Jul 2023 03:05:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlHoLlwDwD5meo9vTwcmXpTPz68tl8FNzaz45etAa1n9ROtseErNYsS2ChobOuA9zzzi9sZ7 X-Received: by 2002:a17:903:2449:b0:1b8:9b1d:d7fa with SMTP id l9-20020a170903244900b001b89b1dd7famr17283912pls.59.1689761148802; Wed, 19 Jul 2023 03:05:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689761148; cv=none; d=google.com; s=arc-20160816; b=Vgwl4puEPoIX3na3hp7scOEh5QDTVKfgECM5cwb/ndc98yAIdLCHsUP0op0f0HriAr EkWDlGQSfHyFHgsgzMpJMRyPHehRCDvg2eZzFJGKCO4in7Z4A5sss3cDo/yzPnWbTI3g fyCJZJ3KUM5g3OSs3X6gsXnCqXU62N0TB6PCAX0Q86GFhcEMqgUAcgaCLxnfMsFRos/k qhMmBecSjd+wVPGoZ5xf+ni+9zOzzBmCDippRyI+d0B+3AI39eyfzao8642/IFABepzE UH446EiND1NZra3ZI7GvktjqdOQj4OPjzJkOKznS3/AUfKCxewaO81MJloTd+5jmyNyE RD2Q== 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=h0zgsx3kKMFpGJVNCTy73NxTaUsiGD9mJb5htLkWjOM=; fh=fQ8bSAglEIUMWaW8g2fbwjC8kqQICqHTc4sMCYJe224=; b=najHAz0umBmje8hW2oKKkvszq5UAMOVdoHZ2hqbwo7e5Px6afRcDUI3jYhnItpkeHN w/UOgW4031sQMcaNCMFJCNd45OBP4lUksuNSDdk1wHhp6hkMg4OwwNQMi9wbccklcpOu vvzN7hsWbYW6Cw1EdqyYiRkRr9KKDw4HrFuE9FDqez+LbkZ4Kc2Ji5UmB3swy4ti+Mqz K3HY0SFaDY1XJXsIJnyF+cbt/G8MCiUOtQ3aXluiuGx7RyrlYBFjzrWh+GbjqHNWw1xZ PgjQsXjeebZsM41PfCIuTwY8fIcrZRS1SnSa/Ps8KbktRXFgh74kVeSmDGJX6MZw4Rgo V59Q== 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 q11-20020a170903204b00b001ae42afbf93si3122998pla.450.2023.07.19.03.05.34; Wed, 19 Jul 2023 03:05:48 -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 S230516AbjGSJ7m (ORCPT + 99 others); Wed, 19 Jul 2023 05:59:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230344AbjGSJ7D (ORCPT ); Wed, 19 Jul 2023 05:59:03 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D72E9E69 for ; Wed, 19 Jul 2023 02:59:01 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R5WRF2wptztRbR; Wed, 19 Jul 2023 17:55:53 +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; Wed, 19 Jul 2023 17:58:59 +0800 From: Peng Zhang To: , , CC: , , , , ZhangPeng Subject: [PATCH v2 8/9] mm/page_io: convert count_swpout_vm_event() to take in a folio Date: Wed, 19 Jul 2023 17:58:47 +0800 Message-ID: <20230719095848.3422629-9-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230719095848.3422629-1-zhangpeng362@huawei.com> References: <20230719095848.3422629-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=-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: 1771842986368077186 X-GMAIL-MSGID: 1771842986368077186 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 e28395331bb0..fa8caf1c05d8 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -205,13 +205,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_pmd_mappable(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) @@ -280,7 +280,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++) @@ -339,7 +339,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); @@ -362,7 +362,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);