From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-kernel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-fsdevel@vger.kernel.org, maple-tree@lists.infradead.org
Subject: [PATCH v2 4/5] tools: Add support for running rosebush tests in userspace
Date: Tue, 25 Jun 2024 22:17:59 +0100 [thread overview]
Message-ID: <20240625211803.2750563-5-willy@infradead.org> (raw)
In-Reply-To: <20240625211803.2750563-1-willy@infradead.org>
Enable make -C tools/testing/radix-tree. Much easier to debug than
an in-kernel module.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
tools/include/linux/rosebush.h | 1 +
tools/testing/radix-tree/.gitignore | 1 +
tools/testing/radix-tree/Makefile | 6 ++++-
tools/testing/radix-tree/kunit/test.h | 20 +++++++++++++++
tools/testing/radix-tree/rosebush.c | 36 +++++++++++++++++++++++++++
5 files changed, 63 insertions(+), 1 deletion(-)
create mode 100644 tools/include/linux/rosebush.h
create mode 100644 tools/testing/radix-tree/kunit/test.h
create mode 100644 tools/testing/radix-tree/rosebush.c
diff --git a/tools/include/linux/rosebush.h b/tools/include/linux/rosebush.h
new file mode 100644
index 000000000000..3f12f4288250
--- /dev/null
+++ b/tools/include/linux/rosebush.h
@@ -0,0 +1 @@
+#include "../../../include/linux/rosebush.h"
diff --git a/tools/testing/radix-tree/.gitignore b/tools/testing/radix-tree/.gitignore
index 49bccb90c35b..fb154f26bdab 100644
--- a/tools/testing/radix-tree/.gitignore
+++ b/tools/testing/radix-tree/.gitignore
@@ -9,3 +9,4 @@ radix-tree.c
xarray
maple
ma_xa_benchmark
+rosebush
diff --git a/tools/testing/radix-tree/Makefile b/tools/testing/radix-tree/Makefile
index 7527f738b4a1..982ff4b7fdeb 100644
--- a/tools/testing/radix-tree/Makefile
+++ b/tools/testing/radix-tree/Makefile
@@ -4,7 +4,7 @@ CFLAGS += -I. -I../../include -I../../../lib -g -Og -Wall \
-D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined
LDFLAGS += -fsanitize=address -fsanitize=undefined
LDLIBS+= -lpthread -lurcu
-TARGETS = main idr-test multiorder xarray maple
+TARGETS = main idr-test multiorder xarray maple rosebush
CORE_OFILES := xarray.o radix-tree.o idr.o linux.o test.o find_bit.o bitmap.o \
slab.o maple.o
OFILES = main.o $(CORE_OFILES) regression1.o regression2.o regression3.o \
@@ -36,6 +36,8 @@ xarray: $(CORE_OFILES)
maple: $(CORE_OFILES)
+rosebush: $(CORE_OFILES)
+
multiorder: multiorder.o $(CORE_OFILES)
clean:
@@ -62,6 +64,8 @@ xarray.o: ../../../lib/xarray.c ../../../lib/test_xarray.c
maple.o: ../../../lib/maple_tree.c ../../../lib/test_maple_tree.c
+rosebush.o: ../../../lib/rosebush.c ../../../lib/test_rosebush.c
+
generated/map-shift.h:
@if ! grep -qws $(SHIFT) generated/map-shift.h; then \
echo "#define XA_CHUNK_SHIFT $(SHIFT)" > \
diff --git a/tools/testing/radix-tree/kunit/test.h b/tools/testing/radix-tree/kunit/test.h
new file mode 100644
index 000000000000..0805e3695762
--- /dev/null
+++ b/tools/testing/radix-tree/kunit/test.h
@@ -0,0 +1,20 @@
+struct kunit {
+};
+
+struct kunit_case {
+ void (*run_case)(struct kunit *test);
+};
+
+struct kunit_suite {
+ char *name;
+ struct kunit_case *test_cases;
+};
+
+#define KUNIT_CASE(test_name) { .run_case = test_name, }
+#define kunit_test_suite(x)
+
+#define KUNIT_EXPECT_EQ(test, left, right) \
+ KUNIT_EXPECT_PTR_EQ_MSG(test, left, right, NULL)
+#define KUNIT_EXPECT_PTR_EQ_MSG(test, left, right, fmt, ...) \
+ assert(left == right)
+
diff --git a/tools/testing/radix-tree/rosebush.c b/tools/testing/radix-tree/rosebush.c
new file mode 100644
index 000000000000..51703737833e
--- /dev/null
+++ b/tools/testing/radix-tree/rosebush.c
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * rosebush.c: Userspace testing for rosebush test-suite
+ * Copyright (c) 2024 Oracle Corporation
+ * Author: Matthew Wilcox <willy@infradead.org>
+ */
+
+#include "test.h"
+#include <stdlib.h>
+#include <time.h>
+
+#define module_init(x)
+#define module_exit(x)
+#define MODULE_AUTHOR(x)
+#define MODULE_LICENSE(x)
+#define dump_stack() assert(0)
+
+#include "../../../lib/rosebush.c"
+#include "../../../lib/test_rosebush.c"
+
+int __weak main(void)
+{
+ struct kunit test;
+ int i;
+
+ assert(rosebush_suite.test_cases == rosebush_cases);
+
+ for (i = 0; i < ARRAY_SIZE(rosebush_cases); i++) {
+ if (!rosebush_cases[i].run_case)
+ continue;
+ printf("i = %d %p\n", i, rosebush_cases[i].run_case);
+ rosebush_cases[i].run_case(&test);
+ }
+
+ return 0;
+}
--
2.43.0
next prev parent reply other threads:[~2024-06-25 21:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-25 21:17 [PATCH v2 0/5] Rosebush, a new hash table Matthew Wilcox (Oracle)
2024-06-25 21:17 ` [PATCH v2 1/5] tools: Add kernel stubs needed for rosebush Matthew Wilcox (Oracle)
2024-06-25 21:17 ` [PATCH v2 2/5] rosebush: Add new data structure Matthew Wilcox (Oracle)
2024-06-25 23:36 ` Dr. David Alan Gilbert
2024-06-26 13:16 ` Matthew Wilcox
2024-06-26 13:07 ` Matthew Wilcox
2024-06-29 19:45 ` Markus Elfring
2024-07-01 1:32 ` Matthew Wilcox
2024-07-01 5:21 ` [v2 " Markus Elfring
2024-07-01 14:18 ` Paul E. McKenney
2024-07-02 1:04 ` [PATCH v2 " Bagas Sanjaya
2024-06-25 21:17 ` [PATCH v2 3/5] rosebush: Add test suite Matthew Wilcox (Oracle)
2024-06-28 15:18 ` Pankaj Raghav (Samsung)
2024-06-29 5:13 ` Jeff Johnson
2024-06-25 21:17 ` Matthew Wilcox (Oracle) [this message]
2024-06-29 5:15 ` [PATCH v2 4/5] tools: Add support for running rosebush tests in userspace Jeff Johnson
2024-06-25 21:18 ` [PATCH v2 5/5] dcache: Convert to use rosebush Matthew Wilcox (Oracle)
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=20240625211803.2750563-5-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maple-tree@lists.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;
as well as URLs for NNTP newsgroup(s).