bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH bpf-next] bpf: Fix build error in case of !CONFIG_DEBUG_INFO_BTF
@ 2022-07-22 11:36 Kumar Kartikeya Dwivedi
  2022-07-22 12:40 ` Jiri Olsa
  2022-07-22 16:10 ` patchwork-bot+netdevbpf
  0 siblings, 2 replies; 3+ messages in thread
From: Kumar Kartikeya Dwivedi @ 2022-07-22 11:36 UTC (permalink / raw)
  To: bpf
  Cc: kernel test robot, Alexei Starovoitov, Andrii Nakryiko, Daniel Borkmann

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 <lkp@intel.com>
Fixes: ab21d6063c01 ("bpf: Introduce 8-byte BTF set")
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
---
 include/linux/btf_ids.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/btf_ids.h b/include/linux/btf_ids.h
index 3cb0741e71d7..2aea877d644f 100644
--- a/include/linux/btf_ids.h
+++ b/include/linux/btf_ids.h
@@ -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


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf: Fix build error in case of !CONFIG_DEBUG_INFO_BTF
  2022-07-22 11:36 [PATCH bpf-next] bpf: Fix build error in case of !CONFIG_DEBUG_INFO_BTF Kumar Kartikeya Dwivedi
@ 2022-07-22 12:40 ` Jiri Olsa
  2022-07-22 16:10 ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 3+ messages in thread
From: Jiri Olsa @ 2022-07-22 12:40 UTC (permalink / raw)
  To: Kumar Kartikeya Dwivedi
  Cc: bpf, kernel test robot, Alexei Starovoitov, Andrii Nakryiko,
	Daniel Borkmann

On Fri, Jul 22, 2022 at 01:36:05PM +0200, Kumar Kartikeya Dwivedi wrote:
> 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 <lkp@intel.com>
> Fixes: ab21d6063c01 ("bpf: Introduce 8-byte BTF set")
> Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>

Acked-by: Jiri Olsa <jolsa@kernel.org>

jirka

> ---
>  include/linux/btf_ids.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/btf_ids.h b/include/linux/btf_ids.h
> index 3cb0741e71d7..2aea877d644f 100644
> --- a/include/linux/btf_ids.h
> +++ b/include/linux/btf_ids.h
> @@ -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
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH bpf-next] bpf: Fix build error in case of !CONFIG_DEBUG_INFO_BTF
  2022-07-22 11:36 [PATCH bpf-next] bpf: Fix build error in case of !CONFIG_DEBUG_INFO_BTF Kumar Kartikeya Dwivedi
  2022-07-22 12:40 ` Jiri Olsa
@ 2022-07-22 16:10 ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-07-22 16:10 UTC (permalink / raw)
  To: Kumar Kartikeya Dwivedi; +Cc: bpf, lkp, ast, andrii, daniel

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov <ast@kernel.org>:

On Fri, 22 Jul 2022 13:36:05 +0200 you wrote:
> 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 <lkp@intel.com>
> Fixes: ab21d6063c01 ("bpf: Introduce 8-byte BTF set")
> Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
> 
> [...]

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!
-- 
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:[~2022-07-22 16:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-22 11:36 [PATCH bpf-next] bpf: Fix build error in case of !CONFIG_DEBUG_INFO_BTF Kumar Kartikeya Dwivedi
2022-07-22 12:40 ` Jiri Olsa
2022-07-22 16:10 ` patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).