From nobody Sat May 30 17:44:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1778654621; cv=none; d=zohomail.com; s=zohoarc; b=m80Ud5Rp0BMB/uuRGHn7iROsnQ63lghyWDShDPQfNoFU393bZWvmdhgqK2cJAPF4Na0kNBc0DD7zYKI++Yvsdn/hBOY/pL0yzMbgQEejCMWKMYZPl4YWqbsvu1nhfYW0NVUGnvJCb0hiNu06cje1Qg5JBZ7l5Lq0rd58J1qLNM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778654621; 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=CDkMGyP8yCuH+z8UvU/zLuhbSiZcsR/HELif+fftQ2M=; b=b5G0zrHMi4jmlEC/TGS+1uz0eWIjFa/qkkH2nhhej7zXs4frCZC2lP+2I2njuCo3wXvvMHKchp2nYKthCItKLVgBGFcYYliGg3sikJLczrsXoj9nGuY0bQMKE93W2NINoBuN64TIkwUOpZmnZ01IvioA7k95tgpzZ3rZIVLmRwc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778654621453940.1860949202452; Tue, 12 May 2026 23:43:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wN3JM-0006do-0C; Wed, 13 May 2026 02:43:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wN3JJ-0006dC-W8 for qemu-devel@nongnu.org; Wed, 13 May 2026 02:43:14 -0400 Received: from mgamail.intel.com ([198.175.65.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wN3JD-00076x-UN for qemu-devel@nongnu.org; Wed, 13 May 2026 02:43:13 -0400 Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2026 23:43:05 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2026 23:43:03 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778654588; x=1810190588; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TyyL1Zw6PSZae4Q3KlT3JK0LMeIOqJedC3KNkyR3Aao=; b=BGpZbtC7WrdRptUl1GaV0cL1ijX8zoKzlqoFtQ8I5rWxbN+4j+ejcLVz DqvYwv8cV6HXHk7Leu2R/JsPJAZYQ9wS6Z6WvKAIGa1K+3js2L8cH0HTj 3AyRdmbLVQtJnR6rkhueGVPWQRt3xhxy3nI6dGCp3kQ4Qt2J2rZ0t5JyF AzLN2F6Ld/Y9huB9EH9t3jQ+TDy8LnLGCERleiyNNBRHdehCgRyxGsG1C ZrG5IOSLB038QVit22iF9maTlHaoYcnAJUc0lj1+cKR9kWf52kzAnDIUw IkyyGOk9+zD+NhXR0g6z12K/5OnU6LO7iQgtpCBOZe9X2udYkIvE214N1 A==; X-CSE-ConnectionGUID: CClhIHNeRcuFu+r2hBoHfQ== X-CSE-MsgGUID: 9mGA7hM0QEq4lSXXFjjf8w== X-IronPort-AV: E=McAfee;i="6800,10657,11784"; a="102240708" X-IronPort-AV: E=Sophos;i="6.23,232,1770624000"; d="scan'208";a="102240708" X-CSE-ConnectionGUID: X95meN5XQRq+m2RvbuzrDQ== X-CSE-MsgGUID: 73jnmkKRQne+8+TnMPua2w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,232,1770624000"; d="scan'208";a="239809234" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: mst@redhat.com, jasowang@redhat.com, berrange@redhat.com, clg@redhat.com, clement.mathieu--drif@bull.com, philmd@linaro.org, yi.l.liu@intel.com, zhenzhong.duan@intel.com, Paolo Bonzini Subject: [PATCH v3 1/2] intel_iommu: Remove 'x-' prefix from 'x-scalable-mode' and 'x-flts' properties Date: Wed, 13 May 2026 02:42:25 -0400 Message-ID: <20260513064227.2304854-2-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260513064227.2304854-1-zhenzhong.duan@intel.com> References: <20260513064227.2304854-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=lists1p.gnu.org; Received-SPF: pass client-ip=198.175.65.9; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -47 X-Spam_score: -4.8 X-Spam_bar: ---- X-Spam_report: (-4.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=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: qemu development 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 @intel.com) X-ZM-MESSAGEID: 1778654626407158500 Content-Type: text/plain; charset="utf-8" We had 'x-scalable-mode' for more than 5 years and 'x-flts' for more than 1 year, it's fine to remove 'x-' now. This is a prerequisite to enable intel_iommu's scalable mode and first stage translation support in libvirt. Signed-off-by: Zhenzhong Duan --- docs/devel/vfio-iommufd.rst | 10 +++++----- hw/i386/intel_iommu.c | 8 ++++---- hw/i386/intel_iommu_accel.c | 4 ++-- tests/qtest/intel-iommu-test.c | 2 +- tests/qtest/iommu-intel-test.c | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/devel/vfio-iommufd.rst b/docs/devel/vfio-iommufd.rst index 78bcdffac7..5755532443 100644 --- a/docs/devel/vfio-iommufd.rst +++ b/docs/devel/vfio-iommufd.rst @@ -153,22 +153,22 @@ RAM discarding for mdev. ``vfio-ap`` and ``vfio-ccw`` devices don't have same issue as their backend devices are always mdev and RAM discarding is force enabled. =20 -Usage with intel_iommu featuring x-flts=3Don +Usage with intel_iommu featuring flts=3Don ------------------------------------------ =20 Only IOMMUFD backed VFIO device is supported when intel_iommu is configured -with x-flts=3Don, for legacy container backed VFIO device, below error sho= ws: +with flts=3Don, for legacy container backed VFIO device, below error shows: =20 .. code-block:: none =20 - qemu-system-x86_64: -device vfio-pci,host=3D0000:02:00.0: vfio 0000:02= :00.0: Failed to set vIOMMU: Need IOMMUFD backend when x-flts=3Don + qemu-system-x86_64: -device vfio-pci,host=3D0000:02:00.0: vfio 0000:02= :00.0: Failed to set vIOMMU: Need IOMMUFD backend when flts=3Don =20 VFIO device under PCI bridge is unsupported, use PCIE bridge if necessary, otherwise below error shows: =20 .. code-block:: none =20 - qemu-system-x86_64: -device vfio-pci,host=3D0000:02:00.0,bus=3Dbridge1= ,iommufd=3Diommufd0: vfio 0000:02:00.0: Failed to set vIOMMU: Host device d= ownstream to a PCI bridge is unsupported when x-flts=3Don + qemu-system-x86_64: -device vfio-pci,host=3D0000:02:00.0,bus=3Dbridge1= ,iommufd=3Diommufd0: vfio 0000:02:00.0: Failed to set vIOMMU: Host device d= ownstream to a PCI bridge is unsupported when flts=3Don =20 If host IOMMU has ERRATA_772415_SPR17, running guest with "intel_iommu=3Do= n,sm_off" is unsupported, kexec or reboot guest from "intel_iommu=3Don,sm_on" to @@ -177,4 +177,4 @@ below if it's not needed by guest: =20 .. code-block:: bash =20 - -device intel-iommu,x-scalable-mode=3Doff + -device intel-iommu,scalable-mode=3Doff diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index b784c5f10a..f09a87b50b 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -4200,8 +4200,8 @@ static const Property vtd_properties[] =3D { DEFINE_PROP_UINT8("aw-bits", IntelIOMMUState, aw_bits, VTD_HOST_ADDRESS_WIDTH), DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE), - DEFINE_PROP_BOOL("x-scalable-mode", IntelIOMMUState, scalable_mode, FA= LSE), - DEFINE_PROP_BOOL("x-flts", IntelIOMMUState, fsts, FALSE), + DEFINE_PROP_BOOL("scalable-mode", IntelIOMMUState, scalable_mode, FALS= E), + DEFINE_PROP_BOOL("flts", IntelIOMMUState, fsts, FALSE), DEFINE_PROP_BOOL("snoop-control", IntelIOMMUState, snoop_control, fals= e), DEFINE_PROP_BOOL("x-pasid-mode", IntelIOMMUState, pasid, false), DEFINE_PROP_BOOL("svm", IntelIOMMUState, svm, false), @@ -5563,7 +5563,7 @@ static bool vtd_decide_config(IntelIOMMUState *s, Err= or **errp) } =20 if (!s->scalable_mode && s->fsts) { - error_setg(errp, "x-flts is only available in scalable mode"); + error_setg(errp, "flts is only available in scalable mode"); return false; } =20 @@ -5576,7 +5576,7 @@ static bool vtd_decide_config(IntelIOMMUState *s, Err= or **errp) } =20 if (s->fsts && s->aw_bits !=3D VTD_HOST_AW_48BIT) { - error_setg(errp, "Scalable mode(x-flts=3Don): supported value for " + error_setg(errp, "Scalable mode(flts=3Don): supported value for " "aw-bits is: %d", VTD_HOST_AW_48BIT); return false; } diff --git a/hw/i386/intel_iommu_accel.c b/hw/i386/intel_iommu_accel.c index ed3793602b..36dc5ac020 100644 --- a/hw/i386/intel_iommu_accel.c +++ b/hw/i386/intel_iommu_accel.c @@ -26,7 +26,7 @@ bool vtd_check_hiod_accel(IntelIOMMUState *s, VTDHostIOMM= UDevice *vtd_hiod, PCIDevice *pdev =3D bus->devices[vtd_hiod->devfn]; =20 if (!object_dynamic_cast(OBJECT(hiod), TYPE_HOST_IOMMU_DEVICE_IOMMUFD)= ) { - error_setg(errp, "Need IOMMUFD backend when x-flts=3Don"); + error_setg(errp, "Need IOMMUFD backend when flts=3Don"); return false; } =20 @@ -44,7 +44,7 @@ bool vtd_check_hiod_accel(IntelIOMMUState *s, VTDHostIOMM= UDevice *vtd_hiod, =20 if (pci_device_get_iommu_bus_devfn(pdev, &bus, NULL, NULL)) { error_setg(errp, "Host device downstream to a PCI bridge is " - "unsupported when x-flts=3Don"); + "unsupported when flts=3Don"); return false; } =20 diff --git a/tests/qtest/intel-iommu-test.c b/tests/qtest/intel-iommu-test.c index e5cc6acaf0..4f12c56260 100644 --- a/tests/qtest/intel-iommu-test.c +++ b/tests/qtest/intel-iommu-test.c @@ -29,7 +29,7 @@ static void test_intel_iommu_stage_1(void) uint64_t cap, ecap, tmp; QTestState *s; =20 - s =3D qtest_init("-M q35 -device intel-iommu,x-scalable-mode=3Don,x-fl= ts=3Don"); + s =3D qtest_init("-M q35 -device intel-iommu,scalable-mode=3Don,flts= =3Don"); =20 cap =3D vtd_reg_readq(s, DMAR_CAP_REG); g_assert((cap & CAP_STAGE_1_FIXED1) =3D=3D CAP_STAGE_1_FIXED1); diff --git a/tests/qtest/iommu-intel-test.c b/tests/qtest/iommu-intel-test.c index a52c45e298..8125be9e28 100644 --- a/tests/qtest/iommu-intel-test.c +++ b/tests/qtest/iommu-intel-test.c @@ -54,10 +54,10 @@ static const char *qvtd_iommu_args(QVTDTransMode mode) { switch (mode) { case QVTD_TM_SCALABLE_FLT: - return "-device intel-iommu,x-scalable-mode=3Don,x-flts=3Don "; + return "-device intel-iommu,scalable-mode=3Don,flts=3Don "; case QVTD_TM_SCALABLE_PT: case QVTD_TM_SCALABLE_SLT: - return "-device intel-iommu,x-scalable-mode=3Don "; + return "-device intel-iommu,scalable-mode=3Don "; default: return "-device intel-iommu "; } --=20 2.47.3 From nobody Sat May 30 17:44:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1778654621; cv=none; d=zohomail.com; s=zohoarc; b=mMDoAvkEgHEa/x+CeIPqdknHx0EfcVRjAWWRyBHvtikqpP2KEQntIgKw/X1jkgHtvAR3lmNBq8hNstZ+p/YyRjXhe45xODAiTXwSljRv+Fjoe+kW+3apyL/SdQ6yMVNLQ9n4AOz1ss+7Vg5os0797m++nfD7zXvm1Aok1JhwSzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778654621; 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=ZtfFnrn+3wTb7goRO5jVwI7vZLYJqmtPMHiYf1GfCOE=; b=E9Ei1xiBXRsCSiwg2b0GTC0Dptf5Wb7qqvL4ydfyG6GLpAcXHB69hyXVxMpSc034h0nN4pv86FHk9SiUrTaJAZ39dCARimguhiw7Eaqvf4FrdOv2FhQ3nuYrgp3Jw0tPg/7WPYJNBOAP0yZvb9JNQ3Avo2BUu/4q8iOR5P0fO80= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778654621492591.9422527104655; Tue, 12 May 2026 23:43:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wN3JL-0006dr-T7; Wed, 13 May 2026 02:43:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wN3JK-0006dG-5N for qemu-devel@nongnu.org; Wed, 13 May 2026 02:43:14 -0400 Received: from mgamail.intel.com ([198.175.65.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wN3JF-0007Ax-KQ for qemu-devel@nongnu.org; Wed, 13 May 2026 02:43:13 -0400 Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2026 23:43:08 -0700 Received: from unknown (HELO gnr-sp-2s-612.sh.intel.com) ([10.112.230.229]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2026 23:43:05 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778654590; x=1810190590; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PTMH/4ANBKmow1t7dA8kVDSvahqWYBsa9VZCDOk+uiw=; b=jxV3jtl+qSk5hcd5MzNDlAeniVoBIrbUJlEuxJWEmAd4wmPLDzYJFKGb vDJEbkdPTsLMph/kRZr5N08uxca3cKSxD1L9WnbJCI0rvYTkWCn+csoVg Vf+XHYRNKQfAXMB1A7xp7k0kOdun6uxVS6YRaF54OPMbUGam2bNjEboQE NICru50EllrAqzXsoTtMvloUvgi6uWQOgRAux+7NxxoNFc+0rF56srGHI ICYULXACSyVhdzQsxIz8EX/AU1zamMOWr5xaCVXoldVaB7avhJYWAOcWj AtzKdjjqXInZhaAqBfmgMt9QLyXsWuNsxFZoQenm5E+MVfTo5WqDHTzf8 g==; X-CSE-ConnectionGUID: Iz4EOz1lR0OWLOKaxRU4cA== X-CSE-MsgGUID: 2RsiNZmKRhOezyLGKWhUYw== X-IronPort-AV: E=McAfee;i="6800,10657,11784"; a="102240714" X-IronPort-AV: E=Sophos;i="6.23,232,1770624000"; d="scan'208";a="102240714" X-CSE-ConnectionGUID: o13ioLiPTwODeMP890TMjw== X-CSE-MsgGUID: 87FnEjelSJyQyCZIkUQ3VQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,232,1770624000"; d="scan'208";a="239809246" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: mst@redhat.com, jasowang@redhat.com, berrange@redhat.com, clg@redhat.com, clement.mathieu--drif@bull.com, philmd@linaro.org, yi.l.liu@intel.com, zhenzhong.duan@intel.com, Paolo Bonzini Subject: [PATCH v3 2/2] intel_iommu: Change 'flts' property naming to 'fsts' Date: Wed, 13 May 2026 02:42:26 -0400 Message-ID: <20260513064227.2304854-3-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260513064227.2304854-1-zhenzhong.duan@intel.com> References: <20260513064227.2304854-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=lists1p.gnu.org; Received-SPF: pass client-ip=198.175.65.9; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -47 X-Spam_score: -4.8 X-Spam_bar: ---- X-Spam_report: (-4.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=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: qemu development 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 @intel.com) X-ZM-MESSAGEID: 1778654626400158500 Content-Type: text/plain; charset="utf-8" Previous patch Removed 'x-' prefix from 'x-flts' property. Opportunistically, this patch does s/flts/fsts for property name in order to better align with newer spec since revision 3.4 which changed terminology from "First-level" to "First-stage". Signed-off-by: Zhenzhong Duan --- docs/devel/vfio-iommufd.rst | 8 ++++---- hw/i386/intel_iommu.c | 10 +++++----- hw/i386/intel_iommu_accel.c | 6 +++--- tests/qtest/intel-iommu-test.c | 2 +- tests/qtest/iommu-intel-test.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/devel/vfio-iommufd.rst b/docs/devel/vfio-iommufd.rst index 5755532443..d5538461ba 100644 --- a/docs/devel/vfio-iommufd.rst +++ b/docs/devel/vfio-iommufd.rst @@ -153,22 +153,22 @@ RAM discarding for mdev. ``vfio-ap`` and ``vfio-ccw`` devices don't have same issue as their backend devices are always mdev and RAM discarding is force enabled. =20 -Usage with intel_iommu featuring flts=3Don +Usage with intel_iommu featuring fsts=3Don ------------------------------------------ =20 Only IOMMUFD backed VFIO device is supported when intel_iommu is configured -with flts=3Don, for legacy container backed VFIO device, below error shows: +with fsts=3Don, for legacy container backed VFIO device, below error shows: =20 .. code-block:: none =20 - qemu-system-x86_64: -device vfio-pci,host=3D0000:02:00.0: vfio 0000:02= :00.0: Failed to set vIOMMU: Need IOMMUFD backend when flts=3Don + qemu-system-x86_64: -device vfio-pci,host=3D0000:02:00.0: vfio 0000:02= :00.0: Failed to set vIOMMU: Need IOMMUFD backend when fsts=3Don =20 VFIO device under PCI bridge is unsupported, use PCIE bridge if necessary, otherwise below error shows: =20 .. code-block:: none =20 - qemu-system-x86_64: -device vfio-pci,host=3D0000:02:00.0,bus=3Dbridge1= ,iommufd=3Diommufd0: vfio 0000:02:00.0: Failed to set vIOMMU: Host device d= ownstream to a PCI bridge is unsupported when flts=3Don + qemu-system-x86_64: -device vfio-pci,host=3D0000:02:00.0,bus=3Dbridge1= ,iommufd=3Diommufd0: vfio 0000:02:00.0: Failed to set vIOMMU: Host device d= ownstream to a PCI bridge is unsupported when fsts=3Don =20 If host IOMMU has ERRATA_772415_SPR17, running guest with "intel_iommu=3Do= n,sm_off" is unsupported, kexec or reboot guest from "intel_iommu=3Don,sm_on" to diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index f09a87b50b..4f8302d200 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -4201,7 +4201,7 @@ static const Property vtd_properties[] =3D { VTD_HOST_ADDRESS_WIDTH), DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE), DEFINE_PROP_BOOL("scalable-mode", IntelIOMMUState, scalable_mode, FALS= E), - DEFINE_PROP_BOOL("flts", IntelIOMMUState, fsts, FALSE), + DEFINE_PROP_BOOL("fsts", IntelIOMMUState, fsts, FALSE), DEFINE_PROP_BOOL("snoop-control", IntelIOMMUState, snoop_control, fals= e), DEFINE_PROP_BOOL("x-pasid-mode", IntelIOMMUState, pasid, false), DEFINE_PROP_BOOL("svm", IntelIOMMUState, svm, false), @@ -5563,20 +5563,20 @@ static bool vtd_decide_config(IntelIOMMUState *s, E= rror **errp) } =20 if (!s->scalable_mode && s->fsts) { - error_setg(errp, "flts is only available in scalable mode"); + error_setg(errp, "fsts is only available in scalable mode"); return false; } =20 if (!s->fsts && s->aw_bits !=3D VTD_HOST_AW_39BIT && s->aw_bits !=3D VTD_HOST_AW_48BIT) { error_setg(errp, "%s: supported values for aw-bits are: %d, %d", - s->scalable_mode ? "Scalable mode(flts=3Doff)" : "Legac= y mode", + s->scalable_mode ? "Scalable mode(fsts=3Doff)" : "Legac= y mode", VTD_HOST_AW_39BIT, VTD_HOST_AW_48BIT); return false; } =20 if (s->fsts && s->aw_bits !=3D VTD_HOST_AW_48BIT) { - error_setg(errp, "Scalable mode(flts=3Don): supported value for " + error_setg(errp, "Scalable mode(fsts=3Don): supported value for " "aw-bits is: %d", VTD_HOST_AW_48BIT); return false; } @@ -5593,7 +5593,7 @@ static bool vtd_decide_config(IntelIOMMUState *s, Err= or **errp) } =20 if (!s->fsts) { - error_setg(errp, "Need to set flts for svm"); + error_setg(errp, "Need to set fsts for svm"); return false; } =20 diff --git a/hw/i386/intel_iommu_accel.c b/hw/i386/intel_iommu_accel.c index 36dc5ac020..18ca5a801a 100644 --- a/hw/i386/intel_iommu_accel.c +++ b/hw/i386/intel_iommu_accel.c @@ -26,7 +26,7 @@ bool vtd_check_hiod_accel(IntelIOMMUState *s, VTDHostIOMM= UDevice *vtd_hiod, PCIDevice *pdev =3D bus->devices[vtd_hiod->devfn]; =20 if (!object_dynamic_cast(OBJECT(hiod), TYPE_HOST_IOMMU_DEVICE_IOMMUFD)= ) { - error_setg(errp, "Need IOMMUFD backend when flts=3Don"); + error_setg(errp, "Need IOMMUFD backend when fsts=3Don"); return false; } =20 @@ -44,7 +44,7 @@ bool vtd_check_hiod_accel(IntelIOMMUState *s, VTDHostIOMM= UDevice *vtd_hiod, =20 if (pci_device_get_iommu_bus_devfn(pdev, &bus, NULL, NULL)) { error_setg(errp, "Host device downstream to a PCI bridge is " - "unsupported when flts=3Don"); + "unsupported when fsts=3Don"); return false; } =20 @@ -105,7 +105,7 @@ static bool vtd_device_attach_iommufd(VTDHostIOMMUDevic= e *vtd_hiod, bool ret; =20 /* - * We can get here only if flts=3Don, the supported PGTT is FST or PT. + * We can get here only if fsts=3Don, the supported PGTT is FST or PT. * Catch invalid PGTT when processing invalidation request to avoid * attaching to wrong hwpt. */ diff --git a/tests/qtest/intel-iommu-test.c b/tests/qtest/intel-iommu-test.c index 4f12c56260..30ee6524df 100644 --- a/tests/qtest/intel-iommu-test.c +++ b/tests/qtest/intel-iommu-test.c @@ -29,7 +29,7 @@ static void test_intel_iommu_stage_1(void) uint64_t cap, ecap, tmp; QTestState *s; =20 - s =3D qtest_init("-M q35 -device intel-iommu,scalable-mode=3Don,flts= =3Don"); + s =3D qtest_init("-M q35 -device intel-iommu,scalable-mode=3Don,fsts= =3Don"); =20 cap =3D vtd_reg_readq(s, DMAR_CAP_REG); g_assert((cap & CAP_STAGE_1_FIXED1) =3D=3D CAP_STAGE_1_FIXED1); diff --git a/tests/qtest/iommu-intel-test.c b/tests/qtest/iommu-intel-test.c index 8125be9e28..703bbfef73 100644 --- a/tests/qtest/iommu-intel-test.c +++ b/tests/qtest/iommu-intel-test.c @@ -54,7 +54,7 @@ static const char *qvtd_iommu_args(QVTDTransMode mode) { switch (mode) { case QVTD_TM_SCALABLE_FLT: - return "-device intel-iommu,scalable-mode=3Don,flts=3Don "; + return "-device intel-iommu,scalable-mode=3Don,fsts=3Don "; case QVTD_TM_SCALABLE_PT: case QVTD_TM_SCALABLE_SLT: return "-device intel-iommu,scalable-mode=3Don "; --=20 2.47.3