Skip to contentSkip to conversation

FAILED: patch "[PATCH] net: qrtr: ns: Raise node count limit to 512" failed to apply to 6.1-stable tree

PATCH In review [email protected] 3 participants 4 messages Jul 29 – Jul 30

Subsystems (3)
Networking Stable branch Qualcomm IPC router (QRTR) driver
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x ff194cffd586cbd4cc49eccb002c65f2a902a277
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072918-throwing-steep-c08d@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..'

Possible dependencies:

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From ff194cffd586cbd4cc49eccb002c65f2a902a277 Mon Sep 17 00:00:00 2001
From: Youssef Samir <[email protected]>
Date: Mon, 13 Jul 2026 16:59:01 +0200
Subject: [PATCH] net: qrtr: ns: Raise node count limit to 512

The current node limit of 64 breaks the functionality for a number of AI200 deployments that have up to 384 nodes. Raise the limit to 512.

Fixes 27d5e84e810b ("net: qrtr: ns: Limit the total number of nodes")
Cc [email protected]
Signed-off-by Youssef Samir <[email protected]>
Link https://patch.msgid.link/[email protected] open here
Signed-off-by Jakub Kicinski <[email protected]>
net/qrtr/ns.c +2 -2
index b3f9bbcf9ab9..e5b2adb161d9 100644
@@ -76,11 +76,11 @@ struct qrtr_node {
  * requirements. If the requirement changes in the future, these values can be
  * increased.
  */
-#define QRTR_NS_MAX_NODES   64
+#define QRTR_NS_MAX_NODES   512
 #define QRTR_NS_MAX_SERVERS 256
 #define QRTR_NS_MAX_LOOKUPS 64
 
-static u8 node_count;
+static u16 node_count;
 
 static struct qrtr_node *node_get(unsigned int node_id)
 {
#1 lore raw

PATCH 1/1 net: qrtr: ns: Raise node count limit to 512

The current node limit of 64 breaks the functionality for a number of AI200 deployments that have up to 384 nodes. Raise the limit to 512.

Fixes 27d5e84e810b ("net: qrtr: ns: Limit the total number of nodes")
Cc [email protected]
Signed-off-by Youssef Samir <[email protected]>
Link https://patch.msgid.link/[email protected] open here
Signed-off-by Jakub Kicinski <[email protected]>
(cherry picked from commit ff194cffd586cbd4cc49eccb002c65f2a902a277)
Signed-off-by Youssef Samir <[email protected]>
---
 net/qrtr/ns.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
net/qrtr/ns.c +2 -7
index 559aad0e3621..8aabef85e34c 100644
@@ -70,20 +70,15 @@ struct qrtr_node {
 	struct xarray servers;
 };
 
-/* Max lookup limit is chosen based on the current platform requirements. If the
- * requirement changes in the future, this value can be increased.
- */
-#define QRTR_NS_MAX_LOOKUPS 64
-
 /* Max nodes, server, lookup limits are chosen based on the current platform
  * requirements. If the requirement changes in the future, these values can be
  * increased.
  */
-#define QRTR_NS_MAX_NODES   64
+#define QRTR_NS_MAX_NODES   512
 #define QRTR_NS_MAX_SERVERS 256
 #define QRTR_NS_MAX_LOOKUPS 64
 
-static u8 node_count;
+static u16 node_count;
 
 static struct qrtr_node *node_get(unsigned int node_id)
 {
Signature · 1 line
2.43.0
maintainer
#2 lore raw

Re: [PATCH 6.1.y] net: qrtr: ns: Raise node count limit to 512

net/qrtr/ns.c struct qrtr_node { · line 77

Quoted 5 lines
net/qrtr/ns.c +0 -5
-/* Max lookup limit is chosen based on the current platform requirements. If the
- * requirement changes in the future, this value can be increased.
- */
-#define QRTR_NS_MAX_LOOKUPS 64
-

I've queued 6.18, 6.12 and 6.6, but I'm holding 6.1, 5.15 and 5.10 and would like one v2 covering those three.

Two things:

1) The hunk above is in the 6.1 and 5.10 patches only. It removes a duplicated #define that our own backports of 27d5e84e810b ("net: qrtr:
ns: Limit the total number of nodes") introduced, which upstream ff194cffd586 ("net: qrtr: ns: Raise node count limit to 512") does not touch. The 5.15 patch does not have it, even though 6.1 and 5.15 currently have a byte-identical net/qrtr/ns.c. Taking them as-is would leave the three old trees gratuitously different from each other.

2) More importantly, none of 6.1, 5.15 and 5.10 ever decrement node_count. The backports of 27d5e84e810b dropped the node_count-- hunk with the note that ctrl_cmd_bye() has no delete_node, but all three trees do have the delete_node: label with the xa_erase() + kfree(). So the counter is monotonic there and raising the cap from 64 to 512 only defers the wedge rather than fixing it.

Could you send a single v2 for 6.1, 5.15 and 5.10 that matches upstream exactly and adds the missing node_count-- in ctrl_cmd_bye()?

Signature · 2 lines
Thanks,
Sasha
#3 lore raw

Re: [PATCH 6.1.y] net: qrtr: ns: Raise node count limit to 512

Hi Sasha,

Quoted 2 lines

Could you send a single v2 for 6.1, 5.15 and 5.10 that matches upstream exactly and adds the missing node_count-- in ctrl_cmd_bye()?

Will do. Thanks :)

- Youssef