net/virtio-user: fix advertising of protocol features

[dpdk.git] / drivers / net / virtio / virtio_user / vhost_user.c

diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index 631d0e3..706266a 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -244,6 +244,8 @@ const char * const vhost_msg_strings[] = {
        [VHOST_USER_SET_VRING_ENABLE] = "VHOST_SET_VRING_ENABLE",
        [VHOST_USER_GET_PROTOCOL_FEATURES] = "VHOST_USER_GET_PROTOCOL_FEATURES",
        [VHOST_USER_SET_PROTOCOL_FEATURES] = "VHOST_USER_SET_PROTOCOL_FEATURES",
+       [VHOST_USER_SET_STATUS] = "VHOST_SET_STATUS",
+       [VHOST_USER_GET_STATUS] = "VHOST_GET_STATUS",
 };
 
 static int
@@ -254,7 +256,7 @@ vhost_user_sock(struct virtio_user_dev *dev,
        struct vhost_user_msg msg;
        struct vhost_vring_file *file = 0;
        int need_reply = 0;
-       int has_reply_ack;
+       int has_reply_ack = 0;
        int fds[VHOST_MEMORY_MAX_NREGIONS];
        int fd_num = 0;
        int len;
@@ -275,12 +277,31 @@ vhost_user_sock(struct virtio_user_dev *dev,
        msg.size = 0;
 
        switch (req) {
+       case VHOST_USER_GET_STATUS:
+               if (!(dev->status & VIRTIO_CONFIG_STATUS_FEATURES_OK) ||
+                   (!(dev->protocol_features &
+                               (1ULL << VHOST_USER_PROTOCOL_F_STATUS))))
+                       return -ENOTSUP;
+               /* Fallthrough */
        case VHOST_USER_GET_FEATURES:
        case VHOST_USER_GET_PROTOCOL_FEATURES:
                need_reply = 1;
                break;
 
+       case VHOST_USER_SET_STATUS:
+               if (!(dev->status & VIRTIO_CONFIG_STATUS_FEATURES_OK) ||
+                   (!(dev->protocol_features &
+                               (1ULL << VHOST_USER_PROTOCOL_F_STATUS))))
+                       return -ENOTSUP;
+
+               if (has_reply_ack)
+                       msg.flags |= VHOST_USER_NEED_REPLY_MASK;
+               /* Fallthrough */
        case VHOST_USER_SET_FEATURES:
+               msg.payload.u64 = *((__u64 *)arg) |
+                       1ULL << VHOST_USER_F_PROTOCOL_FEATURES;
+               msg.size = sizeof(m.payload.u64);
+               break;
        case VHOST_USER_SET_PROTOCOL_FEATURES:
        case VHOST_USER_SET_LOG_BASE:
                msg.payload.u64 = *((__u64 *)arg);
@@ -363,6 +384,7 @@ vhost_user_sock(struct virtio_user_dev *dev,
 
                switch (req) {
                case VHOST_USER_GET_FEATURES:
+               case VHOST_USER_GET_STATUS:
                case VHOST_USER_GET_PROTOCOL_FEATURES:
                        if (msg.size != sizeof(m.payload.u64)) {
                                PMD_DRV_LOG(ERR, "Received bad msg size");