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: Peng Zhang X-Patchwork-Id: 13315705 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5957DC00528 for ; Mon, 17 Jul 2023 13:26:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CE6948D0002; Mon, 17 Jul 2023 09:26:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BFAE06B0072; Mon, 17 Jul 2023 09:26:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9600C8D0001; Mon, 17 Jul 2023 09:26:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 6836F6B0075 for ; Mon, 17 Jul 2023 09:26:18 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 397C81602F9 for ; Mon, 17 Jul 2023 13:26:18 +0000 (UTC) X-FDA: 81021177636.23.4D35F86 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf11.hostedemail.com (Postfix) with ESMTP id 28A8340007 for ; Mon, 17 Jul 2023 13:26:13 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689600376; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IYxz/hwKzYk9uuwe3O6nxmJnxJXAWQADQD0MlDZJ4Kw=; b=afzjjvo0O1IH7WK5ZT2Rq0gcbg4lKGGyotENdoN4V14S2WzPr8W90TgAps7jNfndMSZtgP FeXk8nzAPyHM1gZcRwQN0xeDQA+lRTT+xmywFoClfhGEBMMM66+9uP77bii/9HE1P0IWqU 3pqb4+l9FTbcwgBuZV9+yU65CqK9Q2U= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689600376; a=rsa-sha256; cv=none; b=SeYe1EfcjnEl9RDci0csNdCzLhydGa9D8kJBC6f4luW1HsFL+WtRnYkBCTiB7PkpBmeCFe 0oJ/HhI1I8OECBNc5gFQwQlhidjSARPlW45avGlEHC2OowibAaLFdn6jNQxcGioELI5EBF w7wa3G3Wl5DQ1pgNjQPVKgoxbC9eufk= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com 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-Rspamd-Queue-Id: 28A8340007 X-Rspam-User: X-Stat-Signature: u8ajyo1y7i4xccs67kprdh8saop8z3wa X-Rspamd-Server: rspam03 X-HE-Tag: 1689600373-250046 X-HE-Meta: U2FsdGVkX18ij51PTlm0msd28NnNHKrKu+j/fzYThbE5dc7wRUyVM0qyjHYvVSYSoTONO/BGSc1tH4WMg5gkaCltXtvXBgmtQg4k9MLbDLTpbRgFo7uBMK7UwSSDEzmnVhc9W1JInAd78KAmxW2mvdyGeRpniYpd5SBMotmK0zljUTiovs7lh3tl+X6/O62vRT9ECvntWoM5zEXmvZdD//eu5aFvPnl8BBsx7fsIReLI0PkIPrx/XZo1WqknQGrbiixKYeZ6tkQaAUWA9ZfBo70DETrDDCtqS1evNSB6s9Dhnb0H688cItb+zfNulJ06TAB7sq62hdbEqhoGHAJq8++s1y305N1Z9PQ9Qu7Q5HbYKsXJmu7cRZB8qlCiyVFDwloVORUSCn2LQroWbYtt8l2n+FqBTF/J8wZFKey3kVyQouL6wvT0AGw0m/Bx9LCEG7xphwlzrGHus3zIi2sJ7p9233pGO9QZ2uTwY/8gOc0Nmu2CjytFX7KIfJ6ljDVuExL0CKT0wU0Is827R4QpDqqXxXawfN2AaMw4JC6G4S4uEVH1fc1wTsBbU82IAk2W1uz6/gyab39xLlMEomnUdtgyFfqq184pW3gPl9NyIYoRMAyfaInunOOqND/OudOPOs4xB2xwl96hFzCWmarjkiQcb9vLthctcfPey6mVL8OSt9Hl1jTHwYyGd7opvGPEjgf90D0CsPxbi3/FqFdLColGbjlR0RqJwyxROkPYQfiiYMic9jP8KTJKvSWjsPCRyXv/DRQczQWsUX1v3SeKYtQihQN7TSUnc6bZmdFd9y06wjyco0q2VTJ42QaCWj0D4EBKRZOllGljVRx1Yx+eoWqHTfQ2MO8Mfpo01vR5MxPHZS7yEvMVLL9pSH8mX3FrVL9k2L+cKiTRmcMNoxYUrQLLva2sRFm3yXPEt/TRpyR1xKfoS0QZNJwE9AY7gDDX94XWEhJSY9hkYfC8R4r hEUq9A2N /X8FdjjDc8h746ZsI61aKHKjkPoR4jGzfTHHZRfc3hS4lCPS2Dv5LvIKuUaBq6SubVl26a4oY5l+ZfYRH2SnHJ8NXog15I3aHBtEskkYf2KzwBXyhKiojnQC5pa8FshSZYA2mCkevu5VVB25ycsNikJ3WNNYKXK/FqByxSzOwHq4ixxdtfq4RTzm5PEwX8ZScsZkq X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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)