lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 4/6] virtio/vsock: add VIRTIO_VSOCK_F_DGRAM feature bit
    CC'ing virtio-dev@lists.oasis-open.org

    On Mon, Aug 15, 2022 at 10:56:07AM -0700, Bobby Eshleman wrote:
    > This commit adds a feature bit for virtio vsock to support datagrams.
    >
    > Signed-off-by: Jiang Wang <jiang.wang@bytedance.com>
    > Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
    > ---
    > drivers/vhost/vsock.c | 3 ++-
    > include/uapi/linux/virtio_vsock.h | 1 +
    > net/vmw_vsock/virtio_transport.c | 8 ++++++--
    > 3 files changed, 9 insertions(+), 3 deletions(-)
    >
    > diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
    > index b20ddec2664b..a5d1bdb786fe 100644
    > --- a/drivers/vhost/vsock.c
    > +++ b/drivers/vhost/vsock.c
    > @@ -32,7 +32,8 @@
    > enum {
    > VHOST_VSOCK_FEATURES = VHOST_FEATURES |
    > (1ULL << VIRTIO_F_ACCESS_PLATFORM) |
    > - (1ULL << VIRTIO_VSOCK_F_SEQPACKET)
    > + (1ULL << VIRTIO_VSOCK_F_SEQPACKET) |
    > + (1ULL << VIRTIO_VSOCK_F_DGRAM)
    > };
    >
    > enum {
    > diff --git a/include/uapi/linux/virtio_vsock.h b/include/uapi/linux/virtio_vsock.h
    > index 64738838bee5..857df3a3a70d 100644
    > --- a/include/uapi/linux/virtio_vsock.h
    > +++ b/include/uapi/linux/virtio_vsock.h
    > @@ -40,6 +40,7 @@
    >
    > /* The feature bitmap for virtio vsock */
    > #define VIRTIO_VSOCK_F_SEQPACKET 1 /* SOCK_SEQPACKET supported */
    > +#define VIRTIO_VSOCK_F_DGRAM 2 /* Host support dgram vsock */
    >
    > struct virtio_vsock_config {
    > __le64 guest_cid;
    > diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
    > index c6212eb38d3c..073314312683 100644
    > --- a/net/vmw_vsock/virtio_transport.c
    > +++ b/net/vmw_vsock/virtio_transport.c
    > @@ -35,6 +35,7 @@ static struct virtio_transport virtio_transport; /* forward declaration */
    > struct virtio_vsock {
    > struct virtio_device *vdev;
    > struct virtqueue *vqs[VSOCK_VQ_MAX];
    > + bool has_dgram;
    >
    > /* Virtqueue processing is deferred to a workqueue */
    > struct work_struct tx_work;
    > @@ -709,7 +710,6 @@ static int virtio_vsock_probe(struct virtio_device *vdev)
    > }
    >
    > vsock->vdev = vdev;
    > -
    > vsock->rx_buf_nr = 0;
    > vsock->rx_buf_max_nr = 0;
    > atomic_set(&vsock->queued_replies, 0);
    > @@ -726,6 +726,9 @@ static int virtio_vsock_probe(struct virtio_device *vdev)
    > if (virtio_has_feature(vdev, VIRTIO_VSOCK_F_SEQPACKET))
    > vsock->seqpacket_allow = true;
    >
    > + if (virtio_has_feature(vdev, VIRTIO_VSOCK_F_DGRAM))
    > + vsock->has_dgram = true;
    > +
    > vdev->priv = vsock;
    >
    > ret = virtio_vsock_vqs_init(vsock);
    > @@ -820,7 +823,8 @@ static struct virtio_device_id id_table[] = {
    > };
    >
    > static unsigned int features[] = {
    > - VIRTIO_VSOCK_F_SEQPACKET
    > + VIRTIO_VSOCK_F_SEQPACKET,
    > + VIRTIO_VSOCK_F_DGRAM
    > };
    >
    > static struct virtio_driver virtio_vsock_driver = {
    > --
    > 2.35.1
    >

    \
     
     \ /
      Last update: 2022-08-16 18:30    [W:2.888 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site