From 62a17b90f0e78fe7396962ae8d82792e8ed4f24a Mon Sep 17 00:00:00 2001 From: Geliang Tang Date: Wed, 23 Oct 2024 10:01:36 +0800 Subject: [PATCH] fix Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c | 4 ++-- tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c | 1 + tools/testing/selftests/bpf/progs/mptcp_bpf_sockopt.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c index 28b4339331e03..7708e64ad68ef 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c @@ -30,10 +30,10 @@ int BPF_PROG(trace_mptcp_sched_get_send, struct mptcp_sock *msk) tp = bpf_core_cast(ssk, struct tcp_sock); if (subflow->subflow_id == 1) { - bpf_printk("bytes 1: sent %lu received %lu subflows %u", tp->bytes_sent, tp->bytes_received, msk->pm.subflows); + //bpf_printk("bytes 1: sent %lu received %lu subflows %u", tp->bytes_sent, tp->bytes_received, msk->pm.subflows); bytes_sent_1 += tp->bytes_sent; } else if (subflow->subflow_id == 2) { - bpf_printk("bytes 2: sent %lu received %lu subflows %u", tp->bytes_sent, tp->bytes_received, msk->pm.subflows); + //bpf_printk("bytes 2: sent %lu received %lu subflows %u", tp->bytes_sent, tp->bytes_received, msk->pm.subflows); bytes_sent_2 += tp->bytes_sent; } } diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c index c901ed045fdc6..7d4d29a50aa00 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -60,6 +60,7 @@ int BPF_PROG(bpf_rr_get_subflow, struct mptcp_sock *msk, out: next = bpf_core_cast(next, struct mptcp_subflow_context); mptcp_subflow_set_scheduled(next, true); + //bpf_printk("rr subflow=%u/%u", next->subflow_id, msk->pm.subflows + 1); ptr->last_snd = mptcp_subflow_tcp_sock(next); return 0; } diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_sockopt.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_sockopt.c index 5aae0e8de9849..a705be8d65a14 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_sockopt.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_sockopt.c @@ -25,7 +25,7 @@ static int mptcp_setsockopt_mark(struct bpf_sock *sk, struct bpf_sockopt *ctx) return 1; bpf_for_each(mptcp_subflow, subflow, msk) { - struct sock *ssk = bpf_mptcp_subflow_tcp_sock(subflow); + struct sock *ssk = mptcp_subflow_tcp_sock(subflow); int err; bpf_spin_lock_bh(&ssk->sk_lock.slock); @@ -59,7 +59,7 @@ static int mptcp_setsockopt_cc(struct bpf_sock *sk, struct bpf_sockopt *ctx) return 1; bpf_for_each(mptcp_subflow, subflow, msk) { - struct sock *ssk = bpf_mptcp_subflow_tcp_sock(subflow); + struct sock *ssk = mptcp_subflow_tcp_sock(subflow); int err; bpf_spin_lock_bh(&ssk->sk_lock.slock); @@ -101,7 +101,7 @@ static int mptcp_getsockopt_mark(struct bpf_sock *sk, struct bpf_sockopt *ctx) return 1; bpf_for_each(mptcp_subflow, subflow, msk) { - struct sock *ssk = bpf_mptcp_subflow_tcp_sock(subflow); + struct sock *ssk = mptcp_subflow_tcp_sock(subflow); if (ssk->sk_mark != 1) { ctx->retval = -1; @@ -126,7 +126,7 @@ static int mptcp_getsockopt_cc(struct bpf_sock *sk, struct bpf_sockopt *ctx) return 1; bpf_for_each(mptcp_subflow, subflow, msk) { - struct sock *ssk = bpf_mptcp_subflow_tcp_sock(subflow); + struct sock *ssk = mptcp_subflow_tcp_sock(subflow); struct inet_connection_sock *icsk; icsk = bpf_core_cast(ssk, struct inet_connection_sock);