From patchwork Mon Aug 26 06:58:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13777224 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 7F836C5321E for ; Mon, 26 Aug 2024 06:58:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 39F7E6B0213; Mon, 26 Aug 2024 02:58:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 34F586B0248; Mon, 26 Aug 2024 02:58:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F6C36B03D1; Mon, 26 Aug 2024 02:58:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id F24746B0213 for ; Mon, 26 Aug 2024 02:58:37 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 64B2C40D1C for ; Mon, 26 Aug 2024 06:58:37 +0000 (UTC) X-FDA: 82493493474.01.23BF35C Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf28.hostedemail.com (Postfix) with ESMTP id 1061EC000D for ; Mon, 26 Aug 2024 06:58:34 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=wangkefeng.wang@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=1724655402; 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=VVUobr4dJcZwZQQN4rZjWdwoJekZ8plWFjHhFJeXTQg=; b=Kb+D1PgbLMYIEsKJWNgDP/oPm3U490Qw1nGk+DOLypIYWc/JGcx1bFBK2yBzQg8eBOGDrz xo3+inNaK9XS5uCvXvBwTmu4NsrpRtExhFaNsCGIQqZJysg5U1phZjSLnOeXLIDN4X7yRv aLjihtHMdIo15yZHfEjhOc5vV9PNGX0= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724655402; a=rsa-sha256; cv=none; b=qo43Vq+sOmUKeSriu1o9MPMuVTyuAbUvPwtD2kzGfih2v5x9NZQZW49gdC2M2XWI0aJmW1 +nX1gDKEXAxa9BNl4gsdPpqCYnmc9ZzaH2IoV7YAZLNFOjyI7BdKA2Nh0AC3pvSBLBe5E6 blY6AEvKyCbeBsAqMfNCrLdfPZVnvfY= Received: from mail.maildlp.com (unknown [172.19.88.214]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4WshKt69Sfz1xvYj; Mon, 26 Aug 2024 14:56:34 +0800 (CST) Received: from dggpemf100008.china.huawei.com (unknown [7.185.36.138]) by mail.maildlp.com (Postfix) with ESMTPS id 8CCE81A016C; Mon, 26 Aug 2024 14:58:31 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemf100008.china.huawei.com (7.185.36.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Mon, 26 Aug 2024 14:58:31 +0800 From: Kefeng Wang To: Andrew Morton CC: David Hildenbrand , Matthew Wilcox , Baolin Wang , Zi Yan , Alistair Popple , Jonathan Corbet , , Kefeng Wang Subject: [PATCH 2/6] mm: migrate_device: use a folio in migrate_device_range() Date: Mon, 26 Aug 2024 14:58:10 +0800 Message-ID: <20240826065814.1336616-3-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240826065814.1336616-1-wangkefeng.wang@huawei.com> References: <20240826065814.1336616-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemf100008.china.huawei.com (7.185.36.138) X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 1061EC000D X-Stat-Signature: p364q7dqcyjiqc1ecn9fsfyu5bgc53u6 X-Rspam-User: X-HE-Tag: 1724655514-734682 X-HE-Meta: U2FsdGVkX1/JzfyCNC2pCUYL5i6bPbaia5EE6oP3OPCimF7HaqmkyD+zNxjaHqzyrPfU/edPIBOl66v9cWxAegbzO1s648OB2n1ANl4b8Jgd8bEv6QzVQTvIE7o/bhgvJVfbD1zSM9nckp8CgtTvO+UsEEbGStEaBVuc0L2ECsKtZBdeZy0WF3jQ0OqzmCDH1Eizpx49jJB1wwKM9Cq++QyeaPldtNY0IMz10kAi8AmCQYRQR5HTUQnbyrAjYxlhACxwDZfqO35KIADInOa/3hfvv/2LGl68WEU8TN4NohA9C8MHjgkqwEHMe6+IcASJovSRSRfhgrKgdjQ6JA7yrBjk71EqlmIr1JHrFgQgYK9MjkZYxfQ1f7Bu+/oABTPnc7t9W7BWiqnpAhFFi3R3Py/c8bXnwxjl8jdOUFqwTLrG+IT92DEUa+00aF4pM3fEkSeSMfXUc8oXvLZpX4wh3WbfuwAYYE+tDfkXmX2lQlUXbOWbUjbHq3/+itYBeO09yxlbLhAnnfpuz0xAcGZ1PThw6WG/9iCee28sAfLViEEsW8r0jDWxhpGcNdMLfW2TXB1hVnr7vR9DtIxNr1E8PnCOnBvOToJmCW/IoHoozN2YY+SjAEHmD7qFC1pCcVgohhoxi9ZQqWepfQyzVvV1HQ3HyT005fNjjlOyWME4hZfWQ8oyQWhZSpXwMBW0RNHDrYS+jMZF4tYGbaPLk0DYVYZDd99S9HCsaWR4vzxikXDIAxhTHnEytvqE6YBZaKalJM9nyVaNBrLe3ZqwzCetKLDVM0dna90kIXf1/UkNVU4thQ0A7IoC8MrJ7SO+VRc9caVDAaUIHAS+cpERvJLfM9wWLnVwLptbjqyVp6xd5hYeo/rTGZyGpDHxkWCjr6aQlB35wxEjJkvadgmnM2uu3EDJX4Arwjv6F7DiRIsLFX/Fcnhq+i/WpD+JKsqBrUkNmFF2MP/Tg/Qz2gkBVwa Xw68s/oG fEZnOLWpfXx4u1/AxRSNwvT1tCxp0S3YDY9JwicjrzRtJGbbGXL0JoC4FxJ285x9nKlQqjAU0gNKXy09ImGIkq6UYDfMU5WrGjcZ2dDRweEMC7F43+tg8twkozNKPcowZEPwnKyddAMSW7nt/UzhN00WEkkU7iDkARXOVihbmCg1tiY8XQVkZZv3Fio42PE1lK3bC 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: List-Subscribe: List-Unsubscribe: Save two calls to compound_head() and use folio throughout. Signed-off-by: Kefeng Wang Acked-by: David Hildenbrand Reviewed-by: Vishal Moola (Oracle) Reviewed-by: Alistair Popple --- mm/migrate_device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 82d75205dda8..66db28b89f9b 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -898,16 +898,17 @@ int migrate_device_range(unsigned long *src_pfns, unsigned long start, unsigned long i, pfn; for (pfn = start, i = 0; i < npages; pfn++, i++) { - struct page *page = pfn_to_page(pfn); + struct folio *folio; - if (!get_page_unless_zero(page)) { + folio = folio_get_nontail_page(pfn_to_page(pfn)); + if (!folio) { src_pfns[i] = 0; continue; } - if (!trylock_page(page)) { + if (!folio_trylock(folio)) { src_pfns[i] = 0; - put_page(page); + folio_put(folio); continue; }