Re: [PATCH mptcp-next 2/2] Squash to "bpf: Export mptcp packet scheduler helpers"

[Matthieu Baerts <matttbe@kernel.org>]

Hi Geliang,

On 20/05/2025 10:48, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> Define .filter as Martin suggested.
> 
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
>  net/mptcp/bpf.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
> index 2b0cfb57df8c..4044a8f2c477 100644
> --- a/net/mptcp/bpf.c
> +++ b/net/mptcp/bpf.c
> @@ -317,9 +317,22 @@ BTF_ID_FLAGS(func, bpf_mptcp_subflow_queues_empty)
>  BTF_ID_FLAGS(func, mptcp_pm_subflow_chk_stale, KF_SLEEPABLE)
>  BTF_KFUNCS_END(bpf_mptcp_common_kfunc_ids)
>  
> +static int bpf_mptcp_common_kfunc_filter(const struct bpf_prog *prog, u32 kfunc_id)
> +{
> +	if (!btf_id_set8_contains(&bpf_mptcp_common_kfunc_ids, kfunc_id))
> +		return 0;
> +
> +	if (prog->aux->st_ops &&

See my message on the previous patch: maybe we don't need this condition
then.

> +	    prog->aux->st_ops != &bpf_mptcp_sched_ops)
> +		return -EACCES;
> +
> +	return 0;
> +}
> +
>  static const struct btf_kfunc_id_set bpf_mptcp_common_kfunc_set = {
>  	.owner	= THIS_MODULE,
>  	.set	= &bpf_mptcp_common_kfunc_ids,
> +	.filter	= bpf_mptcp_common_kfunc_filter,
>  };
>  
>  static int __init bpf_mptcp_kfunc_init(void)
Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.