tools/testing/vma: update VMA tests to test vma_clear_flags[_mask]()

The tests have existing flag clearing logic, so simply expand this to use
the new VMA-specific flag clearing helpers.

Also correct some trivial formatting issue in a macro define.

Link: https://lkml.kernel.org/r/f5da681d3c33039dd4a838188385796eb8d58373.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 c73c3a565f1d77c6e28b12fb32a1675803856f81..754a2da063215753b3ec13c0515fc3fac4133803 100644 (file)
--- a/tools/testing/vma/tests/vma.c
+++ b/tools/testing/vma/tests/vma.c
@@ -347,19 +347,20 @@ static bool test_vma_flags_clear(void)
                                        , 64
 #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,
+       };
 
        /* Cursory check of _mask() variant, as the helper macros imply. */
        vma_flags_clear_mask(&flags, mask);
-       vma_flags_clear_mask(&vma.flags, mask);
+       vma_clear_flags_mask(&vma, mask);
        vma_desc_clear_flags_mask(&desc, mask);
 #if NUM_VMA_FLAG_BITS > 64
        ASSERT_FALSE(vma_flags_test_any(&flags, VMA_EXEC_BIT, 64));
-       ASSERT_FALSE(vma_flags_test_any(&vma.flags, VMA_EXEC_BIT, 64));
+       ASSERT_FALSE(vma_test_any(&vma, VMA_EXEC_BIT, 64));
        ASSERT_FALSE(vma_desc_test_any(&desc, VMA_EXEC_BIT, 64));
        /* Reset. */
        vma_flags_set(&flags, VMA_EXEC_BIT, 64);
@@ -371,15 +372,15 @@ static bool test_vma_flags_clear(void)
         * Clear the flags and assert clear worked, then reset flags back to
         * include specified flags.
         */
-#define do_test_and_reset(...)                                 \
-       vma_flags_clear(&flags, __VA_ARGS__);                   \
-       vma_flags_clear(&vma.flags, __VA_ARGS__);               \
-       vma_desc_clear_flags(&desc, __VA_ARGS__);               \
-       ASSERT_FALSE(vma_flags_test_any(&flags, __VA_ARGS__));  \
-       ASSERT_FALSE(vma_flags_test_any(&vma.flags, __VA_ARGS__));      \
-       ASSERT_FALSE(vma_desc_test_any(&desc, __VA_ARGS__));    \
-       vma_flags_set(&flags, __VA_ARGS__);                     \
-       vma_set_flags(&vma, __VA_ARGS__);                       \
+#define do_test_and_reset(...)                                         \
+       vma_flags_clear(&flags, __VA_ARGS__);                           \
+       vma_clear_flags(&vma, __VA_ARGS__);                             \
+       vma_desc_clear_flags(&desc, __VA_ARGS__);                       \
+       ASSERT_FALSE(vma_flags_test_any(&flags, __VA_ARGS__));          \
+       ASSERT_FALSE(vma_test_any(&vma, __VA_ARGS__));                  \
+       ASSERT_FALSE(vma_desc_test_any(&desc, __VA_ARGS__));            \
+       vma_flags_set(&flags, __VA_ARGS__);                             \
+       vma_set_flags(&vma, __VA_ARGS__);                               \
        vma_desc_set_flags(&desc, __VA_ARGS__)
 
        /* Single flags. */