Skip to content

Commit f0bb6db

Browse files
Carlos Llamasakpm00
authored andcommitted
selftests/mm: fix division-by-zero in uffd-unit-tests
Commit 4dfd4bb ("selftests/mm/uffd: refactor non-composite global vars into struct") moved some of the operations previously implemented in uffd_setup_environment() earlier in the main test loop. The calculation of nr_pages, which involves a division by page_size, now occurs before checking that default_huge_page_size() returns a non-zero This leads to a division-by-zero error on systems with !CONFIG_HUGETLB. Fix this by relocating the non-zero page_size check before the nr_pages calculation, as it was originally implemented. Link: https://lkml.kernel.org/r/20251113034623.3127012-1-cmllamas@google.com Fixes: 4dfd4bb ("selftests/mm/uffd: refactor non-composite global vars into struct") Signed-off-by: Carlos Llamas <cmllamas@google.com> Acked-by: David Hildenbrand (Red Hat) <david@kernel.org> Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org> Reviewed-by: Ujwal Kundur <ujwal.kundur@gmail.com> Cc: Brendan Jackman <jackmanb@google.com> Cc: Liam Howlett <liam.howlett@oracle.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Peter Xu <peterx@redhat.com> Cc: Shuah Khan <shuah@kernel.org> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 270065f commit f0bb6db

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

tools/testing/selftests/mm/uffd-unit-tests.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1758,10 +1758,15 @@ int main(int argc, char *argv[])
17581758
uffd_test_ops = mem_type->mem_ops;
17591759
uffd_test_case_ops = test->test_case_ops;
17601760

1761-
if (mem_type->mem_flag & (MEM_HUGETLB_PRIVATE | MEM_HUGETLB))
1761+
if (mem_type->mem_flag & (MEM_HUGETLB_PRIVATE | MEM_HUGETLB)) {
17621762
gopts.page_size = default_huge_page_size();
1763-
else
1763+
if (gopts.page_size == 0) {
1764+
uffd_test_skip("huge page size is 0, feature missing?");
1765+
continue;
1766+
}
1767+
} else {
17641768
gopts.page_size = psize();
1769+
}
17651770

17661771
/* Ensure we have at least 2 pages */
17671772
gopts.nr_pages = MAX(UFFD_TEST_MEM_SIZE, gopts.page_size * 2)
@@ -1776,12 +1781,6 @@ int main(int argc, char *argv[])
17761781
continue;
17771782

17781783
uffd_test_start("%s on %s", test->name, mem_type->name);
1779-
if ((mem_type->mem_flag == MEM_HUGETLB ||
1780-
mem_type->mem_flag == MEM_HUGETLB_PRIVATE) &&
1781-
(default_huge_page_size() == 0)) {
1782-
uffd_test_skip("huge page size is 0, feature missing?");
1783-
continue;
1784-
}
17851784
if (!uffd_feature_supported(test)) {
17861785
uffd_test_skip("feature missing");
17871786
continue;

0 commit comments

Comments
 (0)