--- /dev/null
+From stable+bounces-179486-greg=kroah.com@vger.kernel.org Sat Sep 13 16:10:33 2025
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 13 Sep 2025 10:10:23 -0400
+Subject: netlink: specs: mptcp: add missing 'server-side' attr
+To: stable@vger.kernel.org
+Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, Geliang Tang <geliang@kernel.org>, Jakub Kicinski <kuba@kernel.org>, Sasha Levin <sashal@kernel.org>
+Message-ID: <20250913141026.1362030-1-sashal@kernel.org>
+
+From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
+
+[ Upstream commit 6b830c6a023ff6e8fe05dbe47a9e5cd276df09ee ]
+
+This attribute is added with the 'created' and 'established' events, but
+the documentation didn't mention it.
+
+The documentation in the UAPI header has been auto-generated by:
+
+ ./tools/net/ynl/ynl-regen.sh
+
+Reviewed-by: Geliang Tang <geliang@kernel.org>
+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Link: https://patch.msgid.link/20241221-net-mptcp-netlink-specs-pm-doc-fixes-v2-1-e54f2db3f844@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Stable-dep-of: 7094b84863e5 ("netlink: specs: mptcp: fix if-idx attribute type")
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/netlink/specs/mptcp_pm.yaml | 6 ++++--
+ include/uapi/linux/mptcp_pm.h | 11 ++++++-----
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+--- a/Documentation/netlink/specs/mptcp_pm.yaml
++++ b/Documentation/netlink/specs/mptcp_pm.yaml
+@@ -23,7 +23,8 @@ definitions:
+ -
+ name: created
+ doc:
+- token, family, saddr4 | saddr6, daddr4 | daddr6, sport, dport
++ token, family, saddr4 | saddr6, daddr4 | daddr6, sport, dport,
++ server-side
+ A new MPTCP connection has been created. It is the good time to
+ allocate memory and send ADD_ADDR if needed. Depending on the
+ traffic-patterns it can take a long time until the
+@@ -31,7 +32,8 @@ definitions:
+ -
+ name: established
+ doc:
+- token, family, saddr4 | saddr6, daddr4 | daddr6, sport, dport
++ token, family, saddr4 | saddr6, daddr4 | daddr6, sport, dport,
++ server-side
+ A MPTCP connection is established (can start new subflows).
+ -
+ name: closed
+--- a/include/uapi/linux/mptcp_pm.h
++++ b/include/uapi/linux/mptcp_pm.h
+@@ -13,12 +13,13 @@
+ * enum mptcp_event_type
+ * @MPTCP_EVENT_UNSPEC: unused event
+ * @MPTCP_EVENT_CREATED: token, family, saddr4 | saddr6, daddr4 | daddr6,
+- * sport, dport A new MPTCP connection has been created. It is the good time
+- * to allocate memory and send ADD_ADDR if needed. Depending on the
+- * traffic-patterns it can take a long time until the MPTCP_EVENT_ESTABLISHED
+- * is sent.
++ * sport, dport, server-side A new MPTCP connection has been created. It is
++ * the good time to allocate memory and send ADD_ADDR if needed. Depending on
++ * the traffic-patterns it can take a long time until the
++ * MPTCP_EVENT_ESTABLISHED is sent.
+ * @MPTCP_EVENT_ESTABLISHED: token, family, saddr4 | saddr6, daddr4 | daddr6,
+- * sport, dport A MPTCP connection is established (can start new subflows).
++ * sport, dport, server-side A MPTCP connection is established (can start new
++ * subflows).
+ * @MPTCP_EVENT_CLOSED: token A MPTCP connection has stopped.
+ * @MPTCP_EVENT_ANNOUNCED: token, rem_id, family, daddr4 | daddr6 [, dport] A
+ * new address has been announced by the peer.
--- /dev/null
+From stable+bounces-179487-greg=kroah.com@vger.kernel.org Sat Sep 13 16:10:35 2025
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 13 Sep 2025 10:10:24 -0400
+Subject: netlink: specs: mptcp: clearly mention attributes
+To: stable@vger.kernel.org
+Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, Geliang Tang <geliang@kernel.org>, Jakub Kicinski <kuba@kernel.org>, Sasha Levin <sashal@kernel.org>
+Message-ID: <20250913141026.1362030-2-sashal@kernel.org>
+
+From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
+
+[ Upstream commit bea87657b5ee8e6f18af2833ee4b88212ef52d28 ]
+
+The rendered version of the MPTCP events [1] looked strange, because the
+whole content of the 'doc' was displayed in the same block.
+
+It was then not clear that the first words, not even ended by a period,
+were the attributes that are defined when such events are emitted. These
+attributes have now been moved to the end, prefixed by 'Attributes:' and
+ended with a period. Note that '>-' has been added after 'doc:' to allow
+':' in the text below.
+
+The documentation in the UAPI header has been auto-generated by:
+
+ ./tools/net/ynl/ynl-regen.sh
+
+Link: https://docs.kernel.org/networking/netlink_spec/mptcp_pm.html#event-type [1]
+Reviewed-by: Geliang Tang <geliang@kernel.org>
+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Link: https://patch.msgid.link/20241221-net-mptcp-netlink-specs-pm-doc-fixes-v2-2-e54f2db3f844@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Stable-dep-of: 7094b84863e5 ("netlink: specs: mptcp: fix if-idx attribute type")
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/netlink/specs/mptcp_pm.yaml | 50 ++++++++++++++--------------
+ include/uapi/linux/mptcp_pm.h | 53 +++++++++++++++---------------
+ 2 files changed, 52 insertions(+), 51 deletions(-)
+
+--- a/Documentation/netlink/specs/mptcp_pm.yaml
++++ b/Documentation/netlink/specs/mptcp_pm.yaml
+@@ -22,67 +22,67 @@ definitions:
+ doc: unused event
+ -
+ name: created
+- doc:
+- token, family, saddr4 | saddr6, daddr4 | daddr6, sport, dport,
+- server-side
++ doc: >-
+ A new MPTCP connection has been created. It is the good time to
+ allocate memory and send ADD_ADDR if needed. Depending on the
+ traffic-patterns it can take a long time until the
+ MPTCP_EVENT_ESTABLISHED is sent.
++ Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,
++ dport, server-side.
+ -
+ name: established
+- doc:
+- token, family, saddr4 | saddr6, daddr4 | daddr6, sport, dport,
+- server-side
++ doc: >-
+ A MPTCP connection is established (can start new subflows).
++ Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,
++ dport, server-side.
+ -
+ name: closed
+- doc:
+- token
++ doc: >-
+ A MPTCP connection has stopped.
++ Attribute: token.
+ -
+ name: announced
+ value: 6
+- doc:
+- token, rem_id, family, daddr4 | daddr6 [, dport]
++ doc: >-
+ A new address has been announced by the peer.
++ Attributes: token, rem_id, family, daddr4 | daddr6 [, dport].
+ -
+ name: removed
+- doc:
+- token, rem_id
++ doc: >-
+ An address has been lost by the peer.
++ Attributes: token, rem_id.
+ -
+ name: sub-established
+ value: 10
+- doc:
+- token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | daddr6, sport,
+- dport, backup, if_idx [, error]
++ doc: >-
+ A new subflow has been established. 'error' should not be set.
++ Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
++ daddr6, sport, dport, backup, if_idx [, error].
+ -
+ name: sub-closed
+- doc:
+- token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | daddr6, sport,
+- dport, backup, if_idx [, error]
++ doc: >-
+ A subflow has been closed. An error (copy of sk_err) could be set if an
+ error has been detected for this subflow.
++ Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
++ daddr6, sport, dport, backup, if_idx [, error].
+ -
+ name: sub-priority
+ value: 13
+- doc:
+- token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | daddr6, sport,
+- dport, backup, if_idx [, error]
++ doc: >-
+ The priority of a subflow has changed. 'error' should not be set.
++ Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
++ daddr6, sport, dport, backup, if_idx [, error].
+ -
+ name: listener-created
+ value: 15
+- doc:
+- family, sport, saddr4 | saddr6
++ doc: >-
+ A new PM listener is created.
++ Attributes: family, sport, saddr4 | saddr6.
+ -
+ name: listener-closed
+- doc:
+- family, sport, saddr4 | saddr6
++ doc: >-
+ A PM listener is closed.
++ Attributes: family, sport, saddr4 | saddr6.
+
+ attribute-sets:
+ -
+--- a/include/uapi/linux/mptcp_pm.h
++++ b/include/uapi/linux/mptcp_pm.h
+@@ -12,32 +12,33 @@
+ /**
+ * enum mptcp_event_type
+ * @MPTCP_EVENT_UNSPEC: unused event
+- * @MPTCP_EVENT_CREATED: token, family, saddr4 | saddr6, daddr4 | daddr6,
+- * sport, dport, server-side A new MPTCP connection has been created. It is
+- * the good time to allocate memory and send ADD_ADDR if needed. Depending on
+- * the traffic-patterns it can take a long time until the
+- * MPTCP_EVENT_ESTABLISHED is sent.
+- * @MPTCP_EVENT_ESTABLISHED: token, family, saddr4 | saddr6, daddr4 | daddr6,
+- * sport, dport, server-side A MPTCP connection is established (can start new
+- * subflows).
+- * @MPTCP_EVENT_CLOSED: token A MPTCP connection has stopped.
+- * @MPTCP_EVENT_ANNOUNCED: token, rem_id, family, daddr4 | daddr6 [, dport] A
+- * new address has been announced by the peer.
+- * @MPTCP_EVENT_REMOVED: token, rem_id An address has been lost by the peer.
+- * @MPTCP_EVENT_SUB_ESTABLISHED: token, family, loc_id, rem_id, saddr4 |
+- * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error] A new
+- * subflow has been established. 'error' should not be set.
+- * @MPTCP_EVENT_SUB_CLOSED: token, family, loc_id, rem_id, saddr4 | saddr6,
+- * daddr4 | daddr6, sport, dport, backup, if_idx [, error] A subflow has been
+- * closed. An error (copy of sk_err) could be set if an error has been
+- * detected for this subflow.
+- * @MPTCP_EVENT_SUB_PRIORITY: token, family, loc_id, rem_id, saddr4 | saddr6,
+- * daddr4 | daddr6, sport, dport, backup, if_idx [, error] The priority of a
+- * subflow has changed. 'error' should not be set.
+- * @MPTCP_EVENT_LISTENER_CREATED: family, sport, saddr4 | saddr6 A new PM
+- * listener is created.
+- * @MPTCP_EVENT_LISTENER_CLOSED: family, sport, saddr4 | saddr6 A PM listener
+- * is closed.
++ * @MPTCP_EVENT_CREATED: A new MPTCP connection has been created. It is the
++ * good time to allocate memory and send ADD_ADDR if needed. Depending on the
++ * traffic-patterns it can take a long time until the MPTCP_EVENT_ESTABLISHED
++ * is sent. Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6,
++ * sport, dport, server-side.
++ * @MPTCP_EVENT_ESTABLISHED: A MPTCP connection is established (can start new
++ * subflows). Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6,
++ * sport, dport, server-side.
++ * @MPTCP_EVENT_CLOSED: A MPTCP connection has stopped. Attribute: token.
++ * @MPTCP_EVENT_ANNOUNCED: A new address has been announced by the peer.
++ * Attributes: token, rem_id, family, daddr4 | daddr6 [, dport].
++ * @MPTCP_EVENT_REMOVED: An address has been lost by the peer. Attributes:
++ * token, rem_id.
++ * @MPTCP_EVENT_SUB_ESTABLISHED: A new subflow has been established. 'error'
++ * should not be set. Attributes: token, family, loc_id, rem_id, saddr4 |
++ * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error].
++ * @MPTCP_EVENT_SUB_CLOSED: A subflow has been closed. An error (copy of
++ * sk_err) could be set if an error has been detected for this subflow.
++ * Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
++ * daddr6, sport, dport, backup, if_idx [, error].
++ * @MPTCP_EVENT_SUB_PRIORITY: The priority of a subflow has changed. 'error'
++ * should not be set. Attributes: token, family, loc_id, rem_id, saddr4 |
++ * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error].
++ * @MPTCP_EVENT_LISTENER_CREATED: A new PM listener is created. Attributes:
++ * family, sport, saddr4 | saddr6.
++ * @MPTCP_EVENT_LISTENER_CLOSED: A PM listener is closed. Attributes: family,
++ * sport, saddr4 | saddr6.
+ */
+ enum mptcp_event_type {
+ MPTCP_EVENT_UNSPEC,
--- /dev/null
+From stable+bounces-179489-greg=kroah.com@vger.kernel.org Sat Sep 13 16:10:38 2025
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 13 Sep 2025 10:10:26 -0400
+Subject: netlink: specs: mptcp: fix if-idx attribute type
+To: stable@vger.kernel.org
+Cc: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, Geliang Tang <geliang@kernel.org>, Jakub Kicinski <kuba@kernel.org>, Sasha Levin <sashal@kernel.org>
+Message-ID: <20250913141026.1362030-4-sashal@kernel.org>
+
+From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
+
+[ Upstream commit 7094b84863e5832cb1cd9c4b9d648904775b6bd9 ]
+
+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>
+Link: https://patch.msgid.link/20250908-net-mptcp-misc-fixes-6-17-rc5-v1-1-5f2168a66079@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/netlink/specs/mptcp_pm.yaml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- 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
--- /dev/null
+From stable+bounces-179488-greg=kroah.com@vger.kernel.org Sat Sep 13 16:10:37 2025
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 13 Sep 2025 10:10:25 -0400
+Subject: netlink: specs: mptcp: replace underscores with dashes in names
+To: stable@vger.kernel.org
+Cc: Jakub Kicinski <kuba@kernel.org>, Davide Caratti <dcaratti@redhat.com>, Donald Hunter <donald.hunter@gmail.com>, "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, Sasha Levin <sashal@kernel.org>
+Message-ID: <20250913141026.1362030-3-sashal@kernel.org>
+
+From: Jakub Kicinski <kuba@kernel.org>
+
+[ Upstream commit 9e6dd4c256d0774701637b958ba682eff4991277 ]
+
+We're trying to add a strict regexp for the name format in the spec.
+Underscores will not be allowed, dashes should be used instead.
+This makes no difference to C (codegen, if used, replaces special
+chars in names) but it gives more uniform naming in Python.
+
+Fixes: bc8aeb2045e2 ("Documentation: netlink: add a YAML spec for mptcp")
+Reviewed-by: Davide Caratti <dcaratti@redhat.com>
+Reviewed-by: Donald Hunter <donald.hunter@gmail.com>
+Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Link: https://patch.msgid.link/20250624211002.3475021-8-kuba@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Stable-dep-of: 7094b84863e5 ("netlink: specs: mptcp: fix if-idx attribute type")
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/netlink/specs/mptcp_pm.yaml | 8 ++++----
+ include/uapi/linux/mptcp_pm.h | 6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+--- a/Documentation/netlink/specs/mptcp_pm.yaml
++++ b/Documentation/netlink/specs/mptcp_pm.yaml
+@@ -57,21 +57,21 @@ definitions:
+ doc: >-
+ A new subflow has been established. 'error' should not be set.
+ Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
+- daddr6, sport, dport, backup, if_idx [, error].
++ daddr6, sport, dport, backup, if-idx [, error].
+ -
+ name: sub-closed
+ doc: >-
+ A subflow has been closed. An error (copy of sk_err) could be set if an
+ error has been detected for this subflow.
+ Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
+- daddr6, sport, dport, backup, if_idx [, error].
++ daddr6, sport, dport, backup, if-idx [, error].
+ -
+ name: sub-priority
+ value: 13
+ doc: >-
+ The priority of a subflow has changed. 'error' should not be set.
+ Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
+- daddr6, sport, dport, backup, if_idx [, error].
++ daddr6, sport, dport, backup, if-idx [, error].
+ -
+ name: listener-created
+ value: 15
+@@ -255,7 +255,7 @@ attribute-sets:
+ name: timeout
+ type: u32
+ -
+- name: if_idx
++ name: if-idx
+ type: u32
+ -
+ name: reset-reason
+--- a/include/uapi/linux/mptcp_pm.h
++++ b/include/uapi/linux/mptcp_pm.h
+@@ -27,14 +27,14 @@
+ * token, rem_id.
+ * @MPTCP_EVENT_SUB_ESTABLISHED: A new subflow has been established. 'error'
+ * should not be set. Attributes: token, family, loc_id, rem_id, saddr4 |
+- * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error].
++ * saddr6, daddr4 | daddr6, sport, dport, backup, if-idx [, error].
+ * @MPTCP_EVENT_SUB_CLOSED: A subflow has been closed. An error (copy of
+ * sk_err) could be set if an error has been detected for this subflow.
+ * Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
+- * daddr6, sport, dport, backup, if_idx [, error].
++ * daddr6, sport, dport, backup, if-idx [, error].
+ * @MPTCP_EVENT_SUB_PRIORITY: The priority of a subflow has changed. 'error'
+ * should not be set. Attributes: token, family, loc_id, rem_id, saddr4 |
+- * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error].
++ * saddr6, daddr4 | daddr6, sport, dport, backup, if-idx [, error].
+ * @MPTCP_EVENT_LISTENER_CREATED: A new PM listener is created. Attributes:
+ * family, sport, saddr4 | saddr6.
+ * @MPTCP_EVENT_LISTENER_CLOSED: A PM listener is closed. Attributes: family,
drm-xe-attempt-to-bring-bos-back-to-vram-after-eviction.patch
drm-amdgpu-vcn-allow-limiting-ctx-to-instance-0-for-av1-at-any-time.patch
drm-amdgpu-vcn4-fix-ib-parsing-with-multiple-engine-info-packages.patch
+netlink-specs-mptcp-add-missing-server-side-attr.patch
+netlink-specs-mptcp-clearly-mention-attributes.patch
+netlink-specs-mptcp-replace-underscores-with-dashes-in-names.patch
+netlink-specs-mptcp-fix-if-idx-attribute-type.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
