The bpf_burst scheduler selftest calls the mptcp_set_timeout() and
mptcp_pm_subflow_chk_stale() kfuncs by their raw names. The companion
squash-to patches to "bpf: Export mptcp packet scheduler helpers" narrow
those kfuncs behind bpf_mptcp_set_timeout() and
bpf_mptcp_pm_subflow_chk_stale() wrappers. Update the burst scheduler's
extern declarations and call sites to the wrapper names so it keeps
building and loading.
Assisted-by: Claude:claude-opus-4-8
Signed-off-by: Shardul Bankar <shardul.b@mpiricsoftware.com>
---
tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c
index 8ff529d38a595..408c65ed897b5 100644
--- a/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c
+++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c
@@ -22,10 +22,10 @@ struct bpf_subflow_send_info {
#define RB_EMPTY_ROOT(root) (READ_ONCE((root)->rb_node) == NULL)
extern bool mptcp_subflow_active(struct mptcp_subflow_context *subflow) __ksym;
-extern void mptcp_set_timeout(struct sock *sk) __ksym;
+extern void bpf_mptcp_set_timeout(struct mptcp_sock *msk) __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 void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) __ksym;
+extern void bpf_mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) __ksym;
static __always_inline __u64 div_u64(__u64 dividend, __u32 divisor)
{
@@ -99,7 +99,7 @@ int BPF_PROG(bpf_burst_get_send, struct mptcp_sock *msk)
send_info[backup].linger_time = linger_time;
}
}
- mptcp_set_timeout(sk);
+ bpf_mptcp_set_timeout(msk);
/* pick the best backup if no other subflow is active */
if (!nr_active)
@@ -140,7 +140,7 @@ int BPF_PROG(bpf_burst_get_retrans, struct mptcp_sock *msk)
/* still data outstanding at TCP level? skip this */
if (!tcp_rtx_and_write_queues_empty(ssk)) {
- mptcp_pm_subflow_chk_stale(msk, ssk);
+ bpf_mptcp_pm_subflow_chk_stale(msk, ssk);
min_stale_count = min(min_stale_count, subflow->stale_count);
continue;
}
--
2.34.1