From patchwork Wed Jul 19 09:58:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 122497 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2325772vqt; Wed, 19 Jul 2023 03:04:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlEIsFNhgyUg9RTesNfveQPQtBZNLRwnxv0GUHF1Gv+LJ7PuwP2bvRy3CuKSBMaiCF79noMA X-Received: by 2002:a05:6a00:803:b0:668:82fe:16f1 with SMTP id m3-20020a056a00080300b0066882fe16f1mr2903242pfk.1.1689761094500; Wed, 19 Jul 2023 03:04:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689761094; cv=none; d=google.com; s=arc-20160816; b=xfDH1O1IogUnk5RjyM34LloPF/bpXZ6piHYDW9bTSrNKL/6s2sTRBtdn/f8o5Ebh9V r1aJNg/nMK17QOiu8ndTQmEfoI6mN8H8qoK5HyFzKNWiAqfGd0iiztD48zf+z8uZolR+ mpjGNc1+O1P7eeLo7Sms7InESGqJaff+sw6NlcuzTc5X6mL1LcqNx/841rHcFZiF+sgY cV+k2zXjp6fhj9cs8jntCPN3sxVEh4XE4ud8zFxmQAVILfJnweAJuMpBKB8o4O893Srg RCvGI2WN6M6J2P/fmoAs9/PhR8iTugtOXXGX8EoPRkaC4Lhgq/2uFDa41lpnaeFJKkI0 LPvQ== 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=pYlzkQAdk4AUL+lQrQcLU4TJsQEB6E3ePvUtD+d2i7U=; fh=fQ8bSAglEIUMWaW8g2fbwjC8kqQICqHTc4sMCYJe224=; b=xgnLRq+NplPmsS/4FuLcMkNdZ9oEAWEUv+tjwg43/tt2t56BRTuG1AiYjVTdLXf71O tUKH+Gg5rmtKLmItSVn/0wSFHWs+2AFNMhJHi9lhTkuXQzkf+Bz1mAO9BWkj0+NMHBE2 kgrUKC9TIkJvgo/cUGmZDyoVCoPFaUnuh1+dqeDtrdcJvQow+OpdVWUiWkUAOolPDehI 0lHz3mXc3jw6+PZjkLJDwlOHh2uWM2buYEdTaj2FjUdcKGSm5GoTOPLRrrAIPQCKWRW8 ba4o4dh742G+OHcPnaMC66USWi8xgkJ8M8AfR27sLEMWKWMtJ34k0+UhlGPlCx1ihacC 98CA== 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 r4-20020a63ec44000000b0055ffed935fbsi3067838pgj.393.2023.07.19.03.04.40; Wed, 19 Jul 2023 03:04:54 -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 S230317AbjGSJ7A (ORCPT + 99 others); Wed, 19 Jul 2023 05:59:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbjGSJ65 (ORCPT ); Wed, 19 Jul 2023 05:58:57 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5C101BFD for ; Wed, 19 Jul 2023 02:58:56 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4R5WQv0tvZzNmSH; Wed, 19 Jul 2023 17:55:35 +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:54 +0800 From: Peng Zhang To: , , CC: , , , , ZhangPeng Subject: [PATCH v2 1/9] mm/page_io: remove unneeded ClearPageUptodate() Date: Wed, 19 Jul 2023 17:58:40 +0800 Message-ID: <20230719095848.3422629-2-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: 1771842929147025255 X-GMAIL-MSGID: 1771842929147025255 From: ZhangPeng The VM_BUG_ON_FOLIO in swap_readpage() ensures that the page is already !uptodate in __end_swap_bio_read() and sio_read_complete(). Just remove unneeded ClearPageUptodate(). Suggested-by: Matthew Wilcox (Oracle) Signed-off-by: ZhangPeng --- mm/page_io.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 8741d3a0d48a..3087a69a014b 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -62,7 +62,6 @@ static void __end_swap_bio_read(struct bio *bio) if (bio->bi_status) { SetPageError(page); - ClearPageUptodate(page); 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); @@ -417,7 +416,6 @@ static void sio_read_complete(struct kiocb *iocb, long ret) struct page *page = sio->bvec[p].bv_page; SetPageError(page); - ClearPageUptodate(page); unlock_page(page); } pr_alert_ratelimited("Read-error on swap-device\n"); From patchwork Wed Jul 19 09:58:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 122499 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2326077vqt; Wed, 19 Jul 2023 03:05:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlG3tUns744K8WsQoe2j3CztP0SQP2l3kuYCimjdf+PeMMJucZRXNV7qCUgufP/Re8BJC629 X-Received: by 2002:a05:6a00:c82:b0:673:aca1:a0b0 with SMTP id a2-20020a056a000c8200b00673aca1a0b0mr24127386pfv.3.1689761128514; Wed, 19 Jul 2023 03:05:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689761128; cv=none; d=google.com; s=arc-20160816; b=Sf2Qjfpep5k5EkvJ/VU81ozCE1SQ1uZUelnxfwO8Eno0pqZtf/YQBS9YisxV77TQFp HVA/5e6n5bku5XeTSYbj6ZO7AJbP3cYBGoQ6rrBAlfqdhByzht36sUnIqfraIJ4p6zd4 GA5Agz9kqvSerMynpfssrHO+kn552Ao9ZXhQWWH/NUw0jsQOpD+wSBH4ptlMvHdAbvnx kbQp0VxjMMeZPDDe18ccAnbt4hED+GUtmcYhwx1Evz5yf63tFb9U+YCQAW4y+OPqeqv5 eZeW0QJZTrYkvz2bwKidkpAGiugN5e4Am6XM7APYRxtLNdiU2PQQwhjGMx7WuzNqR28r lJvg== 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=wN9Jy/8pPyEHOuZ2Lb/sCQ9C45wtfFLi31VZgiAcDtY=; fh=fQ8bSAglEIUMWaW8g2fbwjC8kqQICqHTc4sMCYJe224=; b=VeKFLXqqEOnPt4hPjTMsPkhkGeH0P1jKci6aScxFPFG9i4H3Ndw+vbL81SAIIYksF2 HVi91H6UPtLA3QkF9gIAnhrmGZaW3NTdYJ25jQ+vIzhkjaOA7wAUwkC/+/odgQD9V5JM gwcrOjEMF9z3hHIqeqwhx0PJBdQhk1yXWwJ0kgtXD6LI1dbIzl/whsGmQwgBjHgLR9Vw a9t/eatPTLmVHUSMk/sPMtdgeB3hP9V1869//HuQE107zselVLSp+SolQf9747TXAph/ 7BOLVnj9z6urZrhQINxm1PuA22z1OoBvkLUbYQnvY2WwYu1Bi7Dw1PWk6Eq0vecs4z/O UJ1A== 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 j38-20020a632326000000b005533f397576si3137459pgj.46.2023.07.19.03.05.15; Wed, 19 Jul 2023 03:05:28 -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 S230348AbjGSJ7D (ORCPT + 99 others); Wed, 19 Jul 2023 05:59:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230004AbjGSJ66 (ORCPT ); Wed, 19 Jul 2023 05:58:58 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54FDE10D4 for ; Wed, 19 Jul 2023 02:58:57 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4R5WQv5t2TzNmPb; Wed, 19 Jul 2023 17:55:35 +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:54 +0800 From: Peng Zhang To: , , CC: , , , , ZhangPeng Subject: [PATCH v2 2/9] mm/page_io: remove unneeded SetPageError() Date: Wed, 19 Jul 2023 17:58:41 +0800 Message-ID: <20230719095848.3422629-3-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: 1771842965416723784 X-GMAIL-MSGID: 1771842965416723784 From: ZhangPeng Nobody checks the PageError()/folio_test_error() for the page/folio in __end_swap_bio_read/write() and sio_write_complete(). Therefore, we don't need to set the error flag. Just drop it. Suggested-by: Matthew Wilcox (Oracle) Signed-off-by: ZhangPeng --- mm/page_io.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index 3087a69a014b..5ddb5d9c5013 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -32,7 +32,6 @@ static void __end_swap_bio_write(struct bio *bio) struct page *page = bio_first_page_all(bio); if (bio->bi_status) { - SetPageError(page); /* * We failed to write the page out to swap-space. * Re-dirty the page in order to avoid it being reclaimed. @@ -61,7 +60,6 @@ static void __end_swap_bio_read(struct bio *bio) struct page *page = bio_first_page_all(bio); if (bio->bi_status) { - SetPageError(page); 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); @@ -415,7 +413,6 @@ static void sio_read_complete(struct kiocb *iocb, long ret) for (p = 0; p < sio->pages; p++) { struct page *page = sio->bvec[p].bv_page; - SetPageError(page); unlock_page(page); } pr_alert_ratelimited("Read-error on swap-device\n"); From patchwork Wed Jul 19 09:58:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 122500 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2326116vqt; Wed, 19 Jul 2023 03:05:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlHNkt6ornCxpLRkNijrXeG0iLVN9hpYVPMbZGCnvadU9wKomeA4okXw20faF3Fuprc1m/j/ X-Received: by 2002:a17:906:7791:b0:994:1806:fb96 with SMTP id s17-20020a170906779100b009941806fb96mr2171454ejm.16.1689761132325; Wed, 19 Jul 2023 03:05:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689761132; cv=none; d=google.com; s=arc-20160816; b=VsmOkbHkyKfJ9JW/LuWfJghMFmg8XQpz933sH0Jb1tr6ZhFCJ+XBDtcmJTayHTM8NP rOTQwXMF85r/I0IbsXgRDM28UUw4HGiYcLIaeSRYFSqHcXIpb62R4GpEOChvDq6v+l2C V26jglI99yTTeLgWti55xns0SDJ0FCfD+NqIUctQTrT3W9lj5qcSVueuE7Rf07HC2D7E NcmrWdBhcMQZgxchoOnG03Axzje1lhmLWXOJJyhM1LTaJN9nn2iAaE+nVyauVwogzjMe 1RdUG2dEmGiCRaBPCxbizkxFSfd6jWP4Mk9YW8GKhaVxCWX+6CNqavBd7c1jVIvpJKgZ c2Sg== 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=JkdEw75PGEAD1hzTApmf9Om0rkylUsU2dhCGnIkdYhw=; fh=fQ8bSAglEIUMWaW8g2fbwjC8kqQICqHTc4sMCYJe224=; b=HTlz0dUUvsLwR8iflQGZeXz/O9pmR5+vE3lkcrWUtH5qYryyYBo5e039eLS2o0j1cz Fa0Vwa1lMD70hWE7vxQS8ePO+CI151FHEP7rxDZoED3ls3Exor9WYphZLc4992dzGCxW +4LVTYcxyfUIweNM86fxoe/Zz4XLMKk0WESIFfhXmihMbnpENv+zD59eWsCyrHJHHtE+ uqrCUpjKSbYqXi3vveFdScTSQ4k925SgXEKP/kRkukCfr1Ix2nHUqHzZPmqi/kwt/RBX dywD6KGZD98154sfNrBzXerbtTpW3qCR/rHbN3Pc0+WeXCAHdzSEu6pXX4voJwvUhrMP FmOA== 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 j9-20020a170906254900b00993860a6d3csi2544171ejb.81.2023.07.19.03.05.07; Wed, 19 Jul 2023 03:05:32 -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 S229596AbjGSJ7a (ORCPT + 99 others); Wed, 19 Jul 2023 05:59:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230041AbjGSJ67 (ORCPT ); Wed, 19 Jul 2023 05:58:59 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52AE7EC for ; Wed, 19 Jul 2023 02:58:58 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4R5WRw64D0zLnrr; Wed, 19 Jul 2023 17:56:28 +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:55 +0800 From: Peng Zhang To: , , CC: , , , , ZhangPeng Subject: [PATCH v2 3/9] mm/page_io: convert bio_first_page_all() to bio_first_folio_all() Date: Wed, 19 Jul 2023 17:58:42 +0800 Message-ID: <20230719095848.3422629-4-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,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: 1771842968841679710 X-GMAIL-MSGID: 1771842968841679710 From: ZhangPeng Convert bio_first_page_all() to bio_first_folio_all() to return a folio, which makes it easier to use. Suggested-by: Matthew Wilcox (Oracle) Signed-off-by: ZhangPeng --- Documentation/block/biovecs.rst | 2 +- drivers/block/drbd/drbd_bitmap.c | 2 +- fs/f2fs/data.c | 2 +- include/linux/bio.h | 4 ++-- kernel/power/swap.c | 2 +- mm/page_io.c | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/block/biovecs.rst b/Documentation/block/biovecs.rst index ddb867e0185b..258f6faed333 100644 --- a/Documentation/block/biovecs.rst +++ b/Documentation/block/biovecs.rst @@ -133,7 +133,7 @@ Usage of helpers: bio_for_each_segment_all() bio_for_each_bvec_all() bio_first_bvec_all() - bio_first_page_all() + bio_first_folio_all() bio_last_bvec_all() * The following helpers iterate over single-page segment. The passed 'struct diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c index 85ca000a0564..ce1a07ba85ff 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c @@ -939,7 +939,7 @@ static void drbd_bm_endio(struct bio *bio) struct drbd_bm_aio_ctx *ctx = bio->bi_private; struct drbd_device *device = ctx->device; struct drbd_bitmap *b = device->bitmap; - unsigned int idx = bm_page_to_idx(bio_first_page_all(bio)); + unsigned int idx = bm_page_to_idx(&bio_first_folio_all(bio)->page); if ((ctx->flags & BM_AIO_COPY_PAGES) == 0 && !bm_test_page_unchanged(b->bm_pages[idx])) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 5882afe71d82..6706858de984 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -288,7 +288,7 @@ static void f2fs_post_read_work(struct work_struct *work) static void f2fs_read_end_io(struct bio *bio) { - struct f2fs_sb_info *sbi = F2FS_P_SB(bio_first_page_all(bio)); + struct f2fs_sb_info *sbi = F2FS_P_SB(&bio_first_folio_all(bio)->page); struct bio_post_read_ctx *ctx; bool intask = in_task(); diff --git a/include/linux/bio.h b/include/linux/bio.h index c4f5b5228105..7d2979d24530 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -248,9 +248,9 @@ static inline struct bio_vec *bio_first_bvec_all(struct bio *bio) return bio->bi_io_vec; } -static inline struct page *bio_first_page_all(struct bio *bio) +static inline struct folio *bio_first_folio_all(struct bio *bio) { - return bio_first_bvec_all(bio)->bv_page; + return page_folio(bio_first_bvec_all(bio)->bv_page); } static inline struct bio_vec *bio_last_bvec_all(struct bio *bio) diff --git a/kernel/power/swap.c b/kernel/power/swap.c index f6ebcd00c410..2796ce48ca4b 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -247,7 +247,7 @@ static void hib_finish_batch(struct hib_bio_batch *hb) static void hib_end_io(struct bio *bio) { struct hib_bio_batch *hb = bio->bi_private; - struct page *page = bio_first_page_all(bio); + struct page *page = &bio_first_folio_all(bio)->page; if (bio->bi_status) { pr_alert("Read-error on swap-device (%u:%u:%Lu)\n", diff --git a/mm/page_io.c b/mm/page_io.c index 5ddb5d9c5013..e21d570c873d 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -29,7 +29,7 @@ static void __end_swap_bio_write(struct bio *bio) { - struct page *page = bio_first_page_all(bio); + struct page *page = &bio_first_folio_all(bio)->page; if (bio->bi_status) { /* @@ -57,7 +57,7 @@ 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 page *page = &bio_first_folio_all(bio)->page; if (bio->bi_status) { pr_alert_ratelimited("Read-error on swap-device (%u:%u:%llu)\n", From patchwork Wed Jul 19 09:58:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 122503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2326339vqt; Wed, 19 Jul 2023 03:05:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlFs5F0/Qrc27wMIGNryBM9Zm8hxaGCn/m1asgYVWkFMMadGOCwVZ8Q6Eri4vmsOYv3DHtDn X-Received: by 2002:a17:90a:1610:b0:263:161c:9e9a with SMTP id n16-20020a17090a161000b00263161c9e9amr15752422pja.6.1689761151160; Wed, 19 Jul 2023 03:05:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689761151; cv=none; d=google.com; s=arc-20160816; b=Pcet+KfOmaOIkAyZTpwQyKxPz3x8WSIkTIOX/NBe24e9XYwEa3zhQkeOrRWhcPFIjv VUY1w4gG9m6qWLTgv0LP9+GxoZl3pj3gkiaEKOcKtItFV6Gb92kqBgZuphZCdGT3fFzY SF4mGxn3r2nBUBRGrwByLDWMHsolPtqjjl+hr+x9XO+YXLU7SiqAcokMDteQUGEISvzz DWrfMtKm/d3Nw8eiJcj6JMVqNUtEUba/oKauxPxPEWiwaJw/e6QDc3Ql3Y25f2GWWiJZ kG7V1fUe56m9IMV5hngR8VNxTf6vJk4dcpPGrvt8NTE9nm4pBpMKPPLj9EwXR5up+3wF 2VHQ== 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=8pEhW7UStfxXp+iiPvwXWB0BJn1hLUjlYFivcxoOpKU=; fh=fQ8bSAglEIUMWaW8g2fbwjC8kqQICqHTc4sMCYJe224=; b=FICmemLE5gnAphBVLos+IeSTS+TAdzyiWSgy0K5ZTViDbCq97oPsXs704tyTheCBti WVCSPcHsqM4f29/GRXn6ZaTDQbpdyYOlWbBeEsmX1ZA+fDym8ECbWS3hnH95x7E8bsC4 /Al/CqCZlUg8ja+nleX24uRMJNvNrwTwD618Dg+mayhZtW6HzA4wXp6DxEp9iZ3nvpH/ R8W4qbzbiN3EDYO8ujtLfVvzWmxRZAqKDAUBHQymPDcXZnoJr+0dJais0kHvSpyWlM9g M8vzxm6Zgtr9f/mar7Rb1FGZLqkw2vSgeKEf9Notscs9/PE1SMjoKDv4R3IkEHrYd9IC yYOQ== 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 nn4-20020a17090b38c400b00265b7cc355csi1152634pjb.106.2023.07.19.03.05.38; Wed, 19 Jul 2023 03:05:51 -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 S230381AbjGSJ7g (ORCPT + 99 others); Wed, 19 Jul 2023 05:59:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230228AbjGSJ7A (ORCPT ); Wed, 19 Jul 2023 05:59:00 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D10210D4 for ; Wed, 19 Jul 2023 02:58:59 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R5WRB2t8dztR9M; Wed, 19 Jul 2023 17:55:50 +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:56 +0800 From: Peng Zhang To: , , CC: , , , , ZhangPeng Subject: [PATCH v2 4/9] mm/page_io: use a folio in __end_swap_bio_read() Date: Wed, 19 Jul 2023 17:58:43 +0800 Message-ID: <20230719095848.3422629-5-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: 1771842989016374733 X-GMAIL-MSGID: 1771842989016374733 From: ZhangPeng Saves one implicit call to compound_head(). Signed-off-by: ZhangPeng --- mm/page_io.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index e21d570c873d..6520687bd282 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -57,16 +57,16 @@ static void end_swap_bio_write(struct bio *bio) static void __end_swap_bio_read(struct bio *bio) { - struct page *page = &bio_first_folio_all(bio)->page; + struct folio *folio = bio_first_folio_all(bio); if (bio->bi_status) { 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 Wed Jul 19 09:58:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 122514 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2331908vqt; Wed, 19 Jul 2023 03:17:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlFaXWzzo+mZ2WNbrCDf207KsqaAS5fSKpnJOpigDxzFFZNtRoz/z+VLjstMgwRP5QF8H0SW X-Received: by 2002:a17:906:51ca:b0:994:1fee:3066 with SMTP id v10-20020a17090651ca00b009941fee3066mr2250725ejk.15.1689761824373; Wed, 19 Jul 2023 03:17:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689761824; cv=none; d=google.com; s=arc-20160816; b=OIiAs9PvHGMbMODzpk3yy0jmMpqG8F+HQKi0g3CJh3apigQ+0Yd+69CE6/+7TrY7AL aQGrE5wxYOtAcF9oQ+Cfa2CPxlgRFzy2WZXVIypqvHSaXdUc7jBlt4zp1K7r+VlLj+Dy Yk2LmEX5DKAon9mLvTkaUtsKx6iE5urIuwoLLviR2WSpNXpAXsYzZe0BtNQ+Vkpd1bde +5oy/lSM2zfAQI9dpthi5tEjJ5j0C6Waujq8nkvTZs36R9BXT5Ij05nM1Kv6M1Ur2QW+ NCiqkS6NJiu+hnUqcX+sgCX3oSKjLzirqhWhnTm4h57a/Qa6ov3VmCs65w1ukAU1ze3K diIw== 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=7iJ8RQalvU29tR6/0DVQL0+l89i13Wo4PPDJ7dZu1gI=; fh=fQ8bSAglEIUMWaW8g2fbwjC8kqQICqHTc4sMCYJe224=; b=JfkkKktBWFYybadSKbo5cwRyNBg0IX3ieaxNA50NEnQ7ZyNkNVojnBPyUvIPU2tcpM wgYEMNDGA9CZNBuHSKiTWUPKrkrwe45pdEM9i3RejIhM/d77v2On2HwK/07cVideFJ9s OhEc3iTe4JQAWZ6kwxMeZ41OfWN4d3xomaEH8PzhiXTF5K/sowiJoqb3XfYJzNyzS7ge k4EAVdrn8zG2erI/gjREBI2vB6+j2ZIo3wotOrQNhI5j8TQmtLtFuusmiAttfsAR/kgU kcHS8A/hCbpF8541HI9xyjFRrlKGt4wvao+sNgfVUQ7DeyMpgWdrj1ZQyXjyWL0lqPSG lFkw== 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 a22-20020a170906275600b0098948181213si2510001ejd.399.2023.07.19.03.16.40; Wed, 19 Jul 2023 03:17:04 -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 S230367AbjGSJ7e (ORCPT + 99 others); Wed, 19 Jul 2023 05:59:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230308AbjGSJ7A (ORCPT ); Wed, 19 Jul 2023 05:59:00 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 898911715 for ; Wed, 19 Jul 2023 02:58:59 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R5WRC0MkCztQlV; Wed, 19 Jul 2023 17:55:51 +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:57 +0800 From: Peng Zhang To: , , CC: , , , , ZhangPeng Subject: [PATCH v2 5/9] mm/page_io: use a folio in sio_read_complete() Date: Wed, 19 Jul 2023 17:58:44 +0800 Message-ID: <20230719095848.3422629-6-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: 1771843694957919539 X-GMAIL-MSGID: 1771843694957919539 From: ZhangPeng Saves one 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 6520687bd282..92f21f380ee8 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -403,17 +403,17 @@ 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); - unlock_page(page); + folio_unlock(folio); } pr_alert_ratelimited("Read-error on swap-device\n"); } From patchwork Wed Jul 19 09:58:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 122504 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2327678vqt; Wed, 19 Jul 2023 03:08:21 -0700 (PDT) X-Google-Smtp-Source: APBJJlG3WQfwjC/ArHf4BZgZZtH/VTjppAoEdT3nT3BgKZGWbe1l+693LykkfUxthgio1ByGi6My X-Received: by 2002:a05:6358:590e:b0:135:24ed:5106 with SMTP id g14-20020a056358590e00b0013524ed5106mr7119651rwf.9.1689761300799; Wed, 19 Jul 2023 03:08:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689761300; cv=none; d=google.com; s=arc-20160816; b=QDSopxC3P7Ma07wrQ89v0eldfIX3BcEeObN7ofIP39+m5XCdu2UzKMbvb08AKjkijs ckMhEDTjNnPnQQrKRfSFVMmtI1XE8VyH7da3jZ5nkdAW9rYhwJYMlf8mclPdUr2NcUMd iGmugMVvGeimWEz8Gxgd+fmYRGthcgAW9l99WgN6T/f+vJGb0axVDmdx6kAtT0+Uw0DP HQ6YBvxVfEayrKW8IonabPk0+9PxwrwmmGGvQM1aB91pTd9VWdTu2ybgpTAN3bIcHCxQ 5p4UEp/UBeNubPij/P4paYYqfm1VQt3fD+dNk3a8D3EnDDyVo/5faKn00qtM1q+SPP18 1LNA== 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=05tbuRnTFRinPzP93Bz+bXGAm8DHGnIQ7HSd5f8g8RQ=; fh=fQ8bSAglEIUMWaW8g2fbwjC8kqQICqHTc4sMCYJe224=; b=XUVQpTk/gDm1RrEINk+3YhJgzi1fYLlvksPDGIQ2QbqQRGpMvlMrmgr8xapMbqn5RZ /b9oW7zVtxUvJHm/u5NR1FO7U7076jbcXvbx3cN2dAMdQbVm024yFuW4mmXKjPXt5jkO KadAve2MaYbKcP3gz/6kAwLbAoOilLSnsMJwa02IjMx7fnhiC74FlcoTwgGlKye8C6IZ Q1dMS/n0+3UT82sQiC5A5IDYOpVCZuFQI3DlR/x04cMGwgx+obcxkelwXaLLPhNOiYtX YNcCq7yZQOzW3nLmldUzLQ9jQNL5I/MR32s31z4wJY81erV3YGtyd7kv1SmGkm/aGu78 ahBw== 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 15-20020a630e4f000000b00543a6cc74bfsi2674228pgo.634.2023.07.19.03.07.48; Wed, 19 Jul 2023 03:08:20 -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 S230463AbjGSJ7i (ORCPT + 99 others); Wed, 19 Jul 2023 05:59:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230320AbjGSJ7B (ORCPT ); Wed, 19 Jul 2023 05:59:01 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F2D41BFD for ; Wed, 19 Jul 2023 02:59:00 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4R5WRy72ngzLnsB; Wed, 19 Jul 2023 17:56: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; Wed, 19 Jul 2023 17:58:57 +0800 From: Peng Zhang To: , , CC: , , , , ZhangPeng Subject: [PATCH v2 6/9] mm/page_io: use a folio in swap_writepage_bdev_sync() Date: Wed, 19 Jul 2023 17:58:45 +0800 Message-ID: <20230719095848.3422629-7-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,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: 1771843145727689148 X-GMAIL-MSGID: 1771843145727689148 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 92f21f380ee8..0c96ea9dd258 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -331,6 +331,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)); @@ -340,8 +341,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 Wed Jul 19 09:58:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 122510 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2331040vqt; Wed, 19 Jul 2023 03:15:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlH4xfr9EO5q7evtaocPyKQOJHpvJA/KXgSPckH3yxJMr8pvQSJ9H7dbSC9ZQPLzhzq847zz X-Received: by 2002:a17:907:7f10:b0:973:d1ce:dbe8 with SMTP id qf16-20020a1709077f1000b00973d1cedbe8mr1816017ejc.46.1689761717970; Wed, 19 Jul 2023 03:15:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689761717; cv=none; d=google.com; s=arc-20160816; b=RDJouwFuVFrzedp7A0Ws9cmAE/plluvompNORullBRuyRLt4jn2imQAUizXb/PBB7k BHKLMkHA7HhC0TS2GP6yi6iYIQ2aOp9Blpg2nHTd+S6ojdzdwjRSjKgvHMqWcLJ81KPq +YyH3HDhoc8C5Sp5yMPCn4MbuNfMchf9ZVxeKWk6bhrPp6mOZ0FKIBk5GwUoMPQYpUM5 L6e1bkGm77Gp2QwXhQRpF/VlhhYQBGDyrU6TATrbOwPThIyO5mEV/3GACdy2JNcGxXUd BWZ+Du0G2ho2If67EnjEcdr3mGqbGZ7rjpucYf2IjLH4AE/Z8QJ6y/P3ketE8QyaIsEQ ZO0A== 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=UVTGk7uE48dHWx0qiOUJ1sysC+jsNAeG55w6ywd1FnI=; fh=fQ8bSAglEIUMWaW8g2fbwjC8kqQICqHTc4sMCYJe224=; b=WbWYULbMZYxJWU/n+hL5Fjsrrp5j8EEMQZ8muw7ChMyONhMa/9MJBOHBPrf/JfJX0n 5QhujnnQ+/v0cRs+NEgMd5EFgRB3IwXl3SfEBQPq2BCtgsRxGb8zWceoXhj/zGkt26g0 cwyi1sHh24rTAD9debdzr0oHJ+opmtpijwYcxuytzjchLo5NSXcUCEpngTpVaacTQF3r MvBKmFMBGSaUVaieFuldQhYK1KML7/YFNl5Xo9v9Wyagz8NNaMXHRQK284Pew5u0AbpD 2PofmhDNtBxw+OhLHjaq6/VtXrq1r0fWzpRE6N98msjM4rJj01umghWSim7o9u6humHJ fSkw== 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 j21-20020a170906051500b00993116b01f9si2632507eja.120.2023.07.19.03.14.52; Wed, 19 Jul 2023 03:15:17 -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 S230480AbjGSJ7j (ORCPT + 99 others); Wed, 19 Jul 2023 05:59:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230346AbjGSJ7D (ORCPT ); Wed, 19 Jul 2023 05:59:03 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 235B91BFD for ; Wed, 19 Jul 2023 02:59:02 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4R5WTz42kTz18LrV; Wed, 19 Jul 2023 17:58:15 +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:58 +0800 From: Peng Zhang To: , , CC: , , , , ZhangPeng Subject: [PATCH v2 7/9] mm/page_io: use a folio in swap_writepage_bdev_async() Date: Wed, 19 Jul 2023 17:58:46 +0800 Message-ID: <20230719095848.3422629-8-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: 1771843583187941179 X-GMAIL-MSGID: 1771843583187941179 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 0c96ea9dd258..e28395331bb0 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -352,6 +352,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), @@ -362,8 +363,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 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); From patchwork Wed Jul 19 09:58:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 122501 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2326311vqt; Wed, 19 Jul 2023 03:05:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlHg/lxYPRghExx096/83nj/luVDvlLbGfZE7zCIPBU7Nvv46P/T4jYJwxOrCzKdDl5y85p3 X-Received: by 2002:a17:90a:c78f:b0:261:38ca:3c48 with SMTP id gn15-20020a17090ac78f00b0026138ca3c48mr16110548pjb.11.1689761148442; 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=nkKoDHs362FdNkvKDwSIch0gVcoEOV6e1hCJhwQIWH6mbYLij4osXDM7lUnxtY1YXJ MEfGBi/OGx8drnrVJn2I4Z/AD3ZgnS58tNJvdObz2xC43E46h096ZzdDFyVEb1A1Fw3u AYvWNtLiUJ1aXTL+i46g+oNNV40FYMWK39iTrKwqWLYiCO5loCmT62mVZyuIBivxOaNt idCQ1U0JIG1gHP4lk2uQ/PdV0ALcgoWa+MVDnAL11NolVXV5RFhMmOl0BeCT3wYdYHiG wBhiQYNkS93WgByfMDSzQM0Qcf8U9VRQHoqgpGXBlwCOlW51JmNgLU3c0JuEYkPH0bNd +uNg== 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=UNTnENqbVIYj1TRfK8rpAxUpKqIh0BpIcBiqRUvXjmo=; fh=fQ8bSAglEIUMWaW8g2fbwjC8kqQICqHTc4sMCYJe224=; b=0YDI8zPXEWzEdKRtENLquVnwD7P2bIQLMfs1G/GmugRKKJoihGEU5/NO8Aaxn83T1M sf1+zYLB1ESK8O6V8TdBJj5uSRMkmuo8USJgkNzX6QuBbWHVBf/ChlMLx4t5S7C1dcLZ 4SU6whOoJI4GyxTH4eldEd2Boop6RXtv73C2sva2+Xe4hzDj0ybCVGeoHyfs74wED9LO WhSV4tF3SXyyjAK3aio181NGK/7RUVN+BKlfRl3n2wc7eDbuk9RFJZnKH2D9U3XUvNXg Immr3ASTjheqG2M7pGEFQcIr0/9E3453Sy2Il2S3VsHFjiJTD42751763AOOc4V400Q8 6IAQ== 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 oc6-20020a17090b1c0600b00263eb5054f2si1186096pjb.105.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 S231142AbjGSJ7n (ORCPT + 99 others); Wed, 19 Jul 2023 05:59:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230354AbjGSJ7D (ORCPT ); Wed, 19 Jul 2023 05:59:03 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C6671FC0 for ; Wed, 19 Jul 2023 02:59:02 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4R5WS1161nzLnsJ; Wed, 19 Jul 2023 17:56:33 +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 9/9] mm/page_io: convert bio_associate_blkg_from_page() to take in a folio Date: Wed, 19 Jul 2023 17:58:48 +0800 Message-ID: <20230719095848.3422629-10-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,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: 1771842986407369495 X-GMAIL-MSGID: 1771842986407369495 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 fa8caf1c05d8..dcb58888dd36 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -215,12 +215,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; @@ -230,7 +230,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 { @@ -338,7 +338,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); @@ -361,7 +361,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);