diff options
| author | Alan Maguire <alan.maguire@oracle.com> | 2024-06-20 10:17:29 +0100 |
|---|---|---|
| committer | Andrii Nakryiko <andrii@kernel.org> | 2024-06-21 14:45:07 -0700 |
| commit | d4e48e3dd45017abdd69a19285d197de897ef44f (patch) | |
| tree | a0f022a078e3faa261970df64601e3b446660f2e /kernel/module | |
| parent | d1cf840854bb603c0718a011bc993f69f2df014e (diff) | |
| download | linux-d4e48e3dd45017abdd69a19285d197de897ef44f.tar.gz linux-d4e48e3dd45017abdd69a19285d197de897ef44f.tar.bz2 linux-d4e48e3dd45017abdd69a19285d197de897ef44f.zip | |
module, bpf: Store BTF base pointer in struct module
...as this will allow split BTF modules with a base BTF
representation (rather than the full vmlinux BTF at time of
BTF encoding) to resolve their references to kernel types in a
way that is more resilient to small changes in kernel types.
This will allow modules that are not built every time the kernel
is to provide more resilient BTF, rather than have it invalidated
every time BTF ids for core kernel types change.
Fields are ordered to avoid holes in struct module.
Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20240620091733.1967885-3-alan.maguire@oracle.com
Diffstat (limited to 'kernel/module')
| -rw-r--r-- | kernel/module/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/module/main.c b/kernel/module/main.c index d18a94b973e1..d9592195c5bb 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2166,6 +2166,8 @@ static int find_module_sections(struct module *mod, struct load_info *info) #endif #ifdef CONFIG_DEBUG_INFO_BTF_MODULES mod->btf_data = any_section_objs(info, ".BTF", 1, &mod->btf_data_size); + mod->btf_base_data = any_section_objs(info, ".BTF.base", 1, + &mod->btf_base_data_size); #endif #ifdef CONFIG_JUMP_LABEL mod->jump_entries = section_objs(info, "__jump_table", @@ -2590,8 +2592,9 @@ static noinline int do_init_module(struct module *mod) } #ifdef CONFIG_DEBUG_INFO_BTF_MODULES - /* .BTF is not SHF_ALLOC and will get removed, so sanitize pointer */ + /* .BTF is not SHF_ALLOC and will get removed, so sanitize pointers */ mod->btf_data = NULL; + mod->btf_base_data = NULL; #endif /* * We want to free module_init, but be aware that kallsyms may be |