Squash to "selftests/bpf: Add bpf_burst scheduler"

Use mptcp_snd_nxt in bpf_burst. Signed-off-by: Geliang Tang <[email protected]>
intel-lab-lkp · Jul 10, 2024 · e3c0cc2 · e3c0cc2
1 parent 38703b0
commit e3c0cc2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c
@@ -19,6 +19,7 @@ struct bpf_subflow_send_info {
 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 __u64 mptcp_snd_nxt(const struct mptcp_sock *msk) __ksym;
 extern bool tcp_stream_memory_free(const struct sock *sk, int wake) __ksym;
 extern bool bpf_mptcp_subflow_queues_empty(struct sock *sk) __ksym;
 extern void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) __ksym;
@@ -121,7 +122,7 @@ static int bpf_burst_get_send(struct mptcp_sock *msk,
 	if (!ssk || !sk_stream_memory_free(ssk))
 		return -1;
 
-	burst = min(MPTCP_SEND_BURST_SIZE, mptcp_wnd_end(msk) - msk->snd_nxt);
+	burst = min(MPTCP_SEND_BURST_SIZE, mptcp_wnd_end(msk) - mptcp_snd_nxt(msk));
 	wmem = ssk->sk_wmem_queued;
 	if (!burst)
 		goto out;