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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 03508C433ED for ; Tue, 6 Apr 2021 09:41:26 +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 719D861040 for ; Tue, 6 Apr 2021 09:41:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 719D861040 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]:45950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTiD6-0006SD-FI for qemu-devel@archiver.kernel.org; Tue, 06 Apr 2021 05:41:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTiBJ-000559-Sy for qemu-devel@nongnu.org; Tue, 06 Apr 2021 05:39:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40823) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTiBF-0003cg-8X for qemu-devel@nongnu.org; Tue, 06 Apr 2021 05:39:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617701966; 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: in-reply-to:in-reply-to:references:references; bh=RbR0uOmPxZQxKHntLiSmUt7qfEecjbQFYdSmNcXDPDg=; b=apUAHMx1RKCxqFVkd2kZFnTh1U66yugZ/BAxAUgR2kK+tIWnsfpF7/6T2FyAZI2AxFPTWP 8bhuU6ghwuK4skYOv3CDN7WJh54eEu4+002TNPRr2pXMw7G063NgEwjD6kDF5qRWS9ri1d Y4LLYv9fLSqLJqCRGNUM3xdFiPpnZs8= 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-515-li38LpIGO8CYUDBSsO8sqQ-1; Tue, 06 Apr 2021 05:39:25 -0400 X-MC-Unique: li38LpIGO8CYUDBSsO8sqQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 49D717FE82; Tue, 6 Apr 2021 09:39:24 +0000 (UTC) Received: from work-vm (ovpn-114-244.ams2.redhat.com [10.36.114.244]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7258963BAF; Tue, 6 Apr 2021 09:39:16 +0000 (UTC) Date: Tue, 6 Apr 2021 10:39:13 +0100 From: "Dr. David Alan Gilbert" To: Jason Wang Subject: Re: [PATCH V2] virtio-pci: compat page aligned ATS Message-ID: References: <20210406040330.11306-1-jasowang@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210406040330.11306-1-jasowang@redhat.com> User-Agent: Mutt/2.0.6 (2021-03-06) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: ehabkost@redhat.com, mst@redhat.com, qemu-stable@nongnu.org, peterx@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Jason Wang (jasowang@redhat.com) wrote: > Commit 4c70875372b8 ("pci: advertise a page aligned ATS") advertises > the page aligned via ATS capability (RO) to unbrek recent Linux IOMMU > drivers since 5.2. But it forgot the compat the capability which > breaks the migration from old machine type: > > (qemu) qemu-kvm: get_pci_config_device: Bad config data: i=0x104 read: > 0 device: 20 cmask: ff wmask: 0 w1cmask:0 > > This patch introduces a new parameter "x-ats-page-aligned" for > virtio-pci device and turns it on for machine type which is newer than > 5.1. I don't know the IOMMU code, but from the property/hw_compat I think this is OK. It's a bit tricky; since this was broken in 5.2, changing the hw_compat_5_1 means that there are exisitng 5.2 users who will be broken - howeer, the original 4c70875372b8 patch was sent to qemu-stable which I think means there are other versions that are inconsistent as well. Dave > Cc: Michael S. Tsirkin > Cc: Peter Xu > Cc: Dr. David Alan Gilbert > Cc: qemu-stable@nongnu.org > Fixes: 4c70875372b8 ("pci: advertise a page aligned ATS") > Signed-off-by: Jason Wang > --- > Changes since V1: > - switch to use "x-ats-page-aligned" instead > --- > hw/core/machine.c | 1 + > hw/pci/pcie.c | 10 ++++++---- > hw/virtio/virtio-pci.c | 5 ++++- > hw/virtio/virtio-pci.h | 5 +++++ > include/hw/pci/pcie.h | 2 +- > 5 files changed, 17 insertions(+), 6 deletions(-) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 9935c6ddd5..a50f2d5f0a 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -53,6 +53,7 @@ GlobalProperty hw_compat_5_1[] = { > { "nvme", "use-intel-id", "on"}, > { "pvpanic", "events", "1"}, /* PVPANIC_PANICKED */ > { "pl011", "migrate-clk", "off" }, > + { "virtio-pci", "x-ats-page-aligned", "off"}, > }; > const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1); > > diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c > index a733e2fb87..fd0fa157e8 100644 > --- a/hw/pci/pcie.c > +++ b/hw/pci/pcie.c > @@ -963,16 +963,18 @@ void pcie_dev_ser_num_init(PCIDevice *dev, uint16_t offset, uint64_t ser_num) > pci_set_quad(dev->config + offset + pci_dsn_cap, ser_num); > } > > -void pcie_ats_init(PCIDevice *dev, uint16_t offset) > +void pcie_ats_init(PCIDevice *dev, uint16_t offset, bool aligned) > { > pcie_add_capability(dev, PCI_EXT_CAP_ID_ATS, 0x1, > offset, PCI_EXT_CAP_ATS_SIZEOF); > > dev->exp.ats_cap = offset; > > - /* Invalidate Queue Depth 0, Page Aligned Request 1 */ > - pci_set_word(dev->config + offset + PCI_ATS_CAP, > - PCI_ATS_CAP_PAGE_ALIGNED); > + /* Invalidate Queue Depth 0 */ > + if (aligned) { > + pci_set_word(dev->config + offset + PCI_ATS_CAP, > + PCI_ATS_CAP_PAGE_ALIGNED); > + } > /* STU 0, Disabled by default */ > pci_set_word(dev->config + offset + PCI_ATS_CTRL, 0); > > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index 883045a223..2b7142a21e 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -1848,7 +1848,8 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) > } > > if (proxy->flags & VIRTIO_PCI_FLAG_ATS) { > - pcie_ats_init(pci_dev, last_pcie_cap_offset); > + pcie_ats_init(pci_dev, last_pcie_cap_offset, > + proxy->flags & VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED); > last_pcie_cap_offset += PCI_EXT_CAP_ATS_SIZEOF; > } > > @@ -1925,6 +1926,8 @@ static Property virtio_pci_properties[] = { > ignore_backend_features, false), > DEFINE_PROP_BIT("ats", VirtIOPCIProxy, flags, > VIRTIO_PCI_FLAG_ATS_BIT, false), > + DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, > + VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, true), > DEFINE_PROP_BIT("x-pcie-deverr-init", VirtIOPCIProxy, flags, > VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, true), > DEFINE_PROP_BIT("x-pcie-lnkctl-init", VirtIOPCIProxy, flags, > diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h > index d7d5d403a9..2446dcd9ae 100644 > --- a/hw/virtio/virtio-pci.h > +++ b/hw/virtio/virtio-pci.h > @@ -42,6 +42,7 @@ enum { > VIRTIO_PCI_FLAG_INIT_PM_BIT, > VIRTIO_PCI_FLAG_INIT_FLR_BIT, > VIRTIO_PCI_FLAG_AER_BIT, > + VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, > }; > > /* Need to activate work-arounds for buggy guests at vmstate load. */ > @@ -84,6 +85,10 @@ enum { > /* Advanced Error Reporting capability */ > #define VIRTIO_PCI_FLAG_AER (1 << VIRTIO_PCI_FLAG_AER_BIT) > > +/* Page Aligned Address space Translation Service */ > +#define VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED \ > + (1 << VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT) > + > typedef struct { > MSIMessage msg; > int virq; > diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h > index 14c58ebdb6..6063bee0ec 100644 > --- a/include/hw/pci/pcie.h > +++ b/include/hw/pci/pcie.h > @@ -137,7 +137,7 @@ void pcie_acs_reset(PCIDevice *dev); > > void pcie_ari_init(PCIDevice *dev, uint16_t offset, uint16_t nextfn); > void pcie_dev_ser_num_init(PCIDevice *dev, uint16_t offset, uint64_t ser_num); > -void pcie_ats_init(PCIDevice *dev, uint16_t offset); > +void pcie_ats_init(PCIDevice *dev, uint16_t offset, bool aligned); > > void pcie_cap_slot_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, > Error **errp); > -- > 2.24.3 (Apple Git-128) > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK