* [PATCH bpf-next v2] selftests/bpf: Fix build of task_pt_regs test for arm64
@ 2021-09-06 16:36 Jean-Philippe Brucker
2021-09-07 10:26 ` Ilya Leoshkevich
2021-09-07 15:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Jean-Philippe Brucker @ 2021-09-06 16:36 UTC (permalink / raw)
To: ast, daniel, andrii
Cc: kafai, songliubraving, yhs, john.fastabend, kpsingh, dxu, bpf,
linux-kselftest, shuah, Jean-Philippe Brucker, Andrii Nakryiko
struct pt_regs is not exported to userspace on all archs. arm64 and s390
export "user_pt_regs" instead, which causes build failure at the moment:
progs/test_task_pt_regs.c:8:16: error: variable has incomplete type 'struct pt_regs'
struct pt_regs current_regs = {};
Instead of using pt_regs from ptrace.h, use the larger kernel struct
from vmlinux.h directly. Since the test runner task_pt_regs.c does not
have access to the kernel struct definition, copy it into a char array.
Fixes: 576d47bb1a92 ("bpf: selftests: Add bpf_task_pt_regs() selftest")
Suggested-by: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
v2: Work on struct pt_regs from vmlinux.h
v1: https://lore.kernel.org/bpf/20210902090925.2010528-1-jean-philippe@linaro.org/
---
.../selftests/bpf/prog_tests/task_pt_regs.c | 1 -
.../selftests/bpf/progs/test_task_pt_regs.c | 19 +++++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c b/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c
index 53f0e0fa1a53..37c20b5ffa70 100644
--- a/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c
+++ b/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#define _GNU_SOURCE
#include <test_progs.h>
-#include <linux/ptrace.h>
#include "test_task_pt_regs.skel.h"
void test_task_pt_regs(void)
diff --git a/tools/testing/selftests/bpf/progs/test_task_pt_regs.c b/tools/testing/selftests/bpf/progs/test_task_pt_regs.c
index 6c059f1cfa1b..e6cb09259408 100644
--- a/tools/testing/selftests/bpf/progs/test_task_pt_regs.c
+++ b/tools/testing/selftests/bpf/progs/test_task_pt_regs.c
@@ -1,12 +1,17 @@
// SPDX-License-Identifier: GPL-2.0
-#include <linux/ptrace.h>
-#include <linux/bpf.h>
+#include "vmlinux.h"
#include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h>
-struct pt_regs current_regs = {};
-struct pt_regs ctx_regs = {};
+#define PT_REGS_SIZE sizeof(struct pt_regs)
+
+/*
+ * The kernel struct pt_regs isn't exported in its entirety to userspace.
+ * Pass it as an array to task_pt_regs.c
+ */
+char current_regs[PT_REGS_SIZE] = {};
+char ctx_regs[PT_REGS_SIZE] = {};
int uprobe_res = 0;
SEC("uprobe/trigger_func")
@@ -17,8 +22,10 @@ int handle_uprobe(struct pt_regs *ctx)
current = bpf_get_current_task_btf();
regs = (struct pt_regs *) bpf_task_pt_regs(current);
- __builtin_memcpy(¤t_regs, regs, sizeof(*regs));
- __builtin_memcpy(&ctx_regs, ctx, sizeof(*ctx));
+ if (bpf_probe_read_kernel(current_regs, PT_REGS_SIZE, regs))
+ return 0;
+ if (bpf_probe_read_kernel(ctx_regs, PT_REGS_SIZE, ctx))
+ return 0;
/* Prove that uprobe was run */
uprobe_res = 1;
--
2.33.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next v2] selftests/bpf: Fix build of task_pt_regs test for arm64
2021-09-06 16:36 [PATCH bpf-next v2] selftests/bpf: Fix build of task_pt_regs test for arm64 Jean-Philippe Brucker
@ 2021-09-07 10:26 ` Ilya Leoshkevich
2021-09-07 15:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Ilya Leoshkevich @ 2021-09-07 10:26 UTC (permalink / raw)
To: Jean-Philippe Brucker, ast, daniel, andrii
Cc: kafai, songliubraving, yhs, john.fastabend, kpsingh, dxu, bpf,
linux-kselftest, shuah, Andrii Nakryiko
On Mon, 2021-09-06 at 17:36 +0100, Jean-Philippe Brucker wrote:
> struct pt_regs is not exported to userspace on all archs. arm64 and
> s390
> export "user_pt_regs" instead, which causes build failure at the
> moment:
>
> progs/test_task_pt_regs.c:8:16: error: variable has incomplete type
> 'struct pt_regs'
> struct pt_regs current_regs = {};
>
> Instead of using pt_regs from ptrace.h, use the larger kernel struct
> from vmlinux.h directly. Since the test runner task_pt_regs.c does not
> have access to the kernel struct definition, copy it into a char array.
>
> Fixes: 576d47bb1a92 ("bpf: selftests: Add bpf_task_pt_regs() selftest")
> Suggested-by: Andrii Nakryiko <andrii.nakryiko@gmail.com>
> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> ---
> v2: Work on struct pt_regs from vmlinux.h
> v1:
> https://lore.kernel.org/bpf/20210902090925.2010528-1-jean-philippe@linaro.org/
> ---
> .../selftests/bpf/prog_tests/task_pt_regs.c | 1 -
> .../selftests/bpf/progs/test_task_pt_regs.c | 19 +++++++++++++------
> 2 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c
> b/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c
> index 53f0e0fa1a53..37c20b5ffa70 100644
> --- a/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c
> +++ b/tools/testing/selftests/bpf/prog_tests/task_pt_regs.c
> @@ -1,7 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> #define _GNU_SOURCE
> #include <test_progs.h>
> -#include <linux/ptrace.h>
> #include "test_task_pt_regs.skel.h"
>
> void test_task_pt_regs(void)
> diff --git a/tools/testing/selftests/bpf/progs/test_task_pt_regs.c
> b/tools/testing/selftests/bpf/progs/test_task_pt_regs.c
> index 6c059f1cfa1b..e6cb09259408 100644
> --- a/tools/testing/selftests/bpf/progs/test_task_pt_regs.c
> +++ b/tools/testing/selftests/bpf/progs/test_task_pt_regs.c
> @@ -1,12 +1,17 @@
> // SPDX-License-Identifier: GPL-2.0
>
> -#include <linux/ptrace.h>
> -#include <linux/bpf.h>
> +#include "vmlinux.h"
> #include <bpf/bpf_helpers.h>
> #include <bpf/bpf_tracing.h>
>
> -struct pt_regs current_regs = {};
> -struct pt_regs ctx_regs = {};
> +#define PT_REGS_SIZE sizeof(struct pt_regs)
> +
> +/*
> + * The kernel struct pt_regs isn't exported in its entirety to
> userspace.
> + * Pass it as an array to task_pt_regs.c
> + */
> +char current_regs[PT_REGS_SIZE] = {};
> +char ctx_regs[PT_REGS_SIZE] = {};
> int uprobe_res = 0;
>
> SEC("uprobe/trigger_func")
> @@ -17,8 +22,10 @@ int handle_uprobe(struct pt_regs *ctx)
>
> current = bpf_get_current_task_btf();
> regs = (struct pt_regs *) bpf_task_pt_regs(current);
> - __builtin_memcpy(¤t_regs, regs, sizeof(*regs));
> - __builtin_memcpy(&ctx_regs, ctx, sizeof(*ctx));
> + if (bpf_probe_read_kernel(current_regs, PT_REGS_SIZE, regs))
> + return 0;
> + if (bpf_probe_read_kernel(ctx_regs, PT_REGS_SIZE, ctx))
> + return 0;
>
> /* Prove that uprobe was run */
> uprobe_res = 1;
I've tested this patch on s390 and it does indeed fix the build issue.
Thanks!
Tested-by: Ilya Leoshkevich <iii@linux.ibm.com>
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next v2] selftests/bpf: Fix build of task_pt_regs test for arm64
2021-09-06 16:36 [PATCH bpf-next v2] selftests/bpf: Fix build of task_pt_regs test for arm64 Jean-Philippe Brucker
2021-09-07 10:26 ` Ilya Leoshkevich
@ 2021-09-07 15:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-09-07 15:30 UTC (permalink / raw)
To: Jean-Philippe Brucker
Cc: ast, daniel, andrii, kafai, songliubraving, yhs, john.fastabend,
kpsingh, dxu, bpf, linux-kselftest, shuah, andrii.nakryiko
Hello:
This patch was applied to bpf/bpf.git (refs/heads/master):
On Mon, 6 Sep 2021 17:36:38 +0100 you wrote:
> struct pt_regs is not exported to userspace on all archs. arm64 and s390
> export "user_pt_regs" instead, which causes build failure at the moment:
>
> progs/test_task_pt_regs.c:8:16: error: variable has incomplete type 'struct pt_regs'
> struct pt_regs current_regs = {};
>
> Instead of using pt_regs from ptrace.h, use the larger kernel struct
> from vmlinux.h directly. Since the test runner task_pt_regs.c does not
> have access to the kernel struct definition, copy it into a char array.
>
> [...]
Here is the summary with links:
- [bpf-next,v2] selftests/bpf: Fix build of task_pt_regs test for arm64
https://git.kernel.org/bpf/bpf/c/3a029e1f3d6e
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-07 15:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-06 16:36 [PATCH bpf-next v2] selftests/bpf: Fix build of task_pt_regs test for arm64 Jean-Philippe Brucker
2021-09-07 10:26 ` Ilya Leoshkevich
2021-09-07 15:30 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.