Re: [Qemu-devel] [PULL 0/7] Net patches

Re: [Qemu-devel] [PULL 0/7] Net patches

[Stefan Hajnoczi]

On Wed, Feb 27, 2013 at 4:22 PM, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> Tested that tap still works with the QEMU "vlan" feature.
>
> The following changes since commit ee24aaf356f44ca7c8fbef136a438c12091cffd0:
>
>   Merge remote-tracking branch 'kiszka/queues/slirp' into staging (2013-02-26 13:36:09 -0600)
>
> are available in the git repository at:
>
>
>   git://github.com/stefanha/qemu.git net
>
> for you to fetch changes up to af347aa5a521555f5342e67993eb717d4f542ba8:
>
>   qmp: netdev_add is like -netdev, not -net, fix documentation (2013-02-27 16:10:47 +0100)
>
> ----------------------------------------------------------------
> Jason Wang (2):
>       tap: forbid creating multiqueue tap when hub is used
>       net: reduce the unnecessary memory allocation of multiqueue
>
> Luigi Rizzo (2):
>       net: fix qemu_flush_queued_packets() in presence of a hub
>       net: fix unbounded NetQueue
>
> Markus Armbruster (1):
>       qmp: netdev_add is like -netdev, not -net, fix documentation
>
> Peter Lieven (1):
>       tap: set IFF_ONE_QUEUE per default
>
> Stefan Hajnoczi (1):
>       doc: document -netdev hubport
>
>  hmp-commands.hx   |  2 +-
>  hw/virtio-net.c   |  6 ++++--
>  include/net/net.h |  2 +-
>  net/hub.c         | 14 ++++++++++++++
>  net/hub.h         |  1 +
>  net/net.c         | 25 +++++++++++++++----------
>  net/queue.c       | 15 +++++++++++++++
>  net/tap-linux.c   | 10 ++++++----
>  net/tap-linux.h   |  9 +++++----
>  net/tap.c         |  7 +++++++
>  qemu-options.hx   | 11 ++++++++++-
>  qmp-commands.hx   |  2 +-
>  12 files changed, 80 insertions(+), 24 deletions(-)
>
> --
> 1.8.1.2
>

ping

Re: [Qemu-devel] [PULL 0/7] Net patches

[Anthony Liguori]

Stefan Hajnoczi <stefanha@gmail.com> writes:

> On Wed, Feb 27, 2013 at 4:22 PM, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>> Tested that tap still works with the QEMU "vlan" feature.
>>
>> The following changes since commit ee24aaf356f44ca7c8fbef136a438c12091cffd0:
>>
>>   Merge remote-tracking branch 'kiszka/queues/slirp' into staging (2013-02-26 13:36:09 -0600)
>>
>> are available in the git repository at:
>>
>>
>>   git://github.com/stefanha/qemu.git net
>>
>> for you to fetch changes up to af347aa5a521555f5342e67993eb717d4f542ba8:
>>
>>   qmp: netdev_add is like -netdev, not -net, fix documentation (2013-02-27 16:10:47 +0100)
>>
>> ----------------------------------------------------------------
>> Jason Wang (2):
>>       tap: forbid creating multiqueue tap when hub is used
>>       net: reduce the unnecessary memory allocation of multiqueue
>>
>> Luigi Rizzo (2):
>>       net: fix qemu_flush_queued_packets() in presence of a hub
>>       net: fix unbounded NetQueue
>>
>> Markus Armbruster (1):
>>       qmp: netdev_add is like -netdev, not -net, fix documentation
>>
>> Peter Lieven (1):
>>       tap: set IFF_ONE_QUEUE per default
>>
>> Stefan Hajnoczi (1):
>>       doc: document -netdev hubport
>>
>>  hmp-commands.hx   |  2 +-
>>  hw/virtio-net.c   |  6 ++++--
>>  include/net/net.h |  2 +-
>>  net/hub.c         | 14 ++++++++++++++
>>  net/hub.h         |  1 +
>>  net/net.c         | 25 +++++++++++++++----------
>>  net/queue.c       | 15 +++++++++++++++
>>  net/tap-linux.c   | 10 ++++++----
>>  net/tap-linux.h   |  9 +++++----
>>  net/tap.c         |  7 +++++++
>>  qemu-options.hx   | 11 ++++++++++-
>>  qmp-commands.hx   |  2 +-
>>  12 files changed, 80 insertions(+), 24 deletions(-)
>>
>> --
>> 1.8.1.2
>>
>
> ping

