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=-9.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 3F7CCC43464 for ; Fri, 18 Sep 2020 09:14:52 +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 4ED3021D24 for ; Fri, 18 Sep 2020 09:14:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="E8katqd+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4ED3021D24 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]:41162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJCTi-00040K-BM for qemu-devel@archiver.kernel.org; Fri, 18 Sep 2020 05:14:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJCSy-0003PT-8M for qemu-devel@nongnu.org; Fri, 18 Sep 2020 05:14:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46648) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJCSw-0003AJ-F5 for qemu-devel@nongnu.org; Fri, 18 Sep 2020 05:14:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600420440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0zKvEaU/9N0LecjSZ1LA1JEd+nLG0iX+v4pZrIfxuIo=; b=E8katqd+vdC4Z+DpKI1KhIhnxeG5iSuUZoUmw6udATehtRHHDsqaJ3xJ6DNM+jXUlg5vBL LbKy1uW+aB50PP4QaUFLOoynbRhU9v1P9HkIvSmI3lzNtx4pJ0LfWshsVcLroMNOeL3X4c u7OLgxHVZQmiZwDX0/p9scspZYq/40U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-34-eaaiH0G4O-OE9Xmty6EKWQ-1; Fri, 18 Sep 2020 05:13:59 -0400 X-MC-Unique: eaaiH0G4O-OE9Xmty6EKWQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 954BF1074668; Fri, 18 Sep 2020 09:13:57 +0000 (UTC) Received: from gondolin (ovpn-112-191.ams2.redhat.com [10.36.112.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B6E65D9E2; Fri, 18 Sep 2020 09:13:45 +0000 (UTC) Date: Fri, 18 Sep 2020 11:13:42 +0200 From: Cornelia Huck To: Stefano Garzarella Subject: Re: [PATCH v3 1/4] virtio: skip legacy support check on machine types less than 5.1 Message-ID: <20200918111342.01fd51c0.cohuck@redhat.com> In-Reply-To: <20200918074710.27810-2-sgarzare@redhat.com> References: <20200918074710.27810-1-sgarzare@redhat.com> <20200918074710.27810-2-sgarzare@redhat.com> Organization: Red Hat GmbH MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=cohuck@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/18 00:20:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.997, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: Thomas Huth , Qinghua Cheng , Eduardo Habkost , "Michael S. Tsirkin" , qemu-stable@nongnu.org, David Hildenbrand , qemu-devel@nongnu.org, "Dr. David Alan Gilbert" , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Richard Henderson , Qian Cai Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 18 Sep 2020 09:47:07 +0200 Stefano Garzarella wrote: > Commit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally > on") added a check that returns an error if legacy support is on, but the > device is not legacy. s/is not legacy/does not support legacy/ ? > > Unfortunately some devices were wrongly declared legacy even if they s/legacy/legacy capable/ ? > were not (e.g vhost-vsock). > > To avoid migration issues, we add a virtio-device property > (x-disable-legacy-check) to skip the legacy error, printing a warning > instaed, for machine types < 5.1. s/instaed/instead/ > > Cc: qemu-stable@nongnu.org > Fixes: 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") > Suggested-by: Dr. David Alan Gilbert > Suggested-by: Cornelia Huck > Signed-off-by: Stefano Garzarella > --- > v3: > - added virtio_legacy_check_disabled() helper > - moved warning where error was returned [Cornelia] > v2: > - fixed Cornelia's e-mail address > --- > include/hw/virtio/virtio.h | 2 ++ > hw/core/machine.c | 1 + > hw/s390x/virtio-ccw.c | 15 ++++++++++++--- > hw/virtio/virtio-pci.c | 14 ++++++++++++-- > hw/virtio/virtio.c | 7 +++++++ > 5 files changed, 34 insertions(+), 5 deletions(-) > > diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h > index 807280451b..f90cfb03e3 100644 > --- a/include/hw/virtio/virtio.h > +++ b/include/hw/virtio/virtio.h > @@ -103,6 +103,7 @@ struct VirtIODevice > bool use_started; > bool started; > bool start_on_kick; /* when virtio 1.0 feature has not been negotiated */ > + bool disable_legacy_check; > VMChangeStateEntry *vmstate; > char *bus_name; > uint8_t device_endian; > @@ -396,5 +397,6 @@ static inline bool virtio_device_disabled(VirtIODevice *vdev) > } > > bool virtio_legacy_allowed(VirtIODevice *vdev); > +bool virtio_legacy_check_disabled(VirtIODevice *vdev); > > #endif > diff --git a/hw/core/machine.c b/hw/core/machine.c > index ea26d61237..b686eab798 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -44,6 +44,7 @@ GlobalProperty hw_compat_5_0[] = { > { "vmport", "x-signal-unsupported-cmd", "off" }, > { "vmport", "x-report-vmx-type", "off" }, > { "vmport", "x-cmds-v2", "off" }, > + { "virtio-device", "x-disable-legacy-check", "true" }, > }; > const size_t hw_compat_5_0_len = G_N_ELEMENTS(hw_compat_5_0); > > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > index 8feb3451a0..97a01bc48a 100644 > --- a/hw/s390x/virtio-ccw.c > +++ b/hw/s390x/virtio-ccw.c > @@ -1122,9 +1122,18 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp) > } > > if (!virtio_ccw_rev_max(dev) && !virtio_legacy_allowed(vdev)) { > - error_setg(errp, "Invalid value of property max_rev " > - "(is %d expected >= 1)", virtio_ccw_rev_max(dev)); > - return; > + /* > + * To avoid migration issues, we allow legacy mode when legacy > + * check is disabled in the old machine types (< 5.1). > + */ > + if (virtio_legacy_check_disabled(vdev)) { > + warn_report("device is modern-only, but for backward " > + "compatibility legacy is allowed"); Hm... "device requires revision >= 1, but for backward compatibility max_rev=0 is allowed" seems more appropriate. (I think I need to rethink the checking for ccw anyway.) > + } else { > + error_setg(errp, "Invalid value of property max_rev " > + "(is %d expected >= 1)", virtio_ccw_rev_max(dev)); > + return; > + } > } > > if (virtio_get_num_queues(vdev) > VIRTIO_QUEUE_MAX) { (...) With the message for ccw changed, Reviewed-by: Cornelia Huck