diff mbox series

[v8,2/4] RISC-V: mm: Add tests for RISC-V mm

Message ID 20230727212647.4182407-3-charlie@rivosinc.com (mailing list archive)
State Superseded
Headers show
Series RISC-V: mm: Make SV48 the default address space | expand

Checks

Context Check Description
conchuod/cover_letter success Series has a cover letter
conchuod/tree_selection success Guessed tree name to be for-next at HEAD 471aba2e4760
conchuod/fixes_present success Fixes tag not required for -next series
conchuod/maintainers_pattern success MAINTAINERS pattern errors before the patch: 4 and now 4
conchuod/verify_signedoff success Signed-off-by tag matches author and committer
conchuod/kdoc success Errors and warnings before: 0 this patch: 0
conchuod/build_rv64_clang_allmodconfig success Errors and warnings before: 9 this patch: 9
conchuod/module_param success Was 0 now: 0
conchuod/build_rv64_gcc_allmodconfig success Errors and warnings before: 9 this patch: 9
conchuod/build_rv32_defconfig success Build OK
conchuod/dtb_warn_rv64 success Errors and warnings before: 3 this patch: 3
conchuod/header_inline success No static functions without inline keyword in header files
conchuod/checkpatch warning WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
conchuod/build_rv64_nommu_k210_defconfig success Build OK
conchuod/verify_fixes success No Fixes tag
conchuod/build_rv64_nommu_virt_defconfig success Build OK

Commit Message

Charlie Jenkins July 27, 2023, 9:26 p.m. UTC
Add tests that enforce mmap hint address behavior. mmap should default
to sv48. mmap will provide an address at the highest address space that
can fit into the hint address, unless the hint address is less than sv39
and not 0, then it will return a sv39 address.

These tests are split into two files: mmap_default.c and mmap_bottomup.c
because a new process must be exec'd in order to change the mmap layout.
The run_mmap.sh script sets the stack to be unlimited for the
mmap_bottomup.c test which triggers a bottomup layout.

Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
---
 tools/testing/selftests/riscv/Makefile        |  2 +-
 tools/testing/selftests/riscv/mm/.gitignore   |  2 +
 tools/testing/selftests/riscv/mm/Makefile     | 15 +++++
 .../riscv/mm/testcases/mmap_bottomup.c        | 35 ++++++++++
 .../riscv/mm/testcases/mmap_default.c         | 35 ++++++++++
 .../selftests/riscv/mm/testcases/mmap_test.h  | 64 +++++++++++++++++++
 .../selftests/riscv/mm/testcases/run_mmap.sh  | 12 ++++
 7 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 tools/testing/selftests/riscv/mm/.gitignore
 create mode 100644 tools/testing/selftests/riscv/mm/Makefile
 create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
 create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_default.c
 create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_test.h
 create mode 100755 tools/testing/selftests/riscv/mm/testcases/run_mmap.sh

Comments

