From patchwork Thu Jul 20 13:01:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 123263 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3115779vqt; Thu, 20 Jul 2023 06:23:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlFW5PwON/ub07lK1xgNOMc+Ue1Afs2DTv6+okWIIDm2o0vBvEKf9B1xlRQ3I7BroOIBuW3G X-Received: by 2002:a17:907:2be4:b0:992:4c42:581c with SMTP id gv36-20020a1709072be400b009924c42581cmr5096553ejc.62.1689859436066; Thu, 20 Jul 2023 06:23:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689859436; cv=none; d=google.com; s=arc-20160816; b=UZCQy99bwvBsF/UNhxW/3I2e0apa9D2DibDaU5rbHPFUuEKN9zQrOsskAwGcQxL+3I DR25D53yJFWImkVtbnJ6edHIHivpO+bz51fw7f+k1ZvN7daiwZP2mAPURbFFmTs/LXYn yvdVwD/faiJGST3ukksIHf+Es583waFy4Bg4U9bGJchbDUt9b1LZGll5TJlss4ch5vxD CTDJqCexBWsCNHgY7Ch55gkO//B5LsVqAyQLDbbTEhB/esCNake/Pm/H78TLXPpCz2Qa PNsDXlMtK0q7AZEnMqKkuFgeNeedwZYQpaFvKu7/FvmUpuoBw33k5Qmx1X19vNA+J6YI GwYw== 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=q8rOnvZaN5Z50YvgZS1uBArX5ZcEEwPcusRFazgmNUQ=; b=PXvb70rsp7w5iDY36sZrSdenkQkZZ3uEMzJn9Jk0ZMeyd4EB50b5lgfPN3HvoCvfry PdUTIxY5ac43cSE9Zl9Y0bixTyG00rhA75VBkYLZndAqT78BIPA2wzE8v0OmIfGqsMR2 mds4GFbd8by4lJYKaJCDAipQYZ5rqyAOMdU8UW3cGAIXi6nHQKpbgHoGsfbDKK4TdW7c 1Syewfj2oZ5DB3P6WzAMcBmHX11PByqHy6qzClVXUQvsgQPlsJCQSjprmMO4pfbK0rLe W1/d5/j4yAbwIY6uK+TEa1FJiWX7TJqQbm3D2wgcU1MaFQzeD4k/DzSj2VRvVdftodJr DAMA== 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 d27-20020a170906175b00b00991df467bafsi730857eje.617.2023.07.20.06.23.30; Thu, 20 Jul 2023 06:23:56 -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 S231436AbjGTNCZ (ORCPT + 99 others); Thu, 20 Jul 2023 09:02:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230246AbjGTNCV (ORCPT ); Thu, 20 Jul 2023 09:02:21 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F0D2269D for ; Thu, 20 Jul 2023 06:02:20 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4R6CVx52DBzrRqj; Thu, 20 Jul 2023 21:01: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; Thu, 20 Jul 2023 21:02:14 +0800 From: Peng Zhang To: , , CC: , , , , , ZhangPeng Subject: [PATCH v3 01/10] mm/page_io: remove unneeded ClearPageUptodate() Date: Thu, 20 Jul 2023 21:01:38 +0800 Message-ID: <20230720130147.4071649-2-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: 1771946048472475432 X-GMAIL-MSGID: 1771946048472475432 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");