From mboxrd@z Thu Jan 1 00:00:00 1970 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 DFC90C54E68 for ; Thu, 21 Mar 2024 03:29:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26B236B00A7; Wed, 20 Mar 2024 23:29:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A38B6B00A5; Wed, 20 Mar 2024 23:29:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D62F86B00AA; Wed, 20 Mar 2024 23:29:01 -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 A2B0C6B00A3 for ; Wed, 20 Mar 2024 23:29:01 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7DCBF801BA for ; Thu, 21 Mar 2024 03:29:01 +0000 (UTC) X-FDA: 81919614882.25.251E732 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf26.hostedemail.com (Postfix) with ESMTP id 71AA8140010; Thu, 21 Mar 2024 03:28:58 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf26.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.32 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=1710991739; 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=X2GHRlhH8aTEuDCq0p42W7jHL6giIDhZ77iNZJwmisI=; b=jTc3zik17AKWidARNlKqVM8Y6naJPFbVSy1Q0yWNOtpx7uix3+foCczsYWw1J0EO3FBXhO xp0TRnfvIBsbLzosz8G4TtWr+X+DGZi4eLAmgx0jmcXX7u+tjAtKDjhUrF89wOekGlSNUk 6rsSyph96OVkEOo90DgiBUvbWV/sCoQ= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf26.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710991739; a=rsa-sha256; cv=none; b=rjk6ZbD4nqOrOdzISvdDSPadgWn+TAr4xy2qcnOn84F7bXObl33omplsde4d4dl65f98po tGgrfdYUslXdvqxMVguobL7Y+2BrdHhABwFoxjDAbfmwM8ZG14SxcACWdAK2AMSl6yyufa F4apIj0uPzCs94n0T9wruQSuR1On3Yc= Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4V0WBH50m5z1vxCr; Thu, 21 Mar 2024 11:28:07 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 481061400CA; Thu, 21 Mar 2024 11:28:54 +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_256_GCM_SHA384) id 15.1.2507.35; Thu, 21 Mar 2024 11:28:53 +0800 From: Kefeng Wang To: Andrew Morton , CC: Tony Luck , Naoya Horiguchi , Miaohe Lin , Matthew Wilcox , David Hildenbrand , Muchun Song , Benjamin LaHaise , , , , Zi Yan , Jiaqi Yan , Hugh Dickins , Kefeng Wang Subject: [PATCH v1 09/11] fs: hugetlbfs: support poison recover from hugetlbfs_migrate_folio() Date: Thu, 21 Mar 2024 11:27:45 +0800 Message-ID: <20240321032747.87694-10-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240321032747.87694-1-wangkefeng.wang@huawei.com> References: <20240321032747.87694-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100001.china.huawei.com (7.185.36.93) X-Rspamd-Queue-Id: 71AA8140010 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: ak3ku6uh48stuhawas7eeox9mf1gqhz8 X-HE-Tag: 1710991738-167976 X-HE-Meta: U2FsdGVkX19HatC5EwvtVOQA72eebUzlKgSbyQn1JGq0FxFtp9+MvgJEPQeU6BJPQVHffDJwBVIPFEfthT1DUDT1QPldcmzMOCxQMRV+Y8286p+kXY2ADdYcka6JXbR/bfyFr9i68ekuRVomka0PJah18UpVwDVAWIR90kQ2ltEV+AFlF+k0rrxVjxuTeYBGqXCZ+lk1dJPL/iBtwectWMlPE4lWmsbNxaM2qag1zh3P4NSO6JyYUyxwY1YgvvKQo7gNlgchCYEa3u3NNqhjKDsqIHHL8PLq/yG6qCXjpAH/4TOCbLasbm/exOvcUPL+0DsTDGUcZlcCU917Ex5J2azDC417pEDetxmfXHHzQ3BtfQsq8jLueC+9ibVB/+i4Bp887VumJRsAFVYH+uO8rx/rSCJU5HdKoQkfzhq78e2IoyvH0rE3d3LCiBfsNWX64JpZCNWFkff5zWD/zu/WqIzUhhI1eegC/Tu7HlBm2L9EBzDxoBFztVx8SWGHPIhKKjWzAyl+6sbfFoz7YIhJKOcqCNmtWRhhoxgjmb0XwD5dBifgm3kUj5h1srRq/HbbXt5Sp32UmU3tTRSO+s/JuqX6zAbV6dSEWmdekk2Pv4m+al6usfFO50zzN6Cj7kx+UdI1K573JupqOaFS8OzeA7uV4isjbCAPGj+8Rqud2p0gCpzLG8Tz7zUDUDIS3oN6tL6VGBBcf5RSbdWVtBFOw6LLnh5KROntMKUS06PCmDYuKNsopVyAWKaSteEn1irA9zyUlPni5Y7ihy96CMZ8VolmLAnSIsmAWC6jcpAu93Zv2hmJEZBrOlWuKICRIkC8bLybNg1cv9JZQWacMY8+B9Ly9Pz0rGgyzkptHz+VGeqznKKSCxMIyI0Dq5daoeD1PQAYxgJJdkU= 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 d0c496af8d43..e6733f3b6bf1 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -1131,7 +1131,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 a31dd2cfc646..c0e2a26df30b 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -541,15 +541,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; -- 2.27.0