* [PATCH bpf-next 0/2] compute bpf_skc_to_*() helper socket btf ids at build time
@ 2020-07-17 18:47 Yonghong Song
2020-07-17 18:47 ` [PATCH bpf-next 1/2] bpf: change var type of BTF_ID_LIST to static Yonghong Song
2020-07-17 18:47 ` [PATCH bpf-next 2/2] bpf: compute bpf_skc_to_*() helper socket btf ids at build time Yonghong Song
0 siblings, 2 replies; 8+ messages in thread
From: Yonghong Song @ 2020-07-17 18:47 UTC (permalink / raw)
To: bpf, netdev; +Cc: Alexei Starovoitov, Daniel Borkmann, Jiri Olsa, kernel-team
Commit af7ec1383361 ("bpf: Add bpf_skc_to_tcp6_sock() helper")
computed btf ids for a list of sockets at runtime when vmlinux_btf
is available. Commit 5a2798ab32ba
("bpf: Add BTF_ID_LIST/BTF_ID/BTF_ID_UNUSED macros") added support
to calculate btf_ids during linux build time. Patch #2
replaced runtime mechanism with new build-time btf_id computation
mechanism. Patch #1 also fixed a minor issue to use "static" instead
of "extern" for variable declaration to conform to actual
variable scope.
Yonghong Song (2):
bpf: change var type of BTF_ID_LIST to static
bpf: compute bpf_skc_to_*() helper socket btf ids at build time
include/linux/bpf.h | 4 ---
include/linux/btf_ids.h | 2 +-
kernel/bpf/btf.c | 1 -
net/core/filter.c | 49 +++++++++++++----------------------
tools/include/linux/btf_ids.h | 2 +-
5 files changed, 20 insertions(+), 38 deletions(-)
--
2.24.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH bpf-next 1/2] bpf: change var type of BTF_ID_LIST to static
2020-07-17 18:47 [PATCH bpf-next 0/2] compute bpf_skc_to_*() helper socket btf ids at build time Yonghong Song
@ 2020-07-17 18:47 ` Yonghong Song
2020-07-17 19:21 ` Jiri Olsa
` (2 more replies)
2020-07-17 18:47 ` [PATCH bpf-next 2/2] bpf: compute bpf_skc_to_*() helper socket btf ids at build time Yonghong Song
1 sibling, 3 replies; 8+ messages in thread
From: Yonghong Song @ 2020-07-17 18:47 UTC (permalink / raw)
To: bpf, netdev; +Cc: Alexei Starovoitov, Daniel Borkmann, Jiri Olsa, kernel-team
The BTF_ID_LIST macro definition in btf_ids.h:
#define BTF_ID_LIST(name) \
__BTF_ID_LIST(name) \
extern u32 name[];
The variable defined in __BTF_ID_LIST has
".local" directive, which means the variable
is only available in the current file.
So change the scope of "name" in the declaration
from "extern" to "static".
Signed-off-by: Yonghong Song <yhs@fb.com>
---
include/linux/btf_ids.h | 2 +-
tools/include/linux/btf_ids.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/btf_ids.h b/include/linux/btf_ids.h
index 1cdb56950ffe..cebc9a655959 100644
--- a/include/linux/btf_ids.h
+++ b/include/linux/btf_ids.h
@@ -66,7 +66,7 @@ asm( \
#define BTF_ID_LIST(name) \
__BTF_ID_LIST(name) \
-extern u32 name[];
+static u32 name[];
/*
* The BTF_ID_UNUSED macro defines 4 zero bytes.
diff --git a/tools/include/linux/btf_ids.h b/tools/include/linux/btf_ids.h
index fe019774f8a7..b870776201e5 100644
--- a/tools/include/linux/btf_ids.h
+++ b/tools/include/linux/btf_ids.h
@@ -64,7 +64,7 @@ asm( \
#define BTF_ID_LIST(name) \
__BTF_ID_LIST(name) \
-extern u32 name[];
+static u32 name[];
/*
* The BTF_ID_UNUSED macro defines 4 zero bytes.
--
2.24.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH bpf-next 2/2] bpf: compute bpf_skc_to_*() helper socket btf ids at build time
2020-07-17 18:47 [PATCH bpf-next 0/2] compute bpf_skc_to_*() helper socket btf ids at build time Yonghong Song
2020-07-17 18:47 ` [PATCH bpf-next 1/2] bpf: change var type of BTF_ID_LIST to static Yonghong Song
@ 2020-07-17 18:47 ` Yonghong Song
2020-07-18 0:33 ` kernel test robot
1 sibling, 1 reply; 8+ messages in thread
From: Yonghong Song @ 2020-07-17 18:47 UTC (permalink / raw)
To: bpf, netdev; +Cc: Alexei Starovoitov, Daniel Borkmann, Jiri Olsa, kernel-team
Currently, socket types (struct tcp_sock, udp_sock, etc.)
used by bpf_skc_to_*() helpers are computed when vmlinux_btf
is first built in the kernel.
Commit 5a2798ab32ba
("bpf: Add BTF_ID_LIST/BTF_ID/BTF_ID_UNUSED macros")
implemented a mechanism to compute btf_ids at kernel build
time which can simplify kernel implementation and reduce
runtime overhead by removing in-kernel btf_id calculation.
This patch did exactly this, removing in-kernel btf_id
computation and utilizing build-time btf_id computation.
If CONFIG_DEBUG_INFO_BTF is not defined, BTF_ID_LIST will
define an array with size of 5, which is not enough for
btf_sock_ids. So define its own static array if
CONFIG_DEBUG_INFO_BTF is not defined.
Signed-off-by: Yonghong Song <yhs@fb.com>
---
include/linux/bpf.h | 4 ----
kernel/bpf/btf.c | 1 -
net/core/filter.c | 49 +++++++++++++++++----------------------------
3 files changed, 18 insertions(+), 36 deletions(-)
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 54ad426dbea1..bc7a4e475d5c 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -1537,7 +1537,6 @@ static inline bool bpf_map_is_dev_bound(struct bpf_map *map)
struct bpf_map *bpf_map_offload_map_alloc(union bpf_attr *attr);
void bpf_map_offload_map_free(struct bpf_map *map);
-void init_btf_sock_ids(struct btf *btf);
#else
static inline int bpf_prog_offload_init(struct bpf_prog *prog,
union bpf_attr *attr)
@@ -1563,9 +1562,6 @@ static inline struct bpf_map *bpf_map_offload_map_alloc(union bpf_attr *attr)
static inline void bpf_map_offload_map_free(struct bpf_map *map)
{
}
-static inline void init_btf_sock_ids(struct btf *btf)
-{
-}
#endif /* CONFIG_NET && CONFIG_BPF_SYSCALL */
#if defined(CONFIG_BPF_STREAM_PARSER)
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 03d6d43bb1d6..315cde73421b 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -3672,7 +3672,6 @@ struct btf *btf_parse_vmlinux(void)
goto errout;
bpf_struct_ops_init(btf, log);
- init_btf_sock_ids(btf);
btf_verifier_env_free(env);
refcount_set(&btf->refcnt, 1);
diff --git a/net/core/filter.c b/net/core/filter.c
index bdd2382e655d..d861455ec7bd 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -9243,19 +9243,19 @@ void bpf_prog_change_xdp(struct bpf_prog *prev_prog, struct bpf_prog *prog)
* sock_common as the first argument in its memory layout.
*/
#define BTF_SOCK_TYPE_xxx \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_INET, "inet_sock") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_INET_CONN, "inet_connection_sock") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_INET_REQ, "inet_request_sock") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_INET_TW, "inet_timewait_sock") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_REQ, "request_sock") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_SOCK, "sock") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_SOCK_COMMON, "sock_common") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_TCP, "tcp_sock") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_TCP_REQ, "tcp_request_sock") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_TCP_TW, "tcp_timewait_sock") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_TCP6, "tcp6_sock") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_UDP, "udp_sock") \
- BTF_SOCK_TYPE(BTF_SOCK_TYPE_UDP6, "udp6_sock")
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_INET, inet_sock) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_INET_CONN, inet_connection_sock) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_INET_REQ, inet_request_sock) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_INET_TW, inet_timewait_sock) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_REQ, request_sock) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_SOCK, sock) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_SOCK_COMMON, sock_common) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_TCP, tcp_sock) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_TCP_REQ, tcp_request_sock) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_TCP_TW, tcp_timewait_sock) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_TCP6, tcp6_sock) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_UDP, udp_sock) \
+ BTF_SOCK_TYPE(BTF_SOCK_TYPE_UDP6, udp6_sock)
enum {
#define BTF_SOCK_TYPE(name, str) name,
@@ -9264,26 +9264,13 @@ BTF_SOCK_TYPE_xxx
MAX_BTF_SOCK_TYPE,
};
-static int btf_sock_ids[MAX_BTF_SOCK_TYPE];
-
-#ifdef CONFIG_BPF_SYSCALL
-static const char *bpf_sock_types[] = {
-#define BTF_SOCK_TYPE(name, str) str,
+#ifdef CONFIG_DEBUG_INFO_BTF
+BTF_ID_LIST(btf_sock_ids)
+#define BTF_SOCK_TYPE(name, type) BTF_ID(struct, type)
BTF_SOCK_TYPE_xxx
#undef BTF_SOCK_TYPE
-};
-
-void init_btf_sock_ids(struct btf *btf)
-{
- int i, btf_id;
-
- for (i = 0; i < MAX_BTF_SOCK_TYPE; i++) {
- btf_id = btf_find_by_name_kind(btf, bpf_sock_types[i],
- BTF_KIND_STRUCT);
- if (btf_id > 0)
- btf_sock_ids[i] = btf_id;
- }
-}
+#else
+static u32 btf_sock_ids[MAX_BTF_SOCK_TYPE];
#endif
static bool check_arg_btf_id(u32 btf_id, u32 arg)
--
2.24.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH bpf-next 1/2] bpf: change var type of BTF_ID_LIST to static
2020-07-17 18:47 ` [PATCH bpf-next 1/2] bpf: change var type of BTF_ID_LIST to static Yonghong Song
@ 2020-07-17 19:21 ` Jiri Olsa
2020-07-17 23:12 ` kernel test robot
2020-07-18 0:10 ` kernel test robot
2 siblings, 0 replies; 8+ messages in thread
From: Jiri Olsa @ 2020-07-17 19:21 UTC (permalink / raw)
To: Yonghong Song
Cc: bpf, netdev, Alexei Starovoitov, Daniel Borkmann, Jiri Olsa, kernel-team
On Fri, Jul 17, 2020 at 11:47:06AM -0700, Yonghong Song wrote:
> The BTF_ID_LIST macro definition in btf_ids.h:
> #define BTF_ID_LIST(name) \
> __BTF_ID_LIST(name) \
> extern u32 name[];
>
> The variable defined in __BTF_ID_LIST has
> ".local" directive, which means the variable
> is only available in the current file.
> So change the scope of "name" in the declaration
> from "extern" to "static".
>
> Signed-off-by: Yonghong Song <yhs@fb.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
thanks,
jirka
> ---
> include/linux/btf_ids.h | 2 +-
> tools/include/linux/btf_ids.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/btf_ids.h b/include/linux/btf_ids.h
> index 1cdb56950ffe..cebc9a655959 100644
> --- a/include/linux/btf_ids.h
> +++ b/include/linux/btf_ids.h
> @@ -66,7 +66,7 @@ asm( \
>
> #define BTF_ID_LIST(name) \
> __BTF_ID_LIST(name) \
> -extern u32 name[];
> +static u32 name[];
>
> /*
> * The BTF_ID_UNUSED macro defines 4 zero bytes.
> diff --git a/tools/include/linux/btf_ids.h b/tools/include/linux/btf_ids.h
> index fe019774f8a7..b870776201e5 100644
> --- a/tools/include/linux/btf_ids.h
> +++ b/tools/include/linux/btf_ids.h
> @@ -64,7 +64,7 @@ asm( \
>
> #define BTF_ID_LIST(name) \
> __BTF_ID_LIST(name) \
> -extern u32 name[];
> +static u32 name[];
>
> /*
> * The BTF_ID_UNUSED macro defines 4 zero bytes.
> --
> 2.24.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH bpf-next 1/2] bpf: change var type of BTF_ID_LIST to static
2020-07-17 18:47 ` [PATCH bpf-next 1/2] bpf: change var type of BTF_ID_LIST to static Yonghong Song
2020-07-17 19:21 ` Jiri Olsa
@ 2020-07-17 23:12 ` kernel test robot
2020-07-18 5:10 ` Yonghong Song
2020-07-18 0:10 ` kernel test robot
2 siblings, 1 reply; 8+ messages in thread
From: kernel test robot @ 2020-07-17 23:12 UTC (permalink / raw)
To: Yonghong Song, bpf, netdev
Cc: kbuild-all, Alexei Starovoitov, Daniel Borkmann, Jiri Olsa, kernel-team
[-- Attachment #1: Type: text/plain, Size: 10062 bytes --]
Hi Yonghong,
I love your patch! Yet something to improve:
[auto build test ERROR on bpf-next/master]
url: https://github.com/0day-ci/linux/commits/Yonghong-Song/compute-bpf_skc_to_-helper-socket-btf-ids-at-build-time/20200718-025117
base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master
config: x86_64-rhel-7.6-kselftests (attached as .config)
compiler: gcc-9 (Debian 9.3.0-14) 9.3.0
reproduce (this is a W=1 build):
# save the attached .config to linux build tree
make W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All error/warnings (new ones prefixed by >>):
In file included from kernel/bpf/btf.c:21:
>> kernel/bpf/btf.c:3625:13: warning: array 'bpf_ctx_convert_btf_id' assumed to have one element
3625 | BTF_ID_LIST(bpf_ctx_convert_btf_id)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
/tmp/ccYr5IvF.s: Assembler messages:
/tmp/ccYr5IvF.s:23808: Error: symbol `bpf_ctx_convert_btf_id' is already defined
--
In file included from kernel/bpf/stackmap.c:12:
>> kernel/bpf/stackmap.c:580:13: warning: array 'bpf_get_task_stack_btf_ids' assumed to have one element
580 | BTF_ID_LIST(bpf_get_task_stack_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
/tmp/ccjqxVG0.s: Assembler messages:
>> /tmp/ccjqxVG0.s:4352: Error: symbol `bpf_get_task_stack_btf_ids' is already defined
--
In file included from net/core/filter.c:78:
>> net/core/filter.c:3783:13: warning: array 'bpf_skb_output_btf_ids' assumed to have one element
3783 | BTF_ID_LIST(bpf_skb_output_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
>> net/core/filter.c:4179:13: warning: array 'bpf_xdp_output_btf_ids' assumed to have one element
4179 | BTF_ID_LIST(bpf_xdp_output_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
/tmp/ccAPtQBF.s: Assembler messages:
>> /tmp/ccAPtQBF.s:67210: Error: symbol `bpf_xdp_output_btf_ids' is already defined
>> /tmp/ccAPtQBF.s:67358: Error: symbol `bpf_skb_output_btf_ids' is already defined
--
In file included from net/core/filter.c:78:
>> net/core/filter.c:3783:13: warning: array 'bpf_skb_output_btf_ids' assumed to have one element
3783 | BTF_ID_LIST(bpf_skb_output_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
>> net/core/filter.c:4179:13: warning: array 'bpf_xdp_output_btf_ids' assumed to have one element
4179 | BTF_ID_LIST(bpf_xdp_output_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
/tmp/cc5vDkeD.s: Assembler messages:
/tmp/cc5vDkeD.s:67210: Error: symbol `bpf_xdp_output_btf_ids' is already defined
/tmp/cc5vDkeD.s:67358: Error: symbol `bpf_skb_output_btf_ids' is already defined
--
kernel/trace/bpf_trace.c: In function '____bpf_trace_printk':
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
538 | return __BPF_TP_EMIT();
| ^~~~~~
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
kernel/trace/bpf_trace.c:538:2: warning: function '____bpf_trace_printk' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
In file included from kernel/trace/bpf_trace.c:17:
kernel/trace/bpf_trace.c: At top level:
>> kernel/trace/bpf_trace.c:746:13: warning: array 'bpf_seq_printf_btf_ids' assumed to have one element
746 | BTF_ID_LIST(bpf_seq_printf_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
>> kernel/trace/bpf_trace.c:766:13: warning: array 'bpf_seq_write_btf_ids' assumed to have one element
766 | BTF_ID_LIST(bpf_seq_write_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
/tmp/ccD742Hy.s: Assembler messages:
>> /tmp/ccD742Hy.s:18358: Error: symbol `bpf_seq_write_btf_ids' is already defined
>> /tmp/ccD742Hy.s:18376: Error: symbol `bpf_seq_printf_btf_ids' is already defined
--
In file included from kernel/bpf/stackmap.c:12:
>> kernel/bpf/stackmap.c:580:13: warning: array 'bpf_get_task_stack_btf_ids' assumed to have one element
580 | BTF_ID_LIST(bpf_get_task_stack_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
/tmp/cc3dyWIM.s: Assembler messages:
/tmp/cc3dyWIM.s:4352: Error: symbol `bpf_get_task_stack_btf_ids' is already defined
--
In file included from kernel/bpf/btf.c:21:
>> kernel/bpf/btf.c:3625:13: warning: array 'bpf_ctx_convert_btf_id' assumed to have one element
3625 | BTF_ID_LIST(bpf_ctx_convert_btf_id)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
/tmp/ccCr2PU4.s: Assembler messages:
/tmp/ccCr2PU4.s:23808: Error: symbol `bpf_ctx_convert_btf_id' is already defined
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 50002 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH bpf-next 1/2] bpf: change var type of BTF_ID_LIST to static
2020-07-17 18:47 ` [PATCH bpf-next 1/2] bpf: change var type of BTF_ID_LIST to static Yonghong Song
2020-07-17 19:21 ` Jiri Olsa
2020-07-17 23:12 ` kernel test robot
@ 2020-07-18 0:10 ` kernel test robot
2 siblings, 0 replies; 8+ messages in thread
From: kernel test robot @ 2020-07-18 0:10 UTC (permalink / raw)
To: Yonghong Song, bpf, netdev
Cc: kbuild-all, Alexei Starovoitov, Daniel Borkmann, Jiri Olsa, kernel-team
[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]
Hi Yonghong,
I love your patch! Yet something to improve:
[auto build test ERROR on bpf-next/master]
url: https://github.com/0day-ci/linux/commits/Yonghong-Song/compute-bpf_skc_to_-helper-socket-btf-ids-at-build-time/20200718-025117
base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master
config: x86_64-rhel-7.6-kselftests (attached as .config)
compiler: gcc-9 (Debian 9.3.0-14) 9.3.0
reproduce (this is a W=1 build):
# save the attached .config to linux build tree
make W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from kernel/bpf/btf.c:21:
kernel/bpf/btf.c:3625:13: warning: array 'bpf_ctx_convert_btf_id' assumed to have one element
3625 | BTF_ID_LIST(bpf_ctx_convert_btf_id)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
/tmp/ccXM0qVD.s: Assembler messages:
>> /tmp/ccXM0qVD.s:23808: Error: symbol `bpf_ctx_convert_btf_id' is already defined
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 49999 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH bpf-next 2/2] bpf: compute bpf_skc_to_*() helper socket btf ids at build time
2020-07-17 18:47 ` [PATCH bpf-next 2/2] bpf: compute bpf_skc_to_*() helper socket btf ids at build time Yonghong Song
@ 2020-07-18 0:33 ` kernel test robot
0 siblings, 0 replies; 8+ messages in thread
From: kernel test robot @ 2020-07-18 0:33 UTC (permalink / raw)
To: Yonghong Song, bpf, netdev
Cc: kbuild-all, Alexei Starovoitov, Daniel Borkmann, Jiri Olsa, kernel-team
[-- Attachment #1: Type: text/plain, Size: 3358 bytes --]
Hi Yonghong,
I love your patch! Yet something to improve:
[auto build test ERROR on bpf-next/master]
url: https://github.com/0day-ci/linux/commits/Yonghong-Song/compute-bpf_skc_to_-helper-socket-btf-ids-at-build-time/20200718-025117
base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master
config: x86_64-rhel-7.6-kselftests (attached as .config)
compiler: gcc-9 (Debian 9.3.0-14) 9.3.0
reproduce (this is a W=1 build):
# save the attached .config to linux build tree
make W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All error/warnings (new ones prefixed by >>):
In file included from net/core/filter.c:78:
net/core/filter.c:3783:13: warning: array 'bpf_skb_output_btf_ids' assumed to have one element
3783 | BTF_ID_LIST(bpf_skb_output_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
net/core/filter.c:4179:13: warning: array 'bpf_xdp_output_btf_ids' assumed to have one element
4179 | BTF_ID_LIST(bpf_xdp_output_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
>> net/core/filter.c:9268:13: warning: array 'btf_sock_ids' assumed to have one element
9268 | BTF_ID_LIST(btf_sock_ids)
| ^~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
/tmp/ccDB7ajn.s: Assembler messages:
>> /tmp/ccDB7ajn.s:66247: Error: symbol `btf_sock_ids' is already defined
/tmp/ccDB7ajn.s:67196: Error: symbol `bpf_xdp_output_btf_ids' is already defined
/tmp/ccDB7ajn.s:67344: Error: symbol `bpf_skb_output_btf_ids' is already defined
--
In file included from net/core/filter.c:78:
net/core/filter.c:3783:13: warning: array 'bpf_skb_output_btf_ids' assumed to have one element
3783 | BTF_ID_LIST(bpf_skb_output_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
net/core/filter.c:4179:13: warning: array 'bpf_xdp_output_btf_ids' assumed to have one element
4179 | BTF_ID_LIST(bpf_xdp_output_btf_ids)
| ^~~~~~~~~~~~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
>> net/core/filter.c:9268:13: warning: array 'btf_sock_ids' assumed to have one element
9268 | BTF_ID_LIST(btf_sock_ids)
| ^~~~~~~~~~~~
include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
69 | static u32 name[];
| ^~~~
/tmp/cc1GpKvw.s: Assembler messages:
/tmp/cc1GpKvw.s:66247: Error: symbol `btf_sock_ids' is already defined
/tmp/cc1GpKvw.s:67196: Error: symbol `bpf_xdp_output_btf_ids' is already defined
/tmp/cc1GpKvw.s:67344: Error: symbol `bpf_skb_output_btf_ids' is already defined
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 50002 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH bpf-next 1/2] bpf: change var type of BTF_ID_LIST to static
2020-07-17 23:12 ` kernel test robot
@ 2020-07-18 5:10 ` Yonghong Song
0 siblings, 0 replies; 8+ messages in thread
From: Yonghong Song @ 2020-07-18 5:10 UTC (permalink / raw)
To: kernel test robot, bpf, netdev
Cc: kbuild-all, Alexei Starovoitov, Daniel Borkmann, Jiri Olsa, kernel-team
On 7/17/20 4:12 PM, kernel test robot wrote:
> Hi Yonghong,
>
> I love your patch! Yet something to improve:
>
> [auto build test ERROR on bpf-next/master]
>
> url: https://github.com/0day-ci/linux/commits/Yonghong-Song/compute-bpf_skc_to_-helper-socket-btf-ids-at-build-time/20200718-025117
> base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master
> config: x86_64-rhel-7.6-kselftests (attached as .config)
> compiler: gcc-9 (Debian 9.3.0-14) 9.3.0
> reproduce (this is a W=1 build):
> # save the attached .config to linux build tree
> make W=1 ARCH=x86_64
>
> If you fix the issue, kindly add following tag as appropriate
> Reported-by: kernel test robot <lkp@intel.com>
>
> All error/warnings (new ones prefixed by >>):
>
> In file included from kernel/bpf/btf.c:21:
>>> kernel/bpf/btf.c:3625:13: warning: array 'bpf_ctx_convert_btf_id' assumed to have one element
> 3625 | BTF_ID_LIST(bpf_ctx_convert_btf_id)
> | ^~~~~~~~~~~~~~~~~~~~~~
> include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
> 69 | static u32 name[];
> | ^~~~
> /tmp/ccYr5IvF.s: Assembler messages:
> /tmp/ccYr5IvF.s:23808: Error: symbol `bpf_ctx_convert_btf_id' is already defined
gcc8 is fine and gcc9 enforced the rules as `name` is defined both in
assembly code and in C code. I guess `static u32 name[]` won't work.
I will restore to original `extern u32 name[]`.
Thanks.
> --
> In file included from kernel/bpf/stackmap.c:12:
>>> kernel/bpf/stackmap.c:580:13: warning: array 'bpf_get_task_stack_btf_ids' assumed to have one element
> 580 | BTF_ID_LIST(bpf_get_task_stack_btf_ids)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> include/linux/btf_ids.h:69:12: note: in definition of macro 'BTF_ID_LIST'
> 69 | static u32 name[];
> | ^~~~
> /tmp/ccjqxVG0.s: Assembler messages:
[...]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-07-18 5:11 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-17 18:47 [PATCH bpf-next 0/2] compute bpf_skc_to_*() helper socket btf ids at build time Yonghong Song
2020-07-17 18:47 ` [PATCH bpf-next 1/2] bpf: change var type of BTF_ID_LIST to static Yonghong Song
2020-07-17 19:21 ` Jiri Olsa
2020-07-17 23:12 ` kernel test robot
2020-07-18 5:10 ` Yonghong Song
2020-07-18 0:10 ` kernel test robot
2020-07-17 18:47 ` [PATCH bpf-next 2/2] bpf: compute bpf_skc_to_*() helper socket btf ids at build time Yonghong Song
2020-07-18 0:33 ` kernel test robot
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).