Just pushed it 30 minutes ago or so.  Thanks.

Regards,

Anthony Liguori

[Qemu-devel] [PULL 0/7] Net patches

[Stefan Hajnoczi]

The big change here is the new vmxnet3 emulated NIC.

The following changes since commit fe6344a05fba26e16863fefcb823242e579b0991:

  Remove device_tree.o from hw/moxie/Makefile.objs. (2013-03-24 11:30:04 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git net

for you to fetch changes up to d32fcad366e5f45d33dab2ee4de0e5729439680b:

  net: increase buffer size to accommodate Jumbo frame pkts (2013-03-25 11:14:07 +0100)

----------------------------------------------------------------
Dmitry Fleytman (5):
      Checksum-related utility functions
      net: iovec checksum calculator
      Common definitions for VMWARE devices
      Packet abstraction for VMWARE network devices
      VMXNET3 device implementation

Scott Feldman (1):
      net: increase buffer size to accommodate Jumbo frame pkts

Stefan Hajnoczi (1):
      net: use socket_set_nodelay() for -netdev socket

 default-configs/pci.mak |    1 +
 hw/Makefile.objs        |    2 +
 hw/pci/pci.h            |    1 +
 hw/vmware_utils.h       |  143 +++
 hw/vmxnet3.c            | 2461 +++++++++++++++++++++++++++++++++++++++++++++++
 hw/vmxnet3.h            |  760 +++++++++++++++
 hw/vmxnet_debug.h       |  115 +++
 hw/vmxnet_rx_pkt.c      |  187 ++++
 hw/vmxnet_rx_pkt.h      |  174 ++++
 hw/vmxnet_tx_pkt.c      |  567 +++++++++++
 hw/vmxnet_tx_pkt.h      |  148 +++
 include/net/checksum.h  |   26 +-
 include/net/eth.h       |  347 +++++++
 include/net/net.h       |    5 +
 net/Makefile.objs       |    1 +
 net/checksum.c          |   42 +-
 net/eth.c               |  217 +++++
 net/net.c               |    2 +-
 net/socket.c            |    7 +-
 net/tap.c               |    7 +-
 net/vde.c               |    2 +-
 21 files changed, 5198 insertions(+), 17 deletions(-)
 create mode 100644 hw/vmware_utils.h
 create mode 100644 hw/vmxnet3.c
 create mode 100644 hw/vmxnet3.h
 create mode 100644 hw/vmxnet_debug.h
 create mode 100644 hw/vmxnet_rx_pkt.c
 create mode 100644 hw/vmxnet_rx_pkt.h
 create mode 100644 hw/vmxnet_tx_pkt.c
 create mode 100644 hw/vmxnet_tx_pkt.h
 create mode 100644 include/net/eth.h
 create mode 100644 net/eth.c

-- 
1.8.1.4

[Qemu-devel] [PULL 0/7] Net patches

[Stefan Hajnoczi]

The following changes since commit 30eaca3acdf17d7bcbd1213eb149c02037edfb0b:

  Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140902-1' into staging (2014-09-02 10:26:10 +0100)

are available in the git repository at:


  git://github.com/stefanha/qemu.git tags/net-pull-request

for you to fetch changes up to 18ae0593f274c8a52f136bfd95729bf0e0d759f3:

  virtio-net: purge outstanding packets when starting vhost (2014-09-04 14:33:53 +0100)

----------------------------------------------------------------
Net patches

----------------------------------------------------------------
Jason Wang (1):
      net: don't use set/get_pointer() in set/get_netdev()

Michael S. Tsirkin (5):
      virtio-net: don't run bh on vm stopped
      virtio: don't call device on !vm_running
      net: invoke callback when purging queue
      net: complete all queued packets on VM stop
      virtio-net: purge outstanding packets when starting vhost

zhanghailiang (1):
      net: Forbid dealing with packets when VM is not running

 hw/core/qdev-properties-system.c | 71 ++++++++++++++++++++++------------------
 hw/net/virtio-net.c              | 29 ++++++++++++++--
 hw/virtio/virtio.c               |  9 ++++-
 net/net.c                        | 40 +++++++++++++++++++++-
 net/queue.c                      |  3 ++
 5 files changed, 115 insertions(+), 37 deletions(-)

-- 
1.9.3

[Qemu-devel] [PULL 1/7] net: Forbid dealing with packets when VM is not running

[Stefan Hajnoczi]

From: zhanghailiang <zhang.zhanghailiang@huawei.com>

For all NICs(except virtio-net) emulated by qemu,
Such as e1000, rtl8139, pcnet and ne2k_pci,
Qemu can still receive packets when VM is not running.

If this happened in *migration's* last PAUSE VM stage, but
before the end of the migration, the new receiving packets will possibly dirty
parts of RAM which has been cached in *iovec*(will be sent asynchronously) and
dirty parts of new RAM which will be missed.
This will lead serious network fault in VM.

To avoid this, we forbid receiving packets in generic net code when
VM is not running.

Bug reproduction steps:
(1) Start a VM which configured at least one NIC
(2) In VM, open several Terminal and do *Ping IP -i 0.1*
(3) Migrate the VM repeatedly between two Hosts
And the *PING* command in VM will very likely fail with message:
'Destination HOST Unreachable', the NIC in VM will stay unavailable unless you
run 'service network restart'

Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/net.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/net/net.c b/net/net.c
index 6d930ea..962c05f 100644
--- a/net/net.c
+++ b/net/net.c
@@ -41,6 +41,7 @@
 #include "qapi-visit.h"
 #include "qapi/opts-visitor.h"
 #include "qapi/dealloc-visitor.h"
+#include "sysemu/sysemu.h"
 
 /* Net bridge is currently not supported for W32. */
 #if !defined(_WIN32)
@@ -452,6 +453,12 @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len)
 
 int qemu_can_send_packet(NetClientState *sender)
 {
+    int vm_running = runstate_is_running();
+
+    if (!vm_running) {
+        return 0;
+    }
+
     if (!sender->peer) {
         return 1;
     }
-- 
1.9.3

[Qemu-devel] [PULL 2/7] net: don't use set/get_pointer() in set/get_netdev()

[Stefan Hajnoczi]

From: Jason Wang <jasowang@redhat.com>

Commit 1ceef9f27359cbe92ef124bf74de6f792e71f6fb (net: multiqueue
support) tries to use set_pointer() and get_pointer() to set and get
NICPeers which is not a pointer defined in DEFINE_PROP_NETDEV. This
trick works but result a unclean and fragile implementation (e.g
print_netdev and parse_netdev).

This patch solves this issue by not using set/get_pinter() and set and
get netdev directly in set_netdev() and get_netdev(). After this the
parse_netdev() and print_netdev() were no longer used and dropped from
the source.

Cc: Markus Armbruster <armbru@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/core/qdev-properties-system.c | 71 ++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index ae0900f..b3753ce 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -176,41 +176,67 @@ PropertyInfo qdev_prop_chr = {
 };
 
 /* --- netdev device --- */
+static void get_netdev(Object *obj, Visitor *v, void *opaque,
+                       const char *name, Error **errp)
+{
+    DeviceState *dev = DEVICE(obj);
+    Property *prop = opaque;
+    NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);
+    char *p = g_strdup(peers_ptr->ncs[0]->name);
 
-static int parse_netdev(DeviceState *dev, const char *str, void **ptr)
+    visit_type_str(v, &p, name, errp);
+    g_free(p);
+}
+
+static void set_netdev(Object *obj, Visitor *v, void *opaque,
+                       const char *name, Error **errp)
 {
-    NICPeers *peers_ptr = (NICPeers *)ptr;
+    DeviceState *dev = DEVICE(obj);
+    Property *prop = opaque;
+    NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);
     NetClientState **ncs = peers_ptr->ncs;
     NetClientState *peers[MAX_QUEUE_NUM];
-    int queues, i = 0;
-    int ret;
+    Error *local_err = NULL;
+    int err, queues, i = 0;
+    char *str;
+
+    if (dev->realized) {
+        qdev_prop_set_after_realize(dev, name, errp);
+        return;
+    }
+
+    visit_type_str(v, &str, name, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return;
+    }
 
     queues = qemu_find_net_clients_except(str, peers,
                                           NET_CLIENT_OPTIONS_KIND_NIC,
                                           MAX_QUEUE_NUM);
     if (queues == 0) {
-        ret = -ENOENT;
+        err = -ENOENT;
         goto err;
     }
 
     if (queues > MAX_QUEUE_NUM) {
-        ret = -E2BIG;
+        err = -E2BIG;
         goto err;
     }
 
     for (i = 0; i < queues; i++) {
         if (peers[i] == NULL) {
-            ret = -ENOENT;
+            err = -ENOENT;
             goto err;
         }
 
         if (peers[i]->peer) {
-            ret = -EEXIST;
+            err = -EEXIST;
             goto err;
         }
 
         if (ncs[i]) {
-            ret = -EINVAL;
+            err = -EINVAL;
             goto err;
         }
 
@@ -219,31 +245,12 @@ static int parse_netdev(DeviceState *dev, const char *str, void **ptr)
     }
 
     peers_ptr->queues = queues;
