tgupdate: merge t/DO-NOT-MERGE-mptcp-enabled-by-default into t/upstream base

matttbe · matttbe · commit 0d2890f93376 · 2025-03-05T17:13:38.000+01:00
diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
@@ -156,14 +156,12 @@ static int bpf_mptcp_sched_init(struct btf *btf)
 	return 0;
 }
 
-static int __bpf_mptcp_sched_get_send(struct mptcp_sock *msk,
-				      struct mptcp_sched_data *data)
+static int __bpf_mptcp_sched_get_send(struct mptcp_sock *msk)
 {
 	return 0;
 }
 
-static int __bpf_mptcp_sched_get_retrans(struct mptcp_sock *msk,
-					 struct mptcp_sched_data *data)
+static int __bpf_mptcp_sched_get_retrans(struct mptcp_sock *msk)
 {
 	return 0;
 }
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c
@@ -17,8 +17,7 @@ void BPF_PROG(mptcp_sched_bkup_release, struct mptcp_sock *msk)
 }
 
 SEC("struct_ops")
-int BPF_PROG(bpf_bkup_get_send, struct mptcp_sock *msk,
-	     struct mptcp_sched_data *data)
+int BPF_PROG(bpf_bkup_get_send, struct mptcp_sock *msk)
 {
 	struct mptcp_subflow_context *subflow;
 
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c
@@ -50,8 +50,7 @@ void BPF_PROG(mptcp_sched_burst_release, struct mptcp_sock *msk)
 }
 
 SEC("struct_ops")
-int BPF_PROG(bpf_burst_get_send, struct mptcp_sock *msk,
-	     struct mptcp_sched_data *data)
+int BPF_PROG(bpf_burst_get_send, struct mptcp_sock *msk)
 {
 	struct subflow_send_info send_info[SSK_MODE_MAX];
 	struct mptcp_subflow_context *subflow;
@@ -121,8 +120,7 @@ int BPF_PROG(bpf_burst_get_send, struct mptcp_sock *msk,
 }
 
 SEC("struct_ops")
-int BPF_PROG(bpf_burst_get_retrans, struct mptcp_sock *msk,
-	     struct mptcp_sched_data *data)
+int BPF_PROG(bpf_burst_get_retrans, struct mptcp_sock *msk)
 {
 	struct sock *backup = NULL, *pick = NULL;
 	struct mptcp_subflow_context *subflow;
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c
@@ -17,8 +17,7 @@ void BPF_PROG(mptcp_sched_first_release, struct mptcp_sock *msk)
 }
 
 SEC("struct_ops")
-int BPF_PROG(bpf_first_get_send, struct mptcp_sock *msk,
-	     struct mptcp_sched_data *data)
+int BPF_PROG(bpf_first_get_send, struct mptcp_sock *msk)
 {
 	struct mptcp_subflow_context *subflow;
 
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c
@@ -17,8 +17,7 @@ void BPF_PROG(mptcp_sched_red_release, struct mptcp_sock *msk)
 }
 
 SEC("struct_ops")
-int BPF_PROG(bpf_red_get_send, struct mptcp_sock *msk,
-	     struct mptcp_sched_data *data)
+int BPF_PROG(bpf_red_get_send, struct mptcp_sock *msk)
 {
 	struct mptcp_subflow_context *subflow;
 
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c
@@ -31,8 +31,7 @@ void BPF_PROG(mptcp_sched_rr_release, struct mptcp_sock *msk)
 }
 
 SEC("struct_ops")
-int BPF_PROG(bpf_rr_get_send, struct mptcp_sock *msk,
-	     struct mptcp_sched_data *data)
+int BPF_PROG(bpf_rr_get_send, struct mptcp_sock *msk)
 {
 	struct mptcp_subflow_context *subflow, *next;
 	struct mptcp_rr_storage *ptr;

Original file line number	Diff line number	Diff line change
`@@ -156,14 +156,12 @@ static int bpf_mptcp_sched_init(struct btf *btf)`
`156`	`156`	`return 0;`
`157`	`157`	`}`
`158`	`158`
`159`		`-static int __bpf_mptcp_sched_get_send(struct mptcp_sock *msk,`
`160`		`- struct mptcp_sched_data *data)`
	`159`	`+static int __bpf_mptcp_sched_get_send(struct mptcp_sock *msk)`
`161`	`160`	`{`
`162`	`161`	`return 0;`
`163`	`162`	`}`
`164`	`163`
`165`		`-static int __bpf_mptcp_sched_get_retrans(struct mptcp_sock *msk,`
`166`		`- struct mptcp_sched_data *data)`
	`164`	`+static int __bpf_mptcp_sched_get_retrans(struct mptcp_sock *msk)`
`167`	`165`	`{`
`168`	`166`	`return 0;`
`169`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@ void BPF_PROG(mptcp_sched_bkup_release, struct mptcp_sock *msk)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`SEC("struct_ops")`
`20`		`-int BPF_PROG(bpf_bkup_get_send, struct mptcp_sock *msk,`
`21`		`- struct mptcp_sched_data *data)`
	`20`	`+int BPF_PROG(bpf_bkup_get_send, struct mptcp_sock *msk)`
`22`	`21`	`{`
`23`	`22`	`struct mptcp_subflow_context *subflow;`
`24`	`23`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ void BPF_PROG(mptcp_sched_burst_release, struct mptcp_sock *msk)`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`SEC("struct_ops")`
`53`		`-int BPF_PROG(bpf_burst_get_send, struct mptcp_sock *msk,`
`54`		`- struct mptcp_sched_data *data)`
	`53`	`+int BPF_PROG(bpf_burst_get_send, struct mptcp_sock *msk)`
`55`	`54`	`{`
`56`	`55`	`struct subflow_send_info send_info[SSK_MODE_MAX];`
`57`	`56`	`struct mptcp_subflow_context *subflow;`
`@@ -121,8 +120,7 @@ int BPF_PROG(bpf_burst_get_send, struct mptcp_sock *msk,`
`121`	`120`	`}`
`122`	`121`
`123`	`122`	`SEC("struct_ops")`
`124`		`-int BPF_PROG(bpf_burst_get_retrans, struct mptcp_sock *msk,`
`125`		`- struct mptcp_sched_data *data)`
	`123`	`+int BPF_PROG(bpf_burst_get_retrans, struct mptcp_sock *msk)`
`126`	`124`	`{`
`127`	`125`	`struct sock backup = NULL, pick = NULL;`
`128`	`126`	`struct mptcp_subflow_context *subflow;`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,7 @@ void BPF_PROG(mptcp_sched_rr_release, struct mptcp_sock *msk)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`SEC("struct_ops")`
`34`		`-int BPF_PROG(bpf_rr_get_send, struct mptcp_sock *msk,`
`35`		`- struct mptcp_sched_data *data)`
	`34`	`+int BPF_PROG(bpf_rr_get_send, struct mptcp_sock *msk)`
`36`	`35`	`{`
`37`	`36`	`struct mptcp_subflow_context subflow, next;`
`38`	`37`	`struct mptcp_rr_storage *ptr;`