| Message ID | c23f1b80c62bc906267a8b144befe7ac96daa88c.1719481836.git.lstoakes@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Make core VMA operations internal and testable | expand |
* Lorenzo Stoakes <lstoakes@gmail.com> [240627 06:39]: > The core components contained within the radix-tree tests which provide > shims for kernel headers and access to the maple tree are useful for > testing other things, so separate them out and make the radix tree tests > dependent on the shared components. > > This lays the groundwork for us to add VMA tests of the newly introduced > vma.c file. This separation and subsequent patch requires building the xarray-hsared, radix-tree, idr, find_bit, and bitmap .o files which are unneeded for the target 'main'. I'm not a build expert on how to fix this, but could that be reduced to the minimum set somehow? > > Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com> > --- > tools/testing/radix-tree/Makefile | 68 +++---------------- > tools/testing/radix-tree/maple.c | 14 +--- > tools/testing/radix-tree/xarray.c | 9 +-- > tools/testing/shared/autoconf.h | 2 + > tools/testing/{radix-tree => shared}/bitmap.c | 0 > tools/testing/{radix-tree => shared}/linux.c | 0 > .../{radix-tree => shared}/linux/bug.h | 0 > .../{radix-tree => shared}/linux/cpu.h | 0 > .../{radix-tree => shared}/linux/idr.h | 0 > .../{radix-tree => shared}/linux/init.h | 0 > .../{radix-tree => shared}/linux/kconfig.h | 0 > .../{radix-tree => shared}/linux/kernel.h | 0 > .../{radix-tree => shared}/linux/kmemleak.h | 0 > .../{radix-tree => shared}/linux/local_lock.h | 0 > .../{radix-tree => shared}/linux/lockdep.h | 0 > .../{radix-tree => shared}/linux/maple_tree.h | 0 > .../{radix-tree => shared}/linux/percpu.h | 0 > .../{radix-tree => shared}/linux/preempt.h | 0 > .../{radix-tree => shared}/linux/radix-tree.h | 0 > .../{radix-tree => shared}/linux/rcupdate.h | 0 > .../{radix-tree => shared}/linux/xarray.h | 0 > tools/testing/shared/maple-shared.h | 9 +++ > tools/testing/shared/maple-shim.c | 7 ++ > tools/testing/shared/shared.h | 34 ++++++++++ > tools/testing/shared/shared.mk | 68 +++++++++++++++++++ > .../testing/shared/trace/events/maple_tree.h | 5 ++ > tools/testing/shared/xarray-shared.c | 5 ++ > tools/testing/shared/xarray-shared.h | 4 ++ > 28 files changed, 147 insertions(+), 78 deletions(-) > create mode 100644 tools/testing/shared/autoconf.h > rename tools/testing/{radix-tree => shared}/bitmap.c (100%) > rename tools/testing/{radix-tree => shared}/linux.c (100%) > rename tools/testing/{radix-tree => shared}/linux/bug.h (100%) > rename tools/testing/{radix-tree => shared}/linux/cpu.h (100%) > rename tools/testing/{radix-tree => shared}/linux/idr.h (100%) > rename tools/testing/{radix-tree => shared}/linux/init.h (100%) > rename tools/testing/{radix-tree => shared}/linux/kconfig.h (100%) > rename tools/testing/{radix-tree => shared}/linux/kernel.h (100%) > rename tools/testing/{radix-tree => shared}/linux/kmemleak.h (100%) > rename tools/testing/{radix-tree => shared}/linux/local_lock.h (100%) > rename tools/testing/{radix-tree => shared}/linux/lockdep.h (100%) > rename tools/testing/{radix-tree => shared}/linux/maple_tree.h (100%) > rename tools/testing/{radix-tree => shared}/linux/percpu.h (100%) > rename tools/testing/{radix-tree => shared}/linux/preempt.h (100%) > rename tools/testing/{radix-tree => shared}/linux/radix-tree.h (100%) > rename tools/testing/{radix-tree => shared}/linux/rcupdate.h (100%) > rename tools/testing/{radix-tree => shared}/linux/xarray.h (100%) > create mode 100644 tools/testing/shared/maple-shared.h > create mode 100644 tools/testing/shared/maple-shim.c > create mode 100644 tools/testing/shared/shared.h > create mode 100644 tools/testing/shared/shared.mk > create mode 100644 tools/testing/shared/trace/events/maple_tree.h > create mode 100644 tools/testing/shared/xarray-shared.c > create mode 100644 tools/testing/shared/xarray-shared.h > > diff --git a/tools/testing/radix-tree/Makefile b/tools/testing/radix-tree/Makefile > index 7527f738b4a1..29d607063749 100644 > --- a/tools/testing/radix-tree/Makefile > +++ b/tools/testing/radix-tree/Makefile > @@ -1,29 +1,16 @@ > # SPDX-License-Identifier: GPL-2.0 > > -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 > -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 \ > - regression4.o tag_check.o multiorder.o idr-test.o iteration_check.o \ > - iteration_check_2.o benchmark.o > +.PHONY: default > > -ifndef SHIFT > - SHIFT=3 > -endif > +default: main > > -ifeq ($(BUILD), 32) > - CFLAGS += -m32 > - LDFLAGS += -m32 > -LONG_BIT := 32 > -endif > +include ../shared/shared.mk > > -ifndef LONG_BIT > -LONG_BIT := $(shell getconf LONG_BIT) > -endif > +TARGETS = main idr-test multiorder xarray maple > +CORE_OFILES = $(SHARED_OFILES) xarray.o maple.o test.o > +OFILES = main.o $(CORE_OFILES) regression1.o regression2.o \ > + regression3.o regression4.o tag_check.o multiorder.o idr-test.o \ > + iteration_check.o iteration_check_2.o benchmark.o > > targets: generated/map-shift.h generated/bit-length.h $(TARGETS) > > @@ -32,46 +19,13 @@ main: $(OFILES) > idr-test.o: ../../../lib/test_ida.c > idr-test: idr-test.o $(CORE_OFILES) > > -xarray: $(CORE_OFILES) > +xarray: $(CORE_OFILES) xarray.o > > -maple: $(CORE_OFILES) > +maple: $(CORE_OFILES) maple.o > > multiorder: multiorder.o $(CORE_OFILES) > > clean: > $(RM) $(TARGETS) *.o radix-tree.c idr.c generated/map-shift.h generated/bit-length.h > > -vpath %.c ../../lib > - > -$(OFILES): Makefile *.h */*.h generated/map-shift.h generated/bit-length.h \ > - ../../include/linux/*.h \ > - ../../include/asm/*.h \ > - ../../../include/linux/xarray.h \ > - ../../../include/linux/maple_tree.h \ > - ../../../include/linux/radix-tree.h \ > - ../../../lib/radix-tree.h \ > - ../../../include/linux/idr.h > - > -radix-tree.c: ../../../lib/radix-tree.c > - sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ > - > -idr.c: ../../../lib/idr.c > - sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ > - > -xarray.o: ../../../lib/xarray.c ../../../lib/test_xarray.c > - > -maple.o: ../../../lib/maple_tree.c ../../../lib/test_maple_tree.c > - > -generated/map-shift.h: > - @if ! grep -qws $(SHIFT) generated/map-shift.h; then \ > - echo "#define XA_CHUNK_SHIFT $(SHIFT)" > \ > - generated/map-shift.h; \ > - fi > - > -generated/bit-length.h: FORCE > - @if ! grep -qws CONFIG_$(LONG_BIT)BIT generated/bit-length.h; then \ > - echo "Generating $@"; \ > - echo "#define CONFIG_$(LONG_BIT)BIT 1" > $@; \ > - fi > - > -FORCE: ; > +$(OFILES): $(SHARED_DEPS) *.h */*.h > diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c > index f1caf4bcf937..5b53ecf22fc4 100644 > --- a/tools/testing/radix-tree/maple.c > +++ b/tools/testing/radix-tree/maple.c > @@ -8,20 +8,8 @@ > * difficult to handle in kernel tests. > */ > > -#define CONFIG_DEBUG_MAPLE_TREE > -#define CONFIG_MAPLE_SEARCH > -#define MAPLE_32BIT (MAPLE_NODE_SLOTS > 31) > +#include "maple-shared.h" > #include "test.h" > -#include <stdlib.h> > -#include <time.h> > -#include "linux/init.h" > - > -#define module_init(x) > -#define module_exit(x) > -#define MODULE_AUTHOR(x) > -#define MODULE_LICENSE(x) > -#define dump_stack() assert(0) > - > #include "../../../lib/maple_tree.c" > #include "../../../lib/test_maple_tree.c" > > diff --git a/tools/testing/radix-tree/xarray.c b/tools/testing/radix-tree/xarray.c > index f20e12cbbfd4..253208a8541b 100644 > --- a/tools/testing/radix-tree/xarray.c > +++ b/tools/testing/radix-tree/xarray.c > @@ -4,16 +4,9 @@ > * Copyright (c) 2018 Matthew Wilcox <willy@infradead.org> > */ > > -#define XA_DEBUG > +#include "xarray-shared.h" > #include "test.h" > > -#define module_init(x) > -#define module_exit(x) > -#define MODULE_AUTHOR(x) > -#define MODULE_LICENSE(x) > -#define dump_stack() assert(0) > - > -#include "../../../lib/xarray.c" > #undef XA_DEBUG > #include "../../../lib/test_xarray.c" > > diff --git a/tools/testing/shared/autoconf.h b/tools/testing/shared/autoconf.h > new file mode 100644 > index 000000000000..92dc474c349b > --- /dev/null > +++ b/tools/testing/shared/autoconf.h > @@ -0,0 +1,2 @@ > +#include "bit-length.h" > +#define CONFIG_XARRAY_MULTI 1 > diff --git a/tools/testing/radix-tree/bitmap.c b/tools/testing/shared/bitmap.c > similarity index 100% > rename from tools/testing/radix-tree/bitmap.c > rename to tools/testing/shared/bitmap.c > diff --git a/tools/testing/radix-tree/linux.c b/tools/testing/shared/linux.c > similarity index 100% > rename from tools/testing/radix-tree/linux.c > rename to tools/testing/shared/linux.c > diff --git a/tools/testing/radix-tree/linux/bug.h b/tools/testing/shared/linux/bug.h > similarity index 100% > rename from tools/testing/radix-tree/linux/bug.h > rename to tools/testing/shared/linux/bug.h > diff --git a/tools/testing/radix-tree/linux/cpu.h b/tools/testing/shared/linux/cpu.h > similarity index 100% > rename from tools/testing/radix-tree/linux/cpu.h > rename to tools/testing/shared/linux/cpu.h > diff --git a/tools/testing/radix-tree/linux/idr.h b/tools/testing/shared/linux/idr.h > similarity index 100% > rename from tools/testing/radix-tree/linux/idr.h > rename to tools/testing/shared/linux/idr.h > diff --git a/tools/testing/radix-tree/linux/init.h b/tools/testing/shared/linux/init.h > similarity index 100% > rename from tools/testing/radix-tree/linux/init.h > rename to tools/testing/shared/linux/init.h > diff --git a/tools/testing/radix-tree/linux/kconfig.h b/tools/testing/shared/linux/kconfig.h > similarity index 100% > rename from tools/testing/radix-tree/linux/kconfig.h > rename to tools/testing/shared/linux/kconfig.h > diff --git a/tools/testing/radix-tree/linux/kernel.h b/tools/testing/shared/linux/kernel.h > similarity index 100% > rename from tools/testing/radix-tree/linux/kernel.h > rename to tools/testing/shared/linux/kernel.h > diff --git a/tools/testing/radix-tree/linux/kmemleak.h b/tools/testing/shared/linux/kmemleak.h > similarity index 100% > rename from tools/testing/radix-tree/linux/kmemleak.h > rename to tools/testing/shared/linux/kmemleak.h > diff --git a/tools/testing/radix-tree/linux/local_lock.h b/tools/testing/shared/linux/local_lock.h > similarity index 100% > rename from tools/testing/radix-tree/linux/local_lock.h > rename to tools/testing/shared/linux/local_lock.h > diff --git a/tools/testing/radix-tree/linux/lockdep.h b/tools/testing/shared/linux/lockdep.h > similarity index 100% > rename from tools/testing/radix-tree/linux/lockdep.h > rename to tools/testing/shared/linux/lockdep.h > diff --git a/tools/testing/radix-tree/linux/maple_tree.h b/tools/testing/shared/linux/maple_tree.h > similarity index 100% > rename from tools/testing/radix-tree/linux/maple_tree.h > rename to tools/testing/shared/linux/maple_tree.h > diff --git a/tools/testing/radix-tree/linux/percpu.h b/tools/testing/shared/linux/percpu.h > similarity index 100% > rename from tools/testing/radix-tree/linux/percpu.h > rename to tools/testing/shared/linux/percpu.h > diff --git a/tools/testing/radix-tree/linux/preempt.h b/tools/testing/shared/linux/preempt.h > similarity index 100% > rename from tools/testing/radix-tree/linux/preempt.h > rename to tools/testing/shared/linux/preempt.h > diff --git a/tools/testing/radix-tree/linux/radix-tree.h b/tools/testing/shared/linux/radix-tree.h > similarity index 100% > rename from tools/testing/radix-tree/linux/radix-tree.h > rename to tools/testing/shared/linux/radix-tree.h > diff --git a/tools/testing/radix-tree/linux/rcupdate.h b/tools/testing/shared/linux/rcupdate.h > similarity index 100% > rename from tools/testing/radix-tree/linux/rcupdate.h > rename to tools/testing/shared/linux/rcupdate.h > diff --git a/tools/testing/radix-tree/linux/xarray.h b/tools/testing/shared/linux/xarray.h > similarity index 100% > rename from tools/testing/radix-tree/linux/xarray.h > rename to tools/testing/shared/linux/xarray.h > diff --git a/tools/testing/shared/maple-shared.h b/tools/testing/shared/maple-shared.h > new file mode 100644 > index 000000000000..3d847edd149d > --- /dev/null > +++ b/tools/testing/shared/maple-shared.h > @@ -0,0 +1,9 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > + > +#define CONFIG_DEBUG_MAPLE_TREE > +#define CONFIG_MAPLE_SEARCH > +#define MAPLE_32BIT (MAPLE_NODE_SLOTS > 31) > +#include "shared.h" > +#include <stdlib.h> > +#include <time.h> > +#include "linux/init.h" > diff --git a/tools/testing/shared/maple-shim.c b/tools/testing/shared/maple-shim.c > new file mode 100644 > index 000000000000..640df76f483e > --- /dev/null > +++ b/tools/testing/shared/maple-shim.c > @@ -0,0 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > + > +/* Very simple shim around the maple tree. */ > + > +#include "maple-shared.h" > + > +#include "../../../lib/maple_tree.c" > diff --git a/tools/testing/shared/shared.h b/tools/testing/shared/shared.h > new file mode 100644 > index 000000000000..495602e60b65 > --- /dev/null > +++ b/tools/testing/shared/shared.h > @@ -0,0 +1,34 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#include <linux/types.h> > +#include <linux/bug.h> > +#include <linux/kernel.h> > +#include <linux/bitops.h> > + > +#include <linux/gfp.h> > +#include <linux/types.h> > +#include <linux/rcupdate.h> > + > +#ifndef module_init > +#define module_init(x) > +#endif > + > +#ifndef module_exit > +#define module_exit(x) > +#endif > + > +#ifndef MODULE_AUTHOR > +#define MODULE_AUTHOR(x) > +#endif > + > +#ifndef MODULE_LICENSE > +#define MODULE_LICENSE(x) > +#endif > + > +#ifndef MODULE_DESCRIPTION > +#define MODULE_DESCRIPTION(x) > +#endif > + > +#ifndef dump_stack > +#define dump_stack() assert(0) > +#endif > diff --git a/tools/testing/shared/shared.mk b/tools/testing/shared/shared.mk > new file mode 100644 > index 000000000000..69a6a528eaed > --- /dev/null > +++ b/tools/testing/shared/shared.mk > @@ -0,0 +1,68 @@ > +# SPDX-License-Identifier: GPL-2.0 > + > +CFLAGS += -I../shared -I. -I../../include -I../../../lib -g -Og -Wall \ > + -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined > +LDFLAGS += -fsanitize=address -fsanitize=undefined > +LDLIBS += -lpthread -lurcu > +SHARED_OFILES = xarray-shared.o radix-tree.o idr.o linux.o find_bit.o bitmap.o \ > + slab.o > +SHARED_DEPS = Makefile ../shared/shared.mk ../shared/*.h generated/map-shift.h \ > + generated/bit-length.h generated/autoconf.h \ > + ../../include/linux/*.h \ > + ../../include/asm/*.h \ > + ../../../include/linux/xarray.h \ > + ../../../include/linux/maple_tree.h \ > + ../../../include/linux/radix-tree.h \ > + ../../../lib/radix-tree.h \ > + ../../../include/linux/idr.h > + > +ifndef SHIFT > + SHIFT=3 > +endif > + > +ifeq ($(BUILD), 32) > + CFLAGS += -m32 > + LDFLAGS += -m32 > +LONG_BIT := 32 > +endif > + > +ifndef LONG_BIT > +LONG_BIT := $(shell getconf LONG_BIT) > +endif > + > +%.o: ../shared/%.c > + $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ > + > +vpath %.c ../../lib > + > +$(SHARED_OFILES): $(SHARED_DEPS) > + > +radix-tree.c: ../../../lib/radix-tree.c > + sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ > + > +idr.c: ../../../lib/idr.c > + sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ > + > +xarray-shared.o: ../shared/xarray-shared.c ../../../lib/xarray.c \ > + ../../../lib/test_xarray.c > + > +maple-shared.o: ../shared/maple-shared.c ../../../lib/maple_tree.c \ > + ../../../lib/test_maple_tree.c > + > +generated/autoconf.h: > + cp ../shared/autoconf.h generated/autoconf.h > + > +generated/map-shift.h: > + @if ! grep -qws $(SHIFT) generated/map-shift.h; then \ > + echo "Generating $@"; \ > + echo "#define XA_CHUNK_SHIFT $(SHIFT)" > \ > + generated/map-shift.h; \ > + fi > + > +generated/bit-length.h: FORCE > + @if ! grep -qws CONFIG_$(LONG_BIT)BIT generated/bit-length.h; then \ > + echo "Generating $@"; \ > + echo "#define CONFIG_$(LONG_BIT)BIT 1" > $@; \ > + fi > + > +FORCE: ; > diff --git a/tools/testing/shared/trace/events/maple_tree.h b/tools/testing/shared/trace/events/maple_tree.h > new file mode 100644 > index 000000000000..97d0e1ddcf08 > --- /dev/null > +++ b/tools/testing/shared/trace/events/maple_tree.h > @@ -0,0 +1,5 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > + > +#define trace_ma_op(a, b) do {} while (0) > +#define trace_ma_read(a, b) do {} while (0) > +#define trace_ma_write(a, b, c, d) do {} while (0) > diff --git a/tools/testing/shared/xarray-shared.c b/tools/testing/shared/xarray-shared.c > new file mode 100644 > index 000000000000..e90901958dcd > --- /dev/null > +++ b/tools/testing/shared/xarray-shared.c > @@ -0,0 +1,5 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > + > +#include "xarray-shared.h" > + > +#include "../../../lib/xarray.c" > diff --git a/tools/testing/shared/xarray-shared.h b/tools/testing/shared/xarray-shared.h > new file mode 100644 > index 000000000000..ac2d16ff53ae > --- /dev/null > +++ b/tools/testing/shared/xarray-shared.h > @@ -0,0 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > + > +#define XA_DEBUG > +#include "shared.h" > -- > 2.45.1 >
On Thu, Jun 27, 2024 at 01:59:18PM -0400, Liam R. Howlett wrote: > * Lorenzo Stoakes <lstoakes@gmail.com> [240627 06:39]: > > The core components contained within the radix-tree tests which provide > > shims for kernel headers and access to the maple tree are useful for > > testing other things, so separate them out and make the radix tree tests > > dependent on the shared components. > > > > This lays the groundwork for us to add VMA tests of the newly introduced > > vma.c file. > > This separation and subsequent patch requires building the > xarray-hsared, radix-tree, idr, find_bit, and bitmap .o files which are > unneeded for the target 'main'. I'm not a build expert on how to fix > this, but could that be reduced to the minimum set somehow? I'm confused, the existing Makefile specified: 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 \ regression4.o tag_check.o multiorder.o idr-test.o iteration_check.o \ iteration_check_2.o benchmark.o main: $(OFILES) Making all of the files you mentioned dependencies of main no? (xarray-shared being a subset of xarray.o which requires it anyway) I'm not sure this is a huge big deal as these are all rather small :) > > > > > Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com> > > --- > > tools/testing/radix-tree/Makefile | 68 +++---------------- > > tools/testing/radix-tree/maple.c | 14 +--- > > tools/testing/radix-tree/xarray.c | 9 +-- > > tools/testing/shared/autoconf.h | 2 + > > tools/testing/{radix-tree => shared}/bitmap.c | 0 > > tools/testing/{radix-tree => shared}/linux.c | 0 > > .../{radix-tree => shared}/linux/bug.h | 0 > > .../{radix-tree => shared}/linux/cpu.h | 0 > > .../{radix-tree => shared}/linux/idr.h | 0 > > .../{radix-tree => shared}/linux/init.h | 0 > > .../{radix-tree => shared}/linux/kconfig.h | 0 > > .../{radix-tree => shared}/linux/kernel.h | 0 > > .../{radix-tree => shared}/linux/kmemleak.h | 0 > > .../{radix-tree => shared}/linux/local_lock.h | 0 > > .../{radix-tree => shared}/linux/lockdep.h | 0 > > .../{radix-tree => shared}/linux/maple_tree.h | 0 > > .../{radix-tree => shared}/linux/percpu.h | 0 > > .../{radix-tree => shared}/linux/preempt.h | 0 > > .../{radix-tree => shared}/linux/radix-tree.h | 0 > > .../{radix-tree => shared}/linux/rcupdate.h | 0 > > .../{radix-tree => shared}/linux/xarray.h | 0 > > tools/testing/shared/maple-shared.h | 9 +++ > > tools/testing/shared/maple-shim.c | 7 ++ > > tools/testing/shared/shared.h | 34 ++++++++++ > > tools/testing/shared/shared.mk | 68 +++++++++++++++++++ > > .../testing/shared/trace/events/maple_tree.h | 5 ++ > > tools/testing/shared/xarray-shared.c | 5 ++ > > tools/testing/shared/xarray-shared.h | 4 ++ > > 28 files changed, 147 insertions(+), 78 deletions(-) > > create mode 100644 tools/testing/shared/autoconf.h > > rename tools/testing/{radix-tree => shared}/bitmap.c (100%) > > rename tools/testing/{radix-tree => shared}/linux.c (100%) > > rename tools/testing/{radix-tree => shared}/linux/bug.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/cpu.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/idr.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/init.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/kconfig.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/kernel.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/kmemleak.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/local_lock.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/lockdep.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/maple_tree.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/percpu.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/preempt.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/radix-tree.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/rcupdate.h (100%) > > rename tools/testing/{radix-tree => shared}/linux/xarray.h (100%) > > create mode 100644 tools/testing/shared/maple-shared.h > > create mode 100644 tools/testing/shared/maple-shim.c > > create mode 100644 tools/testing/shared/shared.h > > create mode 100644 tools/testing/shared/shared.mk > > create mode 100644 tools/testing/shared/trace/events/maple_tree.h > > create mode 100644 tools/testing/shared/xarray-shared.c > > create mode 100644 tools/testing/shared/xarray-shared.h > > > > diff --git a/tools/testing/radix-tree/Makefile b/tools/testing/radix-tree/Makefile > > index 7527f738b4a1..29d607063749 100644 > > --- a/tools/testing/radix-tree/Makefile > > +++ b/tools/testing/radix-tree/Makefile > > @@ -1,29 +1,16 @@ > > # SPDX-License-Identifier: GPL-2.0 > > > > -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 > > -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 \ > > - regression4.o tag_check.o multiorder.o idr-test.o iteration_check.o \ > > - iteration_check_2.o benchmark.o > > +.PHONY: default > > > > -ifndef SHIFT > > - SHIFT=3 > > -endif > > +default: main > > > > -ifeq ($(BUILD), 32) > > - CFLAGS += -m32 > > - LDFLAGS += -m32 > > -LONG_BIT := 32 > > -endif > > +include ../shared/shared.mk > > > > -ifndef LONG_BIT > > -LONG_BIT := $(shell getconf LONG_BIT) > > -endif > > +TARGETS = main idr-test multiorder xarray maple > > +CORE_OFILES = $(SHARED_OFILES) xarray.o maple.o test.o > > +OFILES = main.o $(CORE_OFILES) regression1.o regression2.o \ > > + regression3.o regression4.o tag_check.o multiorder.o idr-test.o \ > > + iteration_check.o iteration_check_2.o benchmark.o > > > > targets: generated/map-shift.h generated/bit-length.h $(TARGETS) > > > > @@ -32,46 +19,13 @@ main: $(OFILES) > > idr-test.o: ../../../lib/test_ida.c > > idr-test: idr-test.o $(CORE_OFILES) > > > > -xarray: $(CORE_OFILES) > > +xarray: $(CORE_OFILES) xarray.o > > > > -maple: $(CORE_OFILES) > > +maple: $(CORE_OFILES) maple.o > > > > multiorder: multiorder.o $(CORE_OFILES) > > > > clean: > > $(RM) $(TARGETS) *.o radix-tree.c idr.c generated/map-shift.h generated/bit-length.h > > > > -vpath %.c ../../lib > > - > > -$(OFILES): Makefile *.h */*.h generated/map-shift.h generated/bit-length.h \ > > - ../../include/linux/*.h \ > > - ../../include/asm/*.h \ > > - ../../../include/linux/xarray.h \ > > - ../../../include/linux/maple_tree.h \ > > - ../../../include/linux/radix-tree.h \ > > - ../../../lib/radix-tree.h \ > > - ../../../include/linux/idr.h > > - > > -radix-tree.c: ../../../lib/radix-tree.c > > - sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ > > - > > -idr.c: ../../../lib/idr.c > > - sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ > > - > > -xarray.o: ../../../lib/xarray.c ../../../lib/test_xarray.c > > - > > -maple.o: ../../../lib/maple_tree.c ../../../lib/test_maple_tree.c > > - > > -generated/map-shift.h: > > - @if ! grep -qws $(SHIFT) generated/map-shift.h; then \ > > - echo "#define XA_CHUNK_SHIFT $(SHIFT)" > \ > > - generated/map-shift.h; \ > > - fi > > - > > -generated/bit-length.h: FORCE > > - @if ! grep -qws CONFIG_$(LONG_BIT)BIT generated/bit-length.h; then \ > > - echo "Generating $@"; \ > > - echo "#define CONFIG_$(LONG_BIT)BIT 1" > $@; \ > > - fi > > - > > -FORCE: ; > > +$(OFILES): $(SHARED_DEPS) *.h */*.h > > diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c > > index f1caf4bcf937..5b53ecf22fc4 100644 > > --- a/tools/testing/radix-tree/maple.c > > +++ b/tools/testing/radix-tree/maple.c > > @@ -8,20 +8,8 @@ > > * difficult to handle in kernel tests. > > */ > > > > -#define CONFIG_DEBUG_MAPLE_TREE > > -#define CONFIG_MAPLE_SEARCH > > -#define MAPLE_32BIT (MAPLE_NODE_SLOTS > 31) > > +#include "maple-shared.h" > > #include "test.h" > > -#include <stdlib.h> > > -#include <time.h> > > -#include "linux/init.h" > > - > > -#define module_init(x) > > -#define module_exit(x) > > -#define MODULE_AUTHOR(x) > > -#define MODULE_LICENSE(x) > > -#define dump_stack() assert(0) > > - > > #include "../../../lib/maple_tree.c" > > #include "../../../lib/test_maple_tree.c" > > > > diff --git a/tools/testing/radix-tree/xarray.c b/tools/testing/radix-tree/xarray.c > > index f20e12cbbfd4..253208a8541b 100644 > > --- a/tools/testing/radix-tree/xarray.c > > +++ b/tools/testing/radix-tree/xarray.c > > @@ -4,16 +4,9 @@ > > * Copyright (c) 2018 Matthew Wilcox <willy@infradead.org> > > */ > > > > -#define XA_DEBUG > > +#include "xarray-shared.h" > > #include "test.h" > > > > -#define module_init(x) > > -#define module_exit(x) > > -#define MODULE_AUTHOR(x) > > -#define MODULE_LICENSE(x) > > -#define dump_stack() assert(0) > > - > > -#include "../../../lib/xarray.c" > > #undef XA_DEBUG > > #include "../../../lib/test_xarray.c" > > > > diff --git a/tools/testing/shared/autoconf.h b/tools/testing/shared/autoconf.h > > new file mode 100644 > > index 000000000000..92dc474c349b > > --- /dev/null > > +++ b/tools/testing/shared/autoconf.h > > @@ -0,0 +1,2 @@ > > +#include "bit-length.h" > > +#define CONFIG_XARRAY_MULTI 1 > > diff --git a/tools/testing/radix-tree/bitmap.c b/tools/testing/shared/bitmap.c > > similarity index 100% > > rename from tools/testing/radix-tree/bitmap.c > > rename to tools/testing/shared/bitmap.c > > diff --git a/tools/testing/radix-tree/linux.c b/tools/testing/shared/linux.c > > similarity index 100% > > rename from tools/testing/radix-tree/linux.c > > rename to tools/testing/shared/linux.c > > diff --git a/tools/testing/radix-tree/linux/bug.h b/tools/testing/shared/linux/bug.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/bug.h > > rename to tools/testing/shared/linux/bug.h > > diff --git a/tools/testing/radix-tree/linux/cpu.h b/tools/testing/shared/linux/cpu.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/cpu.h > > rename to tools/testing/shared/linux/cpu.h > > diff --git a/tools/testing/radix-tree/linux/idr.h b/tools/testing/shared/linux/idr.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/idr.h > > rename to tools/testing/shared/linux/idr.h > > diff --git a/tools/testing/radix-tree/linux/init.h b/tools/testing/shared/linux/init.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/init.h > > rename to tools/testing/shared/linux/init.h > > diff --git a/tools/testing/radix-tree/linux/kconfig.h b/tools/testing/shared/linux/kconfig.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/kconfig.h > > rename to tools/testing/shared/linux/kconfig.h > > diff --git a/tools/testing/radix-tree/linux/kernel.h b/tools/testing/shared/linux/kernel.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/kernel.h > > rename to tools/testing/shared/linux/kernel.h > > diff --git a/tools/testing/radix-tree/linux/kmemleak.h b/tools/testing/shared/linux/kmemleak.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/kmemleak.h > > rename to tools/testing/shared/linux/kmemleak.h > > diff --git a/tools/testing/radix-tree/linux/local_lock.h b/tools/testing/shared/linux/local_lock.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/local_lock.h > > rename to tools/testing/shared/linux/local_lock.h > > diff --git a/tools/testing/radix-tree/linux/lockdep.h b/tools/testing/shared/linux/lockdep.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/lockdep.h > > rename to tools/testing/shared/linux/lockdep.h > > diff --git a/tools/testing/radix-tree/linux/maple_tree.h b/tools/testing/shared/linux/maple_tree.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/maple_tree.h > > rename to tools/testing/shared/linux/maple_tree.h > > diff --git a/tools/testing/radix-tree/linux/percpu.h b/tools/testing/shared/linux/percpu.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/percpu.h > > rename to tools/testing/shared/linux/percpu.h > > diff --git a/tools/testing/radix-tree/linux/preempt.h b/tools/testing/shared/linux/preempt.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/preempt.h > > rename to tools/testing/shared/linux/preempt.h > > diff --git a/tools/testing/radix-tree/linux/radix-tree.h b/tools/testing/shared/linux/radix-tree.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/radix-tree.h > > rename to tools/testing/shared/linux/radix-tree.h > > diff --git a/tools/testing/radix-tree/linux/rcupdate.h b/tools/testing/shared/linux/rcupdate.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/rcupdate.h > > rename to tools/testing/shared/linux/rcupdate.h > > diff --git a/tools/testing/radix-tree/linux/xarray.h b/tools/testing/shared/linux/xarray.h > > similarity index 100% > > rename from tools/testing/radix-tree/linux/xarray.h > > rename to tools/testing/shared/linux/xarray.h > > diff --git a/tools/testing/shared/maple-shared.h b/tools/testing/shared/maple-shared.h > > new file mode 100644 > > index 000000000000..3d847edd149d > > --- /dev/null > > +++ b/tools/testing/shared/maple-shared.h > > @@ -0,0 +1,9 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > + > > +#define CONFIG_DEBUG_MAPLE_TREE > > +#define CONFIG_MAPLE_SEARCH > > +#define MAPLE_32BIT (MAPLE_NODE_SLOTS > 31) > > +#include "shared.h" > > +#include <stdlib.h> > > +#include <time.h> > > +#include "linux/init.h" > > diff --git a/tools/testing/shared/maple-shim.c b/tools/testing/shared/maple-shim.c > > new file mode 100644 > > index 000000000000..640df76f483e > > --- /dev/null > > +++ b/tools/testing/shared/maple-shim.c > > @@ -0,0 +1,7 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > + > > +/* Very simple shim around the maple tree. */ > > + > > +#include "maple-shared.h" > > + > > +#include "../../../lib/maple_tree.c" > > diff --git a/tools/testing/shared/shared.h b/tools/testing/shared/shared.h > > new file mode 100644 > > index 000000000000..495602e60b65 > > --- /dev/null > > +++ b/tools/testing/shared/shared.h > > @@ -0,0 +1,34 @@ > > +/* SPDX-License-Identifier: GPL-2.0 */ > > + > > +#include <linux/types.h> > > +#include <linux/bug.h> > > +#include <linux/kernel.h> > > +#include <linux/bitops.h> > > + > > +#include <linux/gfp.h> > > +#include <linux/types.h> > > +#include <linux/rcupdate.h> > > + > > +#ifndef module_init > > +#define module_init(x) > > +#endif > > + > > +#ifndef module_exit > > +#define module_exit(x) > > +#endif > > + > > +#ifndef MODULE_AUTHOR > > +#define MODULE_AUTHOR(x) > > +#endif > > + > > +#ifndef MODULE_LICENSE > > +#define MODULE_LICENSE(x) > > +#endif > > + > > +#ifndef MODULE_DESCRIPTION > > +#define MODULE_DESCRIPTION(x) > > +#endif > > + > > +#ifndef dump_stack > > +#define dump_stack() assert(0) > > +#endif > > diff --git a/tools/testing/shared/shared.mk b/tools/testing/shared/shared.mk > > new file mode 100644 > > index 000000000000..69a6a528eaed > > --- /dev/null > > +++ b/tools/testing/shared/shared.mk > > @@ -0,0 +1,68 @@ > > +# SPDX-License-Identifier: GPL-2.0 > > + > > +CFLAGS += -I../shared -I. -I../../include -I../../../lib -g -Og -Wall \ > > + -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined > > +LDFLAGS += -fsanitize=address -fsanitize=undefined > > +LDLIBS += -lpthread -lurcu > > +SHARED_OFILES = xarray-shared.o radix-tree.o idr.o linux.o find_bit.o bitmap.o \ > > + slab.o > > +SHARED_DEPS = Makefile ../shared/shared.mk ../shared/*.h generated/map-shift.h \ > > + generated/bit-length.h generated/autoconf.h \ > > + ../../include/linux/*.h \ > > + ../../include/asm/*.h \ > > + ../../../include/linux/xarray.h \ > > + ../../../include/linux/maple_tree.h \ > > + ../../../include/linux/radix-tree.h \ > > + ../../../lib/radix-tree.h \ > > + ../../../include/linux/idr.h > > + > > +ifndef SHIFT > > + SHIFT=3 > > +endif > > + > > +ifeq ($(BUILD), 32) > > + CFLAGS += -m32 > > + LDFLAGS += -m32 > > +LONG_BIT := 32 > > +endif > > + > > +ifndef LONG_BIT > > +LONG_BIT := $(shell getconf LONG_BIT) > > +endif > > + > > +%.o: ../shared/%.c > > + $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ > > + > > +vpath %.c ../../lib > > + > > +$(SHARED_OFILES): $(SHARED_DEPS) > > + > > +radix-tree.c: ../../../lib/radix-tree.c > > + sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ > > + > > +idr.c: ../../../lib/idr.c > > + sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ > > + > > +xarray-shared.o: ../shared/xarray-shared.c ../../../lib/xarray.c \ > > + ../../../lib/test_xarray.c > > + > > +maple-shared.o: ../shared/maple-shared.c ../../../lib/maple_tree.c \ > > + ../../../lib/test_maple_tree.c > > + > > +generated/autoconf.h: > > + cp ../shared/autoconf.h generated/autoconf.h > > + > > +generated/map-shift.h: > > + @if ! grep -qws $(SHIFT) generated/map-shift.h; then \ > > + echo "Generating $@"; \ > > + echo "#define XA_CHUNK_SHIFT $(SHIFT)" > \ > > + generated/map-shift.h; \ > > + fi > > + > > +generated/bit-length.h: FORCE > > + @if ! grep -qws CONFIG_$(LONG_BIT)BIT generated/bit-length.h; then \ > > + echo "Generating $@"; \ > > + echo "#define CONFIG_$(LONG_BIT)BIT 1" > $@; \ > > + fi > > + > > +FORCE: ; > > diff --git a/tools/testing/shared/trace/events/maple_tree.h b/tools/testing/shared/trace/events/maple_tree.h > > new file mode 100644 > > index 000000000000..97d0e1ddcf08 > > --- /dev/null > > +++ b/tools/testing/shared/trace/events/maple_tree.h > > @@ -0,0 +1,5 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > + > > +#define trace_ma_op(a, b) do {} while (0) > > +#define trace_ma_read(a, b) do {} while (0) > > +#define trace_ma_write(a, b, c, d) do {} while (0) > > diff --git a/tools/testing/shared/xarray-shared.c b/tools/testing/shared/xarray-shared.c > > new file mode 100644 > > index 000000000000..e90901958dcd > > --- /dev/null > > +++ b/tools/testing/shared/xarray-shared.c > > @@ -0,0 +1,5 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > + > > +#include "xarray-shared.h" > > + > > +#include "../../../lib/xarray.c" > > diff --git a/tools/testing/shared/xarray-shared.h b/tools/testing/shared/xarray-shared.h > > new file mode 100644 > > index 000000000000..ac2d16ff53ae > > --- /dev/null > > +++ b/tools/testing/shared/xarray-shared.h > > @@ -0,0 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > + > > +#define XA_DEBUG > > +#include "shared.h" > > -- > > 2.45.1 > >
* Lorenzo Stoakes <lstoakes@gmail.com> [240627 15:47]: > On Thu, Jun 27, 2024 at 01:59:18PM -0400, Liam R. Howlett wrote: > > * Lorenzo Stoakes <lstoakes@gmail.com> [240627 06:39]: > > > The core components contained within the radix-tree tests which provide > > > shims for kernel headers and access to the maple tree are useful for > > > testing other things, so separate them out and make the radix tree tests > > > dependent on the shared components. > > > > > > This lays the groundwork for us to add VMA tests of the newly introduced > > > vma.c file. > > > > This separation and subsequent patch requires building the > > xarray-hsared, radix-tree, idr, find_bit, and bitmap .o files which are > > unneeded for the target 'main'. I'm not a build expert on how to fix > > this, but could that be reduced to the minimum set somehow? > > I'm confused, the existing Makefile specified: > > 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 \ > regression4.o tag_check.o multiorder.o idr-test.o iteration_check.o \ > iteration_check_2.o benchmark.o > > main: $(OFILES) > > Making all of the files you mentioned dependencies of main no? (xarray-shared > being a subset of xarray.o which requires it anyway) After replacing main with vma and dropping the vma.c, I can generate the vma executable. I had to generate map-shift.h and bit-lenght.h, then execute: cc -O2 -g -Wall -I../shared -I. -I../../include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined -c -o vma.o vma.c cc -c -O2 -g -Wall -I../shared -I. -I../../include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined ../shared/linux.c -o linux.o cc -O2 -g -Wall -I../shared -I. -I../../include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined -c -o slab.o ../../lib/slab.c cc -c -O2 -g -Wall -I../shared -I. -I../../include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined ../shared/maple-shim.c -o maple-shim.o cc -O2 -g -Wall -I../shared -I. -I../../include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined -c -o vma_stub.o vma_stub.c cc -fsanitize=address -fsanitize=undefined vma.o linux.o slab.o maple-shim.o vma_stub.o -lpthread -lurcu -o vma Dropping a number of the pre-built items. When I looked at the list, it seemed too numerous for what we were doing (why do we need idr, and radix-tree?) So I tried removing as many as I could. > > I'm not sure this is a huge big deal as these are all rather small :) Yeah, maybe not worth the effort. Cheers, Liam
On Thu, Jun 27, 2024 at 04:03:21PM -0400, Liam R. Howlett wrote: > * Lorenzo Stoakes <lstoakes@gmail.com> [240627 15:47]: > > On Thu, Jun 27, 2024 at 01:59:18PM -0400, Liam R. Howlett wrote: > > > * Lorenzo Stoakes <lstoakes@gmail.com> [240627 06:39]: > > > > The core components contained within the radix-tree tests which provide > > > > shims for kernel headers and access to the maple tree are useful for > > > > testing other things, so separate them out and make the radix tree tests > > > > dependent on the shared components. > > > > > > > > This lays the groundwork for us to add VMA tests of the newly introduced > > > > vma.c file. > > > > > > This separation and subsequent patch requires building the > > > xarray-hsared, radix-tree, idr, find_bit, and bitmap .o files which are > > > unneeded for the target 'main'. I'm not a build expert on how to fix > > > this, but could that be reduced to the minimum set somehow? > > > > I'm confused, the existing Makefile specified: > > > > 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 \ > > regression4.o tag_check.o multiorder.o idr-test.o iteration_check.o \ > > iteration_check_2.o benchmark.o > > > > main: $(OFILES) > > > > Making all of the files you mentioned dependencies of main no? (xarray-shared > > being a subset of xarray.o which requires it anyway) > > After replacing main with vma and dropping the vma.c, I can generate the > vma executable. I had to generate map-shift.h and bit-lenght.h, then > execute: > > cc -O2 -g -Wall -I../shared -I. -I../../include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined -c -o vma.o vma.c > cc -c -O2 -g -Wall -I../shared -I. -I../../include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined ../shared/linux.c -o linux.o > cc -O2 -g -Wall -I../shared -I. -I../../include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined -c -o slab.o ../../lib/slab.c > cc -c -O2 -g -Wall -I../shared -I. -I../../include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined ../shared/maple-shim.c -o maple-shim.o > cc -O2 -g -Wall -I../shared -I. -I../../include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined -c -o vma_stub.o vma_stub.c > cc -fsanitize=address -fsanitize=undefined vma.o linux.o slab.o maple-shim.o vma_stub.o -lpthread -lurcu -o vma > > Dropping a number of the pre-built items. When I looked at the list, it > seemed too numerous for what we were doing (why do we need idr, and > radix-tree?) So I tried removing as many as I could. I did see link errors at some point when radix-tree wasn't included there, I'll take another look and see if we can reduce to a smaller subset if posible. > > > > > I'm not sure this is a huge big deal as these are all rather small :) > > Yeah, maybe not worth the effort. > > Cheers, > Liam
diff --git a/tools/testing/radix-tree/Makefile b/tools/testing/radix-tree/Makefile index 7527f738b4a1..29d607063749 100644 --- a/tools/testing/radix-tree/Makefile +++ b/tools/testing/radix-tree/Makefile @@ -1,29 +1,16 @@ # SPDX-License-Identifier: GPL-2.0 -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 -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 \ - regression4.o tag_check.o multiorder.o idr-test.o iteration_check.o \ - iteration_check_2.o benchmark.o +.PHONY: default -ifndef SHIFT - SHIFT=3 -endif +default: main -ifeq ($(BUILD), 32) - CFLAGS += -m32 - LDFLAGS += -m32 -LONG_BIT := 32 -endif +include ../shared/shared.mk -ifndef LONG_BIT -LONG_BIT := $(shell getconf LONG_BIT) -endif +TARGETS = main idr-test multiorder xarray maple +CORE_OFILES = $(SHARED_OFILES) xarray.o maple.o test.o +OFILES = main.o $(CORE_OFILES) regression1.o regression2.o \ + regression3.o regression4.o tag_check.o multiorder.o idr-test.o \ + iteration_check.o iteration_check_2.o benchmark.o targets: generated/map-shift.h generated/bit-length.h $(TARGETS) @@ -32,46 +19,13 @@ main: $(OFILES) idr-test.o: ../../../lib/test_ida.c idr-test: idr-test.o $(CORE_OFILES) -xarray: $(CORE_OFILES) +xarray: $(CORE_OFILES) xarray.o -maple: $(CORE_OFILES) +maple: $(CORE_OFILES) maple.o multiorder: multiorder.o $(CORE_OFILES) clean: $(RM) $(TARGETS) *.o radix-tree.c idr.c generated/map-shift.h generated/bit-length.h -vpath %.c ../../lib - -$(OFILES): Makefile *.h */*.h generated/map-shift.h generated/bit-length.h \ - ../../include/linux/*.h \ - ../../include/asm/*.h \ - ../../../include/linux/xarray.h \ - ../../../include/linux/maple_tree.h \ - ../../../include/linux/radix-tree.h \ - ../../../lib/radix-tree.h \ - ../../../include/linux/idr.h - -radix-tree.c: ../../../lib/radix-tree.c - sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ - -idr.c: ../../../lib/idr.c - sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ - -xarray.o: ../../../lib/xarray.c ../../../lib/test_xarray.c - -maple.o: ../../../lib/maple_tree.c ../../../lib/test_maple_tree.c - -generated/map-shift.h: - @if ! grep -qws $(SHIFT) generated/map-shift.h; then \ - echo "#define XA_CHUNK_SHIFT $(SHIFT)" > \ - generated/map-shift.h; \ - fi - -generated/bit-length.h: FORCE - @if ! grep -qws CONFIG_$(LONG_BIT)BIT generated/bit-length.h; then \ - echo "Generating $@"; \ - echo "#define CONFIG_$(LONG_BIT)BIT 1" > $@; \ - fi - -FORCE: ; +$(OFILES): $(SHARED_DEPS) *.h */*.h diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c index f1caf4bcf937..5b53ecf22fc4 100644 --- a/tools/testing/radix-tree/maple.c +++ b/tools/testing/radix-tree/maple.c @@ -8,20 +8,8 @@ * difficult to handle in kernel tests. */ -#define CONFIG_DEBUG_MAPLE_TREE -#define CONFIG_MAPLE_SEARCH -#define MAPLE_32BIT (MAPLE_NODE_SLOTS > 31) +#include "maple-shared.h" #include "test.h" -#include <stdlib.h> -#include <time.h> -#include "linux/init.h" - -#define module_init(x) -#define module_exit(x) -#define MODULE_AUTHOR(x) -#define MODULE_LICENSE(x) -#define dump_stack() assert(0) - #include "../../../lib/maple_tree.c" #include "../../../lib/test_maple_tree.c" diff --git a/tools/testing/radix-tree/xarray.c b/tools/testing/radix-tree/xarray.c index f20e12cbbfd4..253208a8541b 100644 --- a/tools/testing/radix-tree/xarray.c +++ b/tools/testing/radix-tree/xarray.c @@ -4,16 +4,9 @@ * Copyright (c) 2018 Matthew Wilcox <willy@infradead.org> */ -#define XA_DEBUG +#include "xarray-shared.h" #include "test.h" -#define module_init(x) -#define module_exit(x) -#define MODULE_AUTHOR(x) -#define MODULE_LICENSE(x) -#define dump_stack() assert(0) - -#include "../../../lib/xarray.c" #undef XA_DEBUG #include "../../../lib/test_xarray.c" diff --git a/tools/testing/shared/autoconf.h b/tools/testing/shared/autoconf.h new file mode 100644 index 000000000000..92dc474c349b --- /dev/null +++ b/tools/testing/shared/autoconf.h @@ -0,0 +1,2 @@ +#include "bit-length.h" +#define CONFIG_XARRAY_MULTI 1 diff --git a/tools/testing/radix-tree/bitmap.c b/tools/testing/shared/bitmap.c similarity index 100% rename from tools/testing/radix-tree/bitmap.c rename to tools/testing/shared/bitmap.c diff --git a/tools/testing/radix-tree/linux.c b/tools/testing/shared/linux.c similarity index 100% rename from tools/testing/radix-tree/linux.c rename to tools/testing/shared/linux.c diff --git a/tools/testing/radix-tree/linux/bug.h b/tools/testing/shared/linux/bug.h similarity index 100% rename from tools/testing/radix-tree/linux/bug.h rename to tools/testing/shared/linux/bug.h diff --git a/tools/testing/radix-tree/linux/cpu.h b/tools/testing/shared/linux/cpu.h similarity index 100% rename from tools/testing/radix-tree/linux/cpu.h rename to tools/testing/shared/linux/cpu.h diff --git a/tools/testing/radix-tree/linux/idr.h b/tools/testing/shared/linux/idr.h similarity index 100% rename from tools/testing/radix-tree/linux/idr.h rename to tools/testing/shared/linux/idr.h diff --git a/tools/testing/radix-tree/linux/init.h b/tools/testing/shared/linux/init.h similarity index 100% rename from tools/testing/radix-tree/linux/init.h rename to tools/testing/shared/linux/init.h diff --git a/tools/testing/radix-tree/linux/kconfig.h b/tools/testing/shared/linux/kconfig.h similarity index 100% rename from tools/testing/radix-tree/linux/kconfig.h rename to tools/testing/shared/linux/kconfig.h diff --git a/tools/testing/radix-tree/linux/kernel.h b/tools/testing/shared/linux/kernel.h similarity index 100% rename from tools/testing/radix-tree/linux/kernel.h rename to tools/testing/shared/linux/kernel.h diff --git a/tools/testing/radix-tree/linux/kmemleak.h b/tools/testing/shared/linux/kmemleak.h similarity index 100% rename from tools/testing/radix-tree/linux/kmemleak.h rename to tools/testing/shared/linux/kmemleak.h diff --git a/tools/testing/radix-tree/linux/local_lock.h b/tools/testing/shared/linux/local_lock.h similarity index 100% rename from tools/testing/radix-tree/linux/local_lock.h rename to tools/testing/shared/linux/local_lock.h diff --git a/tools/testing/radix-tree/linux/lockdep.h b/tools/testing/shared/linux/lockdep.h similarity index 100% rename from tools/testing/radix-tree/linux/lockdep.h rename to tools/testing/shared/linux/lockdep.h diff --git a/tools/testing/radix-tree/linux/maple_tree.h b/tools/testing/shared/linux/maple_tree.h similarity index 100% rename from tools/testing/radix-tree/linux/maple_tree.h rename to tools/testing/shared/linux/maple_tree.h diff --git a/tools/testing/radix-tree/linux/percpu.h b/tools/testing/shared/linux/percpu.h similarity index 100% rename from tools/testing/radix-tree/linux/percpu.h rename to tools/testing/shared/linux/percpu.h diff --git a/tools/testing/radix-tree/linux/preempt.h b/tools/testing/shared/linux/preempt.h similarity index 100% rename from tools/testing/radix-tree/linux/preempt.h rename to tools/testing/shared/linux/preempt.h diff --git a/tools/testing/radix-tree/linux/radix-tree.h b/tools/testing/shared/linux/radix-tree.h similarity index 100% rename from tools/testing/radix-tree/linux/radix-tree.h rename to tools/testing/shared/linux/radix-tree.h diff --git a/tools/testing/radix-tree/linux/rcupdate.h b/tools/testing/shared/linux/rcupdate.h similarity index 100% rename from tools/testing/radix-tree/linux/rcupdate.h rename to tools/testing/shared/linux/rcupdate.h diff --git a/tools/testing/radix-tree/linux/xarray.h b/tools/testing/shared/linux/xarray.h similarity index 100% rename from tools/testing/radix-tree/linux/xarray.h rename to tools/testing/shared/linux/xarray.h diff --git a/tools/testing/shared/maple-shared.h b/tools/testing/shared/maple-shared.h new file mode 100644 index 000000000000..3d847edd149d --- /dev/null +++ b/tools/testing/shared/maple-shared.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#define CONFIG_DEBUG_MAPLE_TREE +#define CONFIG_MAPLE_SEARCH +#define MAPLE_32BIT (MAPLE_NODE_SLOTS > 31) +#include "shared.h" +#include <stdlib.h> +#include <time.h> +#include "linux/init.h" diff --git a/tools/testing/shared/maple-shim.c b/tools/testing/shared/maple-shim.c new file mode 100644 index 000000000000..640df76f483e --- /dev/null +++ b/tools/testing/shared/maple-shim.c @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +/* Very simple shim around the maple tree. */ + +#include "maple-shared.h" + +#include "../../../lib/maple_tree.c" diff --git a/tools/testing/shared/shared.h b/tools/testing/shared/shared.h new file mode 100644 index 000000000000..495602e60b65 --- /dev/null +++ b/tools/testing/shared/shared.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include <linux/types.h> +#include <linux/bug.h> +#include <linux/kernel.h> +#include <linux/bitops.h> + +#include <linux/gfp.h> +#include <linux/types.h> +#include <linux/rcupdate.h> + +#ifndef module_init +#define module_init(x) +#endif + +#ifndef module_exit +#define module_exit(x) +#endif + +#ifndef MODULE_AUTHOR +#define MODULE_AUTHOR(x) +#endif + +#ifndef MODULE_LICENSE +#define MODULE_LICENSE(x) +#endif + +#ifndef MODULE_DESCRIPTION +#define MODULE_DESCRIPTION(x) +#endif + +#ifndef dump_stack +#define dump_stack() assert(0) +#endif diff --git a/tools/testing/shared/shared.mk b/tools/testing/shared/shared.mk new file mode 100644 index 000000000000..69a6a528eaed --- /dev/null +++ b/tools/testing/shared/shared.mk @@ -0,0 +1,68 @@ +# SPDX-License-Identifier: GPL-2.0 + +CFLAGS += -I../shared -I. -I../../include -I../../../lib -g -Og -Wall \ + -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined +LDFLAGS += -fsanitize=address -fsanitize=undefined +LDLIBS += -lpthread -lurcu +SHARED_OFILES = xarray-shared.o radix-tree.o idr.o linux.o find_bit.o bitmap.o \ + slab.o +SHARED_DEPS = Makefile ../shared/shared.mk ../shared/*.h generated/map-shift.h \ + generated/bit-length.h generated/autoconf.h \ + ../../include/linux/*.h \ + ../../include/asm/*.h \ + ../../../include/linux/xarray.h \ + ../../../include/linux/maple_tree.h \ + ../../../include/linux/radix-tree.h \ + ../../../lib/radix-tree.h \ + ../../../include/linux/idr.h + +ifndef SHIFT + SHIFT=3 +endif + +ifeq ($(BUILD), 32) + CFLAGS += -m32 + LDFLAGS += -m32 +LONG_BIT := 32 +endif + +ifndef LONG_BIT +LONG_BIT := $(shell getconf LONG_BIT) +endif + +%.o: ../shared/%.c + $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ + +vpath %.c ../../lib + +$(SHARED_OFILES): $(SHARED_DEPS) + +radix-tree.c: ../../../lib/radix-tree.c + sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ + +idr.c: ../../../lib/idr.c + sed -e 's/^static //' -e 's/__always_inline //' -e 's/inline //' < $< > $@ + +xarray-shared.o: ../shared/xarray-shared.c ../../../lib/xarray.c \ + ../../../lib/test_xarray.c + +maple-shared.o: ../shared/maple-shared.c ../../../lib/maple_tree.c \ + ../../../lib/test_maple_tree.c + +generated/autoconf.h: + cp ../shared/autoconf.h generated/autoconf.h + +generated/map-shift.h: + @if ! grep -qws $(SHIFT) generated/map-shift.h; then \ + echo "Generating $@"; \ + echo "#define XA_CHUNK_SHIFT $(SHIFT)" > \ + generated/map-shift.h; \ + fi + +generated/bit-length.h: FORCE + @if ! grep -qws CONFIG_$(LONG_BIT)BIT generated/bit-length.h; then \ + echo "Generating $@"; \ + echo "#define CONFIG_$(LONG_BIT)BIT 1" > $@; \ + fi + +FORCE: ; diff --git a/tools/testing/shared/trace/events/maple_tree.h b/tools/testing/shared/trace/events/maple_tree.h new file mode 100644 index 000000000000..97d0e1ddcf08 --- /dev/null +++ b/tools/testing/shared/trace/events/maple_tree.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#define trace_ma_op(a, b) do {} while (0) +#define trace_ma_read(a, b) do {} while (0) +#define trace_ma_write(a, b, c, d) do {} while (0) diff --git a/tools/testing/shared/xarray-shared.c b/tools/testing/shared/xarray-shared.c new file mode 100644 index 000000000000..e90901958dcd --- /dev/null +++ b/tools/testing/shared/xarray-shared.c @@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "xarray-shared.h" + +#include "../../../lib/xarray.c" diff --git a/tools/testing/shared/xarray-shared.h b/tools/testing/shared/xarray-shared.h new file mode 100644 index 000000000000..ac2d16ff53ae --- /dev/null +++ b/tools/testing/shared/xarray-shared.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#define XA_DEBUG +#include "shared.h"
The core components contained within the radix-tree tests which provide shims for kernel headers and access to the maple tree are useful for testing other things, so separate them out and make the radix tree tests dependent on the shared components. This lays the groundwork for us to add VMA tests of the newly introduced vma.c file. Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com> --- tools/testing/radix-tree/Makefile | 68 +++---------------- tools/testing/radix-tree/maple.c | 14 +--- tools/testing/radix-tree/xarray.c | 9 +-- tools/testing/shared/autoconf.h | 2 + tools/testing/{radix-tree => shared}/bitmap.c | 0 tools/testing/{radix-tree => shared}/linux.c | 0 .../{radix-tree => shared}/linux/bug.h | 0 .../{radix-tree => shared}/linux/cpu.h | 0 .../{radix-tree => shared}/linux/idr.h | 0 .../{radix-tree => shared}/linux/init.h | 0 .../{radix-tree => shared}/linux/kconfig.h | 0 .../{radix-tree => shared}/linux/kernel.h | 0 .../{radix-tree => shared}/linux/kmemleak.h | 0 .../{radix-tree => shared}/linux/local_lock.h | 0 .../{radix-tree => shared}/linux/lockdep.h | 0 .../{radix-tree => shared}/linux/maple_tree.h | 0 .../{radix-tree => shared}/linux/percpu.h | 0 .../{radix-tree => shared}/linux/preempt.h | 0 .../{radix-tree => shared}/linux/radix-tree.h | 0 .../{radix-tree => shared}/linux/rcupdate.h | 0 .../{radix-tree => shared}/linux/xarray.h | 0 tools/testing/shared/maple-shared.h | 9 +++ tools/testing/shared/maple-shim.c | 7 ++ tools/testing/shared/shared.h | 34 ++++++++++ tools/testing/shared/shared.mk | 68 +++++++++++++++++++ .../testing/shared/trace/events/maple_tree.h | 5 ++ tools/testing/shared/xarray-shared.c | 5 ++ tools/testing/shared/xarray-shared.h | 4 ++ 28 files changed, 147 insertions(+), 78 deletions(-) create mode 100644 tools/testing/shared/autoconf.h rename tools/testing/{radix-tree => shared}/bitmap.c (100%) rename tools/testing/{radix-tree => shared}/linux.c (100%) rename tools/testing/{radix-tree => shared}/linux/bug.h (100%) rename tools/testing/{radix-tree => shared}/linux/cpu.h (100%) rename tools/testing/{radix-tree => shared}/linux/idr.h (100%) rename tools/testing/{radix-tree => shared}/linux/init.h (100%) rename tools/testing/{radix-tree => shared}/linux/kconfig.h (100%) rename tools/testing/{radix-tree => shared}/linux/kernel.h (100%) rename tools/testing/{radix-tree => shared}/linux/kmemleak.h (100%) rename tools/testing/{radix-tree => shared}/linux/local_lock.h (100%) rename tools/testing/{radix-tree => shared}/linux/lockdep.h (100%) rename tools/testing/{radix-tree => shared}/linux/maple_tree.h (100%) rename tools/testing/{radix-tree => shared}/linux/percpu.h (100%) rename tools/testing/{radix-tree => shared}/linux/preempt.h (100%) rename tools/testing/{radix-tree => shared}/linux/radix-tree.h (100%) rename tools/testing/{radix-tree => shared}/linux/rcupdate.h (100%) rename tools/testing/{radix-tree => shared}/linux/xarray.h (100%) create mode 100644 tools/testing/shared/maple-shared.h create mode 100644 tools/testing/shared/maple-shim.c create mode 100644 tools/testing/shared/shared.h create mode 100644 tools/testing/shared/shared.mk create mode 100644 tools/testing/shared/trace/events/maple_tree.h create mode 100644 tools/testing/shared/xarray-shared.c create mode 100644 tools/testing/shared/xarray-shared.h