From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>,
Mikhail Sennikovsky <mikhail.sennikovskii@cloud.ionos.com>,
qemu-stable@nongnu.org
Subject: [PATCH 48/55] virtio-net: prevent offloads reset on migration
Date: Tue, 5 Nov 2019 14:52:36 -0600 [thread overview]
Message-ID: <20191105205243.3766-49-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <20191105205243.3766-1-mdroth@linux.vnet.ibm.com>
From: Mikhail Sennikovsky <mikhail.sennikovskii@cloud.ionos.com>
Currently offloads disabled by guest via the VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET
command are not preserved on VM migration.
Instead all offloads reported by guest features (via VIRTIO_PCI_GUEST_FEATURES)
get enabled.
What happens is: first the VirtIONet::curr_guest_offloads gets restored and offloads
are getting set correctly:
#0 qemu_set_offload (nc=0x555556a11400, csum=1, tso4=0, tso6=0, ecn=0, ufo=0) at net/net.c:474
#1 virtio_net_apply_guest_offloads (n=0x555557701ca0) at hw/net/virtio-net.c:720
#2 virtio_net_post_load_device (opaque=0x555557701ca0, version_id=11) at hw/net/virtio-net.c:2334
#3 vmstate_load_state (f=0x5555569dc010, vmsd=0x555556577c80 <vmstate_virtio_net_device>, opaque=0x555557701ca0, version_id=11)
at migration/vmstate.c:168
#4 virtio_load (vdev=0x555557701ca0, f=0x5555569dc010, version_id=11) at hw/virtio/virtio.c:2197
#5 virtio_device_get (f=0x5555569dc010, opaque=0x555557701ca0, size=0, field=0x55555668cd00 <__compound_literal.5>) at hw/virtio/virtio.c:2036
#6 vmstate_load_state (f=0x5555569dc010, vmsd=0x555556577ce0 <vmstate_virtio_net>, opaque=0x555557701ca0, version_id=11) at migration/vmstate.c:143
#7 vmstate_load (f=0x5555569dc010, se=0x5555578189e0) at migration/savevm.c:829
#8 qemu_loadvm_section_start_full (f=0x5555569dc010, mis=0x5555569eee20) at migration/savevm.c:2211
#9 qemu_loadvm_state_main (f=0x5555569dc010, mis=0x5555569eee20) at migration/savevm.c:2395
#10 qemu_loadvm_state (f=0x5555569dc010) at migration/savevm.c:2467
#11 process_incoming_migration_co (opaque=0x0) at migration/migration.c:449
However later on the features are getting restored, and offloads get reset to
everything supported by features:
#0 qemu_set_offload (nc=0x555556a11400, csum=1, tso4=1, tso6=1, ecn=0, ufo=0) at net/net.c:474
#1 virtio_net_apply_guest_offloads (n=0x555557701ca0) at hw/net/virtio-net.c:720
#2 virtio_net_set_features (vdev=0x555557701ca0, features=5104441767) at hw/net/virtio-net.c:773
#3 virtio_set_features_nocheck (vdev=0x555557701ca0, val=5104441767) at hw/virtio/virtio.c:2052
#4 virtio_load (vdev=0x555557701ca0, f=0x5555569dc010, version_id=11) at hw/virtio/virtio.c:2220
#5 virtio_device_get (f=0x5555569dc010, opaque=0x555557701ca0, size=0, field=0x55555668cd00 <__compound_literal.5>) at hw/virtio/virtio.c:2036
#6 vmstate_load_state (f=0x5555569dc010, vmsd=0x555556577ce0 <vmstate_virtio_net>, opaque=0x555557701ca0, version_id=11) at migration/vmstate.c:143
#7 vmstate_load (f=0x5555569dc010, se=0x5555578189e0) at migration/savevm.c:829
#8 qemu_loadvm_section_start_full (f=0x5555569dc010, mis=0x5555569eee20) at migration/savevm.c:2211
#9 qemu_loadvm_state_main (f=0x5555569dc010, mis=0x5555569eee20) at migration/savevm.c:2395
#10 qemu_loadvm_state (f=0x5555569dc010) at migration/savevm.c:2467
#11 process_incoming_migration_co (opaque=0x0) at migration/migration.c:449
Fix this by preserving the state in saved_guest_offloads field and
pushing out offload initialization to the new post load hook.
Cc: qemu-stable@nongnu.org
Signed-off-by: Mikhail Sennikovsky <mikhail.sennikovskii@cloud.ionos.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
(cherry picked from commit 7788c3f2e21e35902d45809b236791383bbb613e)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
hw/net/virtio-net.c | 27 ++++++++++++++++++++++++---
include/hw/virtio/virtio-net.h | 2 ++
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index b9e1cd71cf..6adb0fe252 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -2330,9 +2330,13 @@ static int virtio_net_post_load_device(void *opaque, int version_id)
n->curr_guest_offloads = virtio_net_supported_guest_offloads(n);
}
- if (peer_has_vnet_hdr(n)) {
- virtio_net_apply_guest_offloads(n);
- }
+ /*
+ * curr_guest_offloads will be later overwritten by the
+ * virtio_set_features_nocheck call done from the virtio_load.
+ * Here we make sure it is preserved and restored accordingly
+ * in the virtio_net_post_load_virtio callback.
+ */
+ n->saved_guest_offloads = n->curr_guest_offloads;
virtio_net_set_queues(n);
@@ -2367,6 +2371,22 @@ static int virtio_net_post_load_device(void *opaque, int version_id)
return 0;
}
+static int virtio_net_post_load_virtio(VirtIODevice *vdev)
+{
+ VirtIONet *n = VIRTIO_NET(vdev);
+ /*
+ * The actual needed state is now in saved_guest_offloads,
+ * see virtio_net_post_load_device for detail.
+ * Restore it back and apply the desired offloads.
+ */
+ n->curr_guest_offloads = n->saved_guest_offloads;
+ if (peer_has_vnet_hdr(n)) {
+ virtio_net_apply_guest_offloads(n);
+ }
+
+ return 0;
+}
+
/* tx_waiting field of a VirtIONetQueue */
static const VMStateDescription vmstate_virtio_net_queue_tx_waiting = {
.name = "virtio-net-queue-tx_waiting",
@@ -2909,6 +2929,7 @@ static void virtio_net_class_init(ObjectClass *klass, void *data)
vdc->guest_notifier_mask = virtio_net_guest_notifier_mask;
vdc->guest_notifier_pending = virtio_net_guest_notifier_pending;
vdc->legacy_features |= (0x1 << VIRTIO_NET_F_GSO);
+ vdc->post_load = virtio_net_post_load_virtio;
vdc->vmsd = &vmstate_virtio_net_device;
}
diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h
index b96f0c643f..07a9319f4b 100644
--- a/include/hw/virtio/virtio-net.h
+++ b/include/hw/virtio/virtio-net.h
@@ -182,6 +182,8 @@ struct VirtIONet {
char *netclient_name;
char *netclient_type;
uint64_t curr_guest_offloads;
+ /* used on saved state restore phase to preserve the curr_guest_offloads */
+ uint64_t saved_guest_offloads;
AnnounceTimer announce_timer;
bool needs_vnet_hdr_swap;
bool mtu_bypass_backend;
--
2.17.1
next prev parent reply other threads:[~2019-11-05 21:14 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 20:51 [PATCH 00/55] Patch Round-up for stable 4.1.1, freeze on 2019-11-12 Michael Roth
2019-11-05 20:51 ` [PATCH 01/55] dma-helpers: ensure AIO callback is invoked after cancellation Michael Roth
2019-11-05 20:51 ` [PATCH 02/55] Revert "ide/ahci: Check for -ECANCELED in aio callbacks" Michael Roth
2019-11-05 20:51 ` [PATCH 03/55] s390x/tcg: Fix VERIM with 32/64 bit elements Michael Roth
2019-11-05 20:51 ` [PATCH 04/55] target/alpha: fix tlb_fill trap_arg2 value for instruction fetch Michael Roth
2019-11-05 20:51 ` [PATCH 05/55] pc: Don't make die-id mandatory unless necessary Michael Roth
2019-11-05 20:51 ` [PATCH 06/55] xen-bus: Fix backend state transition on device reset Michael Roth
2019-11-05 20:51 ` [PATCH 07/55] xen-bus: check whether the frontend is active during " Michael Roth
2019-11-05 20:51 ` [PATCH 08/55] block/file-posix: Reduce xfsctl() use Michael Roth
2019-11-05 20:51 ` [PATCH 09/55] iotests: Test reverse sub-cluster qcow2 writes Michael Roth
2019-11-05 20:51 ` [PATCH 10/55] pr-manager: Fix invalid g_free() crash bug Michael Roth
2019-11-05 20:51 ` [PATCH 11/55] x86: do not advertise die-id in query-hotpluggbale-cpus if '-smp dies' is not set Michael Roth
2019-11-05 20:52 ` [PATCH 12/55] vpc: Return 0 from vpc_co_create() on success Michael Roth
2019-11-05 20:52 ` [PATCH 13/55] iotests: add testing shim for script-style python tests Michael Roth
2019-11-05 20:52 ` [PATCH 14/55] iotests: Add supported protocols to execute_test() Michael Roth
2019-11-05 20:52 ` [PATCH 15/55] iotests: Restrict file Python tests to file Michael Roth
2019-11-05 20:52 ` [PATCH 16/55] iotests: Restrict nbd Python tests to nbd Michael Roth
2019-11-05 20:52 ` [PATCH 17/55] iotests: Test blockdev-create for vpc Michael Roth
2019-11-05 20:52 ` [PATCH 18/55] target/arm: Free TCG temps in trans_VMOV_64_sp() Michael Roth
2019-11-05 20:52 ` [PATCH 19/55] target/arm: Don't abort on M-profile exception return in linux-user mode Michael Roth
2019-11-05 20:52 ` [PATCH 20/55] libvhost-user: fix SLAVE_SEND_FD handling Michael Roth
2019-11-05 20:52 ` [PATCH 21/55] qcow2: Fix the calculation of the maximum L2 cache size Michael Roth
2019-11-05 20:52 ` [PATCH 22/55] block/nfs: tear down aio before nfs_close Michael Roth
2019-11-05 20:52 ` [PATCH 23/55] curl: Keep pointer to the CURLState in CURLSocket Michael Roth
2019-11-05 20:52 ` [PATCH 24/55] curl: Keep *socket until the end of curl_sock_cb() Michael Roth
2019-11-05 20:52 ` [PATCH 25/55] curl: Check completion in curl_multi_do() Michael Roth
2019-11-05 20:52 ` [PATCH 26/55] curl: Pass CURLSocket to curl_multi_do() Michael Roth
2019-11-05 20:52 ` [PATCH 27/55] curl: Report only ready sockets Michael Roth
2019-11-05 20:52 ` [PATCH 28/55] curl: Handle success in multi_check_completion Michael Roth
2019-11-05 20:52 ` [PATCH 29/55] blockjob: update nodes head while removing all bdrv Michael Roth
2019-11-05 20:52 ` [PATCH 30/55] block/qcow2: Fix corruption introduced by commit 8ac0f15f335 Michael Roth
2019-11-05 20:52 ` [PATCH 31/55] coroutine: Add qemu_co_mutex_assert_locked() Michael Roth
2019-11-05 20:52 ` [PATCH 32/55] qcow2: Fix corruption bug in qcow2_detect_metadata_preallocation() Michael Roth
2019-11-05 20:52 ` [PATCH 33/55] block/backup: fix max_transfer handling for copy_range Michael Roth
2019-11-05 20:52 ` [PATCH 34/55] block/backup: fix backup_cow_with_offload for last cluster Michael Roth
2019-11-05 20:52 ` [PATCH 35/55] hw/arm/boot.c: Set NSACR.{CP11, CP10} for NS kernel boots Michael Roth
2019-11-05 20:52 ` [PATCH 36/55] make-release: pull in edk2 submodules so we can build it from tarballs Michael Roth
2019-11-05 20:52 ` [PATCH 37/55] roms/Makefile.edk2: don't pull in submodules when building from tarball Michael Roth
2019-11-05 20:52 ` [PATCH 38/55] s390: PCI: fix IOMMU region init Michael Roth
2019-11-05 20:52 ` [PATCH 39/55] block/snapshot: Restrict set of snapshot nodes Michael Roth
2019-11-05 20:52 ` [PATCH 40/55] iotests: Test internal snapshots with -blockdev Michael Roth
2019-11-05 20:52 ` [PATCH 41/55] vhost-user: save features if the char dev is closed Michael Roth
2019-11-05 20:52 ` [PATCH 42/55] hw/core/loader: Fix possible crash in rom_copy() Michael Roth
2019-11-05 20:52 ` [PATCH 43/55] qcow2: Limit total allocation range to INT_MAX Michael Roth
2019-11-05 20:52 ` [PATCH 44/55] iotests: Test large write request to qcow2 file Michael Roth
2019-11-05 20:52 ` [PATCH 45/55] mirror: Do not dereference invalid pointers Michael Roth
2019-11-05 20:52 ` [PATCH 46/55] ui: Fix hanging up Cocoa display on macOS 10.15 (Catalina) Michael Roth
2019-11-05 20:52 ` [PATCH 47/55] virtio: new post_load hook Michael Roth
2019-11-05 20:52 ` Michael Roth [this message]
2019-11-05 20:52 ` [PATCH 49/55] COLO-compare: Fix incorrect `if` logic Michael Roth
2019-11-05 20:52 ` [PATCH 50/55] util/hbitmap: strict hbitmap_reset Michael Roth
2019-11-05 20:52 ` [PATCH 51/55] hbitmap: handle set/reset with zero length Michael Roth
2019-11-05 20:52 ` [PATCH 52/55] target/arm: Allow reading flags from FPSCR for M-profile Michael Roth
2019-11-05 20:52 ` [PATCH 53/55] target/xtensa: regenerate and re-import test_mmuhifi_c3 core Michael Roth
2019-11-05 20:52 ` [PATCH 54/55] scsi: lsi: exit infinite loop while executing script (CVE-2019-12068) Michael Roth
2019-11-05 20:52 ` [PATCH 55/55] virtio-blk: Cancel the pending BH when the dataplane is reset Michael Roth
2019-11-08 9:46 ` [PATCH 00/55] Patch Round-up for stable 4.1.1, freeze on 2019-11-12 Max Reitz
2019-11-11 14:03 ` Cole Robinson
2019-11-11 14:06 ` Cole Robinson
2019-11-12 18:05 ` Michael Roth
2019-11-12 23:12 ` Michael Roth
2019-11-12 21:52 ` Bruce Rogers
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=20191105205243.3766-49-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=jasowang@redhat.com \
--cc=mikhail.sennikovskii@cloud.ionos.com \
--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).