From nobody Mon Dec 15 21:50:34 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2045.outbound.protection.outlook.com [40.107.92.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6661822D4C5 for ; Wed, 4 Jun 2025 06:14:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749017643; cv=fail; b=r6clsPb0kMmAm7rtnJPqGwUIj1TbA9n74X4R4WL0NdBjxjmMb+nrI90gqXdGq+ixMV/FGRO5nVriJgFrDRP04ujyLxp+/qYJVw/LYfJPIgw+Mo1YH50ZZpIBTS+ldUKmmNfI3VJifBuVYaxSvpnoIpTwjZWvYrgXsMJuP8yonqY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749017643; c=relaxed/simple; bh=DPsbCFUmI85mXbxYb8Ecxl455+7kTPPjYPmsvv/5fjg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EDuYeCvtGvH/daOe1g0B77stAP9kPTGfLzqfb+bLBRJA6CeYzlZ/LLJrZhXoCpEWJgKoIv0G2ydFATAeww8sOHOKl8i2w7/sjAMu2jRlC2LBv4iGU54a0Vr/rQAp6OAvXZ8tmXQ3a1FKX65DTmsHm5Dnr9WIalL+aUzJ/6a7SpQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=Zw+Qdg56; arc=fail smtp.client-ip=40.107.92.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Zw+Qdg56" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=C905KMaRzPN9vWqS9hAiFnTUJ+nOy5G8nkkUqph+67uGcikz+WwGvDLOfGlg2MhCnFwCwXao49+LXrVvlkkwLRvqHobyKC+MYzWv6GoEPQkSmLePIoxaMrVnPoowKs/cxUM5NhPBtfug+l0J3jpqEHiQJZnXKEsiURAkl/o7DW59Qy8JC4WHdRmwNyZsATgXDwUDLncg+zaFZ56pCTavX7QS2rdlxc3Cbj3PfcBTR0seqrP+FbvBa5p8wCmcZlgUa1uz5ST4Sgi0Y8h3K5fwgaAcUMnbdEi3ns7qmhTo62A0+hDtX0lFVtfEZeYgSf5NXw8GOt5be+aqUs29/xIqzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aFqQEOa67a5nBgD7nEh54Z3M8V3xKMg2mNvVGSK0q4w=; b=Ivpc09QIumLfmPmPYBd+Gp2PhOdhKJbAUeBepb3n6ZedZqtDq9YG2HvfZfHEzKzCpnm3F+saDQf3XUQe1rbMT55YXynVFEY7ZVO+FyKHHp4zOKut7/zcvu40B+kYKRfYWgArBBt7oJJvtEWxD4mjfvzmEwmUCTcV2+WSndK056re4PgBa+iLrvjNI8Ln+H4GyhS9SQKShaEP//5m09ycr7YFyPSOP7ztqEPSCZjuWUNg2reo7ggAO5P+bz9IC8bPbLZTn5oyOT1mkJUKJ2hsJpKHmOTGe6F4IpXgRKkeqkS7A8nmgbPPfTJQ9p2aKwS+nWlce8hc3EwLo0vYrWfYRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.linux.dev smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aFqQEOa67a5nBgD7nEh54Z3M8V3xKMg2mNvVGSK0q4w=; b=Zw+Qdg56Ifhlp4B0sqL9vlSshn2BCc+gkCvq5up7BPEdscwM4zjKd6cGRBSGPVTITKZHZQWHguTQJUKM57k5DeICoqOSRu3OWlJOzmUq+I49tH2IGCa2YbUTQK7dPNHB3Gl+F1f75eIX089d9jUZNzIBxsaPghY7RGlhRGiWEcc= Received: from BN9P222CA0005.NAMP222.PROD.OUTLOOK.COM (2603:10b6:408:10c::10) by LV8PR12MB9153.namprd12.prod.outlook.com (2603:10b6:408:185::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.21; Wed, 4 Jun 2025 06:13:57 +0000 Received: from BN1PEPF00006000.namprd05.prod.outlook.com (2603:10b6:408:10c:cafe::9f) by BN9P222CA0005.outlook.office365.com (2603:10b6:408:10c::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.19 via Frontend Transport; Wed, 4 Jun 2025 06:13:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006000.mail.protection.outlook.com (10.167.243.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8792.29 via Frontend Transport; Wed, 4 Jun 2025 06:13:57 +0000 Received: from BLRANKISONI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 4 Jun 2025 01:13:54 -0500 From: Ankit Soni To: CC: , , , , , , Subject: [PATCH v4 1/2] iommu/amd: Add HATDis feature support Date: Wed, 4 Jun 2025 06:13:24 +0000 Message-ID: <8109b208f87b80e400c2abd24a2e44fcbc0763a5.1749016436.git.Ankit.Soni@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006000:EE_|LV8PR12MB9153:EE_ X-MS-Office365-Filtering-Correlation-Id: beff859e-f4f2-4484-8296-08dda32efd8c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700013|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SGYjfleedQ4BiU6lKDf785nb+Q0uHI0cS7BxQEasQmU/m7pKTuv0D6L47yIM?= =?us-ascii?Q?7x+5yaS3bJ0/V8g2npXgabLh2qU7WEUOVMas6N6ywceSnJO+A6y6zxHC3rA/?= =?us-ascii?Q?hwJKhPQdW3tzl40pHX8MQUBn5l/NP6fqCDcRlviJmfHVnD4I1e9xXWbAXBE2?= =?us-ascii?Q?lcZoF7Hm0uSIoC+ftp6AqsFWJHrjRdsR98p48DkHorDg7S17m/mCr2ZTG9jE?= =?us-ascii?Q?6i54PvK8pNDXlPgLZ5vMvaSft8eoA4rzz89eAqgnmfvbm1MC9BX/adeFVydl?= =?us-ascii?Q?w5NoX84zmv2z2dnlv/sCHuKgFMwaa5xW42M9wgB45pQOP6dMD7zHDQIgjJ+6?= =?us-ascii?Q?3QMx03ACZOwmYlLRNbolog+FdBfgzx2j7TM4FRyS72mbx2xDoOz0im5pXij5?= =?us-ascii?Q?Pxo4dghV10qLK91kyLq6kJpU0vm6s/dYyxw2Yl4Kwp4ffEt5y8a/PLe4FdyV?= =?us-ascii?Q?EjqdgJEmwVwElksfmnEl2nVYdfDyGnEpupl7biJMVmP0CQnTmTdbr1JzLNyM?= =?us-ascii?Q?a7Y784z0sP7KWA23/o4Oj5nt2/pQywObLT1honb/lyxAp8XsOQGlV17L84nU?= =?us-ascii?Q?lpP1x7gEZcVH9IwoqzjIpGn7NwAwhG56isxCqoU/eP+dJSsfFuyP00kpSU8E?= =?us-ascii?Q?fZTJZsj6YPyVzvn4e5+l7i8XQ7LIKZVK1uqoQpJDmLU2KgctFSwqJ5TLW8UH?= =?us-ascii?Q?b791Zmu4RvgtcCZDvsmJ7pvEsvRjC0cPFkRQEagWlEvXl9pKHEzdPO/FAD9i?= =?us-ascii?Q?lA3NZAzsniGbljD0TN5juBGaFjuo0yxvje7lxJAjRKXXSdrugTNiD9vuNi5J?= =?us-ascii?Q?0oEMsmufzNbjhz/UB17J4uoLnkc49/Ee5RQyXR/pbsliVIm4Hiu7EGsiFI4s?= =?us-ascii?Q?Srs4b9KS6TzFCPfMQzvcRO/67hO7MPfYG32x//UqHhKks5wS04kuV10oZugP?= =?us-ascii?Q?9LFl12CIZxGL0UaaWMfMC6jYnwkTT/P9X+aryYPxbQDfqD8Jon81eG6YmC4N?= =?us-ascii?Q?mx4P0WcgmvEV/Imfy60p2ssKPearh5tthdt38PgzUz/LuM3rKQumXSGwbNT1?= =?us-ascii?Q?ujJASkTCzFJAHeXwdQSrERbeWZkwnNMiwFlCnT8iUTjbawXh8UPSNKbYKmwZ?= =?us-ascii?Q?B88bNY8bGjxmWtfoPJxOfQRN7gawSl9dfOeF7O+rfBxblqlaHncO+ToVFgCM?= =?us-ascii?Q?RozaHO+pO/ECKJUjdV1FGum6Hr6WdH+y1ZoNmKBoPpsBzcuwJc1S+Ez9dIEJ?= =?us-ascii?Q?p0tGUBAGTehaRPuWHXcDkldRIZ+2QfUXwvNo1mMBiv19q/6U3YXsXiQHYBOe?= =?us-ascii?Q?Abo2Yt4pGD7G2ZErxE58KoHu+TdZloB6tI0+b0GjQpgUQMhTQrHh5xJ2j4cx?= =?us-ascii?Q?okHbQMW0Of+p7GuWZBtguOEtewyk5IntLRGilWwiMbwha5VVovFC0xoLaSsC?= =?us-ascii?Q?p4ii3TWmaxDnHtbggyhnRy0AmNvcl2BGc3k0/nzg+T+v1EnsMAq/j9rh775c?= =?us-ascii?Q?IQETt58E2p+m14An6ow0IcY9saVUGwCpcABlRU7MmE61JUUIaFWn6wkiew?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(376014)(36860700013)(13003099007);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2025 06:13:57.3719 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: beff859e-f4f2-4484-8296-08dda32efd8c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00006000.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9153 Content-Type: text/plain; charset="utf-8" Current AMD IOMMU assumes Host Address Translation (HAT) is always supported, and Linux kernel enables this capability by default. However, in case of emulated and virtualized IOMMU, this might not be the case. For example,current QEMU-emulated AMD vIOMMU does not support host translation for VFIO pass-through device, but the interrupt remapping support is required for x2APIC (i.e. kvm-msi-ext-dest-id is also not supported by the guest OS). This would require the guest kernel to boot with guest kernel option iommu=3Dpt to by-pass the initialization of host (v1) table. The AMD I/O Virtualization Technology (IOMMU) Specification Rev 3.10 [1] introduces a new flag 'HATDis' in the IVHD 11h IOMMU attributes to indicate that HAT is not supported on a particular IOMMU instance. Therefore, modifies the AMD IOMMU driver to detect the new HATDis attributes, and disable host translation and switch to use guest translation if it is available. Otherwise, the driver will disable DMA translation. [1] https://www.amd.com/content/dam/amd/en/documents/processor-tech-docs/sp= ecifications/48882_IOMMU.pdf Reviewed-by: Suravee Suthikulpanit Signed-off-by: Ankit Soni --- drivers/iommu/amd/amd_iommu.h | 1 + drivers/iommu/amd/amd_iommu_types.h | 6 +++++- drivers/iommu/amd/init.c | 31 +++++++++++++++++++++++++++-- drivers/iommu/amd/iommu.c | 13 ++++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h index 29a8864381c3..fddfad4a9009 100644 --- a/drivers/iommu/amd/amd_iommu.h +++ b/drivers/iommu/amd/amd_iommu.h @@ -43,6 +43,7 @@ extern int amd_iommu_guest_ir; extern enum protection_domain_mode amd_iommu_pgtable; extern int amd_iommu_gpt_level; extern unsigned long amd_iommu_pgsize_bitmap; +extern bool amd_iommu_hatdis; =20 /* Protection domain ops */ void amd_iommu_init_identity_domain(void); diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_io= mmu_types.h index ccbab3a4811a..69291cef73f7 100644 --- a/drivers/iommu/amd/amd_iommu_types.h +++ b/drivers/iommu/amd/amd_iommu_types.h @@ -460,6 +460,9 @@ /* IOMMU Feature Reporting Field (for IVHD type 10h */ #define IOMMU_FEAT_GASUP_SHIFT 6 =20 +/* IOMMU HATDIS for IVHD type 11h and 40h */ +#define IOMMU_IVHD_ATTR_HATDIS_SHIFT 0 + /* IOMMU Extended Feature Register (EFR) */ #define IOMMU_EFR_XTSUP_SHIFT 2 #define IOMMU_EFR_GASUP_SHIFT 7 @@ -558,7 +561,8 @@ struct amd_io_pgtable { }; =20 enum protection_domain_mode { - PD_MODE_V1 =3D 1, + PD_MODE_NONE, + PD_MODE_V1, PD_MODE_V2, }; =20 diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index c06b62f87b9b..5dda0f6d2492 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -168,6 +168,9 @@ static int amd_iommu_target_ivhd_type; u64 amd_iommu_efr; u64 amd_iommu_efr2; =20 +/* Host (v1) page table is not supported*/ +bool amd_iommu_hatdis; + /* SNP is enabled on the system? */ bool amd_iommu_snp_en; EXPORT_SYMBOL(amd_iommu_snp_en); @@ -1792,6 +1795,11 @@ static int __init init_iommu_one(struct amd_iommu *i= ommu, struct ivhd_header *h, if (h->efr_reg & BIT(IOMMU_EFR_XTSUP_SHIFT)) amd_iommu_xt_mode =3D IRQ_REMAP_X2APIC_MODE; =20 + if (h->efr_attr & BIT(IOMMU_IVHD_ATTR_HATDIS_SHIFT)) { + pr_warn_once("Host Address Translation is not supported.\n"); + amd_iommu_hatdis =3D true; + } + early_iommu_features_init(iommu, h); =20 break; @@ -2115,7 +2123,15 @@ static int __init iommu_init_pci(struct amd_iommu *i= ommu) return ret; } =20 - iommu_device_register(&iommu->iommu, &amd_iommu_ops, NULL); + ret =3D iommu_device_register(&iommu->iommu, &amd_iommu_ops, NULL); + if (ret || amd_iommu_pgtable =3D=3D PD_MODE_NONE) { + /* + * Remove sysfs if DMA translation is not supported by the + * IOMMU. Do not return an error to enable IRQ remapping + * in state_next(), DTE[V, TV] must eventually be set to 0. + */ + iommu_device_sysfs_remove(&iommu->iommu); + } =20 return pci_enable_device(iommu->dev); } @@ -2576,7 +2592,7 @@ static void init_device_table_dma(struct amd_iommu_pc= i_seg *pci_seg) u32 devid; struct dev_table_entry *dev_table =3D pci_seg->dev_table; =20 - if (dev_table =3D=3D NULL) + if (!dev_table || amd_iommu_pgtable =3D=3D PD_MODE_NONE) return; =20 for (devid =3D 0; devid <=3D pci_seg->last_bdf; ++devid) { @@ -3087,6 +3103,17 @@ static int __init early_amd_iommu_init(void) } } =20 + if (amd_iommu_hatdis) { + /* + * Host (v1) page table is not available. Attempt to use + * Guest (v2) page table. + */ + if (amd_iommu_v2_pgtbl_supported()) + amd_iommu_pgtable =3D PD_MODE_V2; + else + amd_iommu_pgtable =3D PD_MODE_NONE; + } + /* Disable any previously enabled IOMMUs */ if (!is_kdump_kernel() || amd_iommu_disabled) disable_iommus(); diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 3117d99cf83d..8a9babd6dfa7 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -2424,6 +2424,13 @@ static struct iommu_device *amd_iommu_probe_device(s= truct device *dev) pci_max_pasids(to_pci_dev(dev))); } =20 + if (amd_iommu_pgtable =3D=3D PD_MODE_NONE) { + pr_warn_once("%s: DMA translation not supported by iommu.\n", + __func__); + iommu_dev =3D ERR_PTR(-ENODEV); + goto out_err; + } + out_err: =20 iommu_completion_wait(iommu); @@ -2511,6 +2518,9 @@ static int pdom_setup_pgtable(struct protection_domai= n *domain, case PD_MODE_V2: fmt =3D AMD_IOMMU_V2; break; + case PD_MODE_NONE: + WARN_ON_ONCE(1); + return -EPERM; } =20 domain->iop.pgtbl.cfg.amd.nid =3D dev_to_node(dev); @@ -2532,6 +2542,9 @@ static inline u64 dma_max_address(enum protection_dom= ain_mode pgtable) =20 static bool amd_iommu_hd_support(struct amd_iommu *iommu) { + if (amd_iommu_hatdis) + return false; + return iommu && (iommu->features & FEATURE_HDSUP); } =20 --=20 2.43.0 From nobody Mon Dec 15 21:50:34 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2055.outbound.protection.outlook.com [40.107.243.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08E8127735 for ; Wed, 4 Jun 2025 06:14:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749017659; cv=fail; b=Q+eCIrDztUqqTPSQs0fBFuLSSGn2TTEfwJsNbIxm6Zix2438i4oOUCrvmXMO4pAXAJ8MmQsHIKMlkVfO8ZT+pQshe8NGaBk7fsdAZmCb8wHv7ZrlQt8ULXOiq2Lqny3lPNTMesIr4XnbesLjDDJNbKwXzLPh/SdBpO3MtMXabUU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749017659; c=relaxed/simple; bh=sWuqRpa8UH7ClvgUEGFHSRhEjJAOdvpopY4gh6NrVF4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=f9dsJ9e56xixMQO0g69Ece/H3TOEBcHSbgO85i3M0JJLCrswToZFp28rqbuRnWnH+b0iK9mt/NVzWbvoL8toJa3AFsQ2B1HIwgPE3/SO84o1dSYsC2oAFzxjnueBNWK5jiCq/BB/L3UMePjPufoDJEniCeoUTdD+VJGja3CRbXQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=WUUC57Sl; arc=fail smtp.client-ip=40.107.243.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="WUUC57Sl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lixYhH6EJ7gDeHh4CkcFVB4ll3OWzZmwHdeqqso6gAixnDRuqWdwLzQObGQPNMBQxNU4cCzkzhl1YuYiXudv7A2sz24pqgBd+g8/ImKuH4zSmjGmKGs68Qa4dDhQccWcVXWUne+Al1/LyNzGmWrpkc3V9gYJZyoaDyRxe4psPBvHMXvF0t+G4bXIwAI8AAsBqZUTXPzmXHjgFBJ2QzHk/eCWeXkI/nvIPbF1/S4EOZkqZqyqR1GsS6iWI5MA24KhvaHQNfQok2i/VJxilSLqMPeST9DmzQ//wG0LGISlGIHT1tPCdT8ZGcU5gdkYao3tPJi7bLdCHJOnK96byLRJ2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WKknU0F0wAoW11teczERtNB7+osUJZGcNOpLfWhQ/H4=; b=tOetnRBFMJn02diPpEDa0PpjpAZsS8G/73Jo/EZKKPqTKx7Te+IVkrAVDwJzPqK+LQkrn2x27+m+5yw2VE00ma6AVf3IcSlrJ+klrAdxUww+ZYB6AfXmGC4LS9cuPEJ9JgNMNUwnkXsocLMJ54EClws2f6xxGZ1dNM2npdVrH2xD4lvhjsIfBH/n1/sB3YzjaKwIpJIJVQLC4vgqSxXjRgtFNmR3fP+hPKSMN+TWlsD58s6nggwXX9MU4JAYKkKSH+vF4Eg1BKUcE9LvXAXIefU6yr+PPkIBw/YtZRx7aECSWXtsiNDjKd71qD6s5vLaCk1Q/jGC8g3ZsasP94JWlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.linux.dev smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WKknU0F0wAoW11teczERtNB7+osUJZGcNOpLfWhQ/H4=; b=WUUC57SlYYHlDDiPBwIfcHtTISzT7pR2kmeBlWugeZotk3/gU3bjw8XSQO0HLPoCskFQYx1VV4FLJ97k+o3W026X6lVqubi78A6+xApFW4XQy+v/Ut68rrPvde8rq3aeOHFw26FtTlOPQUL7qVOdday6aOm3hduEKyx7OKic1qc= Received: from BN9P222CA0021.NAMP222.PROD.OUTLOOK.COM (2603:10b6:408:10c::26) by PH7PR12MB7916.namprd12.prod.outlook.com (2603:10b6:510:26a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8792.34; Wed, 4 Jun 2025 06:14:13 +0000 Received: from BN1PEPF00006000.namprd05.prod.outlook.com (2603:10b6:408:10c:cafe::52) by BN9P222CA0021.outlook.office365.com (2603:10b6:408:10c::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.19 via Frontend Transport; Wed, 4 Jun 2025 06:14:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006000.mail.protection.outlook.com (10.167.243.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8792.29 via Frontend Transport; Wed, 4 Jun 2025 06:14:13 +0000 Received: from BLRANKISONI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 4 Jun 2025 01:14:10 -0500 From: Ankit Soni To: CC: , , , , , , Subject: [PATCH v4 2/2] iommu/amd: Add efr[HATS] max v1 page table level Date: Wed, 4 Jun 2025 06:13:25 +0000 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006000:EE_|PH7PR12MB7916:EE_ X-MS-Office365-Filtering-Correlation-Id: 3aaaa76d-d69b-4525-8fda-08dda32f072d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vC/YFkbyWTAxVf+8QGyaJguciJ+j7ZI0AKw7TYpYalQkjVUAqEZHMIBe3dNa?= =?us-ascii?Q?dGqWCcdew7/mkyht7LafcYSDCNPY0PRO6eXD+bmzGl93mp9FLjo/husIUrce?= =?us-ascii?Q?pEZYdNLQBrENGgpnoR8StART+kpdeKKM2apg0IXtDJyoL+51+h5QBPEFIVIy?= =?us-ascii?Q?Ih1xG9LvX+USIxlFZW32ePfMLrbEMOcARYw4pR3jTNI/RiH49HUdXI28IL8A?= =?us-ascii?Q?07yD7K19R9M2B1kwm03f0gLtigABI6tWk3GP/xgr4UWTQykJEboql6Ql4PRJ?= =?us-ascii?Q?uopvyVsp8EOYSY6QUxCh+tlFGcmgrrTxmqWc17NtE1/2ZA/B49EFYNZsIj9p?= =?us-ascii?Q?KDH7UTROSPw2uI33usyfiJ36yrl4z2+lPb8zCX7toz6vKV3lXmJTcuEUd/xY?= =?us-ascii?Q?KgsATunHvTpHdXmzoTscqIKEJTn0+YTeDp+S8rccOG0GtFc839KFStNYDNwu?= =?us-ascii?Q?F532LchJXh018rAZRfFn0IzXNWKspuJYuPHo2+9Q55IQFRLTAIPwavXqBjK/?= =?us-ascii?Q?HCPVtg9UpvAzV/Lz3wCc2/FaitTkEr4f3yHtPDGZ1Z7Dghis/CdqO/okYopS?= =?us-ascii?Q?8YseBpxG9sZXzEkCHi6SDaMo41NefVNPi4BVPkPy7/VXLr+y9WaT8+K+nBkI?= =?us-ascii?Q?tG2qvcQPougKbx/0urTvi2qGb+r5CcX7TQSCGxpmVsth7DlV2e4Ujc55uTGS?= =?us-ascii?Q?fF57QCegw7or9mwlMlx8OEfim6qXWHBBjFhGSs9ZaeV4SyDmkD7lmpl2ROEk?= =?us-ascii?Q?iqkSO3nO4mEtS742nWuBJK5nLVDQ1+tbbTsMruaen5piWOqnc9oz/z9nDhzd?= =?us-ascii?Q?j7TH6OrrG+y7ycEICux7MR2+qsg4qgK8Myb0Fj8I3yeDQSEhhM4D9U+wQ+zn?= =?us-ascii?Q?8NQRGy016L2bXaYq7/fkZaGxSgOe22iNU3czdLHhzIWEENcg3NCDyqSTelhq?= =?us-ascii?Q?w3xJcXaoTLU/H9bYSu6mYKuzIcL28rwOCoYjneElJp7etxQcS1QYDG2YzaXC?= =?us-ascii?Q?4RHzxOU+s8sTUGNj9Bv3wJ2kHPmg3CNql/HV/ENiJTX+A22vJI6LHw3CztfA?= =?us-ascii?Q?lvC51M1Rk51dS/LdZALRY8RlMTKWSRA0KZWUxbY8WafQhZYJrb/K8QcVSxFc?= =?us-ascii?Q?orgBD0VaGv7+c5kmuFvPmkHWZl/0EHMephL+ENHWaMZgVYSXO1PZxNp/zvxU?= =?us-ascii?Q?zoWB/xSucTRBYEjblDfsgv9OfzBdng0SJ5Do6ClWeuFRHM1/vlo7Qba738a7?= =?us-ascii?Q?YeePkCfNvrWUCzPfwpAjOVxmlc+GLRQEIvF6ECZ+FadHIWU0nM15eegVbJB2?= =?us-ascii?Q?Hg5HW4KcBH1yD6cEhlmX34x9kOPKJe9jmzFYHgGln7EaIlADAHXs9EZXQhKa?= =?us-ascii?Q?kcE0d8NJ9ENJmjZNZXKhrKpdFNdrkPSNfG4JgzSWPYGGVjkD+N8A6JHVw2HK?= =?us-ascii?Q?Ba60w3AHuMdyu7N6tel6r5t2EgeTIMqnQHCxn93Vqns77UifZ+BNEvD4mViQ?= =?us-ascii?Q?WgJhbxQTnYwaMekCjGmTo0R8mHyqi4I7fWA+?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2025 06:14:13.5261 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3aaaa76d-d69b-4525-8fda-08dda32f072d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00006000.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7916 Content-Type: text/plain; charset="utf-8" The EFR[HATS] bits indicate maximum host translation level supported by IOMMU. Adding support to set the maximum host page table level as indicated by EFR[HATS]. If the HATS=3D11b (reserved), the driver will attempt to use guest page table for DMA API. Reviewed-by: Vasant Hegde Reviewed-by: Suravee Suthikulpanit Signed-off-by: Ankit Soni --- drivers/iommu/amd/amd_iommu.h | 1 + drivers/iommu/amd/amd_iommu_types.h | 1 + drivers/iommu/amd/init.c | 16 ++++++++++++++++ drivers/iommu/amd/io_pgtable.c | 4 ++-- drivers/iommu/amd/iommu.c | 2 +- 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h index fddfad4a9009..0bf3744c7b3a 100644 --- a/drivers/iommu/amd/amd_iommu.h +++ b/drivers/iommu/amd/amd_iommu.h @@ -42,6 +42,7 @@ int amd_iommu_enable_faulting(unsigned int cpu); extern int amd_iommu_guest_ir; extern enum protection_domain_mode amd_iommu_pgtable; extern int amd_iommu_gpt_level; +extern u8 amd_iommu_hpt_level; extern unsigned long amd_iommu_pgsize_bitmap; extern bool amd_iommu_hatdis; =20 diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_io= mmu_types.h index 69291cef73f7..35ee7b0648af 100644 --- a/drivers/iommu/amd/amd_iommu_types.h +++ b/drivers/iommu/amd/amd_iommu_types.h @@ -94,6 +94,7 @@ #define FEATURE_GA BIT_ULL(7) #define FEATURE_HE BIT_ULL(8) #define FEATURE_PC BIT_ULL(9) +#define FEATURE_HATS GENMASK_ULL(11, 10) #define FEATURE_GATS GENMASK_ULL(13, 12) #define FEATURE_GLX GENMASK_ULL(15, 14) #define FEATURE_GAM_VAPIC BIT_ULL(21) diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index 5dda0f6d2492..1b4f4c324e9c 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -152,6 +152,8 @@ bool amd_iommu_dump; bool amd_iommu_irq_remap __read_mostly; =20 enum protection_domain_mode amd_iommu_pgtable =3D PD_MODE_V1; +/* Host page table level */ +u8 amd_iommu_hpt_level; /* Guest page table level */ int amd_iommu_gpt_level =3D PAGE_MODE_4_LEVEL; =20 @@ -3052,6 +3054,7 @@ static int __init early_amd_iommu_init(void) struct acpi_table_header *ivrs_base; int ret; acpi_status status; + u8 efr_hats; =20 if (!amd_iommu_detected) return -ENODEV; @@ -3096,6 +3099,19 @@ static int __init early_amd_iommu_init(void) FIELD_GET(FEATURE_GATS, amd_iommu_efr) =3D=3D GUEST_PGTABLE_5_LEVEL) amd_iommu_gpt_level =3D PAGE_MODE_5_LEVEL; =20 + efr_hats =3D FIELD_GET(FEATURE_HATS, amd_iommu_efr); + if (efr_hats !=3D 0x3) { + /* + * efr[HATS] bits specify the maximum host translation level + * supported, with LEVEL 4 being initial max level. + */ + amd_iommu_hpt_level =3D efr_hats + PAGE_MODE_4_LEVEL; + } else { + pr_warn_once(FW_BUG "Disable host address translation due to invalid tra= nslation level (%#x).\n", + efr_hats); + amd_iommu_hatdis =3D true; + } + if (amd_iommu_pgtable =3D=3D PD_MODE_V2) { if (!amd_iommu_v2_pgtbl_supported()) { pr_warn("Cannot enable v2 page table for DMA-API. Fallback to v1.\n"); diff --git a/drivers/iommu/amd/io_pgtable.c b/drivers/iommu/amd/io_pgtable.c index 4d308c071134..a91e71f981ef 100644 --- a/drivers/iommu/amd/io_pgtable.c +++ b/drivers/iommu/amd/io_pgtable.c @@ -125,7 +125,7 @@ static bool increase_address_space(struct amd_io_pgtabl= e *pgtable, goto out; =20 ret =3D false; - if (WARN_ON_ONCE(pgtable->mode =3D=3D PAGE_MODE_6_LEVEL)) + if (WARN_ON_ONCE(pgtable->mode =3D=3D amd_iommu_hpt_level)) goto out; =20 *pte =3D PM_LEVEL_PDE(pgtable->mode, iommu_virt_to_phys(pgtable->root)); @@ -526,7 +526,7 @@ static void v1_free_pgtable(struct io_pgtable *iop) =20 /* Page-table is not visible to IOMMU anymore, so free it */ BUG_ON(pgtable->mode < PAGE_MODE_NONE || - pgtable->mode > PAGE_MODE_6_LEVEL); + pgtable->mode > amd_iommu_hpt_level); =20 free_sub_pt(pgtable->root, pgtable->mode, &freelist); iommu_put_pages_list(&freelist); diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 8a9babd6dfa7..9c67f0be2b35 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -2534,7 +2534,7 @@ static int pdom_setup_pgtable(struct protection_domai= n *domain, static inline u64 dma_max_address(enum protection_domain_mode pgtable) { if (pgtable =3D=3D PD_MODE_V1) - return ~0ULL; + return PM_LEVEL_SIZE(amd_iommu_hpt_level); =20 /* V2 with 4/5 level page table */ return ((1ULL << PM_LEVEL_SHIFT(amd_iommu_gpt_level)) - 1); --=20 2.43.0