vhost_net: cleanup recovery
PATCH 1/1 vhost_net: cleanup recovery
commit aad4dce934649b3a398396fc2a76f215bb194ea4
vhost_net: start/stop guest notifiers properly
changed the order of calls for guest notifiers, but did not recover in the correct (reverse) order. Fix it up.
--- hw/net/vhost_net.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
hw/net/vhost_net.c +9 -3
@@ -289,7 +289,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,BusState *qbus =BUS (qdev_get_parent_bus (DEVICE (dev)));VirtioBusState *vbus =VIRTIO_BUS (qbus);VirtioBusClass *k =VIRTIO_BUS_GET_CLASS (vbus); -int r, i =0 ; +int r, i;if (!vhost_net_device_endian_ok (dev)) {error_report ("vhost-net does not support cross-endian" );
@@ -317,16 +317,22 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, r =vhost_net_start_one (get_vhost_net (ncs[i].peer), dev);if (r <0 ) { - goto err; + goto err_start; } }return 0 ; -err: +err_start:while (--i >=0 ) {vhost_net_stop_one (get_vhost_net (ncs[i].peer), dev); } +err: + r = k->set_guest_notifiers (qbus->parent, total_queues *2 , false); +if (r <0 ) { +fprintf (stderr,"vhost guest notifier cleanup failed: %d\n" , r); +fflush (stderr); + }return r; }
Signature · 1 line
MST
Quoted 40 lines · Michael S. Tsirkin
commit
aad4dce934649b3a398396fc2a76f215bb194ea4
vhost_net: start/stop guest notifiers properlychanged the order of calls for guest notifiers, but did not recover in the correct (reverse) order. Fix it up.
Cc Andrey Korolyov <[email protected]>Cc Jason Wang <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/net/vhost_net.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)hw/net/vhost_net.c +2
-3@@ -289,7 +289,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,BusState *qbus =BUS (qdev_get_parent_bus (DEVICE (dev)));VirtioBusState *vbus =VIRTIO_BUS (qbus);VirtioBusClass *k =VIRTIO_BUS_GET_CLASS (vbus); -int r, i =0 ; +int r, i;if (!vhost_net_device_endian_ok (dev)) {error_report ("vhost-net does not support cross-endian" );@@ -317,16 +317,22 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, r =vhost_net_start_one (get_vhost_net (ncs[i].peer), dev);if (r <0 ) { - goto err; + goto err_start; } }return 0 ; -err:
hw/net/vhost_net.c int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, · line 335
Quoted 10 lines
hw/net/vhost_net.c +7
-0+err_start:while (--i >=0 ) {vhost_net_stop_one (get_vhost_net (ncs[i].peer), dev); } +err: + r = k->set_guest_notifiers (qbus->parent, total_queues *2 , false); +if (r <0 ) { +fprintf (stderr,"vhost guest notifier cleanup failed: %d\n" , r); +fflush (stderr); + }
We probably need a new label, since we only want to do this when guest notifiers has been set.
Quoted 3 lines
hw/net/vhost_net.c +0
-0return r; }
Quoted 40 lines · Jason Wang
Quoted 39 lines · Michael S. Tsirkin
commit
aad4dce934649b3a398396fc2a76f215bb194ea4
vhost_net: start/stop guest notifiers properlychanged the order of calls for guest notifiers, but did not recover in the correct (reverse) order. Fix it up.
Cc Andrey Korolyov <[email protected]>Cc Jason Wang <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/net/vhost_net.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)hw/net/vhost_net.c +2
-2@@ -289,7 +289,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,BusState *qbus =BUS (qdev_get_parent_bus (DEVICE (dev)));VirtioBusState *vbus =VIRTIO_BUS (qbus);VirtioBusClass *k =VIRTIO_BUS_GET_CLASS (vbus); -int r, i =0 ; +int r, i;if (!vhost_net_device_endian_ok (dev)) {error_report ("vhost-net does not support cross-endian" );@@ -317,16 +317,22 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, r =vhost_net_start_one (get_vhost_net (ncs[i].peer), dev);if (r <0 ) { - goto err; + goto err_start; } }return 0 ;
Quoted 18 lines
hw/net/vhost_net.c int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, · line 335
Quoted 11 lines
hw/net/vhost_net.c +7
-1-err: +err_start:while (--i >=0 ) {vhost_net_stop_one (get_vhost_net (ncs[i].peer), dev); } +err: + r = k->set_guest_notifiers (qbus->parent, total_queues *2 , false); +if (r <0 ) { +fprintf (stderr,"vhost guest notifier cleanup failed: %d\n" , r); +fflush (stderr); + }We probably need a new label, since we only want to do this when guest notifiers has been set.
Quoted 3 lines
hw/net/vhost_net.c +0
-0return r; }
Erm, no improvements for me from V1 - brand-new assert at reset and lack of connectivity.
Quoted 55 lines · Andrey Korolyov
Quoted 54 lines · Jason Wang
Quoted 40 lines · Michael S. Tsirkin
commit
aad4dce934649b3a398396fc2a76f215bb194ea4
vhost_net: start/stop guest notifiers properlychanged the order of calls for guest notifiers, but did not recover in the correct (reverse) order. Fix it up.
Cc Andrey Korolyov <[email protected]>Cc Jason Wang <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/net/vhost_net.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)hw/net/vhost_net.c +2
-3@@ -289,7 +289,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,BusState *qbus =BUS (qdev_get_parent_bus (DEVICE (dev)));VirtioBusState *vbus =VIRTIO_BUS (qbus);VirtioBusClass *k =VIRTIO_BUS_GET_CLASS (vbus); -int r, i =0 ; +int r, i;if (!vhost_net_device_endian_ok (dev)) {error_report ("vhost-net does not support cross-endian" );@@ -317,16 +317,22 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, r =vhost_net_start_one (get_vhost_net (ncs[i].peer), dev);if (r <0 ) { - goto err; + goto err_start; } }return 0 ; -err:hw/net/vhost_net.c int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, · line 335
Quoted 10 lines
hw/net/vhost_net.c +7
-0+err_start:while (--i >=0 ) {vhost_net_stop_one (get_vhost_net (ncs[i].peer), dev); } +err: + r = k->set_guest_notifiers (qbus->parent, total_queues *2 , false); +if (r <0 ) { +fprintf (stderr,"vhost guest notifier cleanup failed: %d\n" , r); +fflush (stderr); + }We probably need a new label, since we only want to do this when guest notifiers has been set.
Quoted 7 lines
Quoted 4 lines
hw/net/vhost_net.c int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, · line 338
Quoted 3 lines
hw/net/vhost_net.c +0
-0return r; }Erm, no improvements for me from V1 - brand-new assert at reset and lack of connectivity.
Heh, I see what's wrong. Let me try again. V3 sent.
Signature · 1 line
MST