From: James Hilliard <james.hilliard1@gmail.com>
To: bpf@vger.kernel.org
Cc: James Hilliard <james.hilliard1@gmail.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Tom Rix <trix@redhat.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
llvm@lists.linux.dev
Subject: [PATCH v2] bpf/scripts: Generate GCC compatible helpers
Date: Wed, 6 Jul 2022 11:28:13 -0600 [thread overview]
Message-ID: <20220706172814.169274-1-james.hilliard1@gmail.com> (raw)
The current bpf_helper_defs.h helpers are llvm specific and don't work
correctly with gcc.
GCC appears to required kernel helper funcs to have the following
attribute set: __attribute__((kernel_helper(NUM)))
Generate gcc compatible headers based on the format in bpf-helpers.h.
This adds conditional blocks for GCC while leaving clang codepaths
unchanged, for example:
#if __GNUC__ && !__clang__
void *bpf_map_lookup_elem(void *map, const void *key) __attribute__((kernel_helper(1)));
#else
static void *(*bpf_map_lookup_elem)(void *map, const void *key) = (void *) 1;
#endif
#if __GNUC__ && !__clang__
long bpf_map_update_elem(void *map, const void *key, const void *value, __u64 flags) __attribute__((kernel_helper(2)));
#else
static long (*bpf_map_update_elem)(void *map, const void *key, const void *value, __u64 flags) = (void *) 2;
#endif
See:
https://github.com/gcc-mirror/gcc/blob/releases/gcc-12.1.0/gcc/config/bpf/bpf-helpers.h#L24-L27
This fixes the following build error:
error: indirect call in function, which are not supported by eBPF
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
Changes v1 -> v2:
- more details in commit log
---
scripts/bpf_doc.py | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/scripts/bpf_doc.py b/scripts/bpf_doc.py
index a0ec321469bd..36fb400a5731 100755
--- a/scripts/bpf_doc.py
+++ b/scripts/bpf_doc.py
@@ -739,6 +739,24 @@ class PrinterHelpers(Printer):
seen_helpers = set()
+ def print_args(self, proto):
+ comma = ''
+ for i, a in enumerate(proto['args']):
+ t = a['type']
+ n = a['name']
+ if proto['name'] in self.overloaded_helpers and i == 0:
+ t = 'void'
+ n = 'ctx'
+ one_arg = '{}{}'.format(comma, self.map_type(t))
+ if n:
+ if a['star']:
+ one_arg += ' {}'.format(a['star'])
+ else:
+ one_arg += ' '
+ one_arg += '{}'.format(n)
+ comma = ', '
+ print(one_arg, end='')
+
def print_one(self, helper):
proto = helper.proto_break_down()
@@ -762,26 +780,17 @@ class PrinterHelpers(Printer):
print(' *{}{}'.format(' \t' if line else '', line))
print(' */')
+ print('#if __GNUC__ && !__clang__')
+ print('%s %s%s(' % (self.map_type(proto['ret_type']),
+ proto['ret_star'], proto['name']), end='')
+ self.print_args(proto)
+ print(') __attribute__((kernel_helper(%d)));' % len(self.seen_helpers))
+ print('#else')
print('static %s %s(*%s)(' % (self.map_type(proto['ret_type']),
proto['ret_star'], proto['name']), end='')
- comma = ''
- for i, a in enumerate(proto['args']):
- t = a['type']
- n = a['name']
- if proto['name'] in self.overloaded_helpers and i == 0:
- t = 'void'
- n = 'ctx'
- one_arg = '{}{}'.format(comma, self.map_type(t))
- if n:
- if a['star']:
- one_arg += ' {}'.format(a['star'])
- else:
- one_arg += ' '
- one_arg += '{}'.format(n)
- comma = ', '
- print(one_arg, end='')
-
+ self.print_args(proto)
print(') = (void *) %d;' % len(self.seen_helpers))
+ print('#endif')
print('')
###############################################################################
--
2.34.1
next reply other threads:[~2022-07-06 17:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-06 17:28 James Hilliard [this message]
2022-07-11 23:35 ` [PATCH v2] bpf/scripts: Generate GCC compatible helpers Yonghong Song
2022-07-12 0:11 ` James Hilliard
2022-07-12 4:40 ` Andrii Nakryiko
2022-07-12 9:48 ` Quentin Monnet
2022-07-12 11:29 ` Jose E. Marchesi
2022-07-12 23:29 ` James Hilliard
2022-07-12 11:19 ` Jose E. Marchesi
2022-07-12 16:48 ` Alexei Starovoitov
2022-07-13 1:10 ` James Hilliard
2022-07-13 1:18 ` Alexei Starovoitov
2022-07-13 1:29 ` James Hilliard
2022-07-13 1:44 ` Alexei Starovoitov
2022-07-13 2:56 ` James Hilliard
2022-07-13 4:25 ` Alexei Starovoitov
2022-07-13 5:25 ` James Hilliard
2022-08-27 11:03 ` James Hilliard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220706172814.169274-1-james.hilliard1@gmail.com \
--to=james.hilliard1@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=trix@redhat.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox