From nobody Sun Oct 5 01:47:25 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 7B77D1C7005; Tue, 12 Aug 2025 01:35:57 +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=1754962561; cv=none; b=WPgsebn6EvrxN3NslTZMNJFhOVbrs/McHgI3XXRMMQHM2bU2xS2HNJzS9BGS2BCtrnOCqY/zoz5JLUMvw/wj28bYeD8y4C/Akrd1vQ3Vqu/T+3mEiKs+Kn6EFT3I5dQ4K7BQCEMIh6Miqe4xO1oqIIaQMmUIjOdvkPWTdlSwfcs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754962561; c=relaxed/simple; bh=KaZ9wvJ2/J2yLTczJ7/mHJuawhEIvHX83gedA3DHxZA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LVkYLeyXuioEVSMTnzP9t9vcGxwV01rvl4clAOZbF3r4VjqpkvPP820bhaYndNiUO9iqoRBgnWFSPO2lyU0ytADYHFlXlUIacxQ0yIaVZden6ddElhttgvCh1kuZ+d56xDDNmOv9uSBAO4UY2J0r65q4LOR0ASqp0Lt8pObWle0= 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=hi4mNLC4; 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="hi4mNLC4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1754962549; bh=KaZ9wvJ2/J2yLTczJ7/mHJuawhEIvHX83gedA3DHxZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hi4mNLC4han/uC3sng8LAebF/KruPaYaSB/3iwRw8qDnNOablviU/rKRgjno+1mnj UonbGUs+7XWQMqI8sDpaInyd/S4AutnGjWfWnCBjrOH7EdejXxcXYpOYDrJ1BsluZe fy6mo/GesXecVv15UrKKpMs5+IyZ7Ds0nmKrbKuM= 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 51D491488DB7; Tue, 12 Aug 2025 03:35:49 +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 v5 05/11] net: qrtr: Report sender endpoint in aux data Date: Tue, 12 Aug 2025 03:35:31 +0200 Message-ID: <4492b2ea7f2db4d704c2ec3a63e106bf57816074.1754962437.git.ionic@ionic.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior 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 --- v5: - no changes - Link to v4: https://msgid.link/aa1fbb89108cd05874c2de6cbc35ec5dc303cac6= .1753720934.git.ionic@ionic.de v4: - no changes - Link to v3: https://msgid.link/30c2c4547108dd0baa638f8ed3cf493a3bc06bc2= .1753312999.git.ionic@ionic.de v3: - rebase against current master - fix checkpatch.pl whitespace warning - Link to v2: https://msgid.link/8dc0c9f99f617db348af5b176bb03b4c11ac9138= .1752947108.git.ionic@ionic.de v2: - rebase against current master - dropped socket locking in qrtr_setsockopt() and qrtr_getsockopt() as per review comment - Link to v1: https://msgid.link/20241018181842.1368394-5-denkenz@gmail.c= om --- include/linux/socket.h | 1 + include/uapi/linux/qrtr.h | 6 +++ net/qrtr/af_qrtr.c | 77 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/include/linux/socket.h b/include/linux/socket.h index 3b262487ec06..0698a11bb2e2 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -386,6 +386,7 @@ struct ucred { #define SOL_MCTP 285 #define SOL_SMC 286 #define SOL_VSOCK 287 +#define SOL_QRTR 288 =20 /* IPX options */ #define IPX_TYPE 1 diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h index f7e2fb3d752b..6d0911984a05 100644 --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h @@ -46,4 +46,10 @@ struct qrtr_ctrl_pkt { }; } __packed; =20 +/* setsockopt / getsockopt */ +#define QRTR_REPORT_ENDPOINT 1 + +/* CMSG */ +#define QRTR_ENDPOINT 1 + #endif /* _LINUX_QRTR_H */ diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index fdf05b6509b5..e114489dbd36 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -26,6 +26,10 @@ =20 #define QRTR_PORT_CTRL_LEGACY 0xffff =20 +enum { + QRTR_F_REPORT_ENDPOINT, +}; + /** * struct qrtr_hdr_v1 - (I|R)PCrouter packet header version 1 * @version: protocol version @@ -79,6 +83,7 @@ struct qrtr_cb { u32 src_port; u32 dst_node; u32 dst_port; + u32 endpoint_id; =20 u8 type; u8 confirm_rx; @@ -92,6 +97,7 @@ struct qrtr_sock { struct sock sk; struct sockaddr_qrtr us; struct sockaddr_qrtr peer; + unsigned long flags; }; =20 static inline struct qrtr_sock *qrtr_sk(struct sock *sk) @@ -575,6 +581,8 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const = void *data, size_t len) if (cb->dst_port =3D=3D QRTR_PORT_CTRL_LEGACY) cb->dst_port =3D QRTR_PORT_CTRL; =20 + cb->endpoint_id =3D ep->id; + if (!size || len !=3D ALIGN(size, 4) + hdrlen) goto err; =20 @@ -1137,6 +1145,7 @@ static int qrtr_recvmsg(struct socket *sock, struct m= sghdr *msg, size_t size, int flags) { DECLARE_SOCKADDR(struct sockaddr_qrtr *, addr, msg->msg_name); + struct qrtr_sock *ipc =3D qrtr_sk(sock->sk); struct sock *sk =3D sock->sk; struct sk_buff *skb; struct qrtr_cb *cb; @@ -1162,6 +1171,10 @@ static int qrtr_recvmsg(struct socket *sock, struct = msghdr *msg, msg->msg_flags |=3D MSG_TRUNC; } =20 + if (cb->endpoint_id && test_bit(QRTR_F_REPORT_ENDPOINT, &ipc->flags)) + put_cmsg(msg, SOL_QRTR, QRTR_ENDPOINT, + sizeof(cb->endpoint_id), &cb->endpoint_id); + rc =3D skb_copy_datagram_msg(skb, 0, msg, copied); if (rc < 0) goto out; @@ -1307,6 +1320,68 @@ static int qrtr_ioctl(struct socket *sock, unsigned = int cmd, unsigned long arg) return rc; } =20 +static int qrtr_setsockopt(struct socket *sock, int level, int optname, + sockptr_t optval, unsigned int optlen) +{ + struct qrtr_sock *ipc =3D qrtr_sk(sock->sk); + unsigned int val =3D 0; + int rc =3D 0; + + if (level !=3D SOL_QRTR) + return -ENOPROTOOPT; + + if (optlen >=3D sizeof(val) && + copy_from_sockptr(&val, optval, sizeof(val))) + return -EFAULT; + + switch (optname) { + case QRTR_REPORT_ENDPOINT: + assign_bit(QRTR_F_REPORT_ENDPOINT, &ipc->flags, val); + break; + default: + rc =3D -ENOPROTOOPT; + } + + return rc; +} + +static int qrtr_getsockopt(struct socket *sock, int level, int optname, + char __user *optval, int __user *optlen) +{ + struct qrtr_sock *ipc =3D qrtr_sk(sock->sk); + unsigned int val; + int len; + int rc =3D 0; + + if (level !=3D SOL_QRTR) + return -ENOPROTOOPT; + + if (get_user(len, optlen)) + return -EFAULT; + + if (len < sizeof(val)) + return -EINVAL; + + switch (optname) { + case QRTR_REPORT_ENDPOINT: + val =3D test_bit(QRTR_F_REPORT_ENDPOINT, &ipc->flags); + break; + default: + rc =3D -ENOPROTOOPT; + } + + if (rc) + return rc; + + len =3D sizeof(int); + + if (put_user(len, optlen) || + copy_to_user(optval, &val, len)) + rc =3D -EFAULT; + + return rc; +} + static int qrtr_release(struct socket *sock) { struct sock *sk =3D sock->sk; @@ -1354,6 +1429,8 @@ static const struct proto_ops qrtr_proto_ops =3D { .shutdown =3D sock_no_shutdown, .release =3D qrtr_release, .mmap =3D sock_no_mmap, + .setsockopt =3D qrtr_setsockopt, + .getsockopt =3D qrtr_getsockopt, }; =20 static struct proto qrtr_proto =3D { --=20 2.50.0