From nobody Mon Oct 6 01:22:04 2025 Received: from mail.ionic.de (ionic.de [145.239.234.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A179F277038; Mon, 28 Jul 2025 16:45:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=145.239.234.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; cv=none; b=lNrmYh5jmZC1r9neVnpVp5QVPtgXQFMwjXljGAbYg3C1s7sVnz6j0ovJFvyfbeFYVOgLofYkyXRs3ABRPwvHFVm0v62bwh3a5Ks8wTt7AnI0A3cE/nN3AD4mTRe83AMzoggQ4ftRBN1gd7fmtzKYe1t6kL2ubIDFq2GQgFvmbb4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753721151; c=relaxed/simple; bh=JPMslWVqDy+ljzsJ3MPzFaKkALDoqTwGQnGVlmfNCXs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TA4q/DRkCoNA39+Hy4OWqj+5CY3aA2Y3hkZ96LiJ43F9ZPDM8Jqhd1bj6Qo5T6znqk60pCo1W5f69tdAtZ5f9mVfRoUedL75iOftunoCg+FcGkNA9FHlVysygIeVY4Ax1J3pvypILI/eWB87wjC8MzwUXKCDT6IaLzo4s7JCLAw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de; spf=pass smtp.mailfrom=ionic.de; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b=M5XO60qA; arc=none smtp.client-ip=145.239.234.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ionic.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionic.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ionic.de header.i=@ionic.de header.b="M5XO60qA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ionic.de; s=default; t=1753721139; bh=JPMslWVqDy+ljzsJ3MPzFaKkALDoqTwGQnGVlmfNCXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M5XO60qAxVIkW1V48KKd4hCB7DnIhoJ5AH1L+aqoqps0K71kNGSLhwpl8WFebpZd8 jgNfPJSbv9dr9TawKE6/wdgoIO1yRRWMGMphhCYGcUI26P0SPsevBtQ3Mbp4XeTPGw CI4pVRvGMAWGGA/zx4gE6o2PFINnTRMag68Ak41A= Received: from grml.local.home.ionic.de (unknown [IPv6:2a00:11:fb41:7a00:21b:21ff:fe5e:dddc]) by mail.ionic.de (Postfix) with ESMTPSA id 12BBA1488DAD; Mon, 28 Jul 2025 18:45:39 +0200 (CEST) From: Mihai Moldovan To: linux-arm-msm@vger.kernel.org, Manivannan Sadhasivam Cc: Denis Kenzior , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S . Miller" , Jakub Kicinski , Simon Horman , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v4 08/11] net: qrtr: allow socket endpoint binding Date: Mon, 28 Jul 2025 18:45:25 +0200 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Denis Kenzior Introduce the ability to bind a QIPCRTR family socket to a specific endpoint. When a socket is bound, only messages from the bound endpoint can be received, and any messages sent from the socket are by default directed to the bound endpoint. Clients can bind a socket by using the setsockopt system call with the QRTR_BIND_ENDPOINT option set to the desired endpoint binding. A previously set binding can be reset by setting QRTR_BIND_ENDPOINT option to zero. This behavior matches that of SO_BINDTOIFINDEX. This functionality is useful for clients that need to communicate with a specific device (i.e. endpoint), such as a PCIe-based 5G modem, and are not interested in messages from other endpoints / nodes. Signed-off-by: Denis Kenzior Reviewed-by: Marcel Holtmann Reviewed-by: Andy Gross Signed-off-by: Mihai Moldovan --- v4: - rebase against earlier changes - Link to v3: https://msgid.link/b523ece3e16dc4c8a9acf740aba5270227a2a2b8= .1753313000.git.ionic@ionic.de v3: - rebase against current master - Link to v2: https://msgid.link/c914eae5bd8d4a3924cc3c00c1dd5810024678f5= .1752947108.git.ionic@ionic.de v2: - rebase against current master - use WRITE_ONCE() to write value in qrtr_setsockopt() and READ_ONCE() to read it in qrtr_getsockopt() as per review comment - Link to v1: https://msgid.link/20241018181842.1368394-8-denkenz@gmail.c= om --- include/uapi/linux/qrtr.h | 1 + net/qrtr/af_qrtr.c | 56 ++++++++++++++++++++++++++++----------- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h index 6d0911984a05..0a8667b049c3 100644 --- a/include/uapi/linux/qrtr.h +++ b/include/uapi/linux/qrtr.h @@ -48,6 +48,7 @@ struct qrtr_ctrl_pkt { =20 /* setsockopt / getsockopt */ #define QRTR_REPORT_ENDPOINT 1 +#define QRTR_BIND_ENDPOINT 2 =20 /* CMSG */ #define QRTR_ENDPOINT 1 diff --git a/net/qrtr/af_qrtr.c b/net/qrtr/af_qrtr.c index fa88a8ed4d8c..a7ab445416e4 100644 --- a/net/qrtr/af_qrtr.c +++ b/net/qrtr/af_qrtr.c @@ -98,6 +98,7 @@ struct qrtr_sock { struct sockaddr_qrtr us; struct sockaddr_qrtr peer; unsigned long flags; + u32 bound_endpoint; }; =20 static inline struct qrtr_sock *qrtr_sk(struct sock *sk) @@ -664,10 +665,14 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, cons= t void *data, size_t len) goto err; } =20 - ret =3D sock_queue_rcv_skb(&ipc->sk, skb); - if (ret) { - qrtr_port_put(ipc); - goto err; + /* Sockets bound to an endpoint only rx from that endpoint */ + if (!ipc->bound_endpoint || + ipc->bound_endpoint =3D=3D cb->endpoint_id) { + ret =3D sock_queue_rcv_skb(&ipc->sk, skb); + if (ret) { + qrtr_port_put(ipc); + goto err; + } } =20 qrtr_port_put(ipc); @@ -1008,29 +1013,41 @@ static int qrtr_local_enqueue(struct qrtr_node *nod= e, struct sk_buff *skb, { struct qrtr_sock *ipc; struct qrtr_cb *cb; + int ret =3D -ENODEV; =20 ipc =3D qrtr_port_lookup(to->sq_port); - if (!ipc || &ipc->sk =3D=3D skb->sk) { /* do not send to self */ - if (ipc) - qrtr_port_put(ipc); - kfree_skb(skb); - return -ENODEV; - } + if (!ipc) + goto done; + + if (&ipc->sk =3D=3D skb->sk) /* do not send to self */ + goto done; + + /* + * Filter out unwanted packets that are not on behalf of the bound + * endpoint. Certain special packets (such as an empty NEW_SERVER + * packet that serves as a sentinel value) always go through. + */ + if (endpoint_id && ipc->bound_endpoint && + ipc->bound_endpoint !=3D endpoint_id) + goto done; =20 cb =3D (struct qrtr_cb *)skb->cb; cb->src_node =3D from->sq_node; cb->src_port =3D from->sq_port; cb->endpoint_id =3D endpoint_id; =20 - if (sock_queue_rcv_skb(&ipc->sk, skb)) { - qrtr_port_put(ipc); - kfree_skb(skb); - return -ENOSPC; - } + ret =3D -ENOSPC; + if (sock_queue_rcv_skb(&ipc->sk, skb)) + goto done; =20 qrtr_port_put(ipc); =20 return 0; +done: + if (ipc) + qrtr_port_put(ipc); + kfree_skb(skb); + return ret; } =20 /* Queue packet for broadcast. */ @@ -1116,7 +1133,8 @@ static int qrtr_sendmsg(struct socket *sock, struct m= sghdr *msg, size_t len) } else if (addr->sq_node =3D=3D ipc->us.sq_node) { enqueue_fn =3D qrtr_local_enqueue; } else { - endpoint_id =3D msg_endpoint_id; + endpoint_id =3D msg_endpoint_id ? + msg_endpoint_id : ipc->bound_endpoint; =20 node =3D qrtr_node_lookup(endpoint_id, addr->sq_node); if (!node) { @@ -1392,6 +1410,9 @@ static int qrtr_setsockopt(struct socket *sock, int l= evel, int optname, case QRTR_REPORT_ENDPOINT: assign_bit(QRTR_F_REPORT_ENDPOINT, &ipc->flags, val); break; + case QRTR_BIND_ENDPOINT: + WRITE_ONCE(ipc->bound_endpoint, val); + break; default: rc =3D -ENOPROTOOPT; } @@ -1420,6 +1441,9 @@ static int qrtr_getsockopt(struct socket *sock, int l= evel, int optname, case QRTR_REPORT_ENDPOINT: val =3D test_bit(QRTR_F_REPORT_ENDPOINT, &ipc->flags); break; + case QRTR_BIND_ENDPOINT: + val =3D READ_ONCE(ipc->bound_endpoint); + break; default: rc =3D -ENOPROTOOPT; } --=20 2.50.0