Alexandre Ghiti Aug. 6, 2023, 10:06 a.m. UTC | #1
On 27/07/2023 23:26, Charlie Jenkins wrote:
> Add tests that enforce mmap hint address behavior. mmap should default
> to sv48. mmap will provide an address at the highest address space that
> can fit into the hint address, unless the hint address is less than sv39
> and not 0, then it will return a sv39 address.
>
> These tests are split into two files: mmap_default.c and mmap_bottomup.c
> because a new process must be exec'd in order to change the mmap layout.
> The run_mmap.sh script sets the stack to be unlimited for the
> mmap_bottomup.c test which triggers a bottomup layout.
>
> Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
> ---
>   tools/testing/selftests/riscv/Makefile        |  2 +-
>   tools/testing/selftests/riscv/mm/.gitignore   |  2 +
>   tools/testing/selftests/riscv/mm/Makefile     | 15 +++++
>   .../riscv/mm/testcases/mmap_bottomup.c        | 35 ++++++++++
>   .../riscv/mm/testcases/mmap_default.c         | 35 ++++++++++
>   .../selftests/riscv/mm/testcases/mmap_test.h  | 64 +++++++++++++++++++
>   .../selftests/riscv/mm/testcases/run_mmap.sh  | 12 ++++
>   7 files changed, 164 insertions(+), 1 deletion(-)
>   create mode 100644 tools/testing/selftests/riscv/mm/.gitignore
>   create mode 100644 tools/testing/selftests/riscv/mm/Makefile
>   create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
>   create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_default.c
>   create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_test.h
>   create mode 100755 tools/testing/selftests/riscv/mm/testcases/run_mmap.sh
>
> diff --git a/tools/testing/selftests/riscv/Makefile b/tools/testing/selftests/riscv/Makefile
> index f4b3d5c9af5b..4a9ff515a3a0 100644
> --- a/tools/testing/selftests/riscv/Makefile
> +++ b/tools/testing/selftests/riscv/Makefile
> @@ -5,7 +5,7 @@
>   ARCH ?= $(shell uname -m 2>/dev/null || echo not)
>   
>   ifneq (,$(filter $(ARCH),riscv))
> -RISCV_SUBTARGETS ?= hwprobe vector
> +RISCV_SUBTARGETS ?= hwprobe vector mm
>   else
>   RISCV_SUBTARGETS :=
>   endif
> diff --git a/tools/testing/selftests/riscv/mm/.gitignore b/tools/testing/selftests/riscv/mm/.gitignore
> new file mode 100644
> index 000000000000..5c2c57cb950c
> --- /dev/null
> +++ b/tools/testing/selftests/riscv/mm/.gitignore
> @@ -0,0 +1,2 @@
> +mmap_bottomup
> +mmap_default
> diff --git a/tools/testing/selftests/riscv/mm/Makefile b/tools/testing/selftests/riscv/mm/Makefile
> new file mode 100644
> index 000000000000..11e0f0568923
> --- /dev/null
> +++ b/tools/testing/selftests/riscv/mm/Makefile
> @@ -0,0 +1,15 @@
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (C) 2021 ARM Limited
> +# Originally tools/testing/arm64/abi/Makefile
> +
> +# Additional include paths needed by kselftest.h and local headers
> +CFLAGS += -D_GNU_SOURCE -std=gnu99 -I.
> +
> +TEST_GEN_FILES := testcases/mmap_default testcases/mmap_bottomup
> +
> +TEST_PROGS := testcases/run_mmap.sh
> +
> +include ../../lib.mk
> +
> +$(OUTPUT)/mm: testcases/mmap_default.c testcases/mmap_bottomup.c testcases/mmap_tests.h
> +	$(CC) -o$@ $(CFLAGS) $(LDFLAGS) $^
> diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c b/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
> new file mode 100644
> index 000000000000..b29379f7e478
> --- /dev/null
> +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
> @@ -0,0 +1,35 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +#include <sys/mman.h>
> +#include <testcases/mmap_test.h>
> +
> +#include "../../kselftest_harness.h"
> +
> +TEST(infinite_rlimit)
> +{
> +// Only works on 64 bit
> +#if __riscv_xlen == 64
> +	struct addresses mmap_addresses;
> +
> +	EXPECT_EQ(BOTTOM_UP, memory_layout());
> +
> +	do_mmaps(&mmap_addresses);
> +
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.no_hint);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_37_addr);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_38_addr);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_46_addr);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_47_addr);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_55_addr);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_56_addr);
> +
> +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.no_hint);


This test ^ will only work on sv48+ systems, if launched on a sv39 
system, it will fail


> +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_37_addr);
> +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_38_addr);
> +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_46_addr);
> +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_47_addr);
> +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_55_addr);
> +	EXPECT_GT(1UL << 56, (unsigned long)mmap_addresses.on_56_addr);
> +#endif
> +}
> +
> +TEST_HARNESS_MAIN
> diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_default.c b/tools/testing/selftests/riscv/mm/testcases/mmap_default.c
> new file mode 100644
> index 000000000000..d1accb91b726
> --- /dev/null
> +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_default.c
> @@ -0,0 +1,35 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +#include <sys/mman.h>
> +#include <testcases/mmap_test.h>
> +
> +#include "../../kselftest_harness.h"
> +
> +TEST(default_rlimit)
> +{
> +// Only works on 64 bit
> +#if __riscv_xlen == 64
> +	struct addresses mmap_addresses;
> +
> +	EXPECT_EQ(TOP_DOWN, memory_layout());
> +
> +	do_mmaps(&mmap_addresses);
> +
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.no_hint);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_37_addr);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_38_addr);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_46_addr);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_47_addr);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_55_addr);
> +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_56_addr);
> +
> +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.no_hint);
> +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_37_addr);
> +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_38_addr);
> +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_46_addr);
> +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_47_addr);
> +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_55_addr);
> +	EXPECT_GT(1UL << 56, (unsigned long)mmap_addresses.on_56_addr);
> +#endif
> +}
> +
> +TEST_HARNESS_MAIN
> diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_test.h b/tools/testing/selftests/riscv/mm/testcases/mmap_test.h
> new file mode 100644
> index 000000000000..98a892de5d19
> --- /dev/null
> +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_test.h
> @@ -0,0 +1,64 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +#ifndef _TESTCASES_MMAP_TEST_H
> +#define _TESTCASES_MMAP_TEST_H
> +#include <sys/mman.h>
> +#include <sys/resource.h>
> +#include <stddef.h>
> +
> +#define TOP_DOWN 0
> +#define BOTTOM_UP 1
> +
> +struct addresses {
> +	int *no_hint;
> +	int *on_37_addr;
> +	int *on_38_addr;
> +	int *on_46_addr;
> +	int *on_47_addr;
> +	int *on_55_addr;
> +	int *on_56_addr;
> +};
> +
> +void do_mmaps(struct addresses *mmap_addresses)


I would static inline this function definition since you are in a header 
file.


> +{
> +	/*
> +	 * Place all of the hint addresses on the boundaries of mmap
> +	 * sv39, sv48, sv57
> +	 * User addresses end at 1<<38, 1<<47, 1<<56 respectively
> +	 */
> +	void *on_37_bits = (void *)(1UL << 37);
> +	void *on_38_bits = (void *)(1UL << 38);
> +	void *on_46_bits = (void *)(1UL << 46);
> +	void *on_47_bits = (void *)(1UL << 47);
> +	void *on_55_bits = (void *)(1UL << 55);
> +	void *on_56_bits = (void *)(1UL << 56);
> +
> +	int prot = PROT_READ | PROT_WRITE;
> +	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
> +
> +	mmap_addresses->no_hint =
> +		mmap(NULL, 5 * sizeof(int), prot, flags, 0, 0);
> +	mmap_addresses->on_37_addr =
> +		mmap(on_37_bits, 5 * sizeof(int), prot, flags, 0, 0);
> +	mmap_addresses->on_38_addr =
> +		mmap(on_38_bits, 5 * sizeof(int), prot, flags, 0, 0);
> +	mmap_addresses->on_46_addr =
> +		mmap(on_46_bits, 5 * sizeof(int), prot, flags, 0, 0);
> +	mmap_addresses->on_47_addr =
> +		mmap(on_47_bits, 5 * sizeof(int), prot, flags, 0, 0);
> +	mmap_addresses->on_55_addr =
> +		mmap(on_55_bits, 5 * sizeof(int), prot, flags, 0, 0);
> +	mmap_addresses->on_56_addr =
> +		mmap(on_56_bits, 5 * sizeof(int), prot, flags, 0, 0);
> +}
> +
> +int memory_layout(void)
> +{
> +	int prot = PROT_READ | PROT_WRITE;
> +	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
> +
> +	void *value1 = mmap(NULL, sizeof(int), prot, flags, 0, 0);
> +	void *value2 = mmap(NULL, sizeof(int), prot, flags, 0, 0);
> +
> +	return value2 > value1;
> +}
> +#endif /* _TESTCASES_MMAP_TEST_H */
> diff --git a/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh b/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh
> new file mode 100755
> index 000000000000..ca5ad7c48bad
> --- /dev/null
> +++ b/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh
> @@ -0,0 +1,12 @@
> +#!/bin/sh
> +# SPDX-License-Identifier: GPL-2.0
> +
> +original_stack_limit=$(ulimit -s)
> +
> +./mmap_default
> +
> +# Force mmap_bottomup to be ran with bottomup memory due to
> +# the unlimited stack
> +ulimit -s unlimited
> +./mmap_bottomup
> +ulimit -s $original_stack_limit
Charlie Jenkins Aug. 7, 2023, 5:53 p.m. UTC | #2
On Sun, Aug 06, 2023 at 12:06:49PM +0200, Alexandre Ghiti wrote:
> 
> On 27/07/2023 23:26, Charlie Jenkins wrote:
> > Add tests that enforce mmap hint address behavior. mmap should default
> > to sv48. mmap will provide an address at the highest address space that
> > can fit into the hint address, unless the hint address is less than sv39
> > and not 0, then it will return a sv39 address.
> > 
> > These tests are split into two files: mmap_default.c and mmap_bottomup.c
> > because a new process must be exec'd in order to change the mmap layout.
> > The run_mmap.sh script sets the stack to be unlimited for the
> > mmap_bottomup.c test which triggers a bottomup layout.
> > 
> > Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
> > ---
> >   tools/testing/selftests/riscv/Makefile        |  2 +-
> >   tools/testing/selftests/riscv/mm/.gitignore   |  2 +
> >   tools/testing/selftests/riscv/mm/Makefile     | 15 +++++
> >   .../riscv/mm/testcases/mmap_bottomup.c        | 35 ++++++++++
> >   .../riscv/mm/testcases/mmap_default.c         | 35 ++++++++++
> >   .../selftests/riscv/mm/testcases/mmap_test.h  | 64 +++++++++++++++++++
> >   .../selftests/riscv/mm/testcases/run_mmap.sh  | 12 ++++
> >   7 files changed, 164 insertions(+), 1 deletion(-)
> >   create mode 100644 tools/testing/selftests/riscv/mm/.gitignore
> >   create mode 100644 tools/testing/selftests/riscv/mm/Makefile
> >   create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
> >   create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_default.c
> >   create mode 100644 tools/testing/selftests/riscv/mm/testcases/mmap_test.h
> >   create mode 100755 tools/testing/selftests/riscv/mm/testcases/run_mmap.sh
> > 
> > diff --git a/tools/testing/selftests/riscv/Makefile b/tools/testing/selftests/riscv/Makefile
> > index f4b3d5c9af5b..4a9ff515a3a0 100644
> > --- a/tools/testing/selftests/riscv/Makefile
> > +++ b/tools/testing/selftests/riscv/Makefile
> > @@ -5,7 +5,7 @@
> >   ARCH ?= $(shell uname -m 2>/dev/null || echo not)
> >   ifneq (,$(filter $(ARCH),riscv))
> > -RISCV_SUBTARGETS ?= hwprobe vector
> > +RISCV_SUBTARGETS ?= hwprobe vector mm
> >   else
> >   RISCV_SUBTARGETS :=
> >   endif
> > diff --git a/tools/testing/selftests/riscv/mm/.gitignore b/tools/testing/selftests/riscv/mm/.gitignore
> > new file mode 100644
> > index 000000000000..5c2c57cb950c
> > --- /dev/null
> > +++ b/tools/testing/selftests/riscv/mm/.gitignore
> > @@ -0,0 +1,2 @@
> > +mmap_bottomup
> > +mmap_default
> > diff --git a/tools/testing/selftests/riscv/mm/Makefile b/tools/testing/selftests/riscv/mm/Makefile
> > new file mode 100644
> > index 000000000000..11e0f0568923
> > --- /dev/null
> > +++ b/tools/testing/selftests/riscv/mm/Makefile
> > @@ -0,0 +1,15 @@
> > +# SPDX-License-Identifier: GPL-2.0
> > +# Copyright (C) 2021 ARM Limited
> > +# Originally tools/testing/arm64/abi/Makefile
> > +
> > +# Additional include paths needed by kselftest.h and local headers
> > +CFLAGS += -D_GNU_SOURCE -std=gnu99 -I.
> > +
> > +TEST_GEN_FILES := testcases/mmap_default testcases/mmap_bottomup
> > +
> > +TEST_PROGS := testcases/run_mmap.sh
> > +
> > +include ../../lib.mk
> > +
> > +$(OUTPUT)/mm: testcases/mmap_default.c testcases/mmap_bottomup.c testcases/mmap_tests.h
> > +	$(CC) -o$@ $(CFLAGS) $(LDFLAGS) $^
> > diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c b/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
> > new file mode 100644
> > index 000000000000..b29379f7e478
> > --- /dev/null
> > +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
> > @@ -0,0 +1,35 @@
> > +// SPDX-License-Identifier: GPL-2.0-only
> > +#include <sys/mman.h>
> > +#include <testcases/mmap_test.h>
> > +
> > +#include "../../kselftest_harness.h"
> > +
> > +TEST(infinite_rlimit)
> > +{
> > +// Only works on 64 bit
> > +#if __riscv_xlen == 64
> > +	struct addresses mmap_addresses;
> > +
> > +	EXPECT_EQ(BOTTOM_UP, memory_layout());
> > +
> > +	do_mmaps(&mmap_addresses);
> > +
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.no_hint);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_37_addr);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_38_addr);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_46_addr);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_47_addr);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_55_addr);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_56_addr);
> > +
> > +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.no_hint);
> 
> 
> This test ^ will only work on sv48+ systems, if launched on a sv39 system,
> it will fail
>
I may be missing something, but why would this test fail? It may not be
particularily useful since the addresses will always be in the sv39
address space, but it shouldn't fail. I have tested in QEMU and it
passes. This tests if 1UL << 47 is greater than the returned mmap address
which will always be true.
> 
> 
> > +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_37_addr);
> > +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_38_addr);
> > +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_46_addr);
> > +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_47_addr);
> > +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_55_addr);
> > +	EXPECT_GT(1UL << 56, (unsigned long)mmap_addresses.on_56_addr);
> > +#endif
> > +}
> > +
> > +TEST_HARNESS_MAIN
> > diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_default.c b/tools/testing/selftests/riscv/mm/testcases/mmap_default.c
> > new file mode 100644
> > index 000000000000..d1accb91b726
> > --- /dev/null
> > +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_default.c
> > @@ -0,0 +1,35 @@
> > +// SPDX-License-Identifier: GPL-2.0-only
> > +#include <sys/mman.h>
> > +#include <testcases/mmap_test.h>
> > +
> > +#include "../../kselftest_harness.h"
> > +
> > +TEST(default_rlimit)
> > +{
> > +// Only works on 64 bit
> > +#if __riscv_xlen == 64
> > +	struct addresses mmap_addresses;
> > +
> > +	EXPECT_EQ(TOP_DOWN, memory_layout());
> > +
> > +	do_mmaps(&mmap_addresses);
> > +
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.no_hint);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_37_addr);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_38_addr);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_46_addr);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_47_addr);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_55_addr);
> > +	EXPECT_NE(MAP_FAILED, mmap_addresses.on_56_addr);
> > +
> > +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.no_hint);
> > +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_37_addr);
> > +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_38_addr);
> > +	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_46_addr);
> > +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_47_addr);
> > +	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_55_addr);
> > +	EXPECT_GT(1UL << 56, (unsigned long)mmap_addresses.on_56_addr);
> > +#endif
> > +}
> > +
> > +TEST_HARNESS_MAIN
> > diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_test.h b/tools/testing/selftests/riscv/mm/testcases/mmap_test.h
> > new file mode 100644
> > index 000000000000..98a892de5d19
> > --- /dev/null
> > +++ b/tools/testing/selftests/riscv/mm/testcases/mmap_test.h
> > @@ -0,0 +1,64 @@
> > +/* SPDX-License-Identifier: GPL-2.0-only */
> > +#ifndef _TESTCASES_MMAP_TEST_H
> > +#define _TESTCASES_MMAP_TEST_H
> > +#include <sys/mman.h>
> > +#include <sys/resource.h>
> > +#include <stddef.h>
> > +
> > +#define TOP_DOWN 0
> > +#define BOTTOM_UP 1
> > +
> > +struct addresses {
> > +	int *no_hint;
> > +	int *on_37_addr;
> > +	int *on_38_addr;
> > +	int *on_46_addr;
> > +	int *on_47_addr;
> > +	int *on_55_addr;
> > +	int *on_56_addr;
> > +};
> > +
> > +void do_mmaps(struct addresses *mmap_addresses)
> 
> 
> I would static inline this function definition since you are in a header
> file.
> 
> 
> > +{
> > +	/*
> > +	 * Place all of the hint addresses on the boundaries of mmap
> > +	 * sv39, sv48, sv57
> > +	 * User addresses end at 1<<38, 1<<47, 1<<56 respectively
> > +	 */
> > +	void *on_37_bits = (void *)(1UL << 37);
> > +	void *on_38_bits = (void *)(1UL << 38);
> > +	void *on_46_bits = (void *)(1UL << 46);
> > +	void *on_47_bits = (void *)(1UL << 47);
> > +	void *on_55_bits = (void *)(1UL << 55);
> > +	void *on_56_bits = (void *)(1UL << 56);
> > +
> > +	int prot = PROT_READ | PROT_WRITE;
> > +	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
> > +
> > +	mmap_addresses->no_hint =
> > +		mmap(NULL, 5 * sizeof(int), prot, flags, 0, 0);
> > +	mmap_addresses->on_37_addr =
> > +		mmap(on_37_bits, 5 * sizeof(int), prot, flags, 0, 0);
> > +	mmap_addresses->on_38_addr =
> > +		mmap(on_38_bits, 5 * sizeof(int), prot, flags, 0, 0);
> > +	mmap_addresses->on_46_addr =
> > +		mmap(on_46_bits, 5 * sizeof(int), prot, flags, 0, 0);
> > +	mmap_addresses->on_47_addr =
> > +		mmap(on_47_bits, 5 * sizeof(int), prot, flags, 0, 0);
> > +	mmap_addresses->on_55_addr =
> > +		mmap(on_55_bits, 5 * sizeof(int), prot, flags, 0, 0);
> > +	mmap_addresses->on_56_addr =
> > +		mmap(on_56_bits, 5 * sizeof(int), prot, flags, 0, 0);
> > +}
> > +
> > +int memory_layout(void)
> > +{
> > +	int prot = PROT_READ | PROT_WRITE;
> > +	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
> > +
> > +	void *value1 = mmap(NULL, sizeof(int), prot, flags, 0, 0);
> > +	void *value2 = mmap(NULL, sizeof(int), prot, flags, 0, 0);
> > +
> > +	return value2 > value1;
> > +}
> > +#endif /* _TESTCASES_MMAP_TEST_H */
> > diff --git a/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh b/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh
> > new file mode 100755
> > index 000000000000..ca5ad7c48bad
> > --- /dev/null
> > +++ b/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh
> > @@ -0,0 +1,12 @@
> > +#!/bin/sh
> > +# SPDX-License-Identifier: GPL-2.0
> > +
> > +original_stack_limit=$(ulimit -s)
> > +
> > +./mmap_default
> > +
> > +# Force mmap_bottomup to be ran with bottomup memory due to
> > +# the unlimited stack
> > +ulimit -s unlimited
> > +./mmap_bottomup
> > +ulimit -s $original_stack_limit
diff mbox series

