* [Qemu-devel] [PATCH] vhost_net: cleanup recovery
@ 2014-09-03 9:10 Michael S. Tsirkin
2014-09-03 9:20 ` Jason Wang
0 siblings, 1 reply; 4+ messages in thread
From: Michael S. Tsirkin @ 2014-09-03 9:10 UTC (permalink / raw)
To: qemu-devel; +Cc: Jason Wang, Andrey Korolyov, qemu-stable
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.
Cc: qemu-stable@nongnu.org
Cc: Andrey Korolyov <andrey@xdel.ru>
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/net/vhost_net.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index ba5d544..1fe18c7 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -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;
}
--
MST
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] vhost_net: cleanup recovery
2014-09-03 9:10 [Qemu-devel] [PATCH] vhost_net: cleanup recovery Michael S. Tsirkin
@ 2014-09-03 9:20 ` Jason Wang
2014-09-03 9:37 ` Andrey Korolyov
0 siblings, 1 reply; 4+ messages in thread
From: Jason Wang @ 2014-09-03 9:20 UTC (permalink / raw)
To: Michael S. Tsirkin, qemu-devel; +Cc: Andrey Korolyov, qemu-stable
On 09/03/2014 05:10 PM, Michael S. Tsirkin wrote:
> 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.
>
> Cc: qemu-stable@nongnu.org
> Cc: Andrey Korolyov <andrey@xdel.ru>
> Cc: Jason Wang <jasowang@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/net/vhost_net.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
> index ba5d544..1fe18c7 100644
> --- a/hw/net/vhost_net.c
> +++ b/hw/net/vhost_net.c
> @@ -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);
> + }
We probably need a new label, since we only want to do this when guest
notifiers has been set.
> return r;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] vhost_net: cleanup recovery
2014-09-03 9:20 ` Jason Wang
@ 2014-09-03 9:37 ` Andrey Korolyov
2014-09-03 10:36 ` Michael S. Tsirkin
0 siblings, 1 reply; 4+ messages in thread
From: Andrey Korolyov @ 2014-09-03 9:37 UTC (permalink / raw)
To: Jason Wang; +Cc: qemu-stable, qemu-devel@nongnu.org, Michael S. Tsirkin
On Wed, Sep 3, 2014 at 1:20 PM, Jason Wang <jasowang@redhat.com> wrote:
> On 09/03/2014 05:10 PM, Michael S. Tsirkin wrote:
>> 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.
>>
>> Cc: qemu-stable@nongnu.org
>> Cc: Andrey Korolyov <andrey@xdel.ru>
>> Cc: Jason Wang <jasowang@redhat.com>
>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>> ---
>> hw/net/vhost_net.c | 12 +++++++++---
>> 1 file changed, 9 insertions(+), 3 deletions(-)
>>
>> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
>> index ba5d544..1fe18c7 100644
>> --- a/hw/net/vhost_net.c
>> +++ b/hw/net/vhost_net.c
>> @@ -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);
>> + }
>
> We probably need a new label, since we only want to do this when guest
> notifiers has been set.
>> return r;
>> }
>>
>
Erm, no improvements for me from V1 - brand-new assert at reset and
lack of connectivity.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] vhost_net: cleanup recovery
2014-09-03 9:37 ` Andrey Korolyov
@ 2014-09-03 10:36 ` Michael S. Tsirkin
0 siblings, 0 replies; 4+ messages in thread
From: Michael S. Tsirkin @ 2014-09-03 10:36 UTC (permalink / raw)
To: Andrey Korolyov; +Cc: Jason Wang, qemu-devel@nongnu.org, qemu-stable
On Wed, Sep 03, 2014 at 01:37:33PM +0400, Andrey Korolyov wrote:
> On Wed, Sep 3, 2014 at 1:20 PM, Jason Wang <jasowang@redhat.com> wrote:
> > On 09/03/2014 05:10 PM, Michael S. Tsirkin wrote:
> >> 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.
> >>
> >> Cc: qemu-stable@nongnu.org
> >> Cc: Andrey Korolyov <andrey@xdel.ru>
> >> Cc: Jason Wang <jasowang@redhat.com>
> >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >> ---
> >> hw/net/vhost_net.c | 12 +++++++++---
> >> 1 file changed, 9 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
> >> index ba5d544..1fe18c7 100644
> >> --- a/hw/net/vhost_net.c
> >> +++ b/hw/net/vhost_net.c
> >> @@ -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);
> >> + }
> >
> > We probably need a new label, since we only want to do this when guest
> > notifiers has been set.
> >> return 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.
--
MST
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-09-03 10:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-03 9:10 [Qemu-devel] [PATCH] vhost_net: cleanup recovery Michael S. Tsirkin
2014-09-03 9:20 ` Jason Wang
2014-09-03 9:37 ` Andrey Korolyov
2014-09-03 10:36 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).