Re: [PATCH v3 bpf-next 5/7] bpf: support BPF ksym variables in kernel modules
From: Daniel Borkmann <daniel@iogearbox.net>
Date: 2021-01-12 16:28:38
Also in:
bpf
On 1/12/21 8:55 AM, Andrii Nakryiko wrote:
Add support for directly accessing kernel module variables from BPF programs using special ldimm64 instructions. This functionality builds upon vmlinux ksym support, but extends ldimm64 with src_reg=BPF_PSEUDO_BTF_ID to allow specifying kernel module BTF's FD in insn[1].imm field. During BPF program load time, verifier will resolve FD to BTF object and will take reference on BTF object itself and, for module BTFs, corresponding module as well, to make sure it won't be unloaded from under running BPF program. The mechanism used is similar to how bpf_prog keeps track of used bpf_maps. One interesting change is also in how per-CPU variable is determined. The logic is to find .data..percpu data section in provided BTF, but both vmlinux and module each have their own .data..percpu entries in BTF. So for module's case, the search for DATASEC record needs to look at only module's added BTF types. This is implemented with custom search function. Acked-by: Yonghong Song <redacted> Acked-by: Hao Luo <redacted> Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
[...]
+
+struct module *btf_try_get_module(const struct btf *btf)
+{
+ struct module *res = NULL;
+#ifdef CONFIG_DEBUG_INFO_BTF_MODULES
+ struct btf_module *btf_mod, *tmp;
+
+ mutex_lock(&btf_module_mutex);
+ list_for_each_entry_safe(btf_mod, tmp, &btf_modules, list) {
+ if (btf_mod->btf != btf)
+ continue;
+
+ if (try_module_get(btf_mod->module))
+ res = btf_mod->module;One more thought (follow-up would be okay I'd think) ... when a module references a symbol from another module, it similarly needs to bump the refcount of the module that is owning it and thus disallowing to unload for that other module's lifetime. That usage dependency is visible via /proc/modules however, so if unload doesn't work then lsmod allows a way to introspect that to the user. This seems to be achieved via resolve_symbol() where it records its dependency/usage. Would be great if we could at some point also include the BPF prog name into that list so that this is more obvious. Wdyt?
quoted hunk ↗ jump to hunk
+ break; + } + mutex_unlock(&btf_module_mutex); +#endif + + return res; +}diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 261f8692d0d2..69c3c308de5e 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c@@ -2119,6 +2119,28 @@ static void bpf_free_used_maps(struct bpf_prog_aux *aux) kfree(aux->used_maps); } +void __bpf_free_used_btfs(struct bpf_prog_aux *aux, + struct btf_mod_pair *used_btfs, u32 len) +{ +#ifdef CONFIG_BPF_SYSCALL + struct btf_mod_pair *btf_mod; + u32 i; + + for (i = 0; i < len; i++) { + btf_mod = &used_btfs[i]; + if (btf_mod->module) + module_put(btf_mod->module); + btf_put(btf_mod->btf); + } +#endif +}