tools/testing/vma: update VMA flag tests to test vma_test[_any_mask]()

Update the existing test logic to assert that vma_test(), vma_test_any()
and vma_test_any_mask() (implicitly tested via vma_test_any()) are
functioning correctly.

We already have tests for other variants like this, so it's simply a
matter of expanding those tests to also include tests for the VMA-specific
helpers.

Link: https://lkml.kernel.org/r/dea3e97c6c3dd86f1a3f1a0703241b03f6e3a33f.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>

diff --git a/tools/testing/vma/tests/vma.c b/tools/testing/vma/tests/vma.c
index 1fae25170ff77b1d3d35a357eb13c99b161e3e5f..1395d55a1e02acdcf2bf8894f55af86fdcfb9ebe 100644 (file)
--- a/tools/testing/vma/tests/vma.c
+++ b/tools/testing/vma/tests/vma.c
@@ -183,13 +183,18 @@ static bool test_vma_flags_test(void)
        struct vm_area_desc desc = {
                .vma_flags = flags,
        };
+       struct vm_area_struct vma = {
+               .flags = flags,
+       };
 
 #define do_test(_flag)                                 \
        ASSERT_TRUE(vma_flags_test(&flags, _flag));     \
+       ASSERT_TRUE(vma_test(&vma, _flag));             \
        ASSERT_TRUE(vma_desc_test(&desc, _flag))
 
 #define do_test_false(_flag)                           \
        ASSERT_FALSE(vma_flags_test(&flags, _flag));    \
+       ASSERT_FALSE(vma_test(&vma, _flag));            \
        ASSERT_FALSE(vma_desc_test(&desc, _flag))
 
        do_test(VMA_READ_BIT);
@@ -219,15 +224,17 @@ static bool test_vma_flags_test_any(void)
                                               , 64, 65
 #endif
                );
-       struct vm_area_struct vma;
-       struct vm_area_desc desc;
-
-       vma.flags = flags;
-       desc.vma_flags = flags;
+       struct vm_area_struct vma = {
+               .flags = flags,
+       };
+       struct vm_area_desc desc = {
+               .vma_flags = flags,
+       };
 
 #define do_test(...)                                           \
        ASSERT_TRUE(vma_flags_test_any(&flags, __VA_ARGS__));   \
-       ASSERT_TRUE(vma_desc_test_any(&desc, __VA_ARGS__))
+       ASSERT_TRUE(vma_desc_test_any(&desc, __VA_ARGS__));     \
+       ASSERT_TRUE(vma_test_any(&vma, __VA_ARGS__));
 
 #define do_test_all_true(...)                                  \
        ASSERT_TRUE(vma_flags_test_all(&flags, __VA_ARGS__));   \