From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=pass header.oldest-pass=0 smtp.remote-ip=100.103.45.18 ARC-Seal: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=pass; t=1793810772; b=SrjUxMdbb2u1IF6ufCB7JYBxCtyWnfrPjL6kbqiNskiCC0poahaIs+fdQ55T6JvspB2u j7smluVFpBebPN82k4KxMqe+IneuZLMeYSIwdDG5i/Szk6Kar2ZaHFMDH6W75SRsgzqsS ldWloi7ul1LttN+s4BChbdKAj5QIqK5Ni58re9Vl/8QdazPSkuK8MGBQv5McJ7VQsv7vI U2EhV+qRZVDbKLl6WGdeknp/LR6A2ROdlzBe4TjItq13jKmVQbZRiRZFlDR4NL6g1kf6M otCzk94EWKiT8Enh3GlSCmEchae7srNhrd+zuWb+Sj1p01PsxneVVCi7p6eFTT7naEw== ARC-Message-Signature: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793810772; h=Received:DKIM-Signature:Received:From:Date:Subject:MIME-Version: Content-Type:Message-Id:References:In-Reply-To:To:Cc:X-Mailer: X-Developer-Signature:X-Developer-Key:X-Endpoint-Received: X-Original-From:Reply-To:Content-Transfer-Encoding; bh=qpGfeXkUPyVgiJPHOasmVtEAkaBGujxSnkBJd7ovLic=; b=ZYB+UobFV3a7jCj5MTvr0bq5bljSpOK9auDz7nhUVNBVYdd/21LJirJpW0Eqo1o7QN76 yXwndVLNkhg6Qx82BKSfd8sC3hJn1YBgGIQ2pPNUhROvZfmSQULVQSkIODu2ZmFkcMA8Y CJgvVH26xzBW2ozs6hv9qTHxGsutlSPjo0sPaywv3vcEa3f5p9U0FJ4sUJpOEQZjxsU53 QVMeig3p/x8KAd3b3cf/8ky3Fji1z106udNNOMibbknr5OGIWz38F3vY9rnRYgS1AM9i+ FE4KA0176R+cl3qjcgETKsLbTZaNh5KdPMiny27nx9vPOzKR/4/DUDJmLW8crWnAX2Q== ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=nok36Eik; arc=pass header.oldest-pass=0 smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7BB0606A33D; Wed, 4 Nov 2026 16:46:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=nok36Eik Authentication-Results: smtp.kernel.org; arc=none smtp.remote-ip=100.80.115.77 ARC-Seal: i=1; d=kernel.org; s=arc20260519; a=rsa-sha256; cv=none; t=1793810771; b=EeFSyjZpMEVh/SRBDAObzKGpL/skScq2mglWzLnEOkFRFtmu36oLVi+Ax7519zN+H2LL NPx8HIK+lfv9455boD8Rw4aN/YRTtno9KP/9jVP3D1UgX/Mb/d1TfARVmfXktZoYxi/8C saqV/eTTv7HUJg8TCqDrz1tNfbc2pSuhdDsUlKUFMYjEwpCTvowj2uGoPDsFTR6O8Jc93 NXBASKwycIc+yhqqqQZ5dgqEF0athHria6IHoOKb3HqlcgbVfU49AO/ZgLKQMJQgetcqQ JhQoP99+e5lyLVR3kTcBm/02wI3IMYrWUxOXoRBLqIo9H951B1IXquOFSwmCnKId9hQ== ARC-Message-Signature: i=1; d=kernel.org; s=arc20260519; a=rsa-sha256; c=relaxed/relaxed; t=1793810771; h=DKIM-Signature:Received:From:Date:Subject:MIME-Version:Content-Type: Message-Id:References:In-Reply-To:To:Cc:X-Mailer: X-Developer-Signature:X-Developer-Key:X-Endpoint-Received: X-Original-From:Reply-To:Content-Transfer-Encoding; bh=qpGfeXkUPyVgiJPHOasmVtEAkaBGujxSnkBJd7ovLic=; b=B6rg3XFz1O5yoRznU5uj6FVcgsIuEaE0ht7RwETgdXG4bzCP0iduNdgFM9W0wKGjeNN0 MUzmWxGCLwnnJ93hC7FAseDYallLIKnC4gj02gTRxhFNKQTcu+F34REvIIEXnq89u155Y E1o84QjnqZ8AFGWeF1iRf3L5NZ8Wvi+UHlkWWHG4CZ2QB33AQD7dq2LB2VgX3DDHZug4n bgjQc1ZOx7AP0fwGpwbvnvSQz8lxFdpomHxt2qLa3YcPSDZ52wsFM/02O2Xqv40nlAg7t OUv68VaNcPGcTn6oNg04gtc48R+QDvUY11IcYwaOE7vD8IGQKeHAIUbA8O99ky7JgRw== ARC-Authentication-Results: i=1; smtp.kernel.org; arc=none smtp.remote-ip=100.80.115.77 Received: from lkml.kernel.org (nexus.subspace.kernel.org [100.80.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id E92F61F00A1B; Wed, 4 Nov 2026 16:46:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793810771; bh=qpGfeXkUPyVgiJPHOasmVtEAkaBGujxSnkBJd7ovLic=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To; b=nok36EikDIy3YLKhPY22SniFKlj0EIl6pNTQDQo9UmCbn+DHkYKAzshpLY2M+a6jG 5A1rVew4nsPcURhe/nSsY8Sjv2zzl/O73ALByu6Te7I8vlIv1UhVsC+ysw8Tyc7SXI sEFx2+CqE1lm7V/j9AfRNd9iJjTK7znzOwwxcKMNr+3YkKJU0ebiRyAGJfPKbdf1/G q5mPhM2s9e8A9xLbiZT+1CD1glcGqa5vcTaT72fYuRwncm2Y/a/3jXIAUmtJxKtbRs vFICZPHgoC+hZQuZXU2qqlJlpiXloBt0he6MbjswdmM5ibDu7QagsgJ0BqT1LeqbbK k5y45P5oRSUFA== Received: from nexus.subspace.kernel.org (localhost [IPv6:::1]) by lkml.kernel.org (Postfix) with ESMTP id 5A6D046EC1; Wed, 4 Nov 2026 16:46:09 +0000 (UTC) From: Manivannan Sadhasivam via B4 Relay Date: Wed, 04 Nov 2026 08:46:01 -0800 Subject: [PATCH net-next v5 1/4] net: qrtr: Allow the host QRTR to assign a unique node id X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Message-Id: <20261104-qrtr-multi-ep-v5-1-4cdb2b4f1920@oss.qualcomm.com> References: <20261104-qrtr-multi-ep-v5-0-4cdb2b4f1920@oss.qualcomm.com> In-Reply-To: <20261104-qrtr-multi-ep-v5-0-4cdb2b4f1920@oss.qualcomm.com> To: Manivannan Sadhasivam , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Simon Horman , Jeff Johnson , Eric Dumazet , Eric Dumazet Cc: linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, ath12k@lists.infradead.org, Bjorn Andersson , Chris Lew , Deepak Kumar Singh , Raj Kumar Bhagat , Juha-Matti Tilli , Jeff Hugo , Manivannan Sadhasivam X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=9537; i=manivannan.sadhasivam@oss.qualcomm.com; h=from:subject:message-id; bh=UbLsQcHXs5fB3lH4xRZFyPFqjEdySNlLHyo1kxA0IsQ=; b=owEBbQGS/pANAwAKAVWfEeb+kc71AcsmYgBq62FPb2CTzV5djZzMzq2CrjWpVjODCmRIYZK69 qPehugQ0ZeJATMEAAEKAB0WIQRnpUMqgUjL2KRYJ5dVnxHm/pHO9QUCauthTwAKCRBVnxHm/pHO 9RkZB/0XgslZ9sf/3G7tRgu/aI7K/0e5efLwcIlxWdATZZ1SVbs3aWhmsuLPnHA3DX/k4ZRWR83 tt2JalNIxisTDtUrHznnb1ZzA/2WCWl+24S8mXnjeTteUV2YaA/XNTLPaB3zRs5lqW45WRMmDYX 5b4M/HhB0QTZfQZy6dVqKE+Jd9IiY+MigdH5D/Vt4TiKunn1eeV8xnAk51KDBmz2rjG7QJ3p4/F mZ1uWK+Z3dGp7NktoEars2WOaLFv55cxrXXmCJ7LEETlei+rGZTSnEp5lW7MIAnYGRFlNsBY6eL GZxfnu8yEtskaNRBGC2Mc4cy/vjWveKpQM0P7yRZ2KsaRVUr X-Developer-Key: i=manivannan.sadhasivam@oss.qualcomm.com; a=openpgp; fpr=C668AEC3C3188E4C611465E7488550E901166008 X-Endpoint-Received: by B4 Relay for manivannan.sadhasivam@oss.qualcomm.com/default with auth_id=461 X-Original-From: Manivannan Sadhasivam Reply-To: manivannan.sadhasivam@oss.qualcomm.com Content-Transfer-Encoding: 7bit From: Manivannan Sadhasivam Currently, QRTR identifies each remote node by the value of the 'src_node_id' field in the received packet and uses the node id as the key to store the node to the internal 'qrtr_nodes' radix tree. But this approach comes with a limitation. When more than one remote node share the same id, then QRTR can only add the first node to the radix tree and has to drop the successive nodes with the same node id as the 'key' in radix tree has to be unique. This prevents connecting identical Qcom PCIe WLAN devices to a single host at the same time. To fix this limitation, allow the host QRTR to use the node id (nid) received from the endpoint driver during qrtr_endpoint_register() as the unique node id and use it as the 'key' for the internal radix tree. Also, store the received 'src_id' in a new 'qrtr_node->ep_nid' field and replace the 'ep_nid' with the unique 'nid' in the QRTR control packets if both differ i.e., an endpoint driver has passed a unique 'nid' during qrtr_endpoint_register(). To maintain symmetry, replace the 'nid' with the 'ep_nid' while sending the packet back to the remote node if both differ. A node can also bridge other distant nodes, so the source id of an incoming packet is not always the id the endpoint advertises for itself. Keep adding such ids to the radix tree as additional keys for the same node, as it was done before this change. Otherwise the bridged nodes would lose their route and qrtr_sendmsg() would start failing with -ECONNRESET for them. Currently, all QRTR endpoint drivers pass 'QRTR_EP_NID_AUTO' as the 'nid' during qrtr_endpoint_register(). So 'ep_nid' and 'nid' are same and the routing behavior is not changed. Finally, since qrtr_node_rewrite_ctrl() dereferences the control packet for DEL_SERVER and DEL_CLIENT as well, extend the existing length check in qrtr_endpoint_post() to cover both types. Reviewed-by: Simon Horman Signed-off-by: Manivannan Sadhasivam --- net/qrtr/af_qrtr.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 116 insertions(+), 16 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index e7b3647424b8..b95ffb98ec23 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -118,7 +118,8 @@ static DEFINE_XARRAY_ALLOC(qrtr_ports); * @ep_lock: lock for endpoint management and callbacks * @ep: endpoint * @ref: reference count for node - * @nid: node id + * @nid: node id assigned by the host QRTR + * @ep_nid: endpoint's own node id as received * @qrtr_tx_flow: xarray of qrtr_tx_flow, keyed by node << 32 | port * @qrtr_tx_lock: lock for qrtr_tx_flow inserts * @hello_sent: hello packet send successful @@ -131,6 +132,7 @@ struct qrtr_node { struct qrtr_endpoint *ep; struct kref ref; unsigned int nid; + unsigned int ep_nid; struct xarray qrtr_tx_flow; struct mutex qrtr_tx_lock; /* for qrtr_tx_flow */ @@ -347,6 +349,7 @@ static int qrtr_node_enqueue(struct qrtr_node *node, struct sk_buff *skb, { struct qrtr_hdr_v1 *hdr; size_t len = skb->len; + unsigned int dst_node; int rc, confirm_rx; mutex_lock(&node->ep_lock); @@ -369,10 +372,14 @@ static int qrtr_node_enqueue(struct qrtr_node *node, struct sk_buff *skb, hdr->src_node_id = cpu_to_le32(from->sq_node); hdr->src_port_id = cpu_to_le32(from->sq_port); if (to->sq_port == QRTR_PORT_CTRL) { - hdr->dst_node_id = cpu_to_le32(READ_ONCE(node->nid)); + hdr->dst_node_id = cpu_to_le32(READ_ONCE(node->ep_nid)); hdr->dst_port_id = cpu_to_le32(QRTR_PORT_CTRL); } else { - hdr->dst_node_id = cpu_to_le32(to->sq_node); + /* Put back the endpoint's own node id */ + dst_node = to->sq_node; + if (dst_node == READ_ONCE(node->nid)) + dst_node = READ_ONCE(node->ep_nid); + hdr->dst_node_id = cpu_to_le32(dst_node); hdr->dst_port_id = cpu_to_le32(to->sq_port); } @@ -422,23 +429,72 @@ static struct qrtr_node *qrtr_node_lookup(unsigned int nid) return node; } -/* Assign node id to node. +/* Add 'nid' as a lookup key for 'node', and adopt it as the node's own id if + * the node does not have one yet. + * + * Callers must hold 'qrtr_nodes_lock'. * - * This is mostly useful for automatic node id assignment, based on - * the source id in the incoming packet. + * Return: 0 on success; negative error code on failure */ -static void qrtr_node_assign(struct qrtr_node *node, unsigned int nid) +static int __qrtr_node_assign(struct qrtr_node *node, unsigned int nid) { - unsigned long flags; + int rc; if (nid == QRTR_EP_NID_AUTO) - return; + return 0; + + if (radix_tree_lookup(&qrtr_nodes, nid) == node) + return 0; + + rc = radix_tree_insert(&qrtr_nodes, nid, node); + if (rc) + return rc; - spin_lock_irqsave(&qrtr_nodes_lock, flags); - radix_tree_insert(&qrtr_nodes, nid, node); if (node->nid == QRTR_EP_NID_AUTO) WRITE_ONCE(node->nid, nid); + + return 0; +} + +/* Assign node id to node. + * + * Return: 0 on success; negative error code on failure + */ +static int qrtr_node_assign(struct qrtr_node *node, unsigned int nid) +{ + unsigned long flags; + int rc; + + spin_lock_irqsave(&qrtr_nodes_lock, flags); + rc = __qrtr_node_assign(node, nid); spin_unlock_irqrestore(&qrtr_nodes_lock, flags); + + return rc; +} + +/* Replace the node id in the control packet with 'node->nid', if both are + * different. + */ +static void qrtr_node_rewrite_ctrl(struct qrtr_node *node, unsigned int type, + struct sk_buff *skb) +{ + unsigned int ep_nid = READ_ONCE(node->ep_nid); + unsigned int host_nid = READ_ONCE(node->nid); + struct qrtr_ctrl_pkt *pkt; + __le32 *nid; + + if (host_nid == ep_nid) + return; + + pkt = (struct qrtr_ctrl_pkt *)skb->data; + if (type == QRTR_TYPE_DEL_CLIENT || type == QRTR_TYPE_RESUME_TX) + nid = &pkt->client.node; + else + nid = &pkt->server.node; + + /* Rewrite only the endpoint's node id, not those of bridged nodes */ + if (le32_to_cpu(*nid) == ep_nid) + *nid = cpu_to_le32(host_nid); } /** @@ -457,9 +513,12 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) struct qrtr_sock *ipc; struct sk_buff *skb; struct qrtr_cb *cb; + unsigned long flags; size_t size; unsigned int ver; + unsigned int nid; size_t hdrlen; + int rc = 0; if (len == 0 || len & 3) return -EINVAL; @@ -521,6 +580,8 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) goto err; if ((cb->type == QRTR_TYPE_NEW_SERVER || + cb->type == QRTR_TYPE_DEL_SERVER || + cb->type == QRTR_TYPE_DEL_CLIENT || cb->type == QRTR_TYPE_RESUME_TX) && size < sizeof(struct qrtr_ctrl_pkt)) goto err; @@ -531,16 +592,46 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) skb_put_data(skb, data + hdrlen, size); - qrtr_node_assign(node, cb->src_node); + nid = cb->src_node; + + spin_lock_irqsave(&qrtr_nodes_lock, flags); + + if (node->ep_nid == QRTR_EP_NID_AUTO) + WRITE_ONCE(node->ep_nid, nid); + + /* Add the source id to the lookup table only if 'node->nid' is auto + * assigned or the packet came from a bridged node. + */ + if (node->nid == QRTR_EP_NID_AUTO || nid != node->ep_nid) + rc = __qrtr_node_assign(node, nid); + + spin_unlock_irqrestore(&qrtr_nodes_lock, flags); + + if (rc) + goto err_nid; if (cb->type == QRTR_TYPE_NEW_SERVER) { /* Remote node endpoint can bridge other distant nodes */ - const struct qrtr_ctrl_pkt *pkt; + const struct qrtr_ctrl_pkt *pkt = data + hdrlen; + + nid = le32_to_cpu(pkt->server.node); - pkt = data + hdrlen; - qrtr_node_assign(node, le32_to_cpu(pkt->server.node)); + if (nid != READ_ONCE(node->ep_nid)) { + rc = qrtr_node_assign(node, nid); + if (rc) + goto err_nid; + } } + if (cb->src_node == READ_ONCE(node->ep_nid)) + cb->src_node = READ_ONCE(node->nid); + + if (cb->type == QRTR_TYPE_NEW_SERVER || + cb->type == QRTR_TYPE_DEL_SERVER || + cb->type == QRTR_TYPE_DEL_CLIENT || + cb->type == QRTR_TYPE_RESUME_TX) + qrtr_node_rewrite_ctrl(node, cb->type, skb); + if (cb->type == QRTR_TYPE_RESUME_TX) { qrtr_tx_resume(node, skb); } else { @@ -558,6 +649,8 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) return 0; +err_nid: + pr_err_ratelimited("qrtr: cannot route node id %u: %d\n", nid, rc); err: kfree_skb(skb); return -EINVAL; @@ -647,6 +740,7 @@ EXPORT_SYMBOL_GPL(qrtr_endpoint_hello); int qrtr_endpoint_register(struct qrtr_endpoint *ep, unsigned int nid) { struct qrtr_node *node; + int rc; if (!ep || !ep->xmit) return -EINVAL; @@ -659,6 +753,7 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, unsigned int nid) mutex_init(&node->ep_lock); skb_queue_head_init(&node->rx_queue); node->nid = QRTR_EP_NID_AUTO; + node->ep_nid = QRTR_EP_NID_AUTO; node->ep = ep; node->hello_sent = false; @@ -667,7 +762,12 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, unsigned int nid) xa_init(&node->qrtr_tx_flow); mutex_init(&node->qrtr_tx_lock); - qrtr_node_assign(node, nid); + rc = qrtr_node_assign(node, nid); + if (rc) { + pr_err("qrtr: cannot assign node id %u: %d\n", nid, rc); + kfree(node); + return rc; + } mutex_lock(&qrtr_node_lock); list_add(&node->item, &qrtr_all_nodes); -- 2.43.0