fix

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
geliangtang · Oct 23, 2024 · 62a17b9 · 62a17b9
1 parent f74e851
commit 62a17b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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);