From nobody Sun Dec 14 02:06:21 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 282FF211A16 for ; Tue, 20 May 2025 08:49:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747730946; cv=none; b=K2Q4S5Ek1WrfJho/u18LnT6KNrlgIkuVjBSCWnOFhv8hSF2YMKncGQx8zmLatS4N9us1Ea5CRNx/h9HDOK2Lxf9yr5FpUoqzH+y2B5/1eN8EwzyNCgtOPGsr5WGev2p5ZEomM1XMMish+Q5qICal5GWVg9Cpo8NyLthDYG2FzL0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747730946; c=relaxed/simple; bh=QnJ4ww0jfWyjyPd25EBGqqRdGmym3DTODKNom4iGYEM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KLZ0bkA2UZLKZMMFPm4wVCaHSzQTk5se6DcBwARr1XAkIOsdjYgcDjsyYYIoQhXMD07bdetNO5WeUGT0keGRBe2/IF0OtgWe6CATz47JN/s+DNRZetOqUlbFUsewUWob6qWhlwznrISfnocZTgZyrT+Y4wZMSM808zQdNzXsiU4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LBKG8oQk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LBKG8oQk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C722AC4CEEF; Tue, 20 May 2025 08:49:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747730945; bh=QnJ4ww0jfWyjyPd25EBGqqRdGmym3DTODKNom4iGYEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LBKG8oQk0gZOwJwEl7lt7z1nAVnJeiSQ/wBAs4ZpNDzo3RMXKAZHgtLgb4KAHTMZP Acx+ZfKv1W3qJ66Z8/aIU8Wf9qC38aF0OsjPQdG7UquPL1u7A29DsCiN1Et/LTYiML /CnosY2LvZhzxZO3eOvDrq+h7/zgYjA35nZ7oYfkDkOICmUGptaY0e17QJ0UjUpq1O w7Z3g7g/QKPGSfIq0O6qRhjYbTGgSoTNyqyA7l8qWyJITCDBQPzF3Hl8Orb/HJIk4T x7Rs84LJ2AZhTcVETaq/uZXKpjEL94PgwlwIDLC6Nhc3iIhNHUqAlKdtogO5pWuOYX NRN8tu0afRzZA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/2] Squash to "selftests/bpf: Add mptcp_subflow bpf_iter subtest" Date: Tue, 20 May 2025 16:48:55 +0800 Message-ID: <3f054bc9184c55420faf7904c8c04bd2d92dab81.1747730598.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Define mptcp_subflow_ctx() using bpf_core_cast as Martin suggested. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf.h | 10 ++++++++++ tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf.h b/tools/testing/= selftests/bpf/progs/mptcp_bpf.h index 4e901941d5dd..815bbf865ee4 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf.h +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf.h @@ -39,6 +39,16 @@ mptcp_subflow_tcp_sock(const struct mptcp_subflow_contex= t *subflow) return subflow->tcp_sock; } =20 +static __always_inline struct mptcp_subflow_context * +mptcp_subflow_ctx(const struct sock *sk) +{ + const struct inet_connection_sock * + icsk =3D bpf_core_cast(sk, struct inet_connection_sock); + + /* Use RCU on icsk_ulp_data only for sock diag code */ + return bpf_core_cast(icsk->icsk_ulp_data, struct mptcp_subflow_context); +} + /* ksym */ extern struct mptcp_subflow_context * bpf_mptcp_subflow_ctx(const struct sock *sk) __ksym; diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_iters.c index a1d8f9b20259..88a3100dfdc2 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c @@ -48,7 +48,7 @@ int iters_subflow(struct bpf_sockopt *ctx) goto out; =20 /* only to check the following kfunc works */ - subflow =3D bpf_mptcp_subflow_ctx(ssk); + subflow =3D mptcp_subflow_ctx(ssk); if (!subflow || subflow->token !=3D msk->token) goto out; =20 --=20 2.43.0 From nobody Sun Dec 14 02:06:21 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A57DD264FA1 for ; Tue, 20 May 2025 08:49:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747730947; cv=none; b=D4fZrTXiDsCJGKNjKg6m9FXMOMSVjdtX3olD5/bmAYlueaqfXlooSMMMbiL9SEzZY7fUCU+aEft0nlHL1JFh71O3eiezyiSFmAzAc+E52mYwqRWGmklOLM5OHEfPn87ycy0emTTLmmMwQ/7GrP9rx+2qNPT/EkNTnXi3w0/rdzE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747730947; c=relaxed/simple; bh=UBHN8aYpKMiiLu5t/dNV0QfeMZMRSayhsB7ibzU8uxw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OK+uyAC1kMXgG/yc+LwkGYgnB2XvLmPCqB88O5LhhTjpM5uHtFJSPpI24XCnXILW/0eemwC93dAkOrqVwN+o+AEQeCga1IFc2dPHVlM/XX35AR02QTjjWMb8iukDo49rpyTgtHU7/kMOAg4KernGjzBtZe5N97HT2iWgOXgtgx0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fB3Wbw7c; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fB3Wbw7c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 240ADC4CEE9; Tue, 20 May 2025 08:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747730947; bh=UBHN8aYpKMiiLu5t/dNV0QfeMZMRSayhsB7ibzU8uxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fB3Wbw7cQp8+b19gMmfwRt736gKtfD3/rXz/8T4nKQhUZktlbprtAReCtUW4aGVg1 1lV/M/VrzIaUQ7CGSJhVD48mtN1P9Ej+bVBl6NjdYYkLBK+JCe7SWy/HsFEiW8OUCw LRBu0t4MJ36QgIQrNJYjfxTUA36wy5tH57j3MMQxDd1QrppI0xdUJzkQvAtTEl1JGM eKj4VmNpd14/cl+y4I8IB29MkkS9867rhXYPdSzX5wDBt3RBCYBgCXe+5fFhufTPi6 NC0TpJZFE8wRdPEbxXkHnBtZK7wyVW1qpk/s0uL7ghJ0EfQP3qjIYVYUZDzvdhisdL zuwM6JlPaoAiQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/2] Squash to "bpf: Export mptcp packet scheduler helpers" Date: Tue, 20 May 2025 16:48:56 +0800 Message-ID: <9c089a245833c43d55ec240be1b880909af849ce.1747730598.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Define .filter as Martin suggested. Signed-off-by: Geliang Tang --- 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) =20 +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 && + prog->aux->st_ops !=3D &bpf_mptcp_sched_ops) + return -EACCES; + + return 0; +} + static const struct btf_kfunc_id_set bpf_mptcp_common_kfunc_set =3D { .owner =3D THIS_MODULE, .set =3D &bpf_mptcp_common_kfunc_ids, + .filter =3D bpf_mptcp_common_kfunc_filter, }; =20 static int __init bpf_mptcp_kfunc_init(void) --=20 2.43.0