tools/testing/vma: eliminate dependency on vma->__vm_flags

The userland VMA test code relied on an internal implementation detail -
the existence of vma->__vm_flags to directly access VMA flags. There is
no need to do so when we have the vm_flags_*() helper functions available.

This is ugly, but also a subsequent commit will eliminate this field
altogether so this will shortly become broken.

This patch has us utilise the helper functions instead.

Link: https://lkml.kernel.org/r/6275c53[e-mail]
Signed-off-by: Lorenzo Stoakes <[e-mail]>
Acked-by: Vlastimil Babka <[e-mail]>
Acked-by: Pedro Falcato <[e-mail]>
Acked-by: Alice Ryhl <[e-mail]> [rust]
Cc: Alex Gaynor <[e-mail]>
Cc: Alistair Popple <[e-mail]>
Cc: Andreas Hindborg <[e-mail]>
Cc: Axel Rasmussen <[e-mail]>
Cc: Baolin Wang <[e-mail]>
Cc: Baoquan He <[e-mail]>
Cc: Barry Song <[e-mail]>
Cc: Ben Segall <[e-mail]>
Cc: Björn Roy Baron <[e-mail]>
Cc: Boqun Feng <[e-mail]>
Cc: Byungchul Park <[e-mail]>
Cc: Chengming Zhou <[e-mail]>
Cc: Chris Li <[e-mail]>
Cc: Danilo Krummrich <[e-mail]>
Cc: David Hildenbrand <[e-mail]>
Cc: David Rientjes <[e-mail]>
Cc: Dev Jain <[e-mail]>
Cc: Dietmar Eggemann <[e-mail]>
Cc: Gary Guo <[e-mail]>
Cc: Gregory Price <[e-mail]>
Cc: "Huang, Ying" <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: Jann Horn <[e-mail]>
Cc: Jason Gunthorpe <[e-mail]>
Cc: Johannes Weiner <[e-mail]>
Cc: John Hubbard <[e-mail]>
Cc: Joshua Hahn <[e-mail]>
Cc: Juri Lelli <[e-mail]>
Cc: Kairui Song <[e-mail]>
Cc: Kees Cook <[e-mail]>
Cc: Kemeng Shi <[e-mail]>
Cc: Lance Yang <[e-mail]>
Cc: Leon Romanovsky <[e-mail]>
Cc: Liam Howlett <[e-mail]>
Cc: Mathew Brost <[e-mail]>
Cc: Matthew Wilcox (Oracle) <[e-mail]>
Cc: Mel Gorman <mgorman <[e-mail]>
Cc: Michal Hocko <[e-mail]>
Cc: Miguel Ojeda <[e-mail]>
Cc: Mike Rapoport <[e-mail]>
Cc: Muchun Song <[e-mail]>
Cc: Nhat Pham <[e-mail]>
Cc: Nico Pache <[e-mail]>
Cc: Oscar Salvador <[e-mail]>
Cc: Peter Xu <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Qi Zheng <[e-mail]>
Cc: Rakie Kim <[e-mail]>
Cc: Rik van Riel <[e-mail]>
Cc: Ryan Roberts <[e-mail]>
Cc: Shakeel Butt <[e-mail]>
Cc: Steven Rostedt <[e-mail]>
Cc: Suren Baghdasaryan <[e-mail]>
Cc: Trevor Gross <[e-mail]>
Cc: Valentin Schneider <[e-mail]>
Cc: Vincent Guittot <[e-mail]>
Cc: Wei Xu <[e-mail]>
Cc: xu xin <[e-mail]>
Cc: Yuanchu Xie <[e-mail]>
Cc: Zi Yan <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>

tools/testing/vma/vma.c

···
 					pgoff_t pgoff,
 					vm_flags_t vm_flags)
 {
-	struct vm_area_struct *ret = vm_area_alloc(mm);
+	struct vm_area_struct *vma = vm_area_alloc(mm);
 
-	if (ret == NULL)
+	if (vma == NULL)
 		return NULL;
 
-	ret->vm_start = start;
-	ret->vm_end = end;
-	ret->vm_pgoff = pgoff;
-	ret->__vm_flags = vm_flags;
-	vma_assert_detached(ret);
+	vma->vm_start = start;
+	vma->vm_end = end;
+	vma->vm_pgoff = pgoff;
+	vm_flags_reset(vma, vm_flags);
+	vma_assert_detached(vma);
 
-	return ret;
+	return vma;
 }
 
 /* Helper function to allocate a VMA and link it to the tree. */
···
 	for (i = 0; i < ARRAY_SIZE(special_flags); i++) {
 		vm_flags_t special_flag = special_flags[i];
 
-		vma_left->__vm_flags = vm_flags | special_flag;
+		vm_flags_reset(vma_left, vm_flags | special_flag);
 		vmg.vm_flags = vm_flags | special_flag;
 		vma = merge_new(&vmg);
 		ASSERT_EQ(vma, NULL);
···
 	for (i = 0; i < ARRAY_SIZE(special_flags); i++) {
 		vm_flags_t special_flag = special_flags[i];
 
-		vma_left->__vm_flags = vm_flags | special_flag;
+		vm_flags_reset(vma_left, vm_flags | special_flag);
 		vmg.vm_flags = vm_flags | special_flag;
 		vma = merge_existing(&vmg);
 		ASSERT_EQ(vma, NULL);