From patchwork Mon Nov 1 23:44:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 516595 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp3863934iml; Mon, 1 Nov 2021 16:58:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytMGUnVhDmfb7UrSIN+bKne5MfnI9UwdLYXngsNiACyqobxwcQymLe07+BjdKS2wBvSX3Z X-Received: by 2002:a05:6808:10ca:: with SMTP id s10mr1986002ois.91.1635811086613; Mon, 01 Nov 2021 16:58:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635811086; cv=none; d=google.com; s=arc-20160816; b=RCnKBlNgZe9DFW281yPGqLzesey/2mnLVFWAMh+Ja4lw6AyvM9BMnZko3XCtjdUj07 9bLCp5HD7O0Fn3TFppwY5HlKcLOZ8VDvbnGV7wU/OXrYSm0J49MZf6ztqn3iWgvqWElx iG5Wl+cZ+SBi1ICLYWleX8CkCQPIC3x5ZjIFMH2TFwSZJxKJIAecrx/umTVNQa/YJhfS maiK/a2GwyPLr1uOd22WjHW1wWn9tqgyVPLQRWXY0WKSf2sEPUOFz0ioFtkJZoHrypWO Gr9/XGwrJ3Sd5VT8oBul9tfsFVKaj4JIVnCeG6FZUSafNxHkF0psjlAR6CYUfvxdzlB1 FM+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-disposition:in-reply-to :mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=V9FWr0j37d3VBNphNAtMkiS5bz48/xHnQY0wdPZWJX8=; b=U17to0vZpWhYZ8qcnmlodBS0pXWW0v4w+gYxMDtISwidvln2gqqVfM2Lyr6sVGSu/J 043i6OcV5rptR/BYCaxaicC4m75bN9/8mgF/yzsnFZYNZ0+bkQpYaQ+5p3GUREkSodvp 4MhQxrWQpl88NR+9bJrQyxoE0fgQtxJznvQdvo+QKkBK+xjjsCl/z6R4t6/ky++Wd3XV VIncuL1C3GOwV1UeIhMEYFGtJO4+lKGSi+rnXasGSLuXzK7/t2rxZlMmNAYS1f+vfZgn lBHJ9X4i4ZK5SRZhRYbQlzAuOzZnDLKyIK8kuTtp7r6Onl3aEI4fqUgzF603jeQHu0lN 60mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=fqDiaWz5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w4si15483891ooh.89.2021.11.01.16.58.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Nov 2021 16:58:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=fqDiaWz5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhhBl-0002N9-UN for patch@linaro.org; Mon, 01 Nov 2021 19:58:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhgyl-00020f-5C for qemu-devel@nongnu.org; Mon, 01 Nov 2021 19:44:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhgyi-0004FY-VO for qemu-devel@nongnu.org; Mon, 01 Nov 2021 19:44:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635810275; 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=V9FWr0j37d3VBNphNAtMkiS5bz48/xHnQY0wdPZWJX8=; b=fqDiaWz5XkXyw5kxYziPvHc89uhD+dVYVgKvacgQ18szH4hffOvrGyhmYF5NMjToQpejnx ZNKTlnJwtiwpgiglgIDq4IZ3MGwFtRVSEfgdWj543F67Jsc2Jubw09AjqwEKwchMK5zzgk pgSFCbUZLZn8J5/zBO8+EsNopb2+6/c= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-515-f3syQuwOPGWGSg2ey36i3A-1; Mon, 01 Nov 2021 19:44:34 -0400 X-MC-Unique: f3syQuwOPGWGSg2ey36i3A-1 Received: by mail-ed1-f69.google.com with SMTP id h16-20020a05640250d000b003dd8167857aso17113113edb.0 for ; Mon, 01 Nov 2021 16:44:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=V9FWr0j37d3VBNphNAtMkiS5bz48/xHnQY0wdPZWJX8=; b=Weijk+Y/thW6UrkZlWc/yF0CMLYVTdpv5malCu/TFdVPF6PGD0togQmCBt5x/SZZ+w bcOMr2sEnB0BAY8R1PW5KGY/Wb1TrUTf9rymkmBDo1NqeB6TMoSyXvu0GV5OrAYANxkl k6eN47q3cK2iHDpdjuCv3D/tIuB2s3J02vq32L+85o2JwFsiL7Tud2VFITpvrhf2P0Mp uR0rZCdK+CyaHPMjASiul1x06ZeqzZ5w2RAlEvP2OcRIp57oE2nqGLoq03pJyRNb/Jzv SxMcIHc4gyY3H5nEWoKW4M4FZVRHaApLMEJ4QljeM54+kOq1RRrpzskzYOJRZ+wAlwwZ 1p5Q== X-Gm-Message-State: AOAM533KMmLAKEAzx9DG5LKLyXJfOkAanOFUY3pxuKPUGPs/rTVNi1N5 5SzT/8lAD8tX1yKKYpr1rbeMgYGFLOjI4NGniWmBYZt9DdU5AbPJOgU8AxJHao8VfwIjzVu0A9/ awBvobDG+I3XFpJz72j6arRezxTp3yhdJlqyzK9D0yakZ+j5zToAXLpSCNAxq X-Received: by 2002:a50:d50c:: with SMTP id u12mr45760085edi.118.1635810272319; Mon, 01 Nov 2021 16:44:32 -0700 (PDT) X-Received: by 2002:a50:d50c:: with SMTP id u12mr45760044edi.118.1635810272068; Mon, 01 Nov 2021 16:44:32 -0700 (PDT) Received: from redhat.com ([2.55.156.42]) by smtp.gmail.com with ESMTPSA id ho30sm1073398ejc.30.2021.11.01.16.44.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 16:44:31 -0700 (PDT) Date: Mon, 1 Nov 2021 19:44:28 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 3/9] hw/acpi: Add VIOT table Message-ID: <20211101234358.582487-4-mst@redhat.com> References: <20211101234358.582487-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20211101234358.582487-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.734, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ani Sinha , Peter Maydell , Igor Mammedov , Eric Auger , Jean-Philippe Brucker Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Jean-Philippe Brucker Add a function that generates a Virtual I/O Translation table (VIOT), describing the topology of paravirtual IOMMUs. The table is created if a virtio-iommu device is present. It contains a virtio-iommu node and PCI Range nodes for endpoints managed by the IOMMU. By default, a single node describes all PCI devices. When passing the "default_bus_bypass_iommu" machine option and "bypass_iommu" PXB option, only buses that do not bypass the IOMMU are described by PCI Range nodes. Reviewed-by: Eric Auger Tested-by: Eric Auger Signed-off-by: Jean-Philippe Brucker Message-Id: <20211026182024.2642038-2-jean-philippe@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/acpi/viot.h | 13 +++++ hw/acpi/viot.c | 114 ++++++++++++++++++++++++++++++++++++++++++++ hw/acpi/Kconfig | 4 ++ hw/acpi/meson.build | 1 + 4 files changed, 132 insertions(+) create mode 100644 hw/acpi/viot.h create mode 100644 hw/acpi/viot.c -- MST diff --git a/hw/acpi/viot.h b/hw/acpi/viot.h new file mode 100644 index 0000000000..9fe565bb87 --- /dev/null +++ b/hw/acpi/viot.h @@ -0,0 +1,13 @@ +/* + * ACPI Virtual I/O Translation Table implementation + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef VIOT_H +#define VIOT_H + +void build_viot(MachineState *ms, GArray *table_data, BIOSLinker *linker, + uint16_t virtio_iommu_bdf, const char *oem_id, + const char *oem_table_id); + +#endif /* VIOT_H */ diff --git a/hw/acpi/viot.c b/hw/acpi/viot.c new file mode 100644 index 0000000000..c1af75206e --- /dev/null +++ b/hw/acpi/viot.c @@ -0,0 +1,114 @@ +/* + * ACPI Virtual I/O Translation table implementation + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include "qemu/osdep.h" +#include "hw/acpi/acpi.h" +#include "hw/acpi/aml-build.h" +#include "hw/acpi/viot.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" + +struct viot_pci_ranges { + GArray *blob; + size_t count; + uint16_t output_node; +}; + +/* Build PCI range for a given PCI host bridge */ +static int build_pci_range_node(Object *obj, void *opaque) +{ + struct viot_pci_ranges *pci_ranges = opaque; + GArray *blob = pci_ranges->blob; + + if (object_dynamic_cast(obj, TYPE_PCI_HOST_BRIDGE)) { + PCIBus *bus = PCI_HOST_BRIDGE(obj)->bus; + + if (bus && !pci_bus_bypass_iommu(bus)) { + int min_bus, max_bus; + + pci_bus_range(bus, &min_bus, &max_bus); + + /* Type */ + build_append_int_noprefix(blob, 1 /* PCI range */, 1); + /* Reserved */ + build_append_int_noprefix(blob, 0, 1); + /* Length */ + build_append_int_noprefix(blob, 24, 2); + /* Endpoint start */ + build_append_int_noprefix(blob, PCI_BUILD_BDF(min_bus, 0), 4); + /* PCI Segment start */ + build_append_int_noprefix(blob, 0, 2); + /* PCI Segment end */ + build_append_int_noprefix(blob, 0, 2); + /* PCI BDF start */ + build_append_int_noprefix(blob, PCI_BUILD_BDF(min_bus, 0), 2); + /* PCI BDF end */ + build_append_int_noprefix(blob, PCI_BUILD_BDF(max_bus, 0xff), 2); + /* Output node */ + build_append_int_noprefix(blob, pci_ranges->output_node, 2); + /* Reserved */ + build_append_int_noprefix(blob, 0, 6); + + pci_ranges->count++; + } + } + + return 0; +} + +/* + * Generate a VIOT table with one PCI-based virtio-iommu that manages PCI + * endpoints. + * + * Defined in the ACPI Specification (Version TBD) + */ +void build_viot(MachineState *ms, GArray *table_data, BIOSLinker *linker, + uint16_t virtio_iommu_bdf, const char *oem_id, + const char *oem_table_id) +{ + /* The virtio-iommu node follows the 48-bytes header */ + int viommu_off = 48; + AcpiTable table = { .sig = "VIOT", .rev = 0, + .oem_id = oem_id, .oem_table_id = oem_table_id }; + struct viot_pci_ranges pci_ranges = { + .output_node = viommu_off, + .blob = g_array_new(false, true /* clear */, 1), + }; + + /* Build the list of PCI ranges that this viommu manages */ + object_child_foreach_recursive(OBJECT(ms), build_pci_range_node, + &pci_ranges); + + /* ACPI table header */ + acpi_table_begin(&table, table_data); + /* Node count */ + build_append_int_noprefix(table_data, pci_ranges.count + 1, 2); + /* Node offset */ + build_append_int_noprefix(table_data, viommu_off, 2); + /* Reserved */ + build_append_int_noprefix(table_data, 0, 8); + + /* Virtio-iommu node */ + /* Type */ + build_append_int_noprefix(table_data, 3 /* virtio-pci IOMMU */, 1); + /* Reserved */ + build_append_int_noprefix(table_data, 0, 1); + /* Length */ + build_append_int_noprefix(table_data, 16, 2); + /* PCI Segment */ + build_append_int_noprefix(table_data, 0, 2); + /* PCI BDF number */ + build_append_int_noprefix(table_data, virtio_iommu_bdf, 2); + /* Reserved */ + build_append_int_noprefix(table_data, 0, 8); + + /* PCI ranges found above */ + g_array_append_vals(table_data, pci_ranges.blob->data, + pci_ranges.blob->len); + g_array_free(pci_ranges.blob, true); + + acpi_table_end(linker, &table); +} + diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 3b5e118c54..622b0b50b7 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -51,6 +51,10 @@ config ACPI_VMGENID default y depends on PC +config ACPI_VIOT + bool + depends on ACPI + config ACPI_HW_REDUCED bool select ACPI diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build index 7d8c0eb43e..adf6347bc4 100644 --- a/hw/acpi/meson.build +++ b/hw/acpi/meson.build @@ -20,6 +20,7 @@ acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'), if_false: files( acpi_ss.add(when: 'CONFIG_ACPI_PIIX4', if_true: files('piix4.c')) acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_true: files('pcihp.c')) acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_false: files('acpi-pci-hotplug-stub.c')) +acpi_ss.add(when: 'CONFIG_ACPI_VIOT', if_true: files('viot.c')) acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c')) acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files('ipmi-stub.c')) acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c')) From patchwork Mon Nov 1 23:44:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 516596 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp3868781iml; Mon, 1 Nov 2021 17:02:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxpcMEXEtGQ8V5Dxp2NQ1fsw1aG6R4PPIoBTgynZJL1GaI18YR+5gbYoNNMkLvEeEYjxOp X-Received: by 2002:a05:6808:1185:: with SMTP id j5mr2066780oil.16.1635811375209; Mon, 01 Nov 2021 17:02:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635811375; cv=none; d=google.com; s=arc-20160816; b=f4907Xo5jGjOXcLcxuybu88zIRi6xD8hgr90xJ6VcfVE71PkbACV+52DoRFZmA3YdK yqoJr+bodHjIwtHHguUkPhf+WFMH3dW7/+RMJrzhlm+naLNRWQ6gxHAbefwCgCl0Tcgn kTkfSjOjourtkI9hLFXGnFPdW+wdCEnylmqhJhUd1QzsNHgD7vHGADwn0Hpe/ZWfb3AC 0QDZ09NI+Yyv2oC7m3vcpfafhbhZxHcfLezxtJa2VOsjclVcVzkv3jfETbwUD9kPKD33 lk27ED0C+OZk2dEYPU9dBkuyhstNNwAWk12Y+Vi9sptbnQ5k3yG6+UL2sUKKe90yW0Wp TcOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-disposition:in-reply-to :mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=jd+7SCo+cPq4PXfrJicKIgmeVY5J4cyEzVidCztEKUY=; b=sMf+OhswqTz1UTmY6Xz7fpKP66XVi9LQB8Su+MBZGIvCfuV5B4vQK2qVUR6+uJ30n7 lKzDiE+tt5LYgkt97Cu9LyEJ2R8P242LT9MnINAHsT3VigeOhW3d7Hx+WqLZH/OhtRsX BeDqo6m69NSMl4oiie3qC6VzBTS7lko1JO5UB70o0WixM/09d193XFNa7d6oYOPAwJ1n MAEx5flcEpjtI+Nf0bQWrCB9Sx5k0Q8JM09Bk9BLlv/z/XGPvMtkC7+gk4LvMP8fKS17 WdFZEQ7Jnjy6e4p/UZ6hzns7CKFqDnVJNn621t4c3rvRpspGoPbzjK6AIvXcC+gZIcUw 7R9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=aJMNHYOH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 35si568586oti.57.2021.11.01.17.02.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Nov 2021 17:02:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=aJMNHYOH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:45198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhhGQ-0008JY-FF for patch@linaro.org; Mon, 01 Nov 2021 20:02:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhgyp-00021J-AQ for qemu-devel@nongnu.org; Mon, 01 Nov 2021 19:44:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:55398) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhgyl-0004Fo-8Z for qemu-devel@nongnu.org; Mon, 01 Nov 2021 19:44:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635810278; 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=jd+7SCo+cPq4PXfrJicKIgmeVY5J4cyEzVidCztEKUY=; b=aJMNHYOHogwzQ0ZqzG7Fr4zS3ftLrw5JBzEBE+3ZaLOOMsHgVc4USH8AdAkRvBfwsaOz8b /EXZJw6tvlt2q/M35iMLU+qKFl7INIfBwdILLR7zQVW7O+rVkCaLVfGW/Sie7WtBuSY06W K/eT8/pEi2FvbpHWtyAvrabDaTiTq2U= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-520-h1XGWQQ1MfC0TXJutb-TUw-1; Mon, 01 Nov 2021 19:44:37 -0400 X-MC-Unique: h1XGWQQ1MfC0TXJutb-TUw-1 Received: by mail-ed1-f71.google.com with SMTP id o22-20020a056402439600b003dd4f228451so17040017edc.16 for ; Mon, 01 Nov 2021 16:44:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=jd+7SCo+cPq4PXfrJicKIgmeVY5J4cyEzVidCztEKUY=; b=LQw08ADcgDTB82zTBrkqmT0fSqlnpNmuO8NqWeDwY57gew+6jbGXR/I7L0PGxlidPz R8uWLjXf8HIMxNFaQKaAu6QPggGQBULhZOXx7fCnB+1u45CqiaLTi30HVHX6a584GLx7 gRymlu9ieho/n5l5Uojih4Yk9cJC5Jl+MkfuTv+2XvZQZjN/r+pMIhnfIwmjv0AT2BAP SeCAQPWgSI7unQeEMCrtd/iJ5c3zBO5Rw9hpw/9T4M0qZbdyCJTTe07SASzyTaBJ51hy QC0CHxOdtBs2JTnztCwJaHrpoReWAXYmQuaGsoQeaLkOvbk9p/XgatjM4Lc0IGjnFwPx 7tqg== X-Gm-Message-State: AOAM533+88gmQfU2lcHHxmeVXQGcMaCp2KMjjngyb2WmO/AQYqqnv3+g y5g1vWiAr08ZGIj9Ce8npBTbI6jYzwHVcyza1sidNbKhT+lk3CfK8/8jG5mrLY5WR6CZH7n7zzp OQFx3+MYapgTanF40S6qvjnvGLYbNtdpWqirW6JKiNK3xv1bfPzVp3DI0qMR9 X-Received: by 2002:a17:906:1683:: with SMTP id s3mr27246301ejd.331.1635810275954; Mon, 01 Nov 2021 16:44:35 -0700 (PDT) X-Received: by 2002:a17:906:1683:: with SMTP id s3mr27246253ejd.331.1635810275628; Mon, 01 Nov 2021 16:44:35 -0700 (PDT) Received: from redhat.com ([2.55.156.42]) by smtp.gmail.com with ESMTPSA id hv9sm7512045ejc.51.2021.11.01.16.44.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 16:44:35 -0700 (PDT) Date: Mon, 1 Nov 2021 19:44:32 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 4/9] hw/i386/pc: Remove x86_iommu_get_type() Message-ID: <20211101234358.582487-5-mst@redhat.com> References: <20211101234358.582487-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20211101234358.582487-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.734, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Jean-Philippe Brucker , Jason Wang , Richard Henderson , Peter Xu , Eric Auger , Paolo Bonzini , Ani Sinha , Igor Mammedov Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Jean-Philippe Brucker To generate the IOMMU ACPI table, acpi-build.c can use base QEMU types instead of a special IommuType value. Reviewed-by: Eric Auger Reviewed-by: Igor Mammedov Signed-off-by: Jean-Philippe Brucker Message-Id: <20211026182024.2642038-3-jean-philippe@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/i386/x86-iommu.h | 12 ------------ hw/i386/acpi-build.c | 20 +++++++++----------- hw/i386/amd_iommu.c | 2 -- hw/i386/intel_iommu.c | 3 --- hw/i386/x86-iommu-stub.c | 5 ----- hw/i386/x86-iommu.c | 5 ----- 6 files changed, 9 insertions(+), 38 deletions(-) -- MST diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h index 9de92d33a1..5ba0c056d6 100644 --- a/include/hw/i386/x86-iommu.h +++ b/include/hw/i386/x86-iommu.h @@ -33,12 +33,6 @@ OBJECT_DECLARE_TYPE(X86IOMMUState, X86IOMMUClass, X86_IOMMU_DEVICE) typedef struct X86IOMMUIrq X86IOMMUIrq; typedef struct X86IOMMU_MSIMessage X86IOMMU_MSIMessage; -typedef enum IommuType { - TYPE_INTEL, - TYPE_AMD, - TYPE_NONE -} IommuType; - struct X86IOMMUClass { SysBusDeviceClass parent; /* Intel/AMD specific realize() hook */ @@ -71,7 +65,6 @@ struct X86IOMMUState { OnOffAuto intr_supported; /* Whether vIOMMU supports IR */ bool dt_supported; /* Whether vIOMMU supports DT */ bool pt_supported; /* Whether vIOMMU supports pass-through */ - IommuType type; /* IOMMU type - AMD/Intel */ QLIST_HEAD(, IEC_Notifier) iec_notifiers; /* IEC notify list */ }; @@ -140,11 +133,6 @@ struct X86IOMMU_MSIMessage { */ X86IOMMUState *x86_iommu_get_default(void); -/* - * x86_iommu_get_type - get IOMMU type - */ -IommuType x86_iommu_get_type(void); - /** * x86_iommu_iec_register_notifier - register IEC (Interrupt Entry * Cache) notifiers diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 81418b7911..ab49e799ff 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2488,6 +2488,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) PCMachineState *pcms = PC_MACHINE(machine); PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); X86MachineState *x86ms = X86_MACHINE(machine); + X86IOMMUState *iommu = x86_iommu_get_default(); GArray *table_offsets; unsigned facs, dsdt, rsdt, fadt; AcpiPmInfo pm; @@ -2604,17 +2605,14 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) build_mcfg(tables_blob, tables->linker, &mcfg, x86ms->oem_id, x86ms->oem_table_id); } - if (x86_iommu_get_default()) { - IommuType IOMMUType = x86_iommu_get_type(); - if (IOMMUType == TYPE_AMD) { - acpi_add_table(table_offsets, tables_blob); - build_amd_iommu(tables_blob, tables->linker, x86ms->oem_id, - x86ms->oem_table_id); - } else if (IOMMUType == TYPE_INTEL) { - acpi_add_table(table_offsets, tables_blob); - build_dmar_q35(tables_blob, tables->linker, x86ms->oem_id, - x86ms->oem_table_id); - } + if (object_dynamic_cast(OBJECT(iommu), TYPE_AMD_IOMMU_DEVICE)) { + acpi_add_table(table_offsets, tables_blob); + build_amd_iommu(tables_blob, tables->linker, x86ms->oem_id, + x86ms->oem_table_id); + } else if (object_dynamic_cast(OBJECT(iommu), TYPE_INTEL_IOMMU_DEVICE)) { + acpi_add_table(table_offsets, tables_blob); + build_dmar_q35(tables_blob, tables->linker, 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/amd_iommu.c b/hw/i386/amd_iommu.c index 9242a0d3ed..91fe34ae58 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1538,7 +1538,6 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp) { int ret = 0; AMDVIState *s = AMD_IOMMU_DEVICE(dev); - X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev); MachineState *ms = MACHINE(qdev_get_machine()); PCMachineState *pcms = PC_MACHINE(ms); X86MachineState *x86ms = X86_MACHINE(ms); @@ -1548,7 +1547,6 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp) amdvi_uint64_equal, g_free, g_free); /* This device should take care of IOMMU PCI properties */ - x86_iommu->type = TYPE_AMD; if (!qdev_realize(DEVICE(&s->pci), &bus->qbus, errp)) { return; } diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 75f075547f..c27b20090e 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3806,9 +3806,6 @@ static void vtd_realize(DeviceState *dev, Error **errp) X86MachineState *x86ms = X86_MACHINE(ms); PCIBus *bus = pcms->bus; IntelIOMMUState *s = INTEL_IOMMU_DEVICE(dev); - X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev); - - x86_iommu->type = TYPE_INTEL; if (!vtd_decide_config(s, errp)) { return; diff --git a/hw/i386/x86-iommu-stub.c b/hw/i386/x86-iommu-stub.c index c5ba077f9d..781b5ff922 100644 --- a/hw/i386/x86-iommu-stub.c +++ b/hw/i386/x86-iommu-stub.c @@ -36,8 +36,3 @@ bool x86_iommu_ir_supported(X86IOMMUState *s) { return false; } - -IommuType x86_iommu_get_type(void) -{ - abort(); -} diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index 86ad03972e..dc968c7a53 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -98,11 +98,6 @@ X86IOMMUState *x86_iommu_get_default(void) return x86_iommu_default; } -IommuType x86_iommu_get_type(void) -{ - return x86_iommu_default->type; -} - static void x86_iommu_realize(DeviceState *dev, Error **errp) { X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(dev); From patchwork Mon Nov 1 23:44:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 516594 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp3863859iml; Mon, 1 Nov 2021 16:58:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyz/Y1VmqKACDRoU6z/QVM/uKKiefsO5WtinF6gegFvbGQbC9/yG9oTkMvkvbeJbv3EkcLB X-Received: by 2002:a05:6830:1f2a:: with SMTP id e10mr23385277oth.118.1635811080296; Mon, 01 Nov 2021 16:58:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635811080; cv=none; d=google.com; s=arc-20160816; b=NwhBZ4BKy+N9vFEsWwIdRTEVmsHqAl0+DPdx4L9TZsAtqzhhHPaa0nsnrwpcZP8oAY XhCe4g+JYCwrxPUeT+xrC9v/8Lie1iaHkW7AyxQIcH4YdDgV6Xnph1FSqBvgDnTH1m+Y Pa07d1KgwigUEBDiIZex27kr6lMu21GQidiLoXjl34478DQd2c89w2o3ZhdqL7nbVdU+ IDIaaspYulW6U0N1rItjYIH4XuMuTACsuZBa1jmLGTFFtxPVF8Fz1QLiwJnUZ1qqfHVp wAIOC3Bq+KAs4dmmMAjjaedjIIa7OqvEvGpuojMu7NP2fm3YXs3YTeqzFE1AVs+GCzaw WpSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-disposition:in-reply-to :mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=dVILjbM3XJCaQkLgjAFWpZSW6dwsRFfaPUIs4btAH2g=; b=xO0aSLA2zS8AWQ7HoY6CBRLaPwgUSrE1DAgDXZ9ZJ2J6wu41bI7QeUARz163WbGf/D 7MOIg5Wmri2Fo0VDle/GHTTkN46HdXb+EkpG1F0KCwnyuxzpb1b2Cu0p0WybpZXF8dS8 IVaZ75W7d+20OnRaR5Rh7scUz8xvvXzf5NmKOPzsjY/R0P4dpUTQm6yxitcyMTl28iEe 5IDORVcpNeX5YE/rD1Xl0n8d9pkg0I0gmg+fhvLFlfTdr1LTYQ2FkgEt5lJKmt7t0uuB FtYcP4/AtCkE3Ordviedbo2W+OB5oDZ12coITqFcPDKOJIgvj96K3ENXm8vcd/2n0VCb 5hMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=ckwqWhP7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o17si15178924oie.5.2021.11.01.16.58.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Nov 2021 16:58:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=ckwqWhP7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhhBf-00020m-K9 for patch@linaro.org; Mon, 01 Nov 2021 19:57:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhgyr-00022h-Mp for qemu-devel@nongnu.org; Mon, 01 Nov 2021 19:44:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhgyo-0004GJ-Ue for qemu-devel@nongnu.org; Mon, 01 Nov 2021 19:44:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635810281; 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=dVILjbM3XJCaQkLgjAFWpZSW6dwsRFfaPUIs4btAH2g=; b=ckwqWhP703Z2VlSY6s9DvELMQLDF0NefhMYOtppkm8mNh5f3XugIN/OBFb1ZPTrkjLLqSS rwDYWqEwjKE2Rb/VDbmgte6pcVsVaokXFf3rcBaGUBbkbGf7v9C2jCDZw1wAjTRNmyKmVT BNQfEmdi6nLmT4OANUYEzQSkyrN/avM= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-592-N_zosMOtNuC2h-_vqyykaQ-1; Mon, 01 Nov 2021 19:44:40 -0400 X-MC-Unique: N_zosMOtNuC2h-_vqyykaQ-1 Received: by mail-ed1-f70.google.com with SMTP id w11-20020a05640234cb00b003e0cd525777so12368942edc.12 for ; Mon, 01 Nov 2021 16:44:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=dVILjbM3XJCaQkLgjAFWpZSW6dwsRFfaPUIs4btAH2g=; b=Dh/faa4yNxFwwtNO2Cim+dufDiGTRicT+LrMX3z2xNe3EWVjmAOHZHKqfJbdsBAigE FLuRwW4XsuA0SpLlQTr3McaIhpn9B6Gq879U/khNX3ELV2HuRBuqiYBQ1kOFaWagVAAr PHISAaHg3u05IKgAdpSE40oi5Bi0GJX5aNE9IOD5NBegwGIqcjBdrLJsEIgRg5FR1sqw cUJzfYmGhBUEu94znpryq2Y4cJwFGpGlWz2tQmbn2Xiu9hy8grVjCBbyM0p5C6uw1NtS 1tQaBtjJ3YTIyDYHdd4WWPvaHzt2OvzwVd0gFis32i7ZAgraOk4hVPVx3I0QW0vUXuAx jqFQ== X-Gm-Message-State: AOAM533ryTCZzDIWFx8cjPdAKDWK9j8KObsK0MPo9w29UP31V4zQYjUF 8uH9LsIKIy7GHa0qa7MMI2hbH4sIvUFlbDB5eafSD4V8418bKz4qXrwW30xxC6F1lyKO/X1Dk3s vPOWh5Z86rFaSWEGc4gYDAWe2KGG6k6csp7IzXbrNoMKqWm2Ye71Ib+fi6l01 X-Received: by 2002:a17:907:1b1f:: with SMTP id mp31mr39966529ejc.319.1635810279008; Mon, 01 Nov 2021 16:44:39 -0700 (PDT) X-Received: by 2002:a17:907:1b1f:: with SMTP id mp31mr39966489ejc.319.1635810278791; Mon, 01 Nov 2021 16:44:38 -0700 (PDT) Received: from redhat.com ([2.55.156.42]) by smtp.gmail.com with ESMTPSA id sd28sm1339174ejc.37.2021.11.01.16.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 16:44:38 -0700 (PDT) Date: Mon, 1 Nov 2021 19:44:35 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 5/9] hw/i386/pc: Move IOMMU singleton into PCMachineState Message-ID: <20211101234358.582487-6-mst@redhat.com> References: <20211101234358.582487-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20211101234358.582487-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) DKIMWL_WL_HIGH=-0.734, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Jean-Philippe Brucker , Richard Henderson , Eric Auger , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Jean-Philippe Brucker We're about to support a third vIOMMU for x86, virtio-iommu which doesn't inherit X86IOMMUState. Move the IOMMU singleton into PCMachineState, so it can be shared between all three vIOMMUs. The x86_iommu_get_default() helper is still needed by KVM and IOAPIC to fetch the default IRQ-remapping IOMMU. Since virtio-iommu doesn't support IRQ remapping, this interface doesn't need to change for the moment. We could later replace X86IOMMUState with an "IRQ remapping IOMMU" interface if necessary. Reviewed-by: Eric Auger Reviewed-by: Igor Mammedov Signed-off-by: Jean-Philippe Brucker Message-Id: <20211026182024.2642038-4-jean-philippe@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/i386/pc.h | 1 + hw/i386/pc.c | 12 +++++++++++- hw/i386/x86-iommu.c | 28 +++++++++------------------- 3 files changed, 21 insertions(+), 20 deletions(-) -- MST diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 11426e26dc..b72e5bf9d1 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -35,6 +35,7 @@ typedef struct PCMachineState { I2CBus *smbus; PFlashCFI01 *flash[2]; ISADevice *pcspk; + DeviceState *iommu; /* Configuration options: */ uint64_t max_ram_below_4g; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 86223acfd3..7b1c4f41cd 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1330,6 +1330,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_X86_IOMMU_DEVICE)) { + PCMachineState *pcms = PC_MACHINE(hotplug_dev); + + if (pcms->iommu) { + error_setg(errp, "QEMU does not support multiple vIOMMUs " + "for x86 yet."); + return; + } + pcms->iommu = dev; } } @@ -1384,7 +1393,8 @@ static HotplugHandler *pc_get_hotplug_handler(MachineState *machine, if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) || 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_MEM_PCI) || + object_dynamic_cast(OBJECT(dev), TYPE_X86_IOMMU_DEVICE)) { return HOTPLUG_HANDLER(machine); } diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index dc968c7a53..01d11325a6 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -77,25 +77,17 @@ void x86_iommu_irq_to_msi_message(X86IOMMUIrq *irq, MSIMessage *msg_out) msg_out->data = msg.msi_data; } -/* Default X86 IOMMU device */ -static X86IOMMUState *x86_iommu_default = NULL; - -static void x86_iommu_set_default(X86IOMMUState *x86_iommu) -{ - assert(x86_iommu); - - if (x86_iommu_default) { - error_report("QEMU does not support multiple vIOMMUs " - "for x86 yet."); - exit(1); - } - - x86_iommu_default = x86_iommu; -} - X86IOMMUState *x86_iommu_get_default(void) { - return x86_iommu_default; + MachineState *ms = MACHINE(qdev_get_machine()); + PCMachineState *pcms = + PC_MACHINE(object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE)); + + if (pcms && + object_dynamic_cast(OBJECT(pcms->iommu), TYPE_X86_IOMMU_DEVICE)) { + return X86_IOMMU_DEVICE(pcms->iommu); + } + return NULL; } static void x86_iommu_realize(DeviceState *dev, Error **errp) @@ -131,8 +123,6 @@ static void x86_iommu_realize(DeviceState *dev, Error **errp) if (x86_class->realize) { x86_class->realize(dev, errp); } - - x86_iommu_set_default(X86_IOMMU_DEVICE(dev)); } static Property x86_iommu_properties[] = { From patchwork Mon Nov 1 23:44:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 516593 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp3858735iml; Mon, 1 Nov 2021 16:51:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzb+3bhdYTuoEO1m4/XzdYLmBHLhgzEsQXZtDz44fAs3RtZCWwRUQtyiWIh/KER4xSJKi66 X-Received: by 2002:a9d:6c91:: with SMTP id c17mr23031774otr.114.1635810693219; Mon, 01 Nov 2021 16:51:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635810693; cv=none; d=google.com; s=arc-20160816; b=fyk7UP9+h9q7qj8OQJRouGvmBR0eWrB7de4kNlRpg8mvEhU69eJtPlWjbxbUFVEGW2 KrF2b6Lzi+q9fAZCEKPR0s8585SEMTsaIwHSE2CeldGMF8lw3x5RyqGsqzsJuWFP1UiZ foT12ONM4Mj47Muf2rxp7G3PTnSa1FYWU6zR38THi7ygJrv7MK+CVtZC1fN8a832pp7k DTSNo7W+KjA11HV+p7AnaJCNGgwfoPswykMzSYMdkBZPQi9PDoZK7ZbkgLvDRK+3Ngwb YVzFrkgAxsQxokfoueH/ehz+Kro3BrYAk9rQbE8PG8syj9EqB4DaZOC8vXSKY7asUgO0 KslA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-disposition:in-reply-to :mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=87si2iofmNbSxccGunRxGUaDXwE4hg4UwpFbhmuRxZ0=; b=omidKmbSqC5AUDFIDfu6BqzqJ+4cvpWICNV/rxOg84yiaPpoYf2o3iCimlggi/VP+I J2Tsj61PDBGupCpFEykKi1ATFcHGltoWgC1yWdGXdYMEM846r4T6v9MhxNMYHD3QO75m 8RgxozMVE+bBSDC02CSy2+XtHlJ804JW+GpxmTCXJKVzax2Ya8Of1Ik8XqPkN2/PYQSE qDXz5i3/zoVDJ/MSs3rIoK9PWs7IQr2joX91vcm19KcjiZfrSA+Oejxay+nnf2sq4jUP exv5gsQP1keeNtStJhU091K+52JOFq8yXcLktI3FzLMGSknHJ8RRdzWQc3sckjEwtgcH cQGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=f0ReRC6c; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t5si8767744oiw.248.2021.11.01.16.51.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Nov 2021 16:51:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=f0ReRC6c; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:53638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhh5Q-00029y-GU for patch@linaro.org; Mon, 01 Nov 2021 19:51:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhgyx-00023Y-PV for qemu-devel@nongnu.org; Mon, 01 Nov 2021 19:44:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhgys-0004Gu-8P for qemu-devel@nongnu.org; Mon, 01 Nov 2021 19:44:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635810285; 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=87si2iofmNbSxccGunRxGUaDXwE4hg4UwpFbhmuRxZ0=; b=f0ReRC6cEGafJdXpu4J7UG1BU8su5W8JeHjts+sDNcWnyp1MLb0lLE7R7BkQcWPvEdWWYV cpgZozfgVVdHpW0tcWsq0eUU+SwwwntYo6wJoT568rY/UYbn8P7ZVXiDnCQsSEMbyKz056 VdyTlg5dRdp36N2FAbtiH06RiNEKuYc= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-375-Adw1jrjrMe-gIyADtn9f3w-1; Mon, 01 Nov 2021 19:44:44 -0400 X-MC-Unique: Adw1jrjrMe-gIyADtn9f3w-1 Received: by mail-ed1-f71.google.com with SMTP id v9-20020a50d849000000b003dcb31eabaaso17145584edj.13 for ; Mon, 01 Nov 2021 16:44:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=87si2iofmNbSxccGunRxGUaDXwE4hg4UwpFbhmuRxZ0=; b=nbd8SU+ky8G2Jh5/KJ0cNY3usU+mt8Eo0P7DXQrWWHBNpu8nnU55Mp4oKo5PydNGOk vXm4YR2dLlQTPd/Wm7azhzKZyxYxY+flHC8FqDdUWc/8yMNrTCc2x7gX8Qgzdksnmp0U RE7mLipc28W47DST/GCokMPCKNOLZ2S1rCgm/T8d9BQcnWhpj/Zwo2BzSSJUmsLpjPec hhlrFVK4dPScqqPDJHBNWaNtqkRRJGzz8EvEtm2KqGnxox/W+S04XIbMCaoq3Vo42o76 qEkLlLeGWpNK7u25mJfEFsaRGL9hwL51M8fdEZiMl6wPw+lAmu5KLqSwQQRIUaxeMz44 Qu4Q== X-Gm-Message-State: AOAM531ZYYPJ8rY8SYxF7Rx2OHRPJvm6eP9x93T9YQFLdq/CF7n26oXl jLbqo5aFGPzJgB00/DZGInT6mcI0vk8qAVoDC3h0zv1It5+q3/ibGV4I7DfLPQK/qVwUw9dcJtv DK/U4BJ+w8cK7thVzBQC9GpJ5s2pSGbhEzSKnfMBsTiKZ1tN0RheVJyNWKRE3 X-Received: by 2002:a50:ee01:: with SMTP id g1mr18447025eds.389.1635810283123; Mon, 01 Nov 2021 16:44:43 -0700 (PDT) X-Received: by 2002:a50:ee01:: with SMTP id g1mr18446992eds.389.1635810282941; Mon, 01 Nov 2021 16:44:42 -0700 (PDT) Received: from redhat.com ([2.55.156.42]) by smtp.gmail.com with ESMTPSA id o12sm9584008edw.84.2021.11.01.16.44.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 16:44:42 -0700 (PDT) Date: Mon, 1 Nov 2021 19:44:38 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 6/9] hw/i386/pc: Allow instantiating a virtio-iommu device Message-ID: <20211101234358.582487-7-mst@redhat.com> References: <20211101234358.582487-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20211101234358.582487-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.734, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Jean-Philippe Brucker , Richard Henderson , Eric Auger , Paolo Bonzini , Ani Sinha , Igor Mammedov Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Jean-Philippe Brucker 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. Reviewed-by: Eric Auger Reviewed-by: Igor Mammedov Tested-by: Eric Auger Signed-off-by: Jean-Philippe Brucker Message-Id: <20211026182024.2642038-5-jean-philippe@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 10 +++++++++- hw/i386/pc.c | 16 +++++++++++++++- hw/i386/Kconfig | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) -- MST diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index ab49e799ff..3ca6cc8118 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -68,9 +68,11 @@ #include "qom/qom-qobject.h" #include "hw/i386/amd_iommu.h" #include "hw/i386/intel_iommu.h" +#include "hw/virtio/virtio-iommu.h" #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 @@ -2488,7 +2490,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) PCMachineState *pcms = PC_MACHINE(machine); PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); X86MachineState *x86ms = X86_MACHINE(machine); - X86IOMMUState *iommu = x86_iommu_get_default(); + DeviceState *iommu = pcms->iommu; GArray *table_offsets; unsigned facs, dsdt, rsdt, fadt; AcpiPmInfo pm; @@ -2613,6 +2615,12 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) acpi_add_table(table_offsets, tables_blob); build_dmar_q35(tables_blob, tables->linker, x86ms->oem_id, x86ms->oem_table_id); + } else if (object_dynamic_cast(OBJECT(iommu), TYPE_VIRTIO_IOMMU_PCI)) { + PCIDevice *pdev = PCI_DEVICE(iommu); + + acpi_add_table(table_offsets, tables_blob); + build_viot(machine, tables_blob, tables->linker, pci_get_bdf(pdev), + 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 7b1c4f41cd..e99017e662 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" @@ -1330,7 +1331,19 @@ 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_X86_IOMMU_DEVICE)) { + } 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); + } + + if (object_dynamic_cast(OBJECT(dev), TYPE_X86_IOMMU_DEVICE) || + object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) { PCMachineState *pcms = PC_MACHINE(hotplug_dev); if (pcms->iommu) { @@ -1394,6 +1407,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 962d2c981b..d22ac4a4b9 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -59,6 +59,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