-
-    return 0;
+    g_free(str);
+    return;
 
 err:
-    return ret;
-}
-
-static char *print_netdev(void *ptr)
-{
-    NetClientState *netdev = ptr;
-    const char *val = netdev->name ? netdev->name : "";
-
-    return g_strdup(val);
-}
-
-static void get_netdev(Object *obj, Visitor *v, void *opaque,
-                       const char *name, Error **errp)
-{
-    get_pointer(obj, v, opaque, print_netdev, name, errp);
-}
-
-static void set_netdev(Object *obj, Visitor *v, void *opaque,
-                       const char *name, Error **errp)
-{
-    set_pointer(obj, v, opaque, parse_netdev, name, errp);
+    error_set_from_qdev_prop_error(errp, err, dev, prop, str);
+    g_free(str);
 }
 
 PropertyInfo qdev_prop_netdev = {
-- 
1.9.3

[Qemu-devel] [PULL 3/7] virtio-net: don't run bh on vm stopped

[Stefan Hajnoczi]

From: "Michael S. Tsirkin" <mst@redhat.com>

commit 783e7706937fe15523b609b545587a028a2bdd03
    virtio-net: stop/start bh when appropriate

is incomplete: BH might execute within the same main loop iteration but
after vmstop, so in theory, we might trigger an assertion.
I was unable to reproduce this in practice,
but it seems clear enough that the potential is there, so worth fixing.

Cc: qemu-stable@nongnu.org
Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/virtio-net.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 268eff9..365e266 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1224,7 +1224,12 @@ static void virtio_net_tx_timer(void *opaque)
     VirtIONetQueue *q = opaque;
     VirtIONet *n = q->n;
     VirtIODevice *vdev = VIRTIO_DEVICE(n);
-    assert(vdev->vm_running);
+    /* This happens when device was stopped but BH wasn't. */
+    if (!vdev->vm_running) {
+        /* Make sure tx waiting is set, so we'll run when restarted. */
+        assert(q->tx_waiting);
+        return;
+    }
 
     q->tx_waiting = 0;
 
@@ -1244,7 +1249,12 @@ static void virtio_net_tx_bh(void *opaque)
     VirtIODevice *vdev = VIRTIO_DEVICE(n);
     int32_t ret;
 
-    assert(vdev->vm_running);
+    /* This happens when device was stopped but BH wasn't. */
+    if (!vdev->vm_running) {
+        /* Make sure tx waiting is set, so we'll run when restarted. */
+        assert(q->tx_waiting);
+        return;
+    }
 
     q->tx_waiting = 0;
 
-- 
1.9.3

[Qemu-devel] [PULL 4/7] virtio: don't call device on !vm_running

[Stefan Hajnoczi]

From: "Michael S. Tsirkin" <mst@redhat.com>

On vm stop, virtio changes vm_running state
too soon, so callbacks can get envoked with
vm_running = false;

Cc: qemu-stable@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/virtio/virtio.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 5c98180..ac22238 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -1108,7 +1108,10 @@ static void virtio_vmstate_change(void *opaque, int running, RunState state)
     BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));
     VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
     bool backend_run = running && (vdev->status & VIRTIO_CONFIG_S_DRIVER_OK);
