From patchwork Tue Feb 6 11:21:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13547064 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 AE451C48297 for ; Tue, 6 Feb 2024 11:22:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 508E46B0099; Tue, 6 Feb 2024 06:21:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 470676B0096; Tue, 6 Feb 2024 06:21:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E10FF6B0095; Tue, 6 Feb 2024 06:21:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id AF7C66B009B for ; Tue, 6 Feb 2024 06:21:54 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 890FE1C14FF for ; Tue, 6 Feb 2024 11:21:54 +0000 (UTC) X-FDA: 81761139348.05.090BC9C Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf08.hostedemail.com (Postfix) with ESMTP id 5C202160006; Tue, 6 Feb 2024 11:21:50 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf08.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707218512; 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=FBRFatEMkhE0Upv1e1YVUOjsRtSrsCysTkXGkXY7BW4=; b=IbbYNNVBUf7Km6n+mi3ipT9ZRHx3mg+OZcABGDkF6DAXAqJsepdGbs6Jn6o3wNiqB/EeR5 CT7TVVY+YLxdTkvmvflA2JBCpfsv9RblvMWzxSV2RGelqUjQXUssU3obNjV49OWq+WQIx7 8aZODpx+0DYvGnXuEgb0NFqjx0KRI/s= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf08.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707218512; a=rsa-sha256; cv=none; b=Zsqw9vi7sbygEDRS/Y95uLtPoP/y/8cPxJ5PU2H0cr7bTwAw3n5hkiGd4Pb8TQAlLAUyIR MYr+RYOg6+U2RPRKQxguXkLY20UUJVZtl27VlxtHmCLYoqsc5JF8vroF3rCTSchVIZpT4P 9EdHHS+KpJncxYAQ0O6CGufB4akoOXE= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4TTgkw56FLz1gykT; Tue, 6 Feb 2024 19:19:52 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 4690F1A0178; Tue, 6 Feb 2024 19:21:48 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 6 Feb 2024 19:21:47 +0800 From: Kefeng Wang To: Andrew Morton , CC: Tony Luck , Naoya Horiguchi , Miaohe Lin , Matthew Wilcox , David Hildenbrand , Muchun Song , Benjamin LaHaise , , , , Kefeng Wang Subject: [PATCH rfcv2 09/11] fs: hugetlbfs: support poison recover from hugetlbfs_migrate_folio() Date: Tue, 6 Feb 2024 19:21:32 +0800 Message-ID: <20240206112134.1479464-10-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240206112134.1479464-1-wangkefeng.wang@huawei.com> References: <20240206112134.1479464-1-wangkefeng.wang@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 dggpemm100001.china.huawei.com (7.185.36.93) X-Rspamd-Queue-Id: 5C202160006 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: tpudkp9h14yra7rzmiru9t6yzmddz3s7 X-HE-Tag: 1707218510-270421 X-HE-Meta: U2FsdGVkX1/65eU3kSdbZfDtFqjRGABImIoldYInAlqiKCTvW56haArTTBZqU7vy427KQN8HA8o9BwfrO14YvxNQUwopk8vKo2yi3NoWWOymbZRC8XHNrblaokfl9iYO/vMzZO9obJWnygbVocVc5/LXlF6XeA7O9Tz0snErlqAhkS1619H835lOk7eQUZRpX+70Zg1UsUDgGO5blvTjsSfJy1lc4jwWI00Ezivy7WvK2zjbjRsgxU2WzNjtqBfK8xj80LdnkI7l+wKWEZEMbrydrDbvkED7A2+K2rJ5X7ST+Cm/Hsm4k4CyKyxAXkaEiLoAe1ea0OnUuvZVhnM4oZcJOr399yzDZb/0fSZTginibpzjbUPrLySwTNg7Dfcb4LXF6M55U6DGENY/s3LAjX94iN1FzPMOdletihpP5IjjWL2TogTGpvOTJRTtV6ioL0PO7MIW9dmi+Bn2xKZwdYxe1hIfNejE9dqTrjFO5uNAYAuEK+4wW+5fxdabVRkvDaDGk9YX2ZhwB4sGSAig/d2NIVwC5lu3uc9tAIhhB36Xg3AHhQr20PFiAp+XnFl1NEFLHsJw/UN2kYgw5kHhg2OVDClapEurb1Cjf+xABwLXOBaa8UG+mXh10WeqIn3siIjY1Ejd6L85cYuwLeHJthmFrvpKVJfYlgKbodYiCA7DmOZ5co/2+wnx9J2ObKCONbuldJFxsMymYREloIXGrGeCCYR5tCp4FAa62tvvOtatmfH0nik5HKZHYcjQC4sdEt/wv8YIUVakl5TvPIcWVCnDS8zPYzJAN2WwFCwInAQzQAeqdg1r9mZETcNfLZz3PMr47YxUQ5iu5UvG8ag+tI1lnhLkhnoyFYc+34VfCnkJiTyqtp1chP8BpPwpWIevwzFCJUfeL+L5HPfHrlTjohbbGUCyXN7VqAQwXbk4eB3Hdmm7kvWfWCMglVkJCROywppGZTMqUj6mDwF2inb dBZ29BE7 ocI4E95ZPwwkjUkzPzqlMhT7IjLWXrnxGt/s3MM402OwUR0ZNmGBZ6X9GNHJmKwImA2lpzx496AgQn6X3fndFUOFoSLc+PmXvPKUvBV/abCRkwtFEDkxnz70y/pq39F7HcRPOYOmRpyjcYRPqxNIJwivBL9ce/dwPelJ0JJSxLnBmRSWkbzqtawmTpaSoUiQs9/BJ 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: This is similar to __migrate_folio(), use folio_mc_copy() in HugeTLB folio migration to avoid panic when copy from poisoned folio. Signed-off-by: Kefeng Wang --- fs/hugetlbfs/inode.c | 2 +- mm/migrate.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 4f2a423037b6..b4861a69ff34 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -1129,7 +1129,7 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping, hugetlb_set_folio_subpool(src, NULL); } - folio_migrate_copy(dst, src); + folio_migrate_flags(dst, src); return MIGRATEPAGE_SUCCESS; } diff --git a/mm/migrate.c b/mm/migrate.c index 6d99052848b4..db189ed8ae06 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -538,15 +538,19 @@ int migrate_huge_page_move_mapping(struct address_space *mapping, struct folio *dst, struct folio *src) { XA_STATE(xas, &mapping->i_pages, folio_index(src)); - int expected_count; + int rc, expected_count = folio_expected_refs(mapping, src); - xas_lock_irq(&xas); - expected_count = folio_expected_refs(mapping, src); - if (!folio_ref_freeze(src, expected_count)) { - xas_unlock_irq(&xas); + if (!folio_ref_freeze(src, expected_count)) return -EAGAIN; + + rc = folio_mc_copy(dst, src); + if (rc) { + folio_ref_unfreeze(src, expected_count); + return rc; } + xas_lock_irq(&xas); + dst->index = src->index; dst->mapping = src->mapping;