| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <52dbc7c8-5a86-48e1-a018-7a5b8afdaaea@lucifer.local>
Date: Tue, 10 Feb 2026 17:44:55 +0000
From: Lorenzo Stoakes <lorenzo.stoakes@...cle.com>
To: "Liam R. Howlett" <Liam.Howlett@...cle.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Jarkko Sakkinen <jarkko@...nel.org>,
Dave Hansen <dave.hansen@...ux.intel.com>,
Thomas Gleixner <tglx@...nel.org>, Ingo Molnar <mingo@...hat.com>,
Borislav Petkov <bp@...en8.de>, x86@...nel.org,
"H . Peter Anvin" <hpa@...or.com>, Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Dan Williams <dan.j.williams@...el.com>,
Vishal Verma <vishal.l.verma@...el.com>,
Dave Jiang <dave.jiang@...el.com>,
Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
Maxime Ripard <mripard@...nel.org>,
Thomas Zimmermann <tzimmermann@...e.de>,
David Airlie <airlied@...il.com>, Simona Vetter <simona@...ll.ch>,
Jani Nikula <jani.nikula@...ux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@...ux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@...el.com>,
Tvrtko Ursulin <tursulin@...ulin.net>,
Christian Koenig <christian.koenig@....com>,
Huang Rui <ray.huang@....com>, Matthew Auld <matthew.auld@...el.com>,
Matthew Brost <matthew.brost@...el.com>,
Alexander Viro <viro@...iv.linux.org.uk>,
Christian Brauner <brauner@...nel.org>, Jan Kara <jack@...e.cz>,
Benjamin LaHaise <bcrl@...ck.org>, Gao Xiang <xiang@...nel.org>,
Chao Yu <chao@...nel.org>, Yue Hu <zbestahu@...il.com>,
Jeffle Xu <jefflexu@...ux.alibaba.com>,
Sandeep Dhavale <dhavale@...gle.com>,
Hongbo Li <lihongbo22@...wei.com>, Chunhai Guo <guochunhai@...o.com>,
Theodore Ts'o <tytso@....edu>,
Andreas Dilger <adilger.kernel@...ger.ca>,
Muchun Song <muchun.song@...ux.dev>,
Oscar Salvador <osalvador@...e.de>,
David Hildenbrand <david@...nel.org>,
Konstantin Komarov <almaz.alexandrovich@...agon-software.com>,
Mike Marshall <hubcap@...ibond.com>,
Martin Brandenburg <martin@...ibond.com>,
Tony Luck <tony.luck@...el.com>,
Reinette Chatre <reinette.chatre@...el.com>,
Dave Martin <Dave.Martin@....com>, James Morse <james.morse@....com>,
Babu Moger <babu.moger@....com>, Carlos Maiolino <cem@...nel.org>,
Damien Le Moal <dlemoal@...nel.org>,
Naohiro Aota <naohiro.aota@....com>,
Johannes Thumshirn <jth@...nel.org>,
Matthew Wilcox <willy@...radead.org>, Vlastimil Babka <vbabka@...e.cz>,
Mike Rapoport <rppt@...nel.org>,
Suren Baghdasaryan <surenb@...gle.com>, Michal Hocko <mhocko@...e.com>,
Hugh Dickins <hughd@...gle.com>,
Baolin Wang <baolin.wang@...ux.alibaba.com>, Zi Yan <ziy@...dia.com>,
Nico Pache <npache@...hat.com>, Ryan Roberts <ryan.roberts@....com>,
Dev Jain <dev.jain@....com>, Barry Song <baohua@...nel.org>,
Lance Yang <lance.yang@...ux.dev>, Jann Horn <jannh@...gle.com>,
Pedro Falcato <pfalcato@...e.de>, David Howells <dhowells@...hat.com>,
Paul Moore <paul@...l-moore.com>, James Morris <jmorris@...ei.org>,
"Serge E . Hallyn" <serge@...lyn.com>,
Yury Norov <yury.norov@...il.com>,
Rasmus Villemoes <linux@...musvillemoes.dk>, linux-sgx@...r.kernel.org,
linux-kernel@...r.kernel.org, nvdimm@...ts.linux.dev,
linux-cxl@...r.kernel.org, dri-devel@...ts.freedesktop.org,
intel-gfx@...ts.freedesktop.org, linux-fsdevel@...r.kernel.org,
linux-aio@...ck.org, linux-erofs@...ts.ozlabs.org,
linux-ext4@...r.kernel.org, linux-mm@...ck.org, ntfs3@...ts.linux.dev,
devel@...ts.orangefs.org, linux-xfs@...r.kernel.org,
keyrings@...r.kernel.org, linux-security-module@...r.kernel.org,
Jason Gunthorpe <jgg@...dia.com>
Subject: Re: [PATCH v2 11/13] tools/testing/vma: separate VMA userland tests
into separate files
On Mon, Feb 09, 2026 at 07:58:22PM +0000, Liam R. Howlett wrote:
> * Lorenzo Stoakes <lorenzo.stoakes@...cle.com> [260122 16:06]:
> > So far the userland VMA tests have been established as a rough expression
> > of what's been possible.
> >
> > qAdapt it into a more usable form by separating out tests and shared helper
> ^^^^ Typo
Oops, Andrew - can you fix that up? Thanks! :)
>
>
> > functions.
> >
> > Since we test functions that are declared statically in mm/vma.c, we make
> > use of the trick of #include'ing kernel C files directly.
> >
> > In order for the tests to continue to function, we must therefore also
> > this way into the tests/ directory.
> >
> > We try to keep as much shared logic actually modularised into a separate
> > compilation unit in shared.c, however the merge_existing() and attach_vma()
> > helpers rely on statically declared mm/vma.c functions so these must be
> > declared in main.c.
> >
> > Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@...cle.com>
>
> Besides that typo, it looks good.
>
> Reviewed-by: Liam R. Howlett <Liam.Howlett@...cle.com>
Thanks :)
Cheers, Lorenzo
>
> > ---
> > tools/testing/vma/Makefile | 4 +-
> > tools/testing/vma/main.c | 55 ++++
> > tools/testing/vma/shared.c | 131 ++++++++
> > tools/testing/vma/shared.h | 114 +++++++
> > tools/testing/vma/{vma.c => tests/merge.c} | 332 +--------------------
> > tools/testing/vma/tests/mmap.c | 57 ++++
> > tools/testing/vma/tests/vma.c | 39 +++
> > tools/testing/vma/vma_internal.h | 9 -
> > 8 files changed, 406 insertions(+), 335 deletions(-)
> > create mode 100644 tools/testing/vma/main.c
> > create mode 100644 tools/testing/vma/shared.c
> > create mode 100644 tools/testing/vma/shared.h
> > rename tools/testing/vma/{vma.c => tests/merge.c} (82%)
> > create mode 100644 tools/testing/vma/tests/mmap.c
> > create mode 100644 tools/testing/vma/tests/vma.c
> >
> > diff --git a/tools/testing/vma/Makefile b/tools/testing/vma/Makefile
> > index 66f3831a668f..94133d9d3955 100644
> > --- a/tools/testing/vma/Makefile
> > +++ b/tools/testing/vma/Makefile
> > @@ -6,10 +6,10 @@ default: vma
> >
> > include ../shared/shared.mk
> >
> > -OFILES = $(SHARED_OFILES) vma.o maple-shim.o
> > +OFILES = $(SHARED_OFILES) main.o shared.o maple-shim.o
> > TARGETS = vma
> >
> > -vma.o: vma.c vma_internal.h ../../../mm/vma.c ../../../mm/vma_init.c ../../../mm/vma_exec.c ../../../mm/vma.h
> > +main.o: main.c shared.c shared.h vma_internal.h tests/merge.c tests/mmap.c tests/vma.c ../../../mm/vma.c ../../../mm/vma_init.c ../../../mm/vma_exec.c ../../../mm/vma.h
> >
> > vma: $(OFILES)
> > $(CC) $(CFLAGS) -o $@ $(OFILES) $(LDLIBS)
> > diff --git a/tools/testing/vma/main.c b/tools/testing/vma/main.c
> > new file mode 100644
> > index 000000000000..49b09e97a51f
> > --- /dev/null
> > +++ b/tools/testing/vma/main.c
> > @@ -0,0 +1,55 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +
> > +#include "shared.h"
> > +/*
> > + * Directly import the VMA implementation here. Our vma_internal.h wrapper
> > + * provides userland-equivalent functionality for everything vma.c uses.
> > + */
> > +#include "../../../mm/vma_init.c"
> > +#include "../../../mm/vma_exec.c"
> > +#include "../../../mm/vma.c"
> > +
> > +/* Tests are included directly so they can test static functions in mm/vma.c. */
> > +#include "tests/merge.c"
> > +#include "tests/mmap.c"
> > +#include "tests/vma.c"
> > +
> > +/* Helper functions which utilise static kernel functions. */
> > +
> > +struct vm_area_struct *merge_existing(struct vma_merge_struct *vmg)
> > +{
> > + struct vm_area_struct *vma;
> > +
> > + vma = vma_merge_existing_range(vmg);
> > + if (vma)
> > + vma_assert_attached(vma);
> > + return vma;
> > +}
> > +
> > +int attach_vma(struct mm_struct *mm, struct vm_area_struct *vma)
> > +{
> > + int res;
> > +
> > + res = vma_link(mm, vma);
> > + if (!res)
> > + vma_assert_attached(vma);
> > + return res;
> > +}
> > +
> > +/* Main test running which invokes tests/ *.c runners. */
> > +int main(void)
> > +{
> > + int num_tests = 0, num_fail = 0;
> > +
> > + maple_tree_init();
> > + vma_state_init();
> > +
> > + run_merge_tests(&num_tests, &num_fail);
> > + run_mmap_tests(&num_tests, &num_fail);
> > + run_vma_tests(&num_tests, &num_fail);
> > +
> > + printf("%d tests run, %d passed, %d failed.\n",
> > + num_tests, num_tests - num_fail, num_fail);
> > +
> > + return num_fail == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
> > +}
> > diff --git a/tools/testing/vma/shared.c b/tools/testing/vma/shared.c
> > new file mode 100644
> > index 000000000000..bda578cc3304
> > --- /dev/null
> > +++ b/tools/testing/vma/shared.c
> > @@ -0,0 +1,131 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +
> > +#include "shared.h"
> > +
> > +
> > +bool fail_prealloc;
> > +unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
> > +unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
> > +unsigned long stack_guard_gap = 256UL<<PAGE_SHIFT;
> > +
> > +const struct vm_operations_struct vma_dummy_vm_ops;
> > +struct anon_vma dummy_anon_vma;
> > +struct task_struct __current;
> > +
> > +struct vm_area_struct *alloc_vma(struct mm_struct *mm,
> > + unsigned long start, unsigned long end,
> > + pgoff_t pgoff, vm_flags_t vm_flags)
> > +{
> > + struct vm_area_struct *vma = vm_area_alloc(mm);
> > +
> > + if (vma == NULL)
> > + return NULL;
> > +
> > + vma->vm_start = start;
> > + vma->vm_end = end;
> > + vma->vm_pgoff = pgoff;
> > + vm_flags_reset(vma, vm_flags);
> > + vma_assert_detached(vma);
> > +
> > + return vma;
> > +}
> > +
> > +void detach_free_vma(struct vm_area_struct *vma)
> > +{
> > + vma_mark_detached(vma);
> > + vm_area_free(vma);
> > +}
> > +
> > +struct vm_area_struct *alloc_and_link_vma(struct mm_struct *mm,
> > + unsigned long start, unsigned long end,
> > + pgoff_t pgoff, vm_flags_t vm_flags)
> > +{
> > + struct vm_area_struct *vma = alloc_vma(mm, start, end, pgoff, vm_flags);
> > +
> > + if (vma == NULL)
> > + return NULL;
> > +
> > + if (attach_vma(mm, vma)) {
> > + detach_free_vma(vma);
> > + return NULL;
> > + }
> > +
> > + /*
> > + * Reset this counter which we use to track whether writes have
> > + * begun. Linking to the tree will have caused this to be incremented,
> > + * which means we will get a false positive otherwise.
> > + */
> > + vma->vm_lock_seq = UINT_MAX;
> > +
> > + return vma;
> > +}
> > +
> > +void reset_dummy_anon_vma(void)
> > +{
> > + dummy_anon_vma.was_cloned = false;
> > + dummy_anon_vma.was_unlinked = false;
> > +}
> > +
> > +int cleanup_mm(struct mm_struct *mm, struct vma_iterator *vmi)
> > +{
> > + struct vm_area_struct *vma;
> > + int count = 0;
> > +
> > + fail_prealloc = false;
> > + reset_dummy_anon_vma();
> > +
> > + vma_iter_set(vmi, 0);
> > + for_each_vma(*vmi, vma) {
> > + detach_free_vma(vma);
> > + count++;
> > + }
> > +
> > + mtree_destroy(&mm->mm_mt);
> > + mm->map_count = 0;
> > + return count;
> > +}
> > +
> > +bool vma_write_started(struct vm_area_struct *vma)
> > +{
> > + int seq = vma->vm_lock_seq;
> > +
> > + /* We reset after each check. */
> > + vma->vm_lock_seq = UINT_MAX;
> > +
> > + /* The vma_start_write() stub simply increments this value. */
> > + return seq > -1;
> > +}
> > +
> > +void __vma_set_dummy_anon_vma(struct vm_area_struct *vma,
> > + struct anon_vma_chain *avc, struct anon_vma *anon_vma)
> > +{
> > + vma->anon_vma = anon_vma;
> > + INIT_LIST_HEAD(&vma->anon_vma_chain);
> > + list_add(&avc->same_vma, &vma->anon_vma_chain);
> > + avc->anon_vma = vma->anon_vma;
> > +}
> > +
> > +void vma_set_dummy_anon_vma(struct vm_area_struct *vma,
> > + struct anon_vma_chain *avc)
> > +{
> > + __vma_set_dummy_anon_vma(vma, avc, &dummy_anon_vma);
> > +}
> > +
> > +struct task_struct *get_current(void)
> > +{
> > + return &__current;
> > +}
> > +
> > +unsigned long rlimit(unsigned int limit)
> > +{
> > + return (unsigned long)-1;
> > +}
> > +
> > +void vma_set_range(struct vm_area_struct *vma,
> > + unsigned long start, unsigned long end,
> > + pgoff_t pgoff)
> > +{
> > + vma->vm_start = start;
> > + vma->vm_end = end;
> > + vma->vm_pgoff = pgoff;
> > +}
> > diff --git a/tools/testing/vma/shared.h b/tools/testing/vma/shared.h
> > new file mode 100644
> > index 000000000000..6c64211cfa22
> > --- /dev/null
> > +++ b/tools/testing/vma/shared.h
> > @@ -0,0 +1,114 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +
> > +#pragma once
> > +
> > +#include <stdbool.h>
> > +#include <stdio.h>
> > +#include <stdlib.h>
> > +
> > +#include "generated/bit-length.h"
> > +#include "maple-shared.h"
> > +#include "vma_internal.h"
> > +#include "../../../mm/vma.h"
> > +
> > +/* Simple test runner. Assumes local num_[fail, tests] counters. */
> > +#define TEST(name) \
> > + do { \
> > + (*num_tests)++; \
> > + if (!test_##name()) { \
> > + (*num_fail)++; \
> > + fprintf(stderr, "Test " #name " FAILED\n"); \
> > + } \
> > + } while (0)
> > +
> > +#define ASSERT_TRUE(_expr) \
> > + do { \
> > + if (!(_expr)) { \
> > + fprintf(stderr, \
> > + "Assert FAILED at %s:%d:%s(): %s is FALSE.\n", \
> > + __FILE__, __LINE__, __FUNCTION__, #_expr); \
> > + return false; \
> > + } \
> > + } while (0)
> > +
> > +#define ASSERT_FALSE(_expr) ASSERT_TRUE(!(_expr))
> > +#define ASSERT_EQ(_val1, _val2) ASSERT_TRUE((_val1) == (_val2))
> > +#define ASSERT_NE(_val1, _val2) ASSERT_TRUE((_val1) != (_val2))
> > +
> > +#define IS_SET(_val, _flags) ((_val & _flags) == _flags)
> > +
> > +extern bool fail_prealloc;
> > +
> > +/* Override vma_iter_prealloc() so we can choose to fail it. */
> > +#define vma_iter_prealloc(vmi, vma) \
> > + (fail_prealloc ? -ENOMEM : mas_preallocate(&(vmi)->mas, (vma), GFP_KERNEL))
> > +
> > +#define CONFIG_DEFAULT_MMAP_MIN_ADDR 65536
> > +
> > +extern unsigned long mmap_min_addr;
> > +extern unsigned long dac_mmap_min_addr;
> > +extern unsigned long stack_guard_gap;
> > +
> > +extern const struct vm_operations_struct vma_dummy_vm_ops;
> > +extern struct anon_vma dummy_anon_vma;
> > +extern struct task_struct __current;
> > +
> > +/*
> > + * Helper function which provides a wrapper around a merge existing VMA
> > + * operation.
> > + *
> > + * Declared in main.c as uses static VMA function.
> > + */
> > +struct vm_area_struct *merge_existing(struct vma_merge_struct *vmg);
> > +
> > +/*
> > + * Helper function to allocate a VMA and link it to the tree.
> > + *
> > + * Declared in main.c as uses static VMA function.
> > + */
> > +int attach_vma(struct mm_struct *mm, struct vm_area_struct *vma);
> > +
> > +/* Helper function providing a dummy vm_ops->close() method.*/
> > +static inline void dummy_close(struct vm_area_struct *)
> > +{
> > +}
> > +
> > +/* Helper function to simply allocate a VMA. */
> > +struct vm_area_struct *alloc_vma(struct mm_struct *mm,
> > + unsigned long start, unsigned long end,
> > + pgoff_t pgoff, vm_flags_t vm_flags);
> > +
> > +/* Helper function to detach and free a VMA. */
> > +void detach_free_vma(struct vm_area_struct *vma);
> > +
> > +/* Helper function to allocate a VMA and link it to the tree. */
> > +struct vm_area_struct *alloc_and_link_vma(struct mm_struct *mm,
> > + unsigned long start, unsigned long end,
> > + pgoff_t pgoff, vm_flags_t vm_flags);
> > +
> > +/*
> > + * Helper function to reset the dummy anon_vma to indicate it has not been
> > + * duplicated.
> > + */
> > +void reset_dummy_anon_vma(void);
> > +
> > +/*
> > + * Helper function to remove all VMAs and destroy the maple tree associated with
> > + * a virtual address space. Returns a count of VMAs in the tree.
> > + */
> > +int cleanup_mm(struct mm_struct *mm, struct vma_iterator *vmi);
> > +
> > +/* Helper function to determine if VMA has had vma_start_write() performed. */
> > +bool vma_write_started(struct vm_area_struct *vma);
> > +
> > +void __vma_set_dummy_anon_vma(struct vm_area_struct *vma,
> > + struct anon_vma_chain *avc, struct anon_vma *anon_vma);
> > +
> > +/* Provide a simple dummy VMA/anon_vma dummy setup for testing. */
> > +void vma_set_dummy_anon_vma(struct vm_area_struct *vma,
> > + struct anon_vma_chain *avc);
> > +
> > +/* Helper function to specify a VMA's range. */
> > +void vma_set_range(struct vm_area_struct *vma,
> > + unsigned long start, unsigned long end,
> > + pgoff_t pgoff);
> > diff --git a/tools/testing/vma/vma.c b/tools/testing/vma/tests/merge.c
> > similarity index 82%
> > rename from tools/testing/vma/vma.c
> > rename to tools/testing/vma/tests/merge.c
> > index 93d21bc7e112..3708dc6945b0 100644
> > --- a/tools/testing/vma/vma.c
> > +++ b/tools/testing/vma/tests/merge.c
> > @@ -1,132 +1,5 @@
> > // SPDX-License-Identifier: GPL-2.0-or-later
> >
> > -#include <stdbool.h>
> > -#include <stdio.h>
> > -#include <stdlib.h>
> > -
> > -#include "generated/bit-length.h"
> > -
> > -#include "maple-shared.h"
> > -#include "vma_internal.h"
> > -
> > -/* Include so header guard set. */
> > -#include "../../../mm/vma.h"
> > -
> > -static bool fail_prealloc;
> > -
> > -/* Then override vma_iter_prealloc() so we can choose to fail it. */
> > -#define vma_iter_prealloc(vmi, vma) \
> > - (fail_prealloc ? -ENOMEM : mas_preallocate(&(vmi)->mas, (vma), GFP_KERNEL))
> > -
> > -#define CONFIG_DEFAULT_MMAP_MIN_ADDR 65536
> > -
> > -unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
> > -unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
> > -unsigned long stack_guard_gap = 256UL<<PAGE_SHIFT;
> > -
> > -/*
> > - * Directly import the VMA implementation here. Our vma_internal.h wrapper
> > - * provides userland-equivalent functionality for everything vma.c uses.
> > - */
> > -#include "../../../mm/vma_init.c"
> > -#include "../../../mm/vma_exec.c"
> > -#include "../../../mm/vma.c"
> > -
> > -const struct vm_operations_struct vma_dummy_vm_ops;
> > -static struct anon_vma dummy_anon_vma;
> > -
> > -#define ASSERT_TRUE(_expr) \
> > - do { \
> > - if (!(_expr)) { \
> > - fprintf(stderr, \
> > - "Assert FAILED at %s:%d:%s(): %s is FALSE.\n", \
> > - __FILE__, __LINE__, __FUNCTION__, #_expr); \
> > - return false; \
> > - } \
> > - } while (0)
> > -#define ASSERT_FALSE(_expr) ASSERT_TRUE(!(_expr))
> > -#define ASSERT_EQ(_val1, _val2) ASSERT_TRUE((_val1) == (_val2))
> > -#define ASSERT_NE(_val1, _val2) ASSERT_TRUE((_val1) != (_val2))
> > -
> > -#define IS_SET(_val, _flags) ((_val & _flags) == _flags)
> > -
> > -static struct task_struct __current;
> > -
> > -struct task_struct *get_current(void)
> > -{
> > - return &__current;
> > -}
> > -
> > -unsigned long rlimit(unsigned int limit)
> > -{
> > - return (unsigned long)-1;
> > -}
> > -
> > -/* Helper function to simply allocate a VMA. */
> > -static struct vm_area_struct *alloc_vma(struct mm_struct *mm,
> > - unsigned long start,
> > - unsigned long end,
> > - pgoff_t pgoff,
> > - vm_flags_t vm_flags)
> > -{
> > - struct vm_area_struct *vma = vm_area_alloc(mm);
> > -
> > - if (vma == NULL)
> > - return NULL;
> > -
> > - vma->vm_start = start;
> > - vma->vm_end = end;
> > - vma->vm_pgoff = pgoff;
> > - vm_flags_reset(vma, vm_flags);
> > - vma_assert_detached(vma);
> > -
> > - return vma;
> > -}
> > -
> > -/* Helper function to allocate a VMA and link it to the tree. */
> > -static int attach_vma(struct mm_struct *mm, struct vm_area_struct *vma)
> > -{
> > - int res;
> > -
> > - res = vma_link(mm, vma);
> > - if (!res)
> > - vma_assert_attached(vma);
> > - return res;
> > -}
> > -
> > -static void detach_free_vma(struct vm_area_struct *vma)
> > -{
> > - vma_mark_detached(vma);
> > - vm_area_free(vma);
> > -}
> > -
> > -/* Helper function to allocate a VMA and link it to the tree. */
> > -static struct vm_area_struct *alloc_and_link_vma(struct mm_struct *mm,
> > - unsigned long start,
> > - unsigned long end,
> > - pgoff_t pgoff,
> > - vm_flags_t vm_flags)
> > -{
> > - struct vm_area_struct *vma = alloc_vma(mm, start, end, pgoff, vm_flags);
> > -
> > - if (vma == NULL)
> > - return NULL;
> > -
> > - if (attach_vma(mm, vma)) {
> > - detach_free_vma(vma);
> > - return NULL;
> > - }
> > -
> > - /*
> > - * Reset this counter which we use to track whether writes have
> > - * begun. Linking to the tree will have caused this to be incremented,
> > - * which means we will get a false positive otherwise.
> > - */
> > - vma->vm_lock_seq = UINT_MAX;
> > -
> > - return vma;
> > -}
> > -
> > /* Helper function which provides a wrapper around a merge new VMA operation. */
> > static struct vm_area_struct *merge_new(struct vma_merge_struct *vmg)
> > {
> > @@ -146,20 +19,6 @@ static struct vm_area_struct *merge_new(struct vma_merge_struct *vmg)
> > return vma;
> > }
> >
> > -/*
> > - * Helper function which provides a wrapper around a merge existing VMA
> > - * operation.
> > - */
> > -static struct vm_area_struct *merge_existing(struct vma_merge_struct *vmg)
> > -{
> > - struct vm_area_struct *vma;
> > -
> > - vma = vma_merge_existing_range(vmg);
> > - if (vma)
> > - vma_assert_attached(vma);
> > - return vma;
> > -}
> > -
> > /*
> > * Helper function which provides a wrapper around the expansion of an existing
> > * VMA.
> > @@ -173,8 +32,8 @@ static int expand_existing(struct vma_merge_struct *vmg)
> > * Helper function to reset merge state the associated VMA iterator to a
> > * specified new range.
> > */
> > -static void vmg_set_range(struct vma_merge_struct *vmg, unsigned long start,
> > - unsigned long end, pgoff_t pgoff, vm_flags_t vm_flags)
> > +void vmg_set_range(struct vma_merge_struct *vmg, unsigned long start,
> > + unsigned long end, pgoff_t pgoff, vm_flags_t vm_flags)
> > {
> > vma_iter_set(vmg->vmi, start);
> >
> > @@ -197,8 +56,8 @@ static void vmg_set_range(struct vma_merge_struct *vmg, unsigned long start,
> >
> > /* Helper function to set both the VMG range and its anon_vma. */
> > static void vmg_set_range_anon_vma(struct vma_merge_struct *vmg, unsigned long start,
> > - unsigned long end, pgoff_t pgoff, vm_flags_t vm_flags,
> > - struct anon_vma *anon_vma)
> > + unsigned long end, pgoff_t pgoff, vm_flags_t vm_flags,
> > + struct anon_vma *anon_vma)
> > {
> > vmg_set_range(vmg, start, end, pgoff, vm_flags);
> > vmg->anon_vma = anon_vma;
> > @@ -211,10 +70,9 @@ static void vmg_set_range_anon_vma(struct vma_merge_struct *vmg, unsigned long s
> > * VMA, link it to the maple tree and return it.
> > */
> > static struct vm_area_struct *try_merge_new_vma(struct mm_struct *mm,
> > - struct vma_merge_struct *vmg,
> > - unsigned long start, unsigned long end,
> > - pgoff_t pgoff, vm_flags_t vm_flags,
> > - bool *was_merged)
> > + struct vma_merge_struct *vmg, unsigned long start,
> > + unsigned long end, pgoff_t pgoff, vm_flags_t vm_flags,
> > + bool *was_merged)
> > {
> > struct vm_area_struct *merged;
> >
> > @@ -234,72 +92,6 @@ static struct vm_area_struct *try_merge_new_vma(struct mm_struct *mm,
> > return alloc_and_link_vma(mm, start, end, pgoff, vm_flags);
> > }
> >
> > -/*
> > - * Helper function to reset the dummy anon_vma to indicate it has not been
> > - * duplicated.
> > - */
> > -static void reset_dummy_anon_vma(void)
> > -{
> > - dummy_anon_vma.was_cloned = false;
> > - dummy_anon_vma.was_unlinked = false;
> > -}
> > -
> > -/*
> > - * Helper function to remove all VMAs and destroy the maple tree associated with
> > - * a virtual address space. Returns a count of VMAs in the tree.
> > - */
> > -static int cleanup_mm(struct mm_struct *mm, struct vma_iterator *vmi)
> > -{
> > - struct vm_area_struct *vma;
> > - int count = 0;
> > -
> > - fail_prealloc = false;
> > - reset_dummy_anon_vma();
> > -
> > - vma_iter_set(vmi, 0);
> > - for_each_vma(*vmi, vma) {
> > - detach_free_vma(vma);
> > - count++;
> > - }
> > -
> > - mtree_destroy(&mm->mm_mt);
> > - mm->map_count = 0;
> > - return count;
> > -}
> > -
> > -/* Helper function to determine if VMA has had vma_start_write() performed. */
> > -static bool vma_write_started(struct vm_area_struct *vma)
> > -{
> > - int seq = vma->vm_lock_seq;
> > -
> > - /* We reset after each check. */
> > - vma->vm_lock_seq = UINT_MAX;
> > -
> > - /* The vma_start_write() stub simply increments this value. */
> > - return seq > -1;
> > -}
> > -
> > -/* Helper function providing a dummy vm_ops->close() method.*/
> > -static void dummy_close(struct vm_area_struct *)
> > -{
> > -}
> > -
> > -static void __vma_set_dummy_anon_vma(struct vm_area_struct *vma,
> > - struct anon_vma_chain *avc,
> > - struct anon_vma *anon_vma)
> > -{
> > - vma->anon_vma = anon_vma;
> > - INIT_LIST_HEAD(&vma->anon_vma_chain);
> > - list_add(&avc->same_vma, &vma->anon_vma_chain);
> > - avc->anon_vma = vma->anon_vma;
> > -}
> > -
> > -static void vma_set_dummy_anon_vma(struct vm_area_struct *vma,
> > - struct anon_vma_chain *avc)
> > -{
> > - __vma_set_dummy_anon_vma(vma, avc, &dummy_anon_vma);
> > -}
> > -
> > static bool test_simple_merge(void)
> > {
> > struct vm_area_struct *vma;
> > @@ -1616,39 +1408,6 @@ static bool test_merge_extend(void)
> > return true;
> > }
> >
> > -static bool test_copy_vma(void)
> > -{
> > - vm_flags_t vm_flags = VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE;
> > - struct mm_struct mm = {};
> > - bool need_locks = false;
> > - VMA_ITERATOR(vmi, &mm, 0);
> > - struct vm_area_struct *vma, *vma_new, *vma_next;
> > -
> > - /* Move backwards and do not merge. */
> > -
> > - vma = alloc_and_link_vma(&mm, 0x3000, 0x5000, 3, vm_flags);
> > - vma_new = copy_vma(&vma, 0, 0x2000, 0, &need_locks);
> > - ASSERT_NE(vma_new, vma);
> > - ASSERT_EQ(vma_new->vm_start, 0);
> > - ASSERT_EQ(vma_new->vm_end, 0x2000);
> > - ASSERT_EQ(vma_new->vm_pgoff, 0);
> > - vma_assert_attached(vma_new);
> > -
> > - cleanup_mm(&mm, &vmi);
> > -
> > - /* Move a VMA into position next to another and merge the two. */
> > -
> > - vma = alloc_and_link_vma(&mm, 0, 0x2000, 0, vm_flags);
> > - vma_next = alloc_and_link_vma(&mm, 0x6000, 0x8000, 6, vm_flags);
> > - vma_new = copy_vma(&vma, 0x4000, 0x2000, 4, &need_locks);
> > - vma_assert_attached(vma_new);
> > -
> > - ASSERT_EQ(vma_new, vma_next);
> > -
> > - cleanup_mm(&mm, &vmi);
> > - return true;
> > -}
> > -
> > static bool test_expand_only_mode(void)
> > {
> > vm_flags_t vm_flags = VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE;
> > @@ -1689,73 +1448,8 @@ static bool test_expand_only_mode(void)
> > return true;
> > }
> >
> > -static bool test_mmap_region_basic(void)
> > -{
> > - struct mm_struct mm = {};
> > - unsigned long addr;
> > - struct vm_area_struct *vma;
> > - VMA_ITERATOR(vmi, &mm, 0);
> > -
> > - current->mm = &mm;
> > -
> > - /* Map at 0x300000, length 0x3000. */
> > - addr = __mmap_region(NULL, 0x300000, 0x3000,
> > - VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE,
> > - 0x300, NULL);
> > - ASSERT_EQ(addr, 0x300000);
> > -
> > - /* Map at 0x250000, length 0x3000. */
> > - addr = __mmap_region(NULL, 0x250000, 0x3000,
> > - VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE,
> > - 0x250, NULL);
> > - ASSERT_EQ(addr, 0x250000);
> > -
> > - /* Map at 0x303000, merging to 0x300000 of length 0x6000. */
> > - addr = __mmap_region(NULL, 0x303000, 0x3000,
> > - VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE,
> > - 0x303, NULL);
> > - ASSERT_EQ(addr, 0x303000);
> > -
> > - /* Map at 0x24d000, merging to 0x250000 of length 0x6000. */
> > - addr = __mmap_region(NULL, 0x24d000, 0x3000,
> > - VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE,
> > - 0x24d, NULL);
> > - ASSERT_EQ(addr, 0x24d000);
> > -
> > - ASSERT_EQ(mm.map_count, 2);
> > -
> > - for_each_vma(vmi, vma) {
> > - if (vma->vm_start == 0x300000) {
> > - ASSERT_EQ(vma->vm_end, 0x306000);
> > - ASSERT_EQ(vma->vm_pgoff, 0x300);
> > - } else if (vma->vm_start == 0x24d000) {
> > - ASSERT_EQ(vma->vm_end, 0x253000);
> > - ASSERT_EQ(vma->vm_pgoff, 0x24d);
> > - } else {
> > - ASSERT_FALSE(true);
> > - }
> > - }
> > -
> > - cleanup_mm(&mm, &vmi);
> > - return true;
> > -}
> > -
> > -int main(void)
> > +static void run_merge_tests(int *num_tests, int *num_fail)
> > {
> > - int num_tests = 0, num_fail = 0;
> > -
> > - maple_tree_init();
> > - vma_state_init();
> > -
> > -#define TEST(name) \
> > - do { \
> > - num_tests++; \
> > - if (!test_##name()) { \
> > - num_fail++; \
> > - fprintf(stderr, "Test " #name " FAILED\n"); \
> > - } \
> > - } while (0)
> > -
> > /* Very simple tests to kick the tyres. */
> > TEST(simple_merge);
> > TEST(simple_modify);
> > @@ -1771,15 +1465,5 @@ int main(void)
> > TEST(dup_anon_vma);
> > TEST(vmi_prealloc_fail);
> > TEST(merge_extend);
> > - TEST(copy_vma);
> > TEST(expand_only_mode);
> > -
> > - TEST(mmap_region_basic);
> > -
> > -#undef TEST
> > -
> > - printf("%d tests run, %d passed, %d failed.\n",
> > - num_tests, num_tests - num_fail, num_fail);
> > -
> > - return num_fail == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
> > }
> > diff --git a/tools/testing/vma/tests/mmap.c b/tools/testing/vma/tests/mmap.c
> > new file mode 100644
> > index 000000000000..bded4ecbe5db
> > --- /dev/null
> > +++ b/tools/testing/vma/tests/mmap.c
> > @@ -0,0 +1,57 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +
> > +static bool test_mmap_region_basic(void)
> > +{
> > + struct mm_struct mm = {};
> > + unsigned long addr;
> > + struct vm_area_struct *vma;
> > + VMA_ITERATOR(vmi, &mm, 0);
> > +
> > + current->mm = &mm;
> > +
> > + /* Map at 0x300000, length 0x3000. */
> > + addr = __mmap_region(NULL, 0x300000, 0x3000,
> > + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE,
> > + 0x300, NULL);
> > + ASSERT_EQ(addr, 0x300000);
> > +
> > + /* Map at 0x250000, length 0x3000. */
> > + addr = __mmap_region(NULL, 0x250000, 0x3000,
> > + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE,
> > + 0x250, NULL);
> > + ASSERT_EQ(addr, 0x250000);
> > +
> > + /* Map at 0x303000, merging to 0x300000 of length 0x6000. */
> > + addr = __mmap_region(NULL, 0x303000, 0x3000,
> > + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE,
> > + 0x303, NULL);
> > + ASSERT_EQ(addr, 0x303000);
> > +
> > + /* Map at 0x24d000, merging to 0x250000 of length 0x6000. */
> > + addr = __mmap_region(NULL, 0x24d000, 0x3000,
> > + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE,
> > + 0x24d, NULL);
> > + ASSERT_EQ(addr, 0x24d000);
> > +
> > + ASSERT_EQ(mm.map_count, 2);
> > +
> > + for_each_vma(vmi, vma) {
> > + if (vma->vm_start == 0x300000) {
> > + ASSERT_EQ(vma->vm_end, 0x306000);
> > + ASSERT_EQ(vma->vm_pgoff, 0x300);
> > + } else if (vma->vm_start == 0x24d000) {
> > + ASSERT_EQ(vma->vm_end, 0x253000);
> > + ASSERT_EQ(vma->vm_pgoff, 0x24d);
> > + } else {
> > + ASSERT_FALSE(true);
> > + }
> > + }
> > +
> > + cleanup_mm(&mm, &vmi);
> > + return true;
> > +}
> > +
> > +static void run_mmap_tests(int *num_tests, int *num_fail)
> > +{
> > + TEST(mmap_region_basic);
> > +}
> > diff --git a/tools/testing/vma/tests/vma.c b/tools/testing/vma/tests/vma.c
> > new file mode 100644
> > index 000000000000..6d9775aee243
> > --- /dev/null
> > +++ b/tools/testing/vma/tests/vma.c
> > @@ -0,0 +1,39 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +
> > +static bool test_copy_vma(void)
> > +{
> > + vm_flags_t vm_flags = VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE;
> > + struct mm_struct mm = {};
> > + bool need_locks = false;
> > + VMA_ITERATOR(vmi, &mm, 0);
> > + struct vm_area_struct *vma, *vma_new, *vma_next;
> > +
> > + /* Move backwards and do not merge. */
> > +
> > + vma = alloc_and_link_vma(&mm, 0x3000, 0x5000, 3, vm_flags);
> > + vma_new = copy_vma(&vma, 0, 0x2000, 0, &need_locks);
> > + ASSERT_NE(vma_new, vma);
> > + ASSERT_EQ(vma_new->vm_start, 0);
> > + ASSERT_EQ(vma_new->vm_end, 0x2000);
> > + ASSERT_EQ(vma_new->vm_pgoff, 0);
> > + vma_assert_attached(vma_new);
> > +
> > + cleanup_mm(&mm, &vmi);
> > +
> > + /* Move a VMA into position next to another and merge the two. */
> > +
> > + vma = alloc_and_link_vma(&mm, 0, 0x2000, 0, vm_flags);
> > + vma_next = alloc_and_link_vma(&mm, 0x6000, 0x8000, 6, vm_flags);
> > + vma_new = copy_vma(&vma, 0x4000, 0x2000, 4, &need_locks);
> > + vma_assert_attached(vma_new);
> > +
> > + ASSERT_EQ(vma_new, vma_next);
> > +
> > + cleanup_mm(&mm, &vmi);
> > + return true;
> > +}
> > +
> > +static void run_vma_tests(int *num_tests, int *num_fail)
> > +{
> > + TEST(copy_vma);
> > +}
> > diff --git a/tools/testing/vma/vma_internal.h b/tools/testing/vma/vma_internal.h
> > index 2743f12ecf32..b48ebae3927d 100644
> > --- a/tools/testing/vma/vma_internal.h
> > +++ b/tools/testing/vma/vma_internal.h
> > @@ -1127,15 +1127,6 @@ static inline void mapping_allow_writable(struct address_space *mapping)
> > atomic_inc(&mapping->i_mmap_writable);
> > }
> >
> > -static inline void vma_set_range(struct vm_area_struct *vma,
> > - unsigned long start, unsigned long end,
> > - pgoff_t pgoff)
> > -{
> > - vma->vm_start = start;
> > - vma->vm_end = end;
> > - vma->vm_pgoff = pgoff;
> > -}
> > -
> > static inline
> > struct vm_area_struct *vma_find(struct vma_iterator *vmi, unsigned long max)
> > {
> > --
> > 2.52.0
> >
Powered by blists - more mailing lists