hugetlbfs: Fix off-by-one error in hugetlb_vmdelete_list()
Subsystems (3)
Sean Christopherson
reviewerPATCH 1/1 hugetlbfs: Fix off-by-one error in hugetlb_vmdelete_list()
Pass "end - 1" instead of "end" when walking the interval tree in hugetlb_vmdelete_list() to fix an inclusive vs. exclusive bug. The two callers that pass a non-zero "end" treat it as exclusive, whereas the interval tree iterator expects an inclusive "last". E.g. punching a hole in a file that precisely matches the size of a single hugepage, with a vma starting right on the boundary, will result in unmap_hugepage_range() being called twice, with the second call having start==end.
The off-by-one error doesn't cause functional problems as __unmap_hugepage_range() turns into a massive nop due to short-circuiting its for-loop on "address < end". But, the mmu_notifier invocations to invalid_range_{start,end}() are passed a bogus zero-sized range, which may be unexpected behavior for secondary MMUs.
The bug was exposed by commit ed922739c919 ("KVM: Use interval tree to do fast hva lookup in memslots"), currently queued in the KVM tree for 5.17, which added a WARN to detect ranges with start==end.
---
Not sure if this should go to stable@. It's mostly harmless, and likely nothing more than a minor performance blip when it's not harmless.
fs/hugetlbfs/inode.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/hugetlbfs/inode.c +4 -3
@@ -409,10 +409,11 @@ hugetlb_vmdelete_list(struct rb_root_cached *root, pgoff_t start, pgoff_t end)struct vm_area_struct *vma;/* -* end == 0 indicates that the entire range after -* start should be unmapped. +* end == 0 indicates that the entire range after start should be +* unmapped. Note, end is exclusive, whereas the interval tree takes +* an inclusive "last". */ - vma_interval_tree_foreach(vma, root, start, end ? end : ULONG_MAX) { + vma_interval_tree_foreach(vma, root, start, end ? end - 1 : ULONG_MAX) {unsigned long v_offset;unsigned long v_end;
Signature · 1 line
2.34.1.448.ga2b2bfdf31-goog
+Cc Andrew if he wants to take it though his tree.
Quoted 18 lines · Sean Christopherson
Pass "end - 1" instead of "end" when walking the interval tree in
hugetlb_vmdelete_list()to fix an inclusive vs. exclusive bug. The two callers that pass a non-zero "end" treat it as exclusive, whereas the interval tree iterator expects an inclusive "last". E.g. punching a hole in a file that precisely matches the size of a single hugepage, with a vma starting right on the boundary, will result inunmap_hugepage_range()being called twice, with the second call having start==end.The off-by-one error doesn't cause functional problems as
__unmap_hugepage_range()turns into a massive nop due to short-circuiting its for-loop on "address < end". But, themmu_notifierinvocations to invalid_range_{start,end}() are passed a bogus zero-sized range, which may be unexpected behavior for secondary MMUs.The bug was exposed by commit
ed922739c919("KVM: Use interval tree to do fast hva lookup in memslots"), currently queued in the KVM tree for 5.17, which added a WARN to detect ranges with start==end.
Quoted 5 lines
Reported-by [email protected]Fixes 1bfad99ab425 ("hugetlbfs: hugetlb_vmtruncate_list() needs to take a range to delete")Cc Paolo Bonzini <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Thanks Sean!
Quoted 4 lines
---
Not sure if this should go to stable@. It's mostly harmless, and likely nothing more than a minor performance blip when it's not harmless.
I am also unsure about the need to send to stable. It is possible automation will pick it up and make that decision for us.
Signature · 1 line
Mike Kravetz
Andrew Morton
maintainerQuoted 1 line · On Tue, 28 Dec 2021 19:52:37 -0800 Mike Kravetz <[email protected]> wrote:
+Cc Andrew if he wants to take it though his tree.
Sure.
Quoted 6 lines
Quoted 3 lines
Not sure if this should go to stable@. It's mostly harmless, and likely nothing more than a minor performance blip when it's not harmless.
I am also unsure about the need to send to stable. It is possible automation will pick it up and make that decision for us.
Automation shouldn't do that for mm/ patches because we asked. But fs/ material might sneak through. But it does appear that -stable won't need this.