qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org
Cc: Jason Wang <jasowang@redhat.com>,
	qemu-devel@nongnu.org, qemu-stable@nongnu.org
Subject: [PULL 23/33] net: use peer when purging queue in qemu_flush_or_purge_queue_packets()
Date: Tue, 16 Jun 2020 14:45:34 +0800	[thread overview]
Message-ID: <1592289944-13727-24-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1592289944-13727-1-git-send-email-jasowang@redhat.com>

The sender of packet will be checked in the qemu_net_queue_purge() but
we use NetClientState not its peer when trying to purge the incoming
queue in qemu_flush_or_purge_packets(). This will trigger the assert
in virtio_net_reset since we can't pass the sender check:

hw/net/virtio-net.c:533: void virtio_net_reset(VirtIODevice *): Assertion
`!virtio_net_get_subqueue(nc)->async_tx.elem' failed.
#9 0x55a33fa31b78 in virtio_net_reset hw/net/virtio-net.c:533:13
#10 0x55a33fc88412 in virtio_reset hw/virtio/virtio.c:1919:9
#11 0x55a341d82764 in virtio_bus_reset hw/virtio/virtio-bus.c:95:9
#12 0x55a341dba2de in virtio_pci_reset hw/virtio/virtio-pci.c:1824:5
#13 0x55a341db3e02 in virtio_pci_common_write hw/virtio/virtio-pci.c:1252:13
#14 0x55a33f62117b in memory_region_write_accessor memory.c:496:5
#15 0x55a33f6205e4 in access_with_adjusted_size memory.c:557:18
#16 0x55a33f61e177 in memory_region_dispatch_write memory.c:1488:16

Reproducer:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg701914.html

Fix by using the peer.

Reported-by: "Alexander Bulekov" <alxndr@bu.edu>
Acked-by: Alexander Bulekov <alxndr@bu.edu>
Fixes: ca77d85e1dbf9 ("net: complete all queued packets on VM stop")
Cc: qemu-stable@nongnu.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/net.c b/net/net.c
index cbeeead..4c62b10 100644
--- a/net/net.c
+++ b/net/net.c
@@ -610,7 +610,7 @@ void qemu_flush_or_purge_queued_packets(NetClientState *nc, bool purge)
         qemu_notify_event();
     } else if (purge) {
         /* Unable to empty the queue, purge remaining packets */
-        qemu_net_queue_purge(nc->incoming_queue, nc);
+        qemu_net_queue_purge(nc->incoming_queue, nc->peer);
     }
 }
 
-- 
2.5.0



  parent reply	other threads:[~2020-06-16  7:05 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-16  6:45 [PULL 00/33] Net patches Jason Wang
2020-06-16  6:45 ` [PULL 01/33] virtio-net: implement RSS configuration command Jason Wang
2020-06-16  6:45 ` [PULL 02/33] virtio-net: implement RX RSS processing Jason Wang
2020-06-16  6:45 ` [PULL 03/33] tap: allow extended virtio header with hash info Jason Wang
2020-06-16  6:45 ` [PULL 04/33] virtio-net: reference implementation of hash report Jason Wang
2020-06-16  6:45 ` [PULL 05/33] vmstate.h: provide VMSTATE_VARRAY_UINT16_ALLOC macro Jason Wang
2020-06-16  6:45 ` [PULL 06/33] virtio-net: add migration support for RSS and hash report Jason Wang
2020-06-16  6:45 ` [PULL 07/33] virtio-net: align RSC fields with updated virtio-net header Jason Wang
2020-06-16  6:45 ` [PULL 08/33] Fix tulip breakage Jason Wang
2020-06-16  6:45 ` [PULL 09/33] hw/net/tulip: Fix 'Descriptor Error' definition Jason Wang
2020-06-16  6:45 ` [PULL 10/33] hw/net/tulip: Log descriptor overflows Jason Wang
2020-06-16  6:45 ` [PULL 11/33] net: cadence_gem: Fix debug statements Jason Wang
2020-06-16  6:45 ` [PULL 12/33] net: cadence_gem: Fix the queue address update during wrap around Jason Wang
2020-06-16  6:45 ` [PULL 13/33] net: cadence_gem: Fix irq update w.r.t queue Jason Wang
2020-06-16  6:45 ` [PULL 14/33] net: cadence_gem: Define access permission for interrupt registers Jason Wang
2020-06-16  6:45 ` [PULL 15/33] net: cadence_gem: Set ISR according to queue in use Jason Wang
2020-06-16  6:45 ` [PULL 16/33] net: cadence_gem: Move tx/rx packet buffert to CadenceGEMState Jason Wang
2020-06-16  6:45 ` [PULL 17/33] net: cadence_gem: Fix up code style Jason Wang
2020-06-16  6:45 ` [PULL 18/33] net: cadence_gem: Add support for jumbo frames Jason Wang
2020-06-16  6:45 ` [PULL 19/33] net: cadnece_gem: Update irq_read_clear field of designcfg_debug1 reg Jason Wang
2020-06-16  6:45 ` [PULL 20/33] net: cadence_gem: Update the reset value for interrupt mask register Jason Wang
2020-06-16  6:45 ` [PULL 21/33] net: cadence_gem: TX_LAST bit should be set by guest Jason Wang
2020-06-16  6:45 ` [PULL 22/33] net: cadence_gem: Fix RX address filtering Jason Wang
2020-06-16  6:45 ` Jason Wang [this message]
2020-06-16  6:45 ` [PULL 24/33] net/colo-compare.c: Create event_bh with the right AioContext Jason Wang
2020-06-16  6:45 ` [PULL 25/33] chardev/char.c: Use qemu_co_sleep_ns if in coroutine Jason Wang
2020-06-16  6:45 ` [PULL 26/33] net/colo-compare.c: Fix deadlock in compare_chr_send Jason Wang
2020-06-16  6:45 ` [PULL 27/33] net/colo-compare.c: Only hexdump packets if tracing is enabled Jason Wang
2020-06-16  6:45 ` [PULL 28/33] net/colo-compare.c: Check that colo-compare is active Jason Wang
2020-06-16  6:45 ` [PULL 29/33] net/colo-compare.c: Correct ordering in complete and finalize Jason Wang
2020-06-16  6:45 ` [PULL 30/33] colo-compare: Fix memory leak in packet_enqueue() Jason Wang
2020-06-16  6:45 ` [PULL 31/33] hw/net/e1000e: Do not abort() on invalid PSRCTL register value Jason Wang
2020-06-16  6:45 ` [PULL 32/33] net: Drop the legacy "name" parameter from the -net option Jason Wang
2020-06-16  6:45 ` [PULL 33/33] net: Drop the NetLegacy structure, always use Netdev instead Jason Wang
2020-06-16 12:32 ` [PULL 00/33] Net patches Peter Maydell
2020-06-17  6:19   ` Jason Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1592289944-13727-24-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).