Skip to contentSkip to conversation

mm-hugetlb-add-missing-vm_fault_set_hindex-in-hugetlb_wp.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 11, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/hugetlb: add missing VM_FAULT_SET_HINDEX in hugetlb_wp
has been removed from the -mm tree. Its filename was
mm-hugetlb-add-missing-vm_fault_set_hindex-in-hugetlb_wp.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Oscar Salvador <[email protected]>
Subject: mm/hugetlb: add missing VM_FAULT_SET_HINDEX in hugetlb_wp
Date: Thu, 9 May 2024 12:01:48 +0200

commit 1cb9dc4b475c ("mm: hwpoison: support recovery from HugePage copy-on-write faults") added support to use the mc variants when coping hugetlb pages on CoW faults.

Add the missing VM_FAULT_SET_HINDEX, so the right si_addr_lsb will be passed to userspace to report the extension of the faulty area.

---

 mm/hugetlb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-add-missing-vm_fault_set_hindex-in-hugetlb_wp +1 -1
@@ -6067,7 +6067,7 @@ retry_avoidcopy:
 		goto out_release_all;
 
 	if (copy_user_large_folio(new_folio, old_folio, vmf->real_address, vma)) {
-		ret = VM_FAULT_HWPOISON_LARGE;
+		ret = VM_FAULT_HWPOISON_LARGE | VM_FAULT_SET_HINDEX(hstate_index(h));
 		goto out_release_all;
 	}
 	__folio_mark_uptodate(new_folio);

_

Patches currently in -mm which might be from [email protected] are