Commit 8555defe authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Daniel Borkmann

selftests/bpf: Add CO-RE relos into linked_funcs selftests

Add CO-RE relocations into __weak subprogs for multi-file linked_funcs
selftest to make sure libbpf handles such combination well.
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220408181425.2287230-4-andrii@kernel.org
parent 2fa5b0f2
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "vmlinux.h" #include "vmlinux.h"
#include <bpf/bpf_helpers.h> #include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h> #include <bpf/bpf_tracing.h>
#include <bpf/bpf_core_read.h>
/* weak and shared between two files */ /* weak and shared between two files */
const volatile int my_tid __weak; const volatile int my_tid __weak;
...@@ -44,6 +45,13 @@ void set_output_ctx1(__u64 *ctx) ...@@ -44,6 +45,13 @@ void set_output_ctx1(__u64 *ctx)
/* this weak instance should win because it's the first one */ /* this weak instance should win because it's the first one */
__weak int set_output_weak(int x) __weak int set_output_weak(int x)
{ {
static volatile int whatever;
/* make sure we use CO-RE relocations in a weak function, this used to
* cause problems for BPF static linker
*/
whatever = bpf_core_type_size(struct task_struct);
output_weak1 = x; output_weak1 = x;
return x; return x;
} }
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "vmlinux.h" #include "vmlinux.h"
#include <bpf/bpf_helpers.h> #include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h> #include <bpf/bpf_tracing.h>
#include <bpf/bpf_core_read.h>
/* weak and shared between both files */ /* weak and shared between both files */
const volatile int my_tid __weak; const volatile int my_tid __weak;
...@@ -44,6 +45,13 @@ void set_output_ctx2(__u64 *ctx) ...@@ -44,6 +45,13 @@ void set_output_ctx2(__u64 *ctx)
/* this weak instance should lose, because it will be processed second */ /* this weak instance should lose, because it will be processed second */
__weak int set_output_weak(int x) __weak int set_output_weak(int x)
{ {
static volatile int whatever;
/* make sure we use CO-RE relocations in a weak function, this used to
* cause problems for BPF static linker
*/
whatever = 2 * bpf_core_type_size(struct task_struct);
output_weak2 = x; output_weak2 = x;
return 2 * x; return 2 * x;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment