riscv: kselftests: Fix mm build by removing testcases subdirectory

kselftests fails to build because the mm/testcases subdirectory is not
created and then the compiler fails to output the binary there.

So fix this by simply removing this subdirectory which is not very
useful.

Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Reviewed-by: Charlie Jenkins <charlie@rivosinc.com>
Link: https://lore.kernel.org/r/20230915100113.13131-1-alexghiti@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/tools/testing/selftests/riscv/mm/Makefile b/tools/testing/selftests/riscv/mm/Makefile
index 11e0f05..c333263 100644 (file)
--- a/tools/testing/selftests/riscv/mm/Makefile
+++ b/tools/testing/selftests/riscv/mm/Makefile
@@ -5,11 +5,11 @@
 # 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_GEN_FILES := mmap_default mmap_bottomup
 
-TEST_PROGS := testcases/run_mmap.sh
+TEST_PROGS := run_mmap.sh
 
 include ../../lib.mk
 
-$(OUTPUT)/mm: testcases/mmap_default.c testcases/mmap_bottomup.c testcases/mmap_tests.h
+$(OUTPUT)/mm: mmap_default.c mmap_bottomup.c mmap_tests.h
        $(CC) -o$@ $(CFLAGS) $(LDFLAGS) $^

diff --git a/tools/testing/selftests/riscv/mm/mmap_bottomup.c b/tools/testing/selftests/riscv/mm/mmap_bottomup.c
new file mode 100644 (file)
index 0000000..1757d19
--- /dev/null
+++ b/tools/testing/selftests/riscv/mm/mmap_bottomup.c
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <sys/mman.h>
+#include <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/mmap_default.c b/tools/testing/selftests/riscv/mm/mmap_default.c
new file mode 100644 (file)
index 0000000..c63c60b
--- /dev/null
+++ b/tools/testing/selftests/riscv/mm/mmap_default.c
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include <sys/mman.h>
+#include <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/mmap_test.h b/tools/testing/selftests/riscv/mm/mmap_test.h
new file mode 100644 (file)
index 0000000..9b8434f
--- /dev/null
+++ b/tools/testing/selftests/riscv/mm/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;
+};
+
+static inline 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);
+}
+
+static inline 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/run_mmap.sh b/tools/testing/selftests/riscv/mm/run_mmap.sh
new file mode 100755 (executable)
index 0000000..ca5ad7c
--- /dev/null
+++ b/tools/testing/selftests/riscv/mm/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 --git a/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c b/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
deleted file mode 100644 (file)
index b29379f..0000000
--- a/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c
+++ /dev/null
@@ -1,35 +0,0 @@
-// 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
deleted file mode 100644 (file)
index d1accb9..0000000
--- a/tools/testing/selftests/riscv/mm/testcases/mmap_default.c
+++ /dev/null
@@ -1,35 +0,0 @@
-// 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
deleted file mode 100644 (file)
index 9b8434f..0000000
--- a/tools/testing/selftests/riscv/mm/testcases/mmap_test.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* 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;
-};
-
-static inline 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);
-}
-
-static inline 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
deleted file mode 100755 (executable)
index ca5ad7c..0000000
--- a/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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