[Qemu-devel] [PULL] Net patches

[Qemu-devel] [PULL] Net patches

[Jason Wang]

The following changes since commit 5e19aed59ab48ca3c7f1e2da203eed27b91bef2d:

  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171127' into staging (2017-11-27 11:16:20 +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 70e53e6e4da3db4b2c31981191753a7e974936d0:

  virtio-net: don't touch virtqueue if vm is stopped (2017-11-28 11:54:50 +0800)

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

----------------------------------------------------------------
Jason Wang (1):
      virtio-net: don't touch virtqueue if vm is stopped

 hw/net/virtio-net.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[Qemu-devel] [PULL] virtio-net: don't touch virtqueue if vm is stopped

[Jason Wang]

Guest state should not be touched if VM is stopped, unfortunately we
didn't check running state and tried to drain tx queue unconditionally
in virtio_net_set_status(). A crash was then noticed as a migration
destination when user type quit after virtqueue state is loaded but
before region cache is initialized. In this case,
virtio_net_drop_tx_queue_data() tries to access the uninitialized
region cache.

Fix this by only dropping tx queue data when vm is running.

Fixes: 283e2c2adcb80 ("net: virtio-net discards TX data after link down")
Cc: Yuri Benditovich <yuri.benditovich@daynix.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: qemu-stable@nongnu.org
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/virtio-net.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 150fd07..38674b0 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -288,7 +288,8 @@ static void virtio_net_set_status(struct VirtIODevice *vdev, uint8_t status)
                 qemu_bh_cancel(q->tx_bh);
             }
             if ((n->status & VIRTIO_NET_S_LINK_UP) == 0 &&
-                (queue_status & VIRTIO_CONFIG_S_DRIVER_OK)) {
+                (queue_status & VIRTIO_CONFIG_S_DRIVER_OK) &&
+                vdev->vm_running) {
                 /* if tx is waiting we are likely have some packets in tx queue
                  * and disabled notification */
                 q->tx_waiting = 0;
-- 
2.7.4

Re: [Qemu-devel] [PULL] Net patches

[Peter Maydell]

On 28 November 2017 at 04:01, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit 5e19aed59ab48ca3c7f1e2da203eed27b91bef2d:
>
>   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171127' into staging (2017-11-27 11:16:20 +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 70e53e6e4da3db4b2c31981191753a7e974936d0:
>
>   virtio-net: don't touch virtqueue if vm is stopped (2017-11-28 11:54:50 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Jason Wang (1):
>       virtio-net: don't touch virtqueue if vm is stopped
>
>  hw/net/virtio-net.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL] Net patches

[Jason Wang]

The following changes since commit d835c6192495dc5b2c3a15a0761eb57d8d310828:

  Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-11-15-1' into staging (2018-11-15 14:18:25 +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 013a62020a92f371555c67342424f2f944b62be4:

  net/filter-rewriter.c: Fix coverity static analysis issue (2018-11-16 11:08:26 +0800)

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

----------------------------------------------------------------
Zhang Chen (1):
      net/filter-rewriter.c: Fix coverity static analysis issue

 net/filter-rewriter.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Re: [Qemu-devel] [PULL] Net patches

[Peter Maydell]

On 16 November 2018 at 03:43, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit d835c6192495dc5b2c3a15a0761eb57d8d310828:
>
>   Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-11-15-1' into staging (2018-11-15 14:18:25 +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 013a62020a92f371555c67342424f2f944b62be4:
>
>   net/filter-rewriter.c: Fix coverity static analysis issue (2018-11-16 11:08:26 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Zhang Chen (1):
>       net/filter-rewriter.c: Fix coverity static analysis issue
>
>  net/filter-rewriter.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)


Applied, thanks.

-- PMM

[Qemu-devel] [PULL] Net patches

[Jason Wang]

The following changes since commit 47d3b60858d90ac8a0cc3a72af7f95c96781125a:

  Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.12-important-fixes' into staging (2018-03-28 22:13:38 +0100)

are available in the git repository at:

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

for you to fetch changes up to abbbb0350d780e24d2f6a0cf8fc3191badb0329a:

  qemu-doc: Rework the network options chapter to make "-net" less prominent (2018-03-30 11:44:11 +0800)

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

----------------------------------------------------------------
Thomas Huth (1):
      qemu-doc: Rework the network options chapter to make "-net" less prominent

 qemu-options.hx | 189 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 94 insertions(+), 95 deletions(-)

Re: [Qemu-devel] [PULL] Net patches

[Peter Maydell]

On 30 March 2018 at 04:53, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit 47d3b60858d90ac8a0cc3a72af7f95c96781125a:
>
>   Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.12-important-fixes' into staging (2018-03-28 22:13:38 +0100)
>
> are available in the git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to abbbb0350d780e24d2f6a0cf8fc3191badb0329a:
>
>   qemu-doc: Rework the network options chapter to make "-net" less prominent (2018-03-30 11:44:11 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Thomas Huth (1):
>       qemu-doc: Rework the network options chapter to make "-net" less prominent
>
>  qemu-options.hx | 189 ++++++++++++++++++++++++++++----------------------------
>  1 file changed, 94 insertions(+), 95 deletions(-)
>
Applied, thanks.

-- PMM

[Qemu-devel] [PULL] Net patches

[Jason Wang]

The following changes since commit 91d35509903464c7f4b9ed56be223d7370d3597c:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20160706' into staging (2016-07-06 17:32:09 +0100)

are available in the git repository at:

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

for you to fetch changes up to 69e87b32680a41d9761191443587c595b6f5fc3f:

  tap: vhost busy polling support (2016-07-07 14:29:04 +0800)

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

Major changes:
- add busy polling support for tap

----------------------------------------------------------------
Jason Wang (1):
      tap: vhost busy polling support

 hw/net/vhost_net.c                |  2 +-
 hw/scsi/vhost-scsi.c              |  2 +-
 hw/virtio/vhost-backend.c         |  8 ++++++++
 hw/virtio/vhost.c                 | 40 ++++++++++++++++++++++++++++++++++++++-
 include/hw/virtio/vhost-backend.h |  3 +++
 include/hw/virtio/vhost.h         |  3 ++-
 include/net/vhost_net.h           |  1 +
 net/tap.c                         |  7 ++++++-
 net/vhost-user.c                  |  1 +
 qapi-schema.json                  |  6 +++++-
 qemu-options.hx                   |  3 +++
 11 files changed, 70 insertions(+), 6 deletions(-)

Re: [Qemu-devel] [PULL] Net patches

[Peter Maydell]

On 7 July 2016 at 07:53, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit 91d35509903464c7f4b9ed56be223d7370d3597c:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20160706' into staging (2016-07-06 17:32:09 +0100)
>
> are available in the git repository at:
>
>   https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 69e87b32680a41d9761191443587c595b6f5fc3f:
>
>   tap: vhost busy polling support (2016-07-07 14:29:04 +0800)
>
> ----------------------------------------------------------------
>
> Major changes:
> - add busy polling support for tap
>
> ----------------------------------------------------------------
> Jason Wang (1):
>       tap: vhost busy polling support

Applied, thanks.

-- PMM

[Qemu-devel] [PULL] Net patches

[Stefan Hajnoczi]

The following changes since commit 1aba4be97eb01b650d146c7f01dc961d55da62ab:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-11-17 17:22:03 +0000)

are available in the git repository at:

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

for you to fetch changes up to ed6273e26fdfb94a282dbbf1234a75422c6b4c4b:

  net: The third parameter of getsockname should be initialized (2014-11-18 15:04:35 +0000)

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

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

zhanghailiang (1):
  net: The third parameter of getsockname should be initialized

 net/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.1.0

Re: [Qemu-devel] [PULL] Net patches

[Peter Maydell]

On 18 November 2014 15:04, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 1aba4be97eb01b650d146c7f01dc961d55da62ab:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-11-17 17:22:03 +0000)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to ed6273e26fdfb94a282dbbf1234a75422c6b4c4b:
>
>   net: The third parameter of getsockname should be initialized (2014-11-18 15:04:35 +0000)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
Applied, thanks.

-- PMM