From nobody Mon Oct 6 16:44:54 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3FFD4289807; Sat, 19 Jul 2025 18:59:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752951586; cv=none; b=GadYpqkU75FaNx7egMQlQREJKim9wXUy2E83RGlDTejPPHIarqxhOYWrCaFFAmNbA3s+Q0s1X5g3Y0Y0hVJFI3N6eaiqVhWGpORqmhmVrwHMT9BR64Y8GO2Wir1b3nOIyu4IRm7JpXABPLZK8C/oiM2M+6gj6kTPnALt+Hp6wdM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752951586; c=relaxed/simple; bh=mV7GQS0iwGZftpO5TApRBNnsCQNb0W2GiCFCZfqenU4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BjOwwfmIt/3AJ3YgVbsb3vulAgHoLycJzJjpi03+92BKiI5GSIIasHuLaEGZK+f19tYdCfbyesS6mey+YRF/TK7ERI/iGs2JN4bDefg5eOwPdFK3JfzcwOfsxN2JEDmtKl6FSUjHjAfU415cDA3Af90ZHKDk2AI1O8tAV/dcQAk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=TZlj2yk3; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="TZlj2yk3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1752951578; bh=mV7GQS0iwGZftpO5TApRBNnsCQNb0W2GiCFCZfqenU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TZlj2yk3C9LOQMwU/hLxI7t91y6ulvFBDLdVp19Fkx0y/OjOzy/yZLLLx4kGtlIoj NCQBnL91QCZMFy4Q2W53ZcLeVITSAPy6FuK1pi15vhdUuelzaQ5l4hgbIlYEWp/s+n bRYCQeVS9xR3OEu5AuQagFvryyyj8VuLlB4hcl0c= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id 2EE9F148909C; Sat, 19 Jul 2025 20:59:38 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 06/10] net: qrtr: Allow sendmsg to target an endpoint Date: Sat, 19 Jul 2025 20:59:26 +0200 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior Allow QIPCRTR family sockets to include QRTR_ENDPOINT auxiliary data as part of the sendmsg system call. By including this parameter, the client can ask the kernel to route the message to a given endpoint, in situations where multiple endpoints with conflicting node identifier sets exist in the system. For legacy clients, or clients that do not include QRTR_ENDPOINT data, the endpoint is looked up, as before, by only using the node identifier of the destination qrtr socket address. Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan --- v2: - rebase against current master - no action on review comment regarding initializing out_endpoint_id, since that's rightfully already being done --- net/qrtr/af_qrtr.c | 80 +++++++++++++++++++++++++++++++++------------- net/qrtr/qrtr.h | 2 ++ 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index f66f1178df96..f610e697aa09 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 */ @@ -404,14 +434,16 @@ 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; unsigned long flags; + unsigned long key =3D (unsigned long)endpoint_id << 32 | nid; =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); @@ -953,6 +985,7 @@ static int qrtr_sendmsg(struct socket *sock, struct msg= hdr *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; @@ -965,46 +998,48 @@ static int qrtr_sendmsg(struct socket *sock, struct m= sghdr *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; } @@ -1043,6 +1078,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; @@ -1057,7 +1093,7 @@ static int qrtr_send_resume_tx(struct qrtr_cb *cb) struct sk_buff *skb; int ret; =20 - node =3D qrtr_node_lookup(remote.sq_node); + node =3D qrtr_node_lookup(cb->endpoint_id, remote.sq_node); if (!node) return -EINVAL; =20 diff --git a/net/qrtr/qrtr.h b/net/qrtr/qrtr.h index 11b897af05e6..22fcecbf8de2 100644 --- a/net/qrtr/qrtr.h +++ b/net/qrtr/qrtr.h @@ -34,4 +34,6 @@ int qrtr_ns_init(void); =20 void qrtr_ns_remove(void); =20 +int qrtr_msg_get_endpoint(struct msghdr *msg, u32 *out_endpoint_id); + #endif --=20 2.50.0