Skip to contentSkip to conversation

vhost-user: start/stop all rings

PATCH In review Michael S. Tsirkin 2 participants 4 messages Nov 16, 2015 – Nov 20, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 vhost-user: start/stop all rings

We are currently only sending VRING_ENABLE message for the first ring, that's wrong: we must start/stop them all.

---

Changes from v1:
typo fix

 hw/virtio/vhost-user.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
hw/virtio/vhost-user.c +11 -6
index 5bc6c45..71c3e16 100644
@@ -333,18 +333,23 @@ static int vhost_user_set_vring_base(struct vhost_dev *dev,
 
 static int vhost_user_set_vring_enable(struct vhost_dev *dev, int enable)
 {
-    struct vhost_vring_state state = {
-        .index = dev->vq_index,
-        .num   = enable,
-    };
+    int i;
 
     if (!virtio_has_feature(dev->features, VHOST_USER_F_PROTOCOL_FEATURES)) {
         return -1;
     }
 
-    return vhost_set_vring(dev, VHOST_USER_SET_VRING_ENABLE, &state);
-}
+    for (i = 0; i < dev->nvqs; ++i) {
+        struct vhost_vring_state state = {
+            .index = dev->vq_index + i,
+            .num   = enable,
+        };
+
+        vhost_set_vring(dev, VHOST_USER_SET_VRING_ENABLE, &state);
+    }
 
+    return 0;
+}
 
 static int vhost_user_get_vring_base(struct vhost_dev *dev,
                                      struct vhost_vring_state *ring)
Signature · 1 line
MST
#1 lore raw
Quoted 5 lines · Michael S. Tsirkin

We are currently only sending VRING_ENABLE message for the first ring, that's wrong: we must start/stop them all.

Note: this is on top of my tree.

Quoted 44 lines

---

Changes from v1:
typo fix

 hw/virtio/vhost-user.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
hw/virtio/vhost-user.c +11 -6
index 5bc6c45..71c3e16 100644
@@ -333,18 +333,23 @@ static int vhost_user_set_vring_base(struct vhost_dev *dev,
 
 static int vhost_user_set_vring_enable(struct vhost_dev *dev, int enable)
 {
-    struct vhost_vring_state state = {
-        .index = dev->vq_index,
-        .num   = enable,
-    };
+    int i;
 
     if (!virtio_has_feature(dev->features, VHOST_USER_F_PROTOCOL_FEATURES)) {
         return -1;
     }
 
-    return vhost_set_vring(dev, VHOST_USER_SET_VRING_ENABLE, &state);
-}
+    for (i = 0; i < dev->nvqs; ++i) {
+        struct vhost_vring_state state = {
+            .index = dev->vq_index + i,
+            .num   = enable,
+        };
+
+        vhost_set_vring(dev, VHOST_USER_SET_VRING_ENABLE, &state);
+    }
 
+    return 0;
+}
 
 static int vhost_user_get_vring_base(struct vhost_dev *dev,
                                      struct vhost_vring_state *ring)
Signature · 1 line
MST
#2 lore raw
In reply to Michael S. Tsirkin
Quoted 30 lines · Michael S. Tsirkin

We are currently only sending VRING_ENABLE message for the first ring, that's wrong: we must start/stop them all.

---

Changes from v1:
typo fix

 hw/virtio/vhost-user.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
hw/virtio/vhost-user.c +1 -4
index 5bc6c45..71c3e16 100644
@@ -333,18 +333,23 @@ static int vhost_user_set_vring_base(struct vhost_dev *dev,
 
 static int vhost_user_set_vring_enable(struct vhost_dev *dev, int enable)
 {
-    struct vhost_vring_state state = {
-        .index = dev->vq_index,
-        .num   = enable,
-    };
+    int i;
 
     if (!virtio_has_feature(dev->features, VHOST_USER_F_PROTOCOL_FEATURES)) {
         return -1;
     }

hw/virtio/vhost-user.c static int vhost_user_set_vring_base(struct vhost_dev *dev, · line 348

Quoted 10 lines
hw/virtio/vhost-user.c +7 -2
 
-    return vhost_set_vring(dev, VHOST_USER_SET_VRING_ENABLE, &state);
-}
+    for (i = 0; i < dev->nvqs; ++i) {
+        struct vhost_vring_state state = {
+            .index = dev->vq_index + i,
+            .num   = enable,
+        };
+
+        vhost_set_vring(dev, VHOST_USER_SET_VRING_ENABLE, &state);

Just noted that the patch make vhost_user_set_vring_enable() to ignore the return value of vhost_set_vring()

Quoted 9 lines
hw/virtio/vhost-user.c +3 -0
+    }
 
+    return 0;
+}
 
 static int vhost_user_get_vring_base(struct vhost_dev *dev,
                                      struct vhost_vring_state *ring)
Signature · 1 line
MST
#3 lore raw
Quoted 32 lines · Victor Kaplansky
Quoted 31 lines · Michael S. Tsirkin

We are currently only sending VRING_ENABLE message for the first ring, that's wrong: we must start/stop them all.

---

Changes from v1:
typo fix

 hw/virtio/vhost-user.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
hw/virtio/vhost-user.c +1 -4
index 5bc6c45..71c3e16 100644
@@ -333,18 +333,23 @@ static int vhost_user_set_vring_base(struct vhost_dev *dev,
 
 static int vhost_user_set_vring_enable(struct vhost_dev *dev, int enable)
 {
-    struct vhost_vring_state state = {
-        .index = dev->vq_index,
-        .num   = enable,
-    };
+    int i;
 
     if (!virtio_has_feature(dev->features, VHOST_USER_F_PROTOCOL_FEATURES)) {
         return -1;
     }
 
Quoted 12 lines

hw/virtio/vhost-user.c static int vhost_user_set_vring_base(struct vhost_dev *dev, · line 348

Quoted 9 lines
hw/virtio/vhost-user.c +7 -2
-    return vhost_set_vring(dev, VHOST_USER_SET_VRING_ENABLE, &state);
-}
+    for (i = 0; i < dev->nvqs; ++i) {
+        struct vhost_vring_state state = {
+            .index = dev->vq_index + i,
+            .num   = enable,
+        };
+
+        vhost_set_vring(dev, VHOST_USER_SET_VRING_ENABLE, &state);

Just noted that the patch make vhost_user_set_vring_enable() to ignore the return value of vhost_set_vring()

Right. But all callers ignore the return value of this function ATM so I don't think it's a big deal.

Quoted 9 lines
Quoted 9 lines
hw/virtio/vhost-user.c +3 -0
+    }
 
+    return 0;
+}
 
 static int vhost_user_get_vring_base(struct vhost_dev *dev,
                                      struct vhost_vring_state *ring)
Signature · 1 line
MST