[PATCH net 0/3] mptcp: misc fixes for v6.17-rc6

[PATCH net 0/3] mptcp: misc fixes for v6.17-rc6

[Matthieu Baerts (NGI0)]

Here are various unrelated fixes:

- Patch 1: Fix a wrong attribute type in the MPTCP Netlink specs. A fix
  for v6.7.

- Patch 2: Avoid mentioning a deprecated MPTCP sysctl knob in the doc. A
  fix for v6.15.

- Patch 3: Handle new warnings from ShellCheck v0.11.0. This prevents
  some warnings reported by some CIs. If it is not a good material for
  'net', please drop it and I can resend it later, targeting 'net-next'.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Matthieu Baerts (NGI0) (3):
      netlink: specs: mptcp: fix if-idx attribute type
      doc: mptcp: net.mptcp.pm_type is deprecated
      selftests: mptcp: shellcheck: support v0.11.0

 Documentation/netlink/specs/mptcp_pm.yaml          | 2 +-
 Documentation/networking/mptcp.rst                 | 8 ++++----
 tools/testing/selftests/net/mptcp/diag.sh          | 2 +-
 tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 +-
 tools/testing/selftests/net/mptcp/mptcp_join.sh    | 2 +-
 tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 2 +-
 tools/testing/selftests/net/mptcp/pm_netlink.sh    | 5 +++--
 tools/testing/selftests/net/mptcp/simult_flows.sh  | 2 +-
 tools/testing/selftests/net/mptcp/userspace_pm.sh  | 2 +-
 9 files changed, 14 insertions(+), 13 deletions(-)
---
base-commit: e2a10daba84968f6b5777d150985fd7d6abc9c84
change-id: 20250908-net-mptcp-misc-fixes-6-17-rc5-7550f5f90b66

Best regards,
-- 
Matthieu Baerts (NGI0) <matttbe@kernel.org>

[PATCH net 1/3] netlink: specs: mptcp: fix if-idx attribute type

[Matthieu Baerts (NGI0)]

This attribute is used as a signed number in the code in pm_netlink.c:

  nla_put_s32(skb, MPTCP_ATTR_IF_IDX, ssk->sk_bound_dev_if))

The specs should then reflect that. Note that other 'if-idx' attributes
from the same .yaml file use a signed number as well.

Fixes: bc8aeb2045e2 ("Documentation: netlink: add a YAML spec for mptcp")
Cc: stable@vger.kernel.org
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 Documentation/netlink/specs/mptcp_pm.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/netlink/specs/mptcp_pm.yaml b/Documentation/netlink/specs/mptcp_pm.yaml
index 02f1ddcfbf1cfd81a398dd03c52bb9f281c1aa08..d15335684ec3d6256505f2b3887ce5818eb57462 100644
--- a/Documentation/netlink/specs/mptcp_pm.yaml
+++ b/Documentation/netlink/specs/mptcp_pm.yaml
@@ -256,7 +256,7 @@ attribute-sets:
         type: u32
       -
         name: if-idx
-        type: u32
+        type: s32
       -
         name: reset-reason
         type: u32

-- 
2.51.0

[PATCH net 2/3] doc: mptcp: net.mptcp.pm_type is deprecated

[Matthieu Baerts (NGI0)]

The net.mptcp.pm_type sysctl knob has been deprecated in v6.15,
net.mptcp.path_manager should be used instead.

Adapt the section about path managers to suggest using the new sysctl
knob instead of the deprecated one.

Fixes: 595c26d122d1 ("mptcp: sysctl: set path manager by name")
Cc: stable@vger.kernel.org
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 Documentation/networking/mptcp.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/networking/mptcp.rst b/Documentation/networking/mptcp.rst
index 17f2bab611644727e19c3969fa08fa974c702d92..2e31038d6462051387be9bd8808a23230db08315 100644
--- a/Documentation/networking/mptcp.rst
+++ b/Documentation/networking/mptcp.rst
@@ -60,10 +60,10 @@ address announcements. Typically, it is the client side that initiates subflows,
 and the server side that announces additional addresses via the ``ADD_ADDR`` and
 ``REMOVE_ADDR`` options.
 
-Path managers are controlled by the ``net.mptcp.pm_type`` sysctl knob -- see
-mptcp-sysctl.rst. There are two types: the in-kernel one (type ``0``) where the
-same rules are applied for all the connections (see: ``ip mptcp``) ; and the
-userspace one (type ``1``), controlled by a userspace daemon (i.e. `mptcpd
+Path managers are controlled by the ``net.mptcp.path_manager`` sysctl knob --
+see mptcp-sysctl.rst. There are two types: the in-kernel one (``kernel``) where
+the same rules are applied for all the connections (see: ``ip mptcp``) ; and the
+userspace one (``userspace``), controlled by a userspace daemon (i.e. `mptcpd
 <https://mptcpd.mptcp.dev/>`_) where different rules can be applied for each
 connection. The path managers can be controlled via a Netlink API; see
 netlink_spec/mptcp_pm.rst.

-- 
2.51.0

Re: [PATCH net 1/3] netlink: specs: mptcp: fix if-idx attribute type

[Donald Hunter]

"Matthieu Baerts (NGI0)" <matttbe@kernel.org> writes:

> This attribute is used as a signed number in the code in pm_netlink.c:
>
>   nla_put_s32(skb, MPTCP_ATTR_IF_IDX, ssk->sk_bound_dev_if))
>
> The specs should then reflect that. Note that other 'if-idx' attributes
> from the same .yaml file use a signed number as well.

Note that mptcp_pm_parse_entry has this, which should maybe be fixed at
the same time:

	u32 val = nla_get_s32(tb[MPTCP_PM_ADDR_ATTR_IF_IDX]);


