tools/testing/vma: test vma_flags_count,vma[_flags]_test_single_mask

Update the VMA tests to assert that vma_flags_count() behaves as expected,
as well as vma_flags_test_single_mask() and vma_test_single_mask().

For the test functions we can simply update the existing vma_test(), et
al. test to also test the single_mask variants.

We also add some explicit testing of an empty VMA flag to this test to
ensure this is handled properly.

In order to test vma_flags_count() we simply take an existing set of flags
and gradually remove flags ensuring the count remains as expected
throughout.

We also update the vma[_flags]_test_all() tests to make clear the
semantics that we expect vma[_flags]_test_all(..., EMPTY_VMA_FLAGS) to
return true, as trivially, all flags of none are always set in VMA flags.

Link: https://lkml.kernel.org/r/4af95d559cd2af0ba3388de1e1386b9f94c0e009.1774034900.git.ljs@kernel.org
Signed-off-by: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jann Horn <jannh@google.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Kees Cook <kees@kernel.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Ondrej Mosnacek <omosnace@redhat.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Moore <paul@paul-moore.com>
Cc: Pedro Falcato <pfalcato@suse.de>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stephen Smalley <stephen.smalley.work@gmail.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Vlastimil Babka (SUSE) <vbabka@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Will Deacon <will@kernel.org>
Cc: xu xin <xu.xin16@zte.com.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Lorenzo Stoakes (Oracle) and committed by

Andrew Morton 1 month ago bbbc17cb e79d1c50

+54 -9

1 changed file

expand all

tools

testing

vma

tests

vma.c

+54 -9

tools/testing/vma/tests/vma.c

··· 174 174 /* Ensure that vma_flags_test() and friends works correctly. */ 175 175 static bool test_vma_flags_test(void) 176 176 { 177 - const vma_flags_t flags = mk_vma_flags(VMA_READ_BIT, VMA_WRITE_BIT, 178 - VMA_EXEC_BIT 177 + vma_flags_t flags = mk_vma_flags(VMA_READ_BIT, VMA_WRITE_BIT, 178 + VMA_EXEC_BIT 179 179 #if NUM_VMA_FLAG_BITS > 64 180 - , 64, 65 180 + , 64, 65 181 181 #endif 182 182 ); 183 183 struct vm_area_desc desc = { ··· 187 187 .flags = flags, 188 188 }; 189 189 190 - #define do_test(_flag) \ 191 - ASSERT_TRUE(vma_flags_test(&flags, _flag)); \ 192 - ASSERT_TRUE(vma_test(&vma, _flag)); \ 190 + #define do_test(_flag) \ 191 + ASSERT_TRUE(vma_flags_test(&flags, _flag)); \ 192 + ASSERT_TRUE(vma_flags_test_single_mask(&flags, mk_vma_flags(_flag))); \ 193 + ASSERT_TRUE(vma_test(&vma, _flag)); \ 194 + ASSERT_TRUE(vma_test_single_mask(&vma, mk_vma_flags(_flag))); \ 193 195 ASSERT_TRUE(vma_desc_test(&desc, _flag)) 194 196 195 - #define do_test_false(_flag) \ 196 - ASSERT_FALSE(vma_flags_test(&flags, _flag)); \ 197 - ASSERT_FALSE(vma_test(&vma, _flag)); \ 197 + #define do_test_false(_flag) \ 198 + ASSERT_FALSE(vma_flags_test(&flags, _flag)); \ 199 + ASSERT_FALSE(vma_flags_test_single_mask(&flags, mk_vma_flags(_flag))); \ 200 + ASSERT_FALSE(vma_test(&vma, _flag)); \ 201 + ASSERT_FALSE(vma_test_single_mask(&vma, mk_vma_flags(_flag))); \ 198 202 ASSERT_FALSE(vma_desc_test(&desc, _flag)) 199 203 200 204 do_test(VMA_READ_BIT); ··· 215 211 216 212 #undef do_test 217 213 #undef do_test_false 214 + 215 + /* We define the _single_mask() variants to return false if empty. */ 216 + ASSERT_FALSE(vma_flags_test_single_mask(&flags, EMPTY_VMA_FLAGS)); 217 + ASSERT_FALSE(vma_test_single_mask(&vma, EMPTY_VMA_FLAGS)); 218 + /* Even when both flags and tested flag mask are empty! */ 219 + flags = EMPTY_VMA_FLAGS; 220 + vma.flags = EMPTY_VMA_FLAGS; 221 + ASSERT_FALSE(vma_flags_test_single_mask(&flags, EMPTY_VMA_FLAGS)); 222 + ASSERT_FALSE(vma_test_single_mask(&vma, EMPTY_VMA_FLAGS)); 218 223 219 224 return true; 220 225 } ··· 321 308 /* Five bits. */ 322 309 do_test(VMA_READ_BIT, VMA_WRITE_BIT, VMA_EXEC_BIT, 64, 65); 323 310 #endif 311 + 312 + /* Testing all flags against none trivially succeeds. */ 313 + ASSERT_TRUE(vma_flags_test_all_mask(&flags, EMPTY_VMA_FLAGS)); 314 + ASSERT_TRUE(vma_test_all_mask(&vma, EMPTY_VMA_FLAGS)); 324 315 325 316 #undef do_test 326 317 #undef do_test_all_true ··· 609 592 return true; 610 593 } 611 594 595 + /* Assert that vma_flags_count() behaves as expected. */ 596 + static bool test_vma_flags_count(void) 597 + { 598 + vma_flags_t flags = mk_vma_flags(VMA_READ_BIT, VMA_WRITE_BIT, 599 + VMA_EXEC_BIT 600 + #if NUM_VMA_FLAG_BITS > 64 601 + , 64, 65 602 + #endif 603 + ); 604 + 605 + #if NUM_VMA_FLAG_BITS > 64 606 + ASSERT_EQ(vma_flags_count(&flags), 5); 607 + vma_flags_clear(&flags, 64); 608 + ASSERT_EQ(vma_flags_count(&flags), 4); 609 + vma_flags_clear(&flags, 65); 610 + #endif 611 + ASSERT_EQ(vma_flags_count(&flags), 3); 612 + vma_flags_clear(&flags, VMA_EXEC_BIT); 613 + ASSERT_EQ(vma_flags_count(&flags), 2); 614 + vma_flags_clear(&flags, VMA_WRITE_BIT); 615 + ASSERT_EQ(vma_flags_count(&flags), 1); 616 + vma_flags_clear(&flags, VMA_READ_BIT); 617 + ASSERT_EQ(vma_flags_count(&flags), 0); 618 + 619 + return true; 620 + } 621 + 612 622 static void run_vma_tests(int *num_tests, int *num_fail) 613 623 { 614 624 TEST(copy_vma); ··· 651 607 TEST(vma_flags_diff); 652 608 TEST(vma_flags_and); 653 609 TEST(append_vma_flags); 610 + TEST(vma_flags_count); 654 611 }

Configure Feed

Configure Feed