mm/hugetlb.c: teach follow_hugetlb_page() to handle FOLL_NOWAIT
Subsystems (2)
cover mm/hugetlb.c: teach follow_hugetlb_page() to handle FOLL_NOWAIT
Hello,
this fixes a regression that resurfaced in hugetlbfs code after we fixed it for the core VM a few months ago. This is only reproducible doing postcopy live migration of KVM (the only user of FOLL_NOWAIT) if backed by hugetlbfs memory. It's unrelated to userfaultfd, but userfaultfd reproduces it easily because it's an heavy user of VM_FAULT_RETRY retvals.
Thanks,
Andrea
Andrea Arcangeli (1):
mm/hugetlb.c: teach follow_hugetlb_page() to handle FOLL_NOWAIT
mm/hugetlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
PATCH 1/1 mm/hugetlb.c: teach follow_hugetlb_page() to handle FOLL_NOWAIT
hugetlb needs the same fix as faultin_nopage (which was applied in 96312e61282ae3f6537a562625706498cbc75594) or KVM hangs because it thinks the mmap_sem was already released by hugetlb_fault() if it returned VM_FAULT_RETRY, but it wasn't in the FOLL_NOWAIT case.
--- mm/hugetlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/hugetlb.c +2 -1
@@ -4301,7 +4301,8 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,break ; }if (ret &VM_FAULT_RETRY ) { -if (nonblocking) +if (nonblocking && + !(fault_flags &FAULT_FLAG_RETRY_NOWAIT )) *nonblocking =0 ; *nr_pages =0 ;/*
Quoted 9 lines · Andrea Arcangeli
hugetlb needs the same fix as
faultin_nopage(which was applied in96312e61282ae3f6537a562625706498cbc75594) or KVM hangs because it thinks themmap_semwas already released byhugetlb_fault()if it returnedVM_FAULT_RETRY, but it wasn't in theFOLL_NOWAITcase.Fixes ce53053ce378 ("kvm: switch get_user_page_nowait() to get_user_pages_unlocked()")Signed-off-by Andrea Arcangeli <[email protected]>Reported-by "Dr. David Alan Gilbert" <[email protected]>
Thanks for fixing this.
Signature · 1 line
Mike Kravetz
Quoted 19 lines
--- mm/hugetlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)mm/hugetlb.c +2
-1@@ -4301,7 +4301,8 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,break ; }if (ret &VM_FAULT_RETRY ) { -if (nonblocking) +if (nonblocking && + !(fault_flags &FAULT_FLAG_RETRY_NOWAIT )) *nonblocking =0 ; *nr_pages =0 ;/*
Quoted 9 lines · Andrea Arcangeli
hugetlb needs the same fix as
faultin_nopage(which was applied in96312e61282ae3f6537a562625706498cbc75594) or KVM hangs because it thinks themmap_semwas already released byhugetlb_fault()if it returnedVM_FAULT_RETRY, but it wasn't in theFOLL_NOWAITcase.Fixes ce53053ce378 ("kvm: switch get_user_page_nowait() to get_user_pages_unlocked()")Signed-off-by Andrea Arcangeli <[email protected]>Reported-by "Dr. David Alan Gilbert" <[email protected]>
FWIW:
Quoted 9 lines
--- mm/hugetlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)mm/hugetlb.c +0
-0
mm/hugetlb.c long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, · line 4308
Quoted 9 lines
mm/hugetlb.c +2
-1@@ -4301,7 +4301,8 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,break ; }if (ret &VM_FAULT_RETRY ) { -if (nonblocking) +if (nonblocking && + !(fault_flags &FAULT_FLAG_RETRY_NOWAIT )) *nonblocking =0 ; *nr_pages =0 ;/*
Regards,
Signature · 1 line
Peter Xu