From patchwork Thu Jul 20 13:01: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: 13320490 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 AA456EB64DA for ; Thu, 20 Jul 2023 13:02:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 428E72800FF; Thu, 20 Jul 2023 09:02:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D90728004C; Thu, 20 Jul 2023 09:02:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A0482800FF; Thu, 20 Jul 2023 09:02:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 1749F28004C for ; Thu, 20 Jul 2023 09:02:28 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BA3F2B0D92 for ; Thu, 20 Jul 2023 13:02:27 +0000 (UTC) X-FDA: 81032003934.05.F9E296E Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf22.hostedemail.com (Postfix) with ESMTP id A0834C00AD for ; Thu, 20 Jul 2023 13:02:23 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf22.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689858145; 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=yLRa2ewWzPH1vKlLihFR0E4jRNz9kx/0dw9KKzLjX+E=; b=tsO4OAVPuI3SUzdRLykvHoTAdnEV8ZthUbtfCWvvProCNrzFm202k3L9EeqM+8pFy1AU2r msBTy2MFJ5r8DIWZZmbDn/8tVHey9iuAS6GjxI/3ihyo1yHgpe1g41DbXpm3SglYEZeMUy Vfx6RHB/VNT/fMIDBXhNoSPKGp9y2JM= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf22.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689858145; a=rsa-sha256; cv=none; b=ORp+K7mvxXG0V16G3XEb10sBycedRX9WmK3LlbYlIaxY5UZtbRG81+d3dD+NAJU1k8tlI/ NrE57aGK7RJ4qGBoZ2/2AlueHhMBK251ZcNYDTbH4YgiC6cHulKxWVhQaEBAI0fk8t3s10 COzNPy/zRdEpMYDPdJeQmzY0AYyiTjI= Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4R6CVH0XC6zVjqr; Thu, 20 Jul 2023 21:00:55 +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:19 +0800 From: Peng Zhang To: , , CC: , , , , , ZhangPeng Subject: [PATCH v3 07/10] mm/page_io: use a folio in swap_writepage_bdev_sync() Date: Thu, 20 Jul 2023 21:01:44 +0800 Message-ID: <20230720130147.4071649-8-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-Rspamd-Queue-Id: A0834C00AD X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: ntkwu3utioh1m3huxius1hrhsqcitcy5 X-HE-Tag: 1689858143-175909 X-HE-Meta: U2FsdGVkX1/15m26aHqTgLQKsKaTC3w3a6au0Pm5gtFigT4hULqAcH7dpiEXvge4kkv8ZzZk8Zfi83VOFadtbuzSuhEUXvr99QeyeFDMTXg8izNe2h76B41/u7e5JC32ltr4zxAo2YSHQEhEYmcH6Du05Pr+KuRR73ak2NnO9qiljSaBwAhfKMlmekOy20RdpxAHrU7oe9SR3OBBSFAMgYwJgOmdD9wj41Mgxio2QHZtNDLUcSVQrJqo3j7wD/xm5YmMOH+jDF4i6DrslhKqiOAhZlP7ZQcghLHW3egpYnqtI6PqntiEhab0Sh8vnfZr/aYfuGUiREUjQYF7jJRPEyd4Jq5XZlPNiaVyMNb6ZAmNsR9yvm3pMSvLCHqGKyLqBAe9ULyTFHsQt6LE1iGZb7KeaFKCFkrlNCoW9Rryrti21PwPHVV8WrU691WaSM8JW9ztrsWYpsY/5PC7aLOOvVlnqIe5bsabkzVosWS6vHbkcw9m+sBPjpoPXyaY0C4B4hexn5abZfw1hP1tOWcHFaUn31b2UTMJvcjZVmXKQ4szkx8kKRf0a+677m+KHP/CBB8I1j6Km/6T3y9i9n4XKJiyi68+d7SNf9sKSxEgykx3FnQhtUOZSyOjlgk78boD/msELKF8pk3kumYQ33prLxo+Q/z09yz9Z38Lu3dPH5f/tS8zKJrN6dbX/a7qeU1hQZvnBFqVYXCupiNTEA7zf9D+AmuqWJPUvCbR7k+IZBWSe2BuJMDcXbXRJWXAVcrzokSlQI7oCnU1YSy9YJM8HneWZMV+FmUKJfTr7L5GtlueEuzcnO4rzTL8qNA1WxzgFVG+dHq3oCJMQ68ZW1ZB7G7kXzHeVrhzCCsuxk7wA1Q7Dkr98385K51i9VHeGCwZMtcjNXVwxyMGRKzQWAjiETp5VuCyB2cccQBEr49GN3RjmLYv+uAI/Msz4zrWQ81w2z/nAHPjixANU0gnbEU BH1vuNOQ Zd7Pc3wquOrZK6Ke3JfR0/6CMlRotFht32nOLCZPD4ejemr3lYlqgEaTbDGC14VEIerB5IIhAFUAaNfZ93SVhc5CJefBxD7LWf+2xlhhqnUe3w+bfXp81FyYQECbeGZ1kYE1E4V7HJ3APQJSLliLee7O7ULp79Lzyy7TDXeVeHgDGqMaPFDHPQ85ZtHy9+vZa4v3pOuL02vlCVFqZU0QtZsl8pu5y5xQTL14Hb8JVL+2SjI3nr/L9c3pdrA== 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 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 7e7a9f67b9ad..9df2a85e31b1 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);