On Thu, Mar 18, 2021 at 10:29 PM Martin KaFai Lau <kafai@xxxxxx> wrote: > > On Thu, Mar 18, 2021 at 09:13:56PM -0700, Andrii Nakryiko wrote: > > On Thu, Mar 18, 2021 at 4:39 PM Martin KaFai Lau <kafai@xxxxxx> wrote: > > > > > > On Thu, Mar 18, 2021 at 03:53:38PM -0700, Andrii Nakryiko wrote: > > > > On Tue, Mar 16, 2021 at 12:01 AM Martin KaFai Lau <kafai@xxxxxx> wrote: > > > > > > > > > > This patch makes BTF verifier to accept extern func. It is used for > > > > > allowing bpf program to call a limited set of kernel functions > > > > > in a later patch. > > > > > > > > > > When writing bpf prog, the extern kernel function needs > > > > > to be declared under a ELF section (".ksyms") which is > > > > > the same as the current extern kernel variables and that should > > > > > keep its usage consistent without requiring to remember another > > > > > section name. > > > > > > > > > > For example, in a bpf_prog.c: > > > > > > > > > > extern int foo(struct sock *) __attribute__((section(".ksyms"))) > > > > > > > > > > [24] FUNC_PROTO '(anon)' ret_type_id=15 vlen=1 > > > > > '(anon)' type_id=18 > > > > > [25] FUNC 'foo' type_id=24 linkage=extern > > > > > [ ... ] > > > > > [33] DATASEC '.ksyms' size=0 vlen=1 > > > > > type_id=25 offset=0 size=0 > > > > > > > > > > LLVM will put the "func" type into the BTF datasec ".ksyms". > > > > > The current "btf_datasec_check_meta()" assumes everything under > > > > > it is a "var" and ensures it has non-zero size ("!vsi->size" test). > > > > > The non-zero size check is not true for "func". This patch postpones the > > > > > "!vsi-size" test from "btf_datasec_check_meta()" to > > > > > "btf_datasec_resolve()" which has all types collected to decide > > > > > if a vsi is a "var" or a "func" and then enforce the "vsi->size" > > > > > differently. > > > > > > > > > > If the datasec only has "func", its "t->size" could be zero. > > > > > Thus, the current "!t->size" test is no longer valid. The > > > > > invalid "t->size" will still be caught by the later > > > > > "last_vsi_end_off > t->size" check. This patch also takes this > > > > > chance to consolidate other "t->size" tests ("vsi->offset >= t->size" > > > > > "vsi->size > t->size", and "t->size < sum") into the existing > > > > > "last_vsi_end_off > t->size" test. > > > > > > > > > > The LLVM will also put those extern kernel function as an extern > > > > > linkage func in the BTF: > > > > > > > > > > [24] FUNC_PROTO '(anon)' ret_type_id=15 vlen=1 > > > > > '(anon)' type_id=18 > > > > > [25] FUNC 'foo' type_id=24 linkage=extern > > > > > > > > > > This patch allows BTF_FUNC_EXTERN in btf_func_check_meta(). > > > > > Also extern kernel function declaration does not > > > > > necessary have arg name. Another change in btf_func_check() is > > > > > to allow extern function having no arg name. > > > > > > > > > > The btf selftest is adjusted accordingly. New tests are also added. > > > > > > > > > > The required LLVM patch: https://reviews.llvm.org/D93563 > > > > > > > > > > Signed-off-by: Martin KaFai Lau <kafai@xxxxxx> > > > > > --- > > > > > > > > High-level question about EXTERN functions in DATASEC. Does kernel > > > > need to see them under DATASEC? What if libbpf just removed all EXTERN > > > > funcs from under DATASEC and leave them as "free-floating" EXTERN > > > > FUNCs in BTF. > > > > > > > > We need to tag EXTERNs with DATASECs mainly for libbpf to know whether > > > > it's .kconfig or .ksym or other type of externs. Does kernel need to > > > > care? > > > Although the kernel does not need to know, since the a legit llvm generates it, > > > I go with a proper support in the kernel (e.g. bpftool btf dump can better > > > reflect what was there). > > > > LLVM also generates extern VAR with BTF_VAR_EXTERN, yet libbpf is > > replacing it with fake INTs. > Yep. I noticed the loop in collect_extern() in libbpf. > It replaces the var->type with INT. > > > We could do just that here as well. > What to replace in the FUNC case? if we do that, I'd just replace them with same INTs. Or we can just remove the entire DATASEC. Now it is easier to do with BTF write APIs. Back then it was a major pain. I'd probably get rid of DATASEC altogether instead of that INT replacement, if I had BTF write APIs. > > Regardless, supporting it properly in the kernel is a better way to go > instead of asking the userspace to move around it. It is not very > complicated to support it in the kernel also. > > What is the concern of having the kernel to support it? Just more complicated BTF validation logic, which means that there are higher chances of permitting invalid BTF. And then the question is what can the kernel do with those EXTERNs in BTF? Probably nothing. And that .ksyms section is special, and purely libbpf convention. Ideally kernel should not allow EXTERN funcs in any other DATASEC. Are you willing to hard-code ".ksyms" name in kernel for libbpf's sake? Probably not. The general rule, so far, was that kernel shouldn't see any unresolved EXTERN at all. Now it's neither here nor there. EXTERN funcs are ok, EXTERN vars are not. > > > If anyone would want to know all the kernel functions that some BPF > > program is using, they could do it from the instruction dump, with > > proper addresses and kernel function names nicely displayed there. > > That's way more useful, IMO.