Re: [PATCH bpf-next v5 2/3] bpf, btf: Add check_btf_kconfigs helper

[Martin KaFai Lau <martin.lau@xxxxxxxxx>]

On 2/8/24 2:07 AM, Jiri Olsa wrote:
> > +static int check_btf_kconfigs(const struct module *module)
> > +{
> > +	if (!module && IS_ENABLED(CONFIG_DEBUG_INFO_BTF)) {
> > +		pr_err("missing vmlinux BTF, cannot register kfuncs\n");
> > +		return -ENOENT;
> > +	}
> > +	if (module && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES))
> > +		pr_warn("missing module BTF, cannot register kfuncs\n");
> > +	return 0;
> > +}
> > +
> >   BPF_CALL_4(bpf_btf_find_by_name_kind, char *, name, int, name_sz, u32, kind, int, flags)
> >   {
> >   	struct btf *btf = NULL;
> > @@ -8098,15 +8109,8 @@ static int __register_btf_kfunc_id_set(enum btf_kfunc_hook hook,
> >   	int ret, i;
> >   
> >   	btf = btf_get_module_btf(kset->owner);
> > -	if (!btf) {
> > -		if (!kset->owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF)) {
> > -			pr_err("missing vmlinux BTF, cannot register kfuncs\n");
> > -			return -ENOENT;
> > -		}
> > -		if (kset->owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES))
> > -			pr_warn("missing module BTF, cannot register kfuncs\n");
> > -		return 0;
> > -	}
> > +	if (!btf)
> > +		return check_btf_kconfigs(kset->owner);
> >   	if (IS_ERR(btf))
> >   		return PTR_ERR(btf);
> >   
> > @@ -8214,15 +8218,8 @@ int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dtors, u32 add_c
> >   	int ret;
> >   
> >   	btf = btf_get_module_btf(owner);
> > -	if (!btf) {
> > -		if (!owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF)) {
> > -			pr_err("missing vmlinux BTF, cannot register dtor kfuncs\n");
> > -			return -ENOENT;
> > -		}
> > -		if (owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES))
> > -			pr_warn("missing module BTF, cannot register dtor kfuncs\n");
> nit, we do lose the 'dtor' from the message but I think it's ok,
> for the patchset:

I added "const char *feature" argument to check_btf_kconfigs(), so it is like 
check_btf_kconfigs(, "kfunc"), check_btf_kconfigs(, "dtor kfunc"), and 
check_btf_kconfigs(, "struct_ops"). Applied. Thanks.