tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Lorenzo Stoakes (Oracle) and committed by
Andrew Morton a6f14fb5 d720b81d

+17 -16
+17 -16
tools/testing/vma/tests/vma.c
··· 347 347 , 64 348 348 #endif 349 349 ); 350 - struct vm_area_struct vma; 351 - struct vm_area_desc desc; 352 - 353 - vma.flags = flags; 354 - desc.vma_flags = flags; 350 + struct vm_area_struct vma = { 351 + .flags = flags, 352 + }; 353 + struct vm_area_desc desc = { 354 + .vma_flags = flags, 355 + }; 355 356 356 357 /* Cursory check of _mask() variant, as the helper macros imply. */ 357 358 vma_flags_clear_mask(&flags, mask); 358 - vma_flags_clear_mask(&vma.flags, mask); 359 + vma_clear_flags_mask(&vma, mask); 359 360 vma_desc_clear_flags_mask(&desc, mask); 360 361 #if NUM_VMA_FLAG_BITS > 64 361 362 ASSERT_FALSE(vma_flags_test_any(&flags, VMA_EXEC_BIT, 64)); 362 - ASSERT_FALSE(vma_flags_test_any(&vma.flags, VMA_EXEC_BIT, 64)); 363 + ASSERT_FALSE(vma_test_any(&vma, VMA_EXEC_BIT, 64)); 363 364 ASSERT_FALSE(vma_desc_test_any(&desc, VMA_EXEC_BIT, 64)); 364 365 /* Reset. */ 365 366 vma_flags_set(&flags, VMA_EXEC_BIT, 64); ··· 372 371 * Clear the flags and assert clear worked, then reset flags back to 373 372 * include specified flags. 374 373 */ 375 - #define do_test_and_reset(...) \ 376 - vma_flags_clear(&flags, __VA_ARGS__); \ 377 - vma_flags_clear(&vma.flags, __VA_ARGS__); \ 378 - vma_desc_clear_flags(&desc, __VA_ARGS__); \ 379 - ASSERT_FALSE(vma_flags_test_any(&flags, __VA_ARGS__)); \ 380 - ASSERT_FALSE(vma_flags_test_any(&vma.flags, __VA_ARGS__)); \ 381 - ASSERT_FALSE(vma_desc_test_any(&desc, __VA_ARGS__)); \ 382 - vma_flags_set(&flags, __VA_ARGS__); \ 383 - vma_set_flags(&vma, __VA_ARGS__); \ 374 + #define do_test_and_reset(...) \ 375 + vma_flags_clear(&flags, __VA_ARGS__); \ 376 + vma_clear_flags(&vma, __VA_ARGS__); \ 377 + vma_desc_clear_flags(&desc, __VA_ARGS__); \ 378 + ASSERT_FALSE(vma_flags_test_any(&flags, __VA_ARGS__)); \ 379 + ASSERT_FALSE(vma_test_any(&vma, __VA_ARGS__)); \ 380 + ASSERT_FALSE(vma_desc_test_any(&desc, __VA_ARGS__)); \ 381 + vma_flags_set(&flags, __VA_ARGS__); \ 382 + vma_set_flags(&vma, __VA_ARGS__); \ 384 383 vma_desc_set_flags(&desc, __VA_ARGS__) 385 384 386 385 /* Single flags. */