From nobody Sun Oct 5 23:37:50 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E0941C5F13; Mon, 28 Jul 2025 16:45:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721148; cv=none; b=u60QjAwHrG3cRxy56SvicE1QrO8UbpKFEfti7mVPbOE+q6CgDp/Va8g7XG8RKTPPIwOiNgB4eZuPFgpqf4qiNZ9xk2hX5V15d4qIftSpMAghsNrxVoqDC0kxwGkJBnnLtflCHtlw6OARaM/EzTWXYQGd6PUgfecbuKyqzqQvBRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721148; c=relaxed/simple; bh=+2JvhvfPPXwyexOfFnmN12zI5ndOKsvqBC97gE+vWfs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mrv4+ta2Ec7egMPO2vayx2zYxFOzrk2yxVUJCd9gmzekGVrYJKkb5LpnicukLe8jF3dbbAm0BE7Sjanm8gDnqqR9+KRe110PhGO4fmOaURYopy18YdUf7++9RhqjsKRUKgjld+vbeZjxK6oMJ8VVUgSmj1zjFRYmHdE020yu5Uc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=YQuZsz85; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="YQuZsz85" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721137; bh=+2JvhvfPPXwyexOfFnmN12zI5ndOKsvqBC97gE+vWfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YQuZsz85mls6du6i+1Xuj/XUQkJy7pL61W/LcCjEWnfpiv72A1plafeF3CwWQBH5F AmsMADFC5/fazcqQPqcrL41h5gDNvBCZlUTQVHvHuCjRD3U+JQx6pRRigXVHkKV2yK evIah4M+MSK7iA8LPvGq8Po5s5dNn9m9uHsALIzQ= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id 4E0E31480984; Mon, 28 Jul 2025 18:45:37 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 01/11] net: qrtr: ns: validate msglen before ctrl_pkt use Date: Mon, 28 Jul 2025 18:45:18 +0200 Message-ID: <456d8dff226c88657c79f1dbadf0dcaba8b905ae.1753720934.git.ionic@ionic.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior The qrtr_ctrl_pkt structure is currently accessed without checking if the received payload is large enough to hold the structure's fields. Add a check to ensure the payload length is sufficient. Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan Fixes: 0c2204a4ad71 ("net: qrtr: Migrate nameservice to kernel from userspa= ce") --- v4: - no changes - Link to v3: https://msgid.link/a3bc13d1496404e96723a427086271107016bdd6= .1753312999.git.ionic@ionic.de v3: - add Fixes: tag - rebase against current master - Link to v2: https://msgid.link/866f309e9739d770dce7e8c648b562d37db1d8b5= .1752947108.git.ionic@ionic.de v2: - rebase against current master - use correct size of packet structure as per review comment - Link to v1: https://msgid.link/20241018181842.1368394-2-denkenz@gmail.c= om --- net/qrtr/ns.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c index 3de9350cbf30..2bcfe539dc3e 100644 --- a/net/qrtr/ns.c +++ b/net/qrtr/ns.c @@ -619,6 +619,9 @@ static void qrtr_ns_worker(struct work_struct *work) break; } =20 + if ((size_t)msglen < sizeof(*pkt)) + break; + pkt =3D recv_buf; cmd =3D le32_to_cpu(pkt->cmd); if (cmd < ARRAY_SIZE(qrtr_ctrl_pkt_strings) && --=20 2.50.0 From nobody Sun Oct 5 23:37:50 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80461212B2B; Mon, 28 Jul 2025 16:45:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721148; cv=none; b=KcUJv7eOfoxc5FJwKllHYO2gsD1/kmJeIAvadnETf3L95OucFNsYb4KHoF9L3rHF/FrKJJ/R+eemn0kvxxmyHPlqnANbznUVrwd9260dKZS1Zj0fupdHncgVjO6D16mM8yUXiU3v4KxEybtpfyYRt9i92pkhm7/Ff4K6PsxgsnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721148; c=relaxed/simple; bh=T6Abg6wnHqYULYhg/L7ENSfbXbluAPPsIjaharMoRTc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ha1cfTMa/0mj25z2sKzUzcnWxpSA6T/woHnBXxsbp2jxtOmUVhZXe/87kNzgUIa96+52/yMNq5b7lwINxJB2qLUDKjyuVf40a9NJq12tFu75bpFDUMb11YkBbmltoErEUd3HfUAp4pdO+QgkhJiR99m/uqc/da8T/NL+OU/mVKw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=ENbspNCt; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="ENbspNCt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721137; bh=T6Abg6wnHqYULYhg/L7ENSfbXbluAPPsIjaharMoRTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ENbspNCt4T02SYqEcKhAodni6g6AKUIcmBl2BTr6DGo3+srgUoacklF5fAN9JMFwU ql7vioNJE+RtgdgqhbnF6AALfhPGLrIFfkmZ5Ta0Gp+G4VPSR5szI6ZKGprjymDyjC uckFGk3Ct+1wAxbSdQjPPTPglRiLGeaZdXnyXyb0= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id 847BF14883B7; Mon, 28 Jul 2025 18:45:37 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 02/11] net: qrtr: allocate and track endpoint ids Date: Mon, 28 Jul 2025 18:45:19 +0200 Message-ID: <347e1fb6aba96b3ef63634b21a20f36453a3bcac.1753720934.git.ionic@ionic.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior Currently, QRTR endpoints are tracked solely by their pointer value, which is sufficient as they are not exposed to user space and it is assumed that each endpoint has a unique set of node identifiers associated with it. However, this assumption does not hold when multiple devices of the same type are connected to the system. For example, multiple PCIe based 5G modems. Such a setup results in multiple endpoints with confliciting node identifiers. To enable support for such scenarios, introduce the ability to track and assign unique identifiers to QRTR endpoints. These identifiers can then be exposed to user space, allowing for userspace clients to identify which endpoint sent a given message, or to direct a message to a specific endpoint. A simple allocation strategy is used based on xa_alloc_cyclic. Remote endpoint ids start at 'qrtr_local_nid' + 1. Since qrtr_local_nid is currently always set to 1 and never changed, node identifiers start at '1' for the local endpoint and 2..INT_MAX for remote endpoints. Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan --- v4: - no changes - Link to v3: https://msgid.link/10b228a30c4416201fa90a10e75ddf05935dc3ec= .1753312999.git.ionic@ionic.de v3: - rebase against current master - Link to v2: https://msgid.link/86ef12964a23c9331be16961a5f9c6ec857aa56c= .1752947108.git.ionic@ionic.de v2: - rebase against current master - Link to v1: https://msgid.link/20241018181842.1368394-3-denkenz@gmail.c= om --- net/qrtr/af_qrtr.c | 24 ++++++++++++++++++++++++ net/qrtr/qrtr.h | 1 + 2 files changed, 25 insertions(+) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index 00c51cf693f3..be275871fb2a 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -22,6 +22,7 @@ #define QRTR_MAX_EPH_SOCKET 0x7fff #define QRTR_EPH_PORT_RANGE \ XA_LIMIT(QRTR_MIN_EPH_SOCKET, QRTR_MAX_EPH_SOCKET) +#define QRTR_ENDPOINT_RANGE XA_LIMIT(qrtr_local_nid + 1, INT_MAX) =20 #define QRTR_PORT_CTRL_LEGACY 0xffff =20 @@ -109,6 +110,10 @@ static LIST_HEAD(qrtr_all_nodes); /* lock for qrtr_all_nodes and node reference */ static DEFINE_MUTEX(qrtr_node_lock); =20 +/* endpoint id allocation management */ +static DEFINE_XARRAY_ALLOC(qrtr_endpoints); +static u32 next_endpoint_id; + /* local port allocation management */ static DEFINE_XARRAY_ALLOC(qrtr_ports); =20 @@ -585,6 +590,8 @@ static struct sk_buff *qrtr_alloc_ctrl_packet(struct qr= tr_ctrl_pkt **pkt, int qrtr_endpoint_register(struct qrtr_endpoint *ep, unsigned int nid) { struct qrtr_node *node; + u32 endpoint_id; + int rc; =20 if (!ep || !ep->xmit) return -EINVAL; @@ -593,6 +600,13 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, u= nsigned int nid) if (!node) return -ENOMEM; =20 + rc =3D xa_alloc_cyclic(&qrtr_endpoints, &endpoint_id, NULL, + QRTR_ENDPOINT_RANGE, &next_endpoint_id, + GFP_KERNEL); + + if (rc < 0) + goto free_node; + kref_init(&node->ref); mutex_init(&node->ep_lock); skb_queue_head_init(&node->rx_queue); @@ -608,8 +622,12 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, u= nsigned int nid) list_add(&node->item, &qrtr_all_nodes); mutex_unlock(&qrtr_node_lock); ep->node =3D node; + ep->id =3D endpoint_id; =20 return 0; +free_node: + kfree(node); + return rc; } EXPORT_SYMBOL_GPL(qrtr_endpoint_register); =20 @@ -628,8 +646,10 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *ep) struct sk_buff *skb; unsigned long flags; void __rcu **slot; + u32 endpoint_id; =20 mutex_lock(&node->ep_lock); + endpoint_id =3D node->ep->id; node->ep =3D NULL; mutex_unlock(&node->ep_lock); =20 @@ -656,6 +676,10 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *ep) mutex_unlock(&node->qrtr_tx_lock); =20 qrtr_node_release(node); + + xa_erase(&qrtr_endpoints, endpoint_id); + + ep->id =3D 0; ep->node =3D NULL; } EXPORT_SYMBOL_GPL(qrtr_endpoint_unregister); diff --git a/net/qrtr/qrtr.h b/net/qrtr/qrtr.h index 3f2d28696062..11b897af05e6 100644 --- a/net/qrtr/qrtr.h +++ b/net/qrtr/qrtr.h @@ -21,6 +21,7 @@ struct qrtr_endpoint { int (*xmit)(struct qrtr_endpoint *ep, struct sk_buff *skb); /* private: not for endpoint use */ struct qrtr_node *node; + u32 id; }; =20 int qrtr_endpoint_register(struct qrtr_endpoint *ep, unsigned int nid); --=20 2.50.0 From nobody Sun Oct 5 23:37:50 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80407212B28; Mon, 28 Jul 2025 16:45:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721148; cv=none; b=SmJqbMpNx32n6vrOfjAnhjvEIY7yzPxuTffgkuPDg9pgzENdyoqhtRoqpmN84De+LdqhjNnR+2gEu3AaZYegtu/CjzoDRxDvDMlH+1Oo3yIYPuygZUfhlbnRoC2/D1oWHr8mvT3Hi6+f1vmhOOCjJBIoXKgtN18SQNHJm10kx9g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721148; c=relaxed/simple; bh=5JwOdTLpR46JSYq6kgfw5nuNpNhQ+yZNQsJFt8Vs68E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=suMuMnjzXTVuZ8BjePVu9H/rgLCqbmJy92t8coF9bgOumtiqhUlR5V2C+izlFmMS/UJ86o4B3kfdRo/mAl+vbZ0nmOS9LKqIalMNHLrn72ZKXTaAPOa5cMVt/etLgQ1dXVDrM+6EMLr8x2rxI/vlW+oXx32RVvPVjCgyMzOW2JA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=oy2Minc6; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="oy2Minc6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721137; bh=5JwOdTLpR46JSYq6kgfw5nuNpNhQ+yZNQsJFt8Vs68E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oy2Minc6jq4y2jrzyZhwFh8d1wL8Ire1NkcohBZMBEqX/rItb6IddVKPxvU1wi/Gx CwA/aiacsOEinY8iNhiOys7qd+svl7F7FnXB3Yk7UQMgXDxq6Q895KCbhdbSVJqhjf qaP1SBswf45TKOEIomK+e6gD0OhUA4mo3Sr/FKGU= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id BC9A6148841E; Mon, 28 Jul 2025 18:45:37 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 03/11] net: qrtr: fit node ID + port number combination into unsigned long Date: Mon, 28 Jul 2025 18:45:20 +0200 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The flow control implementation uses a radix tree to store node ID and port number combinations and the key length is hardcoded to unsigned long. The original implementation shifted the node ID up by 32 bits and added the port number to the lower 64 bits of the unsigned long value to create a key. Unfortunately, since both node IDs and port numbers are defined as u32, this will overflow on platforms where sizeof(unsigned long) < 8 (which are most 32 bit platforms) and essentially just drop the node ID part. To fix this, build the key in a generic way, using half of the unsigned long space for the node ID and the other half for the port number. This will be transparent to platforms where sizeof(unsigned long) >=3D 8 and fix overflow issues otherwise. The caveat, of course. is that, for platforms where sizeof(unsigned long) < 8, the supported amount of node IDs and port numbers will be severely limited - to half of sizeof(unsigned long), which typically will be 16 bits. Needless to say, we have to check if both values fit into this limit. This limitation is probably not going to be an issue in real-world scenarios, but if it turns out to be one after all, we could switch from a radix tree implementation to an XArray implementation. Signed-off-by: Mihai Moldovan Fixes: 5fdeb0d372ab ("net: qrtr: Implement outgoing flow control") --- v4: - no changes - Link to v3: https://msgid.link/c60cc5f238873f72ef6f49582fb87ae7122853d5= .1753312999.git.ionic@ionic.de v3: - introduce commit --- net/qrtr/af_qrtr.c | 76 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 65 insertions(+), 11 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index be275871fb2a..1cb13242e41b 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -117,13 +117,33 @@ static u32 next_endpoint_id; /* local port allocation management */ static DEFINE_XARRAY_ALLOC(qrtr_ports); =20 +/* The radix tree API uses fixed unsigned long keys and we will have to ma= ke + * do with that. + * These keys are often a combination of node IDs (currently u32) and + * port numbers (also currently u32). + * Using the high 32 bits for the node ID and the low 32 bits for the + * port number will work fine to create keys on platforms where unsigned l= ong + * is 64 bits wide, but obviously is not be possible on platforms where + * unsigned long is smaller. + * Virtually split up unsigned long in half and assign the upper bits to + * node IDs and the lower bits to the port number, however big that may be. + */ +#define QRTR_INDEX_HALF_BITS (RADIX_TREE_INDEX_BITS >> 1) + +#define QRTR_INDEX_HALF_UNSIGNED_MAX ((~(unsigned long)(0)) >> QRTR_INDEX_= HALF_BITS) +#define QRTR_INDEX_HALF_UNSIGNED_MIN ((unsigned long)(0)) + +#define QRTR_INDEX_HALF_SIGNED_MAX ((long)(QRTR_INDEX_HALF_UNSIGNED_MAX) >= > 1) +#define QRTR_INDEX_HALF_SIGNED_MIN ((long)(-1) - QRTR_INDEX_HALF_SIGNED_MA= X) + /** * struct qrtr_node - endpoint node * @ep_lock: lock for endpoint management and callbacks * @ep: endpoint * @ref: reference count for node * @nid: node id - * @qrtr_tx_flow: tree of qrtr_tx_flow, keyed by node << 32 | port + * @qrtr_tx_flow: tree of qrtr_tx_flow, keyed by + * node << QRTR_INDEX_HALF_BITS | port * @qrtr_tx_lock: lock for qrtr_tx_flow inserts * @rx_queue: receive queue * @item: list item for broadcast list @@ -222,16 +242,23 @@ static void qrtr_node_release(struct qrtr_node *node) * qrtr_tx_resume() - reset flow control counter * @node: qrtr_node that the QRTR_TYPE_RESUME_TX packet arrived on * @skb: resume_tx packet + * + * Return: 0 on success; negative error code on failure */ -static void qrtr_tx_resume(struct qrtr_node *node, struct sk_buff *skb) +static int qrtr_tx_resume(struct qrtr_node *node, struct sk_buff *skb) { struct qrtr_ctrl_pkt *pkt =3D (struct qrtr_ctrl_pkt *)skb->data; u64 remote_node =3D le32_to_cpu(pkt->client.node); u32 remote_port =3D le32_to_cpu(pkt->client.port); struct qrtr_tx_flow *flow; - unsigned long key; + unsigned long key =3D 0; =20 - key =3D remote_node << 32 | remote_port; + if (remote_node > QRTR_INDEX_HALF_UNSIGNED_MAX || + remote_port > QRTR_INDEX_HALF_UNSIGNED_MAX) + return -EINVAL; + + key =3D ((unsigned long)(remote_node) << QRTR_INDEX_HALF_BITS) | + ((unsigned long)(remote_port) & QRTR_INDEX_HALF_UNSIGNED_MAX); =20 rcu_read_lock(); flow =3D radix_tree_lookup(&node->qrtr_tx_flow, key); @@ -244,6 +271,8 @@ static void qrtr_tx_resume(struct qrtr_node *node, stru= ct sk_buff *skb) } =20 consume_skb(skb); + + return 0; } =20 /** @@ -264,11 +293,20 @@ static void qrtr_tx_resume(struct qrtr_node *node, st= ruct sk_buff *skb) static int qrtr_tx_wait(struct qrtr_node *node, int dest_node, int dest_po= rt, int type) { - unsigned long key =3D (u64)dest_node << 32 | dest_port; + unsigned long key =3D 0; struct qrtr_tx_flow *flow; int confirm_rx =3D 0; int ret; =20 + if (dest_node < QRTR_INDEX_HALF_SIGNED_MIN || + dest_node > QRTR_INDEX_HALF_SIGNED_MAX || + dest_port < QRTR_INDEX_HALF_SIGNED_MIN || + dest_port > QRTR_INDEX_HALF_SIGNED_MAX) + return -EINVAL; + + key =3D ((unsigned long)(dest_node) << QRTR_INDEX_HALF_BITS) | + ((unsigned long)(dest_port) & QRTR_INDEX_HALF_UNSIGNED_MAX); + /* Never set confirm_rx on non-data packets */ if (type !=3D QRTR_TYPE_DATA) return 0; @@ -324,13 +362,24 @@ static int qrtr_tx_wait(struct qrtr_node *node, int d= est_node, int dest_port, * message associated with the dropped confirm_rx message. * Work around this by marking the flow as having a failed transmission and * cause the next transmission attempt to be sent with the confirm_rx. + * + * Return: 0 on success; negative error code on failure */ -static void qrtr_tx_flow_failed(struct qrtr_node *node, int dest_node, - int dest_port) +static int qrtr_tx_flow_failed(struct qrtr_node *node, int dest_node, + int dest_port) { - unsigned long key =3D (u64)dest_node << 32 | dest_port; + unsigned long key =3D 0; struct qrtr_tx_flow *flow; =20 + if (dest_node < QRTR_INDEX_HALF_SIGNED_MIN || + dest_node > QRTR_INDEX_HALF_SIGNED_MAX || + dest_port < QRTR_INDEX_HALF_SIGNED_MIN || + dest_port > QRTR_INDEX_HALF_SIGNED_MAX) + return -EINVAL; + + key =3D ((unsigned long)(dest_node) << QRTR_INDEX_HALF_BITS) | + ((unsigned long)(dest_port) & QRTR_INDEX_HALF_UNSIGNED_MAX); + rcu_read_lock(); flow =3D radix_tree_lookup(&node->qrtr_tx_flow, key); rcu_read_unlock(); @@ -339,6 +388,8 @@ static void qrtr_tx_flow_failed(struct qrtr_node *node,= int dest_node, flow->tx_failed =3D 1; spin_unlock_irq(&flow->resume_tx.lock); } + + return 0; } =20 /* Pass an outgoing packet socket buffer to the endpoint driver. */ @@ -386,7 +437,7 @@ static int qrtr_node_enqueue(struct qrtr_node *node, st= ruct sk_buff *skb, /* Need to ensure that a subsequent message carries the otherwise lost * confirm_rx flag if we dropped this one */ if (rc && confirm_rx) - qrtr_tx_flow_failed(node, to->sq_node, to->sq_port); + rc =3D qrtr_tx_flow_failed(node, to->sq_node, to->sq_port); =20 return rc; } @@ -448,6 +499,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const = void *data, size_t len) size_t size; unsigned int ver; size_t hdrlen; + int ret =3D -EINVAL; =20 if (len =3D=3D 0 || len & 3) return -EINVAL; @@ -530,7 +582,9 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const = void *data, size_t len) } =20 if (cb->type =3D=3D QRTR_TYPE_RESUME_TX) { - qrtr_tx_resume(node, skb); + ret =3D qrtr_tx_resume(node, skb); + if (ret) + goto err; } else { ipc =3D qrtr_port_lookup(cb->dst_port); if (!ipc) @@ -548,7 +602,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const = void *data, size_t len) =20 err: kfree_skb(skb); - return -EINVAL; + return ret; =20 } EXPORT_SYMBOL_GPL(qrtr_endpoint_post); --=20 2.50.0 From nobody Sun Oct 5 23:37:50 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 804C32185AA; Mon, 28 Jul 2025 16:45:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721149; cv=none; b=pgh62YsBSJXvlEw+D6DGg3+aJPsryRYLkC/9/ev9UKwLLgXJQ9SrCegaEtWta3yPSvfOWUHifLvdcoDh0PTCiwWITIIt60/34h9WcJdgVan7DopMc7zcLt8eypuZC3BXOMd20Q2aRgXkRX7OZGgexvsSELFBhQ8cWn6xzMeso+M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721149; c=relaxed/simple; bh=kALUlUVsEq/Mv1CblPD6bvenfYe5rNHuDV3rD3NHVAk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HJWuGelDxxwRP50e8P+LFJudHjAQwTjvAThE2ok7okKk7z/xmHyGaey2k6EqzBTd/yEiz73UsS98NlJVpWRN97gUWx9yV8SnBYSgIbCQZqEbAO5Q0WW7qclo1zbkMA7hdlqBNJIk4By4VEEjAJiTTUC1AUwEIJYLt7ocWlDrpXo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=WcqUx8b8; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="WcqUx8b8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721138; bh=kALUlUVsEq/Mv1CblPD6bvenfYe5rNHuDV3rD3NHVAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WcqUx8b8a22m4pthwCWiuM/Y768KE1OINP0GVXiXLZgWlptnbbQKrtzMc0L5uavx6 wvD9sFemOzHKhuqE3HkFQw2cjSOBENtiowOkj60PNU+2E7g8GKWbI6LniUqxd2ZM7w U9baWlGbpIy4Uo98e56CpXIrvgD3gofnj9hk7K8s= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id 0011214884DD; Mon, 28 Jul 2025 18:45:37 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 04/11] net: qrtr: support identical node ids Date: Mon, 28 Jul 2025 18:45:21 +0200 Message-ID: <7a8e0d05e5c1dbff891e7e734ed42d2313275f96.1753720934.git.ionic@ionic.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior Add support for tracking multiple endpoints that may have conflicting node identifiers. This is achieved by using both the node and endpoint identifiers as the key inside the radix_tree data structure. For backward compatibility with existing clients, the previous key schema (node identifier only) is preserved. However, this schema will only support the first endpoint/node combination. This is acceptable for legacy clients as support for multiple endpoints with conflicting node identifiers was not previously possible. Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan --- v4: - fix lock without unlock in error case in qrtr_node_assign() - fix wrong value for ret in some error cases in qrtr_endpoint_post() - Link to v3: https://msgid.link/8fc53fad3065a9860e3f44cf8853494dd6eb6b47= .1753312999.git.ionic@ionic.de v3: - rebase against current master - port usage of [endpoint ID|node ID] key usage to the generic solution already established for the [node ID|port number] usage - Link to v2: https://msgid.link/4d0fe1eab4b38fb85e2ec53c07289bc0843611a2= .1752947108.git.ionic@ionic.de v2: - rebase against current master - no action on review comment regarding integer overflow on 32 bit long platforms (thus far) - Link to v1: https://msgid.link/20241018181842.1368394-4-denkenz@gmail.c= om --- net/qrtr/af_qrtr.c | 57 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index 1cb13242e41b..fdf05b6509b5 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -119,14 +119,15 @@ static DEFINE_XARRAY_ALLOC(qrtr_ports); =20 /* The radix tree API uses fixed unsigned long keys and we will have to ma= ke * do with that. - * These keys are often a combination of node IDs (currently u32) and - * port numbers (also currently u32). - * Using the high 32 bits for the node ID and the low 32 bits for the - * port number will work fine to create keys on platforms where unsigned l= ong - * is 64 bits wide, but obviously is not be possible on platforms where - * unsigned long is smaller. + * These keys are often a combination of node IDs and port numbers or + * endpoint IDs and node IDs (all currently u32). + * Using the high 32 bits for the node/endpoint ID and the low 32 bits for= the + * port number/node ID will work fine to create keys on platforms where + * unsigned long is 64 bits wide, but obviously is not be possible on + * platforms where unsigned long is smaller. * Virtually split up unsigned long in half and assign the upper bits to - * node IDs and the lower bits to the port number, however big that may be. + * node/endpoint IDs and the lower bits to the port number/node ID, however + * big that may be. */ #define QRTR_INDEX_HALF_BITS (RADIX_TREE_INDEX_BITS >> 1) =20 @@ -465,19 +466,36 @@ static struct qrtr_node *qrtr_node_lookup(unsigned in= t nid) * * 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; + unsigned long key; =20 if (nid =3D=3D QRTR_EP_NID_AUTO) - return; + return 0; + + if (node->ep->id > QRTR_INDEX_HALF_UNSIGNED_MAX || + nid > QRTR_INDEX_HALF_UNSIGNED_MAX) + return -EINVAL; =20 spin_lock_irqsave(&qrtr_nodes_lock, flags); - radix_tree_insert(&qrtr_nodes, nid, node); + + /* Always insert with the endpoint_id + node_id */ + key =3D ((unsigned long)(node->ep->id) << QRTR_INDEX_HALF_BITS) | + ((unsigned long)(nid) & QRTR_INDEX_HALF_UNSIGNED_MAX); + radix_tree_insert(&qrtr_nodes, key, node); + + if (!radix_tree_lookup(&qrtr_nodes, nid)) + radix_tree_insert(&qrtr_nodes, nid, node); + if (node->nid =3D=3D QRTR_EP_NID_AUTO) node->nid =3D nid; spin_unlock_irqrestore(&qrtr_nodes_lock, flags); + + return 0; } =20 /** @@ -571,14 +589,18 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, cons= t void *data, size_t len) =20 skb_put_data(skb, data + hdrlen, size); =20 - qrtr_node_assign(node, cb->src_node); + ret =3D qrtr_node_assign(node, cb->src_node); + if (ret) + goto err; =20 if (cb->type =3D=3D QRTR_TYPE_NEW_SERVER) { /* Remote node endpoint can bridge other distant nodes */ const struct qrtr_ctrl_pkt *pkt; =20 pkt =3D data + hdrlen; - qrtr_node_assign(node, le32_to_cpu(pkt->server.node)); + ret =3D qrtr_node_assign(node, le32_to_cpu(pkt->server.node)); + if (ret) + goto err; } =20 if (cb->type =3D=3D QRTR_TYPE_RESUME_TX) { @@ -587,10 +609,13 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, cons= t void *data, size_t len) goto err; } else { ipc =3D qrtr_port_lookup(cb->dst_port); - if (!ipc) + if (!ipc) { + ret =3D -EINVAL; goto err; + } =20 - if (sock_queue_rcv_skb(&ipc->sk, skb)) { + ret =3D sock_queue_rcv_skb(&ipc->sk, skb); + if (ret) { qrtr_port_put(ipc); goto err; } @@ -670,7 +695,9 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, un= signed int nid) INIT_RADIX_TREE(&node->qrtr_tx_flow, GFP_KERNEL); mutex_init(&node->qrtr_tx_lock); =20 - qrtr_node_assign(node, nid); + rc =3D qrtr_node_assign(node, nid); + if (rc < 0) + goto free_node; =20 mutex_lock(&qrtr_node_lock); list_add(&node->item, &qrtr_all_nodes); --=20 2.50.0 From nobody Sun Oct 5 23:37:50 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAF1A277804; Mon, 28 Jul 2025 16:45:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; cv=none; b=qma7dkilZgDd3jec38U2iB8VriFJZSd9onj7McOA4X2QrzYaB5mdYAihJhe6nObjTSBFBvagQ5u1i9qmp7ws8gcj/9OnhQ7CvdsphMMPIW0GVo+V2iR/o0BBwKYJxfqpdXw0NnTUTFPGNNVES/eJkr8RRtMgco8nG4AGZLYKgjk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; c=relaxed/simple; bh=gSHbkvq+YKqvOWWlGSpdOUOKV5DBXM24WmDfhBkcElU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pQ0mttG1u8jW5Np9c1TxOFbWdTtbzwtN9WSqnXW1g5YTQo6u18hn3plgxKQVxKJe4K2HRpRX7o0qVkZ+Kc0ZScl8zyRUrLxYGIiK906u4ddbNIQ2EKiNOej7pgnkdp+AKG9TTFwjQxpo+hbkQ4VN3q2+PRtFdp90w9kOybolwAI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=LeaWIHMr; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="LeaWIHMr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721138; bh=gSHbkvq+YKqvOWWlGSpdOUOKV5DBXM24WmDfhBkcElU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LeaWIHMrALFsmkXNuT+SMLEsXZq6pKXo6jdnKHJUWMfBls9mqabR2dbpuC2VUB8gB m/gKrJKYHhe5LKAshPof8E+pAY216z5HY9V8pHDLIAdH7a4IKJvGIqM4BrVdZwEGug BKeoj63QCYKlIEj8jORHXnn3q6aAMG7KwmcmeGuk= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id 39AE414884DF; Mon, 28 Jul 2025 18:45:38 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 05/11] net: qrtr: Report sender endpoint in aux data Date: Mon, 28 Jul 2025 18:45:22 +0200 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior Introduce support for reporting the remote endpoint that generated a given QRTR message to clients using AF_QIPCRTR family sockets. This is achieved by including QRTR_ENDPOINT auxiliary data, which carries the endpoint identifier of the message sender. To receive this auxiliary data, clients must explicitly opt-in by using setsockopt with the QRTR_REPORT_ENDPOINT option enabled. Implementation of getsockopt and setsockopt is provided. An additional level 'SOL_QRTR' is added to socket.h for use by AF_QIPCRTR family sockets. Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan --- v4: - no changes - Link to v3: https://msgid.link/30c2c4547108dd0baa638f8ed3cf493a3bc06bc2= .1753312999.git.ionic@ionic.de v3: - rebase against current master - fix checkpatch.pl whitespace warning - Link to v2: https://msgid.link/8dc0c9f99f617db348af5b176bb03b4c11ac9138= .1752947108.git.ionic@ionic.de v2: - rebase against current master - dropped socket locking in qrtr_setsockopt() and qrtr_getsockopt() as per review comment - Link to v1: https://msgid.link/20241018181842.1368394-5-denkenz@gmail.c= om --- include/linux/socket.h | 1 + include/uapi/linux/qrtr.h | 6 +++ net/qrtr/af_qrtr.c | 77 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/include/linux/socket.h b/include/linux/socket.h index 3b262487ec06..0698a11bb2e2 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -386,6 +386,7 @@ struct ucred { #define SOL_MCTP 285 #define SOL_SMC 286 #define SOL_VSOCK 287 +#define SOL_QRTR 288 =20 /* IPX options */ #define IPX_TYPE 1 diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h index f7e2fb3d752b..6d0911984a05 100644 --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h @@ -46,4 +46,10 @@ struct qrtr_ctrl_pkt { }; } __packed; =20 +/* setsockopt / getsockopt */ +#define QRTR_REPORT_ENDPOINT 1 + +/* CMSG */ +#define QRTR_ENDPOINT 1 + #endif /* _LINUX_QRTR_H */ diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index fdf05b6509b5..e114489dbd36 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -26,6 +26,10 @@ =20 #define QRTR_PORT_CTRL_LEGACY 0xffff =20 +enum { + QRTR_F_REPORT_ENDPOINT, +}; + /** * struct qrtr_hdr_v1 - (I|R)PCrouter packet header version 1 * @version: protocol version @@ -79,6 +83,7 @@ struct qrtr_cb { u32 src_port; u32 dst_node; u32 dst_port; + u32 endpoint_id; =20 u8 type; u8 confirm_rx; @@ -92,6 +97,7 @@ struct qrtr_sock { struct sock sk; struct sockaddr_qrtr us; struct sockaddr_qrtr peer; + unsigned long flags; }; =20 static inline struct qrtr_sock *qrtr_sk(struct sock *sk) @@ -575,6 +581,8 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const = void *data, size_t len) if (cb->dst_port =3D=3D QRTR_PORT_CTRL_LEGACY) cb->dst_port =3D QRTR_PORT_CTRL; =20 + cb->endpoint_id =3D ep->id; + if (!size || len !=3D ALIGN(size, 4) + hdrlen) goto err; =20 @@ -1137,6 +1145,7 @@ static int qrtr_recvmsg(struct socket *sock, struct m= sghdr *msg, size_t size, int flags) { DECLARE_SOCKADDR(struct sockaddr_qrtr *, addr, msg->msg_name); + struct qrtr_sock *ipc =3D qrtr_sk(sock->sk); struct sock *sk =3D sock->sk; struct sk_buff *skb; struct qrtr_cb *cb; @@ -1162,6 +1171,10 @@ static int qrtr_recvmsg(struct socket *sock, struct = msghdr *msg, msg->msg_flags |=3D MSG_TRUNC; } =20 + if (cb->endpoint_id && test_bit(QRTR_F_REPORT_ENDPOINT, &ipc->flags)) + put_cmsg(msg, SOL_QRTR, QRTR_ENDPOINT, + sizeof(cb->endpoint_id), &cb->endpoint_id); + rc =3D skb_copy_datagram_msg(skb, 0, msg, copied); if (rc < 0) goto out; @@ -1307,6 +1320,68 @@ static int qrtr_ioctl(struct socket *sock, unsigned = int cmd, unsigned long arg) return rc; } =20 +static int qrtr_setsockopt(struct socket *sock, int level, int optname, + sockptr_t optval, unsigned int optlen) +{ + struct qrtr_sock *ipc =3D qrtr_sk(sock->sk); + unsigned int val =3D 0; + int rc =3D 0; + + if (level !=3D SOL_QRTR) + return -ENOPROTOOPT; + + if (optlen >=3D sizeof(val) && + copy_from_sockptr(&val, optval, sizeof(val))) + return -EFAULT; + + switch (optname) { + case QRTR_REPORT_ENDPOINT: + assign_bit(QRTR_F_REPORT_ENDPOINT, &ipc->flags, val); + break; + default: + rc =3D -ENOPROTOOPT; + } + + return rc; +} + +static int qrtr_getsockopt(struct socket *sock, int level, int optname, + char __user *optval, int __user *optlen) +{ + struct qrtr_sock *ipc =3D qrtr_sk(sock->sk); + unsigned int val; + int len; + int rc =3D 0; + + if (level !=3D SOL_QRTR) + return -ENOPROTOOPT; + + if (get_user(len, optlen)) + return -EFAULT; + + if (len < sizeof(val)) + return -EINVAL; + + switch (optname) { + case QRTR_REPORT_ENDPOINT: + val =3D test_bit(QRTR_F_REPORT_ENDPOINT, &ipc->flags); + break; + default: + rc =3D -ENOPROTOOPT; + } + + if (rc) + return rc; + + len =3D sizeof(int); + + if (put_user(len, optlen) || + copy_to_user(optval, &val, len)) + rc =3D -EFAULT; + + return rc; +} + static int qrtr_release(struct socket *sock) { struct sock *sk =3D sock->sk; @@ -1354,6 +1429,8 @@ static const struct proto_ops qrtr_proto_ops =3D { .shutdown =3D sock_no_shutdown, .release =3D qrtr_release, .mmap =3D sock_no_mmap, + .setsockopt =3D qrtr_setsockopt, + .getsockopt =3D qrtr_getsockopt, }; =20 static struct proto qrtr_proto =3D { --=20 2.50.0 From nobody Sun Oct 5 23:37:50 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1A3A2777E8; Mon, 28 Jul 2025 16:45:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; cv=none; b=Nfg6O3k1ov9ND2kvtW0JNHbwtSfzjll8/CTFpgLpdER47MBSVOaAZ4sYNf30O/c+gZLLM1PcAZk80trwCMUzzq96T/lo3m0aZ/hvZYkcfYxiOiZ/RyPGP+k9fDeu+TuMSCwUG9ei3omk9DrhxKbj7WCRpp1WCC753AYXCy7Qmoc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; c=relaxed/simple; bh=zThyBy8rMuXtEidraLp50Um2nhlBj3BNkFL58ouVJ38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sNakde5X4i4b1morsBpXrS2bb79EDuyUVyCb35wKk15/dRJaCnGj5W3hATYR9ZjWTEyeZiQL5GuHB6wUCnpJnGNTPOk4KD5373I+I8xMvl8pNs4H2gdoGNrRuLWfuwV83Kwr3uJwJnHjtxa9ajBp+ZCCV0I9yYanhzt7BON2hLA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=QzEC4RjD; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="QzEC4RjD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721138; bh=zThyBy8rMuXtEidraLp50Um2nhlBj3BNkFL58ouVJ38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QzEC4RjDMg4aXANzqHg8Hpx2QnAF5OanEVazlhh/7mYqqJc1VkBcEeRoE2X1iNNV7 Zk+iuw/bv21L9b1A2BerYxbTlbo67vczAcazXNKjdUD8cwnkzbU/ZVd5tliPDS6SuX 6T+/9p41jJ+aDdrRPj/Z1SkcfYAE5cOJtDdkYvdE= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id 73C851488DAA; Mon, 28 Jul 2025 18:45:38 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 06/11] net: qrtr: Report endpoint for locally generated messages Date: Mon, 28 Jul 2025 18:45:23 +0200 Message-ID: <26f31faa87250c4e3b114f35d10226fd3f78eed8.1753720934.git.ionic@ionic.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior For messages generated by the local endpoint destined to the local endpoint, report the local endpoint identifier. Same QRTR_ENDPOINT auxiliary data and QRTR_REPORT_ENDPOINT socket option semantics apply as for messages generated by remote endpoints. Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan --- v4: - no changes - Link to v3: https://msgid.link/ad993f8e1c8f983026e036c1291347901cb2d47b= .1753312999.git.ionic@ionic.de v3: - rebase against current master - fix checkpatch.pl function definition warnings - Link to v2: https://msgid.link/5b08be230cd2e5faf24297ee04beb7616861fe5b= .1752947108.git.ionic@ionic.de v2: - rebase against current master - Link to v1: https://msgid.link/20241018181842.1368394-6-denkenz@gmail.c= om --- net/qrtr/af_qrtr.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index e114489dbd36..8ddaebbd76d2 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -184,9 +184,11 @@ struct qrtr_tx_flow { #define QRTR_TX_FLOW_LOW 5 =20 static int qrtr_local_enqueue(struct qrtr_node *node, struct sk_buff *skb, + u32 endpoint_id, int type, struct sockaddr_qrtr *from, struct sockaddr_qrtr *to); static int qrtr_bcast_enqueue(struct qrtr_node *node, struct sk_buff *skb, + u32 endpoint_id, int type, struct sockaddr_qrtr *from, struct sockaddr_qrtr *to); static struct qrtr_sock *qrtr_port_lookup(int port); @@ -401,6 +403,7 @@ static int qrtr_tx_flow_failed(struct qrtr_node *node, = int dest_node, =20 /* Pass an outgoing packet socket buffer to the endpoint driver. */ static int qrtr_node_enqueue(struct qrtr_node *node, struct sk_buff *skb, + u32 endpoint_id, int type, struct sockaddr_qrtr *from, struct sockaddr_qrtr *to) { @@ -751,7 +754,8 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *ep) skb =3D qrtr_alloc_ctrl_packet(&pkt, GFP_ATOMIC); if (skb) { pkt->cmd =3D cpu_to_le32(QRTR_TYPE_BYE); - qrtr_local_enqueue(NULL, skb, QRTR_TYPE_BYE, &src, &dst); + qrtr_local_enqueue(NULL, skb, endpoint_id, + QRTR_TYPE_BYE, &src, &dst); } } spin_unlock_irqrestore(&qrtr_nodes_lock, flags); @@ -818,8 +822,8 @@ static void qrtr_port_remove(struct qrtr_sock *ipc) pkt->client.port =3D cpu_to_le32(ipc->us.sq_port); =20 skb_set_owner_w(skb, &ipc->sk); - qrtr_bcast_enqueue(NULL, skb, QRTR_TYPE_DEL_CLIENT, &ipc->us, - &to); + qrtr_bcast_enqueue(NULL, skb, qrtr_local_nid, + QRTR_TYPE_DEL_CLIENT, &ipc->us, &to); } =20 if (port =3D=3D QRTR_PORT_CTRL) @@ -959,6 +963,7 @@ static int qrtr_bind(struct socket *sock, struct sockad= dr *saddr, int len) =20 /* Queue packet to local peer socket. */ static int qrtr_local_enqueue(struct qrtr_node *node, struct sk_buff *skb, + u32 endpoint_id, int type, struct sockaddr_qrtr *from, struct sockaddr_qrtr *to) { @@ -976,6 +981,7 @@ static int qrtr_local_enqueue(struct qrtr_node *node, s= truct sk_buff *skb, cb =3D (struct qrtr_cb *)skb->cb; cb->src_node =3D from->sq_node; cb->src_port =3D from->sq_port; + cb->endpoint_id =3D endpoint_id; =20 if (sock_queue_rcv_skb(&ipc->sk, skb)) { qrtr_port_put(ipc); @@ -990,6 +996,7 @@ static int qrtr_local_enqueue(struct qrtr_node *node, s= truct sk_buff *skb, =20 /* Queue packet for broadcast. */ static int qrtr_bcast_enqueue(struct qrtr_node *node, struct sk_buff *skb, + u32 endpoint_id, int type, struct sockaddr_qrtr *from, struct sockaddr_qrtr *to) { @@ -1001,11 +1008,11 @@ static int qrtr_bcast_enqueue(struct qrtr_node *nod= e, struct sk_buff *skb, if (!skbn) break; skb_set_owner_w(skbn, skb->sk); - qrtr_node_enqueue(node, skbn, type, from, to); + qrtr_node_enqueue(node, skbn, endpoint_id, type, from, to); } mutex_unlock(&qrtr_node_lock); =20 - qrtr_local_enqueue(NULL, skb, type, from, to); + qrtr_local_enqueue(NULL, skb, endpoint_id, type, from, to); =20 return 0; } @@ -1013,12 +1020,15 @@ static int qrtr_bcast_enqueue(struct qrtr_node *nod= e, struct sk_buff *skb, static int qrtr_sendmsg(struct socket *sock, struct msghdr *msg, size_t le= n) { DECLARE_SOCKADDR(struct sockaddr_qrtr *, addr, msg->msg_name); - int (*enqueue_fn)(struct qrtr_node *, struct sk_buff *, int, - struct sockaddr_qrtr *, struct sockaddr_qrtr *); + int (*enqueue_fn)(struct qrtr_node *node, struct sk_buff *skb, + u32 endpoint_id, int type, + struct sockaddr_qrtr *from, + struct sockaddr_qrtr *to); __le32 qrtr_type =3D cpu_to_le32(QRTR_TYPE_DATA); struct qrtr_sock *ipc =3D qrtr_sk(sock->sk); struct sock *sk =3D sock->sk; struct qrtr_node *node; + u32 endpoint_id =3D qrtr_local_nid; struct sk_buff *skb; size_t plen; u32 type; @@ -1102,7 +1112,7 @@ static int qrtr_sendmsg(struct socket *sock, struct m= sghdr *msg, size_t len) } =20 type =3D le32_to_cpu(qrtr_type); - rc =3D enqueue_fn(node, skb, type, &ipc->us, addr); + rc =3D enqueue_fn(node, skb, endpoint_id, type, &ipc->us, addr); if (rc >=3D 0) rc =3D len; =20 @@ -1134,7 +1144,8 @@ static int qrtr_send_resume_tx(struct qrtr_cb *cb) pkt->client.node =3D cpu_to_le32(cb->dst_node); pkt->client.port =3D cpu_to_le32(cb->dst_port); =20 - ret =3D qrtr_node_enqueue(node, skb, QRTR_TYPE_RESUME_TX, &local, &remote= ); + ret =3D qrtr_node_enqueue(node, skb, cb->endpoint_id, + QRTR_TYPE_RESUME_TX, &local, &remote); =20 qrtr_node_release(node); =20 --=20 2.50.0 From nobody Sun Oct 5 23:37:50 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B19CF2777E5; Mon, 28 Jul 2025 16:45:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; cv=none; b=dNMBpGGBZo7fNkhsRq7b13+KMOqf63Y7cftFGbO75KqAETsoENagOUoTmmLa8oc6ju3Isanl16UdKG63iT1+dfMKs0fYiV8ko/TM/gmF816N4tfS6FjaeOCkmyAsqqayORHHuGOxxmkQyGABdhJ6j7U7ldq4OVgoKElZBsnqVEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; c=relaxed/simple; bh=sRagXtAjFHraUlfzUojvn06V/iNinnpjcwDbfzALuaY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s+nmOxNgIb4LBKMYAw9sauTK6cE+B1QOPPhQB1cj96wxM311v/Z7YDefE+UzzwUidedL8DBfcaC/kpoL516AyqVhFaL/nK44hBZeHgSgv6n2Y9AiB3dcubNMdCliem6NLRQwdVQwv9qKcMmH8/LifPJqjwivT+sNWhZjNagbpY4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=gULdd0XN; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="gULdd0XN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721138; bh=sRagXtAjFHraUlfzUojvn06V/iNinnpjcwDbfzALuaY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gULdd0XNljbkpbfUJNDkAizzup+KoOxrUfoMnneHveMU2jcPgDqok6pNDSe4CAhUf XntwKYcd67pv4EOvkCsoqjTPKurEj15Xq6RWuui/phXrBeRFDjScoxOAdR0u9qW10t SpUPI6XBFtpv6FB3EioyQ2WE073WFFsZdYOenCOw= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id AD94C1488DAC; Mon, 28 Jul 2025 18:45:38 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 07/11] net: qrtr: Allow sendmsg to target an endpoint Date: Mon, 28 Jul 2025 18:45:24 +0200 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior Allow QIPCRTR family sockets to include QRTR_ENDPOINT auxiliary data as part of the sendmsg system call. By including this parameter, the client can ask the kernel to route the message to a given endpoint, in situations where multiple endpoints with conflicting node identifier sets exist in the system. For legacy clients, or clients that do not include QRTR_ENDPOINT data, the endpoint is looked up, as before, by only using the node identifier of the destination qrtr socket address. Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan --- v4: - no changes - Link to v3: https://msgid.link/4b812aeb566819045dfca401bd06656ea612a4ec= .1753312999.git.ionic@ionic.de v3: - rebase against current master - port [endpoint ID|node ID] key usage in qrtr_node_lookup() to the gener= ic solution already established for the [node ID|port number] usage - Link to v2: https://msgid.link/fc510e5f0bae7e2d2cc5c0349ee7c166840b9154= .1752947108.git.ionic@ionic.de v2: - rebase against current master - no action on review comment regarding initializing out_endpoint_id, since that's rightfully already being done - Link to v1: https://msgid.link/20241018181842.1368394-7-denkenz@gmail.c= om --- net/qrtr/af_qrtr.c | 89 ++++++++++++++++++++++++++++++++++------------ net/qrtr/qrtr.h | 2 ++ 2 files changed, 68 insertions(+), 23 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index 8ddaebbd76d2..fa88a8ed4d8c 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -106,6 +106,36 @@ static inline struct qrtr_sock *qrtr_sk(struct sock *s= k) return container_of(sk, struct qrtr_sock, sk); } =20 +int qrtr_msg_get_endpoint(struct msghdr *msg, u32 *out_endpoint_id) +{ + struct cmsghdr *cmsg; + u32 endpoint_id =3D 0; + + for_each_cmsghdr(cmsg, msg) { + if (!CMSG_OK(msg, cmsg)) + return -EINVAL; + + if (cmsg->cmsg_level !=3D SOL_QRTR) + continue; + + if (cmsg->cmsg_type !=3D QRTR_ENDPOINT) + return -EINVAL; + + if (cmsg->cmsg_len < CMSG_LEN(sizeof(u32))) + return -EINVAL; + + /* Endpoint ids start at 1 */ + endpoint_id =3D *(u32 *)CMSG_DATA(cmsg); + if (!endpoint_id) + return -EINVAL; + } + + if (out_endpoint_id) + *out_endpoint_id =3D endpoint_id; + + return 0; +} + static unsigned int qrtr_local_nid =3D 1; =20 /* for node ids */ @@ -456,14 +486,23 @@ static int qrtr_node_enqueue(struct qrtr_node *node, = struct sk_buff *skb, * * callers must release with qrtr_node_release() */ -static struct qrtr_node *qrtr_node_lookup(unsigned int nid) +static struct qrtr_node *qrtr_node_lookup(unsigned int endpoint_id, + unsigned int nid) { - struct qrtr_node *node; + struct qrtr_node *node =3D NULL; unsigned long flags; + unsigned long key =3D 0; + + if (endpoint_id > QRTR_INDEX_HALF_UNSIGNED_MAX || + nid > QRTR_INDEX_HALF_UNSIGNED_MAX) + return node; + + key =3D ((unsigned long)(endpoint_id) << QRTR_INDEX_HALF_BITS) | + ((unsigned long)(nid) & QRTR_INDEX_HALF_UNSIGNED_MAX); =20 mutex_lock(&qrtr_node_lock); spin_lock_irqsave(&qrtr_nodes_lock, flags); - node =3D radix_tree_lookup(&qrtr_nodes, nid); + node =3D radix_tree_lookup(&qrtr_nodes, key); node =3D qrtr_node_acquire(node); spin_unlock_irqrestore(&qrtr_nodes_lock, flags); mutex_unlock(&qrtr_node_lock); @@ -1028,6 +1067,7 @@ static int qrtr_sendmsg(struct socket *sock, struct m= sghdr *msg, size_t len) struct qrtr_sock *ipc =3D qrtr_sk(sock->sk); struct sock *sk =3D sock->sk; struct qrtr_node *node; + u32 msg_endpoint_id; u32 endpoint_id =3D qrtr_local_nid; struct sk_buff *skb; size_t plen; @@ -1040,46 +1080,48 @@ static int qrtr_sendmsg(struct socket *sock, struct= msghdr *msg, size_t len) if (len > 65535) return -EMSGSIZE; =20 + rc =3D qrtr_msg_get_endpoint(msg, &msg_endpoint_id); + if (rc < 0) + return rc; + lock_sock(sk); =20 if (addr) { - if (msg->msg_namelen < sizeof(*addr)) { - release_sock(sk); - return -EINVAL; - } + rc =3D -EINVAL; =20 - if (addr->sq_family !=3D AF_QIPCRTR) { - release_sock(sk); - return -EINVAL; - } + if (msg->msg_namelen < sizeof(*addr)) + goto release_sock; + + if (addr->sq_family !=3D AF_QIPCRTR) + goto release_sock; =20 rc =3D qrtr_autobind(sock); - if (rc) { - release_sock(sk); - return rc; - } + if (rc) + goto release_sock; } else if (sk->sk_state =3D=3D TCP_ESTABLISHED) { addr =3D &ipc->peer; } else { - release_sock(sk); - return -ENOTCONN; + rc =3D -ENOTCONN; + goto release_sock; } =20 node =3D NULL; if (addr->sq_node =3D=3D QRTR_NODE_BCAST) { if (addr->sq_port !=3D QRTR_PORT_CTRL && qrtr_local_nid !=3D QRTR_NODE_BCAST) { - release_sock(sk); - return -ENOTCONN; + rc =3D -ENOTCONN; + goto release_sock; } enqueue_fn =3D qrtr_bcast_enqueue; } else if (addr->sq_node =3D=3D ipc->us.sq_node) { enqueue_fn =3D qrtr_local_enqueue; } else { - node =3D qrtr_node_lookup(addr->sq_node); + endpoint_id =3D msg_endpoint_id; + + node =3D qrtr_node_lookup(endpoint_id, addr->sq_node); if (!node) { - release_sock(sk); - return -ECONNRESET; + rc =3D endpoint_id ? -ENXIO : -ECONNRESET; + goto release_sock; } enqueue_fn =3D qrtr_node_enqueue; } @@ -1118,6 +1160,7 @@ static int qrtr_sendmsg(struct socket *sock, struct m= sghdr *msg, size_t len) =20 out_node: qrtr_node_release(node); +release_sock: release_sock(sk); =20 return rc; @@ -1132,7 +1175,7 @@ static int qrtr_send_resume_tx(struct qrtr_cb *cb) struct sk_buff *skb; int ret; =20 - node =3D qrtr_node_lookup(remote.sq_node); + node =3D qrtr_node_lookup(cb->endpoint_id, remote.sq_node); if (!node) return -EINVAL; =20 diff --git a/net/qrtr/qrtr.h b/net/qrtr/qrtr.h index 11b897af05e6..22fcecbf8de2 100644 --- a/net/qrtr/qrtr.h +++ b/net/qrtr/qrtr.h @@ -34,4 +34,6 @@ int qrtr_ns_init(void); =20 void qrtr_ns_remove(void); =20 +int qrtr_msg_get_endpoint(struct msghdr *msg, u32 *out_endpoint_id); + #endif --=20 2.50.0 From nobody Sun Oct 5 23:37:50 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A179F277038; Mon, 28 Jul 2025 16:45:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; cv=none; b=lNrmYh5jmZC1r9neVnpVp5QVPtgXQFMwjXljGAbYg3C1s7sVnz6j0ovJFvyfbeFYVOgLofYkyXRs3ABRPwvHFVm0v62bwh3a5Ks8wTt7AnI0A3cE/nN3AD4mTRe83AMzoggQ4ftRBN1gd7fmtzKYe1t6kL2ubIDFq2GQgFvmbb4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; c=relaxed/simple; bh=JPMslWVqDy+ljzsJ3MPzFaKkALDoqTwGQnGVlmfNCXs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TA4q/DRkCoNA39+Hy4OWqj+5CY3aA2Y3hkZ96LiJ43F9ZPDM8Jqhd1bj6Qo5T6znqk60pCo1W5f69tdAtZ5f9mVfRoUedL75iOftunoCg+FcGkNA9FHlVysygIeVY4Ax1J3pvypILI/eWB87wjC8MzwUXKCDT6IaLzo4s7JCLAw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=M5XO60qA; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="M5XO60qA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721139; bh=JPMslWVqDy+ljzsJ3MPzFaKkALDoqTwGQnGVlmfNCXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M5XO60qAxVIkW1V48KKd4hCB7DnIhoJ5AH1L+aqoqps0K71kNGSLhwpl8WFebpZd8 jgNfPJSbv9dr9TawKE6/wdgoIO1yRRWMGMphhCYGcUI26P0SPsevBtQ3Mbp4XeTPGw CI4pVRvGMAWGGA/zx4gE6o2PFINnTRMag68Ak41A= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id 12BBA1488DAD; Mon, 28 Jul 2025 18:45:39 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 08/11] net: qrtr: allow socket endpoint binding Date: Mon, 28 Jul 2025 18:45:25 +0200 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior Introduce the ability to bind a QIPCRTR family socket to a specific endpoint. When a socket is bound, only messages from the bound endpoint can be received, and any messages sent from the socket are by default directed to the bound endpoint. Clients can bind a socket by using the setsockopt system call with the QRTR_BIND_ENDPOINT option set to the desired endpoint binding. A previously set binding can be reset by setting QRTR_BIND_ENDPOINT option to zero. This behavior matches that of SO_BINDTOIFINDEX. This functionality is useful for clients that need to communicate with a specific device (i.e. endpoint), such as a PCIe-based 5G modem, and are not interested in messages from other endpoints / nodes. Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan --- v4: - rebase against earlier changes - Link to v3: https://msgid.link/b523ece3e16dc4c8a9acf740aba5270227a2a2b8= .1753313000.git.ionic@ionic.de v3: - rebase against current master - Link to v2: https://msgid.link/c914eae5bd8d4a3924cc3c00c1dd5810024678f5= .1752947108.git.ionic@ionic.de v2: - rebase against current master - use WRITE_ONCE() to write value in qrtr_setsockopt() and READ_ONCE() to read it in qrtr_getsockopt() as per review comment - Link to v1: https://msgid.link/20241018181842.1368394-8-denkenz@gmail.c= om --- include/uapi/linux/qrtr.h | 1 + net/qrtr/af_qrtr.c | 56 ++++++++++++++++++++++++++++----------- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h index 6d0911984a05..0a8667b049c3 100644 --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h @@ -48,6 +48,7 @@ struct qrtr_ctrl_pkt { =20 /* setsockopt / getsockopt */ #define QRTR_REPORT_ENDPOINT 1 +#define QRTR_BIND_ENDPOINT 2 =20 /* CMSG */ #define QRTR_ENDPOINT 1 diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index fa88a8ed4d8c..a7ab445416e4 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -98,6 +98,7 @@ struct qrtr_sock { struct sockaddr_qrtr us; struct sockaddr_qrtr peer; unsigned long flags; + u32 bound_endpoint; }; =20 static inline struct qrtr_sock *qrtr_sk(struct sock *sk) @@ -664,10 +665,14 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, cons= t void *data, size_t len) goto err; } =20 - ret =3D sock_queue_rcv_skb(&ipc->sk, skb); - if (ret) { - qrtr_port_put(ipc); - goto err; + /* Sockets bound to an endpoint only rx from that endpoint */ + if (!ipc->bound_endpoint || + ipc->bound_endpoint =3D=3D cb->endpoint_id) { + ret =3D sock_queue_rcv_skb(&ipc->sk, skb); + if (ret) { + qrtr_port_put(ipc); + goto err; + } } =20 qrtr_port_put(ipc); @@ -1008,29 +1013,41 @@ static int qrtr_local_enqueue(struct qrtr_node *nod= e, struct sk_buff *skb, { struct qrtr_sock *ipc; struct qrtr_cb *cb; + int ret =3D -ENODEV; =20 ipc =3D qrtr_port_lookup(to->sq_port); - if (!ipc || &ipc->sk =3D=3D skb->sk) { /* do not send to self */ - if (ipc) - qrtr_port_put(ipc); - kfree_skb(skb); - return -ENODEV; - } + if (!ipc) + goto done; + + if (&ipc->sk =3D=3D skb->sk) /* do not send to self */ + goto done; + + /* + * Filter out unwanted packets that are not on behalf of the bound + * endpoint. Certain special packets (such as an empty NEW_SERVER + * packet that serves as a sentinel value) always go through. + */ + if (endpoint_id && ipc->bound_endpoint && + ipc->bound_endpoint !=3D endpoint_id) + goto done; =20 cb =3D (struct qrtr_cb *)skb->cb; cb->src_node =3D from->sq_node; cb->src_port =3D from->sq_port; cb->endpoint_id =3D endpoint_id; =20 - if (sock_queue_rcv_skb(&ipc->sk, skb)) { - qrtr_port_put(ipc); - kfree_skb(skb); - return -ENOSPC; - } + ret =3D -ENOSPC; + if (sock_queue_rcv_skb(&ipc->sk, skb)) + goto done; =20 qrtr_port_put(ipc); =20 return 0; +done: + if (ipc) + qrtr_port_put(ipc); + kfree_skb(skb); + return ret; } =20 /* Queue packet for broadcast. */ @@ -1116,7 +1133,8 @@ static int qrtr_sendmsg(struct socket *sock, struct m= sghdr *msg, size_t len) } else if (addr->sq_node =3D=3D ipc->us.sq_node) { enqueue_fn =3D qrtr_local_enqueue; } else { - endpoint_id =3D msg_endpoint_id; + endpoint_id =3D msg_endpoint_id ? + msg_endpoint_id : ipc->bound_endpoint; =20 node =3D qrtr_node_lookup(endpoint_id, addr->sq_node); if (!node) { @@ -1392,6 +1410,9 @@ static int qrtr_setsockopt(struct socket *sock, int l= evel, int optname, case QRTR_REPORT_ENDPOINT: assign_bit(QRTR_F_REPORT_ENDPOINT, &ipc->flags, val); break; + case QRTR_BIND_ENDPOINT: + WRITE_ONCE(ipc->bound_endpoint, val); + break; default: rc =3D -ENOPROTOOPT; } @@ -1420,6 +1441,9 @@ static int qrtr_getsockopt(struct socket *sock, int l= evel, int optname, case QRTR_REPORT_ENDPOINT: val =3D test_bit(QRTR_F_REPORT_ENDPOINT, &ipc->flags); break; + case QRTR_BIND_ENDPOINT: + val =3D READ_ONCE(ipc->bound_endpoint); + break; default: rc =3D -ENOPROTOOPT; } --=20 2.50.0 From nobody Sun Oct 5 23:37:50 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22156277C9B; Mon, 28 Jul 2025 16:45:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; cv=none; b=cXqgJ8eVj9bVPbYv6GhMvCN8bBOeUyiwl4HoiYbBiw9zgZgX1C/k+FnSeN+/yZWmty7Zeygj8du6jZ5tD1YOoeKQnjMSwncJyycvDyFsBIgxZSHwcn2TQCOqfX/GhWOJ6BJl8GDA1MPenUx79jsM5ZimzKEFymH5XhcSmmjbFfg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; c=relaxed/simple; bh=IR8/da2OxoESOTMBqP1MrVkIJMK+E5kDzsXkiUg7Bag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WNrBQRBj7A34Ts9s+ApXFLGEF00GfplFXBV9YIA+Xj6pYD8V1wMmJ0M+iqwS18PNELo++aUfyE5IMlatcT+OKWmnXKptQWKVI7cvTAXc++Nfibvlx/i/CjoipUnaRB7Adto4jqzzgDv3PgNrB3+OYQum7tn6CUYQ2T6TVbji+1g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=PWCoWbAk; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="PWCoWbAk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721139; bh=IR8/da2OxoESOTMBqP1MrVkIJMK+E5kDzsXkiUg7Bag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PWCoWbAkJX/zH8m80X5/yN0mtl1sRe/rT0ajhSM0MmiP/iSZmPFIfWktBH8it8rRB VVIeGGKIWMrOUIW7li+GkaOlIP20EdEUfYICF7buRWqa2750nv3oup0M5kDIztofZs xD+L/AFr+LN/Ul/It5mrV4Vgorou8K9FhdKhcIas= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id 54E2D1489141; Mon, 28 Jul 2025 18:45:39 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 09/11] net: qrtr: Drop remote {NEW|DEL}_LOOKUP messages Date: Mon, 28 Jul 2025 18:45:26 +0200 Message-ID: <1ebb6174fcc0e7068f7f695470dc1d380f540377.1753720935.git.ionic@ionic.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior These messages are explicitly filtered out by the in-kernel name service (ns.c). Filter them out even earlier to save some CPU cycles. Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan --- v4: - no changes - Link to v3: https://msgid.link/05625051f520eb1aa091f422a745d048d5c8112e= .1753313000.git.ionic@ionic.de v3: - rebase against current master - Link to v2: https://msgid.link/ad089e97706b095063777f1eefe04d75cbb917f1= .1752947108.git.ionic@ionic.de v2: - rebase against current master - Link to v1: https://msgid.link/20241018181842.1368394-9-denkenz@gmail.c= om --- net/qrtr/af_qrtr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index a7ab445416e4..fb89ef14cecc 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -629,6 +629,11 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const= void *data, size_t len) if (!size || len !=3D ALIGN(size, 4) + hdrlen) goto err; =20 + /* Don't allow remote lookups */ + if (cb->type =3D=3D QRTR_TYPE_NEW_LOOKUP || + cb->type =3D=3D QRTR_TYPE_DEL_LOOKUP) + goto err; + if ((cb->type =3D=3D QRTR_TYPE_NEW_SERVER || cb->type =3D=3D QRTR_TYPE_RESUME_TX) && size < sizeof(struct qrtr_ctrl_pkt)) --=20 2.50.0 From nobody Sun Oct 5 23:37:50 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21E66277C96; Mon, 28 Jul 2025 16:45:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721152; cv=none; b=uTGbpRT5PiiHn/zh4wSBwWAA+UQwT89jBsUou8P6yEmWk6hDmMovSGSqAwJE/gZgAYi4Ti8bCJGguF6srphmVx1PKEINlYUB9cx2O7+T5kCCyWvMBqv0POAZaETpF7iC4jSuoHiUIlKk2Vp8jaWknf5iRaAvcqOP8OI/yzZxOeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721152; c=relaxed/simple; bh=g2lD2leOIN4I6hLBF0adbwn1u2S1n78JzrW7SRvQvys=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qvYFKiraAJvhelg/kzxlgN+HYY72oi7K2QvSeMYCRvoC3ySjJLQhdTMWj9utj7OQGJJHfIgcRDtRLFM2HzP1wvHB5Rg7aSDrnP8ccrmMOUSVNO9bm0FRw1XMbHse4bXwp5k1rvCzsENu05DKEwMX98Eup2b7uqNuyFXfvcwLUuY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=arznZtnl; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="arznZtnl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721139; bh=g2lD2leOIN4I6hLBF0adbwn1u2S1n78JzrW7SRvQvys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=arznZtnlNkH+jKnCkN2Zjqmtt40WynPTMBnrqbtmcCoe+0QGLdHXhRi/b3ZqJV+Tn NQYs8UUdwZsucBv8+4MNGf/P3var6SB+DMCWyn4YKnXcpbj7m5s4ZRcLukfBAtGJtc U2EeKXjQ/zGE9tfi9mvkMYmU4YBROdO3/wOqhEHU= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id 900911489142; Mon, 28 Jul 2025 18:45:39 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 10/11] net: qrtr: ns: support multiple endpoints Date: Mon, 28 Jul 2025 18:45:27 +0200 Message-ID: <97ff029aab722239815078f5171683f378915d8f.1753720935.git.ionic@ionic.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior Extend the qrtr name service with the concept of an endpoint. Endpoints can be remote or local, and are represented by a unique endpoint id. This allows the qrtr name service to support multiple devices (endpoints) that might have overlapping node / port combinations. The socket used by the name service is subscribed to receive endpoint information via a mechanism similar to the SOL_QRTR QRTR_REPORT_ENDPOINT socket option. Internal data structures are then extended to track endpoint information in addition to nodes and ports. The name service directs packets to the endpoint originating the request. For NEW_SERVER and DEL_SERVER messages triggered using lookups or due to remote endpoints sending the corresponding message, qrtr name service generates a NEW_SERVER and DEL_SERVER messages to all local sockets registered to receive such notifications. The messages are made to look as if they're coming from the remote endpoint using a special extension to AF_QRTR sendmsg operation. This extension only works for the local socket that owns the QRTR_PORT_CTRL port (name service). Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan --- v4: - no changes - Link to v3: https://msgid.link/44696d7a9cdba5e30c794aaba46664fdd6d5647b= .1753313000.git.ionic@ionic.de v3: - rebase against current master - Link to v2: https://msgid.link/0781b3d2293d05616f18b03439a08ae8612b2dbb= .1752947108.git.ionic@ionic.de v2: - rebase against current master - drop socket locking from qrtr_sock_set_report_endpoint() as per review comment - Link to v1: https://msgid.link/20241018181842.1368394-10-denkenz@gmail.= com --- net/qrtr/af_qrtr.c | 12 ++ net/qrtr/ns.c | 296 +++++++++++++++++++++++++++------------------ net/qrtr/qrtr.h | 1 + 3 files changed, 191 insertions(+), 118 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index fb89ef14cecc..6ee7e922c203 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -107,6 +107,13 @@ static inline struct qrtr_sock *qrtr_sk(struct sock *s= k) return container_of(sk, struct qrtr_sock, sk); } =20 +void qrtr_sock_set_report_endpoint(struct sock *sk) +{ + struct qrtr_sock *ipc =3D qrtr_sk(sk); + + assign_bit(QRTR_F_REPORT_ENDPOINT, &ipc->flags, 1); +} + int qrtr_msg_get_endpoint(struct msghdr *msg, u32 *out_endpoint_id) { struct cmsghdr *cmsg; @@ -1174,6 +1181,11 @@ static int qrtr_sendmsg(struct socket *sock, struct = msghdr *msg, size_t len) =20 /* control messages already require the type as 'command' */ skb_copy_bits(skb, 0, &qrtr_type, 4); + /* + * Allow local name service to make packets appear as if + * they originated remotely + */ + endpoint_id =3D msg_endpoint_id; } =20 type =3D le32_to_cpu(qrtr_type); diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c index 2bcfe539dc3e..a84c286209d9 100644 --- a/net/qrtr/ns.c +++ b/net/qrtr/ns.c @@ -5,6 +5,7 @@ * Copyright (c) 2020, Linaro Ltd. */ =20 +#define pr_fmt(fmt) "QRTR NS: "fmt #include #include #include @@ -16,7 +17,7 @@ #define CREATE_TRACE_POINTS #include =20 -static DEFINE_XARRAY(nodes); +static DEFINE_XARRAY(endpoints); =20 static struct { struct socket *sock; @@ -60,6 +61,7 @@ struct qrtr_server { =20 unsigned int node; unsigned int port; + u32 endpoint_id; =20 struct list_head qli; }; @@ -69,28 +71,70 @@ struct qrtr_node { struct xarray servers; }; =20 -static struct qrtr_node *node_get(unsigned int node_id) +struct qrtr_ns_endpoint { + unsigned int id; + struct xarray nodes; +}; + +static struct qrtr_node *node_lookup(u32 endpoint_id, unsigned int node_id) +{ + struct qrtr_ns_endpoint *endpoint; + + endpoint =3D xa_load(&endpoints, endpoint_id); + if (!endpoint) + return NULL; + + return xa_load(&endpoint->nodes, node_id); +} + +static struct qrtr_node *node_new(u32 endpoint_id, unsigned int node_id) { + struct qrtr_ns_endpoint *endpoint; struct qrtr_node *node; + bool new_endpoint =3D false; =20 - node =3D xa_load(&nodes, node_id); - if (node) - return node; + endpoint =3D xa_load(&endpoints, endpoint_id); + if (!endpoint) { + endpoint =3D kzalloc(sizeof(*endpoint), GFP_KERNEL); + if (!endpoint) + return NULL; + + endpoint->id =3D endpoint_id; + xa_init(&endpoint->nodes); + + if (xa_store(&endpoints, endpoint_id, endpoint, GFP_KERNEL)) { + kfree(endpoint); + return NULL; + } + + new_endpoint =3D true; + } else { + node =3D xa_load(&endpoint->nodes, node_id); + if (node) + return node; + } =20 /* If node didn't exist, allocate and insert it to the tree */ node =3D kzalloc(sizeof(*node), GFP_KERNEL); if (!node) - return NULL; + goto error; =20 node->id =3D node_id; xa_init(&node->servers); =20 - if (xa_store(&nodes, node_id, node, GFP_KERNEL)) { + if (xa_store(&endpoint->nodes, node_id, node, GFP_KERNEL)) { kfree(node); - return NULL; + goto error; } =20 return node; +error: + if (new_endpoint) { + xa_erase(&endpoints, endpoint_id); + kfree(endpoint); + } + + return NULL; } =20 static int server_match(const struct qrtr_server *srv, @@ -106,19 +150,42 @@ static int server_match(const struct qrtr_server *srv, return (srv->instance & ifilter) =3D=3D f->instance; } =20 -static int service_announce_new(struct sockaddr_qrtr *dest, - struct qrtr_server *srv) +static int qrtr_ns_sendmsg(u32 endpoint_id, struct sockaddr_qrtr *dest, + struct qrtr_ctrl_pkt *pkt) { - struct qrtr_ctrl_pkt pkt; struct msghdr msg =3D { }; struct kvec iv; + u8 control[CMSG_SPACE(sizeof(endpoint_id))]; + struct cmsghdr *cmsg; + + iv.iov_base =3D pkt; + iv.iov_len =3D sizeof(*pkt); + + msg.msg_name =3D (struct sockaddr *)dest; + msg.msg_namelen =3D sizeof(*dest); + + if (endpoint_id) { + msg.msg_control =3D control; + msg.msg_controllen =3D sizeof(control); + + cmsg =3D CMSG_FIRSTHDR(&msg); + cmsg->cmsg_level =3D SOL_QRTR; + cmsg->cmsg_type =3D QRTR_ENDPOINT; + cmsg->cmsg_len =3D CMSG_LEN(sizeof(endpoint_id)); + memcpy(CMSG_DATA(cmsg), &endpoint_id, sizeof(endpoint_id)); + } + + return kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(*pkt)); +} + +static int service_announce_new(u32 endpoint_id, struct sockaddr_qrtr *des= t, + struct qrtr_server *srv) +{ + struct qrtr_ctrl_pkt pkt; =20 trace_qrtr_ns_service_announce_new(srv->service, srv->instance, srv->node, srv->port); =20 - iv.iov_base =3D &pkt; - iv.iov_len =3D sizeof(pkt); - memset(&pkt, 0, sizeof(pkt)); pkt.cmd =3D cpu_to_le32(QRTR_TYPE_NEW_SERVER); pkt.server.service =3D cpu_to_le32(srv->service); @@ -126,26 +193,18 @@ static int service_announce_new(struct sockaddr_qrtr = *dest, pkt.server.node =3D cpu_to_le32(srv->node); pkt.server.port =3D cpu_to_le32(srv->port); =20 - msg.msg_name =3D (struct sockaddr *)dest; - msg.msg_namelen =3D sizeof(*dest); - - return kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt)); + return qrtr_ns_sendmsg(endpoint_id, dest, &pkt); } =20 -static void service_announce_del(struct sockaddr_qrtr *dest, +static void service_announce_del(u32 endpoint_id, struct sockaddr_qrtr *de= st, struct qrtr_server *srv) { struct qrtr_ctrl_pkt pkt; - struct msghdr msg =3D { }; - struct kvec iv; int ret; =20 trace_qrtr_ns_service_announce_del(srv->service, srv->instance, srv->node, srv->port); =20 - iv.iov_base =3D &pkt; - iv.iov_len =3D sizeof(pkt); - memset(&pkt, 0, sizeof(pkt)); pkt.cmd =3D cpu_to_le32(QRTR_TYPE_DEL_SERVER); pkt.server.service =3D cpu_to_le32(srv->service); @@ -153,27 +212,22 @@ static void service_announce_del(struct sockaddr_qrtr= *dest, pkt.server.node =3D cpu_to_le32(srv->node); pkt.server.port =3D cpu_to_le32(srv->port); =20 - msg.msg_name =3D (struct sockaddr *)dest; - msg.msg_namelen =3D sizeof(*dest); - - ret =3D kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt)); + ret =3D qrtr_ns_sendmsg(endpoint_id, dest, &pkt); if (ret < 0 && ret !=3D -ENODEV) pr_err("failed to announce del service\n"); - - return; } =20 -static void lookup_notify(struct sockaddr_qrtr *to, struct qrtr_server *sr= v, - bool new) +static void lookup_notify(u32 endpoint_id, struct sockaddr_qrtr *to, + struct qrtr_server *srv, bool new) { struct qrtr_ctrl_pkt pkt; - struct msghdr msg =3D { }; - struct kvec iv; int ret; =20 - iv.iov_base =3D &pkt; - iv.iov_len =3D sizeof(pkt); - + /* + * Notify a local client at @to about a server change. The aux data + * will look as if it came from the endpoint that reported the event + * (remote or local) + */ memset(&pkt, 0, sizeof(pkt)); pkt.cmd =3D new ? cpu_to_le32(QRTR_TYPE_NEW_SERVER) : cpu_to_le32(QRTR_TYPE_DEL_SERVER); @@ -184,28 +238,25 @@ static void lookup_notify(struct sockaddr_qrtr *to, s= truct qrtr_server *srv, pkt.server.port =3D cpu_to_le32(srv->port); } =20 - msg.msg_name =3D (struct sockaddr *)to; - msg.msg_namelen =3D sizeof(*to); - - ret =3D kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt)); + ret =3D qrtr_ns_sendmsg(endpoint_id, to, &pkt); if (ret < 0 && ret !=3D -ENODEV) pr_err("failed to send lookup notification\n"); } =20 -static int announce_servers(struct sockaddr_qrtr *sq) +static int announce_servers(u32 endpoint_id, struct sockaddr_qrtr *sq) { struct qrtr_server *srv; struct qrtr_node *node; unsigned long index; int ret; =20 - node =3D node_get(qrtr_ns.local_node); + node =3D node_lookup(qrtr_ns.local_node, qrtr_ns.local_node); if (!node) return 0; =20 - /* Announce the list of servers registered in this node */ + /* Announce servers registered on local endpoint to remote endpoint */ xa_for_each(&node->servers, index, srv) { - ret =3D service_announce_new(sq, srv); + ret =3D service_announce_new(endpoint_id, sq, srv); if (ret < 0) { if (ret =3D=3D -ENODEV) continue; @@ -217,7 +268,8 @@ static int announce_servers(struct sockaddr_qrtr *sq) return 0; } =20 -static struct qrtr_server *server_add(unsigned int service, +static struct qrtr_server *server_add(u32 endpoint_id, + unsigned int service, unsigned int instance, unsigned int node_id, unsigned int port) @@ -238,7 +290,7 @@ static struct qrtr_server *server_add(unsigned int serv= ice, srv->node =3D node_id; srv->port =3D port; =20 - node =3D node_get(node_id); + node =3D node_new(endpoint_id, node_id); if (!node) goto err; =20 @@ -264,7 +316,8 @@ static struct qrtr_server *server_add(unsigned int serv= ice, return NULL; } =20 -static int server_del(struct qrtr_node *node, unsigned int port, bool bcas= t) +static int server_del(u32 endpoint_id, struct qrtr_node *node, + unsigned int port, bool bcast) { struct qrtr_lookup *lookup; struct qrtr_server *srv; @@ -276,9 +329,10 @@ static int server_del(struct qrtr_node *node, unsigned= int port, bool bcast) =20 xa_erase(&node->servers, port); =20 - /* Broadcast the removal of local servers */ + /* Broadcast the removal of local servers to remote endpoints */ if (srv->node =3D=3D qrtr_ns.local_node && bcast) - service_announce_del(&qrtr_ns.bcast_sq, srv); + service_announce_del(qrtr_ns.local_node, + &qrtr_ns.bcast_sq, srv); =20 /* Announce the service's disappearance to observers */ list_for_each(li, &qrtr_ns.lookups) { @@ -288,7 +342,7 @@ static int server_del(struct qrtr_node *node, unsigned = int port, bool bcast) if (lookup->instance && lookup->instance !=3D srv->instance) continue; =20 - lookup_notify(&lookup->sq, srv, false); + lookup_notify(endpoint_id, &lookup->sq, srv, false); } =20 kfree(srv); @@ -296,23 +350,15 @@ static int server_del(struct qrtr_node *node, unsigne= d int port, bool bcast) return 0; } =20 -static int say_hello(struct sockaddr_qrtr *dest) +static int say_hello(u32 endpoint_id, struct sockaddr_qrtr *dest) { struct qrtr_ctrl_pkt pkt; - struct msghdr msg =3D { }; - struct kvec iv; int ret; =20 - iv.iov_base =3D &pkt; - iv.iov_len =3D sizeof(pkt); - memset(&pkt, 0, sizeof(pkt)); pkt.cmd =3D cpu_to_le32(QRTR_TYPE_HELLO); =20 - msg.msg_name =3D (struct sockaddr *)dest; - msg.msg_namelen =3D sizeof(*dest); - - ret =3D kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt)); + ret =3D qrtr_ns_sendmsg(endpoint_id, dest, &pkt); if (ret < 0) pr_err("failed to send hello msg\n"); =20 @@ -320,42 +366,38 @@ static int say_hello(struct sockaddr_qrtr *dest) } =20 /* Announce the list of servers registered on the local node */ -static int ctrl_cmd_hello(struct sockaddr_qrtr *sq) +static int ctrl_cmd_hello(u32 endpoint_id, struct sockaddr_qrtr *sq) { int ret; =20 - ret =3D say_hello(sq); + /* Send Hello and New Server messages to remote endpoint */ + ret =3D say_hello(endpoint_id, sq); if (ret < 0) return ret; =20 - return announce_servers(sq); + return announce_servers(endpoint_id, sq); } =20 -static int ctrl_cmd_bye(struct sockaddr_qrtr *from) +static int ctrl_cmd_bye(u32 endpoint_id, struct sockaddr_qrtr *from) { struct qrtr_node *local_node; struct qrtr_ctrl_pkt pkt; struct qrtr_server *srv; struct sockaddr_qrtr sq; - struct msghdr msg =3D { }; struct qrtr_node *node; unsigned long index; - struct kvec iv; int ret; =20 - iv.iov_base =3D &pkt; - iv.iov_len =3D sizeof(pkt); - - node =3D node_get(from->sq_node); + node =3D node_lookup(endpoint_id, from->sq_node); if (!node) return 0; =20 /* Advertise removal of this client to all servers of remote node */ xa_for_each(&node->servers, index, srv) - server_del(node, srv->port, true); + server_del(endpoint_id, node, srv->port, true); =20 /* Advertise the removal of this client to all local servers */ - local_node =3D node_get(qrtr_ns.local_node); + local_node =3D node_lookup(qrtr_ns.local_node, qrtr_ns.local_node); if (!local_node) return 0; =20 @@ -368,10 +410,8 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from) sq.sq_node =3D srv->node; sq.sq_port =3D srv->port; =20 - msg.msg_name =3D (struct sockaddr *)&sq; - msg.msg_namelen =3D sizeof(sq); - - ret =3D kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt)); + /* Bye will look as if it came from endpoint_id */ + ret =3D qrtr_ns_sendmsg(endpoint_id, &sq, &pkt); if (ret < 0 && ret !=3D -ENODEV) { pr_err("failed to send bye cmd\n"); return ret; @@ -380,25 +420,20 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from) return 0; } =20 -static int ctrl_cmd_del_client(struct sockaddr_qrtr *from, +static int ctrl_cmd_del_client(u32 endpoint_id, struct sockaddr_qrtr *from, unsigned int node_id, unsigned int port) { struct qrtr_node *local_node; struct qrtr_lookup *lookup; struct qrtr_ctrl_pkt pkt; - struct msghdr msg =3D { }; struct qrtr_server *srv; struct sockaddr_qrtr sq; struct qrtr_node *node; struct list_head *tmp; struct list_head *li; unsigned long index; - struct kvec iv; int ret; =20 - iv.iov_base =3D &pkt; - iv.iov_len =3D sizeof(pkt); - /* Don't accept spoofed messages */ if (from->sq_node !=3D node_id) return -EINVAL; @@ -423,12 +458,12 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *= from, * DEL_SERVER. Neighbours would've already removed the server belonging * to this port due to the DEL_CLIENT broadcast from qrtr_port_remove(). */ - node =3D node_get(node_id); + node =3D node_lookup(endpoint_id, node_id); if (node) - server_del(node, port, false); + server_del(endpoint_id, node, port, false); =20 /* Advertise the removal of this client to all local servers */ - local_node =3D node_get(qrtr_ns.local_node); + local_node =3D node_lookup(qrtr_ns.local_node, qrtr_ns.local_node); if (!local_node) return 0; =20 @@ -442,10 +477,8 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *f= rom, sq.sq_node =3D srv->node; sq.sq_port =3D srv->port; =20 - msg.msg_name =3D (struct sockaddr *)&sq; - msg.msg_namelen =3D sizeof(sq); - - ret =3D kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt)); + /* Del Client will look as if it came from endpoint_id */ + ret =3D qrtr_ns_sendmsg(endpoint_id, &sq, &pkt); if (ret < 0 && ret !=3D -ENODEV) { pr_err("failed to send del client cmd\n"); return ret; @@ -454,7 +487,7 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *fr= om, return 0; } =20 -static int ctrl_cmd_new_server(struct sockaddr_qrtr *from, +static int ctrl_cmd_new_server(u32 endpoint_id, struct sockaddr_qrtr *from, unsigned int service, unsigned int instance, unsigned int node_id, unsigned int port) { @@ -469,12 +502,16 @@ static int ctrl_cmd_new_server(struct sockaddr_qrtr *= from, port =3D from->sq_port; } =20 - srv =3D server_add(service, instance, node_id, port); - if (!srv) + srv =3D server_add(endpoint_id, service, instance, node_id, port); + if (!srv) { + pr_err("Failed to add server\n"); return -EINVAL; + } =20 if (srv->node =3D=3D qrtr_ns.local_node) { - ret =3D service_announce_new(&qrtr_ns.bcast_sq, srv); + /* Broadcast local server info to all peer endpoints */ + ret =3D service_announce_new(qrtr_ns.local_node, + &qrtr_ns.bcast_sq, srv); if (ret < 0) { pr_err("failed to announce new service\n"); return ret; @@ -489,13 +526,13 @@ static int ctrl_cmd_new_server(struct sockaddr_qrtr *= from, if (lookup->instance && lookup->instance !=3D instance) continue; =20 - lookup_notify(&lookup->sq, srv, true); + lookup_notify(endpoint_id, &lookup->sq, srv, true); } =20 return ret; } =20 -static int ctrl_cmd_del_server(struct sockaddr_qrtr *from, +static int ctrl_cmd_del_server(u32 endpoint_id, struct sockaddr_qrtr *from, unsigned int service, unsigned int instance, unsigned int node_id, unsigned int port) { @@ -511,24 +548,22 @@ static int ctrl_cmd_del_server(struct sockaddr_qrtr *= from, if (from->sq_node =3D=3D qrtr_ns.local_node && from->sq_port !=3D port) return -EINVAL; =20 - node =3D node_get(node_id); + node =3D node_lookup(endpoint_id, node_id); if (!node) return -ENOENT; =20 - server_del(node, port, true); + server_del(endpoint_id, node, port, true); =20 return 0; } =20 -static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *from, +static int ctrl_cmd_new_lookup(u32 endpoint_id, struct sockaddr_qrtr *from, unsigned int service, unsigned int instance) { struct qrtr_server_filter filter; struct qrtr_lookup *lookup; - struct qrtr_server *srv; - struct qrtr_node *node; - unsigned long node_idx; - unsigned long srv_idx; + unsigned long id; + struct qrtr_ns_endpoint *endpoint; =20 /* Accept only local observers */ if (from->sq_node !=3D qrtr_ns.local_node) @@ -547,22 +582,30 @@ static int ctrl_cmd_new_lookup(struct sockaddr_qrtr *= from, filter.service =3D service; filter.instance =3D instance; =20 - xa_for_each(&nodes, node_idx, node) { - xa_for_each(&node->servers, srv_idx, srv) { - if (!server_match(srv, &filter)) - continue; + xa_for_each(&endpoints, id, endpoint) { + struct qrtr_node *node; + unsigned long node_idx; =20 - lookup_notify(from, srv, true); + xa_for_each(&endpoint->nodes, node_idx, node) { + unsigned long srv_idx; + struct qrtr_server *srv; + + xa_for_each(&node->servers, srv_idx, srv) { + if (!server_match(srv, &filter)) + continue; + + lookup_notify(id, from, srv, true); + } } } =20 /* Empty notification, to indicate end of listing */ - lookup_notify(from, NULL, true); + lookup_notify(0, from, NULL, true); =20 return 0; } =20 -static void ctrl_cmd_del_lookup(struct sockaddr_qrtr *from, +static void ctrl_cmd_del_lookup(u32 endpoint_id, struct sockaddr_qrtr *fro= m, unsigned int service, unsigned int instance) { struct qrtr_lookup *lookup; @@ -595,6 +638,7 @@ static void qrtr_ns_worker(struct work_struct *work) ssize_t msglen; void *recv_buf; struct kvec iv; + u8 control[32]; int ret; =20 msg.msg_name =3D (struct sockaddr *)&sq; @@ -605,8 +649,12 @@ static void qrtr_ns_worker(struct work_struct *work) return; =20 for (;;) { + u32 endpoint_id; + iv.iov_base =3D recv_buf; iv.iov_len =3D recv_buf_size; + msg.msg_control =3D control; + msg.msg_controllen =3D sizeof(control); =20 msglen =3D kernel_recvmsg(qrtr_ns.sock, &msg, &iv, 1, iv.iov_len, MSG_DONTWAIT); @@ -619,6 +667,16 @@ static void qrtr_ns_worker(struct work_struct *work) break; } =20 + /* AUX data is written direct into the control buffer */ + msg.msg_control =3D control; + msg.msg_controllen =3D sizeof(control) - msg.msg_controllen; + + ret =3D qrtr_msg_get_endpoint(&msg, &endpoint_id); + if (ret < 0) { + pr_err("error receiving endpoint id: %d\n", ret); + break; + } + if ((size_t)msglen < sizeof(*pkt)) break; =20 @@ -632,25 +690,25 @@ static void qrtr_ns_worker(struct work_struct *work) ret =3D 0; switch (cmd) { case QRTR_TYPE_HELLO: - ret =3D ctrl_cmd_hello(&sq); + ret =3D ctrl_cmd_hello(endpoint_id, &sq); break; case QRTR_TYPE_BYE: - ret =3D ctrl_cmd_bye(&sq); + ret =3D ctrl_cmd_bye(endpoint_id, &sq); break; case QRTR_TYPE_DEL_CLIENT: - ret =3D ctrl_cmd_del_client(&sq, + ret =3D ctrl_cmd_del_client(endpoint_id, &sq, le32_to_cpu(pkt->client.node), le32_to_cpu(pkt->client.port)); break; case QRTR_TYPE_NEW_SERVER: - ret =3D ctrl_cmd_new_server(&sq, + ret =3D ctrl_cmd_new_server(endpoint_id, &sq, le32_to_cpu(pkt->server.service), le32_to_cpu(pkt->server.instance), le32_to_cpu(pkt->server.node), le32_to_cpu(pkt->server.port)); break; case QRTR_TYPE_DEL_SERVER: - ret =3D ctrl_cmd_del_server(&sq, + ret =3D ctrl_cmd_del_server(endpoint_id, &sq, le32_to_cpu(pkt->server.service), le32_to_cpu(pkt->server.instance), le32_to_cpu(pkt->server.node), @@ -661,12 +719,12 @@ static void qrtr_ns_worker(struct work_struct *work) case QRTR_TYPE_RESUME_TX: break; case QRTR_TYPE_NEW_LOOKUP: - ret =3D ctrl_cmd_new_lookup(&sq, + ret =3D ctrl_cmd_new_lookup(endpoint_id, &sq, le32_to_cpu(pkt->server.service), le32_to_cpu(pkt->server.instance)); break; case QRTR_TYPE_DEL_LOOKUP: - ctrl_cmd_del_lookup(&sq, + ctrl_cmd_del_lookup(endpoint_id, &sq, le32_to_cpu(pkt->server.service), le32_to_cpu(pkt->server.instance)); break; @@ -700,6 +758,8 @@ int qrtr_ns_init(void) if (ret < 0) return ret; =20 + qrtr_sock_set_report_endpoint(qrtr_ns.sock->sk); + ret =3D kernel_getsockname(qrtr_ns.sock, (struct sockaddr *)&sq); if (ret < 0) { pr_err("failed to get socket name\n"); @@ -727,7 +787,7 @@ int qrtr_ns_init(void) qrtr_ns.bcast_sq.sq_node =3D QRTR_NODE_BCAST; qrtr_ns.bcast_sq.sq_port =3D QRTR_PORT_CTRL; =20 - ret =3D say_hello(&qrtr_ns.bcast_sq); + ret =3D say_hello(qrtr_ns.local_node, &qrtr_ns.bcast_sq); if (ret < 0) goto err_wq; =20 diff --git a/net/qrtr/qrtr.h b/net/qrtr/qrtr.h index 22fcecbf8de2..b4f50336ae75 100644 --- a/net/qrtr/qrtr.h +++ b/net/qrtr/qrtr.h @@ -35,5 +35,6 @@ int qrtr_ns_init(void); void qrtr_ns_remove(void); =20 int qrtr_msg_get_endpoint(struct msghdr *msg, u32 *out_endpoint_id); +void qrtr_sock_set_report_endpoint(struct sock *sk); =20 #endif --=20 2.50.0 From nobody Sun Oct 5 23:37:50 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C521277CBF; Mon, 28 Jul 2025 16:45:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721152; cv=none; b=iy3CfaG5dKxGOtykPSXVyb3kNYYQyEJyQQ2yBf3aG4mPYGJi7WVZZz+JZ1k3y60BtAZG9mLUM+0MPkrM8ZAsPjnGmtf/Q84qLmMuZdVHoufJEbqmdJryCZC7Q6g2AI286toIggKieM+BwYQUG1vHfEqqxh+E9a34DLMELzeM894= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721152; c=relaxed/simple; bh=8epHVsEtMy66kJ6BvBfg+CFKw+2BoQFPwomKVgFujng=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ISLeIFrDGFAe6Me+PK+uQUs6p5F6D2xTvofZIQCGpfEUgd1Kdzz/R2VVB+YpSTjYkujRfTd20fndC+S1AmKTGCq94XB0RoZ+NkmML7E/v4FL5fU6TwKdFK+AXoKAOnCysYkOADkXh2Cr0+I3Bl68knG//DDHX+fQHIYsx+fzVng= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=CJA1sliy; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="CJA1sliy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721140; bh=8epHVsEtMy66kJ6BvBfg+CFKw+2BoQFPwomKVgFujng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CJA1sliyrrFiTr9GssmBOqcLgf84hr557mCiuztkXlfmvj8f0TGwijLnPT5sZl11r EgUXOOCUpYil32H814PyOuYbVyWcUy41PijORFHgV5zvDcbbokhIwhQwxelY9NZHsB /aCdMJHaVwn3QsIU2u0SDwnFUzoUR1CPysanbO2k= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id CFE1B14891BD; Mon, 28 Jul 2025 18:45:39 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 11/11] net: qrtr: mhi: Report endpoint id in sysfs Date: Mon, 28 Jul 2025 18:45:28 +0200 Message-ID: <462b6599fc713e8ee0950f08a5a176f12eb74555.1753720935.git.ionic@ionic.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior Add a read-only 'endpoint' sysfs entry that contains the qrtr endpoint identifier assigned to this mhi device. Can be used to direct / receive qrtr traffic only from a particular MHI device. Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan --- v4: - no changes - Link to v3: https://msgid.link/e1f5b82cd25b2ac433b1bd7e83e22604e6b24f03= .1753313000.git.ionic@ionic.de v3: - rebase against current master - Link to v2: https://msgid.link/1a49dec96d5c2c5258c9df935d8c9381793d4ddd= .1752947108.git.ionic@ionic.de v2: - rebase against current master - use %u formatter instead of %d when printing endpoint id (u32) as per review comment - Link to v1: https://msgid.link/20241018181842.1368394-11-denkenz@gmail.= com --- net/qrtr/mhi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/net/qrtr/mhi.c b/net/qrtr/mhi.c index 69f53625a049..9a23c888e234 100644 --- a/net/qrtr/mhi.c +++ b/net/qrtr/mhi.c @@ -72,6 +72,16 @@ static int qcom_mhi_qrtr_send(struct qrtr_endpoint *ep, = struct sk_buff *skb) return rc; } =20 +static ssize_t endpoint_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct qrtr_mhi_dev *qdev =3D dev_get_drvdata(dev); + + return sprintf(buf, "%u\n", qdev->ep.id); +} + +static DEVICE_ATTR_RO(endpoint); + static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev, const struct mhi_device_id *id) { @@ -91,6 +101,9 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_de= v, if (rc) return rc; =20 + if (device_create_file(&mhi_dev->dev, &dev_attr_endpoint) < 0) + dev_err(qdev->dev, "Failed to create endpoint attribute\n"); + /* start channels */ rc =3D mhi_prepare_for_transfer_autoqueue(mhi_dev); if (rc) { @@ -107,6 +120,7 @@ static void qcom_mhi_qrtr_remove(struct mhi_device *mhi= _dev) { struct qrtr_mhi_dev *qdev =3D dev_get_drvdata(&mhi_dev->dev); =20 + device_remove_file(&mhi_dev->dev, &dev_attr_endpoint); qrtr_endpoint_unregister(&qdev->ep); mhi_unprepare_from_transfer(mhi_dev); dev_set_drvdata(&mhi_dev->dev, NULL); --=20 2.50.0