-    vdev->vm_running = running;
+
+    if (running) {
+        vdev->vm_running = running;
+    }
 
     if (backend_run) {
         virtio_set_status(vdev, vdev->status);
@@ -1121,6 +1124,10 @@ static void virtio_vmstate_change(void *opaque, int running, RunState state)
     if (!backend_run) {
         virtio_set_status(vdev, vdev->status);
     }
+
+    if (!running) {
+        vdev->vm_running = running;
+    }
 }
 
 void virtio_init(VirtIODevice *vdev, const char *name,
-- 
1.9.3

[Qemu-devel] [PULL 5/7] net: invoke callback when purging queue

[Stefan Hajnoczi]

From: "Michael S. Tsirkin" <mst@redhat.com>

devices rely on packet callbacks eventually running,
but we violate this rule whenever we purge the queue.
To fix, invoke callbacks on all packets on purge.
Set length to 0, this way callers can detect that
this happened and re-queue if necessary.

Cc: qemu-stable@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/queue.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/queue.c b/net/queue.c
index 859d02a..f948318 100644
--- a/net/queue.c
+++ b/net/queue.c
@@ -233,6 +233,9 @@ void qemu_net_queue_purge(NetQueue *queue, NetClientState *from)
         if (packet->sender == from) {
             QTAILQ_REMOVE(&queue->packets, packet, entry);
             queue->nq_count--;
+            if (packet->sent_cb) {
+                packet->sent_cb(packet->sender, 0);
+            }
             g_free(packet);
         }
     }
-- 
1.9.3

[Qemu-devel] [PULL 6/7] net: complete all queued packets on VM stop

[Stefan Hajnoczi]

From: "Michael S. Tsirkin" <mst@redhat.com>

This completes all packets, ensuring that callbacks
will not run when VM is stopped.

Cc: qemu-stable@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/net.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/net/net.c b/net/net.c
index 962c05f..7acc162 100644
--- a/net/net.c
+++ b/net/net.c
@@ -48,6 +48,7 @@
 # define CONFIG_NET_BRIDGE
 #endif
 
+static VMChangeStateEntry *net_change_state_entry;
 static QTAILQ_HEAD(, NetClientState) net_clients;
 
 const char *host_net_devices[] = {
@@ -511,7 +512,8 @@ void qemu_purge_queued_packets(NetClientState *nc)
     qemu_net_queue_purge(nc->peer->incoming_queue, nc);
 }
 
-void qemu_flush_queued_packets(NetClientState *nc)
+static
+void qemu_flush_or_purge_queued_packets(NetClientState *nc, bool purge)
 {
     nc->receive_disabled = 0;
 
@@ -525,9 +527,17 @@ void qemu_flush_queued_packets(NetClientState *nc)
          * the file descriptor (for tap, for example).
          */
         qemu_notify_event();
+    } else if (purge) {
+        /* Unable to empty the queue, purge remaining packets */
+        qemu_net_queue_purge(nc->incoming_queue, nc);
     }
 }
 
+void qemu_flush_queued_packets(NetClientState *nc)
+{
+    qemu_flush_or_purge_queued_packets(nc, false);
+}
+
 static ssize_t qemu_send_packet_async_with_flags(NetClientState *sender,
                                                  unsigned flags,
                                                  const uint8_t *buf, int size,
@@ -1175,6 +1185,22 @@ void qmp_set_link(const char *name, bool up, Error **errp)
     }
 }
 
+static void net_vm_change_state_handler(void *opaque, int running,
+                                        RunState state)
+{
+    /* Complete all queued packets, to guarantee we don't modify
+     * state later when VM is not running.
+     */
+    if (!running) {
+        NetClientState *nc;
+        NetClientState *tmp;
+
+        QTAILQ_FOREACH_SAFE(nc, &net_clients, next, tmp) {
+            qemu_flush_or_purge_queued_packets(nc, true);
+        }
+    }
+}
+
 void net_cleanup(void)
 {
     NetClientState *nc;
@@ -1190,6 +1216,8 @@ void net_cleanup(void)
             qemu_del_net_client(nc);
         }
     }
+
+    qemu_del_vm_change_state_handler(net_change_state_entry);
 }
 
 void net_check_clients(void)
@@ -1275,6 +1303,9 @@ int net_init_clients(void)
 #endif
     }
 
+    net_change_state_entry =
+        qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL);
+
     QTAILQ_INIT(&net_clients);
 
     if (qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, 1) == -1)
