From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D096C352AA for ; Wed, 2 Oct 2019 09:56:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 42A90218DE for ; Wed, 2 Oct 2019 09:56:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 42A90218DE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbN1-000257-A4 for qemu-devel@archiver.kernel.org; Wed, 02 Oct 2019 05:56:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50236) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbMM-0001e3-7y for qemu-devel@nongnu.org; Wed, 02 Oct 2019 05:55:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbMK-0006C8-5v for qemu-devel@nongnu.org; Wed, 02 Oct 2019 05:55:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56484) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFbMJ-0006Bk-TQ for qemu-devel@nongnu.org; Wed, 02 Oct 2019 05:55:48 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D18D30860D1; Wed, 2 Oct 2019 09:55:47 +0000 (UTC) Received: from work-vm (unknown [10.36.118.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F50160605; Wed, 2 Oct 2019 09:55:40 +0000 (UTC) Date: Wed, 2 Oct 2019 10:55:38 +0100 From: "Dr. David Alan Gilbert" To: Mikhail Sennikovsky , stefanha@redhat.com, jasowang@redhat.com, mst@redhat.com Subject: Re: [PATCH] virtio-net: prevent offloads reset on migration Message-ID: <20191002095538.GA2709@work-vm> References: <1569932308-30478-1-git-send-email-mikhail.sennikovskii@cloud.ionos.com> <1569932308-30478-2-git-send-email-mikhail.sennikovskii@cloud.ionos.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1569932308-30478-2-git-send-email-mikhail.sennikovskii@cloud.ionos.com> User-Agent: Mutt/1.12.1 (2019-06-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Wed, 02 Oct 2019 09:55:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Copying in Stefan, Jason and Michael who know the virtio details Dave * Mikhail Sennikovsky (mikhail.sennikovskii@cloud.ionos.com) wrote: > 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 , 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 , 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 , 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 > > This patch fixes this by adding an extra argument to the set_features callback, > specifying whether the offloads are to be reset, and setting it to false > for the migration case. > > Signed-off-by: Mikhail Sennikovsky > --- > hw/display/virtio-gpu-base.c | 3 ++- > hw/net/virtio-net.c | 5 +++-- > hw/virtio/virtio.c | 10 +++++----- > include/hw/virtio/virtio.h | 2 +- > 4 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c > index 55e0799..04d8a23 100644 > --- a/hw/display/virtio-gpu-base.c > +++ b/hw/display/virtio-gpu-base.c > @@ -193,7 +193,8 @@ virtio_gpu_base_get_features(VirtIODevice *vdev, uint64_t features, > } > > static void > -virtio_gpu_base_set_features(VirtIODevice *vdev, uint64_t features) > +virtio_gpu_base_set_features(VirtIODevice *vdev, uint64_t features, > + bool reset_offloads) > { > static const uint32_t virgl = (1 << VIRTIO_GPU_F_VIRGL); > VirtIOGPUBase *g = VIRTIO_GPU_BASE(vdev); > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index b9e1cd7..5d108e5 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -743,7 +743,8 @@ static inline uint64_t virtio_net_supported_guest_offloads(VirtIONet *n) > return virtio_net_guest_offloads_by_features(vdev->guest_features); > } > > -static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) > +static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features, > + bool reset_offloads) > { > VirtIONet *n = VIRTIO_NET(vdev); > int i; > @@ -767,7 +768,7 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) > n->rsc6_enabled = virtio_has_feature(features, VIRTIO_NET_F_RSC_EXT) && > virtio_has_feature(features, VIRTIO_NET_F_GUEST_TSO6); > > - if (n->has_vnet_hdr) { > + if (reset_offloads && n->has_vnet_hdr) { > n->curr_guest_offloads = > virtio_net_guest_offloads_by_features(features); > virtio_net_apply_guest_offloads(n); > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index a94ea18..b89f7b0 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -2042,14 +2042,14 @@ const VMStateInfo virtio_vmstate_info = { > .put = virtio_device_put, > }; > > -static int virtio_set_features_nocheck(VirtIODevice *vdev, uint64_t val) > +static int virtio_set_features_nocheck(VirtIODevice *vdev, uint64_t val, bool reset_offloads) > { > VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev); > bool bad = (val & ~(vdev->host_features)) != 0; > > val &= vdev->host_features; > if (k->set_features) { > - k->set_features(vdev, val); > + k->set_features(vdev, val, reset_offloads); > } > vdev->guest_features = val; > return bad ? -1 : 0; > @@ -2065,7 +2065,7 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val) > if (vdev->status & VIRTIO_CONFIG_S_FEATURES_OK) { > return -EINVAL; > } > - ret = virtio_set_features_nocheck(vdev, val); > + ret = virtio_set_features_nocheck(vdev, val, true); > if (!ret) { > if (virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) { > /* VIRTIO_RING_F_EVENT_IDX changes the size of the caches. */ > @@ -2217,14 +2217,14 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id) > * host_features. > */ > uint64_t features64 = vdev->guest_features; > - if (virtio_set_features_nocheck(vdev, features64) < 0) { > + if (virtio_set_features_nocheck(vdev, features64, false) < 0) { > error_report("Features 0x%" PRIx64 " unsupported. " > "Allowed features: 0x%" PRIx64, > features64, vdev->host_features); > return -1; > } > } else { > - if (virtio_set_features_nocheck(vdev, features) < 0) { > + if (virtio_set_features_nocheck(vdev, features, false) < 0) { > error_report("Features 0x%x unsupported. " > "Allowed features: 0x%" PRIx64, > features, vdev->host_features); > diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h > index b189788..fd8cac5 100644 > --- a/include/hw/virtio/virtio.h > +++ b/include/hw/virtio/virtio.h > @@ -128,7 +128,7 @@ typedef struct VirtioDeviceClass { > uint64_t requested_features, > Error **errp); > uint64_t (*bad_features)(VirtIODevice *vdev); > - void (*set_features)(VirtIODevice *vdev, uint64_t val); > + void (*set_features)(VirtIODevice *vdev, uint64_t val, bool reset_offloads); > int (*validate_features)(VirtIODevice *vdev); > void (*get_config)(VirtIODevice *vdev, uint8_t *config); > void (*set_config)(VirtIODevice *vdev, const uint8_t *config); > -- > 2.7.4 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK