| Message ID | 20200720163359.1393079-1-yhs@fb.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | bpf: compute btf_ids at build time for btf_iter | expand |
On Mon, Jul 20, 2020 at 09:33:59AM -0700, Yonghong Song wrote: > Sync kernel header btf_ids.h to tools directory. > Also define macro CONFIG_DEBUG_INFO_BTF before > including btf_ids.h in prog_tests/resolve_btfids.c > since non-stub definitions for BTF_ID_LIST etc. macros > are defined under CONFIG_DEBUG_INFO_BTF. This > prevented test_progs from failing. I was going to send this with the d_path change ;-) thanks, jirka > > Signed-off-by: Yonghong Song <yhs@fb.com> > --- > tools/include/linux/btf_ids.h | 11 ++++++++++- > .../testing/selftests/bpf/prog_tests/resolve_btfids.c | 1 + > 2 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/tools/include/linux/btf_ids.h b/tools/include/linux/btf_ids.h > index fe019774f8a7..1cdb56950ffe 100644 > --- a/tools/include/linux/btf_ids.h > +++ b/tools/include/linux/btf_ids.h > @@ -3,6 +3,8 @@ > #ifndef _LINUX_BTF_IDS_H > #define _LINUX_BTF_IDS_H > > +#ifdef CONFIG_DEBUG_INFO_BTF > + > #include <linux/compiler.h> /* for __PASTE */ > > /* > @@ -21,7 +23,7 @@ > asm( \ > ".pushsection " BTF_IDS_SECTION ",\"a\"; \n" \ > ".local " #symbol " ; \n" \ > -".type " #symbol ", @object; \n" \ > +".type " #symbol ", STT_OBJECT; \n" \ > ".size " #symbol ", 4; \n" \ > #symbol ": \n" \ > ".zero 4 \n" \ > @@ -83,5 +85,12 @@ asm( \ > ".zero 4 \n" \ > ".popsection; \n"); > > +#else > + > +#define BTF_ID_LIST(name) static u32 name[5]; > +#define BTF_ID(prefix, name) > +#define BTF_ID_UNUSED > + > +#endif /* CONFIG_DEBUG_INFO_BTF */ > > #endif > diff --git a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c > index 403be6f36cba..22d83bba4e91 100644 > --- a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c > +++ b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c > @@ -6,6 +6,7 @@ > #include <bpf/libbpf.h> > #include <linux/btf.h> > #include <linux/kernel.h> > +#define CONFIG_DEBUG_INFO_BTF > #include <linux/btf_ids.h> > #include "test_progs.h" > > -- > 2.24.1 >
diff --git a/tools/include/linux/btf_ids.h b/tools/include/linux/btf_ids.h index fe019774f8a7..1cdb56950ffe 100644 --- a/tools/include/linux/btf_ids.h +++ b/tools/include/linux/btf_ids.h @@ -3,6 +3,8 @@ #ifndef _LINUX_BTF_IDS_H #define _LINUX_BTF_IDS_H +#ifdef CONFIG_DEBUG_INFO_BTF + #include <linux/compiler.h> /* for __PASTE */ /* @@ -21,7 +23,7 @@ asm( \ ".pushsection " BTF_IDS_SECTION ",\"a\"; \n" \ ".local " #symbol " ; \n" \ -".type " #symbol ", @object; \n" \ +".type " #symbol ", STT_OBJECT; \n" \ ".size " #symbol ", 4; \n" \ #symbol ": \n" \ ".zero 4 \n" \ @@ -83,5 +85,12 @@ asm( \ ".zero 4 \n" \ ".popsection; \n"); +#else + +#define BTF_ID_LIST(name) static u32 name[5]; +#define BTF_ID(prefix, name) +#define BTF_ID_UNUSED + +#endif /* CONFIG_DEBUG_INFO_BTF */ #endif diff --git a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c index 403be6f36cba..22d83bba4e91 100644 --- a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c +++ b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c @@ -6,6 +6,7 @@ #include <bpf/libbpf.h> #include <linux/btf.h> #include <linux/kernel.h> +#define CONFIG_DEBUG_INFO_BTF #include <linux/btf_ids.h> #include "test_progs.h"
Sync kernel header btf_ids.h to tools directory. Also define macro CONFIG_DEBUG_INFO_BTF before including btf_ids.h in prog_tests/resolve_btfids.c since non-stub definitions for BTF_ID_LIST etc. macros are defined under CONFIG_DEBUG_INFO_BTF. This prevented test_progs from failing. Signed-off-by: Yonghong Song <yhs@fb.com> --- tools/include/linux/btf_ids.h | 11 ++++++++++- .../testing/selftests/bpf/prog_tests/resolve_btfids.c | 1 + 2 files changed, 11 insertions(+), 1 deletion(-)