-- 
1.9.3

[Qemu-devel] [PULL 7/7] virtio-net: purge outstanding packets when starting vhost

[Stefan Hajnoczi]

From: "Michael S. Tsirkin" <mst@redhat.com>

whenever we start vhost, virtio could have outstanding packets
queued, when they complete later we'll modify the ring
while vhost is processing it.

To prevent this, purge outstanding packets on vhost start.

Cc: qemu-stable@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/virtio-net.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 365e266..826a2a5 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -125,10 +125,23 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t status)
         return;
     }
     if (!n->vhost_started) {
-        int r;
+        int r, i;
+
         if (!vhost_net_query(get_vhost_net(nc->peer), vdev)) {
             return;
         }
+
+        /* Any packets outstanding? Purge them to avoid touching rings
+         * when vhost is running.
+         */
+        for (i = 0;  i < queues; i++) {
+            NetClientState *qnc = qemu_get_subqueue(n->nic, i);
+
+            /* Purge both directions: TX and RX. */
+            qemu_net_queue_purge(qnc->peer->incoming_queue, qnc);
+            qemu_net_queue_purge(qnc->incoming_queue, qnc->peer);
+        }
+
         n->vhost_started = 1;
         r = vhost_net_start(vdev, n->nic->ncs, queues);
         if (r < 0) {
-- 
1.9.3

Re: [Qemu-devel] [PULL 6/7] net: complete all queued packets on VM stop

[Jason Wang]

On 09/04/2014 11:50 PM, Stefan Hajnoczi wrote:
> From: "Michael S. Tsirkin" <mst@redhat.com>
>
> This completes all packets, ensuring that callbacks
> will not run when VM is stopped.
>
> Cc: qemu-stable@nongnu.org
> Cc: Jason Wang <jasowang@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  net/net.c | 33 ++++++++++++++++++++++++++++++++-
>  1 file changed, 32 insertions(+), 1 deletion(-)
>
> diff --git a/net/net.c b/net/net.c
> index 962c05f..7acc162 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -48,6 +48,7 @@
>  # define CONFIG_NET_BRIDGE
>  #endif
>  
> +static VMChangeStateEntry *net_change_state_entry;
>  static QTAILQ_HEAD(, NetClientState) net_clients;
>  
>  const char *host_net_devices[] = {
> @@ -511,7 +512,8 @@ void qemu_purge_queued_packets(NetClientState *nc)
>      qemu_net_queue_purge(nc->peer->incoming_queue, nc);
>  }
>  
> -void qemu_flush_queued_packets(NetClientState *nc)
> +static
> +void qemu_flush_or_purge_queued_packets(NetClientState *nc, bool purge)
>  {
>      nc->receive_disabled = 0;
>  
> @@ -525,9 +527,17 @@ void qemu_flush_queued_packets(NetClientState *nc)
>           * the file descriptor (for tap, for example).
>           */
>          qemu_notify_event();
> +    } else if (purge) {
> +        /* Unable to empty the queue, purge remaining packets */
> +        qemu_net_queue_purge(nc->incoming_queue, nc);
>      }
>  }
>  
> +void qemu_flush_queued_packets(NetClientState *nc)
> +{
> +    qemu_flush_or_purge_queued_packets(nc, false);
> +}
> +
>  static ssize_t qemu_send_packet_async_with_flags(NetClientState *sender,
>                                                   unsigned flags,
>                                                   const uint8_t *buf, int size,
> @@ -1175,6 +1185,22 @@ void qmp_set_link(const char *name, bool up, Error **errp)
>      }
>  }
>  
> +static void net_vm_change_state_handler(void *opaque, int running,
> +                                        RunState state)
> +{
> +    /* Complete all queued packets, to guarantee we don't modify
> +     * state later when VM is not running.
> +     */
> +    if (!running) {
> +        NetClientState *nc;
> +        NetClientState *tmp;
> +
> +        QTAILQ_FOREACH_SAFE(nc, &net_clients, next, tmp) {
> +            qemu_flush_or_purge_queued_packets(nc, true);
> +        }
> +    }
> +}

Something like net_drain_all_queue() in do_vm_stop() looks simpler. And
doing this is tricky if it depends on other handlers to be called first.

E.g virtio-net vm change state handler will set vm_running to false. And
net_vm_change_state_handler() will be called after this. This means
virtio_net_flush_tx() will still hit the assert since it will be called
by packet cb (virtio_net_tx_complete()).
> +
>  void net_cleanup(void)
>  {
>      NetClientState *nc;
> @@ -1190,6 +1216,8 @@ void net_cleanup(void)
>              qemu_del_net_client(nc);
>          }
>      }
> +
> +    qemu_del_vm_change_state_handler(net_change_state_entry);
>  }
>  
>  void net_check_clients(void)
> @@ -1275,6 +1303,9 @@ int net_init_clients(void)
>  #endif
>      }
>  
> +    net_change_state_entry =
> +        qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL);
> +
>      QTAILQ_INIT(&net_clients);
>  
>      if (qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, 1) == -1)

[Qemu-devel] [PULL 0/7] Net patches

[Stefan Hajnoczi]

The following changes since commit 090d0bfd948343d522cd20bc634105b5cfe2483b:

  s390: fix softmmu compilation (2015-08-28 16:05:24 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/net-pull-request

for you to fetch changes up to c5a93780453e6da919287c17e873c843544ef2a3:

  ne2000: Drop ne2000_can_receive (2015-09-02 14:51:07 +0100)

----------------------------------------------------------------

----------------------------------------------------------------

Fam Zheng (2):
  vmxnet3: Drop net_vmxnet3_info.can_receive
  ne2000: Drop ne2000_can_receive

Stefan Hajnoczi (3):
  rtl8139: remove duplicate net/eth.h definitions
  rtl8139: use net/eth.h macros instead of custom macros
  rtl8139: use ldl/stl wrapper for unaligned 32-bit access

Vladislav Yasevich (2):
  rtl8139: Fix receive buffer overflow check
  rtl8139: Do not consume the packet during overflow in standard mode.

 hw/net/ne2000-isa.c |   1 -
 hw/net/ne2000.c     |  10 -----
 hw/net/ne2000.h     |   1 -
 hw/net/rtl8139.c    | 111 +++++++++++++++-------------------------------------
 hw/net/vmxnet3.c    |   1 -
 5 files changed, 32 insertions(+), 92 deletions(-)

-- 
2.4.3

Re: [Qemu-devel] [PULL 0/7] Net patches

[Peter Maydell]

On 2 September 2015 at 17:14, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 090d0bfd948343d522cd20bc634105b5cfe2483b:
>
>   s390: fix softmmu compilation (2015-08-28 16:05:24 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to c5a93780453e6da919287c17e873c843544ef2a3:
>
>   ne2000: Drop ne2000_can_receive (2015-09-02 14:51:07 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/7] Net patches

[Jason Wang]

The following changes since commit b68a80139e37e806f004237e55311ebc42151434:

  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging (2016-03-24 16:24:02 +0000)

are available in the git repository at:

  https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to e680f08328f6a05a43963c3e9db1b0cdc701ed9f:

  Revert "e1000: fix hang of win2k12 shutdown with flood ping" (2016-03-25 10:39:43 +0800)

----------------------------------------------------------------

- mirror/redirector which could mirror or redirct the traffic between
  netdev and chardev
- fix e1000 interrupt strom and remove previous hack

----------------------------------------------------------------
Sameeh Jubran (2):
      e1000: Fixing interrupts pace.
      Revert "e1000: fix hang of win2k12 shutdown with flood ping"

Zhang Chen (5):
      net/filter-mirror:Add filter-mirror
      tests/test-filter-mirror:add filter-mirror unit test
      net/filter-mirror: Change filter_mirror_send interface
      net/filter-mirror: implement filter-redirector
      tests/test-filter-redirector: Add unit test for filter-redirector

 hw/net/e1000.c                 |  13 +-
 net/Makefile.objs              |   1 +
 net/filter-mirror.c            | 426 +++++++++++++++++++++++++++++++++++++++++
 qemu-options.hx                |  14 ++
 tests/.gitignore               |   2 +
 tests/Makefile                 |   4 +
 tests/test-filter-mirror.c     |  93 +++++++++
 tests/test-filter-redirector.c | 221 +++++++++++++++++++++
 vl.c                           |   4 +-
 9 files changed, 772 insertions(+), 6 deletions(-)
 create mode 100644 net/filter-mirror.c
 create mode 100644 tests/test-filter-mirror.c
 create mode 100644 tests/test-filter-redirector.c

Re: [Qemu-devel] [PULL 0/7] Net patches

[Peter Maydell]

On 25 March 2016 at 07:42, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit b68a80139e37e806f004237e55311ebc42151434:
>
>   Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging (2016-03-24 16:24:02 +0000)
>
> are available in the git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to e680f08328f6a05a43963c3e9db1b0cdc701ed9f:
>
>   Revert "e1000: fix hang of win2k12 shutdown with flood ping" (2016-03-25 10:39:43 +0800)
>
> ----------------------------------------------------------------
>
> - mirror/redirector which could mirror or redirct the traffic between
>   netdev and chardev
> - fix e1000 interrupt strom and remove previous hack

Hi. I'm afraid this fails to compile:

/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c: In function
‘filter_mirror_setup’:
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:242:9:
error: implicit declaration of function ‘error_setg’
[-Werror=implicit-function-declaration]
         error_setg(errp, "filter filter mirror needs 'outdev' "
         ^
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:242:9:
error: nested extern declaration of ‘error_setg’
[-Werror=nested-externs]
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:9:
error: implicit declaration of function ‘error_set’
[-Werror=implicit-function-declaration]
         error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
         ^
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:9:
error: nested extern declaration of ‘error_set’
[-Werror=nested-externs]
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:25:
error: ‘ERROR_CLASS_DEVICE_NOT_FOUND’ undeclared (first use in this
function)
         error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
                         ^
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:25:
note: each undeclared identifier is reported only once for each
function it appears in
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c: In function
‘filter_redirector_setup’:
/home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:281:29:
error: ‘ERROR_CLASS_DEVICE_NOT_FOUND’ undeclared (first use in this
function)
             error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
                             ^
cc1: all warnings being treated as errors

I think your commit has unfortunately clashed with the
pull from Paolo that I've just applied that makes
changes to our include files.

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/7] Net patches

[Jason Wang]

On 03/30/2016 12:39 AM, Peter Maydell wrote:
> On 25 March 2016 at 07:42, Jason Wang <jasowang@redhat.com> wrote:
>> The following changes since commit b68a80139e37e806f004237e55311ebc42151434:
>>
>>   Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging (2016-03-24 16:24:02 +0000)
>>
>> are available in the git repository at:
>>
>>   https://github.com/jasowang/qemu.git tags/net-pull-request
>>
>> for you to fetch changes up to e680f08328f6a05a43963c3e9db1b0cdc701ed9f:
>>
>>   Revert "e1000: fix hang of win2k12 shutdown with flood ping" (2016-03-25 10:39:43 +0800)
>>
>> ----------------------------------------------------------------
>>
>> - mirror/redirector which could mirror or redirct the traffic between
>>   netdev and chardev
>> - fix e1000 interrupt strom and remove previous hack
> Hi. I'm afraid this fails to compile:
>
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c: In function
> ‘filter_mirror_setup’:
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:242:9:
> error: implicit declaration of function ‘error_setg’
> [-Werror=implicit-function-declaration]
>          error_setg(errp, "filter filter mirror needs 'outdev' "
>          ^
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:242:9:
> error: nested extern declaration of ‘error_setg’
> [-Werror=nested-externs]
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:9:
> error: implicit declaration of function ‘error_set’
> [-Werror=implicit-function-declaration]
>          error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
>          ^
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:9:
> error: nested extern declaration of ‘error_set’
> [-Werror=nested-externs]
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:25:
> error: ‘ERROR_CLASS_DEVICE_NOT_FOUND’ undeclared (first use in this
> function)
>          error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
>                          ^
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:249:25:
> note: each undeclared identifier is reported only once for each
> function it appears in
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c: In function
> ‘filter_redirector_setup’:
> /home/petmay01/linaro/qemu-for-merges/net/filter-mirror.c:281:29:
> error: ‘ERROR_CLASS_DEVICE_NOT_FOUND’ undeclared (first use in this
> function)
>              error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
>                              ^
> cc1: all warnings being treated as errors
>
> I think your commit has unfortunately clashed with the
> pull from Paolo that I've just applied that makes
> changes to our include files.

Right, will fix and send V2.

Thanks

>
> thanks
> -- PMM
>