[prev in list] [next in list] [prev in thread] [next in thread]
List: linux-aio
Subject: [PATCH v1 09/11] fs: hugetlbfs: support poison recover from hugetlbfs_migrate_folio()
From: Kefeng Wang <wangkefeng.wang () huawei ! com>
Date: 2024-03-21 3:27:45
Message-ID: 20240321032747.87694-10-wangkefeng.wang () huawei ! com
[Download RAW message or body]
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 <wangkefeng.wang@huawei.com>
---
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
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in
the body to majordomo@kvack.org. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"aart@kvack.org">aart@kvack.org</a>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic