From: Alexandre Ghiti <alexghiti@rivosinc.com>
To: Charlie Jenkins <charlie@rivosinc.com>
Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
conor@kernel.org, paul.walmsley@sifive.com, palmer@rivosinc.com,
aou@eecs.berkeley.edu, anup@brainfault.org,
konstantin@linuxfoundation.org, linux-doc@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-mm@kvack.org,
mick@ics.forth.gr, jrtc27@jrtc27.com, rdunlap@infradead.org
Subject: Re: [PATCH v6 2/4] RISC-V: mm: Add tests for RISC-V mm
Date: Thu, 20 Jul 2023 10:16:10 +0200 [thread overview]
Message-ID: <CAHVXubhT1ixqw03r+6XtPO-0V5ff7a4r4xf2zOqTMDg8xtY0UA@mail.gmail.com> (raw)
In-Reply-To: <20230714165508.94561-3-charlie@rivosinc.com>
On Fri, Jul 14, 2023 at 6:55 PM Charlie Jenkins <charlie@rivosinc.com> 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. In addition, ensure that
> rlimit changes do not cause mmap to fail.
>
> Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
> ---
> tools/testing/selftests/riscv/Makefile | 2 +-
> tools/testing/selftests/riscv/mm/.gitignore | 1 +
> tools/testing/selftests/riscv/mm/Makefile | 21 +++
> .../selftests/riscv/mm/testcases/mmap.c | 133 ++++++++++++++++++
> 4 files changed, 156 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.c
>
> diff --git a/tools/testing/selftests/riscv/Makefile b/tools/testing/selftests/riscv/Makefile
> index 9dd629cc86aa..1b79da90396e 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..9a6f303edcd3
> --- /dev/null
> +++ b/tools/testing/selftests/riscv/mm/.gitignore
> @@ -0,0 +1 @@
> +mmap
> diff --git a/tools/testing/selftests/riscv/mm/Makefile b/tools/testing/selftests/riscv/mm/Makefile
> new file mode 100644
> index 000000000000..cf68e63e7495
> --- /dev/null
> +++ b/tools/testing/selftests/riscv/mm/Makefile
> @@ -0,0 +1,21 @@
> +# SPDX-License-Identifier: GPL-2.0
> +# Originally tools/testing/selftests/arm64/signal
> +
> +# Additional include paths needed by kselftest.h and local headers
> +CFLAGS += -D_GNU_SOURCE -std=gnu99 -I.
> +
> +SRCS := $(filter-out testcases/testcases.c,$(wildcard testcases/*.c))
> +PROGS := $(patsubst %.c,%,$(SRCS))
> +
> +# Generated binaries to be installed by top KSFT script
> +TEST_GEN_PROGS := $(notdir $(PROGS))
> +
> +# Get Kernel headers installed and use them.
> +
> +# Including KSFT lib.mk here will also mangle the TEST_GEN_PROGS list
> +# to account for any OUTPUT target-dirs optionally provided by
> +# the toplevel makefile
> +include ../../lib.mk
> +
> +$(TEST_GEN_PROGS): $(PROGS)
> + cp $(PROGS) $(OUTPUT)/
> diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap.c b/tools/testing/selftests/riscv/mm/testcases/mmap.c
> new file mode 100644
> index 000000000000..d8e751f7b8c9
> --- /dev/null
> +++ b/tools/testing/selftests/riscv/mm/testcases/mmap.c
> @@ -0,0 +1,133 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +#include <sys/mman.h>
> +#include <sys/resource.h>
> +#include <sys/time.h>
> +
> +#include "../../kselftest_harness.h"
> +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
Doesn't checkpatch complain about those comments? Shouldn't you use /*
*/ instead?
> + 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);
> +}
> +
> +TEST(default_rlimit)
> +{
> +// Only works on 64 bit
> +#if __riscv_xlen == 64
> + struct addresses mmap_addresses;
> +
> + do_mmaps(&mmap_addresses);
> +
> + EXPECT_NE(mmap_addresses.no_hint, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_37_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_38_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_46_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_47_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_55_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_56_addr, MAP_FAILED);
> +
> + EXPECT_LT((unsigned long)mmap_addresses.no_hint, 1UL << 47);
> + EXPECT_LT((unsigned long)mmap_addresses.on_37_addr, 1UL << 38);
> + EXPECT_LT((unsigned long)mmap_addresses.on_38_addr, 1UL << 38);
> + EXPECT_LT((unsigned long)mmap_addresses.on_46_addr, 1UL << 38);
> + EXPECT_LT((unsigned long)mmap_addresses.on_47_addr, 1UL << 47);
> + EXPECT_LT((unsigned long)mmap_addresses.on_55_addr, 1UL << 47);
> + EXPECT_LT((unsigned long)mmap_addresses.on_56_addr, 1UL << 56);
> +#endif
> +}
> +
> +TEST(zero_rlimit)
> +{
> +// Only works on 64 bit
> +#if __riscv_xlen == 64
> + struct addresses mmap_addresses;
> + struct rlimit rlim_new = { .rlim_cur = 0, .rlim_max = RLIM_INFINITY };
> +
> + setrlimit(RLIMIT_STACK, &rlim_new);
> +
> + do_mmaps(&mmap_addresses);
> +
> + EXPECT_NE(mmap_addresses.no_hint, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_37_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_38_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_46_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_47_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_55_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_56_addr, MAP_FAILED);
> +
> + EXPECT_LT((unsigned long)mmap_addresses.no_hint, 1UL << 47);
> + EXPECT_LT((unsigned long)mmap_addresses.on_37_addr, 1UL << 38);
> + EXPECT_LT((unsigned long)mmap_addresses.on_38_addr, 1UL << 38);
> + EXPECT_LT((unsigned long)mmap_addresses.on_46_addr, 1UL << 38);
> + EXPECT_LT((unsigned long)mmap_addresses.on_47_addr, 1UL << 47);
> + EXPECT_LT((unsigned long)mmap_addresses.on_55_addr, 1UL << 47);
> + EXPECT_LT((unsigned long)mmap_addresses.on_56_addr, 1UL << 56);
> +#endif
> +}
> +
> +TEST(infinite_rlimit)
> +{
> +// Only works on 64 bit
> +#if __riscv_xlen == 64
> + struct addresses mmap_addresses;
> + struct rlimit rlim_new = { .rlim_cur = RLIM_INFINITY,
> + .rlim_max = RLIM_INFINITY };
> +
> + setrlimit(RLIMIT_STACK, &rlim_new);
> +
> + do_mmaps(&mmap_addresses);
> +
> + EXPECT_NE(mmap_addresses.no_hint, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_37_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_38_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_46_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_47_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_55_addr, MAP_FAILED);
> + EXPECT_NE(mmap_addresses.on_56_addr, MAP_FAILED);
> +
> + EXPECT_LT((unsigned long)mmap_addresses.no_hint, 1UL << 47);
> + EXPECT_LT((unsigned long)mmap_addresses.on_37_addr, 1UL << 38);
> + EXPECT_LT((unsigned long)mmap_addresses.on_38_addr, 1UL << 38);
> + EXPECT_LT((unsigned long)mmap_addresses.on_46_addr, 1UL << 38);
> + EXPECT_LT((unsigned long)mmap_addresses.on_47_addr, 1UL << 47);
> + EXPECT_LT((unsigned long)mmap_addresses.on_55_addr, 1UL << 47);
> + EXPECT_LT((unsigned long)mmap_addresses.on_56_addr, 1UL << 56);
> +#endif
> +}
> +
> +TEST_HARNESS_MAIN
> --
> 2.41.0
>
next prev parent reply other threads:[~2023-07-20 8:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-14 16:54 [PATCH v6 0/4] RISC-V: mm: Make SV48 the default address space Charlie Jenkins
2023-07-14 16:54 ` [PATCH v6 1/4] RISC-V: mm: Restrict address space for sv39,sv48,sv57 Charlie Jenkins
2023-07-20 8:13 ` Alexandre Ghiti
2023-07-26 14:02 ` Charlie Jenkins
2023-07-14 16:54 ` [PATCH v6 2/4] RISC-V: mm: Add tests for RISC-V mm Charlie Jenkins
2023-07-20 8:16 ` Alexandre Ghiti [this message]
2023-07-14 16:54 ` [PATCH v6 3/4] RISC-V: mm: Update pgtable comment documentation Charlie Jenkins
2023-07-20 7:00 ` Alexandre Ghiti
2023-07-14 16:54 ` [PATCH v6 4/4] RISC-V: mm: Document mmap changes Charlie Jenkins
2023-07-20 6:59 ` Alexandre Ghiti
2023-07-26 13:52 ` Charlie Jenkins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAHVXubhT1ixqw03r+6XtPO-0V5ff7a4r4xf2zOqTMDg8xtY0UA@mail.gmail.com \
--to=alexghiti@rivosinc.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=charlie@rivosinc.com \
--cc=conor@kernel.org \
--cc=jrtc27@jrtc27.com \
--cc=konstantin@linuxfoundation.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-riscv@lists.infradead.org \
--cc=mick@ics.forth.gr \
--cc=palmer@rivosinc.com \
--cc=paul.walmsley@sifive.com \
--cc=rdunlap@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox