* [PATCH net-next 01/10] selftests: mptcp: run userspace pm tests slower
2023-10-25 23:37 [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 Mat Martineau
@ 2023-10-25 23:37 ` Mat Martineau
2023-10-25 23:37 ` [PATCH net-next 02/10] selftests: mptcp: fix wait_rm_addr/sf parameters Mat Martineau
` (9 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Mat Martineau @ 2023-10-25 23:37 UTC (permalink / raw)
To: Matthieu Baerts, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Geliang Tang, Kishen Maloor
Cc: netdev, mptcp, Mat Martineau, stable
From: Geliang Tang <geliang.tang@suse.com>
Some userspace pm tests failed are reported by CI:
112 userspace pm add & remove address
syn [ ok ]
synack [ ok ]
ack [ ok ]
add [ ok ]
echo [ ok ]
mptcp_info subflows=1:1 [ ok ]
subflows_total 2:2 [ ok ]
mptcp_info add_addr_signal=1:1 [ ok ]
rm [ ok ]
rmsf [ ok ]
Info: invert
mptcp_info subflows=0:0 [ ok ]
subflows_total 1:1 [fail]
got subflows 0:0 expected 1:1
Server ns stats
TcpPassiveOpens 2 0.0
TcpInSegs 118 0.0
This patch fixes them by changing 'speed' to 5 to run the tests much more
slowly.
Fixes: 4369c198e599 ("selftests: mptcp: test userspace pm out of transfer")
Cc: stable@vger.kernel.org
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index dc895b7b94e1..edc569bab4b8 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3417,7 +3417,7 @@ userspace_tests()
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
set_userspace_pm $ns1
pm_nl_set_limits $ns2 1 1
- speed=10 \
+ speed=5 \
run_tests $ns1 $ns2 10.0.1.1 &
local tests_pid=$!
wait_mpj $ns1
@@ -3438,7 +3438,7 @@ userspace_tests()
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
set_userspace_pm $ns2
pm_nl_set_limits $ns1 0 1
- speed=10 \
+ speed=5 \
run_tests $ns1 $ns2 10.0.1.1 &
local tests_pid=$!
wait_mpj $ns2
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH net-next 02/10] selftests: mptcp: fix wait_rm_addr/sf parameters
2023-10-25 23:37 [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 Mat Martineau
2023-10-25 23:37 ` [PATCH net-next 01/10] selftests: mptcp: run userspace pm tests slower Mat Martineau
@ 2023-10-25 23:37 ` Mat Martineau
2023-10-25 23:37 ` [PATCH net-next 03/10] mptcp: userspace pm send RM_ADDR for ID 0 Mat Martineau
` (8 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Mat Martineau @ 2023-10-25 23:37 UTC (permalink / raw)
To: Matthieu Baerts, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Geliang Tang, Kishen Maloor
Cc: netdev, mptcp, Mat Martineau, stable
From: Geliang Tang <geliang.tang@suse.com>
The second input parameter of 'wait_rm_addr/sf $1 1' is misused. If it's
1, wait_rm_addr/sf will never break, and will loop ten times, then
'wait_rm_addr/sf' equals to 'sleep 1'. This delay time is too long,
which can sometimes make the tests fail.
A better way to use wait_rm_addr/sf is to use rm_addr/sf_count to obtain
the current value, and then pass into wait_rm_addr/sf.
Fixes: 4369c198e599 ("selftests: mptcp: test userspace pm out of transfer")
Cc: stable@vger.kernel.org
Suggested-by: Matthieu Baerts <matttbe@kernel.org>
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index edc569bab4b8..5917a74b749d 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3289,6 +3289,7 @@ userspace_pm_rm_sf_addr_ns1()
local addr=$1
local id=$2
local tk sp da dp
+ local cnt_addr cnt_sf
tk=$(grep "type:1," "$evts_ns1" |
sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q')
@@ -3298,11 +3299,13 @@ userspace_pm_rm_sf_addr_ns1()
sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q')
dp=$(grep "type:10" "$evts_ns1" |
sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q')
+ cnt_addr=$(rm_addr_count ${ns1})
+ cnt_sf=$(rm_sf_count ${ns1})
ip netns exec $ns1 ./pm_nl_ctl rem token $tk id $id
ip netns exec $ns1 ./pm_nl_ctl dsf lip "::ffff:$addr" \
lport $sp rip $da rport $dp token $tk
- wait_rm_addr $ns1 1
- wait_rm_sf $ns1 1
+ wait_rm_addr $ns1 "${cnt_addr}"
+ wait_rm_sf $ns1 "${cnt_sf}"
}
userspace_pm_add_sf()
@@ -3324,17 +3327,20 @@ userspace_pm_rm_sf_addr_ns2()
local addr=$1
local id=$2
local tk da dp sp
+ local cnt_addr cnt_sf
tk=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2")
da=$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2")
dp=$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2")
sp=$(grep "type:10" "$evts_ns2" |
sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q')
+ cnt_addr=$(rm_addr_count ${ns2})
+ cnt_sf=$(rm_sf_count ${ns2})
ip netns exec $ns2 ./pm_nl_ctl rem token $tk id $id
ip netns exec $ns2 ./pm_nl_ctl dsf lip $addr lport $sp \
rip $da rport $dp token $tk
- wait_rm_addr $ns2 1
- wait_rm_sf $ns2 1
+ wait_rm_addr $ns2 "${cnt_addr}"
+ wait_rm_sf $ns2 "${cnt_sf}"
}
userspace_tests()
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH net-next 03/10] mptcp: userspace pm send RM_ADDR for ID 0
2023-10-25 23:37 [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 Mat Martineau
2023-10-25 23:37 ` [PATCH net-next 01/10] selftests: mptcp: run userspace pm tests slower Mat Martineau
2023-10-25 23:37 ` [PATCH net-next 02/10] selftests: mptcp: fix wait_rm_addr/sf parameters Mat Martineau
@ 2023-10-25 23:37 ` Mat Martineau
2023-10-27 3:26 ` Jakub Kicinski
2023-10-25 23:37 ` [PATCH net-next 04/10] mptcp: drop useless ssk in pm_subflow_check_next Mat Martineau
` (7 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Mat Martineau @ 2023-10-25 23:37 UTC (permalink / raw)
To: Matthieu Baerts, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Geliang Tang, Kishen Maloor
Cc: netdev, mptcp, Mat Martineau, stable
From: Geliang Tang <geliang.tang@suse.com>
This patch adds the ability to send RM_ADDR for local ID 0. Check
whether id 0 address is removed, if not, put id 0 into a removing
list, pass it to mptcp_pm_remove_addr() to remove id 0 address.
There is no reason not to allow the userspace to remove the initial
address (ID 0). This special case was not taken into account not
letting the userspace to delete all addresses as announced.
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/379
Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE")
Cc: stable@vger.kernel.org
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
---
net/mptcp/pm_userspace.c | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index 0f92e5b13a8a..25fa37ac3620 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -208,6 +208,40 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info)
return err;
}
+static int mptcp_userspace_pm_remove_id_zero_address(struct mptcp_sock *msk,
+ struct genl_info *info)
+{
+ struct mptcp_rm_list list = { .nr = 0 };
+ struct mptcp_subflow_context *subflow;
+ struct sock *sk = (struct sock *)msk;
+ bool has_id_0 = false;
+ int err = -EINVAL;
+
+ lock_sock(sk);
+ mptcp_for_each_subflow(msk, subflow) {
+ if (subflow->local_id == 0) {
+ has_id_0 = true;
+ break;
+ }
+ }
+ if (!has_id_0) {
+ GENL_SET_ERR_MSG(info, "address with id 0 not found");
+ goto remove_err;
+ }
+
+ list.ids[list.nr++] = 0;
+
+ spin_lock_bh(&msk->pm.lock);
+ mptcp_pm_remove_addr(msk, &list);
+ spin_unlock_bh(&msk->pm.lock);
+
+ err = 0;
+
+remove_err:
+ release_sock(sk);
+ return err;
+}
+
int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)
{
struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];
@@ -239,6 +273,11 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)
goto remove_err;
}
+ if (id_val == 0) {
+ err = mptcp_userspace_pm_remove_id_zero_address(msk, info);
+ goto remove_err;
+ }
+
lock_sock((struct sock *)msk);
list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH net-next 03/10] mptcp: userspace pm send RM_ADDR for ID 0
2023-10-25 23:37 ` [PATCH net-next 03/10] mptcp: userspace pm send RM_ADDR for ID 0 Mat Martineau
@ 2023-10-27 3:26 ` Jakub Kicinski
2023-10-27 15:34 ` Mat Martineau
0 siblings, 1 reply; 17+ messages in thread
From: Jakub Kicinski @ 2023-10-27 3:26 UTC (permalink / raw)
To: Mat Martineau
Cc: Matthieu Baerts, David S. Miller, Eric Dumazet, Paolo Abeni,
Geliang Tang, Kishen Maloor, netdev, mptcp
On Wed, 25 Oct 2023 16:37:04 -0700 Mat Martineau wrote:
> Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE")
> Cc: stable@vger.kernel.org
CC: stable@ + net-next really doesn't make sense.
Either it's important or it's not. Which one do you pick?
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH net-next 03/10] mptcp: userspace pm send RM_ADDR for ID 0
2023-10-27 3:26 ` Jakub Kicinski
@ 2023-10-27 15:34 ` Mat Martineau
2023-10-27 15:43 ` Jakub Kicinski
0 siblings, 1 reply; 17+ messages in thread
From: Mat Martineau @ 2023-10-27 15:34 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Matthieu Baerts, David S. Miller, Eric Dumazet, Paolo Abeni,
Geliang Tang, Kishen Maloor, netdev, mptcp
On Thu, 26 Oct 2023, Jakub Kicinski wrote:
> On Wed, 25 Oct 2023 16:37:04 -0700 Mat Martineau wrote:
>> Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE")
>> Cc: stable@vger.kernel.org
>
> CC: stable@ + net-next really doesn't make sense.
> Either it's important or it's not. Which one do you pick?
>
Hi Jakub -
This is what I was attempting to explain in the cover letter:
> This series includes three initial patches that we had queued in our
> mptcp-net branch, but given the likely timing of net/net-next syncs this
> week, the need to avoid introducing branch conflicts, and another batch
> of net-next patches pending in the mptcp tree, the most practical route
> is to send everything for net-next.
So, that's the reasoning, but I'll send v2 without the cc's.
- Mat
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH net-next 03/10] mptcp: userspace pm send RM_ADDR for ID 0
2023-10-27 15:34 ` Mat Martineau
@ 2023-10-27 15:43 ` Jakub Kicinski
2023-10-27 15:45 ` Mat Martineau
0 siblings, 1 reply; 17+ messages in thread
From: Jakub Kicinski @ 2023-10-27 15:43 UTC (permalink / raw)
To: Mat Martineau
Cc: Matthieu Baerts, David S. Miller, Eric Dumazet, Paolo Abeni,
Geliang Tang, Kishen Maloor, netdev, mptcp
On Fri, 27 Oct 2023 08:34:27 -0700 (PDT) Mat Martineau wrote:
> > This series includes three initial patches that we had queued in our
> > mptcp-net branch, but given the likely timing of net/net-next syncs this
> > week, the need to avoid introducing branch conflicts, and another batch
> > of net-next patches pending in the mptcp tree, the most practical route
> > is to send everything for net-next.
>
> So, that's the reasoning, but I'll send v2 without the cc's.
No need, I can strip when applying.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH net-next 03/10] mptcp: userspace pm send RM_ADDR for ID 0
2023-10-27 15:43 ` Jakub Kicinski
@ 2023-10-27 15:45 ` Mat Martineau
2023-10-27 15:53 ` Jakub Kicinski
0 siblings, 1 reply; 17+ messages in thread
From: Mat Martineau @ 2023-10-27 15:45 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Matthieu Baerts, David S. Miller, Eric Dumazet, Paolo Abeni,
Geliang Tang, Kishen Maloor, netdev, mptcp
On Fri, 27 Oct 2023, Jakub Kicinski wrote:
> On Fri, 27 Oct 2023 08:34:27 -0700 (PDT) Mat Martineau wrote:
>>> This series includes three initial patches that we had queued in our
>>> mptcp-net branch, but given the likely timing of net/net-next syncs this
>>> week, the need to avoid introducing branch conflicts, and another batch
>>> of net-next patches pending in the mptcp tree, the most practical route
>>> is to send everything for net-next.
>>
>> So, that's the reasoning, but I'll send v2 without the cc's.
>
> No need, I can strip when applying.
>
Thanks Jakub, appreciate this!
- Mat
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH net-next 03/10] mptcp: userspace pm send RM_ADDR for ID 0
2023-10-27 15:45 ` Mat Martineau
@ 2023-10-27 15:53 ` Jakub Kicinski
0 siblings, 0 replies; 17+ messages in thread
From: Jakub Kicinski @ 2023-10-27 15:53 UTC (permalink / raw)
To: Mat Martineau
Cc: Matthieu Baerts, David S. Miller, Eric Dumazet, Paolo Abeni,
Geliang Tang, Kishen Maloor, netdev, mptcp
On Fri, 27 Oct 2023 08:45:53 -0700 (PDT) Mat Martineau wrote:
> > No need, I can strip when applying.
>
> Thanks Jakub, appreciate this!
What's the reset of the stuff you have for 6.7, tho?
The net-next PR comes out today, unless it's really trivial cleanups
and/or selftest changes it's probably already too late :(
Assuming MW doesn't get postponed.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH net-next 04/10] mptcp: drop useless ssk in pm_subflow_check_next
2023-10-25 23:37 [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 Mat Martineau
` (2 preceding siblings ...)
2023-10-25 23:37 ` [PATCH net-next 03/10] mptcp: userspace pm send RM_ADDR for ID 0 Mat Martineau
@ 2023-10-25 23:37 ` Mat Martineau
2023-10-25 23:37 ` [PATCH net-next 05/10] mptcp: use mptcp_check_fallback helper Mat Martineau
` (6 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Mat Martineau @ 2023-10-25 23:37 UTC (permalink / raw)
To: Matthieu Baerts, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Geliang Tang, Kishen Maloor
Cc: netdev, mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
The code using 'ssk' parameter of mptcp_pm_subflow_check_next() has been
dropped in commit "95d686517884 (mptcp: fix subflow accounting on close)".
So drop this useless parameter ssk.
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
---
net/mptcp/pm.c | 2 +-
net/mptcp/protocol.c | 2 +-
net/mptcp/protocol.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index d8da5374d9e1..4ae19113b8eb 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -184,7 +184,7 @@ void mptcp_pm_subflow_established(struct mptcp_sock *msk)
spin_unlock_bh(&pm->lock);
}
-void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk,
+void mptcp_pm_subflow_check_next(struct mptcp_sock *msk,
const struct mptcp_subflow_context *subflow)
{
struct mptcp_pm_data *pm = &msk->pm;
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 1dacc072dcca..a29116eda30a 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -2490,7 +2490,7 @@ void mptcp_close_ssk(struct sock *sk, struct sock *ssk,
/* subflow aborted before reaching the fully_established status
* attempt the creation of the next subflow
*/
- mptcp_pm_subflow_check_next(mptcp_sk(sk), ssk, subflow);
+ mptcp_pm_subflow_check_next(mptcp_sk(sk), subflow);
__mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_PUSH);
}
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 9092fcf18798..a5322074353b 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -888,7 +888,7 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk);
void mptcp_pm_connection_closed(struct mptcp_sock *msk);
void mptcp_pm_subflow_established(struct mptcp_sock *msk);
bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk);
-void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk,
+void mptcp_pm_subflow_check_next(struct mptcp_sock *msk,
const struct mptcp_subflow_context *subflow);
void mptcp_pm_add_addr_received(const struct sock *ssk,
const struct mptcp_addr_info *addr);
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH net-next 05/10] mptcp: use mptcp_check_fallback helper
2023-10-25 23:37 [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 Mat Martineau
` (3 preceding siblings ...)
2023-10-25 23:37 ` [PATCH net-next 04/10] mptcp: drop useless ssk in pm_subflow_check_next Mat Martineau
@ 2023-10-25 23:37 ` Mat Martineau
2023-10-25 23:37 ` [PATCH net-next 06/10] mptcp: use mptcp_get_ext helper Mat Martineau
` (5 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Mat Martineau @ 2023-10-25 23:37 UTC (permalink / raw)
To: Matthieu Baerts, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Geliang Tang, Kishen Maloor
Cc: netdev, mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
Use __mptcp_check_fallback() helper defined in net/mptcp/protocol.h,
instead of open-coding it in both __mptcp_do_fallback() and
mptcp_diag_fill_info().
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
---
net/mptcp/protocol.h | 2 +-
net/mptcp/sockopt.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index a5322074353b..fe6f2d399ee8 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -1065,7 +1065,7 @@ static inline bool mptcp_check_fallback(const struct sock *sk)
static inline void __mptcp_do_fallback(struct mptcp_sock *msk)
{
- if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags)) {
+ if (__mptcp_check_fallback(msk)) {
pr_debug("TCP fallback already done (msk=%p)", msk);
return;
}
diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
index 574e221bb765..77f5e8932abf 100644
--- a/net/mptcp/sockopt.c
+++ b/net/mptcp/sockopt.c
@@ -916,7 +916,7 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info)
mptcp_pm_get_local_addr_max(msk);
}
- if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags))
+ if (__mptcp_check_fallback(msk))
flags |= MPTCP_INFO_FLAG_FALLBACK;
if (READ_ONCE(msk->can_ack))
flags |= MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED;
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH net-next 06/10] mptcp: use mptcp_get_ext helper
2023-10-25 23:37 [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 Mat Martineau
` (4 preceding siblings ...)
2023-10-25 23:37 ` [PATCH net-next 05/10] mptcp: use mptcp_check_fallback helper Mat Martineau
@ 2023-10-25 23:37 ` Mat Martineau
2023-10-25 23:37 ` [PATCH net-next 07/10] mptcp: move sk assignment statement ahead Mat Martineau
` (4 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Mat Martineau @ 2023-10-25 23:37 UTC (permalink / raw)
To: Matthieu Baerts, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Geliang Tang, Kishen Maloor
Cc: netdev, mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
Use mptcp_get_ext() helper defined in protocol.h instead of open-coding
it in mptcp_sendmsg_frag().
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
---
net/mptcp/protocol.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index a29116eda30a..a0b8356cd8c5 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1267,7 +1267,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
* queue management operation, to avoid breaking the ext <->
* SSN association set here
*/
- mpext = skb_ext_find(skb, SKB_EXT_MPTCP);
+ mpext = mptcp_get_ext(skb);
if (!mptcp_skb_can_collapse_to(data_seq, skb, mpext)) {
TCP_SKB_CB(skb)->eor = 1;
goto alloc_skb;
@@ -1289,7 +1289,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
i = skb_shinfo(skb)->nr_frags;
reuse_skb = false;
- mpext = skb_ext_find(skb, SKB_EXT_MPTCP);
+ mpext = mptcp_get_ext(skb);
}
/* Zero window and all data acked? Probe. */
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH net-next 07/10] mptcp: move sk assignment statement ahead
2023-10-25 23:37 [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 Mat Martineau
` (5 preceding siblings ...)
2023-10-25 23:37 ` [PATCH net-next 06/10] mptcp: use mptcp_get_ext helper Mat Martineau
@ 2023-10-25 23:37 ` Mat Martineau
2023-10-25 23:37 ` [PATCH net-next 08/10] mptcp: define more local variables sk Mat Martineau
` (3 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Mat Martineau @ 2023-10-25 23:37 UTC (permalink / raw)
To: Matthieu Baerts, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Geliang Tang, Kishen Maloor
Cc: netdev, mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
If we move the sk assignment statement ahead in mptcp_nl_cmd_sf_create()
or mptcp_nl_cmd_sf_destroy(), right after the msk null-check statements,
sk can be used after the create_err or destroy_err labels instead of
open-coding it again.
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
---
net/mptcp/pm_userspace.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index 25fa37ac3620..7bb2b29e5b96 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -335,6 +335,8 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info)
return err;
}
+ sk = (struct sock *)msk;
+
if (!mptcp_pm_is_userspace(msk)) {
GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");
goto create_err;
@@ -352,8 +354,6 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info)
goto create_err;
}
- sk = (struct sock *)msk;
-
if (!mptcp_pm_addr_families_match(sk, &addr_l, &addr_r)) {
GENL_SET_ERR_MSG(info, "families mismatch");
err = -EINVAL;
@@ -381,7 +381,7 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info *info)
spin_unlock_bh(&msk->pm.lock);
create_err:
- sock_put((struct sock *)msk);
+ sock_put(sk);
return err;
}
@@ -458,6 +458,8 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info
return err;
}
+ sk = (struct sock *)msk;
+
if (!mptcp_pm_is_userspace(msk)) {
GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");
goto destroy_err;
@@ -487,7 +489,6 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info
goto destroy_err;
}
- sk = (struct sock *)msk;
lock_sock(sk);
ssk = mptcp_nl_find_ssk(msk, &addr_l, &addr_r);
if (ssk) {
@@ -507,7 +508,7 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info
release_sock(sk);
destroy_err:
- sock_put((struct sock *)msk);
+ sock_put(sk);
return err;
}
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH net-next 08/10] mptcp: define more local variables sk
2023-10-25 23:37 [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 Mat Martineau
` (6 preceding siblings ...)
2023-10-25 23:37 ` [PATCH net-next 07/10] mptcp: move sk assignment statement ahead Mat Martineau
@ 2023-10-25 23:37 ` Mat Martineau
2023-10-25 23:37 ` [PATCH net-next 09/10] selftests: mptcp: sockopt: drop mptcp_connect var Mat Martineau
` (2 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Mat Martineau @ 2023-10-25 23:37 UTC (permalink / raw)
To: Matthieu Baerts, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Geliang Tang, Kishen Maloor
Cc: netdev, mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
'(struct sock *)msk' is used several times in mptcp_nl_cmd_announce(),
mptcp_nl_cmd_remove() or mptcp_userspace_pm_set_flags() in pm_userspace.c,
it's worth adding a local variable sk to point it.
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
---
net/mptcp/pm_userspace.c | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index 7bb2b29e5b96..5c01b9bc619a 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -152,6 +152,7 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info)
struct mptcp_pm_addr_entry addr_val;
struct mptcp_sock *msk;
int err = -EINVAL;
+ struct sock *sk;
u32 token_val;
if (!addr || !token) {
@@ -167,6 +168,8 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info)
return err;
}
+ sk = (struct sock *)msk;
+
if (!mptcp_pm_is_userspace(msk)) {
GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");
goto announce_err;
@@ -190,7 +193,7 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info)
goto announce_err;
}
- lock_sock((struct sock *)msk);
+ lock_sock(sk);
spin_lock_bh(&msk->pm.lock);
if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) {
@@ -200,11 +203,11 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info)
}
spin_unlock_bh(&msk->pm.lock);
- release_sock((struct sock *)msk);
+ release_sock(sk);
err = 0;
announce_err:
- sock_put((struct sock *)msk);
+ sock_put(sk);
return err;
}
@@ -251,6 +254,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)
struct mptcp_sock *msk;
LIST_HEAD(free_list);
int err = -EINVAL;
+ struct sock *sk;
u32 token_val;
u8 id_val;
@@ -268,6 +272,8 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)
return err;
}
+ sk = (struct sock *)msk;
+
if (!mptcp_pm_is_userspace(msk)) {
GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected");
goto remove_err;
@@ -278,7 +284,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)
goto remove_err;
}
- lock_sock((struct sock *)msk);
+ lock_sock(sk);
list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) {
if (entry->addr.id == id_val) {
@@ -289,7 +295,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)
if (!match) {
GENL_SET_ERR_MSG(info, "address with specified id not found");
- release_sock((struct sock *)msk);
+ release_sock(sk);
goto remove_err;
}
@@ -297,15 +303,15 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info)
mptcp_pm_remove_addrs(msk, &free_list);
- release_sock((struct sock *)msk);
+ release_sock(sk);
list_for_each_entry_safe(match, entry, &free_list, list) {
- sock_kfree_s((struct sock *)msk, match, sizeof(*match));
+ sock_kfree_s(sk, match, sizeof(*match));
}
err = 0;
remove_err:
- sock_put((struct sock *)msk);
+ sock_put(sk);
return err;
}
@@ -518,6 +524,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,
{
struct mptcp_sock *msk;
int ret = -EINVAL;
+ struct sock *sk;
u32 token_val;
token_val = nla_get_u32(token);
@@ -526,6 +533,8 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,
if (!msk)
return ret;
+ sk = (struct sock *)msk;
+
if (!mptcp_pm_is_userspace(msk))
goto set_flags_err;
@@ -533,11 +542,11 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,
rem->addr.family == AF_UNSPEC)
goto set_flags_err;
- lock_sock((struct sock *)msk);
+ lock_sock(sk);
ret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup);
- release_sock((struct sock *)msk);
+ release_sock(sk);
set_flags_err:
- sock_put((struct sock *)msk);
+ sock_put(sk);
return ret;
}
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH net-next 09/10] selftests: mptcp: sockopt: drop mptcp_connect var
2023-10-25 23:37 [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 Mat Martineau
` (7 preceding siblings ...)
2023-10-25 23:37 ` [PATCH net-next 08/10] mptcp: define more local variables sk Mat Martineau
@ 2023-10-25 23:37 ` Mat Martineau
2023-10-25 23:37 ` [PATCH net-next 10/10] selftests: mptcp: display simult in extra_msg Mat Martineau
2023-10-27 16:20 ` [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 patchwork-bot+netdevbpf
10 siblings, 0 replies; 17+ messages in thread
From: Mat Martineau @ 2023-10-25 23:37 UTC (permalink / raw)
To: Matthieu Baerts, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Geliang Tang, Kishen Maloor
Cc: netdev, mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
Global var mptcp_connect defined at the front of mptcp_sockopt.sh is
duplicate with local var mptcp_connect defined in do_transfer(), drop
this useless global one.
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
---
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index 8c8694f21e7d..a817af6616ec 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -11,7 +11,6 @@ cout=""
ksft_skip=4
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
-mptcp_connect=""
iptables="iptables"
ip6tables="ip6tables"
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH net-next 10/10] selftests: mptcp: display simult in extra_msg
2023-10-25 23:37 [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 Mat Martineau
` (8 preceding siblings ...)
2023-10-25 23:37 ` [PATCH net-next 09/10] selftests: mptcp: sockopt: drop mptcp_connect var Mat Martineau
@ 2023-10-25 23:37 ` Mat Martineau
2023-10-27 16:20 ` [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 patchwork-bot+netdevbpf
10 siblings, 0 replies; 17+ messages in thread
From: Mat Martineau @ 2023-10-25 23:37 UTC (permalink / raw)
To: Matthieu Baerts, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Geliang Tang, Kishen Maloor
Cc: netdev, mptcp, Mat Martineau
From: Geliang Tang <geliang.tang@suse.com>
Just like displaying "invert" after "Info: ", "simult" should be
displayed too when rm_subflow_nr doesn't match the expect value in
chk_rm_nr():
syn [ ok ]
synack [ ok ]
ack [ ok ]
add [ ok ]
echo [ ok ]
rm [ ok ]
rmsf [ ok ] 3 in [2:4]
Info: invert simult
syn [ ok ]
synack [ ok ]
ack [ ok ]
add [ ok ]
echo [ ok ]
rm [ ok ]
rmsf [ ok ]
Info: invert
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 5917a74b749d..75a2438efdf3 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -1770,7 +1770,10 @@ chk_rm_nr()
# in case of simult flush, the subflow removal count on each side is
# unreliable
count=$((count + cnt))
- [ "$count" != "$rm_subflow_nr" ] && suffix="$count in [$rm_subflow_nr:$((rm_subflow_nr*2))]"
+ if [ "$count" != "$rm_subflow_nr" ]; then
+ suffix="$count in [$rm_subflow_nr:$((rm_subflow_nr*2))]"
+ extra_msg="$extra_msg simult"
+ fi
if [ $count -ge "$rm_subflow_nr" ] && \
[ "$count" -le "$((rm_subflow_nr *2 ))" ]; then
print_ok "$suffix"
--
2.41.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7
2023-10-25 23:37 [PATCH net-next 00/10] mptcp: Fixes and cleanup for v6.7 Mat Martineau
` (9 preceding siblings ...)
2023-10-25 23:37 ` [PATCH net-next 10/10] selftests: mptcp: display simult in extra_msg Mat Martineau
@ 2023-10-27 16:20 ` patchwork-bot+netdevbpf
10 siblings, 0 replies; 17+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-10-27 16:20 UTC (permalink / raw)
To: Mat Martineau
Cc: matttbe, davem, edumazet, kuba, pabeni, geliang.tang,
kishen.maloor, netdev, mptcp, stable
Hello:
This series was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 25 Oct 2023 16:37:01 -0700 you wrote:
> This series includes three initial patches that we had queued in our
> mptcp-net branch, but given the likely timing of net/net-next syncs this
> week, the need to avoid introducing branch conflicts, and another batch
> of net-next patches pending in the mptcp tree, the most practical route
> is to send everything for net-next.
>
> Patches 1 & 2 fix some intermittent selftest failures by adjusting timing.
>
> [...]
Here is the summary with links:
- [net-next,01/10] selftests: mptcp: run userspace pm tests slower
https://git.kernel.org/netdev/net-next/c/f4a75e9d1100
- [net-next,02/10] selftests: mptcp: fix wait_rm_addr/sf parameters
https://git.kernel.org/netdev/net-next/c/9168ea02b898
- [net-next,03/10] mptcp: userspace pm send RM_ADDR for ID 0
https://git.kernel.org/netdev/net-next/c/84c531f54ad9
- [net-next,04/10] mptcp: drop useless ssk in pm_subflow_check_next
https://git.kernel.org/netdev/net-next/c/74cbb0c65b29
- [net-next,05/10] mptcp: use mptcp_check_fallback helper
https://git.kernel.org/netdev/net-next/c/83d580ddbe1b
- [net-next,06/10] mptcp: use mptcp_get_ext helper
https://git.kernel.org/netdev/net-next/c/a16c054b527b
- [net-next,07/10] mptcp: move sk assignment statement ahead
https://git.kernel.org/netdev/net-next/c/a6c85fc61c08
- [net-next,08/10] mptcp: define more local variables sk
https://git.kernel.org/netdev/net-next/c/14cb0e0bf39b
- [net-next,09/10] selftests: mptcp: sockopt: drop mptcp_connect var
https://git.kernel.org/netdev/net-next/c/e71aab6777a4
- [net-next,10/10] selftests: mptcp: display simult in extra_msg
https://git.kernel.org/netdev/net-next/c/629b35a225b0
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 17+ messages in thread