From nobody Wed Apr 1 20:42:57 2026 Received: from SN4PR0501CU005.outbound.protection.outlook.com (mail-southcentralusazon11011029.outbound.protection.outlook.com [40.93.194.29]) (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 3D55B3CBE8F for ; Wed, 1 Apr 2026 14:44:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.194.29 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775054692; cv=fail; b=taQW3cQaM/c77DtGDU69Z+V5w6FuVuhrC0L7TU5nfUX7XG/8UFNVWwmzEHayro8JY7kpwKAcXzLH2gXkL8wqAvi4J9xA1GS+ulSBkyX1gkpPtos+5lKv0g7qjxQOledk6WM52QPSBIHpdSbYnJaeJTLyOG3EiTF2CCW+zlQVRsw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775054692; c=relaxed/simple; bh=iXc7FVXWXRKnpPpbffl9xKW6hT2jetr/ar17IHjO6hc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pCDezyY6ajR+piSIASMRN/r/CFs6Wuj0TqAOR+3NBflu7fSOR2Dee39T5ENA5iQuzr8SrplCi+KFR/TM6rCynjukij8eQ8gTz7ngeYAn9irG9fV26L2wY/Iyge8rkEqCNU5fymepUiNbByCjEoOHyqz4lXvn49pThP/4zBuI2ZU= 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=hJlcN19F; arc=fail smtp.client-ip=40.93.194.29 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="hJlcN19F" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=By25Cf3M6oKqjhH9hdxUviZgm5A1jPtMofYW29w5QkOsuv3G8R2TWM8cn6ZGiTJ+vNpp4kzQyLtbU/3EbpoycjqJaFsjABg3EHYCnsfOXeMDkHMZku7NzefXhfffiXhHyt7yZIoxKlqz6Hb9ZIC7VukKUjrrSH/yi6VXTBTN0ItkYQBqIEojyC6KimbmdOZwHoEPnAxALsDj4vfzWFW1dQAdjpsQ1sX9a1veY4/+dzDsiPxd6/dXdB445qiqIIMzppBy6JSIoNHUY0AD7WH5G3fis0njKDZ588nuPIdzU+jzKgT1bY681zmqgg7/vhuwrTWK9ikhhst56aBnAPUHAw== 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=7Mi0Cu9/v4ZkvEpVxYTCGQ+TC3HaTjJmd2Cm2oRpe1E=; b=c+lLlj15ZdUhOr16tUdxt9Ldn2wT/L7lqn5DdIV9DJH4PoYzF1pG9Q8WqYvi2TWcTam3zYOluCcXtDu14L9p/KErxcQdRBfPZm3gpOp1h55ud0BgNmMa9S1QMtFIWScIIsCm1KtjAE0y0Vvlp7bP2Qp82cNGHzrGHbyUvtoGXxj/acvThkVZF0p9KSqGFGBgmQv2DPKVT2h+RIup3THAbef+evQTDdcWk4bjVWgWtJEUsv16tU0/41jvFNAuFPoJ00IUWk+OrAkCZbGTA6ogJm8tQzkY18jqAUYgwxM6JXS/ESdinJLxWeddS3HpUHXHDri9v01pRr70UctwC30utg== 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=7Mi0Cu9/v4ZkvEpVxYTCGQ+TC3HaTjJmd2Cm2oRpe1E=; b=hJlcN19FadqWyjldxEGrTF6SSadwRcpDHbz4o6DdckWZBI4c4lpccR3lHOUeNJayMq0TwQd5uyleiTfpvZ0s76yzxu4//ySMefaki/XpX4bgvodhtthNDlmLIDZrD25XVlq5Hx1t/Xb73Mf2RKY2Z3fq7ssTam15E3Tqt5NzK84= Received: from MN2PR16CA0062.namprd16.prod.outlook.com (2603:10b6:208:234::31) by PH7PR12MB6882.namprd12.prod.outlook.com (2603:10b6:510:1b8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.16; Wed, 1 Apr 2026 14:44:47 +0000 Received: from MN1PEPF0000ECD5.namprd02.prod.outlook.com (2603:10b6:208:234:cafe::47) by MN2PR16CA0062.outlook.office365.com (2603:10b6:208:234::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9745.30 via Frontend Transport; Wed, 1 Apr 2026 14:44:46 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by MN1PEPF0000ECD5.mail.protection.outlook.com (10.167.242.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17 via Frontend Transport; Wed, 1 Apr 2026 14:44:45 +0000 Received: from BLRANKISONI.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Wed, 1 Apr 2026 09:44:41 -0500 From: Ankit Soni To: CC: , , , , , , Subject: [PATCH v4 1/3] iommu_pt: support small VA for AMDv1 Date: Wed, 1 Apr 2026 14:43:55 +0000 Message-ID: <62cb55fdc5e08dceeb6d740cb73f75c6bce36226.1775045213.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: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD5:EE_|PH7PR12MB6882:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ec7f486-486f-4deb-249d-08de8ffd37c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700016|1800799024|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: h4XP+K5/BTDIIhNhxs7+8MlmlR9QtQewe7abf/uHPw8i/MssT/FyIHtMUt2Det14E7Vm5SLFHtEWrVTAWJJXwN6OzkqPLq9mJeebrtA+FHYFdvIztl1G93zxbpHapN8zzKWzok2yS4co/GDogpXxsivufScJMD7etNi6XHwY7Supw0NLFDac7WUl1gJdHfXHw3fjMjGPm9ry84l95oNk1TS3kAGaXAwtXZ64NZRvvqK8H2jyCYD+0Os8O0v4CbXIBpcCKmNd0HGy+eOXBqKbgAezP8U7HLDAphp2KIiJGKxXZYu1gBWGBAtkLGFhKkoBGI6gTDNya24cBvpI0AQOr98Ib3mGngjjfEC/m2CAvOOhhmmq52a/S9h8CtjA5qHUP8GwEOdqOq74H8eB01+32sMHysB+jTqn1GxRCeqKWxj562rY3SVNMDt918yPGZ+86CbRvWZz5oNd+YTcOj4CVkHG3n3FF3/vm58spJhhyIE9IN3XRRj+Hk99y8zHNVv7/ZWuD0/sOdmtclucCzA1h8FQ5Cj9QyTIwRMIKHfijMkWeS+5jz/JjHSXBSkRGDJP9F4gkDftQHvGEbG2TgYPWDFNyNdYFgB5oaAtEKLEhR8X/pWc3LswM2th3TThDHCRdT1hUOchAAiLmwhW2q/IiKRVtIczjNHUTRhd4WYK3y1s3WqZxYkjEHmLja2+vl6J55Jj3dLRIaXl6YHdca6HMVlJH+CngYzVw8nhqShpoYTDE0WWW42w3Hd1pSQVrnxVTzCqD0peT0pbjmYEyEZdVw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700016)(1800799024)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DwXUCDR4TvYfFH/rszM4IBjcS6ktC6B1yM9v1lvDC5MP2FP+ayC2O7j4kC3XwdNCZJLz0uW6mhV+0X9pxYwsmJ3sfweOl2sEfr/px0sYflHnhUKCXW/HPhVD4F2WVsAal8NMwlsXAzcFbjnLt9H98WNo0PaMuT5a/dK1eO8BhZMb2ZqUncwiuzomeHDjzLxjOy6iHMtLJW6reNVO3f1C07U7Tno7rwWUGUplLKepZzxTeVIVRoY/pH4SKS200rHN/YPdMxKCpQChwJnF1enUV4kybitWg1KWWKeHVOhu4BwhBl9UICTzhCEGSXA7Yw31I/NVBipw0ehEJDaflyLVw/TjzVLlkeF9qcmmZOMBmCn4dyyGmpx29HnN52pnlnPwpw9BmO85Rqomwsoncf9gS9cZ+8kObJ+oAJ7qVAYw7ClZHOiZYVTLpwXy4EHl3pG8 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2026 14:44:45.8099 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6ec7f486-486f-4deb-249d-08de8ffd37c8 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD5.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6882 Content-Type: text/plain; charset="utf-8" When hardware/VM request a small VA limit, the generic page table code clears PT_FEAT_DYNAMIC_TOP. This later causes domain initialization to=20 fail with -EOPNOTSUPP. To properly enforce the domain VA limit, clamp amdv1pt_possible_sizes using the requested max_vasz_lg2. Signed-off-by: Ankit Soni --- drivers/iommu/generic_pt/fmt/amdv1.h | 4 +++- drivers/iommu/generic_pt/iommu_pt.h | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/generic_pt/fmt/amdv1.h b/drivers/iommu/generic_p= t/fmt/amdv1.h index 3b2c41d9654d..bc04d482c12f 100644 --- a/drivers/iommu/generic_pt/fmt/amdv1.h +++ b/drivers/iommu/generic_pt/fmt/amdv1.h @@ -156,6 +156,7 @@ static inline unsigned int amdv1pt_num_items_lg2(const = struct pt_state *pts) static inline pt_vaddr_t amdv1pt_possible_sizes(const struct pt_state *pts) { unsigned int isz_lg2 =3D pt_table_item_lg2sz(pts); + pt_vaddr_t raw; =20 if (!amdv1pt_can_have_leaf(pts)) return 0; @@ -168,8 +169,9 @@ static inline pt_vaddr_t amdv1pt_possible_sizes(const s= truct pt_state *pts) * 512GB Pages are not supported due to a hardware bug. * Otherwise every power of two size is supported. */ - return GENMASK_ULL(min(51, isz_lg2 + amdv1pt_num_items_lg2(pts) - 1), + raw =3D GENMASK_ULL(min(51, isz_lg2 + amdv1pt_num_items_lg2(pts) - 1), isz_lg2) & ~SZ_512G; + return fvalog2_mod(raw, pts->range->common->max_vasz_lg2); } #define pt_possible_sizes amdv1pt_possible_sizes =20 diff --git a/drivers/iommu/generic_pt/iommu_pt.h b/drivers/iommu/generic_pt= /iommu_pt.h index 3e33fe64feab..a3dc5cf14aeb 100644 --- a/drivers/iommu/generic_pt/iommu_pt.h +++ b/drivers/iommu/generic_pt/iommu_pt.h @@ -1125,10 +1125,6 @@ static int pt_init_common(struct pt_common *common) if (PT_WARN_ON(top_range.top_level > PT_MAX_TOP_LEVEL)) return -EINVAL; =20 - if (top_range.top_level =3D=3D PT_MAX_TOP_LEVEL || - common->max_vasz_lg2 =3D=3D top_range.max_vasz_lg2) - common->features &=3D ~BIT(PT_FEAT_DYNAMIC_TOP); - if (top_range.max_vasz_lg2 =3D=3D PT_VADDR_MAX_LG2) common->features |=3D BIT(PT_FEAT_FULL_VA); =20 --=20 2.43.0 From nobody Wed Apr 1 20:42:57 2026 Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012071.outbound.protection.outlook.com [40.93.195.71]) (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 6837D44DB63 for ; Wed, 1 Apr 2026 14:45:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.195.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775054713; cv=fail; b=OilssE6+aSYTIBiC52EtxzSrpyBEOU++LGWCfmCvaQu+S5Xx7BG1WsJSFJtgv0IICFKYK0m0iU909k2YeZaCRkg4dQvA/QqKXR300RRgFACwX1tJZsx/kr2Ot4ABNfpKcQjyZvhxGd1SyjMw2Va0BUC58ln+QJ1jeMvg3KVKeuU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775054713; c=relaxed/simple; bh=DCZKDMuZY4tOJ6i9+VXlLtdnUe/gKwAeovATWsAcuPA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jSL9HDVRkFNkI0sToPc6YUYQ9IJTFc/L+70i+xsLjyU1TwIYe4D9q4gF5UV+KFKmWf5pj7n3qxrAoHC66N3s6qGC6DNw3yfRwlgmDhVAFxiBR8f5TP3hxjeecnSCfgoDW1MOq9+WHCWn+L8rtp8sB6Henvw+UUvPqoXZm4czIlA= 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=d9HWj7Fd; arc=fail smtp.client-ip=40.93.195.71 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="d9HWj7Fd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ix9ytGMPeTTKzqsTMV3sNc2TgX7it+2sOQihAN7s07Vw3u2z7oBC7JJDxOepEzXxocaRUIoWOOKQaIG11y64gthmSoRVQ8zzWZlNhlKHwJRFfriDDPHe/3isFjCd2WSRFqoqt5tVakvnwz112b3pDZiDWC/0KRrZI2bHvaITRpwMfsnwc4bsZP0OsCQqWpKm/hVVBn7mjpKzTmIr8pXtxE39j72NWoMKOb5u4gZIUMzzBioJvctpbtMDuHXN6kpZ8tthNWFwq+8SCjA2x/Ub90ufZSCQMxSmMs/F57k1/qo6K86rKx4Kj9SFbcDEG8rWtJE81VNxbTMOfc3mUMjgIw== 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=gMjgv5D/NxjIEOm2CnE6AxkkfyAd4I2Bc/iOPjfFCPI=; b=D2IBhzHlkKLOH9ytUcSud06dSoQL/n2wZAsAP7lPhvrkhd6QmOr+pJUhzYhYE/FRaz6GoaFC8NXRoZXoxWemDhIwU7T052lt11FSElbZ0UHu0eWCy55prpbnaaiSkrDG3Aa6cbvW/JilapMv3FXxrqZ7pqI8msK5mLgvu4I2k6cYHHJjwZrYADCPtEPWGjPY93CCCx+i50jugJFlSf1xMHatrWXx3Eb3aeepTDB7UQb2ufjf8xa84M9dk/yS3bwcSMGdqNpH2P/BhM9VeE1t53fkOSf30lMHIRvDcCt3l4bSjodNTaB2Z89OLZWIczKbGo6SnXU4HMNbnu4VlC9kWg== 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=gMjgv5D/NxjIEOm2CnE6AxkkfyAd4I2Bc/iOPjfFCPI=; b=d9HWj7Fd17PHHNhyHmYVwPbK3vrb9Z654dYvnvHnzmNMvDIVW178gCc2MX+e2fNhuKUxBTkvn4uo8ewVQdn7PBmtmBmKq7rvZzGB0b77rVWifCtpajRz71r1e0yP9+yvw0Yt8XQyOqYD41V0qrF/oS2NqoIXjA/vG823VBHs7/U= Received: from MN2PR16CA0037.namprd16.prod.outlook.com (2603:10b6:208:234::6) by IA0PR12MB7627.namprd12.prod.outlook.com (2603:10b6:208:437::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.18; Wed, 1 Apr 2026 14:45:05 +0000 Received: from MN1PEPF0000ECD5.namprd02.prod.outlook.com (2603:10b6:208:234:cafe::2a) by MN2PR16CA0037.outlook.office365.com (2603:10b6:208:234::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9745.31 via Frontend Transport; Wed, 1 Apr 2026 14:45:12 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by MN1PEPF0000ECD5.mail.protection.outlook.com (10.167.242.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17 via Frontend Transport; Wed, 1 Apr 2026 14:45:05 +0000 Received: from BLRANKISONI.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Wed, 1 Apr 2026 09:45:01 -0500 From: Ankit Soni To: CC: , , , , , , Subject: [PATCH v4 2/3] iommu_pt: add kunit config for 32-bit VA (amdv1_cfg_1) Date: Wed, 1 Apr 2026 14:43:56 +0000 Message-ID: <993efc6aec604ca6c7e706e5faf7ee216e70ce2c.1775045213.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD5:EE_|IA0PR12MB7627:EE_ X-MS-Office365-Filtering-Correlation-Id: 595a4dec-149d-4e19-6469-08de8ffd43a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700016|376014|82310400026|56012099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: qsjgQ8NXGUir7KTwWKgT0OH99tpT+H8JGoUFd01TNJxgGxVq8PJ6Ca5Bi8KAQOv2ymZcs11PfJRQoucsKn02cjQ6AaxtoQMLKV/BZgo1z+h+E2+NEJzJRyTpFC2W2MFgWhQyKAqVJk/YoMY1oHvgbfYWv6fQCM+dgPQPgs+a7Cd5Q9fjEOtV85hg13GK0G3GP07eNA0IX8YykzBqXeSW1mVlG+LVkva/czqt2F83wLm5Adjx79SNEdM7hlNgq83hYHPApOSxP8+2mhhjkr5l4HgWR0EPyKsQtgZxhxus4JrY8VC98vPfOocW77H8O5z5erfuUfewLlWl4aps4yd6J7iZxNQ2ZcVruh4TdszcpY/Eo5S8Iv3MA2QFnJqdfoqzPus/GePlL1JskX/7pmgIlgct30bApRJaeo0ZF5Fj26+yaTMxLOUhr8H8mEsn8eFk4s8n0lzqj9PBUh7XIibEfh5Xnxokp1qNkgTBSRUS0yh4CLjsYpU7GNdDZyBggu1wqvELe+glmupnINcepjobOtS4lsICw48ejk/w6XHqkwJZOQu0sqmlTDIhgepc7Tn/87jwJJfH5zXqxotUhkTRIKSFIXRnvujHMSZttmmYQ0IAVhC3CQRsi8LZbv6csjQoY3ur4o/Za2DKzshxnbvu3LwezMBFMgT6U9prKZ+EppZuDPuXcEsnU1fbObdb+1q2VTRk9fcvOVyaWrWq29a2y1H4rLp9zJTTTWTBnQby7GOlbm/u6r93iSONtBptu1eixeeLhF3MCeYbYITaDzhNkQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700016)(376014)(82310400026)(56012099003)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jROovE6pFbbaSF6QxNAr21yL9ynbi4EUWFHcN0x7LPYybSMNgXftT1HfCoCXFlJoHGdclXsD8vLGr2W2XOIGSXNqnZ37qJy6qUySMrDyQrTtjRHRjAuBJP3L5y/m/4uV+Xlszs2u/tLMcJ2jgxjUgSRWgwzANQMdchRaMgvMYQsQTev+E4C/uUuVqs869dNRMhSaHkXvOduHvnPOpnNuhbjG1LNI/wvIh2bja7xlMK3KDrKcrrf0lFRYnc7tG0xFZNhsx6NL1dBM0wLEe1pd/4lb0MRSill2JuIRCQ78bOueUqYADwF0fnqAsVwuKGAJml04trsrim6XKLyni0GmLPG7/kpzmIdcO+Wh0bBpMXcpFVMfKKVTArfchj6L6fTCtJFe80F8iCX0Ia5mSXXFDIuyfGH0KPHe5YUtmvB3bCCpQkH9qxvDIAkOBZA19sUb X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2026 14:45:05.6887 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 595a4dec-149d-4e19-6469-08de8ffd43a1 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD5.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7627 Add test coverage for small VAs (32=E2=80=91bit) starting at level 2 by ena= bling the AMDv1 KUnit configuration. This limits level expansion because the starting level can accommodate only the maximum virtual address requested. Signed-off-by: Ankit Soni --- drivers/iommu/generic_pt/fmt/amdv1.h | 1 + drivers/iommu/generic_pt/kunit_iommu_pt.h | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/generic_pt/fmt/amdv1.h b/drivers/iommu/generic_p= t/fmt/amdv1.h index bc04d482c12f..289c1c010e18 100644 --- a/drivers/iommu/generic_pt/fmt/amdv1.h +++ b/drivers/iommu/generic_pt/fmt/amdv1.h @@ -406,6 +406,7 @@ amdv1pt_iommu_fmt_hw_info(struct pt_iommu_amdv1 *table, static const struct pt_iommu_amdv1_cfg amdv1_kunit_fmt_cfgs[] =3D { /* Matches what io_pgtable does */ [0] =3D { .starting_level =3D 2 }, + [1] =3D { .starting_level =3D 2, .common.hw_max_vasz_lg2 =3D 32 }, }; #define kunit_fmt_cfgs amdv1_kunit_fmt_cfgs enum { KUNIT_FMT_FEATURES =3D 0 }; diff --git a/drivers/iommu/generic_pt/kunit_iommu_pt.h b/drivers/iommu/gene= ric_pt/kunit_iommu_pt.h index e8a63c8ea850..ece1c9b8c55d 100644 --- a/drivers/iommu/generic_pt/kunit_iommu_pt.h +++ b/drivers/iommu/generic_pt/kunit_iommu_pt.h @@ -112,8 +112,9 @@ static void test_increase_level(struct kunit *test) if (IS_32BIT) kunit_skip(test, "Unable to test on 32bit"); =20 - KUNIT_ASSERT_GT(test, common->max_vasz_lg2, - pt_top_range(common).max_vasz_lg2); + if (common->max_vasz_lg2 <=3D pt_top_range(common).max_vasz_lg2) + kunit_skip(test, + "max_vasz_lg2 fits in starting level, no growth possible"); =20 /* Add every possible level to the max */ while (common->max_vasz_lg2 !=3D pt_top_range(common).max_vasz_lg2) { --=20 2.43.0 From nobody Wed Apr 1 20:42:57 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010023.outbound.protection.outlook.com [52.101.61.23]) (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 3D3E147AF5D for ; Wed, 1 Apr 2026 14:45:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.23 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775054729; cv=fail; b=mONFiNHBD+BJy2xCOqSNExY+u9AZtLQMnzNloOCCCCJVJjaWRLFfifgSd3hqI9q5JI9C6yaoiL53axhVork/rxA8hodOUU3jYb4DF5AGNSwM+q6EEAeOswbMz2oEJuo8Ot3mmtum+/nvGmkAYOnmAdw/SWtzTJ1ydw45ugZmejY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775054729; c=relaxed/simple; bh=2lzbzujy6hfcDVy8JoyV4li/VYMz7hxgC2z01rLpwUg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EgFZX3QLeMlNii/7jvnWthY9XRBIn9Gl7OExgOvWfRNY9BPwc3e4IWXpZLcQ3F+Lq8aDKr+bxyn7mNCqQg3U7R5uEqgD1bFDSxNZ/1nCZEqRh75jbK2Ck5ejCrFC8/VduqrkTF0GyiruXh0Kqjdib8tqqpYNBhqV7VpiDFYGNxA= 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=V44MaoX0; arc=fail smtp.client-ip=52.101.61.23 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="V44MaoX0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EQSEVnhCZyO7JHK59kqxOXRBWGsT1JllsBk0wOBEObFNm1oZ1y5miIoPyiamS19CXeYaiFL0Uw8GdcUf6B6DnKrUn1SwPwVfBKntH0NedC4bCfTQ4NrnarDi3AWs5pZj5O9bPa3ZbTMaswuJG8vOlOq4Dhw9EiQ7oTq3i9mHfKtEEkxFLBE1mNn4k6fVlT8fMmCdW78xVw3XrWJuHk4qvNP12QPdiWXny8lONbpDG5Ilm0T4+JTPaaFNi7U4MbpWD5OycYfye1NkpX2upS8h3mBrPczofYqmpBcDNLGNmeLG5rFGxxKexRlZSVtr5+cCtucepFn3pwCA6CcFmWbcog== 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=bidcYRQU1gsKoST20xMV1wt7Ww3RkNqewVjbg0yrmn0=; b=WMoQEPTF5Mf5urgKGC18JgJP74/YTm1kIbU6w5Nv04gCjSPJx3TAFAfaPtnJTZuKAeaCkGfUP/DQ+Fu9k0PtmaTujSYCdxhqNhYkvUkXyBHgOC8P89K0BfvNaHipZrIOmtxAXVymqh5LKQqrpiAUYPBWTyOA49yAgXx9rvjBnRnw10yhKyrOfZ0by+bvaVLZoXELAewEHMVlXK0wC8aIXLleKDucmkwboZmFWIzvMOdVPjMyeYvyh1qq3DJ+K2oZqMuC0oHBlNdKUa92K/Ta9Um51l7cpVlNIg3VaSZtUrVhWL2GAwpr1UnDPGDvmgaHu9W5YYaQJd/R699yzx/PfQ== 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=bidcYRQU1gsKoST20xMV1wt7Ww3RkNqewVjbg0yrmn0=; b=V44MaoX0SV1XPzqbO7b/NeJ1dzs2xnv9uyXkvKe+6PTAxiq5xTDuWsTHFxrLhmGlqvzoDuxomSvzb2tyHWajl1UxJ2VXkGje3ivtMh+7bNZMmv1Rz74HJyHhFxglHce53w31v1Bzl/JTx+Q1X0r1HdFwtffiPuo6yj4xjSRd/uU= Received: from MN0PR03CA0010.namprd03.prod.outlook.com (2603:10b6:208:52f::7) by SJ2PR12MB8717.namprd12.prod.outlook.com (2603:10b6:a03:53d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.18; Wed, 1 Apr 2026 14:45:24 +0000 Received: from MN1PEPF0000ECD9.namprd02.prod.outlook.com (2603:10b6:208:52f:cafe::b3) by MN0PR03CA0010.outlook.office365.com (2603:10b6:208:52f::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9745.31 via Frontend Transport; Wed, 1 Apr 2026 14:45:24 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by MN1PEPF0000ECD9.mail.protection.outlook.com (10.167.242.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17 via Frontend Transport; Wed, 1 Apr 2026 14:45:24 +0000 Received: from BLRANKISONI.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Wed, 1 Apr 2026 09:45:19 -0500 From: Ankit Soni To: CC: , , , , , , Subject: [PATCH v4 3/3] iommu/amd: Adhere to IVINFO[VASIZE] for address limits Date: Wed, 1 Apr 2026 14:43:57 +0000 Message-ID: <61a1bbd81b2437ac96e0c26f50e07d136bbfa6ee.1775045213.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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD9:EE_|SJ2PR12MB8717:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f1bf036-e3f1-40e2-b0eb-08de8ffd4eb3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700016|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: ocKmWqB+xR/rfCB3489uCX04YSliTmTjdptYLHa8yfkWzGYwe5YRmWJfw0XZQKD1N0bVr7no3Ou3RDwYzlSaMEvFDVJpNHhFTFGC+DkrQP0HdArqED8Lijz1IWqDuxuBp0QOc7l5d7RVv4+U92HrshxXnS5/eY9sIzMCENPJNOTirFKxken0Q8AbJ55eiOUisNoQlwruh/s1TtuCwu5nehPm+zcgno97tDJqTsEFCAlPOtVqwq7NA8o9H6ViMkwXqz6ukvQwvrQUdDm+BI98/McNLNdXttDLdaHFnJFjkNt/9ZJmPtxGXUuv2ImisOR6jxuMKFWnVh56I7HofIjCvyKoHeH8tmbiheD4K9d0KdS2EOMQUjL4QHTdoX7+zvekDBWHmCwn8qLKiruueCecRDborWm2f9K3j3VsJ6Qh7klieVwmmLZb+UB1jIccILzs1G5/P6xSWuerkytoFt3xW9N2EPfGPcGNNR6GdrQUG9OvcUoFjrVxPvkZun2SGHUbLvbEaKcToTfvK2oU9G19MIhXJXarOevszeysQmQ/SS4sb97wlPoNC7TBjv7taraODw5P/4kq8r2748CAsOGJdPtn8622TCWfoTdruC79YR4rMoYXxdS2Bfkc54p/khijBfrdOKYqvogQVaQduQdDbmDObmoVntxqRqRdwaYyB0Crx6VWZ1b4lYbtejhnCib4aPbFwbKFiilQCmTcJ+XEkVDVxLn1ONE3C0dEWP63Nt2gseiaq6uJQ5csovTRM+8888ChHsBMSw9iOJquFjAaqg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700016)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 62DVe9geD/i2oWhnc7hJy751iB8neLLUp3VhAUdAuLRjRd9kJWnlmCPE8It+gKDMVTNIAdr0Cwz34C8BN9EurWsmOoKDEh4RF/fTbskNOiAhLOfeMxpWcunMUIlXhA1vUOElH0IcA/Ufltjqd0dRyA7Bi1PTEq7qob0RcVJP2Qzoo4LzBDPIh9AxuVRjoTRgQ+AQFQkTQwTTh7WJIJV21T0no0iN06QC6XPp8V0G42yYzcp/eL1W9BYAnRA0DzLyYvkrSXYWRbx26bo0vd84XMnMgvQTqDO1vfEGn3POH0g5KI7estx3uHKi7yiR+0Hnl64WiIOl3tjqhYx8TvgHFDKqFPP2X23JTH4Ffmmypl8fU84aAkg0Iw6Omf1u8SZd2f8XDPUmd43+tQ99CzfaWWvoiQ8tA942Hmuc9ROOWYRoYro8zAW98xBk5T7WT1Qv X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2026 14:45:24.2643 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8f1bf036-e3f1-40e2-b0eb-08de8ffd4eb3 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8717 ACPI IVRS IVHD=E2=80=99s IVINFO field reports the maximum virtual address size (VASIZE) supported by the IOMMU. The AMD IOMMU driver currently caps this with pagetable level reported by EFR[HATS] when configuring paging domains (hw_max_vasz_lg2). On systems where firmware or VM advertises smaller or different limits, the driver may over-advertise capabilities and create domains outside the hardware=E2=80=99s actual bound= s. Reviewed-by: Jason Gunthorpe Reviewed-by: Vasant Hegde Signed-off-by: Ankit Soni --- drivers/iommu/amd/amd_iommu.h | 2 +- drivers/iommu/amd/amd_iommu_types.h | 1 + drivers/iommu/amd/init.c | 13 +++++++++---- drivers/iommu/amd/iommu.c | 3 +-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h index 1342e764a548..f915938a3a08 100644 --- a/drivers/iommu/amd/amd_iommu.h +++ b/drivers/iommu/amd/amd_iommu.h @@ -41,7 +41,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 u8 amd_iommu_hpt_vasize; 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 c685d3771436..6a85a38d34bd 100644 --- a/drivers/iommu/amd/amd_iommu_types.h +++ b/drivers/iommu/amd/amd_iommu_types.h @@ -395,6 +395,7 @@ #define IOMMU_IVINFO_OFFSET 36 #define IOMMU_IVINFO_EFRSUP BIT(0) #define IOMMU_IVINFO_DMA_REMAP BIT(1) +#define IOMMU_IVINFO_VASIZE GENMASK_ULL(21, 15) =20 /* IOMMU Feature Reporting Field (for IVHD type 10h */ #define IOMMU_FEAT_GASUP_SHIFT 6 diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index f3fd7f39efb4..e874a4135d5c 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -152,8 +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; +/* Virtual address size */ +u8 amd_iommu_hpt_vasize; /* Guest page table level */ int amd_iommu_gpt_level =3D PAGE_MODE_4_LEVEL; =20 @@ -3188,7 +3188,7 @@ static int __init early_amd_iommu_init(void) struct acpi_table_header *ivrs_base; int ret; acpi_status status; - u8 efr_hats; + u8 efr_hats, max_vasize; =20 if (!amd_iommu_detected) return -ENODEV; @@ -3218,6 +3218,10 @@ static int __init early_amd_iommu_init(void) =20 ivinfo_init(ivrs_base); =20 + max_vasize =3D FIELD_GET(IOMMU_IVINFO_VASIZE, amd_iommu_ivinfo); + if (!max_vasize) + max_vasize =3D 64; + amd_iommu_target_ivhd_type =3D get_highest_supported_ivhd_type(ivrs_base); DUMP_printk("Using IVHD type %#x\n", amd_iommu_target_ivhd_type); =20 @@ -3240,7 +3244,8 @@ static int __init early_amd_iommu_init(void) * 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; + amd_iommu_hpt_vasize =3D min_t(unsigned int, max_vasize, + (efr_hats + PAGE_MODE_4_LEVEL - 1) * 9 + 21); } else { pr_warn_once(FW_BUG "Disable host address translation due to invalid tra= nslation level (%#x).\n", efr_hats); diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 760d5f4623b5..c18252a2c857 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -2712,8 +2712,7 @@ static struct iommu_domain *amd_iommu_domain_alloc_pa= ging_v1(struct device *dev, else cfg.common.features |=3D BIT(PT_FEAT_FLUSH_RANGE); =20 - cfg.common.hw_max_vasz_lg2 =3D - min(64, (amd_iommu_hpt_level - 1) * 9 + 21); + cfg.common.hw_max_vasz_lg2 =3D amd_iommu_hpt_vasize; cfg.common.hw_max_oasz_lg2 =3D 52; cfg.starting_level =3D 2; domain->domain.ops =3D &amdv1_ops; --=20 2.43.0