Re: [PATCH dwarves v3 3/3] btf_encoder: Factor out BPF kfunc emission

[Eduard Zingerman <eddyz87@gmail.com>]

On Wed, 2025-11-05 at 10:59 -0800, Ihor Solodrai wrote:

[...]

> @@ -1408,6 +1394,28 @@ static int32_t btf_encoder__add_func(struct btf_encoder *encoder,
>  		return -1;
>  	}
>  
> +	return btf_fn_id;
> +}
> +
> +static int btf_encoder__add_bpf_kfunc(struct btf_encoder *encoder,
> +				      struct btf_encoder_func_state *state)
> +{
> +	int btf_fn_id, err;
> +
> +	if (encoder->tag_kfuncs && encoder->encode_attributes)
> +		if (btf__add_bpf_arena_type_tags(encoder->btf, state) < 0)
> +			return -1;

Nit: maybe keep the error check consistent with the one below? E.g.:
       err = btf__add_bpf_arena_type_tags(...);
       if (err)
          return err;
     ?
> +
> +	btf_fn_id = btf_encoder__add_func(encoder, state);
> +	if (btf_fn_id < 0)
> +		return -1;
> +
> +	if (encoder->tag_kfuncs && !encoder->skip_encoding_decl_tag) {
> +		err = btf__tag_kfunc(encoder->btf, state->elf, btf_fn_id);
> +		if (err < 0)
> +			return -1;
> +	}
> +
>  	return 0;
>  }
>  

[...]