From nobody Tue Nov 26 19:55:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1706033975; cv=none; d=zohomail.com; s=zohoarc; b=Zz96Y3oxKzrWtBT7WEnvPu5phpsjCPv40kbda7dQg5041kI5RPQ7/RwH99cqCTa2ArUik6kEa+q2dkUMxkHhyKxoSkO9RmamMXmdyVLqHS7ykhLWUeuO9sxSpngNo3cQNWHxLmDrg9D+E7ZTOz8WiSWF8RFqZt6/ekkFL2uxRBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706033975; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4E9PS+wmquzixnBAkIzbuS/d8cmi9np9eCbZNk4hpos=; b=V/3gbsnG/1LQ7yvhLPBqlcP1QdvbJn+ZYZ0NF/WWiBs/z4gy3v68tWqv+NQuGSKH7pgSNOcd49C+mrh+oYPu3IdynKQNE6TG5bIVxpTREytxUYpMmf4Txy5jjT78anQLD2E2CbNbTka77Nhq+KmXaPiMxfPnUP8zwBxl4QYFlG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1706033975039449.50215388265804; Tue, 23 Jan 2024 10:19:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSLLo-0007En-08; Tue, 23 Jan 2024 13:18:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSLLi-00078p-02 for qemu-devel@nongnu.org; Tue, 23 Jan 2024 13:18:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSLLg-00066R-3x for qemu-devel@nongnu.org; Tue, 23 Jan 2024 13:18:13 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-150-6h_DB6LDPuybBo2N080mBQ-1; Tue, 23 Jan 2024 13:18:07 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A6C111013663; Tue, 23 Jan 2024 18:18:06 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.39.192.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DD7C2166B32; Tue, 23 Jan 2024 18:18:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706033888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4E9PS+wmquzixnBAkIzbuS/d8cmi9np9eCbZNk4hpos=; b=BtY9ZRJHFDoF8nZxyqBcTbBlx7jJCzL7Ol6rFoUpjscdYcCwN30nc0fUfFBuS+hQjI0uO1 ukaA+cYArVn0HfOjJxgtpr9RI0vu/Q5zBE6JQBydqP+A+b+ZQSDCWMtMGvMOxM1TGbUAY6 xj8XSiFtVd7sYbmKrGBq8cYAJu4CI80= X-MC-Unique: 6h_DB6LDPuybBo2N080mBQ-1 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, jean-philippe@linaro.org, alex.williamson@redhat.com, peter.maydell@linaro.org, zhenzhong.duan@intel.com, peterx@redhat.com, yanghliu@redhat.com Cc: mst@redhat.com, clg@redhat.com, jasowang@redhat.com Subject: [PATCH 3/3] hw/pc: Set the default virtio-iommu aw-bits to 39 on pc_q35_9.0 onwards Date: Tue, 23 Jan 2024 19:15:57 +0100 Message-ID: <20240123181753.413961-4-eric.auger@redhat.com> In-Reply-To: <20240123181753.413961-1-eric.auger@redhat.com> References: <20240123181753.413961-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.327, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1706033976419100001 Content-Type: text/plain; charset="utf-8" Currently the default input range can extend to 64 bits. On x86, when the virtio-iommu protects vfio devices, the physical iommu may support only 39 bits. Let's set the default to 39, as done for the intel-iommu. We introduce a new compat to make sure older pc_q35 machine types still use 64 bits. On ARM we keep 64b as the default input address width. Of course if aw-bits is set from the command line, the default is overriden. Signed-off-by: Eric Auger --- hw/arm/virt.c | 6 ++++++ hw/i386/pc.c | 10 +++++++++- hw/virtio/virtio-iommu.c | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 2793121cb4..a27fe13c73 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2715,10 +2715,16 @@ static void virt_machine_device_pre_plug_cb(Hotplug= Handler *hotplug_dev, } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MD_PCI)) { virtio_md_pci_pre_plug(VIRTIO_MD_PCI(dev), MACHINE(hotplug_dev), e= rrp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) { + uint8_t aw_bits =3D object_property_get_uint(OBJECT(dev), + "aw-bits", NULL); hwaddr db_start =3D 0, db_end =3D 0; QList *reserved_regions; char *resv_prop_str; =20 + if (!aw_bits) { + qdev_prop_set_uint8(dev, "aw-bits", 64); + } + if (vms->iommu !=3D VIRT_IOMMU_NONE) { error_setg(errp, "virt machine does not support multiple IOMMU= s"); return; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 496498df3a..a8dbc99946 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -78,7 +78,9 @@ { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }= ,\ { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }, =20 -GlobalProperty pc_compat_8_2[] =3D {}; +GlobalProperty pc_compat_8_2[] =3D { + { TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "64" }, +}; const size_t pc_compat_8_2_len =3D G_N_ELEMENTS(pc_compat_8_2); =20 GlobalProperty pc_compat_8_1[] =3D {}; @@ -1458,6 +1460,8 @@ static void pc_machine_device_pre_plug_cb(HotplugHand= ler *hotplug_dev, } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MD_PCI)) { virtio_md_pci_pre_plug(VIRTIO_MD_PCI(dev), MACHINE(hotplug_dev), e= rrp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) { + uint8_t aw_bits =3D object_property_get_uint(OBJECT(dev), + "aw-bits", NULL); /* Declare the APIC range as the reserved MSI region */ char *resv_prop_str =3D g_strdup_printf("0xfee00000:0xfeefffff:%d", VIRTIO_IOMMU_RESV_MEM_T_MSI); @@ -1466,6 +1470,10 @@ static void pc_machine_device_pre_plug_cb(HotplugHan= dler *hotplug_dev, qlist_append_str(reserved_regions, resv_prop_str); qdev_prop_set_array(dev, "reserved-regions", reserved_regions); =20 + if (!aw_bits) { + qdev_prop_set_uint8(dev, "aw-bits", 39); + } + g_free(resv_prop_str); } =20 diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index e7f299e0c6..a7c268a01a 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -1526,7 +1526,7 @@ static Property virtio_iommu_properties[] =3D { DEFINE_PROP_LINK("primary-bus", VirtIOIOMMU, primary_bus, TYPE_PCI_BUS, PCIBus *), DEFINE_PROP_BOOL("boot-bypass", VirtIOIOMMU, boot_bypass, true), - DEFINE_PROP_UINT8("aw-bits", VirtIOIOMMU, aw_bits, 64), + DEFINE_PROP_UINT8("aw-bits", VirtIOIOMMU, aw_bits, 0), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.41.0