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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEA4AC433F5 for ; Tue, 5 Oct 2021 19:19:35 +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 4BE2361154 for ; Tue, 5 Oct 2021 19:19:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4BE2361154 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:52266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXpyP-0001RE-8Y for qemu-devel@archiver.kernel.org; Tue, 05 Oct 2021 15:19:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXpxb-0000gB-OZ for qemu-devel@nongnu.org; Tue, 05 Oct 2021 15:18:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:45895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXpxZ-0000pz-Tl for qemu-devel@nongnu.org; Tue, 05 Oct 2021 15:18:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633461520; h=from:from:reply-to: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=CmwlctZXa9SRLLOF5HoyKuIr8xuKkHYDWtZbzov85pg=; b=OHGe+7VUxMxQlsiAXzDCza1uld2Hx35fXFTVFA41yjr20G4gMIHu0ajUijx+O0MMrGahs/ BfxrbExrtOy6dGoZFxlImPWrTjxhC91QMrh9OK0VwJ+9RHilhQ3DvZU/EoM6ORnybCy6v3 rmUtE6Kh4oUw40IE/k/NlbatpK32t3M= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-5-UqvCCm6bOx-sr_yeAAJQ7A-1; Tue, 05 Oct 2021 15:18:39 -0400 X-MC-Unique: UqvCCm6bOx-sr_yeAAJQ7A-1 Received: by mail-wr1-f69.google.com with SMTP id k2-20020adfc702000000b0016006b2da9bso123519wrg.1 for ; Tue, 05 Oct 2021 12:18:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=CmwlctZXa9SRLLOF5HoyKuIr8xuKkHYDWtZbzov85pg=; b=GEdCzy01gMGaYIK8QwB9hZO1MO7ggeF3DcJm2DaeABXJSzlSrLlJ6gAddW25WTeTra 84ZJsddr8o2DON3Hzdm0XmwgWMBMMcxvZ9ggAeHAYiWZATku09jXIxvZTuw6pfSIMYzs QmWERB0WEKBZJOYkPgpQuH4knz+Ni2o4/5CI9UdSMB6AVILRlZwcIFM8Z78OyclzHyC8 m5gmZq6I30Wo56VJdaarQbtXpFFC5SpNNdg/J98n/lNJwVfvqUmz2JjZONDFqj/Uj8PC W+wUcCDMjnKzoo9nooBqEPWJl4tfGaY7ZsqStWpzM6FMS2eBwpayi9AmmJA0pkBuEodq 2Ytg== X-Gm-Message-State: AOAM532CEAhNdUSM3TjB33T75dRwqGenHu42lCpzHPZFHq9ayw61CRPw TGlSLBiBVcL4qE/XNa5XJcIMMTJmyqOEygyNH/qr8ufOrKlnMezChjhqSvgNk0ZOzfMFH0h0PU6 xYmtGE/nZTtpDihE= X-Received: by 2002:a7b:c932:: with SMTP id h18mr5429573wml.41.1633461518381; Tue, 05 Oct 2021 12:18:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZKHwQ7qCG7dN6UeI8ZNmftHcFHXR2lD0OUPX3dj7Z8qh8ogknahj3SSl+ggYU0iFI1cO0TQ== X-Received: by 2002:a7b:c932:: with SMTP id h18mr5429552wml.41.1633461518140; Tue, 05 Oct 2021 12:18:38 -0700 (PDT) Received: from ?IPv6:2a01:e0a:59e:9d80:527b:9dff:feef:3874? ([2a01:e0a:59e:9d80:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id z19sm1319937wmf.39.2021.10.05.12.18.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Oct 2021 12:18:37 -0700 (PDT) Subject: Re: [PATCH v4 07/11] pc: Allow instantiating a virtio-iommu device To: Jean-Philippe Brucker , imammedo@redhat.com References: <20211001173358.863017-1-jean-philippe@linaro.org> <20211001173358.863017-8-jean-philippe@linaro.org> From: Eric Auger Message-ID: <25937aae-18de-4198-978e-c799ff79c5f6@redhat.com> Date: Tue, 5 Oct 2021 21:18:29 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20211001173358.863017-8-jean-philippe@linaro.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Received-SPF: pass client-ip=170.10.129.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.066, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, 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: , Reply-To: eric.auger@redhat.com Cc: peter.maydell@linaro.org, ehabkost@redhat.com, mst@redhat.com, richard.henderson@linaro.org, qemu-devel@nongnu.org, shannon.zhaosl@gmail.com, qemu-arm@nongnu.org, ani@anisinha.ca, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Jean, On 10/1/21 7:33 PM, Jean-Philippe Brucker wrote: > Allow instantiating a virtio-iommu device by adding an ACPI Virtual I/O > Translation table (VIOT), which describes the relation between the > virtio-iommu and the endpoints it manages. > > Add a hotplug handler for virtio-iommu on x86 and set the necessary > reserved region property. On x86, the [0xfee00000, 0xfeefffff] DMA > region is reserved for MSIs. DMA transactions to this range either > trigger IRQ remapping in the IOMMU or bypasses IOMMU translation. > > Although virtio-iommu does not support IRQ remapping it must be informed > of the reserved region so that it can forward DMA transactions targeting > this region. > > Signed-off-by: Jean-Philippe Brucker Reviewed-by: Eric Auger tested by a protecting a virtio-net-pci device plugged onto a pxb-pcie and setting default-bus-bypass-iommu=true on pcie.0. As described in the cover letter, without [PATCH 0/3] virtio-iommu: Support VIRTIO_IOMMU_F_BYPASS_CONFIG the ahci emits some failure if it is protected by the virtio-iommu: qemu-system-x86_64: virtio_iommu_translate sid=250 is not known!! qemu-system-x86_64: no buffer available in event queue to report event qemu-system-x86_64: AHCI: Failed to start FIS receive engine: bad FIS receive buffer address ../.. Invalid access at addr 0x7FFA6900, size 4, region '(null)', reason: rejected But this is expected. So feel free to add Tested-by: Eric Auger Thanks Eric > --- > include/hw/i386/pc.h | 2 ++ > hw/i386/acpi-build.c | 5 +++++ > hw/i386/pc.c | 24 ++++++++++++++++++++++-- > hw/i386/Kconfig | 1 + > 4 files changed, 30 insertions(+), 2 deletions(-) > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 82cf7b7e30..f3ba1ee4c0 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -45,6 +45,8 @@ typedef struct PCMachineState { > bool pit_enabled; > bool hpet_enabled; > bool default_bus_bypass_iommu; > + bool virtio_iommu; > + uint16_t virtio_iommu_bdf; > uint64_t max_fw_size; > > /* ACPI Memory hotplug IO base address */ > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index d1c28440f4..4e46585709 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -71,6 +71,7 @@ > > #include "hw/acpi/ipmi.h" > #include "hw/acpi/hmat.h" > +#include "hw/acpi/viot.h" > > /* These are used to size the ACPI tables for -M pc-i440fx-1.7 and > * -M pc-i440fx-2.0. Even if the actual amount of AML generated grows > @@ -2593,6 +2594,10 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) > build_dmar_q35(tables_blob, tables->linker, x86ms->oem_id, > x86ms->oem_table_id); > } > + } else if (pcms->virtio_iommu) { > + acpi_add_table(table_offsets, tables_blob); > + build_viot(machine, tables_blob, tables->linker, pcms->virtio_iommu_bdf, > + x86ms->oem_id, x86ms->oem_table_id); > } > if (machine->nvdimms_state->is_enabled) { > nvdimm_build_acpi(table_offsets, tables_blob, tables->linker, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 789ccb6ef4..31710bc4fb 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -83,6 +83,7 @@ > #include "hw/i386/intel_iommu.h" > #include "hw/net/ne2000-isa.h" > #include "standard-headers/asm-x86/bootparam.h" > +#include "hw/virtio/virtio-iommu.h" > #include "hw/virtio/virtio-pmem-pci.h" > #include "hw/virtio/virtio-mem-pci.h" > #include "hw/mem/memory-device.h" > @@ -1367,8 +1368,11 @@ static void pc_virtio_md_pci_unplug(HotplugHandler *hotplug_dev, > static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > - if (object_dynamic_cast(OBJECT(dev), TYPE_X86_IOMMU_DEVICE) && > - x86_iommu_get_default()) { > + PCMachineState *pcms = PC_MACHINE(hotplug_dev); > + > + if ((object_dynamic_cast(OBJECT(dev), TYPE_X86_IOMMU_DEVICE) || > + object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) && > + (x86_iommu_get_default() || pcms->virtio_iommu)) { > error_setg(errp, "QEMU does not support multiple vIOMMUs " > "for x86 yet."); > return; > @@ -1381,6 +1385,15 @@ static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, > } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI) || > object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) { > pc_virtio_md_pci_pre_plug(hotplug_dev, dev, errp); > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) { > + /* Declare the APIC range as the reserved MSI region */ > + char *resv_prop_str = g_strdup_printf("0xfee00000:0xfeefffff:%d", > + VIRTIO_IOMMU_RESV_MEM_T_MSI); > + > + object_property_set_uint(OBJECT(dev), "len-reserved-regions", 1, errp); > + object_property_set_str(OBJECT(dev), "reserved-regions[0]", > + resv_prop_str, errp); > + g_free(resv_prop_str); > } > } > > @@ -1394,6 +1407,12 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev, > } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI) || > object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) { > pc_virtio_md_pci_plug(hotplug_dev, dev, errp); > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) { > + PCMachineState *pcms = PC_MACHINE(hotplug_dev); > + PCIDevice *pdev = PCI_DEVICE(dev); > + > + pcms->virtio_iommu = true; > + pcms->virtio_iommu_bdf = pci_get_bdf(pdev); > } > } > > @@ -1436,6 +1455,7 @@ static HotplugHandler *pc_get_hotplug_handler(MachineState *machine, > object_dynamic_cast(OBJECT(dev), TYPE_CPU) || > object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI) || > object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI) || > + object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI) || > object_dynamic_cast(OBJECT(dev), TYPE_X86_IOMMU_DEVICE)) { > return HOTPLUG_HANDLER(machine); > } > diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig > index ddedcef0b2..13db05d557 100644 > --- a/hw/i386/Kconfig > +++ b/hw/i386/Kconfig > @@ -54,6 +54,7 @@ config PC_ACPI > select ACPI_X86 > select ACPI_CPU_HOTPLUG > select ACPI_MEMORY_HOTPLUG > + select ACPI_VIOT > select SMBUS_EEPROM > select PFLASH_CFI01 > depends on ACPI_SMBUS