From nobody Mon Feb 9 16:01:56 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E2ADC77B7A for ; Wed, 31 May 2023 00:36:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233090AbjEaAf6 (ORCPT ); Tue, 30 May 2023 20:35:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231417AbjEaAfx (ORCPT ); Tue, 30 May 2023 20:35:53 -0400 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21231100 for ; Tue, 30 May 2023 17:35:22 -0700 (PDT) Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-64d18d772bdso5888772b3a.3 for ; Tue, 30 May 2023 17:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1685493310; x=1688085310; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=MBkrJyItUyRhzT4bmma9mx6Vol4nebGHcShs2lGo94w=; b=iNlH0QtHTTTATAr/k26z3SJPVDTebYiG6fymyCkFevXaG4+jxrcnCVh1ZMFSU0YBxI fKWERi5FViCQU8d7y3jUstV3BQ7uu1gzZgc6jaQQMlrT/WjCJSV0s9gcgbZ7F4sk0gMc 8TH8mWJEBwZw5aZEJ9srsIBYLl64BUOCfXEfbBDG8R18uL84tUW4hPQvv68ajCiWv+Mb jATKIcEpG7F3330JlQBhFtYdPmRnELcCN3grPIDYhLzrPDvT63St2pFpMiOrQzedZsIJ dKUQwv6h6mblByxwqiv+AJraQpQ6Nm+Tjrr9TJTZoVAr8ZuNLFnnwzZrl8DyRF3H/T6c +UhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685493310; x=1688085310; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MBkrJyItUyRhzT4bmma9mx6Vol4nebGHcShs2lGo94w=; b=l26j8icE6MK6KFCiKFaXTaTZSpBkagxZB5JKONjH/eKeA7E1/Jj8/3Vj1tHSbj1A+Q bXf3gnVCjlg8p9yvUyfWFnYQFa45yGQZdcUZS96Qnk6QJWhibGqso6Q0D4dlVpTzE6ao V1aJrxrcpL0vyikjy4xb519bK1Nyr7MrmTJGsXD+z9cZFl92Z2Jzot9q/jhQPWCyyR6p 06JKMoHHCiNq08SeuM5L1Xni81S9z2D0W1D/IBXj4E6Il48+R/yVINJNxmAvIKgdHU9t PMGt7GQ82/67eWMYtewFO50HLiN+FI8aKG8Tv4SFNDqgkbjhGaa+Kn6vbt7LhT4kP3TV tDQA== X-Gm-Message-State: AC+VfDy75CMnmPFgntdGt472tkznLVQKHzx98xJyqk7XV0hDkKVIJhSf 8x03I7w3AOO5wXPTHg0LsHjung== X-Google-Smtp-Source: ACHHUZ4tg6+fPh5E3zaS1dhuSUW1MyU7mic0eiffTdvmQiYap1qyPWZJUDXhr3lJ6bSbLOzR9CQfpQ== X-Received: by 2002:a05:6a00:2ea9:b0:64c:4f2f:a235 with SMTP id fd41-20020a056a002ea900b0064c4f2fa235mr4899127pfb.30.1685493309676; Tue, 30 May 2023 17:35:09 -0700 (PDT) Received: from [172.17.0.2] (c-67-170-131-147.hsd1.wa.comcast.net. [67.170.131.147]) by smtp.gmail.com with ESMTPSA id j12-20020a62b60c000000b0064cb0845c77sm2151340pff.122.2023.05.30.17.35.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 17:35:09 -0700 (PDT) From: Bobby Eshleman Date: Wed, 31 May 2023 00:35:05 +0000 Subject: [PATCH RFC net-next v3 1/8] vsock/dgram: generalize recvmsg and drop transport->dgram_dequeue MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230413-b4-vsock-dgram-v3-1-c2414413ef6a@bytedance.com> References: <20230413-b4-vsock-dgram-v3-0-c2414413ef6a@bytedance.com> In-Reply-To: <20230413-b4-vsock-dgram-v3-0-c2414413ef6a@bytedance.com> To: Stefan Hajnoczi , Stefano Garzarella , "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Bryan Tan , Vishnu Dasa , VMware PV-Drivers Reviewers Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, Bobby Eshleman X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit drops the transport->dgram_dequeue callback and makes vsock_dgram_recvmsg() generic. It also adds additional transport callbacks for use by the generic vsock_dgram_recvmsg(), such as for parsing skbs for CID/port which vary in format per transport. Signed-off-by: Bobby Eshleman --- drivers/vhost/vsock.c | 4 +- include/linux/virtio_vsock.h | 3 ++ include/net/af_vsock.h | 13 ++++++- net/vmw_vsock/af_vsock.c | 51 ++++++++++++++++++++++++- net/vmw_vsock/hyperv_transport.c | 17 +++++++-- net/vmw_vsock/virtio_transport.c | 4 +- net/vmw_vsock/virtio_transport_common.c | 18 +++++++++ net/vmw_vsock/vmci_transport.c | 68 +++++++++++++----------------= ---- net/vmw_vsock/vsock_loopback.c | 4 +- 9 files changed, 132 insertions(+), 50 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 6578db78f0ae..c8201c070b4b 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -410,9 +410,11 @@ static struct virtio_transport vhost_transport =3D { .cancel_pkt =3D vhost_transport_cancel_pkt, =20 .dgram_enqueue =3D virtio_transport_dgram_enqueue, - .dgram_dequeue =3D virtio_transport_dgram_dequeue, .dgram_bind =3D virtio_transport_dgram_bind, .dgram_allow =3D virtio_transport_dgram_allow, + .dgram_get_cid =3D virtio_transport_dgram_get_cid, + .dgram_get_port =3D virtio_transport_dgram_get_port, + .dgram_get_length =3D virtio_transport_dgram_get_length, =20 .stream_enqueue =3D virtio_transport_stream_enqueue, .stream_dequeue =3D virtio_transport_stream_dequeue, diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index c58453699ee9..23521a318cf0 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -219,6 +219,9 @@ bool virtio_transport_stream_allow(u32 cid, u32 port); int virtio_transport_dgram_bind(struct vsock_sock *vsk, struct sockaddr_vm *addr); bool virtio_transport_dgram_allow(u32 cid, u32 port); +int virtio_transport_dgram_get_cid(struct sk_buff *skb, unsigned int *cid); +int virtio_transport_dgram_get_port(struct sk_buff *skb, unsigned int *por= t); +int virtio_transport_dgram_get_length(struct sk_buff *skb, size_t *len); =20 int virtio_transport_connect(struct vsock_sock *vsk); =20 diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index 0e7504a42925..7bedb9ee7e3e 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -120,11 +120,20 @@ struct vsock_transport { =20 /* DGRAM. */ int (*dgram_bind)(struct vsock_sock *, struct sockaddr_vm *); - int (*dgram_dequeue)(struct vsock_sock *vsk, struct msghdr *msg, - size_t len, int flags); int (*dgram_enqueue)(struct vsock_sock *, struct sockaddr_vm *, struct msghdr *, size_t len); bool (*dgram_allow)(u32 cid, u32 port); + int (*dgram_get_cid)(struct sk_buff *skb, unsigned int *cid); + int (*dgram_get_port)(struct sk_buff *skb, unsigned int *port); + int (*dgram_get_length)(struct sk_buff *skb, size_t *length); + + /* The number of bytes into the buffer at which the payload starts, as + * first seen by the receiving socket layer. For example, if the + * transport presets the skb pointers using skb_pull(sizeof(header)) + * than this would be zero, otherwise it would be the size of the + * header. + */ + const size_t dgram_payload_offset; =20 /* STREAM. */ /* TODO: stream_bind() */ diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 413407bb646c..7ec0659c6ae5 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1271,11 +1271,15 @@ static int vsock_dgram_connect(struct socket *sock, int vsock_dgram_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags) { + const struct vsock_transport *transport; #ifdef CONFIG_BPF_SYSCALL const struct proto *prot; #endif struct vsock_sock *vsk; + struct sk_buff *skb; + size_t payload_len; struct sock *sk; + int err; =20 sk =3D sock->sk; vsk =3D vsock_sk(sk); @@ -1286,7 +1290,52 @@ int vsock_dgram_recvmsg(struct socket *sock, struct = msghdr *msg, return prot->recvmsg(sk, msg, len, flags, NULL); #endif =20 - return vsk->transport->dgram_dequeue(vsk, msg, len, flags); + if (flags & MSG_OOB || flags & MSG_ERRQUEUE) + return -EOPNOTSUPP; + + transport =3D vsk->transport; + + /* Retrieve the head sk_buff from the socket's receive queue. */ + err =3D 0; + skb =3D skb_recv_datagram(&vsk->sk, flags, &err); + if (!skb) + return err; + + err =3D transport->dgram_get_length(skb, &payload_len); + if (err) + goto out; + + if (payload_len > len) { + payload_len =3D len; + msg->msg_flags |=3D MSG_TRUNC; + } + + /* Place the datagram payload in the user's iovec. */ + err =3D skb_copy_datagram_msg(skb, transport->dgram_payload_offset, msg, = payload_len); + if (err) + goto out; + + if (msg->msg_name) { + /* Provide the address of the sender. */ + DECLARE_SOCKADDR(struct sockaddr_vm *, vm_addr, msg->msg_name); + unsigned int cid, port; + + err =3D transport->dgram_get_cid(skb, &cid); + if (err) + goto out; + + err =3D transport->dgram_get_port(skb, &port); + if (err) + goto out; + + vsock_addr_init(vm_addr, cid, port); + msg->msg_namelen =3D sizeof(*vm_addr); + } + err =3D payload_len; + +out: + skb_free_datagram(&vsk->sk, skb); + return err; } EXPORT_SYMBOL_GPL(vsock_dgram_recvmsg); =20 diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transp= ort.c index 7cb1a9d2cdb4..ff6e87e25fa0 100644 --- a/net/vmw_vsock/hyperv_transport.c +++ b/net/vmw_vsock/hyperv_transport.c @@ -556,8 +556,17 @@ static int hvs_dgram_bind(struct vsock_sock *vsk, stru= ct sockaddr_vm *addr) return -EOPNOTSUPP; } =20 -static int hvs_dgram_dequeue(struct vsock_sock *vsk, struct msghdr *msg, - size_t len, int flags) +static int hvs_dgram_get_cid(struct sk_buff *skb, unsigned int *cid) +{ + return -EOPNOTSUPP; +} + +static int hvs_dgram_get_port(struct sk_buff *skb, unsigned int *port) +{ + return -EOPNOTSUPP; +} + +static int hvs_dgram_get_length(struct sk_buff *skb, size_t *len) { return -EOPNOTSUPP; } @@ -833,7 +842,9 @@ static struct vsock_transport hvs_transport =3D { .shutdown =3D hvs_shutdown, =20 .dgram_bind =3D hvs_dgram_bind, - .dgram_dequeue =3D hvs_dgram_dequeue, + .dgram_get_cid =3D hvs_dgram_get_cid, + .dgram_get_port =3D hvs_dgram_get_port, + .dgram_get_length =3D hvs_dgram_get_length, .dgram_enqueue =3D hvs_dgram_enqueue, .dgram_allow =3D hvs_dgram_allow, =20 diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transp= ort.c index e95df847176b..5763cdf13804 100644 --- a/net/vmw_vsock/virtio_transport.c +++ b/net/vmw_vsock/virtio_transport.c @@ -429,9 +429,11 @@ static struct virtio_transport virtio_transport =3D { .cancel_pkt =3D virtio_transport_cancel_pkt, =20 .dgram_bind =3D virtio_transport_dgram_bind, - .dgram_dequeue =3D virtio_transport_dgram_dequeue, .dgram_enqueue =3D virtio_transport_dgram_enqueue, .dgram_allow =3D virtio_transport_dgram_allow, + .dgram_get_cid =3D virtio_transport_dgram_get_cid, + .dgram_get_port =3D virtio_transport_dgram_get_port, + .dgram_get_length =3D virtio_transport_dgram_get_length, =20 .stream_dequeue =3D virtio_transport_stream_dequeue, .stream_enqueue =3D virtio_transport_stream_enqueue, diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio= _transport_common.c index e4878551f140..abd939694a1a 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -797,6 +797,24 @@ int virtio_transport_dgram_bind(struct vsock_sock *vsk, } EXPORT_SYMBOL_GPL(virtio_transport_dgram_bind); =20 +int virtio_transport_dgram_get_cid(struct sk_buff *skb, unsigned int *cid) +{ + return -EOPNOTSUPP; +} +EXPORT_SYMBOL_GPL(virtio_transport_dgram_get_cid); + +int virtio_transport_dgram_get_port(struct sk_buff *skb, unsigned int *por= t) +{ + return -EOPNOTSUPP; +} +EXPORT_SYMBOL_GPL(virtio_transport_dgram_get_port); + +int virtio_transport_dgram_get_length(struct sk_buff *skb, size_t *len) +{ + return -EOPNOTSUPP; +} +EXPORT_SYMBOL_GPL(virtio_transport_dgram_get_length); + bool virtio_transport_dgram_allow(u32 cid, u32 port) { return false; diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index b370070194fa..b6a51afb74b8 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -1731,57 +1731,40 @@ static int vmci_transport_dgram_enqueue( return err - sizeof(*dg); } =20 -static int vmci_transport_dgram_dequeue(struct vsock_sock *vsk, - struct msghdr *msg, size_t len, - int flags) +int vmci_transport_dgram_get_cid(struct sk_buff *skb, unsigned int *cid) { - int err; struct vmci_datagram *dg; - size_t payload_len; - struct sk_buff *skb; =20 - if (flags & MSG_OOB || flags & MSG_ERRQUEUE) - return -EOPNOTSUPP; + dg =3D (struct vmci_datagram *)skb->data; + if (!dg) + return -EINVAL; =20 - /* Retrieve the head sk_buff from the socket's receive queue. */ - err =3D 0; - skb =3D skb_recv_datagram(&vsk->sk, flags, &err); - if (!skb) - return err; + *cid =3D dg->src.context; + return 0; +} + +int vmci_transport_dgram_get_port(struct sk_buff *skb, unsigned int *port) +{ + struct vmci_datagram *dg; =20 dg =3D (struct vmci_datagram *)skb->data; if (!dg) - /* err is 0, meaning we read zero bytes. */ - goto out; - - payload_len =3D dg->payload_size; - /* Ensure the sk_buff matches the payload size claimed in the packet. */ - if (payload_len !=3D skb->len - sizeof(*dg)) { - err =3D -EINVAL; - goto out; - } + return -EINVAL; =20 - if (payload_len > len) { - payload_len =3D len; - msg->msg_flags |=3D MSG_TRUNC; - } + *port =3D dg->src.resource; + return 0; +} =20 - /* Place the datagram payload in the user's iovec. */ - err =3D skb_copy_datagram_msg(skb, sizeof(*dg), msg, payload_len); - if (err) - goto out; +int vmci_transport_dgram_get_length(struct sk_buff *skb, size_t *len) +{ + struct vmci_datagram *dg; =20 - if (msg->msg_name) { - /* Provide the address of the sender. */ - DECLARE_SOCKADDR(struct sockaddr_vm *, vm_addr, msg->msg_name); - vsock_addr_init(vm_addr, dg->src.context, dg->src.resource); - msg->msg_namelen =3D sizeof(*vm_addr); - } - err =3D payload_len; + dg =3D (struct vmci_datagram *)skb->data; + if (!dg) + return -EINVAL; =20 -out: - skb_free_datagram(&vsk->sk, skb); - return err; + *len =3D dg->payload_size; + return 0; } =20 static bool vmci_transport_dgram_allow(u32 cid, u32 port) @@ -2040,9 +2023,12 @@ static struct vsock_transport vmci_transport =3D { .release =3D vmci_transport_release, .connect =3D vmci_transport_connect, .dgram_bind =3D vmci_transport_dgram_bind, - .dgram_dequeue =3D vmci_transport_dgram_dequeue, .dgram_enqueue =3D vmci_transport_dgram_enqueue, .dgram_allow =3D vmci_transport_dgram_allow, + .dgram_get_cid =3D vmci_transport_dgram_get_cid, + .dgram_get_port =3D vmci_transport_dgram_get_port, + .dgram_get_length =3D vmci_transport_dgram_get_length, + .dgram_payload_offset =3D sizeof(struct vmci_datagram), .stream_dequeue =3D vmci_transport_stream_dequeue, .stream_enqueue =3D vmci_transport_stream_enqueue, .stream_has_data =3D vmci_transport_stream_has_data, diff --git a/net/vmw_vsock/vsock_loopback.c b/net/vmw_vsock/vsock_loopback.c index e3afc0c866f5..136061f622b8 100644 --- a/net/vmw_vsock/vsock_loopback.c +++ b/net/vmw_vsock/vsock_loopback.c @@ -63,9 +63,11 @@ static struct virtio_transport loopback_transport =3D { .cancel_pkt =3D vsock_loopback_cancel_pkt, =20 .dgram_bind =3D virtio_transport_dgram_bind, - .dgram_dequeue =3D virtio_transport_dgram_dequeue, .dgram_enqueue =3D virtio_transport_dgram_enqueue, .dgram_allow =3D virtio_transport_dgram_allow, + .dgram_get_cid =3D virtio_transport_dgram_get_cid, + .dgram_get_port =3D virtio_transport_dgram_get_port, + .dgram_get_length =3D virtio_transport_dgram_get_length, =20 .stream_dequeue =3D virtio_transport_stream_dequeue, .stream_enqueue =3D virtio_transport_stream_enqueue, --=20 2.30.2