bpf: Fix build error in case of !CONFIG_DEBUG_INFO_BTF
Kumar Kartikeya Dwivedi
maintainerPATCH 1/1 bpf: Fix build error in case of !CONFIG_DEBUG_INFO_BTF
BTF_ID_FLAGS macro needs to be able to take 0 or 1 args, so make it a variable argument. BTF_SET8_END is incorrect, it should just be empty.
Reported-by kernel test robot <[email protected]>
Fixes ab21d6063c01 ("bpf: Introduce 8-byte BTF set")
Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>
--- include/linux/btf_ids.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/btf_ids.h +2 -2
@@ -206,7 +206,7 @@ extern struct btf_id_set8 name;#define BTF_ID_LIST (name) static u32 __maybe_unused name[5];#define BTF_ID (prefix, name) -#define BTF_ID_FLAGS (prefix, name, flags) +#define BTF_ID_FLAGS (prefix, name, ...)#define BTF_ID_UNUSED #define BTF_ID_LIST_GLOBAL (name, n) u32 __maybe_unused name[n];#define BTF_ID_LIST_SINGLE (name, prefix, typename) static u32 __maybe_unused name[1];
@@ -215,7 +215,7 @@ extern struct btf_id_set8 name;#define BTF_SET_START_GLOBAL (name) static struct btf_id_set __maybe_unused name = { 0 };#define BTF_SET_END (name)#define BTF_SET8_START (name) static struct btf_id_set8 __maybe_unused name = { 0 }; -#define BTF_SET8_END (name) static struct btf_id_set8 __maybe_unused name = { 0 }; +#define BTF_SET8_END (name)#endif /* CONFIG_DEBUG_INFO_BTF */
--
2.34.1
Quoted 6 lines · Kumar Kartikeya Dwivedi
BTF_ID_FLAGSmacro needs to be able to take 0 or 1 args, so make it a variable argument.BTF_SET8_ENDis incorrect, it should just be empty.Reported-by kernel test robot <[email protected]>Fixes ab21d6063c01 ("bpf: Introduce 8-byte BTF set")Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>
Acked-by Jiri Olsa <[email protected]>
jirka
Quoted 29 lines
--- include/linux/btf_ids.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)include/linux/btf_ids.h +2
-3@@ -206,7 +206,7 @@ extern struct btf_id_set8 name;#define BTF_ID_LIST (name) static u32 __maybe_unused name[5];#define BTF_ID (prefix, name) -#define BTF_ID_FLAGS (prefix, name, flags) +#define BTF_ID_FLAGS (prefix, name, ...)#define BTF_ID_UNUSED #define BTF_ID_LIST_GLOBAL (name, n) u32 __maybe_unused name[n];#define BTF_ID_LIST_SINGLE (name, prefix, typename) static u32 __maybe_unused name[1];@@ -215,7 +215,7 @@ extern struct btf_id_set8 name;#define BTF_SET_START_GLOBAL (name) static struct btf_id_set __maybe_unused name = { 0 };#define BTF_SET_END (name)#define BTF_SET8_START (name) static struct btf_id_set8 __maybe_unused name = { 0 }; -#define BTF_SET8_END (name) static struct btf_id_set8 __maybe_unused name = { 0 }; +#define BTF_SET8_END (name)#endif /* CONFIG_DEBUG_INFO_BTF */ --2.34.1
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Fri, 22 Jul 2022 13:36:05 +0200 you wrote:
BTF_ID_FLAGSmacro needs to be able to take 0 or 1 args, so make it a variable argument.BTF_SET8_ENDis incorrect, it should just be empty.Reported-by kernel test robot <[email protected]>Fixes ab21d6063c01 ("bpf: Introduce 8-byte BTF set")Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>[...]
Here is the summary with links:
- [bpf-next] bpf: Fix build error in case of !CONFIG_DEBUG_INFO_BTF
https://git.kernel.org/bpf/bpf-next/c/e42341437586
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html