From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 01260390C95; Tue, 1 Sep 2026 13:20:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268845; cv=pass; b=VkQDxpDdyww6GPjVT5h8c7OmSlsKtSZ2e/rZ0qCavjOiIOMEpPpIaRdv3zfUae3P8geEh1Y2HZ9CYrNAitm48ln9hUXDD0Ss/WDco192KqHs5nMZm3RiX3ewRv9ZAFY0c+UsIwDNrM3n1brans13eJPsoZjPcxz1IH1Pt77S3JE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268845; c=relaxed/simple; bh=MjFIhswWHGmA81saWxNm3PzHlKyCMCf2Imvg3vl+RZo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p3hPuOvR1tOh9keVukemiwmLsdB31no5TpDm2+ypiiagdf2z8vpVbKci75PNx4rppGV1a5mbj5553Bjw0l+1WfH2C2dUTxefR80KXFj9HV2k4BQ675asBAv7wEF0zo59zl+1+srewvQdOxmAnyVxpoO+eIRDWzuHIuH1Ef0T/Rg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=dZHnT9DG; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="dZHnT9DG" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ61H62tNz49Q7P; Tue, 01 Sep 2026 16:20:35 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JB0TMAWB5v8+c1siilNb9KvoFf3O00+TEZzQXqcio9I=; b=dZHnT9DGwHZX4YbFnNpPex5kbMbfwJKb6gXTlttSfLhUjR5g5qJilqf+TobasHoTXcpw4A bUFSQG6ZSL8rixgIibJmiyZnMx0Qw+bnq8Tsq6/4DGfuBBhk5LAT0pU0/y9mCbGjUcUPut YbqPdPoOIbYv18tj9KRWtR5gFWXxrhEqc8pAetO8J3cO+Y10KVqPytQOc8kM7rBO5oM39O 8dhkKQJ9xlxzAJr+uVn1v8Bxm3EVPfOiaAmDX2zvyGBsuH5b+NdeS8cY7zP2QepLZUipXO ba2Xb4P834RB+0r5qAMcvOtB5EbtOcj6MRnkfMbFcJmNtU5KpT7AFU3FPfn5dw== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268835; b=iFs1HNvo3eIwJAel/L8Xcm209XGJhTtIaj2vAYVVvfDh/Nz0WlOI6wquejrFPsdeQcAMEJ KwlqtE4oH5kfmRzy9Bue6qJJFOE7dz2UwoZOmZec+L1EANE1Zc63ixHFGUvGg8AQbbLPo4 EGvD0J9qccqKZk90qZtxWidKCLpeOh3jzTBWI7p1J07fk/GZCMR2zhoi6eF/9wg2BhXlPM 458KMc5Wul/hW/FVD+08duEiBwD/EV+9f9RBCTlDqzCIsCP6zsfwqX2XiV/SKfobrtmwmK qOmr7pmxAAtvoDJwdpNMwlxwK6J3jWKK4ZVnjmVSvVPrtHrh8RdoZQdC9/N8sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JB0TMAWB5v8+c1siilNb9KvoFf3O00+TEZzQXqcio9I=; b=ixUsWyzw9obhPB99i0fVNSY2JQN23dYRIcJ9U9LLnZkB++7CtLpm8Lu52mSsdCwCLBo0sd MdVR/PwTircpCZstQJ9JM5RbT+MRyEhSRho5+Tr0NUYfGj25+7UfoROqpMt0bXOYg6ByA/ bS0tlA3+WIyXdw7rINdJtFGUrQJEsEbnZKAmICOKKpuX6UsqxIfnURms/gg/qTA004rMWI 3oO+dRaepe4Ei4rwaUpfR1EYm7KBNNKcs0GCsLiWN+1uG35VP4RzdD+3Z+Mxz3uQZtC0x7 AY5vJsMnDT6rpvJwHXIMRQJ7yv+vrhVKmihIV3lrs9IUDohfL1/KQHwsYfNiXA== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 01/15] net: qrtr: ns: validate msglen before ctrl_pkt use Date: Tue, 1 Sep 2026 16:19:20 +0300 Message-Id: <20260901131934.225991-2-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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") Signed-off-by: Juha-Matti Tilli --- net/qrtr/ns.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c index e5b2adb161d92..d544e4998c5d5 100644 --- a/net/qrtr/ns.c +++ b/net/qrtr/ns.c @@ -668,6 +668,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.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 37F0C37BE7B; Tue, 1 Sep 2026 13:20:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268852; cv=pass; b=fKqahGA6nq6chhBvDLB3OtlrATYaSfTc26xxhLP2W7bJzbCMtS2Bdap2hSJ/dFYK8j1QbX5/Wlp+/V28Uxt4lOGNOpC5MDWefIBE2Ey5xSptVMRAiNbZQQGoEI74pmPnbyEO+lpTrgZ+bGLqlI0nIiBYiU2trhqC0+zg0reMZWA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268852; c=relaxed/simple; bh=mnCg6IjXPDA18F3gCIoGu45zsMeW4iiwBq36VbdhGrE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a0oU3lBchfg81GuOodRzERnlJhQEtpR0N9M+Gj3yZyXKpg2o2+ttJ9PLk0r2qajNZ3goEtdQToA1sRDtYyRLjo1m9C2ic+H6SVN8DKYKnrRfHIYe10PXiAaj1gdabaWJnpgdbUaFJ4FeFcspbRmHOlGP0gNB066KIBeQj9Rq+/Q= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=foDnk/vI; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="foDnk/vI" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ61R3My8z49Q7h; Tue, 01 Sep 2026 16:20:43 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b2arz6d4RrSmlewlrh+D8m1nv0qdMIfe9W1Or8yisS4=; b=foDnk/vIZIMSWCHM+A5m0/nYMD9G9G5v35GeoIXFocFzWBF36CNCuiKcDYMhIa7lRgaXwH P51MB3pVxMc16Ghpydb4pd0jVPSTuq1o0enQDzK0tZV8aDrlB2NrUokAFB300yPtaoePPG 9dmc8hL9IM6kTrNLHrP19xT2knTMftuuEdtHzwOeP0u+kcBHmiPZwncgkkHTaUBc36lheG eVfA9Z5UY/o6XUlxgG7hUUiNVJmDJxY1g7XwnW3AlkyK/yIq3gZp24ZnWkcjmAFrcEmtuS dKryAHFO6rhCcGhnaVIne2NlM6YCltDbfUHVHoENwwQRFSZ/oBGA058Ho5uF+w== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268843; b=EeiwNAvAdHhH6YbaQJD6YRX8LdW+QHeyr25oWEcaLYaSrEdhyFJVvv2DoAH/1KoVuuCFni Z+602l9MukNV+iEShknDtET1aSg7NYIxifX1A4EuZstqRqQKS0dCnPVO2RmfiRV6XF/U0J BZ1orB2G22td30NMpkFblE04WAGBmN6c9GmcAkR0q8w2rML+Cd3mOeT3nlbLqOrivVOBLJ To6a/3wfHGNrRtgLllAQzxEbIl7P81QJdXNHr3J7KDOw5bnOVCig+fNMkiH0JnYSYIfS3L j28NHccNnLfupCUPgL487aUenSiIprIRfaXEMoqBddpZ0FMAoUPD3n/bGm3BKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b2arz6d4RrSmlewlrh+D8m1nv0qdMIfe9W1Or8yisS4=; b=Gg/366Upmp1QOOBd8xHEHKRAkguGhdOI2cFcGw2hZqGFRI/1e71Kse6IUOeHsnuN6fQF31 siCgQSI+LyJHkMwfdEpRCI8FYMyrSjh+JS/D+iV++hKFxU5UqVw309gGWPSDh3DdzogDy+ GP/4yKpNypbzzxg/a0ZhWddlsDH6pEBZBhH8grsu2ud4wt+FzBtT/hW+hp0KPT4XRsYr9T Jy67RsmdOLn4x6UhxJbIcP2APiKM9ogAJ9ZpclG1mABHr6PJe4aotRB55R5PFSwpbRbrhe 6HbRP3o12lvz30weSNbKgy9mq/HrfuhLy7DiexcZ+LIZmpfR+q4c3B85S8VoYA== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 02/15] net: qrtr: allocate and track endpoint ids Date: Tue, 1 Sep 2026 16:19:21 +0300 Message-Id: <20260901131934.225991-3-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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 Signed-off-by: Juha-Matti Tilli --- 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 a30fa56e6aa31..38b6def7c5272 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 @@ -581,6 +586,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; @@ -589,6 +596,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); @@ -604,8 +618,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 @@ -625,8 +643,10 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *ep) unsigned long flags; unsigned long index; 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 @@ -651,6 +671,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 3f2d28696062a..11b897af05e67 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.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 39C0D472064; Tue, 1 Sep 2026 13:20:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268859; cv=pass; b=ubKI5f72uNCLOQMTfaudHulXUcqm29KRQwAFkYY6e/4WYYt6cyDCB8DkDumBS3Y9K/pelePkAFNC5a1LE6lYDRPNPZMx85LlgPxBzGIIFQ3nIF8g0qDBNi3+/P8wpR4h8WHihl3Nzy6C4V3qOuw9NslsvPbpZxMjAqS12RdGtzE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268859; c=relaxed/simple; bh=fQk0OZNyx5bWSZ06u8sA1/WbxMmAEqhV0VVV323FxoE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bCZMGkoaX1UWW3StJ9ED2AlC6N+8SKKeJhplNoKoawnsCQZGmzx5vfJ60UgOBf9kYTPKGbm2GyT97mj5GlN/xdIRPJCWLm6z3/TWgYlwycJLrYsS8VU64PbCGKSBaSuwSAMCX2DycwVQXQAP3VsnX1AI441APh77/0DyO0MUjVk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=oToQO52C; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="oToQO52C" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ61b0B7Rz49Q8l; Tue, 01 Sep 2026 16:20:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Oycz5u0f3lz1AvS7cGHa543haJ+L6aX2mdafdbJn/A4=; b=oToQO52CMbD94BBjYGilgi5alaBTvUzTe9goXYKPWx5oYvD7lw2Ug0Kn1QaCnCMfJoWy6Y +iXNfLnzY8zeVcEJ3tZw1lfxWlDTkCevFYbDcwcU9QzCN9Z2/9nAQorA3nGGmdrehX/vdd 3DdEAXYPC1LHPsROzeYBahXaj26FWYq+JW1VctWF6ImIbrcwZeMM1+KXiKWYEWVY1rGfmo sJ3W0uIzv9fQxgevBtNRa5TCKyBWsnnygtP60XBeps22N96XxPHHS5ld34T1SC7bsOANI/ u3MwoFCb5O1Dn50x6tQvKdncQMNFoh3f07FRKvfDen7UwDdaQ/EbG4F6JiqlUA== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268851; b=mI1KUA/kqKgXyAC6WdPq2XQ2Z2zvvCqGpx0YUybDVgRXE87LzcgwMCLQuKDPNP0RjEqu8I 0sOgcOYs3kN0AeonD7w2Ao0cYjWOz1vMnDSSbIy7Gsm5C7smde21k3Xh477u/JP4hkWs87 2YovbAm2LfLTSXY5sWzKcOTEWyCyDfOr9Q+uy+8kuyi/mlhtyTM09xrShcbgnaTWZd6k/7 x93QgR4tW7xHweGDtLGQRPnToMVk2gpziw0L7PvyypLc64wP0KCGFNPHNiJHPx4HyjL0FI ZhN0ohcuM0kNLOZ+Lc408UwKW4wAiulczeaUQdr90JgRLOrzqrzisMPHSeCMlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Oycz5u0f3lz1AvS7cGHa543haJ+L6aX2mdafdbJn/A4=; b=mVwCdsMPEokic4rSJdVRleFr/iXL5sPZTe/K4NeHCqI46EitbwiEfGgdYmXKASdEi2MODj TZRTWIPExLxdTt4/hbIhh/4xgWOXdH4pSUAXdX5QYxpskRSN/8YYwoOLeaZAN/SYhj8YLJ wew3cj+tGGYNP/KngHfx8I1s3fuuPU/sVqYVn07q296JvrMumLRUxoYgbOsQVBhNNulkCq BG2tlezh9D6rnnqHZRdpSVVnjyKhqeiw77llEsRxc72vDPAWUT0au+VYjgIw5gM8h5dMVJ VnxSBVSc5AkYNF5wstJ6xRQjmKs+3VLmY+39GF0RFGcj1Ph3gaFOj7BaQuotAA== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 03/15] net: qrtr: fit node ID + port number combination into unsigned long Date: Tue, 1 Sep 2026 16:19:22 +0300 Message-Id: <20260901131934.225991-4-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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: Mihai Moldovan 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 32 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") Signed-off-by: Juha-Matti Tilli --- net/qrtr/af_qrtr.c | 74 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 64 insertions(+), 10 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index 38b6def7c5272..f2edbd2e9dea9 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -117,6 +117,26 @@ static u32 next_endpoint_id; /* local port allocation management */ static DEFINE_XARRAY_ALLOC(qrtr_ports); =20 +/* The xarray API uses fixed unsigned long keys and we will have to make + * 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_XARRAY_INDEX_BITS (8 /* CHAR_BIT */ * sizeof(unsigned long)) +#define QRTR_INDEX_HALF_BITS (QRTR_XARRAY_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 @@ -221,16 +241,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 flow =3D xa_load(&node->qrtr_tx_flow, key); if (flow) { @@ -241,6 +268,8 @@ static void qrtr_tx_resume(struct qrtr_node *node, stru= ct sk_buff *skb) } =20 consume_skb(skb); + + return 0; } =20 /** @@ -261,11 +290,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; @@ -322,19 +360,32 @@ 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); + flow =3D xa_load(&node->qrtr_tx_flow, key); if (flow) { spin_lock_irq(&flow->resume_tx.lock); 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. */ @@ -382,7 +433,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; } @@ -444,6 +495,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; @@ -526,7 +578,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) @@ -544,7 +598,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.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 3F7EA472064; Tue, 1 Sep 2026 13:21:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268864; cv=pass; b=utcStwI13OsdXl+juRflq+j7vZQq6uO2SSQp9o0uqp555S6mO2MSjTRtyvHXJIO9sRSpO9w6WMeOBMXTF0PKpyLDBemSZ11w3pzkPZwj5UVytzh0HofRkg4l6s6SD3GobzMriynEnZRokql6V5MfE+nPLMNyPoMoDG0i5yBlLJQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268864; c=relaxed/simple; bh=ePdcpjW/kLvFZnLJetnASTkIonTXjx3cf8nqDnz7rQY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FVWVhgDjeuJOvd/P3xk73hd2iHs69OayLHfjESfrYNsbLFekf9qwcHxUMXufHrbBHsQpVq7O5iVEgtskgm8B98knM70nxLaeDoBRtBXKZyCllH5RclYRq8B4Y+YQB5icjAOMzHWCBvD39RZB8lA1lXxjL2zBVTzfXWhw/yEUFB4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=s1So/mBE; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="s1So/mBE" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ61j26Xfz49QF7; Tue, 01 Sep 2026 16:20:57 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v6GkYk0HZBFKkX376VoqF+8xKuVMeoSo1m24bvpn9Wg=; b=s1So/mBEfFktHgEtlbB2K6AiVetMyEPXW0DnkIe48kmKj8/iNOD71jVbv7taUrcHsfRpN1 8JTQsF2ICx7G9v6sDLKBkxnR6rpT8TZ8odwJjH8ZSE2zRcsEaZqRLScZK3ecN4VdPfme1F OS6/RXxguApV0X9raxaROWU7rghZTgXXuyX+iYwiMt9lSqu/mJgQU4c8KqSyIQ1R9fsC95 stRydWO2NHGNg89RAjlE5rBt7anxqjYbPLUPbYSXW91jngNbYQ13qydWpRC37CWy4+3Bfm cQb5Y/I4JAaSPO5O8XTwjXzAe/ZMdBIdAdt3nrHgdoJhcL8FMQxLW6vwfqe9+A== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268857; b=eVuCaLrzOVuLtdsu0obT1pky+hLKnSn5sxnVkUFJt6YL5ZbOEgLyHen+CG880kKZmBUqe4 Hm+VYakdsPwdmPf4TYVXKSaafEee0M0RgIqiFOh+Dfix/e4r/zVSGkPDJKn7bB6WpleD2h lcwtGt8P7cbcmq75qblFxQ9RxfSNiaKTLka0N85dj6+Hp5JLVfTiNAaR8/PLn6kDT3y19z 2gYNiIUH1K7YLTLrAAVqnS6MJasw/huupVFqz3TWpgmuFTcfjMQzdPrbL7PQvXVS9aKCxV W4mKRnld5rgF4lvlenBP414vAezTORlbTqNckImkF78ZbmHt3XCGW9ixS1N1Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v6GkYk0HZBFKkX376VoqF+8xKuVMeoSo1m24bvpn9Wg=; b=cuScf6M7zWVdcAGGyB/sxa0Vaqx0RiQfqoOvKPiCUoO5WdhnDoY3AihE+nXIIG+RLjYo9Q BCRhWxG0ITW5ClY832T3KWwlYTwXpvDWNBtzTMXOJ/DUB0kSEwYzPnQgo6bt6f4FpX0Nkd 44zJFgmq9W8zeQLJ8t42skQ6uRqT9SSCvsxkRadZ+ruR/0CX80j6L4vNX3TK9D2DeypX5C kVieTAT05GCbgtjguvTjebgykN7lgtsPt5V9M8Qhd6YXaiUPJgLZoPBGeYGsqQLRQlcOvb 17HjuK8g93d6LEpwJ/6EkOhiwR3VSdldgANZOxupqHrcLD/KF/siRUEUfKYzGA== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 04/15] net: qrtr: use only low 16 bits of node/port in 32-bit systems Date: Tue, 1 Sep 2026 16:19:23 +0300 Message-Id: <20260901131934.225991-5-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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 node id is generally a single fixed value hardcoded into device firmware. If it happens to be larger than 16 bits on a 32-bit system, using the value modulo 65536 is enough. It is not necessary to check it for being in range. Evidence of this is a prior implementation that fit node_id (u32) and port (u32) into unsigned long in 32-bit systems, in a manner that completely discarded all bits of node_id. Do the same for port: don't check for it being in range. This arguably creates a bug where node_id could clash with a node_id that has the same low-order 16 bits, or a port could clash with a port that has the same low-order 16 bits. But it's probably better than discarding all bits of node and using only bits from port. It's probably also better than failing if either node or port is out-of-range. Signed-off-by: Juha-Matti Tilli --- net/qrtr/af_qrtr.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index f2edbd2e9dea9..b2cb05f2480e0 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -252,9 +252,9 @@ static int qrtr_tx_resume(struct qrtr_node *node, struc= t sk_buff *skb) struct qrtr_tx_flow *flow; unsigned long key =3D 0; =20 - if (remote_node > QRTR_INDEX_HALF_UNSIGNED_MAX || - remote_port > QRTR_INDEX_HALF_UNSIGNED_MAX) - return -EINVAL; + /* Don't check node/port for the valid range, use only low + * 16 bits on 32-bit architectures. + */ =20 key =3D ((unsigned long)(remote_node) << QRTR_INDEX_HALF_BITS) | ((unsigned long)(remote_port) & QRTR_INDEX_HALF_UNSIGNED_MAX); @@ -295,11 +295,9 @@ static int qrtr_tx_wait(struct qrtr_node *node, int de= st_node, int dest_port, 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; + /* Don't check node/port for the valid range, use only low + * 16 bits on 32-bit architectures. + */ =20 key =3D ((unsigned long)(dest_node) << QRTR_INDEX_HALF_BITS) | ((unsigned long)(dest_port) & QRTR_INDEX_HALF_UNSIGNED_MAX); @@ -369,11 +367,9 @@ static int qrtr_tx_flow_failed(struct qrtr_node *node,= int dest_node, 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; + /* Don't check node/port for the valid range, use only low + * 16 bits on 32-bit architectures. + */ =20 key =3D ((unsigned long)(dest_node) << QRTR_INDEX_HALF_BITS) | ((unsigned long)(dest_port) & QRTR_INDEX_HALF_UNSIGNED_MAX); --=20 2.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 65B7047F2F3; Tue, 1 Sep 2026 13:21:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268873; cv=pass; b=mAmCFsO5hVbwL6bHputA3Cbj6ZXnqmAyUv6tLxIbnPSFa+OcAkYakpth2ivDuGFUSt4CX7MGMg1Zvu8BKHTMwIiKTBL7u2tc6WFCUQvxngCB50kuQmyp1JeFLHen2pu16ps1n/LJx7y9Td01UGixzzzpi5TFIjYWNEAokcE5aZc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268873; c=relaxed/simple; bh=9MTKVHXaWAmpPah6Uzh7zDrZE8DXEn0CDbIpbMZiR8Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HNAQAjLxLsiylrPqsWZs9P6wDyIqczxW74aMyli4l8CDFZ8j2hetc3y4yZClSSr9kNaIn0lNYmq2/KqASPP2WXz8XooUEt/oB57k20uHcghXexzCQErAF8U9sWt6Q5kurUqaYoLamf/K1xmcijoSYB5TYclTAEr0gxzX4F9xlAY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=BKyzhP7Q; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="BKyzhP7Q" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ61s2CWlz49QKq; Tue, 01 Sep 2026 16:21:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eQQNkGqsz0DxTiGoA57xy08XjvAtpAjYEEPkpcv0BrA=; b=BKyzhP7QZIe5MlruSWGTVQfB+bfPF0ZOz85j53ztNZa1gfd4u3opoavZ5R7UMaIQ57Hk6D 6mrUqhqKGhqwi7x9iqIPO7TGwQPYx/ClMCGLuee6h/o1gW6QryLBowq88S5UrfgwonmBDa J+ugWAlJy6/nvaH2VRi0AzAqMxJI6GkEBgX1V5DNQJaEM/qfDOk5r0Udpk0zK/I4TLHWsB 4H3/FmpJ8qMUAtTQcqY1K9QHL68ce9rVAVKMXwujweTHXiBItiVzOMjmoZEBcsYCS8/MAP reMNarmWAUIdGkfirW/lGOv72MSImwGidvqylRcIsXEYf2lvV9UTPs43EXiY6g== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268865; b=Lc/0D2fQzLkzqxbNpeJIPHmdq9tTFsppq0MIbYdH1HIpOw8mqiehpibWeC6vti/w1fKpB/ M6E1BszflGJujm5iGh+Wka1FywpvsTP1vYqYolIK+sjr1MDCJ45DfpbxzL0x/AYrkr3oFx 3IkUXto+qSUcwdnWfV7Lj4u+WHKQxS9GQkQFC71OzKoxxB/DpWxxtQaLAFY2k+fV3DtZ4J ZGNejaF2qu11EZ8Oy3ldTJebR+VxV1DLXcMHBWEU7JPCmZ5JuT82BpfCjyl8gKZL672Rnl DeesKk6aKcaPZC/j7WKSQCO8hIqcUMsq0AiwijSZ1tWphj7j5zhpIhgLAfpB/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eQQNkGqsz0DxTiGoA57xy08XjvAtpAjYEEPkpcv0BrA=; b=wQ7Md/jBozcH8nFB5ic3xvoGQICit1q5x21Q3ZI3NHDAhNNlu4zwlIgM6lOdnsNzwNFymO Ob/lJ02ca24TBMB4yyIfUGgEDFi/Bf4jiw+jOpmWWvTY54xIxD4rbM7azU50rjKmV2cKdJ IwgQLI79T6NiwNzOrzl8Fic59hVh4leMR1qrz1fC4KJplRpyfIYTu/Rx0Izw4AtFTUqank Z3nf1vlslZxmRwN8Bhjc7x5ifCwNyk1lhWcpInJQ0zi01M3RB/mQsB/IGQy9IYwQ9y5+ii jqwg3sQU1oBOQebq4I1ThDU7b16viUhLaFVQ1juafWGCrwsSHfocF5ie6JaJBQ== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 05/15] net: qrtr: support identical node ids Date: Tue, 1 Sep 2026 16:19:24 +0300 Message-Id: <20260901131934.225991-6-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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 Signed-off-by: Juha-Matti Tilli --- 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 b2cb05f2480e0..43e48b89b5cb6 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 xarray API uses fixed unsigned long keys and we will have to make * 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_XARRAY_INDEX_BITS (8 /* CHAR_BIT */ * sizeof(unsigned long)) #define QRTR_INDEX_HALF_BITS (QRTR_XARRAY_INDEX_BITS >> 1) @@ -457,19 +458,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 /** @@ -563,14 +581,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) { @@ -579,10 +601,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; } @@ -662,7 +687,9 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, un= signed int nid) xa_init(&node->qrtr_tx_flow); 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.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 0E62D47CA73; Tue, 1 Sep 2026 13:21:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268882; cv=pass; b=pT3v6rijgqOUzm2zDi3P95Z7xjInuOaLJuJl8pEh0BEtwEDPOKGruPBlAtEkYst4LxAQ04B0sQF98ju09rZm9hRwZxeOJTxDUvX7IrEqIrLkAkvBh+7he051FYjyuq7Z7fv9kDUHAQLvEzG/JWsptuH4ix9fpfaHEmrcV42Ze+8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268882; c=relaxed/simple; bh=G2u4QUEtPn+JuaH/1d7NVY9ZHJgje1rLs5v7TkeoLG8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Cv6m2WlqfUfo3/MEyh5el554svEyDp2EZ9WgxuJFCX8P+JURgSBtAL4wAnUoOlUMUI+E728PoUUJPKiCy2IS+3cHmqdlxTwwwO1uC+WluVBXQBXhMou/HZa/OTwlDogK7P62jkCKO/yuRrq83T7G326MCDu2h8k/ODL5u2//FlY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=rwa5gCl7; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="rwa5gCl7" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ62322Pgz49QLK; Tue, 01 Sep 2026 16:21:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wU+Nh/TTGuJHWO4OvCj1HpjL1997pFYAxqIp0Rc3JXU=; b=rwa5gCl7Jt+BZksWFiIuihBwdTw0a63tcwWhSrz7lwV8PSTdXKYdHL8YZyLCXAN4e4/NWm mrKwudi8h9aMKL+GqBx6J8c5aH7Ldj0FaRvmrQ5RPEUa5UDi5O3tshnidtFgawypj8LNGO cosL39WSPlznhVOG98b5IdudnhIixnUjDUJ53A1e+tW1/E4c3jrj6Q8U578wBW0Wwxmt16 48B7HRIuuDVA0CXd/3iVZNuDnOAtbnE3pTBsZi8o7RFPyhZaE6xiMOkkxkDUss2Psno/R8 r61veAj8JRCZhx27iMCo5LkXIji+w0Z0b/eLDagrFdTT//FDfdiTimdppvPnnA== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268875; b=isavcQ37mQE3U/tAwkk9expHSb0X0jJNL7XcHL+LCmnPEYh8fzOjS6K/B/oqafxi2VTSbS VT8Btb9HP55Mq5H5Mb0HkrKNlLTcDs+a/7cXKWK85ifSU2PmhGCpq4CM9E5t4mpPNJg3Dt JsCMe/BSWsndhuAHn1SywFStKlxarNzjRhwHbPrAVRve06bIc2ifr/D5LnVPAU9ZzKvTsK c8sVyJ40p4x/JtRUhQ7bUXkAMvAxmf4khAfJ1b6Xe4herM1VnDC1gFurB3cKh41HY2Y+V5 LD6A2DwyMy2sy/43zCa7BBPEyMiCaR3KTzuMcpGRJu43jth6x0um8fjLITqR8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wU+Nh/TTGuJHWO4OvCj1HpjL1997pFYAxqIp0Rc3JXU=; b=nKxYQdty38Ai/PdbRNZiIwrWGmfUc75oArf2SXAwjbtqPyMcKZqpk2L3PI9kXNqLSxVxFg JBLC2kjFJjN95jwJUwzJnXGln7insxMXeWeCVtUmGPgcdIKdkmqOpLx4C24+aRSSrFgiWI GszJH3rqpta7DzsvBfipdr9QH/3jmrOvdy0/jKh/c2/Os8tCXd43giLsRv3+CefPmqbWor UDNzoDE8FCuWdsfSFdFGp31tpNEASKbr7+avkA4YCpfX4+0e2uADEHX2TTzqxQ1CO9bP9M LNvZxwuhL3QgWejUEEZKhH8aICno/4DD6P7Qrpn4if4beD3/eVQh/rOLCTYlxg== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 06/15] net: qrtr: Report sender endpoint in aux data Date: Tue, 1 Sep 2026 16:19:25 +0300 Message-Id: <20260901131934.225991-7-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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 Signed-off-by: Juha-Matti Tilli --- 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 2a8d7b14f1d11..4af1dd816dc35 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -400,6 +400,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 f7e2fb3d752b5..6d0911984a050 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 43e48b89b5cb6..897ecc8dc304d 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) @@ -567,6 +573,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 || size > len || len !=3D ALIGN(size, 4) + hdrlen) goto err; =20 @@ -1130,6 +1138,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; @@ -1155,6 +1164,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; @@ -1300,6 +1313,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; @@ -1347,6 +1422,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.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 4F43547ACEB; Tue, 1 Sep 2026 13:21:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268890; cv=pass; b=Sc69/EuAvDUqafyERjK7gMYwQcPdCelUiMc/XPt6KqCfc7U/Izd3uF3kxd4S+1LmukmelhvMx0p2WyOoJAauACyZu1ggjKmGrL40Ccd3RX0vrsvBUzKtPQCiHHazvDpnURZI/xGlz/A94lFL2fn3IslU4kTXSRP5WcCHIQy/j80= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268890; c=relaxed/simple; bh=hdtkGhRfz8rVbNwgtAd+nE20hxvZoyBIqJKmY7rY+Oo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hlVsVqYdymlw0My962cCzWour+i4/X6O2xEZBgDC27m3hTXMOztze1eRawfevr3be3k8xIc1kGVEtR2DcSVq8gXItNqvCpkv5/Q4CEVX5GFQLsKXfHZdjmR/n+KRebYNed9RLV3TiB50VOa/yENGXn4RH1lqpBomKmcXuSdb/cw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=ja0E7aCX; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="ja0E7aCX" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ62C23bVz49QMM; Tue, 01 Sep 2026 16:21:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RWGOLefIcCK3uanL/TxDzRS8ZuMg1qk19zGuow0Q++k=; b=ja0E7aCXsx65M3CEogzj5PxpGwtApRqeURdbZNmShDsU5ykmnOH5gWgGcNzYH/JPco+vp7 XxvYJhak+o+sVe8NHA4OVHSjsTAAj9ykVJgo2UeKLfj7Cm5xABzvb6ot7+xrlKvr41/N6P qk2QtPIW8ci24rClKAiQLgi5EQPhNIOQbgjH3ZLZZN3+Pja/DnN2WFMHEYXF8NEAd6FwK7 aS/YUfRgFmjcGOEQ2STcz6Tv/e8dkAfGIaG690VUwcYx5S1m6esEugTxOFsx9u9gYNvfoh r79g3GdiEBzGaOMowWCVn/Ihums3/9qXhDpxiupFqr2YM54ccTlVa5wmPQnQ/g== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268883; b=tjmAINtLrn4uIKfkv/f6tAa8d2cc90S40eYq4bufElEpdhx2tKfHVDZK3IPzeFmKEpTdma ULBuZBTiEW3w5gjp5YGpSfcD3S46reFRlhtgpcvpZxb+y4R2RE+dpc8b3rV06I6tF3w6gH QYe19Ssc6sSL8Dd6/p3XOwYqTqDFoamsaLYOvj9zlTeBiFw2KGy6/qB1lo1vvwcfShyfpX rZzYiBQ8UjZIS/yffrsP7+D9Utmd9xipIdsOvyv5AhPd1xs9WS47JiNfuLkr70FOnIPD+F fNOVRPPw4hVZKNr+x2AUHQyHFpuxRQdNJTS21m9Ifnt7+iGeDDV98QF37jv76g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RWGOLefIcCK3uanL/TxDzRS8ZuMg1qk19zGuow0Q++k=; b=PAvaqLXxMrPauBpRe6KzZZQehEKL2c4+14sso0qJcamFDEQtoVHqLJ8kTvGn7TVL1yw+lB uDSFAUerPDf4y0g8Aq+k8UT5U3r38cI0BHHnudr1tQc//TntmdThgl6KLlTIMCwBala/MX VgWdmIhwpEdunxhxn21/q/lceWs6ttBPcmYYTyS86ZSgELr71gMIkbiTFAYy4B10HjiHg0 K8OTKy6Pv6g64VvPg3qf0VEBk9gwwN9RWxyTv+mtDjPpru4wiAgcR8l0Wqbx9tn2O04p66 VjjhL7ip+1+hmrnSgOPCMOsnzQJj1dYwFKHovct7ChLul7rIICz+wbj2IoZ39g== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 07/15] net: qrtr: Report endpoint for locally generated messages Date: Tue, 1 Sep 2026 16:19:26 +0300 Message-Id: <20260901131934.225991-8-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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 Signed-off-by: Juha-Matti Tilli --- 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 897ecc8dc304d..da7ccf19c6851 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); @@ -393,6 +395,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) { @@ -744,7 +747,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); @@ -809,8 +813,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) @@ -950,6 +954,7 @@ static int qrtr_bind(struct socket *sock, struct sockad= dr_unsized *saddr, int le =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) { @@ -967,6 +972,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); @@ -981,6 +987,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) { @@ -992,11 +999,11 @@ static int qrtr_bcast_enqueue(struct qrtr_node *node,= 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; } @@ -1004,12 +1011,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; @@ -1093,7 +1103,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 @@ -1127,7 +1137,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.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 9285247ACEB; Tue, 1 Sep 2026 13:21:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268898; cv=pass; b=jiPaTfz97vEA/xOY7HgLsR5mS4wLoxA4zaQ36D31jzwJ99K/dUcICBJZp6xXDEhfK+v6G45jLeUSR7uzqhqgQYi5aQ07x0ELBPKw5zAKOhzlNWR6X3qeZ7mZgRccbDweDBx0gMKDUdwLtZQDNnLRoKfD5UlFgbHRY7P39uVKHw0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268898; c=relaxed/simple; bh=QY1A8D3fH5Ocg0eZmlF5oy360Of+P5EZpl0ZY75wxxc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fgTPGADhSakiK0Pwi1wnIX/Y4GHb8O2+B0yTXT49N0O3PBNMJeXhgR1vPzLBwD6oQSlM4l4y1tFJ6cca4E52XEa87rm6/grxaF5lP4ngZEOFArx+507Q+U4Ke8HkdmGjzaE/6WHDBDRrn3Kl7Y+QNJXi3+fBJMyXkCy3EAnWRX0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=ny2k5K6I; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="ny2k5K6I" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ62L4YKVz49QNC; Tue, 01 Sep 2026 16:21:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LAv/+3HXe4Wk5FPqWwSHvR9+eMlqhJUTF/4hhmmGEYo=; b=ny2k5K6IZlZwNnLUOSQ7kr6uu3bc8x2auRaysFsxg1uTAtxUxI8ijBUDFHNeFh4x/lidi6 b3TL4bQNBP7/XIm4qM626BACSRy69ykUwHa7X6CqJeo4bsfDegV4bMAYxvgGURwVaIej+b OmXKR2gI9siifxnelmlMFxSsnBCU6HU+uuxXFeiGf3Dj9VkXeoCgXj7FQlqEVWilJUm81f CIYZ/IR8zBOgpAWQQLCCDF1Qrd8dAy6h+Ls8Hbqx9DVmSBLFpa6Nkor4SoxOZ/IoJgNox0 gZw4xjqVkqE9XWCTylpmq1BTpIFSEKSBziOGU8dpAGr+gYIKh6M3EHVyoyCYOA== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268890; b=SV97+SH80+8/H9DpiiFhIYeNqmslZAfXnXut01MZHzTUbwkN2VXzE/6yLFbmsXAw653kbS RrhCc89XA6djrj0FZ2afzbB1JKwELBWwKWsjIq4aqKOO/aBgvCpr4rYwL4ZJBEhPkF05tv enzBlLwsElnmK+x5SC7qOnc8my/KIJo8VXZCWkaVz8+40PAQP/+0tT5zTeiWwZnZNvWGBK OyfvaYrj7Pp4VS6TNIjFo5RCDhMgHBA15a775l1v+CreJBOdjmAnamyiumb6hC8PdrL3SB 5VadtlWg4lfPztQ5/H3jUyJAnH9J1ayZmQtbBx0doVgj+f2c1OwgfN4aEnsCTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LAv/+3HXe4Wk5FPqWwSHvR9+eMlqhJUTF/4hhmmGEYo=; b=sLM2JSmWztX45pxU8z1tlQ3ZFTcxxiLvmT9Ae+QdMceeH9KvYbolT227jKamaw9a/+N2CW jRnpCziVwEDwIy5G7f4t8TKZZ7IQgcEPMm7SC2U//9sx4yPRVq9aYI5XvAo0aywwlL9C3/ 4ve/4CdSDXmDDrTTWy5nkYkg9/11PKOJVI1S+tPOWzDKGopHLGJ41wuGJH8B+5tJuH9y3n sIjhoDnwFzzc1r+v2SY0Kuyx2oxUD55GiJh/BnPzr2zvdmWj5NO0L2xyrG3cMUPzJtzrkm koF6x8XmuLTbkFa6dPu3t8DQID0KBTTdogkOSruDxgkTl4sFmxhb47tBVF5rwQ== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 08/15] net: qrtr: Allow sendmsg to target an endpoint Date: Tue, 1 Sep 2026 16:19:27 +0300 Message-Id: <20260901131934.225991-9-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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 Signed-off-by: Juha-Matti Tilli --- 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 da7ccf19c6851..d4a472f0ac4d1 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 */ @@ -448,14 +478,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); @@ -1019,6 +1058,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; @@ -1031,46 +1071,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; } @@ -1109,6 +1151,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; @@ -1123,7 +1166,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 11b897af05e67..22fcecbf8de23 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.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 4FFA247ACEB; Tue, 1 Sep 2026 13:21:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268905; cv=pass; b=oCnDZzg+s95OCAsbLgxNTq2MiSe+qz0ufFqtB2bg6+msytZYc27UVDbF2JTdhGsVMlaCxC3OfExi3Ob+QOGhp1ze53V5YXqJM57CjpeAOoz7VdQF/cW70259FBZtW6vkhhyssiyGrQS7ATI3Dpl65ffKme120+MJFqg7/PeqUa8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268905; c=relaxed/simple; bh=tKWTf1cazHWaXntnYsiXxrJYnrU+iW5fvyj/sDkCDtc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Hy4hm/1fMk/HL76m2TpYo3i4HqpiCRVfypp270BNqWfbkxdg9KoQIc5DEkK3I9v8pUGrkjmsU2pBL2Crp3VqRpc63CB/13M2+qr8v4PAPqnYcdsf7IbBvaY0F7BfDXX2xvWr0N8vyBlTT2CtVtCrjMJSxQJA3Qz+0IUMqd/Y5EA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=RgFq6W1E; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="RgFq6W1E" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ62V0lG1z49QNp; Tue, 01 Sep 2026 16:21:38 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+1zGVynj9H5SONi5WNNQRZuKnULVYkGJU/Lsk8iTgW0=; b=RgFq6W1EfHAeDT9HqtDjC82r1ZHuxvqQmLJTQ3kU4Uhk4gLOujgMpbf4zRDCEA6zJkJS/p VwrjenzmZoGbU8sEOeUW4BugUBoBGDcXrAXhrHkQTPIPVAV6PJuykns1D0kSqXIskDv6S1 IdyuXTNSPi3/pwR0lneJlaQf5YRbT2+S/fU7YyVIfYOYdnteeeK+o/TzzPkW+mmA6mAET/ RvV8fWc+7KmZRIODIF0tCOVvv+pjzpAYyu8eTFANkwyoUhpwbJ4yMpKdQ3WvzHGoOrWW7T 0ibDpC6MOyE/y86+YV3Ht7z4d7iwr4Q8pK7OZqX7p9Khzy1yVCQ+tC+dDsHbTQ== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268898; b=K1xB4FoD+661Ioa4HZ4tX3wRK9++BYIClgyXRKo0OuMtRN1L842IsB1tyWtcR0QfyASAAq wnHj/Xw33817rXH7EwCO3z+mEnt0rzzaDyKUPV97xw1a9PUG2keKP0ZlDAoto50MgZMxMd X3JsNPdHbcV1j3tEhJyOWzw8rLWzllcSia340cgKparfSz1bIDA80uN901t9QCM08i903X EOg2gBQsBe11ynw6T9OjQfo2FTyl+5kzK3CHnjwbrfv/ga0Exq4IkUguuHattZUtNBQ3cY fg9B/I3PVvDgJr1w17ZfyqxUvE6lNnebgixFPHzfhFL9/B+kaixMmky8naLy8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+1zGVynj9H5SONi5WNNQRZuKnULVYkGJU/Lsk8iTgW0=; b=Nxu7K3lAPpg1lB8EJxLsyMAu6QiY4tobSGKZAyHXCNRZZAZPuUX/kMHn25kAp3W2q1LEom Mglkqr7+1JT9Omuo8ZasSOrXBp9J1uKvtu6Ky7CHyQZFG0+rPGCUBJLD1nSkIYRChmX5n1 8y7YYRemuOWtWb0gyMgbHKN+D/MsSfZ4e+/n3eQi84x2XEALNwfoqzsc1Te1MOCtWXCw4e g3z+enJLv2HbRfUnjquQpiKzQV2WqmxkfQcY03Ug4yXDzLGKNkl2EjrAoggQXKlenP3j4N kDdqeMtpSKjvRWchRWfqff7n8BaYefEgiQ/NB0JMnPHgaZmSmm2sj+JOh407jA== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 09/15] net: qrtr: allow socket endpoint binding Date: Tue, 1 Sep 2026 16:19:28 +0300 Message-Id: <20260901131934.225991-10-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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 Signed-off-by: Juha-Matti Tilli --- 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 6d0911984a050..0a8667b049c3d 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 d4a472f0ac4d1..ccfa3ed33a996 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) @@ -656,10 +657,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); @@ -999,29 +1004,41 @@ static int qrtr_local_enqueue(struct qrtr_node *node= , 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. */ @@ -1107,7 +1124,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) { @@ -1385,6 +1403,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; } @@ -1413,6 +1434,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.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 BD0D32253B0; Tue, 1 Sep 2026 13:21:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268916; cv=pass; b=BkBWaUQqTmoE4Gw/m07H15eFDJYLILguBMopSb1Grspue38BP+uTW2GEbP28j/LQuh/dvGaDlu0EfWEZfM4YqXU3Ud6DwZZ49QA5X+ebclN+93kDPOTENDrQ4K7mILNZr4NTdZ3Q/Q/TBERb/gKdsA9rHmtcSjdrvPWPKlLQFfA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268916; c=relaxed/simple; bh=Idzz+qs8f5I+xqu9a7wEtufSLSZ3EedsBKyqg8tf084=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Q8DvejFiPWKHbLVImMK7JkW9z9tcdLgsNLOcKpi/zUrG9LzLZpmNSYIdIuQmni0hv2S8l7ExGFTTrdCmvcoPrQNxNKwnybUaVy9cFmkDo3kJ9Hd9Y0tqCKPlO/fM36gn4C6wSKpe0ddXOPbpi/MhtUkuLnrvIOBC/tSwdaN7JPc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=JonlzZNp; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="JonlzZNp" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ62h06q6z49QNp; Tue, 01 Sep 2026 16:21:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b3qERqGgzrD2T4aK1iBclz+AkDg1ZG2HnPrGpORQgtc=; b=JonlzZNpK6bkbw2AGi1UG8US+bXxlzBWn+qA515cevi+GFi+rwKC1v+DjQrm9K5x/euopk KSJSF4opgQLH4FD329cIGDEOOk5wihhFSld2kORzmAntwqu1MNd89RBKltfNIiWoaGeqoI t3TpA4k+FlvW+HmAAn+gctKdM2+/CMpMfSJuuuvQuEPFwMGL50XYxbmsMwLorWAd3X+vc4 IamyUxLrjqSQwdzH9bZEbv+mMZiMtjZ05nY29R6kLVYEnOIEpOVL7alnSR5duAQJFrxLWI E4PR4VljSYTbLhLRyKcJSS0Ep4UiX/+WRyKRnZ22+N1wkxzeCzgO2ZiwyoND7Q== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268908; b=g1Q0RN/8Ct3Z1jiLfzqRGk+g6utbX8NfMXCis+FpEE2OM9+Ds6uf+UQdIsGaC+8nSY6Oe2 9D9NRSyf1da8Q3EGo4S3pa7jupBic3XPuCZgwzaQKwW3BoItW1FapuCumoKSTH2i/FTRel P485hyXA8D5AngQPVlZPK9ywWmJQXNknUxB5VV6zMKUZcBobdUExFvSxri3I+kXfCnuSaH ZKBoodu6Ri3wmLo0yWFfot3AlYmCA6udjv5krTjswrh06HFVNmqz1dM6gL7LIQML8OtnSc L9kUuCib1YOm3nsoDOQ++3maJ3jwdUz9kPBBjp9Wf0prK2EHWIe7QupWsK4Rfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b3qERqGgzrD2T4aK1iBclz+AkDg1ZG2HnPrGpORQgtc=; b=T9aH6uq+uMjqfzoYUbYIIuveW3WHdu7ISpcnKlZWtjcy1a5Z9zoV8hjINY45pr9afumTGj Opu+PFQFSJ03sBWNiCCGmDTebAIlg7DaPfV0ePe1W3wIn9ppSorlUnaTiRZf/CoVR02yub 5EDwg1no+jI9k21vswvQDrAQsWM8uNjvyBjfWRuRraxYeI2bTuvX7sauzi6qFu/ELQG+yX 5K6IzNYDg4HO/1yCEIzV305fv+nk5xL7mzESwa1jGdjfF8eJZI5nsbvTKbVltUxe7HiYTM boQS7E1xNWgeQ9n4btgI8CltPyxcvP1CT86cdVBq0L/l627aL/v84kjML+eLXw== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 10/15] net: qrtr: Drop remote {NEW|DEL}_LOOKUP messages Date: Tue, 1 Sep 2026 16:19:29 +0300 Message-Id: <20260901131934.225991-11-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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 Signed-off-by: Juha-Matti Tilli --- 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 ccfa3ed33a996..c139786c56f39 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -621,6 +621,11 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const= void *data, size_t len) if (!size || size > len || 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.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 EF10846C4B4; Tue, 1 Sep 2026 13:22:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268925; cv=pass; b=J4QwqQLFG/nUATtgWDGMxMTbm699O8ICt8+eMwoubjOO+EVui7ZHctPpJns7Gtjou82fmmjLe3rbfRSyr4Cef9HfhhMFpaqO47MyZx+z8a9881XQjABXKaOq/UiqDoGSwflOhvXFcoIiDXtG+Zdn7WoN5jF4LSqp11IbD2YT/OA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268925; c=relaxed/simple; bh=UhO4rbYnoct1r2YZkB9LWHyZoeF6UnSvoRQbDqF8O84=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vDlhoyUlrTAaUy9cIo1g8u7DlElxt7qaPWdU7rsL3KeYSSPSyYailj7k9XSzuAO4FUnCAfXo60E2XzypHbxKcyRD6piBQkOcKVoUmOsY67gYsvXCsFA94Z7BMebuwyIrUPmc0pTRbcUK59fAOaCgmX+U8u2Sl0H7ZuZtTQB4OeE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=s87fwfko; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="s87fwfko" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ62r2zBXz49QPH; Tue, 01 Sep 2026 16:21:56 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AaogwBLSAxbtt8J5RK3a15fMJs9TJU/uyNVjcw2tqLM=; b=s87fwfko3Z3nZfHJWwV9htkqAWt8HRbCgpLnc9r7CJD+Z7qYx8o+bTZIvThEzjxsFyY5M0 1NJ7qVPkJQMjGfv4bC6RY+5jTa+CkGEj3kRIV9ujk2kvTgR9But/R5vTdGRLTNre1f/U39 9WWtfAIDvEIyjNUOu+35TSgrnmwlVNtgPiAul5r+dTj8OM8QuYVEpkw4PxTNm/tMa8fDwe pyB/y7f+hmKnkmSh3MZW4IgYlvsi4JvS+x7lJl7+kx9C9/cW54aAaoVyAhUWcaZKZ9/EZX cZHIQx/YhZzEdBqjKeLOKyU4KXQu0KqgLpwlCsKkC5511d1SvUUi4jZHVOtNEg== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268916; b=wInxFf1i49IkbwMEQxfcR+c8nDO9Mba1TqxtCvic9xKXthNmPvy6EdGgVa+Iwg554CsPwS EEs6AKSZNyn52/Nexf9N+jS71PrvsD6y1L6wM7ZVy7Ik0KD93O2MQlYwmIkcpONkdSAuRf L+mTyeJw5a3yq4eyCL/pULneeSlRasGWFzUBprnls+pbg/z7db/61T6m7OgTaBT1melnYR sdkYqsR/dx/A1dqnhGXSksKhuO0yNLoHCWp7WwVcTvGtfD8rtQ3QNVb7d2Rw8Dwh/NWMNR Z1uBxB9Ab8jPWLrODzekL/6GvSEfAw4U+W5Oi4vIGcISSEaZO/F444fUVZrFmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AaogwBLSAxbtt8J5RK3a15fMJs9TJU/uyNVjcw2tqLM=; b=cFLj/Uhn3CJMVXUVXFyHT0kxZVl02f5WMhG6FdUkL8xa16f1Bhcs1Yqe9tObax2lBe6y+u bl+IMXcXxMBzTDbDfGy8O4uMSM5r6nSb+oFpvnlicUu0oVyu6lDz2PWyybIJkoum4ZDF8M p2UguTy9Dz/joRmUEiAUJoN4MPio/W6acuMMCsL44iGBn1XZX4N1EhUIGa/xsuTTF5+6nc /HTmZWCYNylLsGvBqaK/SwFUYzbOriGpJ5cOqCN7+pjZ11zEklGKr/cEmIY04Sx8d6rAPP L+9iWrPUevifOpiUh33yHVejLh7Tu3LkWG+HvYvrkgYFjouGux/99AvvPYEY5A== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 11/15] net: qrtr: ns: support multiple endpoints Date: Tue, 1 Sep 2026 16:19:30 +0300 Message-Id: <20260901131934.225991-12-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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 Signed-off-by: Juha-Matti Tilli --- net/qrtr/af_qrtr.c | 12 ++ net/qrtr/ns.c | 313 ++++++++++++++++++++++++++++----------------- net/qrtr/qrtr.h | 1 + 3 files changed, 209 insertions(+), 117 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index c139786c56f39..b27c5a659795d 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; @@ -1165,6 +1172,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 d544e4998c5d5..d171035b88f69 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; @@ -62,6 +63,7 @@ struct qrtr_server { =20 unsigned int node; unsigned int port; + u32 endpoint_id; =20 struct list_head qli; }; @@ -72,6 +74,11 @@ struct qrtr_node { u32 server_count; }; =20 +struct qrtr_ns_endpoint { + unsigned int id; + struct xarray nodes; +}; + /* Max nodes, server, lookup limits are chosen based on the current platfo= rm * requirements. If the requirement changes in the future, these values ca= n be * increased. @@ -82,35 +89,90 @@ struct qrtr_node { =20 static u16 node_count; =20 -static struct qrtr_node *node_get(unsigned int node_id) +static struct qrtr_node *node_get(u32 endpoint_id, unsigned int node_id) { + struct qrtr_ns_endpoint *endpoint; struct qrtr_node *node; + bool new_endpoint =3D false; + + endpoint =3D xa_load(&endpoints, endpoint_id); + if (!endpoint) { + endpoint =3D kzalloc_obj(*endpoint); + 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; + } =20 - node =3D xa_load(&nodes, node_id); + node =3D xa_load(&endpoint->nodes, node_id); if (node) return node; =20 if (node_count >=3D QRTR_NS_MAX_NODES) { pr_err_ratelimited("QRTR clients exceed max node limit!\n"); - return NULL; + goto error; } =20 /* If node didn't exist, allocate and insert it to the tree */ node =3D kzalloc_obj(*node); 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 node_count++; =20 return node; +error: + if (new_endpoint) { + xa_erase(&endpoints, endpoint_id); + kfree(endpoint); + } + + return NULL; +} + +static void node_erase(u32 endpoint_id, unsigned int node_id) +{ + struct qrtr_ns_endpoint *endpoint; + struct qrtr_node *node; + + endpoint =3D xa_load(&endpoints, endpoint_id); + if (!endpoint) + return; + + node =3D xa_load(&endpoint->nodes, node_id); + if (!node) + return; + + xa_erase(&endpoint->nodes, node_id); + kfree(node); + node_count--; +} + +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); } =20 static int server_match(const struct qrtr_server *srv, @@ -126,19 +188,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); @@ -146,26 +231,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); @@ -173,26 +250,24 @@ 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"); =20 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) + */ =20 memset(&pkt, 0, sizeof(pkt)); pkt.cmd =3D new ? cpu_to_le32(QRTR_TYPE_NEW_SERVER) : @@ -204,28 +279,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; @@ -237,7 +309,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) @@ -249,7 +322,7 @@ static struct qrtr_server *server_add(unsigned int serv= ice, if (!service || !port) return NULL; =20 - node =3D node_get(node_id); + node =3D node_get(endpoint_id, node_id); if (!node) return NULL; =20 @@ -293,7 +366,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; @@ -305,9 +379,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) { @@ -317,7 +392,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); @@ -326,23 +401,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 @@ -350,42 +417,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 =3D 0; =20 - iv.iov_base =3D &pkt; - iv.iov_len =3D sizeof(pkt); - - node =3D node_get(from->sq_node); + node =3D node_get(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_get(qrtr_ns.local_node, qrtr_ns.local_node); if (!local_node) { ret =3D 0; goto delete_node; @@ -400,10 +463,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"); goto delete_node; @@ -414,32 +475,25 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from) ret =3D 0; =20 delete_node: - xa_erase(&nodes, from->sq_node); - kfree(node); - node_count--; + node_erase(endpoint_id, from->sq_node); =20 return ret; } =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; @@ -465,12 +519,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 @@ -484,10 +538,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; @@ -496,7 +548,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) { @@ -511,12 +563,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; @@ -531,13 +587,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) { @@ -553,24 +609,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) @@ -595,22 +649,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; + + xa_for_each(&endpoint->nodes, node_idx, node) { + unsigned long srv_idx; + struct qrtr_server *srv; =20 - lookup_notify(from, srv, true); + 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; @@ -644,6 +706,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; @@ -654,8 +717,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); @@ -668,6 +735,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 @@ -681,25 +758,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), @@ -710,12 +787,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; @@ -749,6 +826,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"); @@ -777,7 +856,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 22fcecbf8de23..b4f50336ae75a 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.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 B47A74756D4; Tue, 1 Sep 2026 13:22:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268933; cv=pass; b=qBUN8Z8ffcUsURl4n1rMSsWGmzdpvsEDwI83nhvNp9ZhSFo6dCf4WZOfsn2npGDdU8texo2Ppd1B/evR7XQ3B71Mk/6CikSxkRZapn6xNFGefEebG4elb9pasUmXo5d4bgjKRCpRDg4lIY8xzR9bZU/HKNSXsfvvcox0pj2MNlk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268933; c=relaxed/simple; bh=rxPegwfWsbhaXnaOfXAiSIbv8UqPN8bqJ9GM2VU5AGA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YFllT6RE0qwSuNbcPImY+T3hVM2f5SlhTpIctZKvSM4BidJgLkT2GufIISk4D4TtZiR+8poxb8Mutm6Txt43r7ZBI28u7ooSIAwQvBN2wN69aKFaTprX7Uao+lO0zonccfPKUwRK0BDsCGnfTEm8f2RiE97KXla//hUerMjzapU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=IwsTI6JM; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="IwsTI6JM" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ630586dz49QPY; Tue, 01 Sep 2026 16:22:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v8dnLpIuawa/T5WKzmKQT35hCSn6pD7KsZ9UF2NkcKc=; b=IwsTI6JMHbpC5lca9qH4KN3Q4gbZhwcXEolhHVNy2Zst00xH+QEheODmdjP8eLnGqgnbTP pA/D5B+83ftSYYfeqXU3hCiwdtCncCE4ns2cnTvtJW9sQZeumVyz7zLP9fRROnOqFqcIZT /MbHHhTpL3w72uMBIl+u+K6WT06bdG3tVxgfnNjZkLoPq+2Ghj298By0v1vsMMpQ5WF+bb v3wl4zr8C4yGKAxSNOMO3/51dFyPbDKu5DshKAxzVDgoqn5HcudMJg1oMexwSpDw8uqJSB jRcWB82xpfKRVWMv4Sb8eRplTxo1qMFzQilN3IBCyPjvv20Ij/f+kzBJH1DDpQ== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268924; b=p0OqZ6mKstN6Pc6ycLMqQnre8mvHLj+YEhdw9y7tXOaG2fxHFg8a2qaLfT7/yWSAN7XxmN h/Qr99Qjn4tV7klCzKBKSxMvlV3X/dZM0ovlA/Y1S/cA46YBk80ZRe23TL+qIFEGvt3S6Y cd4BHZytD1RnX4y2fh8ys+BpnEcdVhj6l0i5qmdmslzGLubRUG4DBY1YG04D33izHEzKvG nb3VyamOFjDCG248eFmM7zRBbRf6LEGM56pbrI3fvMPZtqx0MU50uQjOOfpOm55LliQkKu 2OJTgGMGV5wNP4NSPJ4aC28Ce7QH0bRnG4CsCvpXrHGEY9Vp3JWGQ1RDmNLIVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v8dnLpIuawa/T5WKzmKQT35hCSn6pD7KsZ9UF2NkcKc=; b=WN7tBA5/prja7Bo4RDEJyZCsNSruqbMwlHCAu4vE3CmE8E8hmW/NZXN0a8IGWapTUX3AAB eghX1Gr1Z6964uhCa3OorP0IVB7NOS07FwbG/hC/LzcXE5/GrTZqH/ijq1Et0Sf7M3HqPi hFwDC0ajHhfm6W84Y4+5I4cdT3bTLvUdVCbK83bI/NXzdcPzUuUab/GJqYS8jgoM94X5bN a7TkjL6zTXi/rnWq6f78su2qTxYpmhYVnPT2NPOeAI5jF254O32EsHdIoiLIglrIczHzP5 JTQxIqqeNrGk79kSsWd8551TochjnhRrTN5frDUbb1oCoOv/GoGRp5S5PoIxfQ== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 12/15] net: qrtr: mhi: Report endpoint id in sysfs Date: Tue, 1 Sep 2026 16:19:31 +0300 Message-Id: <20260901131934.225991-13-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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 Signed-off-by: Juha-Matti Tilli --- net/qrtr/mhi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/net/qrtr/mhi.c b/net/qrtr/mhi.c index 3990da1a65dc4..630ce0da060e5 100644 --- a/net/qrtr/mhi.c +++ b/net/qrtr/mhi.c @@ -106,6 +106,16 @@ static int qcom_mhi_qrtr_queue_dl_buffers(struct mhi_d= evice *mhi_dev) return 0; } =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) { @@ -135,6 +145,9 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_d= ev, if (rc) goto err_unregister; =20 + if (device_create_file(&mhi_dev->dev, &dev_attr_endpoint) < 0) + dev_err(qdev->dev, "Failed to create endpoint attribute\n"); + dev_dbg(qdev->dev, "Qualcomm MHI QRTR driver probed\n"); =20 return 0; @@ -151,6 +164,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.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 6D50C472084; Tue, 1 Sep 2026 13:22:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268939; cv=pass; b=LqY26fBymOiyRUvLwfa7D2VX1ninOCbreWwrW9JGbob95EfQlQGcUJ/mShB/lVLieP7VOB07aSTqldOPIphnBrxF49l+5XerRWeWEMOibvg1ayvc9uRHSdN2srE3siIyXndz5mBxJTERO0ABDMX1KX9dk4FFpDGy9fefbH9tPYs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268939; c=relaxed/simple; bh=I6+6D5NMypTbm/L4XqjdnDGV4qktEPqHN7NLR96bzNM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UfxBVJajeXNFregAtNl4Kij9wKYSE4dNjPEu868HByQgqxOCwbRvnDGiFvsHU8q5tcbxUkqCT2RJKu1Sj3GvIbq41bAu+DifxVZXf5o40EcN3tmz776R3JbaihGEuCDJS/qzcNi6KRLQ78rvqIXu6gkA86mnTlW9UNVYq7f+j+E= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=RuEimtTv; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="RuEimtTv" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ6383qPmz49QNp; Tue, 01 Sep 2026 16:22:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PEUjQjjsFci1enYBM15zd0rVQmDzTx8erkfzrvkeXzI=; b=RuEimtTvH2oxN+JjDSCVkH/Tlvg7OReTX5147N9nNJEtapAmiFYHTkkA31yzm9INcm8pL9 m1ZS6YHgHf8HcQRUhWQZpkt6rQMEPCw8Fn1SqldgAIs99e0Jlsn/ZhQdfjJnRit71kBbas F/yAUBCNZNbi2GTJHn1LB/mkAMyb/IFQuaNJ1w92ahj6YybFhUnkHMMW1+fmx1QSPhC4yy zedEJlDGGnQOPKUt1EjcjLfRcYZMNNCIXQSdsfkCqoE0udwKRYSOBmiXiVSj7xiMu5VozI rcx4pNcwm+aqvU4Ux5Z2k2FyLNQ3Neh39nQ6sDQEriiZ4Rezt3wVjglxBaYx5g== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268932; b=wNFe60L9TLBCl7gTDxp+mZRv7lxWcefjmVCEjwxRnltEwV+jByQJ14i7zFtv8IjLccrMkA j23OvDQfNzQsC1KDxU6y1DDszzZscg/myzcP5w38xax7T4xQxJSAFK1eow58VPhdRj7SVc MTmh5wdg7q1O4QPhDXPk8JAn9Fwn74BJikMNe7Dgi9VeVQ8zlfeHp9S3Bh4BWUFOPQkIrW dQRHZ4pLhu+PwFiSoQ4X3H6Dty1Ms8siijGTD+5YLO1neCKU/45u6bKXOECN9TyNkggAOe iqttiWE+pykslDZRajj6CsXg/X5Je1EgErR4t80sUrfjyUrnXFAkJMdQeEwXwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PEUjQjjsFci1enYBM15zd0rVQmDzTx8erkfzrvkeXzI=; b=hZMGYfUykUXDwPZJxxkmDZ3v7MWapGf82YB5NH9/FLwdhMYABGYXiHnHeA7HCLXGhpg+o+ y8IMcRrNWPXrYkDBn6fAQah4zqeVdf+Mh/vWQqhT1tSmKF5tbxFd3REJWhMUaHYBJNTJnb 2ewLk53b/eMv2fmIa6SoRlzwEYxEXHT1C17KB1Le3Ynhli9p3k07nwj99xGI+uD/jvpCD7 OMq9sHhW6TSbcfQJ5bnONfQq+4eQI4h8YbyowXUYxXXQGwdKnL7y+dnFyCqQGyqwvThbpv swSFeTOiQb1rcXzzD2LAu1gsK9/bcIi18v7QRaCTnGikaHm6HfFlw79ikm6zSA== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 13/15] net: qrtr: limit endpoint range to 16 bits on 32-bit machines Date: Tue, 1 Sep 2026 16:19:32 +0300 Message-Id: <20260901131934.225991-14-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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" On 64-bit machines, use the full range for endpoint ids, but on 32-bit machines, use only 16 bits. This gives plenty of endpoints, 65534 to be specific, apart from the invalid zero value and the local endpoint. This should fix any issues where a long-running system with lots of allocations might allocate an endpoint id bigger than 65535 on a 32-bit system. The node id, the secondary part, is already combined with port id into a value that is potentially 32 bits in existing old code. NOTE: please don't merge yet. This commit will have to be either squashed or removed. Signed-off-by: Juha-Matti Tilli --- net/qrtr/af_qrtr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index b27c5a659795d..f1601c0701fdb 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -22,7 +22,11 @@ #define QRTR_MAX_EPH_SOCKET 0x7fff #define QRTR_EPH_PORT_RANGE \ XA_LIMIT(QRTR_MIN_EPH_SOCKET, QRTR_MAX_EPH_SOCKET) +#if BITS_PER_LONG >=3D 64 #define QRTR_ENDPOINT_RANGE XA_LIMIT(qrtr_local_nid + 1, INT_MAX) +#else +#define QRTR_ENDPOINT_RANGE XA_LIMIT(qrtr_local_nid + 1, UINT16_MAX) +#endif =20 #define QRTR_PORT_CTRL_LEGACY 0xffff =20 --=20 2.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 9B8F047ECC1; Tue, 1 Sep 2026 13:22:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268945; cv=pass; b=CiWevPy1yLZCDmuUQIaehE77K7bs17v1FvMbBfEUDPphsNqBbCbq+mo8nNlEDrDq/mB4lhMR56LgVsqkXYyal7LKa4gqHRVsi5HS3ajJkuI2++Ink3am3RQlc905i8uN8HpKVpoSm19qzlAGz5b9D/NfiyQ+ZwI+8Or0dlGA6hU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268945; c=relaxed/simple; bh=WqScErXHLIxXCEjTed+lPGyvHThfPzNMYs1ezWOako8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IGrPYaK2wAOMwTX0QUB1UkzDkGvfMF08uW2dYa5YKli/LaThbFppZ24nCZJGiM1kLiUaWFgPIr8IlAh3fOF2cvn8QoJ5IBnkVjjvEsMFUEsIXpD7Wt2jdx83urlHRcrTioh2+VcE6gimCZptCn19+1OfeZU55PWPBssYQlHAHv0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=Ys4pOgVd; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="Ys4pOgVd" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ63G68JWz49QPY; Tue, 01 Sep 2026 16:22:18 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SJzg4P4QLrj75qtjVLOwYgEJe07MA1YoOLZt79qoTIA=; b=Ys4pOgVdzbseZALIplz9Jqsb6/qT3W7Yvp+NODMaSaCfbyMVZYB3KkBSPUr0YQ9vtAxvcg 3/FrX8P1Qis2Lq/aO9oZeyG02WYQGG3AsC0lwzNw6sg2zkoWKx2sZ9SrYRtFuJXtZVymQX HZPTug0G/mFalMhQETM1UvgZMGodQWIlvZ12jCnPoYEe34/EBIcqXBooQxr/ivuBB9W6Ts igpcAG01w4yHFSLF2eTgO9tk9S5drZvZn2dbeXj4UXT45zRZ1pXP32hMH3QBVjnaGbmBfa yNvzv1O9qCX/GT6nlHasIionM7+2hv7A8wJCYmIVkO+MWg7Fo3o/Eb5KXKWIhA== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268938; b=sEETn95gXP7RItB8nXWiM+2AI8RKy1qlva3xFX6s9CcG3kdDQVK0W9OAtyqojavv9hDcfc YjxM+Sq7fBSm3UfYlVeWML0pg/x+eTUOwUMELORXXSBXDVlWiLEE5DIC7zrpqmFrZNQQym N3T3NM6cd4m5yBq7TNndq2AAHeMi6yVe++G+48nXjEtH7C9+C9r9bf99sUbMsJ88go/NT9 TtBUzw4deOxgJzRhaYaCAG+DqBu9EQTmk1Mkt2NtVQt5KQkHdM5/DFpID5e7IBWuoDUF5q avsrgNCgyNJDy29bZpYW5RaKG7Pah8j9ddr04OXDO3lvpgzQhTo9HgaYqpMxcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SJzg4P4QLrj75qtjVLOwYgEJe07MA1YoOLZt79qoTIA=; b=GD+OTkRo94ka+5cyDWoanhOs+BIhcB9Ae7U3W2xB3sEUIhw+1Jf03rFldCMVEXrq5DS2Rx aUQ07XNcTuEXYa5Qxkkms4pgq0+P6YevRZY7r0eLUbrJNeTJNjdd1aWLpmK8Qw0J4cLKdK LMFwgN15HSLQAJQAWlxrKsbbUfQZEjqi6Lz94+SxYVD0hZbXKKp5CtUMcpsKJbMydaKI6+ mHRPUKa3aQJps+6u7a33/YKsCfkqwz6lnia38VXQr6KBrc87s/09X3MJ3vrn4gGghAhEIW WDRBoh/XVgc5U2aFHxqBbtJqFq9U4ZQdqttWQaM5v8Md0lMPekPDhI038wtKdg== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 14/15] net: qrtr: use nid modulo 65536 in 32-bit lookups Date: Tue, 1 Sep 2026 16:19:33 +0300 Message-Id: <20260901131934.225991-15-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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 node id is chosen by the device firmware, and is generally a small single number. However, there's nothing to prevent the device from choosing a large node id. Use node id modulo 65536 in 32-bit systems to allow it to work in cases where the node id is large. NOTE: please don't merge yet. This commit will have to be either squashed or removed. Signed-off-by: Juha-Matti Tilli --- net/qrtr/af_qrtr.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index f1601c0701fdb..960e6e816be41 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -497,8 +497,11 @@ static struct qrtr_node *qrtr_node_lookup(unsigned int= endpoint_id, unsigned long flags; unsigned long key =3D 0; =20 - if (endpoint_id > QRTR_INDEX_HALF_UNSIGNED_MAX || - nid > QRTR_INDEX_HALF_UNSIGNED_MAX) + /* nid is chosen by device firmware and is generally a single + * and small number. If firmware chooses otherwise, use it + * modulo 65536 in 32-bit systems. + */ + if (endpoint_id > QRTR_INDEX_HALF_UNSIGNED_MAX) return node; =20 key =3D ((unsigned long)(endpoint_id) << QRTR_INDEX_HALF_BITS) | @@ -529,8 +532,11 @@ static int qrtr_node_assign(struct qrtr_node *node, un= signed int nid) if (nid =3D=3D QRTR_EP_NID_AUTO) return 0; =20 - if (node->ep->id > QRTR_INDEX_HALF_UNSIGNED_MAX || - nid > QRTR_INDEX_HALF_UNSIGNED_MAX) + /* nid is chosen by device firmware and is generally a single + * and small number. If firmware chooses otherwise, use it + * modulo 65536 in 32-bit systems. + */ + if (node->ep->id > QRTR_INDEX_HALF_UNSIGNED_MAX) return -EINVAL; =20 spin_lock_irqsave(&qrtr_nodes_lock, flags); --=20 2.34.1 From nobody Sat Sep 26 12:30:56 2026 Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) (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 72DD7429CF3; Tue, 1 Sep 2026 13:22:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=185.185.170.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268953; cv=pass; b=LGdejCNKDaNfWmt78vB0K8uBfmyG6k5+8F06XKLyeexj85KExPE/DBg37yfqDaV1fgfNwhqsjPFRrsqzkz5qNpP5gMJV5y9UuOo/Ci9Rfy+rapLRYhXX9qyUKteK8Ro4vekkzq8iRsYnPYvDtbw63HWuaTXlyLAH5cxZat+Dyiw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788268953; c=relaxed/simple; bh=+uxsxkXjN3Bxpg0NC5tRARwWPNMwOUh37H41hx1uM4A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=b9lAgb5/G80Pc7+Dnxrk+BSGvAiULaYYti3hqzNXb7BjuJ3PIMcw0FPTaobe7oRmihFgktq6Covk5OgG14xm1M4HPT+eb8l5K/deR5y14VKggVd4V+6LgI144WrHIx9+j/SLy96bWgmY/UniHfDTrJcjFC8Ua5Ietjv0Nv83zhc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi; spf=pass smtp.mailfrom=iki.fi; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b=d4xmIgLY; arc=pass smtp.client-ip=185.185.170.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iki.fi Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iki.fi Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=iki.fi header.i=@iki.fi header.b="d4xmIgLY" Received: from mandelbrot.. (xdsl-83-150-90-33.nebulazone.fi [83.150.90.33]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmtilli) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 4hZ63N4gDLz49QPH; Tue, 01 Sep 2026 16:22:24 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HlPgQr/GMs2WGlgIquCEJmPpzMZAme2mzXsO0aoLbe8=; b=d4xmIgLYsZVEAasGsN+hlxLJBwyXjvmTf/UBRKPtEt1L+8ZKatA/aYV5ikd6zJ40V65MvW DXgkpmQfRE1B/jd/IYdoar1M3YzLJorVvcgqNVBRD+QRlu7nTeD5NVgyXT8tNYkc3XXRSk lKRRVfK1/i9ah6MkfJZ9U5mR1tYD7NQnmAz5ZrKsshXUE7Bx+eELqxdCVOcso6pbonivTI BlzPEtMNZFuV97dahY2b3LxeyZO7qLqy0hmKLDut6SlgtKYHS6XttmuD30FJR5BKUUocnt 2LvoIqU2JwOCdAhPK9yXVi6PGMR2frG5b5nHBQn4g+xDM2DoWKs9ylcENEUhWg== ARC-Seal: i=1; a=rsa-sha256; d=iki.fi; s=lahtoruutu; cv=none; t=1788268944; b=hgAMc9tA73oZKHrfFRbuBb/8gscmCCWFWo3KGknAE2ENI9w7Rd/O1EmmB2ccLsRBvMROqz yGE8wnIZSogP3z+giLa5Dfj3oAiahlRRoVIZ8i4qDSHgz/A+3AbwhSDqX4ghzMgntb2905 Xmb2c0eCGK1SJkmQm96X7Z7LW/CRy/L0OQwVy7b54KuYDjQeOiKWLi1sxeBNLf2N3jUF5B Xth0vi0pD/Qd0Vm+WRV7AtsMZlNug+IBgf6Hae6Ia6ossYeKNTjv3iqAZdjsw7PKENIS/H 2KczkB6ZncwOOQc4Dc0whS/ZemhIPyY0zlpLrtqhyu4zjVW7NBZquZwJ1IqFxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1788268944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HlPgQr/GMs2WGlgIquCEJmPpzMZAme2mzXsO0aoLbe8=; b=YVu/z//M0WaOqBEevb0odnG/IR0cY8rOwE4qRJHIgIIYJFpqUDbxptHGHfG/qhMeyDFsS7 QgZmhCarb3Dh6UMWOzd+UXpRGTHVVWClgZjzOQ36BdLmy5vFT+/7bii1TAvQp2/LFqg0B6 t/Zrb/jGmj05WYp4KHyUDqQQRcdr/2jRuVfmsOdhP+/rmPxeFSJL9shMrKYy9QU2xTywTR 8JtZ4wD+41r/bYw2xmOx02+/eKKvBFtOupWadsrCuQv2w49GmZwqNq63uNMZKsG2+vhHtn qHglb2GkMEmXQQWKIIGNM9nbhmqSUkLWnBSZ1ioYR6oin/C522lUm4D46XD+TA== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=jmtilli smtp.mailfrom=juha-matti.tilli@iki.fi From: Juha-Matti Tilli 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 , Marcel Holtmann , Andy Gross , Mihai Moldovan , Denis Kenzior , Juha-Matti Tilli , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 15/15] net: qrtr: solve the 32-bit unsafe use in endpoints Date: Tue, 1 Sep 2026 16:19:34 +0300 Message-Id: <20260901131934.225991-16-juha-matti.tilli@iki.fi> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260901131934.225991-1-juha-matti.tilli@iki.fi> References: <20260901131934.225991-1-juha-matti.tilli@iki.fi> 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" In 32-bit architectures, a single radix tree can have at most 32 bit keys. We're cramming 64 bits in there. To solve this, use a radix tree of radix trees. First, the endpoint is looked up. Secondly, the node is looked up based on the endpoint. Theoretically, there could be the option of skipping the "tree of trees" approach if long is 64 bits. However, this has the drawback that the code would be entirely different on 32-bit and 64-bit architectures, and could create subtle bugs where someone commits and tests modifications on a 64-bit architecture, and suddenly those who use a 32-bit architecture would see them break. This has been tested on a 32-bit ARM machine with two identical ath11k modules, using patches by Mihai Moldovan to allow multiple modules to work in parallel. Signed-off-by: Juha-Matti Tilli Tested-by: Juha-Matti Tilli --- net/qrtr/af_qrtr.c | 118 ++++++++++++++++++++++++++++++--------------- net/qrtr/qrtr.h | 10 ++++ 2 files changed, 89 insertions(+), 39 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index 960e6e816be41..7c50d32b11015 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -22,11 +22,7 @@ #define QRTR_MAX_EPH_SOCKET 0x7fff #define QRTR_EPH_PORT_RANGE \ XA_LIMIT(QRTR_MIN_EPH_SOCKET, QRTR_MAX_EPH_SOCKET) -#if BITS_PER_LONG >=3D 64 #define QRTR_ENDPOINT_RANGE XA_LIMIT(qrtr_local_nid + 1, INT_MAX) -#else -#define QRTR_ENDPOINT_RANGE XA_LIMIT(qrtr_local_nid + 1, UINT16_MAX) -#endif =20 #define QRTR_PORT_CTRL_LEGACY 0xffff =20 @@ -186,6 +182,9 @@ static DEFINE_XARRAY_ALLOC(qrtr_ports); #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) =20 +/* endpoint not defined, i.e. endpoint 0 */ +static struct qrtr_node_lookup_helper helper0; + /** * struct qrtr_node - endpoint node * @ep_lock: lock for endpoint management and callbacks @@ -245,9 +244,11 @@ static void __qrtr_node_release(struct kref *kref) { struct qrtr_node *node =3D container_of(kref, struct qrtr_node, ref); struct radix_tree_iter iter; + struct radix_tree_iter iter2; struct qrtr_tx_flow *flow; unsigned long flags; void __rcu **slot; + void __rcu **slot2; unsigned long index; =20 spin_lock_irqsave(&qrtr_nodes_lock, flags); @@ -255,8 +256,18 @@ static void __qrtr_node_release(struct kref *kref) * multiple entries pointing to our released node, delete them all. */ radix_tree_for_each_slot(slot, &qrtr_nodes, &iter, 0) { - if (*slot =3D=3D node) + struct qrtr_node_lookup_helper *helper =3D *slot; + + if (!helper) + continue; + radix_tree_for_each_slot(slot2, &helper->nodes, &iter2, 0) { + if (*slot2 =3D=3D node) + radix_tree_iter_delete(&helper->nodes, &iter2, slot2); + } + if (helper !=3D &helper0 && radix_tree_empty(&helper->nodes)) { radix_tree_iter_delete(&qrtr_nodes, &iter, slot); + helper->added =3D 0; + } } spin_unlock_irqrestore(&qrtr_nodes_lock, flags); =20 @@ -494,22 +505,14 @@ static struct qrtr_node *qrtr_node_lookup(unsigned in= t endpoint_id, unsigned int nid) { struct qrtr_node *node =3D NULL; + struct qrtr_node_lookup_helper *helper =3D NULL; unsigned long flags; - unsigned long key =3D 0; - - /* nid is chosen by device firmware and is generally a single - * and small number. If firmware chooses otherwise, use it - * modulo 65536 in 32-bit systems. - */ - if (endpoint_id > 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, key); + helper =3D radix_tree_lookup(&qrtr_nodes, endpoint_id); + if (helper) + node =3D radix_tree_lookup(&helper->nodes, nid); node =3D qrtr_node_acquire(node); spin_unlock_irqrestore(&qrtr_nodes_lock, flags); mutex_unlock(&qrtr_node_lock); @@ -527,33 +530,45 @@ static struct qrtr_node *qrtr_node_lookup(unsigned in= t endpoint_id, static int qrtr_node_assign(struct qrtr_node *node, unsigned int nid) { unsigned long flags; - unsigned long key; + int rc =3D 0; + int did_insert0 =3D 0; =20 if (nid =3D=3D QRTR_EP_NID_AUTO) return 0; =20 - /* nid is chosen by device firmware and is generally a single - * and small number. If firmware chooses otherwise, use it - * modulo 65536 in 32-bit systems. - */ - if (node->ep->id > QRTR_INDEX_HALF_UNSIGNED_MAX) - return -EINVAL; - spin_lock_irqsave(&qrtr_nodes_lock, flags); =20 - /* 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 (!radix_tree_lookup(&helper0.nodes, nid)) { + rc =3D radix_tree_insert(&helper0.nodes, nid, node); + if (rc) + goto err_lock; + did_insert0 =3D 1; + } + if (!node->ep->helper.added) { + INIT_RADIX_TREE(&node->ep->helper.nodes, GFP_ATOMIC); + rc =3D radix_tree_insert(&qrtr_nodes, node->ep->id, + &node->ep->helper); + if (rc) + goto err_insert0; + node->ep->helper.added =3D 1; + } + rc =3D radix_tree_insert(&node->ep->helper.nodes, nid, node); + if (rc && rc !=3D -EEXIST) + goto err_insert0; // Don't revert helper insertion =20 if (node->nid =3D=3D QRTR_EP_NID_AUTO) node->nid =3D nid; spin_unlock_irqrestore(&qrtr_nodes_lock, flags); =20 return 0; + +err_insert0: + if (did_insert0) + radix_tree_delete(&helper0.nodes, nid); + +err_lock: + spin_unlock_irqrestore(&qrtr_nodes_lock, flags); + return rc; } =20 /** @@ -773,6 +788,7 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, un= signed int nid) mutex_unlock(&qrtr_node_lock); ep->node =3D node; ep->id =3D endpoint_id; + ep->helper.added =3D 0; =20 return 0; free_node: @@ -791,12 +807,14 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *e= p) struct sockaddr_qrtr src =3D {AF_QIPCRTR, node->nid, QRTR_PORT_CTRL}; struct sockaddr_qrtr dst =3D {AF_QIPCRTR, qrtr_local_nid, QRTR_PORT_CTRL}; struct radix_tree_iter iter; + struct radix_tree_iter iter2; struct qrtr_ctrl_pkt *pkt; struct qrtr_tx_flow *flow; struct sk_buff *skb; unsigned long flags; unsigned long index; void __rcu **slot; + void __rcu **slot2; u32 endpoint_id; =20 mutex_lock(&node->ep_lock); @@ -807,16 +825,28 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *e= p) /* Notify the local controller about the event */ spin_lock_irqsave(&qrtr_nodes_lock, flags); radix_tree_for_each_slot(slot, &qrtr_nodes, &iter, 0) { - if (*slot !=3D node) + struct qrtr_node_lookup_helper *helper =3D *slot; + + if (!helper) continue; - src.sq_node =3D iter.index; - 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, endpoint_id, - QRTR_TYPE_BYE, &src, &dst); + radix_tree_for_each_slot(slot2, &helper->nodes, &iter2, 0) { + if (*slot2 !=3D node) + continue; + src.sq_node =3D iter.index; + 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, endpoint_id, + QRTR_TYPE_BYE, &src, &dst); + } } } + if (ep->helper.added) { + radix_tree_for_each_slot(slot, &ep->helper.nodes, &iter, 0) + radix_tree_iter_delete(&ep->helper.nodes, &iter, slot); + radix_tree_delete(&qrtr_nodes, ep->id); + ep->helper.added =3D 0; + } spin_unlock_irqrestore(&qrtr_nodes_lock, flags); =20 /* Wake up any transmitters waiting for resume-tx from the node */ @@ -1593,8 +1623,17 @@ static int __init qrtr_proto_init(void) if (rc) goto err_sock; =20 + rc =3D radix_tree_insert(&qrtr_nodes, 0, &helper0); + if (rc) + goto err_ns; + + INIT_RADIX_TREE(&helper0.nodes, GFP_ATOMIC); + helper0.added =3D 1; + return 0; =20 +err_ns: + qrtr_ns_remove(); err_sock: sock_unregister(qrtr_family.family); err_proto: @@ -1605,6 +1644,7 @@ postcore_initcall(qrtr_proto_init); =20 static void __exit qrtr_proto_fini(void) { + radix_tree_delete(&qrtr_nodes, 0); qrtr_ns_remove(); sock_unregister(qrtr_family.family); proto_unregister(&qrtr_proto); diff --git a/net/qrtr/qrtr.h b/net/qrtr/qrtr.h index b4f50336ae75a..affc24f426c64 100644 --- a/net/qrtr/qrtr.h +++ b/net/qrtr/qrtr.h @@ -9,6 +9,15 @@ struct sk_buff; /* endpoint node id auto assignment */ #define QRTR_EP_NID_AUTO (-1) =20 +/** + * struct qrtr_node_lookup_helper - node lookup helper, stored in qrtr_nod= es + * @nodes: nodes, indexed by node_id + */ +struct qrtr_node_lookup_helper { + int added; + struct radix_tree_root nodes; +}; + /** * struct qrtr_endpoint - endpoint handle * @xmit: Callback for outgoing packets @@ -21,6 +30,7 @@ struct qrtr_endpoint { int (*xmit)(struct qrtr_endpoint *ep, struct sk_buff *skb); /* private: not for endpoint use */ struct qrtr_node *node; + struct qrtr_node_lookup_helper helper; u32 id; }; =20 --=20 2.34.1