The patch titled
Subject: mm-hwposion-support-recovery-from-ksm_might_need_to_copy-v4
has been added to the -mm mm-hotfixes-unstable branch. Its filename is
mm-hwposion-support-recovery-from-ksm_might_need_to_copy-v4.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-hwposion-support-recovery-from-ksm_might_need_to_copy-v4.patch
This patch will later appear in the mm-hotfixes-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
Subject: mm-hwposion-support-recovery-from-ksm_might_need_to_copy-v4
Date: Wed, 1 Feb 2023 15:44:33 +0800
- update changelog and directly return ERR_PTR(-EHWPOISON) in
ksm_might_need_to_copy() suggested HORIGUCHI NAOYA
- add back unlikely in unuse_pte()
Link: https://lkml.kernel.org/r/20230201074433.96641-1-wangkefeng.wang@xxxxxxxxxx
Signed-off-by: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
Cc: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Cc: Naoya Horiguchi <naoya.horiguchi@xxxxxxx>
Cc: Tony Luck <tony.luck@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
--- a/mm/ksm.c~mm-hwposion-support-recovery-from-ksm_might_need_to_copy-v4
+++ a/mm/ksm.c
@@ -2631,9 +2631,8 @@ struct page *ksm_might_need_to_copy(stru
if (new_page) {
if (copy_mc_user_highpage(new_page, page, address, vma)) {
put_page(new_page);
- new_page = ERR_PTR(-EHWPOISON);
memory_failure_queue(page_to_pfn(page), 0);
- return new_page;
+ return ERR_PTR(-EHWPOISON);
}
SetPageDirty(new_page);
__SetPageUptodate(new_page);
--- a/mm/swapfile.c~mm-hwposion-support-recovery-from-ksm_might_need_to_copy-v4
+++ a/mm/swapfile.c
@@ -1780,7 +1780,7 @@ static int unuse_pte(struct vm_area_stru
goto out;
}
- if (hwposioned || !PageUptodate(page)) {
+ if (unlikely(hwposioned || !PageUptodate(page))) {
swp_entry_t swp_entry;
dec_mm_counter(vma->vm_mm, MM_SWAPENTS);
_
Patches currently in -mm which might be from wangkefeng.wang@xxxxxxxxxx are
mm-hwposion-support-recovery-from-ksm_might_need_to_copy.patch
mm-hwposion-support-recovery-from-ksm_might_need_to_copy-v3.patch
mm-hwposion-support-recovery-from-ksm_might_need_to_copy-v4.patch
mm-madvise-use-vm_normal_folio-in-madvise_free_pte_range.patch
