From nobody Sun Jul 5 05:52:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 E786334AB01 for ; Tue, 23 Jun 2026 02:56:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782183381; cv=none; b=hmB3LPrY6L4onX5UWzG0qoqEL8XYBM7w0YQ4F9Pd6LMB6PhfKfEEDCLY4Q3NSIzVWLxE7Jv1vTGoJE06wBuW/LRdmEy+Cgqs4i4DA0eU/42j4rvwvrRvFb22kXj3G8cF1vWCUeNZnkJUY82KhvTWwfsnJPEkQO2YJ0MWMoh2R7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782183381; c=relaxed/simple; bh=lFb/geS2dZg3XJzMdoYqIDC5yB2B+9DfL04NK4etorM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DZNFmWHaZwZ7lsSNJcqghCUhyv8tR0TFFL0a+5B0dEw0rDmSrngW57zbALiGOfVHLxa+BG9XMD3zD7vvUaYVYIsrn97VOPoUBeFUUK1wN6nfkLP5W8NLO8SL+LaLuLwfJFWYfEU4Ph45EltAmhxOkSB2xSwJRoFn55KlEDAENJ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dkseMYLP; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dkseMYLP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57FDF1F00A3A; Tue, 23 Jun 2026 02:56:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782183380; bh=U34nGYcY58lJoa5TjzbUg0D4eF3hXF9c26ILuO7GtFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dkseMYLPswvp/xggIsi9CrQqFUx75FJi13XLP9mQ1UTxT9R8fU9W+IDnsEMNh54tZ xNmypj3ypwF6wb1gRn5LJljnzgHTpd6PQsJSN9H5sq5XQOO2QiR8ViKPLskoHAQvDs CHrG8daKfU++3fVx7CNAN+jDntkgynV+jLRb0MgAmeap6ufal1fa4ghbOKWt4TYBjP qWhbKgRybphE2Li3aGGVSGlgwYJP0EE76XEGV1OQaeQH2VV0YwmBohfi6HRgehJv82 tU35Ek/5t2V2d3WVID8cG3RrM7DURh7tXrwJ4lShvuwugBOn5QR2jnkWtWlIN1HWeG Qui6vfySvSwIQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/2] Squash to "bpf: Export mptcp packet scheduler helpers" Date: Tue, 23 Jun 2026 10:56:11 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 Remove bpf_mptcp_subflow_queues_empty() kfunc and its BTF ID. This kfunc is no longer used by any BPF scheduler after the burst scheduler was updated to implement tcp_rtx_queue_empty() inline. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 577b815775a2..0845061ddc65 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -289,11 +289,6 @@ bpf_iter_mptcp_subflow_destroy(struct bpf_iter_mptcp_s= ubflow *it) { } =20 -__bpf_kfunc static bool bpf_mptcp_subflow_queues_empty(struct sock *sk) -{ - return tcp_rtx_queue_empty(sk); -} - __bpf_kfunc static bool bpf_sk_stream_memory_free(const struct mptcp_subflow_context *subflow) { @@ -327,7 +322,6 @@ BTF_ID_FLAGS(func, mptcp_subflow_active) BTF_ID_FLAGS(func, mptcp_set_timeout) BTF_ID_FLAGS(func, mptcp_wnd_end) BTF_ID_FLAGS(func, bpf_sk_stream_memory_free) -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 --=20 2.53.0 From nobody Sun Jul 5 05:52:31 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 2F1AA34AB01 for ; Tue, 23 Jun 2026 02:56:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782183383; cv=none; b=YLoWRWp4D5xZ4IAxXijF4y0y82YI1KHyPkyNvqxUuJQiANIiOh1IFsHE+qtlR1ZNMVtRAfjZk5fBaJBpl9v8SLDF0TJL9GFDiIz5l2C0LqW8lxh1Nd/g+p2wolVNSkpm7p6aGdBCih1gRzjpM93HV12cqrJs6Nb4Pf6HqC9RSJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782183383; c=relaxed/simple; bh=O0WTLIAf4uKjk+MXlhWW3hPNjVHWoCi6iXyZZVcKBvw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fz7zUrfzM2teEoEfyuj2SKjVbYHB3Yjw36exJ0G6RumlltI+4WA3QKECK0Unly1BYtkl2BWTY5Zdxh1uJ7PuYZeeCfxuT9p000UWXoux5db6fKqGiaBBu6uAISNwc4xGhayzZP+CXaEnUJY3wCh6yQc4c0552Z8CK7kwS+bf2Cw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IbjrmCiR; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IbjrmCiR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0ED4A1F000E9; Tue, 23 Jun 2026 02:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782183381; bh=AFnC+eT+wMl/uHSQcoQgrP4Lgt8VIzp0y9FTS7KOTdY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IbjrmCiRV0rhRimG82g4pUvfd+XmjT2emUoLhaKnM1k2H9hOkk5+QKYcY2gTvQ/QA VYC1vra57MGstSd0s46wApzJOFUZvBjrsD1XPAyn+oSqa7QEySJmHsO0a1Nmheo3EV 7R2D3t1mTOEA4dWRZcqO2eyfW4kqyD1hGR5t6Ns2cBHxKpRFp//iPGAVVu+rblLXJN /1EEVjOw53sO5Gdx6WtXlWQjkSUkxo1QLIuA7kkMkwUh6bBg58RvYg/CQlvwF6R6gd +Nukuj3qaTwXNrlrkRYq0ngpDFTL4yYlQSCJ9o4OqqQTF1sI0n4dHF3bIk8hOUScbC GYoKRW7eVjgiQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/2] Squash to "selftests/bpf: Add bpf_burst scheduler & test" Date: Tue, 23 Jun 2026 10:56:12 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 Implement tcp_rtx_queue_empty() inline in the burst scheduler using RB_EMPTY_ROOT(), and remove the dependency on the external kfunc bpf_mptcp_subflow_queues_empty(). Also include bpf_atomic.h for READ_ONCE() support. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf.h | 1 + tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf.h b/tools/testing/= selftests/bpf/progs/mptcp_bpf.h index 4e901941d5dd..de450b2eaf0f 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf.h +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf.h @@ -3,6 +3,7 @@ #define __MPTCP_BPF_H__ =20 #include "bpf_experimental.h" +#include "bpf_atomic.h" =20 /* list helpers from include/linux/list.h */ static inline int list_is_head(const struct list_head *list, diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_burst.c index 48c22f5bce32..8ff529d38a59 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c @@ -19,12 +19,12 @@ struct bpf_subflow_send_info { #define SSK_MODE_MAX 2 =20 #define min(a, b) ((a) < (b) ? (a) : (b)) +#define RB_EMPTY_ROOT(root) (READ_ONCE((root)->rb_node) =3D=3D NULL) =20 extern bool mptcp_subflow_active(struct mptcp_subflow_context *subflow) __= ksym; extern void mptcp_set_timeout(struct sock *sk) __ksym; extern __u64 mptcp_wnd_end(const struct mptcp_sock *msk) __ksym; extern bool bpf_sk_stream_memory_free(const struct mptcp_subflow_context *= subflow) __ksym; -extern bool bpf_mptcp_subflow_queues_empty(struct sock *sk) __ksym; extern void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struc= t sock *ssk) __ksym; =20 static __always_inline __u64 div_u64(__u64 dividend, __u32 divisor) @@ -39,9 +39,14 @@ static __always_inline bool tcp_write_queue_empty(struct= sock *sk) return tp ? tp->write_seq =3D=3D tp->snd_nxt : true; } =20 +static __always_inline bool tcp_rtx_queue_empty(const struct sock *sk) +{ + return RB_EMPTY_ROOT(&sk->tcp_rtx_queue); +} + static __always_inline bool tcp_rtx_and_write_queues_empty(struct sock *sk) { - return bpf_mptcp_subflow_queues_empty(sk) && tcp_write_queue_empty(sk); + return tcp_rtx_queue_empty(sk) && tcp_write_queue_empty(sk); } =20 SEC("struct_ops") --=20 2.53.0