Patch

diff --git a/tools/testing/selftests/riscv/Makefile b/tools/testing/selftests/riscv/Makefile
index f4b3d5c9af5b..4a9ff515a3a0 100644
--- a/tools/testing/selftests/riscv/Makefile
+++ b/tools/testing/selftests/riscv/Makefile
@@ -5,7 +5,7 @@ 
 ARCH ?= $(shell uname -m 2>/dev/null || echo not)
 
 ifneq (,$(filter $(ARCH),riscv))
-RISCV_SUBTARGETS ?= hwprobe vector
+RISCV_SUBTARGETS ?= hwprobe vector mm
 else
 RISCV_SUBTARGETS :=
 endif
diff --git a/tools/testing/selftests/riscv/mm/.gitignore b/tools/testing/selftests/riscv/mm/.gitignore
new file mode 100644
index 000000000000..5c2c57cb950c
--- /dev/null
+++ b/tools/testing/selftests/riscv/mm/.gitignore
@@ -0,0 +1,2 @@ 
+mmap_bottomup
+mmap_default
diff --git a/tools/testing/selftests/riscv/mm/Makefile b/tools/testing/selftests/riscv/mm/Makefile
new file mode 100644
index 000000000000..11e0f0568923
--- /dev/null
+++ b/tools/testing/selftests/riscv/mm/Makefile
@@ -0,0 +1,15 @@ 
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2021 ARM Limited
+# Originally tools/testing/arm64/abi/Makefile
+
+# Additional include paths needed by kselftest.h and local headers
+CFLAGS += -D_GNU_SOURCE -std=gnu99 -I.
+
+TEST_GEN_FILES := testcases/mmap_default testcases/mmap_bottomup
+
+TEST_PROGS := testcases/run_mmap.sh
+
+include ../../lib.mk
+
+$(OUTPUT)/mm: testcases/mmap_default.c testcases/mmap_bottomup.c testcases/mmap_tests.h
+	$(CC) -o$@ $(CFLAGS) $(LDFLAGS) $^
diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c b/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
new file mode 100644
index 000000000000..b29379f7e478
--- /dev/null
+++ b/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
@@ -0,0 +1,35 @@ 
+// SPDX-License-Identifier: GPL-2.0-only
+#include <sys/mman.h>
+#include <testcases/mmap_test.h>
+
+#include "../../kselftest_harness.h"
+
+TEST(infinite_rlimit)
+{
+// Only works on 64 bit
+#if __riscv_xlen == 64
+	struct addresses mmap_addresses;
+
+	EXPECT_EQ(BOTTOM_UP, memory_layout());
+
+	do_mmaps(&mmap_addresses);
+
+	EXPECT_NE(MAP_FAILED, mmap_addresses.no_hint);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_37_addr);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_38_addr);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_46_addr);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_47_addr);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_55_addr);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_56_addr);
+
+	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.no_hint);
+	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_37_addr);
+	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_38_addr);
+	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_46_addr);
+	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_47_addr);
+	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_55_addr);
+	EXPECT_GT(1UL << 56, (unsigned long)mmap_addresses.on_56_addr);
+#endif
+}
+
+TEST_HARNESS_MAIN
diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_default.c b/tools/testing/selftests/riscv/mm/testcases/mmap_default.c
new file mode 100644
index 000000000000..d1accb91b726
--- /dev/null
+++ b/tools/testing/selftests/riscv/mm/testcases/mmap_default.c
@@ -0,0 +1,35 @@ 
+// SPDX-License-Identifier: GPL-2.0-only
+#include <sys/mman.h>
+#include <testcases/mmap_test.h>
+
+#include "../../kselftest_harness.h"
+
+TEST(default_rlimit)
+{
+// Only works on 64 bit
+#if __riscv_xlen == 64
+	struct addresses mmap_addresses;
+
+	EXPECT_EQ(TOP_DOWN, memory_layout());
+
+	do_mmaps(&mmap_addresses);
+
+	EXPECT_NE(MAP_FAILED, mmap_addresses.no_hint);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_37_addr);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_38_addr);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_46_addr);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_47_addr);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_55_addr);
+	EXPECT_NE(MAP_FAILED, mmap_addresses.on_56_addr);
+
+	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.no_hint);
+	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_37_addr);
+	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_38_addr);
+	EXPECT_GT(1UL << 38, (unsigned long)mmap_addresses.on_46_addr);
+	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_47_addr);
+	EXPECT_GT(1UL << 47, (unsigned long)mmap_addresses.on_55_addr);
+	EXPECT_GT(1UL << 56, (unsigned long)mmap_addresses.on_56_addr);
+#endif
+}
+
+TEST_HARNESS_MAIN
diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_test.h b/tools/testing/selftests/riscv/mm/testcases/mmap_test.h
new file mode 100644
index 000000000000..98a892de5d19
--- /dev/null
+++ b/tools/testing/selftests/riscv/mm/testcases/mmap_test.h
@@ -0,0 +1,64 @@ 
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef _TESTCASES_MMAP_TEST_H
+#define _TESTCASES_MMAP_TEST_H
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <stddef.h>
+
+#define TOP_DOWN 0
+#define BOTTOM_UP 1
+
+struct addresses {
+	int *no_hint;
+	int *on_37_addr;
+	int *on_38_addr;
+	int *on_46_addr;
+	int *on_47_addr;
+	int *on_55_addr;
+	int *on_56_addr;
+};
+
+void do_mmaps(struct addresses *mmap_addresses)
+{
+	/*
+	 * Place all of the hint addresses on the boundaries of mmap
+	 * sv39, sv48, sv57
+	 * User addresses end at 1<<38, 1<<47, 1<<56 respectively
+	 */
+	void *on_37_bits = (void *)(1UL << 37);
+	void *on_38_bits = (void *)(1UL << 38);
+	void *on_46_bits = (void *)(1UL << 46);
+	void *on_47_bits = (void *)(1UL << 47);
+	void *on_55_bits = (void *)(1UL << 55);
+	void *on_56_bits = (void *)(1UL << 56);
+
+	int prot = PROT_READ | PROT_WRITE;
+	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
+
+	mmap_addresses->no_hint =
+		mmap(NULL, 5 * sizeof(int), prot, flags, 0, 0);
+	mmap_addresses->on_37_addr =
+		mmap(on_37_bits, 5 * sizeof(int), prot, flags, 0, 0);
+	mmap_addresses->on_38_addr =
+		mmap(on_38_bits, 5 * sizeof(int), prot, flags, 0, 0);
+	mmap_addresses->on_46_addr =
+		mmap(on_46_bits, 5 * sizeof(int), prot, flags, 0, 0);
+	mmap_addresses->on_47_addr =
+		mmap(on_47_bits, 5 * sizeof(int), prot, flags, 0, 0);
+	mmap_addresses->on_55_addr =
+		mmap(on_55_bits, 5 * sizeof(int), prot, flags, 0, 0);
+	mmap_addresses->on_56_addr =
+		mmap(on_56_bits, 5 * sizeof(int), prot, flags, 0, 0);
+}
+
+int memory_layout(void)
+{
+	int prot = PROT_READ | PROT_WRITE;
+	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
+
+	void *value1 = mmap(NULL, sizeof(int), prot, flags, 0, 0);
+	void *value2 = mmap(NULL, sizeof(int), prot, flags, 0, 0);
+
+	return value2 > value1;
+}
+#endif /* _TESTCASES_MMAP_TEST_H */
diff --git a/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh b/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh
new file mode 100755
index 000000000000..ca5ad7c48bad
--- /dev/null
+++ b/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh
@@ -0,0 +1,12 @@ 
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+original_stack_limit=$(ulimit -s)
+
+./mmap_default
+
+# Force mmap_bottomup to be ran with bottomup memory due to
+# the unlimited stack
+ulimit -s unlimited
+./mmap_bottomup
+ulimit -s $original_stack_limit