Fix attaching fentry/fexit/fmod_ret/lsm to modules
Subsystems (7)
v6 cover Fix attaching fentry/fexit/fmod_ret/lsm to modules
Context: I noticed that the verifier behaves incorrectly when attaching to fentry of multiple functions of the same name located in different modules (or in vmlinux). The reason for this is that if the target program is not specified, the verifier will search kallsyms for the trampoline address to attach to. The entire kallsyms is always searched, not respecting the module in which the function to attach to is located.
As Yonghong correctly pointed out, there is yet another issue - the trampoline acquires the module reference in register_fentry which means that if the module is unloaded between the place where the address is found in the verifier and register_fentry, it is possible that another module is loaded to the same address in the meantime, which may lead to errors.
This patch fixes the above issues by extracting the module name from the BTF of the attachment target (which must be specified) and by doing the search in kallsyms of the correct module. At the same time, the module reference is acquired right after the address is found and only released right before the program itself is unloaded.
---
Changes in v6:
- storing the module reference inside bpf_prog_aux instead of bpf_trampoline and releasing it when the program is unloaded (suggested by Jiri Olsa)
Changes in v5:
- fixed acquiring and releasing of module references by trampolines to prevent modules being unloaded between address lookup and trampoline allocation
Changes in v4:
- reworked module kallsyms lookup approach using existing functions, verifier now calls btf_try_get_module to retrieve the module and find_kallsyms_symbol_value to get the symbol address (suggested by Alexei)
- included Jiri Olsa's comments
- improved description of the new test and added it as a comment into the test source
Changes in v3:
- added trivial implementation for kallsyms_lookup_name_in_module() for !CONFIG_MODULES (noticed by test robot, fix suggested by Hao Luo)
Changes in v2:
- introduced and used more space-efficient kallsyms lookup function, suggested by Jiri Olsa
- included Hao Luo's comments
Viktor Malik (2):
bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules bpf/selftests: Test fentry attachment to shadowed functions
include/linux/bpf.h | 1 + kernel/bpf/syscall.c | 2 + kernel/bpf/trampoline.c | 27 ---- kernel/bpf/verifier.c | 20 ++- kernel/module/internal.h | 5 + net/bpf/test_run.c | 5 + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 6 + .../bpf/prog_tests/module_attach_shadow.c | 131 ++++++++++++++++++ 8 files changed, 169 insertions(+), 28 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c
Signature · 1 line
2.39.1
PATCH v6 1/2 bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
This resolves two problems with attachment of fentry/fexit/fmod_ret/lsm to functions located in modules:
1. The verifier tries to find the address to attach to in kallsyms. This is always done by searching the entire kallsyms, not respecting the module in which the function is located. Such approach causes an incorrect attachment address to be computed if the function to attach to is shadowed by a function of the same name located earlier in kallsyms.
2. If the address to attach to is located in a module, the module reference is only acquired in register_fentry. If the module is unloaded between the place where the address is found (bpf_check_attach_target in the verifier) and register_fentry, it is possible that another module is loaded to the same address which may lead to potential errors.
Since the attachment must contain the BTF of the program to attach to, we extract the module from it and search for the function address in the correct module (resolving problem no. 1). Then, the module reference is taken directly in bpf_check_attach_target and stored in the bpf program (in bpf_prog_aux). The reference is only released when the program is unloaded (resolving problem no. 2).
--- include/linux/bpf.h | 1 + kernel/bpf/syscall.c | 2 ++ kernel/bpf/trampoline.c | 27 --------------------------- kernel/bpf/verifier.c | 20 +++++++++++++++++++- kernel/module/internal.h | 5 +++++ 5 files changed, 27 insertions(+), 28 deletions(-)
include/linux/bpf.h +1 -0
@@ -1330,6 +1330,7 @@ struct bpf_prog_aux {* main prog always has linfo_idx == 0 */ u32 linfo_idx; +struct module *mod;u32 num_exentries;struct exception_table_entry *extable;union {
kernel/bpf/syscall.c +2 -0
@@ -2064,6 +2064,8 @@ static void bpf_prog_put_deferred(struct work_struct *work) prog = aux->prog;perf_event_bpf_event (prog,PERF_BPF_EVENT_PROG_UNLOAD ,0 );bpf_audit_prog (prog,BPF_AUDIT_UNLOAD ); +if (aux->mod) +module_put (aux->mod);bpf_prog_free_id (prog);__bpf_prog_put_noref (prog, true); }
kernel/bpf/trampoline.c +0 -27
@@ -172,26 +172,6 @@ static struct bpf_trampoline *bpf_trampoline_lookup(u64 key)return tr; } -static int bpf_trampoline_module_get (struct bpf_trampoline *tr) -{ -struct module *mod; -int err =0 ; - -preempt_disable (); - mod =__module_text_address ((unsigned long ) tr->func.addr); -if (mod && !try_module_get (mod)) - err = -ENOENT ; -preempt_enable (); - tr->mod = mod; -return err; -} - -static void bpf_trampoline_module_put (struct bpf_trampoline *tr) -{ -module_put (tr->mod); - tr->mod =NULL ; -} -static int unregister_fentry (struct bpf_trampoline *tr,void *old_addr) {void *ip = tr->func.addr;
@@ -202,8 +182,6 @@ static int unregister_fentry(struct bpf_trampoline *tr, void *old_addr)else ret =bpf_arch_text_poke (ip,BPF_MOD_CALL , old_addr,NULL ); -if (!ret) -bpf_trampoline_module_put (tr);return ret; }
@@ -238,9 +216,6 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr) tr->func.ftrace_managed = true; } -if (bpf_trampoline_module_get (tr)) -return -ENOENT ; -if (tr->func.ftrace_managed) {ftrace_set_filter_ip (tr->fops, (unsigned long )ip,0 ,1 ); ret =register_ftrace_direct_multi (tr->fops, (long )new_addr);
@@ -248,8 +223,6 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr) ret =bpf_arch_text_poke (ip,BPF_MOD_CALL ,NULL , new_addr); } -if (ret) -bpf_trampoline_module_put (tr);return ret; }
kernel/bpf/verifier.c +19 -1
@@ -24,6 +24,7 @@#include <linux/bpf_lsm.h> #include <linux/btf_ids.h> #include <linux/poison.h> +#include "../module/internal.h" #include "disasm.h"
@@ -16868,6 +16869,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,const char *tname;struct btf *btf;long addr =0 ; +struct module *mod =NULL ;if (!btf_id) {bpf_log (log,"Tracing programs must provide btf_id\n" );
@@ -17041,7 +17043,17 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,else addr = (long ) tgt_prog->aux->func[subprog]->bpf_func; }else { - addr =kallsyms_lookup_name (tname); +if (btf_is_module (btf)) { +preempt_disable (); + mod =btf_try_get_module (btf); +if (mod) + addr =find_kallsyms_symbol_value (mod, tname); +else + addr =0 ; +preempt_enable (); + }else { + addr =kallsyms_lookup_name (tname); + }if (!addr) { bpf_log(log, "The address of function %s cannot be found\n",
@@ -17105,6 +17117,12 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, tgt_info->tgt_addr = addr; tgt_info->tgt_name = tname; tgt_info->tgt_type = t; +if (mod) { +if (!prog->aux->mod) + prog->aux->mod = mod; +else +module_put (mod); + }return 0 ; }
kernel/module/internal.h +5 -0
@@ -256,6 +256,11 @@ static inline bool sect_empty(const Elf_Shdr *sect)static inline void init_build_id (struct module *mod,const struct load_info *info) { }static inline void layout_symtab (struct module *mod,struct load_info *info) { }static inline void add_kallsyms (struct module *mod,const struct load_info *info) { } +static inline unsigned long find_kallsyms_symbol_value(struct module *mod + const char *name) +{ +return 0 ; +}#endif /* CONFIG_KALLSYMS */ #ifdef CONFIG_SYSFS
Signature · 1 line
2.39.1
PATCH v6 2/2 bpf/selftests: Test fentry attachment to shadowed functions
In reply to Viktor MalikAdds a new test that tries to attach a program to fentry of two functions of the same name, one located in vmlinux and the other in bpf_testmod.
To avoid conflicts with existing tests, a new function "bpf_fentry_shadow_test" was created both in vmlinux and in bpf_testmod.
The previous commit fixed a bug which caused this test to fail. The verifier would always use the vmlinux function's address as the target trampoline address, hence trying to create two trampolines for a single address, which is forbidden.
--- net/bpf/test_run.c | 5 + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 6 + .../bpf/prog_tests/module_attach_shadow.c | 131 ++++++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c
net/bpf/test_run.c +5 -0
@@ -558,6 +558,11 @@ long noinline bpf_kfunc_call_test4(signed char a, short b, int c, long d)return (long )a + (long )b + (long )c + d; } +int noinline bpf_fentry_shadow_test(int a) +{ +return a +1 ; +} +struct prog_test_member1 {int a; };
tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c +6 -0
@@ -229,6 +229,12 @@ static const struct btf_kfunc_id_set bpf_testmod_kfunc_set = { .set = &bpf_testmod_check_kfunc_ids, }; +noinline int bpf_fentry_shadow_test(int a) +{ +return a +2 ; +} +EXPORT_SYMBOL_GPL (bpf_fentry_shadow_test); +extern int bpf_fentry_test1 (int a);static int bpf_testmod_init (void )
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c new file +131 -0
131 lines not on this page · raw message
Signature · 1 line
2.39.1
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
In reply to Viktor MalikQuoted 50 lines · Viktor Malik
This resolves two problems with attachment of fentry/fexit/fmod_ret/lsm to functions located in modules:
1. The verifier tries to find the address to attach to in kallsyms. This is always done by searching the entire kallsyms, not respecting the module in which the function is located. Such approach causes an incorrect attachment address to be computed if the function to attach to is shadowed by a function of the same name located earlier in kallsyms.
2. If the address to attach to is located in a module, the module reference is only acquired in
register_fentry. If the module is unloaded between the place where the address is found (bpf_check_attach_targetin the verifier) andregister_fentry, it is possible that another module is loaded to the same address which may lead to potential errors.Since the attachment must contain the BTF of the program to attach to, we extract the module from it and search for the function address in the correct module (resolving problem no. 1). Then, the module reference is taken directly in
bpf_check_attach_targetand stored in the bpf program (inbpf_prog_aux). The reference is only released when the program is unloaded (resolving problem no. 2).Signed-off-by Viktor Malik <[email protected]>--- include/linux/bpf.h | 1 + kernel/bpf/syscall.c | 2 ++ kernel/bpf/trampoline.c | 27 --------------------------- kernel/bpf/verifier.c | 20 +++++++++++++++++++- kernel/module/internal.h | 5 +++++ 5 files changed, 27 insertions(+), 28 deletions(-)include/linux/bpf.h +1
-0@@ -1330,6 +1330,7 @@ struct bpf_prog_aux {* main prog always has linfo_idx == 0 */ u32 linfo_idx; +struct module *mod;u32 num_exentries;struct exception_table_entry *extable;union {kernel/bpf/syscall.c +0
-0
kernel/bpf/syscall.c static void bpf_prog_put_deferred(struct work_struct *work) · line 2068
Quoted 5 lines
kernel/bpf/syscall.c +2
-0@@ -2064,6 +2064,8 @@ static void bpf_prog_put_deferred(struct work_struct *work) prog = aux->prog;perf_event_bpf_event (prog,PERF_BPF_EVENT_PROG_UNLOAD ,0 );bpf_audit_prog (prog,BPF_AUDIT_UNLOAD ); +if (aux->mod) +module_put (aux->mod);
you can call just module_put, there's != NULL check inside
also should we call it from __bpf_prog_put_noref instead to cover bpf_prog_load error path?
Quoted 83 lines
kernel/bpf/syscall.c +0
-0bpf_prog_free_id (prog);__bpf_prog_put_noref (prog, true); }kernel/bpf/trampoline.c +0
-27@@ -172,26 +172,6 @@ static struct bpf_trampoline *bpf_trampoline_lookup(u64 key)return tr; } -static int bpf_trampoline_module_get (struct bpf_trampoline *tr) -{ -struct module *mod; -int err =0 ; - -preempt_disable (); - mod =__module_text_address ((unsigned long ) tr->func.addr); -if (mod && !try_module_get (mod)) - err = -ENOENT ; -preempt_enable (); - tr->mod = mod; -return err; -} - -static void bpf_trampoline_module_put (struct bpf_trampoline *tr) -{ -module_put (tr->mod); - tr->mod =NULL ; -} -static int unregister_fentry (struct bpf_trampoline *tr,void *old_addr) {void *ip = tr->func.addr;@@ -202,8 +182,6 @@ static int unregister_fentry(struct bpf_trampoline *tr, void *old_addr)else ret =bpf_arch_text_poke (ip,BPF_MOD_CALL , old_addr,NULL ); -if (!ret) -bpf_trampoline_module_put (tr);return ret; }@@ -238,9 +216,6 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr) tr->func.ftrace_managed = true; } -if (bpf_trampoline_module_get (tr)) -return -ENOENT ; -if (tr->func.ftrace_managed) {ftrace_set_filter_ip (tr->fops, (unsigned long )ip,0 ,1 ); ret =register_ftrace_direct_multi (tr->fops, (long )new_addr);@@ -248,8 +223,6 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr) ret =bpf_arch_text_poke (ip,BPF_MOD_CALL ,NULL , new_addr); } -if (ret) -bpf_trampoline_module_put (tr);return ret; }kernel/bpf/verifier.c +2
-0@@ -24,6 +24,7 @@#include <linux/bpf_lsm.h> #include <linux/btf_ids.h> #include <linux/poison.h> +#include "../module/internal.h" #include "disasm.h" @@ -16868,6 +16869,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,const char *tname;struct btf *btf;long addr =0 ; +struct module *mod =NULL ;if (!btf_id) {bpf_log (log,"Tracing programs must provide btf_id\n" );
kernel/bpf/verifier.c int bpf_check_attach_target(struct bpf_verifier_log *log, · line 17047
Quoted 6 lines
kernel/bpf/verifier.c +2
-1@@ -17041,7 +17043,17 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,else addr = (long ) tgt_prog->aux->func[subprog]->bpf_func; }else { - addr =kallsyms_lookup_name (tname); +if (btf_is_module (btf)) { +preempt_disable ();
btf_try_get_module takes mutex, so you can't preempt_disable in here, I got this when running the test:
[ 691.916989][ T2585] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:580
Quoted 13 lines
kernel/bpf/verifier.c +9
-0+ mod =btf_try_get_module (btf); +if (mod) + addr =find_kallsyms_symbol_value (mod, tname); +else + addr =0 ; +preempt_enable (); + }else { + addr =kallsyms_lookup_name (tname); + }if (!addr) { bpf_log(log, "The address of function %s cannot be found\n",
kernel/bpf/verifier.c int bpf_check_attach_target(struct bpf_verifier_log *log, · line 17122
Quoted 6 lines
kernel/bpf/verifier.c +3
-0@@ -17105,6 +17117,12 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, tgt_info->tgt_addr = addr; tgt_info->tgt_name = tname; tgt_info->tgt_type = t; +if (mod) { +if (!prog->aux->mod) + prog->aux->mod = mod;
can this actually happen? would it be better to have bpf_check_attach_target just to take take the module ref and return it in tgt_info->tgt_mod and it'd be up to caller to decide what to do with that
thanks,
jirka
Quoted 25 lines
kernel/bpf/verifier.c +3
-0+else +module_put (mod); + }return 0 ; }kernel/module/internal.h +5
-0@@ -256,6 +256,11 @@ static inline bool sect_empty(const Elf_Shdr *sect)static inline void init_build_id (struct module *mod,const struct load_info *info) { }static inline void layout_symtab (struct module *mod,struct load_info *info) { }static inline void add_kallsyms (struct module *mod,const struct load_info *info) { } +static inline unsigned long find_kallsyms_symbol_value(struct module *mod + const char *name) +{ +return 0 ; +}#endif /* CONFIG_KALLSYMS */ #ifdef CONFIG_SYSFS Signature · 1 line
2.39.1
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
Quoted 59 lines · Jiri Olsa
Quoted 50 lines · Viktor Malik
This resolves two problems with attachment of fentry/fexit/fmod_ret/lsm to functions located in modules:
1. The verifier tries to find the address to attach to in kallsyms. This is always done by searching the entire kallsyms, not respecting the module in which the function is located. Such approach causes an incorrect attachment address to be computed if the function to attach to is shadowed by a function of the same name located earlier in kallsyms.
2. If the address to attach to is located in a module, the module reference is only acquired in
register_fentry. If the module is unloaded between the place where the address is found (bpf_check_attach_targetin the verifier) andregister_fentry, it is possible that another module is loaded to the same address which may lead to potential errors.Since the attachment must contain the BTF of the program to attach to, we extract the module from it and search for the function address in the correct module (resolving problem no. 1). Then, the module reference is taken directly in
bpf_check_attach_targetand stored in the bpf program (inbpf_prog_aux). The reference is only released when the program is unloaded (resolving problem no. 2).Signed-off-by Viktor Malik <[email protected]>--- include/linux/bpf.h | 1 + kernel/bpf/syscall.c | 2 ++ kernel/bpf/trampoline.c | 27 --------------------------- kernel/bpf/verifier.c | 20 +++++++++++++++++++- kernel/module/internal.h | 5 +++++ 5 files changed, 27 insertions(+), 28 deletions(-)include/linux/bpf.h +1
-0@@ -1330,6 +1330,7 @@ struct bpf_prog_aux {* main prog always has linfo_idx == 0 */ u32 linfo_idx; +struct module *mod;u32 num_exentries;struct exception_table_entry *extable;union {kernel/bpf/syscall.c +0
-0kernel/bpf/syscall.c static void bpf_prog_put_deferred(struct work_struct *work) · line 2068
Quoted 5 lines
kernel/bpf/syscall.c +2
-0@@ -2064,6 +2064,8 @@ static void bpf_prog_put_deferred(struct work_struct *work) prog = aux->prog;perf_event_bpf_event (prog,PERF_BPF_EVENT_PROG_UNLOAD ,0 );bpf_audit_prog (prog,BPF_AUDIT_UNLOAD ); +if (aux->mod) +module_put (aux->mod);you can call just
module_put, there's != NULL check inside
Quoted 2 lines
also should we call it from
__bpf_prog_put_norefinstead to coverbpf_prog_loaderror path?
Yes, good point, will do that.
Quoted 94 lines
Quoted 84 lines
kernel/bpf/syscall.c +0
-0bpf_prog_free_id (prog);__bpf_prog_put_noref (prog, true); }kernel/bpf/trampoline.c +0
-27@@ -172,26 +172,6 @@ static struct bpf_trampoline *bpf_trampoline_lookup(u64 key)return tr; } -static int bpf_trampoline_module_get (struct bpf_trampoline *tr) -{ -struct module *mod; -int err =0 ; - -preempt_disable (); - mod =__module_text_address ((unsigned long ) tr->func.addr); -if (mod && !try_module_get (mod)) - err = -ENOENT ; -preempt_enable (); - tr->mod = mod; -return err; -} - -static void bpf_trampoline_module_put (struct bpf_trampoline *tr) -{ -module_put (tr->mod); - tr->mod =NULL ; -} -static int unregister_fentry (struct bpf_trampoline *tr,void *old_addr) {void *ip = tr->func.addr;@@ -202,8 +182,6 @@ static int unregister_fentry(struct bpf_trampoline *tr, void *old_addr)else ret =bpf_arch_text_poke (ip,BPF_MOD_CALL , old_addr,NULL ); -if (!ret) -bpf_trampoline_module_put (tr);return ret; }@@ -238,9 +216,6 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr) tr->func.ftrace_managed = true; } -if (bpf_trampoline_module_get (tr)) -return -ENOENT ; -if (tr->func.ftrace_managed) {ftrace_set_filter_ip (tr->fops, (unsigned long )ip,0 ,1 ); ret =register_ftrace_direct_multi (tr->fops, (long )new_addr);@@ -248,8 +223,6 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr) ret =bpf_arch_text_poke (ip,BPF_MOD_CALL ,NULL , new_addr); } -if (ret) -bpf_trampoline_module_put (tr);return ret; }kernel/bpf/verifier.c +2
-0@@ -24,6 +24,7 @@#include <linux/bpf_lsm.h> #include <linux/btf_ids.h> #include <linux/poison.h> +#include "../module/internal.h" #include "disasm.h" @@ -16868,6 +16869,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,const char *tname;struct btf *btf;long addr =0 ; +struct module *mod =NULL ;if (!btf_id) {bpf_log (log,"Tracing programs must provide btf_id\n" );kernel/bpf/verifier.c int bpf_check_attach_target(struct bpf_verifier_log *log, · line 17047
Quoted 6 lines
kernel/bpf/verifier.c +2
-1@@ -17041,7 +17043,17 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,else addr = (long ) tgt_prog->aux->func[subprog]->bpf_func; }else { - addr =kallsyms_lookup_name (tname); +if (btf_is_module (btf)) { +preempt_disable ();
btf_try_get_moduletakes mutex, so you can'tpreempt_disablein here, I got this when running the test:
Quoted 2 lines
[ 691.916989][ T2585] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:580
Hm, do we even need to preempt_disable? IIUC, preempt_disable is used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
Quoted 15 lines
Quoted 15 lines
kernel/bpf/verifier.c +9
-0+ mod =btf_try_get_module (btf); +if (mod) + addr =find_kallsyms_symbol_value (mod, tname); +else + addr =0 ; +preempt_enable (); + }else { + addr =kallsyms_lookup_name (tname); + }if (!addr) { bpf_log(log, "The address of function %s cannot be found\n",@@ -17105,6 +17117,12 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, tgt_info->tgt_addr = addr; tgt_info->tgt_name = tname;
Quoted 8 lines
kernel/bpf/verifier.c int bpf_check_attach_target(struct bpf_verifier_log *log, · line 17122
Quoted 4 lines
kernel/bpf/verifier.c +3
-0tgt_info->tgt_type = t; +if (mod) { +if (!prog->aux->mod) + prog->aux->mod = mod;can this actually happen? would it be better to have
bpf_check_attach_targetjust to take take the module ref and return it intgt_info->tgt_modand it'd be up to caller to decide what to do with that
Ok, I'll try to do it that way.
Thanks for the review!
Viktor
Quoted 30 lines
thanks,
jirkaQuoted 25 lines
kernel/bpf/verifier.c +3
-0+else +module_put (mod); + }return 0 ; }kernel/module/internal.h +5
-0@@ -256,6 +256,11 @@ static inline bool sect_empty(const Elf_Shdr *sect)static inline void init_build_id (struct module *mod,const struct load_info *info) { }static inline void layout_symtab (struct module *mod,struct load_info *info) { }static inline void add_kallsyms (struct module *mod,const struct load_info *info) { } +static inline unsigned long find_kallsyms_symbol_value(struct module *mod + const char *name) +{ +return 0 ; +}#endif /* CONFIG_KALLSYMS */ #ifdef CONFIG_SYSFS Signature · 1 line
2.39.1
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
On Thu, Feb 16, 2023 at 03:45:11PM +0100, Viktor Malik wrote:
SNIP
Quoted 28 lines
Quoted 28 lines
Quoted 18 lines
kernel/bpf/verifier.c +2
-0@@ -24,6 +24,7 @@#include <linux/bpf_lsm.h> #include <linux/btf_ids.h> #include <linux/poison.h> +#include "../module/internal.h" #include "disasm.h" @@ -16868,6 +16869,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,const char *tname;struct btf *btf;long addr =0 ; +struct module *mod =NULL ;if (!btf_id) {bpf_log (log,"Tracing programs must provide btf_id\n" );kernel/bpf/verifier.c int bpf_check_attach_target(struct bpf_verifier_log *log, · line 17047
Quoted 6 lines
kernel/bpf/verifier.c +2
-1@@ -17041,7 +17043,17 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,else addr = (long ) tgt_prog->aux->func[subprog]->bpf_func; }else { - addr =kallsyms_lookup_name (tname); +if (btf_is_module (btf)) { +preempt_disable ();
btf_try_get_moduletakes mutex, so you can'tpreempt_disablein here, I got this when running the test:
Quoted 6 lines
Quoted 2 lines
[ 691.916989][ T2585] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:580Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_module calls try_module_get which disables the preemption, so no need to call it in here
jirka
Quoted 59 lines
Quoted 16 lines
Quoted 16 lines
kernel/bpf/verifier.c +9
-0+ mod =btf_try_get_module (btf); +if (mod) + addr =find_kallsyms_symbol_value (mod, tname); +else + addr =0 ; +preempt_enable (); + }else { + addr =kallsyms_lookup_name (tname); + }if (!addr) { bpf_log(log, "The address of function %s cannot be found\n",@@ -17105,6 +17117,12 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, tgt_info->tgt_addr = addr; tgt_info->tgt_name = tname;Quoted 8 lines
kernel/bpf/verifier.c int bpf_check_attach_target(struct bpf_verifier_log *log, · line 17122
Quoted 4 lines
kernel/bpf/verifier.c +3
-0tgt_info->tgt_type = t; +if (mod) { +if (!prog->aux->mod) + prog->aux->mod = mod;can this actually happen? would it be better to have
bpf_check_attach_targetjust to take take the module ref and return it intgt_info->tgt_modand it'd be up to caller to decide what to do with thatOk, I'll try to do it that way.
Thanks for the review!
ViktorQuoted 28 lines
thanks,
jirkaQuoted 23 lines
kernel/bpf/verifier.c +3
-0+else +module_put (mod); + }return 0 ; }kernel/module/internal.h +5
-0@@ -256,6 +256,11 @@ static inline bool sect_empty(const Elf_Shdr *sect)static inline void init_build_id (struct module *mod,const struct load_info *info) { }static inline void layout_symtab (struct module *mod,struct load_info *info) { }static inline void add_kallsyms (struct module *mod,const struct load_info *info) { } +static inline unsigned long find_kallsyms_symbol_value(struct module *mod + const char *name) +{ +return 0 ; +}#endif /* CONFIG_KALLSYMS */ #ifdef CONFIG_SYSFS Signature · 1 line
2.39.1
Re: [PATCH bpf-next v6 2/2] bpf/selftests: Test fentry attachment to shadowed functions
In reply to Viktor MalikQuoted 121 lines · Viktor Malik
Adds a new test that tries to attach a program to fentry of two functions of the same name, one located in vmlinux and the other in
bpf_testmod.To avoid conflicts with existing tests, a new function "
bpf_fentry_shadow_test" was created both in vmlinux and inbpf_testmod.The previous commit fixed a bug which caused this test to fail. The verifier would always use the vmlinux function's address as the target trampoline address, hence trying to create two trampolines for a single address, which is forbidden.
Signed-off-by Viktor Malik <[email protected]>--- net/bpf/test_run.c | 5 + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 6 + .../bpf/prog_tests/module_attach_shadow.c | 131 ++++++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/module_attach_shadow.cnet/bpf/test_run.c +5
-0@@ -558,6 +558,11 @@ long noinline bpf_kfunc_call_test4(signed char a, short b, int c, long d)return (long )a + (long )b + (long )c + d; } +int noinline bpf_fentry_shadow_test(int a) +{ +return a +1 ; +} +struct prog_test_member1 {int a; };tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c +6
-0@@ -229,6 +229,12 @@ static const struct btf_kfunc_id_set bpf_testmod_kfunc_set = { .set = &bpf_testmod_check_kfunc_ids, }; +noinline int bpf_fentry_shadow_test(int a) +{ +return a +2 ; +} +EXPORT_SYMBOL_GPL (bpf_fentry_shadow_test); +extern int bpf_fentry_test1 (int a);static int bpf_testmod_init (void )tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c new file +61
-0@@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022 Red Hat */ +#include <test_progs.h> +#include <bpf/btf.h> +#include "bpf/libbpf_internal.h" +#include "cgroup_helpers.h" + +static const char *module_name ="bpf_testmod" ; +static const char *symbol_name ="bpf_fentry_shadow_test" ; + +static int get_bpf_testmod_btf_fd (void ) +{ +struct bpf_btf_info info; +char name[64 ]; +__u32 id =0 , len; +int err, fd; + +while (true) { + err =bpf_btf_get_next_id (id, &id); +if (err) { +log_err ("failed to iterate BTF objects" ); +return err; + } + + fd =bpf_btf_get_fd_by_id (id); +if (fd <0 ) { +if (errno ==ENOENT ) +continue ;/* expected race: BTF was unloaded */ + err = -errno; +log_err ("failed to get FD for BTF object #%d" , id); +return err; + } + + len =sizeof (info); +memset (&info,0 ,sizeof (info)); + info.name =ptr_to_u64 (name); + info.name_len =sizeof (name); + + err =bpf_obj_get_info_by_fd (fd, &info, &len); +if (err) { + err = -errno; +log_err ("failed to get info for BTF object #%d" , id); +close (fd); +return err; + } + +if (strcmp (name, module_name) ==0 ) +return fd; + +close (fd); + } +return -ENOENT ; +} + +void test_module_fentry_shadow (void ) +{ +struct btf *vmlinux_btf =NULL , *mod_btf =NULL ; +int err, i; +int btf_fd[2 ] = {}; +int prog_fd[2 ] = {}; +int link_fd[2 ] = {};
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c line 71
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c new file +10
-0+__s32 btf_id[2 ] = {}; + +const struct bpf_insn trace_program[] = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_EXIT_INSN (), + }; + +LIBBPF_OPTS (bpf_prog_load_opts, load_opts, + .expected_attach_type = BPF_TRACE_FENTRY, + );
nit: this is a variable declaration, so keep it together with other variables
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c line 81
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c new file +10
-0+ +LIBBPF_OPTS (bpf_test_run_opts, test_opts); + + vmlinux_btf =btf__load_vmlinux_btf (); +if (!ASSERT_OK_PTR (vmlinux_btf,"load_vmlinux_btf" )) +return ; + + btf_fd[1 ] =get_bpf_testmod_btf_fd (); +if (!ASSERT_GT (btf_fd[1 ],0 ,"get_bpf_testmod_btf_fd" )) + goto out;
it probably won't ever happen, by FD == 0 is a valid FD, so better not make >0 assumption here?
Quoted 18 lines
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c new file +18
-0+ + mod_btf =btf_get_from_fd (btf_fd[1 ], vmlinux_btf); +if (!ASSERT_OK_PTR (mod_btf,"btf_get_from_fd" )) + goto out; + + btf_id[0 ] =btf__find_by_name_kind (vmlinux_btf, symbol_name,BTF_KIND_FUNC ); +if (!ASSERT_GT (btf_id[0 ],0 ,"btf_find_by_name" )) + goto out; + + btf_id[1 ] =btf__find_by_name_kind (mod_btf, symbol_name,BTF_KIND_FUNC ); +if (!ASSERT_GT (btf_id[1 ],0 ,"btf_find_by_name" )) + goto out; + +for (i =0 ; i <2 ; i++) { + load_opts.attach_btf_id = btf_id[i]; + load_opts.attach_btf_obj_fd = btf_fd[i]; + prog_fd[i] = bpf_prog_load(BPF_PROG_TYPE_TRACING, NULL, "GPL", + trace_program,
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c line 109
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c new file +10
-0+sizeof (trace_program) /sizeof (struct bpf_insn ), + &load_opts); +if (!ASSERT_GE (prog_fd[i],0 ,"bpf_prog_load" )) + goto out; + +// If the verifier incorrectly resolves addresses of the +// shadowed functions and uses the same address for both the +// vmlinux and the bpf_testmod functions, this will fail on +// attempting to create two trampolines for the same address, +// which is forbidden.
C++ style comments, please use /* */
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c line 115
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c new file +6
-0+ link_fd[i] =bpf_link_create (prog_fd[i],0 ,BPF_TRACE_FENTRY ,NULL ); +if (!ASSERT_GE (link_fd[i],0 ,"bpf_link_create" )) + goto out; + } + + err =bpf_prog_test_run_opts (prog_fd[0 ], &test_opts);
you don't need empty test_opts, just pass NULL
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c line 122
Quoted 7 lines
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c new file +7
-0+ASSERT_OK (err,"running test" ); + +out: +if (vmlinux_btf) +btf__free (vmlinux_btf); +if (mod_btf) +btf__free (mod_btf);
no need to check for non-NULL, libbpf's destructors (btf__free being one of them) always handles NULLs correctly
Quoted 12 lines
tools/testing/selftests/bpf/prog_tests/module_attach_shadow.c new file +9
-1+for (i =0 ; i <2 ; i++) { +if (btf_fd[i]) +close (btf_fd[i]); +if (prog_fd[i]) +close (prog_fd[i]); +if (link_fd[i]) +close (link_fd[i]); + } +} --2.39.1
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
In reply to Jiri OlsaQuoted 35 lines · Jiri Olsa
On Thu, Feb 16, 2023 at 03:45:11PM +0100, Viktor Malik wrote:
SNIP
Quoted 31 lines
Quoted 30 lines
Quoted 18 lines
kernel/bpf/verifier.c +2
-0@@ -24,6 +24,7 @@#include <linux/bpf_lsm.h> #include <linux/btf_ids.h> #include <linux/poison.h> +#include "../module/internal.h" #include "disasm.h" @@ -16868,6 +16869,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,const char *tname;struct btf *btf;long addr =0 ; +struct module *mod =NULL ;if (!btf_id) {bpf_log (log,"Tracing programs must provide btf_id\n" );kernel/bpf/verifier.c int bpf_check_attach_target(struct bpf_verifier_log *log, · line 17047
Quoted 6 lines
kernel/bpf/verifier.c +2
-1@@ -17041,7 +17043,17 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,else addr = (long ) tgt_prog->aux->func[subprog]->bpf_func; }else { - addr =kallsyms_lookup_name (tname); +if (btf_is_module (btf)) { +preempt_disable ();
btf_try_get_moduletakes mutex, so you can'tpreempt_disablein here, I got this when running the test:[ 691.916989][ T2585] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:580
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in here
It does, but it reenables preemption right away so it is enabled by the time we call find_kallsyms_symbol_value(). I am getting the following lockdep splat while running module_fentry_shadow test from test_progs.
[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0 [ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdc [ 12.033313][ T488] RIP: 0033:0x7f174ea0e92d [ 12.033668][ T488] Code: 5d c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d d3 e4 0c 00 f7 d8 64 89 0 1 48 [ 12.035197][ T488] RSP: 002b:00007ffee5cefc68 EFLAGS: 00000202 ORIG_RAX: 0000000000000141 [ 12.035864][ T488] RAX: ffffffffffffffda RBX: 00007ffee5cf02a8 RCX: 00007f174ea0e92d [ 12.036495][ T488] RDX: 0000000000000080 RSI: 00007ffee5cefd20 RDI: 0000000000000005 [ 12.037123][ T488] RBP: 00007ffee5cefc80 R08: 00007ffee5cefea0 R09: 00007ffee5cefd20 [ 12.037752][ T488] R10: 0000000000000002 R11: 0000000000000202 R12: 0000000000000000 [ 12.038382][ T488] R13: 00007ffee5cf02c8 R14: 0000000000f2edb0 R15: 00007f174eb59000 [ 12.039022][ T488] </TASK>
Quoted 61 lines
jirka
Quoted 59 lines
Quoted 16 lines
Quoted 16 lines
kernel/bpf/verifier.c +9
-0+ mod =btf_try_get_module (btf); +if (mod) + addr =find_kallsyms_symbol_value (mod, tname); +else + addr =0 ; +preempt_enable (); + }else { + addr =kallsyms_lookup_name (tname); + }if (!addr) { bpf_log(log, "The address of function %s cannot be found\n",@@ -17105,6 +17117,12 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, tgt_info->tgt_addr = addr; tgt_info->tgt_name = tname;Quoted 8 lines
kernel/bpf/verifier.c int bpf_check_attach_target(struct bpf_verifier_log *log, · line 17122
Quoted 4 lines
kernel/bpf/verifier.c +3
-0tgt_info->tgt_type = t; +if (mod) { +if (!prog->aux->mod) + prog->aux->mod = mod;can this actually happen? would it be better to have
bpf_check_attach_targetjust to take take the module ref and return it intgt_info->tgt_modand it'd be up to caller to decide what to do with thatOk, I'll try to do it that way.
Thanks for the review!
ViktorQuoted 28 lines
thanks,
jirkaQuoted 23 lines
kernel/bpf/verifier.c +3
-0+else +module_put (mod); + }return 0 ; }kernel/module/internal.h +5
-0@@ -256,6 +256,11 @@ static inline bool sect_empty(const Elf_Shdr *sect)static inline void init_build_id (struct module *mod,const struct load_info *info) { }static inline void layout_symtab (struct module *mod,struct load_info *info) { }static inline void add_kallsyms (struct module *mod,const struct load_info *info) { } +static inline unsigned long find_kallsyms_symbol_value(struct module *mod + const char *name) +{ +return 0 ; +}#endif /* CONFIG_KALLSYMS */ #ifdef CONFIG_SYSFS Signature · 1 line
2.39.1
Signature · 1 line
Artem
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 36 lines
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0
Quoted 8 lines
[ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdc
hum, for some reason I can't reproduce, but looks like we need to disable preemption for find_kallsyms_symbol_value.. could you please check with patch below?
also could you please share your .config? not sure why I can't reproduce
thanks,
jirka
---
kernel/module/kallsyms.c +13 -3
@@ -442,7 +442,7 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type, }/* Given a module and name of symbol, find and return the symbol's value */ -unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +static unsigned long __find_kallsyms_symbol_value (struct module *mod,const char *name) {unsigned int i;struct mod_kallsyms *kallsyms =rcu_dereference_sched (mod->kallsyms);
@@ -466,7 +466,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (colon) { mod =find_module_all (name, colon - name, false);if (mod) -return find_kallsyms_symbol_value (mod, colon +1 ); +return __find_kallsyms_symbol_value (mod, colon +1 );return 0 ; }
@@ -475,7 +475,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (mod->state ==MODULE_STATE_UNFORMED )continue ; - ret =find_kallsyms_symbol_value (mod, name); + ret =__find_kallsyms_symbol_value (mod, name);if (ret)return ret; }
@@ -494,6 +494,16 @@ unsigned long module_kallsyms_lookup_name(const char *name)return ret; } +unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +{ +unsigned long ret; + +preempt_disable (); + ret =__find_kallsyms_symbol_value (mod, name); +preempt_enable (); +return ret; +} + int module_kallsyms_on_each_symbol(const char *modname, int (*fn)(void *, const char *, struct module *, unsigned long),
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
Quoted 96 lines · Jiri Olsa
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 36 lines
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0Quoted 8 lines
[ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdchum, for some reason I can't reproduce, but looks like we need to disable preemption for
find_kallsyms_symbol_value.. could you please check with patch below?also could you please share your .config? not sure why I can't reproduce
thanks,
jirka---
kernel/module/kallsyms.c +3
-3@@ -442,7 +442,7 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type, }/* Given a module and name of symbol, find and return the symbol's value */ -unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +static unsigned long __find_kallsyms_symbol_value (struct module *mod,const char *name) {unsigned int i;struct mod_kallsyms *kallsyms =rcu_dereference_sched (mod->kallsyms);@@ -466,7 +466,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (colon) { mod =find_module_all (name, colon - name, false);if (mod) -return find_kallsyms_symbol_value (mod, colon +1 ); +return __find_kallsyms_symbol_value (mod, colon +1 );return 0 ; }@@ -475,7 +475,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (mod->state ==MODULE_STATE_UNFORMED )continue ; - ret =find_kallsyms_symbol_value (mod, name); + ret =__find_kallsyms_symbol_value (mod, name);if (ret)return ret; }@@ -494,6 +494,16 @@ unsigned long module_kallsyms_lookup_name(const char *name)return ret; }
kernel/module/kallsyms.c unsigned long module_kallsyms_lookup_name(const char *name) · line 505
Quoted 10 lines
kernel/module/kallsyms.c +9
-0+unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +{ +unsigned long ret; + +preempt_disable (); + ret =__find_kallsyms_symbol_value (mod, name); +preempt_enable (); +return ret; +}
That doesn't look right.
I think the issue is misuse of rcu_dereference_sched in find_kallsyms_symbol_value.
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
Quoted 98 lines · Alexei Starovoitov
Quoted 97 lines · Jiri Olsa
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 36 lines
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0Quoted 8 lines
[ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdchum, for some reason I can't reproduce, but looks like we need to disable preemption for
find_kallsyms_symbol_value.. could you please check with patch below?also could you please share your .config? not sure why I can't reproduce
thanks,
jirka---
kernel/module/kallsyms.c +3
-3@@ -442,7 +442,7 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type, }/* Given a module and name of symbol, find and return the symbol's value */ -unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +static unsigned long __find_kallsyms_symbol_value (struct module *mod,const char *name) {unsigned int i;struct mod_kallsyms *kallsyms =rcu_dereference_sched (mod->kallsyms);@@ -466,7 +466,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (colon) { mod =find_module_all (name, colon - name, false);if (mod) -return find_kallsyms_symbol_value (mod, colon +1 ); +return __find_kallsyms_symbol_value (mod, colon +1 );return 0 ; }@@ -475,7 +475,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (mod->state ==MODULE_STATE_UNFORMED )continue ; - ret =find_kallsyms_symbol_value (mod, name); + ret =__find_kallsyms_symbol_value (mod, name);if (ret)return ret; }@@ -494,6 +494,16 @@ unsigned long module_kallsyms_lookup_name(const char *name)return ret; }
Quoted 13 lines
kernel/module/kallsyms.c unsigned long module_kallsyms_lookup_name(const char *name) · line 505
Quoted 9 lines
kernel/module/kallsyms.c +9
-0+unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +{ +unsigned long ret; + +preempt_disable (); + ret =__find_kallsyms_symbol_value (mod, name); +preempt_enable (); +return ret; +}That doesn't look right.
I think the issue is misuse ofrcu_dereference_schedinfind_kallsyms_symbol_value.
it seems to be using rcu pointer to keep symbols for module init time and then core symbols for after init.. and switch between them when module is loaded, hence the strange rcu usage I think
Petr, Zhen, any idea/insight?
thanks,
jirka
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
ping,
Petr, Zhen, any comment on discussion below?
thanks,
jirka
Quoted 121 lines · Jiri Olsa
Quoted 98 lines · Alexei Starovoitov
Quoted 97 lines · Jiri Olsa
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 36 lines
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0Quoted 8 lines
[ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdchum, for some reason I can't reproduce, but looks like we need to disable preemption for
find_kallsyms_symbol_value.. could you please check with patch below?also could you please share your .config? not sure why I can't reproduce
thanks,
jirka---
kernel/module/kallsyms.c +3
-3@@ -442,7 +442,7 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type, }/* Given a module and name of symbol, find and return the symbol's value */ -unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +static unsigned long __find_kallsyms_symbol_value (struct module *mod,const char *name) {unsigned int i;struct mod_kallsyms *kallsyms =rcu_dereference_sched (mod->kallsyms);@@ -466,7 +466,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (colon) { mod =find_module_all (name, colon - name, false);if (mod) -return find_kallsyms_symbol_value (mod, colon +1 ); +return __find_kallsyms_symbol_value (mod, colon +1 );return 0 ; }@@ -475,7 +475,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (mod->state ==MODULE_STATE_UNFORMED )continue ; - ret =find_kallsyms_symbol_value (mod, name); + ret =__find_kallsyms_symbol_value (mod, name);if (ret)return ret; }@@ -494,6 +494,16 @@ unsigned long module_kallsyms_lookup_name(const char *name)return ret; }Quoted 13 lines
kernel/module/kallsyms.c unsigned long module_kallsyms_lookup_name(const char *name) · line 505
Quoted 9 lines
kernel/module/kallsyms.c +9
-0+unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +{ +unsigned long ret; + +preempt_disable (); + ret =__find_kallsyms_symbol_value (mod, name); +preempt_enable (); +return ret; +}That doesn't look right.
I think the issue is misuse ofrcu_dereference_schedinfind_kallsyms_symbol_value.it seems to be using rcu pointer to keep symbols for module init time and then core symbols for after init.. and switch between them when module is loaded, hence the strange rcu usage I think
Petr, Zhen, any idea/insight?
thanks,
jirka
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
Quoted 126 lines · Jiri Olsa
ping,
Petr, Zhen, any comment on discussion below?
thanks,
jirkaQuoted 118 lines · Jiri Olsa
Quoted 98 lines · Alexei Starovoitov
Quoted 97 lines · Jiri Olsa
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 36 lines
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0Quoted 8 lines
[ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdchum, for some reason I can't reproduce, but looks like we need to disable preemption for
find_kallsyms_symbol_value.. could you please check with patch below?also could you please share your .config? not sure why I can't reproduce
thanks,
jirka---
kernel/module/kallsyms.c +3
-3@@ -442,7 +442,7 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type, }/* Given a module and name of symbol, find and return the symbol's value */ -unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +static unsigned long __find_kallsyms_symbol_value (struct module *mod,const char *name) {unsigned int i;struct mod_kallsyms *kallsyms =rcu_dereference_sched (mod->kallsyms);@@ -466,7 +466,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (colon) { mod =find_module_all (name, colon - name, false);if (mod) -return find_kallsyms_symbol_value (mod, colon +1 ); +return __find_kallsyms_symbol_value (mod, colon +1 );return 0 ; }@@ -475,7 +475,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (mod->state ==MODULE_STATE_UNFORMED )continue ; - ret =find_kallsyms_symbol_value (mod, name); + ret =__find_kallsyms_symbol_value (mod, name);if (ret)return ret; }@@ -494,6 +494,16 @@ unsigned long module_kallsyms_lookup_name(const char *name)return ret; }Quoted 13 lines
kernel/module/kallsyms.c unsigned long module_kallsyms_lookup_name(const char *name) · line 505
Quoted 9 lines
kernel/module/kallsyms.c +9
-0+unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +{ +unsigned long ret; + +preempt_disable (); + ret =__find_kallsyms_symbol_value (mod, name); +preempt_enable (); +return ret; +}That doesn't look right.
I think the issue is misuse ofrcu_dereference_schedinfind_kallsyms_symbol_value.it seems to be using rcu pointer to keep symbols for module init time and then core symbols for after init.. and switch between them when module is loaded, hence the strange rcu usage I think
Petr, Zhen, any idea/insight?
Commit 91fb02f31505 ("module: Move kallsyms support into a separate file") hides the answer. find_kallsyms_symbol_value() was originally a static function, and it is only called by module_kallsyms_lookup_name() and is preemptive-protected.
Now that we've added a call to function find_kallsyms_symbol_value(), it seems like we should do the same thing as function module_kallsyms_lookup_name().
Like this?
+ mod = btf_try_get_module(btf);
+ if (mod) {
+ preempt_disable();
+ addr = find_kallsyms_symbol_value(mod, tname);
+ preempt_enable();
+ } else
+ addr = 0;
Quoted 5 lines
Quoted 3 lines
thanks,
jirka.
Signature · 2 lines
Regards, Zhen Lei
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
Quoted 138 lines · Leizhen (ThunderTown)
Quoted 126 lines · Jiri Olsa
ping,
Petr, Zhen, any comment on discussion below?
thanks,
jirkaQuoted 118 lines · Jiri Olsa
Quoted 98 lines · Alexei Starovoitov
Quoted 97 lines · Jiri Olsa
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 36 lines
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0Quoted 8 lines
[ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdchum, for some reason I can't reproduce, but looks like we need to disable preemption for
find_kallsyms_symbol_value.. could you please check with patch below?also could you please share your .config? not sure why I can't reproduce
thanks,
jirka---
kernel/module/kallsyms.c +3
-3@@ -442,7 +442,7 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type, }/* Given a module and name of symbol, find and return the symbol's value */ -unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +static unsigned long __find_kallsyms_symbol_value (struct module *mod,const char *name) {unsigned int i;struct mod_kallsyms *kallsyms =rcu_dereference_sched (mod->kallsyms);@@ -466,7 +466,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (colon) { mod =find_module_all (name, colon - name, false);if (mod) -return find_kallsyms_symbol_value (mod, colon +1 ); +return __find_kallsyms_symbol_value (mod, colon +1 );return 0 ; }@@ -475,7 +475,7 @@ static unsigned long __module_kallsyms_lookup_name(const char *name)if (mod->state ==MODULE_STATE_UNFORMED )continue ; - ret =find_kallsyms_symbol_value (mod, name); + ret =__find_kallsyms_symbol_value (mod, name);if (ret)return ret; }@@ -494,6 +494,16 @@ unsigned long module_kallsyms_lookup_name(const char *name)return ret; }Quoted 13 lines
kernel/module/kallsyms.c unsigned long module_kallsyms_lookup_name(const char *name) · line 505
Quoted 9 lines
kernel/module/kallsyms.c +9
-0+unsigned long find_kallsyms_symbol_value (struct module *mod,const char *name) +{ +unsigned long ret; + +preempt_disable (); + ret =__find_kallsyms_symbol_value (mod, name); +preempt_enable (); +return ret; +}That doesn't look right.
I think the issue is misuse ofrcu_dereference_schedinfind_kallsyms_symbol_value.it seems to be using rcu pointer to keep symbols for module init time and then core symbols for after init.. and switch between them when module is loaded, hence the strange rcu usage I think
Petr, Zhen, any idea/insight?
Commit
91fb02f31505("module: Move kallsyms support into a separate file") hides the answer.find_kallsyms_symbol_value()was originally a static function, and it is only called bymodule_kallsyms_lookup_name()and is preemptive-protected.Now that we've added a call to function
find_kallsyms_symbol_value(), it seems like we should do the same thing as functionmodule_kallsyms_lookup_name().Like this?
Review
Quoted 7 lines
(quoted diff) +7
-0+ mod = btf_try_get_module(btf); + if (mod) { + preempt_disable(); + addr = find_kallsyms_symbol_value(mod, tname); + preempt_enable(); + } else + addr = 0;
yes, that's what I did above, but I was just curious about the strange RCU usage Alexei commented on earlier:
>>> +unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name)
>>> +{
>>> + unsigned long ret;
>>> +
>>> + preempt_disable();
>>> + ret = __find_kallsyms_symbol_value(mod, name);
>>> + preempt_enable();
>>> + return ret;
>>> +}
>>
>> That doesn't look right.
>> I think the issue is misuse of rcu_dereference_sched in
>> find_kallsyms_symbol_value.
>
> it seems to be using rcu pointer to keep symbols for module init time and
> then core symbols for after init.. and switch between them when module is
> loaded, hence the strange rcu usage I think
>
> Petr, Zhen, any idea/insight?thanks,
jirka
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
Quoted 94 lines · Jiri Olsa
Quoted 73 lines · Leizhen (ThunderTown)
Quoted 60 lines · Jiri Olsa
ping,
Petr, Zhen, any comment on discussion below?
thanks,
jirkaQuoted 52 lines · Jiri Olsa
Quoted 51 lines · Alexei Starovoitov
Quoted 50 lines · Jiri Olsa
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 44 lines
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0 [ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdcQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
kernel/module/kallsyms.c
Quoted 2 lines
kernel/module/kallsyms.c +0
-0Commit
91fb02f31505("module: Move kallsyms support into a separate file") hides the answer.find_kallsyms_symbol_value()was originally a static function, and it is only called bymodule_kallsyms_lookup_name()and is preemptive-protected.Now that we've added a call to function
find_kallsyms_symbol_value(), it seems like we should do the same thing as functionmodule_kallsyms_lookup_name().Like this?
Review
Quoted 7 lines
(quoted diff) +7
-0+ mod = btf_try_get_module(btf); + if (mod) { + preempt_disable(); + addr = find_kallsyms_symbol_value(mod, tname); + preempt_enable(); + } else + addr = 0;yes, that's what I did above, but I was just curious about the strange RCU usage Alexei commented on earlier:
>>> +unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name) >>> +{ >>> + unsigned long ret; >>> + >>> + preempt_disable(); >>> + ret = __find_kallsyms_symbol_value(mod, name); >>> + preempt_enable(); >>> + return ret; >>> +}
Quoted 8 lines
>> >> That doesn't look right. >> I think the issue is misuse of rcu_dereference_sched in >> find_kallsyms_symbol_value. > > it seems to be using rcu pointer to keep symbols for module init time and > then core symbols for after init.. and switch between them when module is > loaded, hence the strange rcu usage I think
My understanding is that rcu is needed to prevent module from being freed. It should be related to:
static void free_module(struct module *mod)
{
[...]
/* Now we can delete it from the lists */ mutex_lock(&module_mutex); /* Unlink carefully: kallsyms could be walking list. */ list_del_rcu(&mod->list);
[...]
}
I am sorry for the late reply. I was busy and I thought that it was related to the refactoring. I hoped that peopled doing the refactoring would answer.
Best Regards,
Petr
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
Quoted 95 lines · Petr Mladek
Quoted 94 lines · Jiri Olsa
Quoted 73 lines · Leizhen (ThunderTown)
Quoted 60 lines · Jiri Olsa
ping,
Petr, Zhen, any comment on discussion below?
thanks,
jirkaQuoted 52 lines · Jiri Olsa
Quoted 51 lines · Alexei Starovoitov
Quoted 50 lines · Jiri Olsa
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 44 lines
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0 [ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdcQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
kernel/module/kallsyms.c
Quoted 2 lines
kernel/module/kallsyms.c +0
-0Commit
91fb02f31505("module: Move kallsyms support into a separate file") hides the answer.find_kallsyms_symbol_value()was originally a static function, and it is only called bymodule_kallsyms_lookup_name()and is preemptive-protected.Now that we've added a call to function
find_kallsyms_symbol_value(), it seems like we should do the same thing as functionmodule_kallsyms_lookup_name().Like this?
Review
Quoted 7 lines
(quoted diff) +7
-0+ mod = btf_try_get_module(btf); + if (mod) { + preempt_disable(); + addr = find_kallsyms_symbol_value(mod, tname); + preempt_enable(); + } else + addr = 0;yes, that's what I did above, but I was just curious about the strange RCU usage Alexei commented on earlier:
>>> +unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name) >>> +{ >>> + unsigned long ret; >>> + >>> + preempt_disable(); >>> + ret = __find_kallsyms_symbol_value(mod, name); >>> + preempt_enable(); >>> + return ret; >>> +}
Quoted 8 lines
Quoted 8 lines
>>
>> That doesn't look right.
>> I think the issue is misuse ofrcu_dereference_schedin
>>find_kallsyms_symbol_value.
>
> it seems to be using rcu pointer to keep symbols for module init time and > then core symbols for after init.. and switch between them when module is > loaded, hence the strange rcu usage I think
load_module
post_relocation add_kallsyms mod->kallsyms = (void __rcu *)mod->init_layout.base + info->mod_kallsyms_init_off; (1) do_init_module freeinit->module_init = mod->init_layout.base; rcu_assign_pointer(mod->kallsyms, &mod->core_kallsyms); (2) if (llist_add(&freeinit->node, &init_free_list)) schedule_work(&init_free_wq);
do_free_init
synchronize_rcu(); module_memfree(initfree->module_init);
IIUC, the RCU can help synchronize_rcu() in do_free_init() to make sure that no one is still using the first mod->kallsyms (1). If find_kallsyms_symbol_value() is executed between (1) and (2).
Quoted 22 lines
My understanding is that rcu is needed to prevent module from being freed. It should be related to:
static void
free_module(struct module *mod)
{
[...]/* Now we can delete it from the lists */ mutex_lock(&module_mutex); /* Unlink carefully: kallsyms could be walking list. */ list_del_rcu(&mod->list);[...]
}I am sorry for the late reply. I was busy and I thought that it was related to the refactoring. I hoped that peopled doing the refactoring would answer.
Best Regards,
Petr
.
Signature · 2 lines
Regards, Zhen Lei
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
Quoted 117 lines · Leizhen (ThunderTown)
Quoted 95 lines · Petr Mladek
Quoted 94 lines · Jiri Olsa
Quoted 73 lines · Leizhen (ThunderTown)
Quoted 60 lines · Jiri Olsa
ping,
Petr, Zhen, any comment on discussion below?
thanks,
jirkaQuoted 52 lines · Jiri Olsa
Quoted 51 lines · Alexei Starovoitov
Quoted 50 lines · Jiri Olsa
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 44 lines
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0 [ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdcQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
kernel/module/kallsyms.c
Quoted 2 lines
kernel/module/kallsyms.c +0
-0Commit
91fb02f31505("module: Move kallsyms support into a separate file") hides the answer.find_kallsyms_symbol_value()was originally a static function, and it is only called bymodule_kallsyms_lookup_name()and is preemptive-protected.Now that we've added a call to function
find_kallsyms_symbol_value(), it seems like we should do the same thing as functionmodule_kallsyms_lookup_name().Like this?
Review
Quoted 7 lines
(quoted diff) +7
-0+ mod = btf_try_get_module(btf); + if (mod) { + preempt_disable(); + addr = find_kallsyms_symbol_value(mod, tname); + preempt_enable(); + } else + addr = 0;yes, that's what I did above, but I was just curious about the strange RCU usage Alexei commented on earlier:
>>> +unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name) >>> +{ >>> + unsigned long ret; >>> + >>> + preempt_disable(); >>> + ret = __find_kallsyms_symbol_value(mod, name); >>> + preempt_enable(); >>> + return ret; >>> +}Quoted 8 lines
Quoted 8 lines
>>
>> That doesn't look right.
>> I think the issue is misuse ofrcu_dereference_schedin
>>find_kallsyms_symbol_value.
>
> it seems to be using rcu pointer to keep symbols for module init time and > then core symbols for after init.. and switch between them when module is > loaded, hence the strange rcu usage I think
load_modulepost_relocation add_kallsyms mod->kallsyms = (void __rcu *)mod->init_layout.base + info->mod_kallsyms_init_off; (1) do_init_module freeinit->module_init = mod->init_layout.base; rcu_assign_pointer(mod->kallsyms, &mod->core_kallsyms); (2) if (llist_add(&freeinit->node, &init_free_list)) schedule_work(&init_free_wq);
Quoted 7 lines
do_free_initsynchronize_rcu(); module_memfree(initfree->module_init);IIUC, the RCU can help
synchronize_rcu()indo_free_init()to make sure that no one is still using the firstmod->kallsyms(1). Iffind_kallsyms_symbol_value()is executed between (1) and (2).
Yes, this seems to be another scenario where the RCU synchronization/access is needed.
Best Regards,
Petr
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
Quoted 122 lines · Petr Mladek
Quoted 121 lines · Leizhen (ThunderTown)
Quoted 95 lines · Petr Mladek
Quoted 94 lines · Jiri Olsa
Quoted 73 lines · Leizhen (ThunderTown)
Quoted 60 lines · Jiri Olsa
ping,
Petr, Zhen, any comment on discussion below?
thanks,
jirkaQuoted 52 lines · Jiri Olsa
Quoted 51 lines · Alexei Starovoitov
Quoted 50 lines · Jiri Olsa
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 44 lines
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to
preempt_disable? IIUC,preempt_disableis used in module kallsyms to prevent taking the module lock b/c kallsyms are used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0 [ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdcQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
kernel/module/kallsyms.c
Quoted 2 lines
kernel/module/kallsyms.c +0
-0Commit
91fb02f31505("module: Move kallsyms support into a separate file") hides the answer.find_kallsyms_symbol_value()was originally a static function, and it is only called bymodule_kallsyms_lookup_name()and is preemptive-protected.Now that we've added a call to function
find_kallsyms_symbol_value(), it seems like we should do the same thing as functionmodule_kallsyms_lookup_name().Like this?
Review
Quoted 7 lines
(quoted diff) +7
-0+ mod = btf_try_get_module(btf); + if (mod) { + preempt_disable(); + addr = find_kallsyms_symbol_value(mod, tname); + preempt_enable(); + } else + addr = 0;yes, that's what I did above, but I was just curious about the strange RCU usage Alexei commented on earlier:
>>> +unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name) >>> +{ >>> + unsigned long ret; >>> + >>> + preempt_disable(); >>> + ret = __find_kallsyms_symbol_value(mod, name); >>> + preempt_enable(); >>> + return ret; >>> +}Quoted 8 lines
Quoted 8 lines
>>
>> That doesn't look right.
>> I think the issue is misuse ofrcu_dereference_schedin
>>find_kallsyms_symbol_value.
>
> it seems to be using rcu pointer to keep symbols for module init time and > then core symbols for after init.. and switch between them when module is > loaded, hence the strange rcu usage I think
load_modulepost_relocation add_kallsyms mod->kallsyms = (void __rcu *)mod->init_layout.base + info->mod_kallsyms_init_off; (1) do_init_module freeinit->module_init = mod->init_layout.base; rcu_assign_pointer(mod->kallsyms, &mod->core_kallsyms); (2) if (llist_add(&freeinit->node, &init_free_list)) schedule_work(&init_free_wq);
do_free_initsynchronize_rcu(); module_memfree(initfree->module_init);
Quoted 6 lines
Quoted 3 lines
IIUC, the RCU can help
synchronize_rcu()indo_free_init()to make sure that no one is still using the firstmod->kallsyms(1). Iffind_kallsyms_symbol_value()is executed between (1) and (2).Yes, this seems to be another scenario where the RCU synchronization/access is needed.
thanks for the details
still curious.. confusing part for me is the use of rcu_dereference in add_kallsyms IIUC there's no need for that because mod->kallsyms is not exposed at that time? we could do without it like in patch below?
thanks,
jirka
---
kernel/module/kallsyms.c +14 -14
@@ -170,20 +170,18 @@ void add_kallsyms(struct module *mod, const struct load_info *info)Elf_Sym *dst;char *s;Elf_Shdr *symsec = &info->sechdrs[info->index.sym]; +struct mod_kallsyms *kallsyms;unsigned long strtab_size; -/* Set up to point into init section. */ - mod->kallsyms = (void __rcu *)mod->init_layout.base + - info->mod_kallsyms_init_off; + kallsyms = mod->init_layout.base + info->mod_kallsyms_init_off; -rcu_read_lock ();/* The following is safe since this pointer cannot change */ -rcu_dereference (mod->kallsyms)->symtab = (void *)symsec->sh_addr; -rcu_dereference (mod->kallsyms)->num_symtab = symsec->sh_size /sizeof (Elf_Sym); + kallsyms->symtab = (void *)symsec->sh_addr; + kallsyms->num_symtab = symsec->sh_size /sizeof (Elf_Sym);/* Make sure we get permanent strtab: don't use info->strtab. */ -rcu_dereference (mod->kallsyms)->strtab = + kallsyms->strtab = (void *)info->sechdrs[info->index.str].sh_addr; -rcu_dereference (mod->kallsyms)->typetab = mod->init_layout.base + info->init_typeoffs; + kallsyms->typetab = mod->init_layout.base + info->init_typeoffs;/* * Now populate the cut down core kallsyms for after init
@@ -193,20 +191,20 @@ void add_kallsyms(struct module *mod, const struct load_info *info) mod->core_kallsyms.strtab = s = mod->data_layout.base + info->stroffs; mod->core_kallsyms.typetab = mod->data_layout.base + info->core_typeoffs; strtab_size = info->core_typeoffs - info->stroffs; - src =rcu_dereference (mod->kallsyms)->symtab; -for (ndst = i =0 ; i <rcu_dereference (mod->kallsyms)->num_symtab; i++) { -rcu_dereference (mod->kallsyms)->typetab[i] =elf_type (src + i, info); + src = kallsyms->symtab; +for (ndst = i =0 ; i < kallsyms->num_symtab; i++) { + kallsyms->typetab[i] =elf_type (src + i, info);if (i ==0 ||is_livepatch_module (mod) ||is_core_symbol (src + i, info->sechdrs, info->hdr->e_shnum, info->index.pcpu)) {ssize_t ret; mod->core_kallsyms.typetab[ndst] = -rcu_dereference (mod->kallsyms)->typetab[i]; + kallsyms->typetab[i]; dst[ndst] = src[i]; dst[ndst++].st_name = s - mod->core_kallsyms.strtab; ret =strscpy (s, - &rcu_dereference (mod->kallsyms)->strtab[src[i].st_name], + &kallsyms->strtab[src[i].st_name], strtab_size);if (ret <0 )break ;
@@ -214,8 +212,10 @@ void add_kallsyms(struct module *mod, const struct load_info *info) strtab_size -= ret +1 ; } } -rcu_read_unlock (); mod->core_kallsyms.num_symtab = ndst; + +/* Set up to point into init section. */ +rcu_assign_pointer (mod->kallsyms, kallsyms); }#if IS_ENABLED (CONFIG_STACKTRACE_BUILD_ID )
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
Quoted 127 lines · Jiri Olsa
Quoted 126 lines · Petr Mladek
Quoted 124 lines · Leizhen (ThunderTown)
Quoted 95 lines · Petr Mladek
Quoted 94 lines · Jiri Olsa
Quoted 73 lines · Leizhen (ThunderTown)
Quoted 60 lines · Jiri Olsa
ping,
Petr, Zhen, any comment on discussion below?
thanks,
jirkaQuoted 52 lines · Jiri Olsa
Quoted 51 lines · Alexei Starovoitov
Quoted 50 lines · Jiri Olsa
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 44 lines
Quoted 6 lines
Quoted 3 lines
Hm, do we even need to preempt_disable? IIUC, preempt_disable is used
in module kallsyms to prevent taking the module lock b/c kallsyms are
used in the oops path. That shouldn't be an issue here, is that correct?
btf_try_get_modulecallstry_module_getwhich disables the preemption, so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0 [ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdcQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
kernel/module/kallsyms.c
Quoted 2 lines
kernel/module/kallsyms.c +0
-0Commit
91fb02f31505("module: Move kallsyms support into a separate file") hides the answer.find_kallsyms_symbol_value()was originally a static function, and it is only called bymodule_kallsyms_lookup_name()and is preemptive-protected.Now that we've added a call to function
find_kallsyms_symbol_value(), it seems like we should do the same thing as functionmodule_kallsyms_lookup_name().Like this?
Review
Quoted 7 lines
(quoted diff) +7
-0+ mod = btf_try_get_module(btf); + if (mod) { + preempt_disable(); + addr = find_kallsyms_symbol_value(mod, tname); + preempt_enable(); + } else + addr = 0;yes, that's what I did above, but I was just curious about the strange RCU usage Alexei commented on earlier:
>>> +unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name) >>> +{ >>> + unsigned long ret; >>> + >>> + preempt_disable(); >>> + ret = __find_kallsyms_symbol_value(mod, name); >>> + preempt_enable(); >>> + return ret; >>> +}Quoted 8 lines
Quoted 8 lines
>>
>> That doesn't look right.
>> I think the issue is misuse ofrcu_dereference_schedin
>>find_kallsyms_symbol_value.
>
> it seems to be using rcu pointer to keep symbols for module init time and > then core symbols for after init.. and switch between them when module is > loaded, hence the strange rcu usage I think
load_modulepost_relocation add_kallsyms mod->kallsyms = (void __rcu *)mod->init_layout.base + info->mod_kallsyms_init_off; (1) do_init_module freeinit->module_init = mod->init_layout.base; rcu_assign_pointer(mod->kallsyms, &mod->core_kallsyms); (2) if (llist_add(&freeinit->node, &init_free_list)) schedule_work(&init_free_wq);
do_free_initsynchronize_rcu(); module_memfree(initfree->module_init);IIUC, the RCU can help
synchronize_rcu()indo_free_init()to make sure that no one is still using the firstmod->kallsyms(1). Iffind_kallsyms_symbol_value()is executed between (1) and (2).
Quoted 8 lines
Quoted 2 lines
Yes, this seems to be another scenario where the RCU synchronization/access is needed.
thanks for the details
still curious.. confusing part for me is the use of
rcu_dereferenceinadd_kallsymsIIUC there's no need for that becausemod->kallsymsis not exposed at that time? we could do without it like in patch below?
Looks good to me. Prepare the data first, and then pointer to it. This is the standard operation procedure of the RCU. But there may be special considerations that we don't know about.
Quoted 77 lines
thanks,
jirka---
kernel/module/kallsyms.c +14
-14@@ -170,20 +170,18 @@ void add_kallsyms(struct module *mod, const struct load_info *info)Elf_Sym *dst;char *s;Elf_Shdr *symsec = &info->sechdrs[info->index.sym]; +struct mod_kallsyms *kallsyms;unsigned long strtab_size; -/* Set up to point into init section. */ - mod->kallsyms = (void __rcu *)mod->init_layout.base + - info->mod_kallsyms_init_off; + kallsyms = mod->init_layout.base + info->mod_kallsyms_init_off; -rcu_read_lock ();/* The following is safe since this pointer cannot change */ -rcu_dereference (mod->kallsyms)->symtab = (void *)symsec->sh_addr; -rcu_dereference (mod->kallsyms)->num_symtab = symsec->sh_size /sizeof (Elf_Sym); + kallsyms->symtab = (void *)symsec->sh_addr; + kallsyms->num_symtab = symsec->sh_size /sizeof (Elf_Sym);/* Make sure we get permanent strtab: don't use info->strtab. */ -rcu_dereference (mod->kallsyms)->strtab = + kallsyms->strtab = (void *)info->sechdrs[info->index.str].sh_addr; -rcu_dereference (mod->kallsyms)->typetab = mod->init_layout.base + info->init_typeoffs; + kallsyms->typetab = mod->init_layout.base + info->init_typeoffs;/* * Now populate the cut down core kallsyms for after init @@ -193,20 +191,20 @@ void add_kallsyms(struct module *mod, const struct load_info *info) mod->core_kallsyms.strtab = s = mod->data_layout.base + info->stroffs; mod->core_kallsyms.typetab = mod->data_layout.base + info->core_typeoffs; strtab_size = info->core_typeoffs - info->stroffs; - src =rcu_dereference (mod->kallsyms)->symtab; -for (ndst = i =0 ; i <rcu_dereference (mod->kallsyms)->num_symtab; i++) { -rcu_dereference (mod->kallsyms)->typetab[i] =elf_type (src + i, info); + src = kallsyms->symtab; +for (ndst = i =0 ; i < kallsyms->num_symtab; i++) { + kallsyms->typetab[i] =elf_type (src + i, info);if (i ==0 ||is_livepatch_module (mod) ||is_core_symbol (src + i, info->sechdrs, info->hdr->e_shnum, info->index.pcpu)) {ssize_t ret; mod->core_kallsyms.typetab[ndst] = -rcu_dereference (mod->kallsyms)->typetab[i]; + kallsyms->typetab[i]; dst[ndst] = src[i]; dst[ndst++].st_name = s - mod->core_kallsyms.strtab; ret =strscpy (s, - &rcu_dereference (mod->kallsyms)->strtab[src[i].st_name], + &kallsyms->strtab[src[i].st_name], strtab_size);if (ret <0 )break ;@@ -214,8 +212,10 @@ void add_kallsyms(struct module *mod, const struct load_info *info) strtab_size -= ret +1 ; } } -rcu_read_unlock (); mod->core_kallsyms.num_symtab = ndst; + +/* Set up to point into init section. */ +rcu_assign_pointer (mod->kallsyms, kallsyms); }#if IS_ENABLED (CONFIG_STACKTRACE_BUILD_ID ).
Signature · 2 lines
Regards, Zhen Lei
Re: [PATCH bpf-next v6 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules
Quoted 135 lines · Leizhen (ThunderTown)
Quoted 132 lines · Jiri Olsa
Quoted 122 lines · Petr Mladek
Quoted 121 lines · Leizhen (ThunderTown)
Quoted 95 lines · Petr Mladek
Quoted 94 lines · Jiri Olsa
Quoted 73 lines · Leizhen (ThunderTown)
Quoted 60 lines · Jiri Olsa
ping,
Petr, Zhen, any comment on discussion below?
thanks,
jirkaQuoted 52 lines · Jiri Olsa
Quoted 51 lines · Alexei Starovoitov
Quoted 50 lines · Jiri Olsa
On Wed, Mar 22, 2023 at 10:49:38AM +0100, Artem Savkov wrote:
SNIP
Quoted 44 lines
Quoted 6 lines
Hm, do we even need to preempt_disable? IIUC, preempt_disable is used
in module kallsyms to prevent taking the module lock b/c kallsyms are
used in the oops path. That shouldn't be an issue here, is that correct?btf_try_get_module calls try_module_get which disables the preemption,
so no need to call it in hereIt does, but it reenables preemption right away so it is enabled by the time we call
find_kallsyms_symbol_value(). I am getting the following lockdep splat while runningmodule_fentry_shadowtest fromtest_progs.[ 12.017973][ T488] ============================= [ 12.018529][ T488] WARNING: suspicious RCU usage [ 12.018987][ T488] 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 Tainted: G OE [ 12.019898][ T488] ----------------------------- [ 12.020391][ T488] kernel/module/kallsyms.c:448 suspicious rcu_dereference_check() usage! [ 12.021335][ T488] [ 12.021335][ T488] other info that might help us debug this: [ 12.021335][ T488] [ 12.022416][ T488] [ 12.022416][ T488] rcu_scheduler_active = 2, debug_locks = 1 [ 12.023297][ T488] no locks held by test_progs/488. [ 12.023854][ T488] [ 12.023854][ T488] stack backtrace: [ 12.024336][ T488] CPU: 0 PID: 488 Comm: test_progs Tainted: G OE 6.2.0.bpf-test-13063-g6a9f5cdba3c5 #804 [ 12.025290][ T488] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 [ 12.026108][ T488] Call Trace: [ 12.026381][ T488] <TASK> [ 12.026649][ T488] dump_stack_lvl+0xb4/0x110 [ 12.027060][ T488] lockdep_rcu_suspicious+0x158/0x1f0 [ 12.027541][ T488] find_kallsyms_symbol_value+0xe8/0x110 [ 12.028028][ T488] bpf_check_attach_target+0x838/0xa20 [ 12.028511][ T488] check_attach_btf_id+0x144/0x3f0 [ 12.028957][ T488] ? __pfx_cmp_subprogs+0x10/0x10 [ 12.029408][ T488] bpf_check+0xeec/0x1850 [ 12.029799][ T488] ? ktime_get_with_offset+0x124/0x1d0 [ 12.030247][ T488] bpf_prog_load+0x87a/0xed0 [ 12.030627][ T488] ? __lock_release+0x5f/0x160 [ 12.031010][ T488] ? __might_fault+0x53/0xb0 [ 12.031394][ T488] ? selinux_bpf+0x6c/0xa0 [ 12.031756][ T488] __sys_bpf+0x53c/0x1240 [ 12.032115][ T488] __x64_sys_bpf+0x27/0x40 [ 12.032476][ T488] do_syscall_64+0x3e/0x90 [ 12.032835][ T488] entry_SYSCALL_64_after_hwframe+0x72/0xdcQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
kernel/module/kallsyms.c
Quoted 2 lines
kernel/module/kallsyms.c +0
-0Commit
91fb02f31505("module: Move kallsyms support into a separate file") hides the answer.find_kallsyms_symbol_value()was originally a static function, and it is only called bymodule_kallsyms_lookup_name()and is preemptive-protected.Now that we've added a call to function
find_kallsyms_symbol_value(), it seems like we should do the same thing as functionmodule_kallsyms_lookup_name().Like this?
Review
Quoted 7 lines
(quoted diff) +7
-0+ mod = btf_try_get_module(btf); + if (mod) { + preempt_disable(); + addr = find_kallsyms_symbol_value(mod, tname); + preempt_enable(); + } else + addr = 0;yes, that's what I did above, but I was just curious about the strange RCU usage Alexei commented on earlier:
>>> +unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name) >>> +{ >>> + unsigned long ret; >>> + >>> + preempt_disable(); >>> + ret = __find_kallsyms_symbol_value(mod, name); >>> + preempt_enable(); >>> + return ret; >>> +}Quoted 8 lines
Quoted 8 lines
>>
>> That doesn't look right.
>> I think the issue is misuse ofrcu_dereference_schedin
>>find_kallsyms_symbol_value.
>
> it seems to be using rcu pointer to keep symbols for module init time and > then core symbols for after init.. and switch between them when module is > loaded, hence the strange rcu usage I think
load_modulepost_relocation add_kallsyms mod->kallsyms = (void __rcu *)mod->init_layout.base + info->mod_kallsyms_init_off; (1) do_init_module freeinit->module_init = mod->init_layout.base; rcu_assign_pointer(mod->kallsyms, &mod->core_kallsyms); (2) if (llist_add(&freeinit->node, &init_free_list)) schedule_work(&init_free_wq);
do_free_initsynchronize_rcu(); module_memfree(initfree->module_init);Quoted 6 lines
Quoted 3 lines
IIUC, the RCU can help
synchronize_rcu()indo_free_init()to make sure that no one is still using the firstmod->kallsyms(1). Iffind_kallsyms_symbol_value()is executed between (1) and (2).Yes, this seems to be another scenario where the RCU synchronization/access is needed.
thanks for the details
Quoted 7 lines
Quoted 3 lines
still curious.. confusing part for me is the use of
rcu_dereferenceinadd_kallsymsIIUC there's no need for that becausemod->kallsymsis not exposed at that time? we could do without it like in patch below?Looks good to me. Prepare the data first, and then pointer to it. This is the standard operation procedure of the RCU. But there may be special considerations that we don't know about.
I was curious and found the commit 8244062ef1e54502ef5 ("modules: fix longstanding /proc/kallsyms vs module insertion race.").
So we need to be careful about races. But I would expect that the proposed change could only make things better.
Best Reagrds,
Petr
Quoted 82 lines
Quoted 78 lines
thanks,
jirka---
kernel/module/kallsyms.c +14
-14@@ -170,20 +170,18 @@ void add_kallsyms(struct module *mod, const struct load_info *info)Elf_Sym *dst;char *s;Elf_Shdr *symsec = &info->sechdrs[info->index.sym]; +struct mod_kallsyms *kallsyms;unsigned long strtab_size; -/* Set up to point into init section. */ - mod->kallsyms = (void __rcu *)mod->init_layout.base + - info->mod_kallsyms_init_off; + kallsyms = mod->init_layout.base + info->mod_kallsyms_init_off; -rcu_read_lock ();/* The following is safe since this pointer cannot change */ -rcu_dereference (mod->kallsyms)->symtab = (void *)symsec->sh_addr; -rcu_dereference (mod->kallsyms)->num_symtab = symsec->sh_size /sizeof (Elf_Sym); + kallsyms->symtab = (void *)symsec->sh_addr; + kallsyms->num_symtab = symsec->sh_size /sizeof (Elf_Sym);/* Make sure we get permanent strtab: don't use info->strtab. */ -rcu_dereference (mod->kallsyms)->strtab = + kallsyms->strtab = (void *)info->sechdrs[info->index.str].sh_addr; -rcu_dereference (mod->kallsyms)->typetab = mod->init_layout.base + info->init_typeoffs; + kallsyms->typetab = mod->init_layout.base + info->init_typeoffs;/* * Now populate the cut down core kallsyms for after init @@ -193,20 +191,20 @@ void add_kallsyms(struct module *mod, const struct load_info *info) mod->core_kallsyms.strtab = s = mod->data_layout.base + info->stroffs; mod->core_kallsyms.typetab = mod->data_layout.base + info->core_typeoffs; strtab_size = info->core_typeoffs - info->stroffs; - src =rcu_dereference (mod->kallsyms)->symtab; -for (ndst = i =0 ; i <rcu_dereference (mod->kallsyms)->num_symtab; i++) { -rcu_dereference (mod->kallsyms)->typetab[i] =elf_type (src + i, info); + src = kallsyms->symtab; +for (ndst = i =0 ; i < kallsyms->num_symtab; i++) { + kallsyms->typetab[i] =elf_type (src + i, info);if (i ==0 ||is_livepatch_module (mod) ||is_core_symbol (src + i, info->sechdrs, info->hdr->e_shnum, info->index.pcpu)) {ssize_t ret; mod->core_kallsyms.typetab[ndst] = -rcu_dereference (mod->kallsyms)->typetab[i]; + kallsyms->typetab[i]; dst[ndst] = src[i]; dst[ndst++].st_name = s - mod->core_kallsyms.strtab; ret =strscpy (s, - &rcu_dereference (mod->kallsyms)->strtab[src[i].st_name], + &kallsyms->strtab[src[i].st_name], strtab_size);if (ret <0 )break ;@@ -214,8 +212,10 @@ void add_kallsyms(struct module *mod, const struct load_info *info) strtab_size -= ret +1 ; } } -rcu_read_unlock (); mod->core_kallsyms.num_symtab = ndst; + +/* Set up to point into init section. */ +rcu_assign_pointer (mod->kallsyms, kallsyms); }#if IS_ENABLED (CONFIG_STACKTRACE_BUILD_ID ).
Signature · 2 lines
Regards, Zhen Lei