2024-04-23 18:05:33

by Luis Chamberlain

Subject: [PATCH 1/2] tools: fix userspace compilation with new test_xarray changes

Liam reported that compiling the test_xarray on userspace was broken.
I was not even aware that was possible but you can via and you can
run these tests in userspace with:

make -C tools/testing/radix-tree
/tools/testing/radix-tree/xarray

Add the two helpers we need to fix compilation. We don't need a
userspace schedule() so just make it do nothing.

Reported-by: "Liam R. Howlett" <[email protected]>
Signed-off-by: Luis Chamberlain <[email protected]>
---
tools/testing/radix-tree/linux/kernel.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/tools/testing/radix-tree/linux/kernel.h b/tools/testing/radix-tree/linux/kernel.h
index c5c9d05f29da..c0a2bb785b92 100644
--- a/tools/testing/radix-tree/linux/kernel.h
+++ b/tools/testing/radix-tree/linux/kernel.h
@@ -18,6 +18,8 @@
#define pr_info printk
#define pr_debug printk
#define pr_cont printk
+#define schedule()
+#define PAGE_SHIFT 12

#define __acquires(x)
#define __releases(x)
--
2.43.0

2024-04-24 15:10:56

by Liam R. Howlett

Subject: Re: [PATCH 1/2] tools: fix userspace compilation with new test_xarray changes

* Luis Chamberlain <[email protected]> [240423 14:05]:
> Liam reported that compiling the test_xarray on userspace was broken.
> I was not even aware that was possible but you can via and you can
> run these tests in userspace with:
>
> make -C tools/testing/radix-tree
> ./tools/testing/radix-tree/xarray
>
> Add the two helpers we need to fix compilation. We don't need a
> userspace schedule() so just make it do nothing.
>
> Reported-by: "Liam R. Howlett" <[email protected]>
> Signed-off-by: Luis Chamberlain <[email protected]>

Tested-by: Liam R. Howlett <[email protected]>

> ---
> tools/testing/radix-tree/linux/kernel.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/tools/testing/radix-tree/linux/kernel.h b/tools/testing/radix-tree/linux/kernel.h
> index c5c9d05f29da..c0a2bb785b92 100644
> --- a/tools/testing/radix-tree/linux/kernel.h
> +++ b/tools/testing/radix-tree/linux/kernel.h
> @@ -18,6 +18,8 @@
> #define pr_info printk
> #define pr_debug printk
> #define pr_cont printk
> +#define schedule()
> +#define PAGE_SHIFT 12
>
> #define __acquires(x)
> #define __releases(x)
> --
> 2.43.0
>