https://elixir.bootlin.com/linux/v6.16.5/source/net/mptcp/pm_netlink.c#L116

>
> Fixes: bc8aeb2045e2 ("Documentation: netlink: add a YAML spec for mptcp")
> Cc: stable@vger.kernel.org
> Reviewed-by: Geliang Tang <geliang@kernel.org>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> ---
>  Documentation/netlink/specs/mptcp_pm.yaml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/netlink/specs/mptcp_pm.yaml b/Documentation/netlink/specs/mptcp_pm.yaml
> index 02f1ddcfbf1cfd81a398dd03c52bb9f281c1aa08..d15335684ec3d6256505f2b3887ce5818eb57462 100644
> --- a/Documentation/netlink/specs/mptcp_pm.yaml
> +++ b/Documentation/netlink/specs/mptcp_pm.yaml
> @@ -256,7 +256,7 @@ attribute-sets:
>          type: u32
>        -
>          name: if-idx
> -        type: u32
> +        type: s32
>        -
>          name: reset-reason
>          type: u32

Re: [PATCH net 1/3] netlink: specs: mptcp: fix if-idx attribute type

[Matthieu Baerts]

Hi Donald,

On 09/09/2025 10:44, Donald Hunter wrote:
> "Matthieu Baerts (NGI0)" <matttbe@kernel.org> writes:
> 
>> This attribute is used as a signed number in the code in pm_netlink.c:
>>
>>   nla_put_s32(skb, MPTCP_ATTR_IF_IDX, ssk->sk_bound_dev_if))
>>
>> The specs should then reflect that. Note that other 'if-idx' attributes
>> from the same .yaml file use a signed number as well.
> 
> Note that mptcp_pm_parse_entry has this, which should maybe be fixed at
> the same time:
> 
> 	u32 val = nla_get_s32(tb[MPTCP_PM_ADDR_ATTR_IF_IDX]);

Good catch!

This should be fixed in a dedicated patch, because this fixes commit:
ef0da3b8a2f1 ("mptcp: move address attribute into mptcp_addr_info"), a
different commit than the one being fixed here.

I can send that separately later on if that's OK.

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

Re: [PATCH net 2/3] doc: mptcp: net.mptcp.pm_type is deprecated

[Simon Horman]

On Mon, Sep 08, 2025 at 11:27:28PM +0200, Matthieu Baerts (NGI0) wrote:
> The net.mptcp.pm_type sysctl knob has been deprecated in v6.15,
> net.mptcp.path_manager should be used instead.
> 
> Adapt the section about path managers to suggest using the new sysctl
> knob instead of the deprecated one.
> 
> Fixes: 595c26d122d1 ("mptcp: sysctl: set path manager by name")
> Cc: stable@vger.kernel.org
> Reviewed-by: Geliang Tang <geliang@kernel.org>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Reviewed-by: Simon Horman <horms@kernel.org>

Re: [PATCH net 1/3] netlink: specs: mptcp: fix if-idx attribute type

[Jakub Kicinski]

On Tue, 9 Sep 2025 11:08:46 +0200 Matthieu Baerts wrote:
> > Note that mptcp_pm_parse_entry has this, which should maybe be fixed at
> > the same time:
> > 
> > 	u32 val = nla_get_s32(tb[MPTCP_PM_ADDR_ATTR_IF_IDX]);  
> 
> Good catch!

indeed!

> This should be fixed in a dedicated patch, because this fixes commit:
> ef0da3b8a2f1 ("mptcp: move address attribute into mptcp_addr_info"), a
> different commit than the one being fixed here.

int = u32 is unlikely to cause issues AFAIU. We recently applied 
a bunch of such fixes to net-next. I think this can also go to -next.

Re: [PATCH net 0/3] mptcp: misc fixes for v6.17-rc6

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 08 Sep 2025 23:27:26 +0200 you wrote:
> Here are various unrelated fixes:
> 
> - Patch 1: Fix a wrong attribute type in the MPTCP Netlink specs. A fix
>   for v6.7.
> 
> - Patch 2: Avoid mentioning a deprecated MPTCP sysctl knob in the doc. A
>   fix for v6.15.
> 
> [...]

Here is the summary with links:
  - [net,1/3] netlink: specs: mptcp: fix if-idx attribute type
    https://git.kernel.org/netdev/net/c/7094b84863e5
  - [net,2/3] doc: mptcp: net.mptcp.pm_type is deprecated
    https://git.kernel.org/netdev/net/c/6f021e95d082
  - [net,3/3] selftests: mptcp: shellcheck: support v0.11.0
    https://git.kernel.org/netdev/net/c/ef1bd93b3b92

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH net 1/3] netlink: specs: mptcp: fix if-idx attribute type

[Matthieu Baerts]

Hi Jakub,

On 10/09/2025 03:42, Jakub Kicinski wrote:
> On Tue, 9 Sep 2025 11:08:46 +0200 Matthieu Baerts wrote:
>>> Note that mptcp_pm_parse_entry has this, which should maybe be fixed at
>>> the same time:
>>>
>>> 	u32 val = nla_get_s32(tb[MPTCP_PM_ADDR_ATTR_IF_IDX]);  
>>
>> Good catch!
> 
> indeed!
> 
>> This should be fixed in a dedicated patch, because this fixes commit:
>> ef0da3b8a2f1 ("mptcp: move address attribute into mptcp_addr_info"), a
>> different commit than the one being fixed here.
> 
> int = u32 is unlikely to cause issues AFAIU. We recently applied 
> a bunch of such fixes to net-next. I think this can also go to -next.

Good point, in our tree, I will queue this patch for -next:


https://lore.kernel.org/20250909-mptcp-pm-user-c-flag-v2-1-a6f9542481c5@kernel.org

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.