From nobody Fri Dec 19 04:17:26 2025 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1747390030; cv=pass; d=zohomail.com; s=zohoarc; b=ZM7QICut/sMSePX3vUsY55fu0CrvhCQxvfCzHphvyw992qGaLVcJuQHt1Mo8czPlgV0UL4BtxfH4wHzmoJQFnZlX2501lUet+NpQvG8qF6Ms56w13XVYVnOljNL2sNaVVr3ynZSbHErHu9Ph3d4XrJa84Z9SfgpRhGlEc/tr3dA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747390030; h=Content-Type: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=4mx2BKDEo3zrHxtC7Tzxai4k36XyrRQyMUuKrCGRIq8=; b=UWxPNbEZxiXMo7s9r0UM4DbdQRjrrhTINotDAnCLX3AluL6j3/Tm/e4tQHibZnOPJzJaruw4Zc8bYcum/jGnu5HWW8Cq7scL2JFDG88kgcaaWVWds8GOuoTMXSAiB2rJd7DIVavB7GLpBvPknu2R0rBTrGnNsW6O2lVPFXfsSVI= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1747390030006833.0600066319145; Fri, 16 May 2025 03:07:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFrxl-0007uk-VC; Fri, 16 May 2025 06:06:45 -0400 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 1uFrxZ-0007n1-6w for qemu-devel@nongnu.org; Fri, 16 May 2025 06:06:34 -0400 Received: from mail-dm6nam11on2061f.outbound.protection.outlook.com ([2a01:111:f403:2415::61f] helo=NAM11-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFrxT-0006tW-EW for qemu-devel@nongnu.org; Fri, 16 May 2025 06:06:31 -0400 Received: from PH8PR02CA0007.namprd02.prod.outlook.com (2603:10b6:510:2d0::18) by SA1PR12MB5616.namprd12.prod.outlook.com (2603:10b6:806:22a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.32; Fri, 16 May 2025 10:06:22 +0000 Received: from BY1PEPF0001AE1A.namprd04.prod.outlook.com (2603:10b6:510:2d0:cafe::59) by PH8PR02CA0007.outlook.office365.com (2603:10b6:510:2d0::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.16 via Frontend Transport; Fri, 16 May 2025 10:06:22 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BY1PEPF0001AE1A.mail.protection.outlook.com (10.167.242.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 16 May 2025 10:06:22 +0000 Received: from BLR-L1-SARUNKOD.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; Fri, 16 May 2025 05:06:18 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Rg+kAEAfpV+C3zmdA3LP9qsgYV8A8ftMIzZnHnWEfZKAIigIICjkocyKohg8a/XUT+fVOQwgDJhRBkPErLBJ52Hs1g8cBPL8LJTdbmRVVX0yvwiasG0Nh6aJ06bO4UgLQjQnFNphpZ9BVE0XvRP1k0Na3qVf2FxR3C4WOmxxai8/XdAzaXxB0vqRQVRgRh4s+pR9SBChCP1njnnZgSA473cAdcoPYgk7osHokERGEIS4ZnBu3iwKl1PjvI6C+ADyIlkceoDwyUTH0+6w3E0Nam3y7fETm1NQdavGxwd74fn3EhywAcPfKauImFrNzG8qjDEGVaZTf7NhDdPq7JhduA== 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=4mx2BKDEo3zrHxtC7Tzxai4k36XyrRQyMUuKrCGRIq8=; b=jbbDAbQcpoKzkWgg0Bjdv7h3nqzpslTheRPGwHvZo80pBRi6NGKZ8rh8Zt3CmJIF3CPfGqBcufeOUcNS5AAfb8yR1+EoqBC2jqOqSfC1kVEKppkVI8kTTY1totAtsZWWO5IgDPpfEA/aKH0QGv3bOwA9jeNaQM3XN6JBbOFGRJK7Fli2znuhdxx5g1DHeeOh6/+v716XSpiwo6yfSdwywl11ZpywwcfSruRiCQXSPgM/rTfT8JurVi7YsTxDM5t43rvYIRpml8ArEXXagX8mlAmUssWBHwFN5OohpK4b38LZMAFqHnUwOZr0AE5xyYI5wNaac9SrbIhZfMSZD44JZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org 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=4mx2BKDEo3zrHxtC7Tzxai4k36XyrRQyMUuKrCGRIq8=; b=hyBRi24Zx9Gi0v0iXJTX1N0sAEsaaYptRQ8YMz0Yvdlcil9bR9nHvcZqbDkan/EUvUJN0sno/71BZkv5PR9zy/PdbSXe9YCyr9mpOOQuUOzC9LqzorFG/S1/NhTnOYEROE4i8v6ZbqNSzicWv+lVQi0fw3DDSBaxp29Mgna14Kk= 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 (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 (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 From: Sairaj Kodilkar To: CC: , , , , , , , , , Vasant Hegde Subject: [PATCH v3 1/2] hw/i386/amd_iommu: Fix device setup failure when PT is on. Date: Fri, 16 May 2025 15:35:34 +0530 Message-ID: <20250516100535.4980-2-sarunkod@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250516100535.4980-1-sarunkod@amd.com> References: <20250516100535.4980-1-sarunkod@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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: BY1PEPF0001AE1A:EE_|SA1PR12MB5616:EE_ X-MS-Office365-Filtering-Correlation-Id: a1e33f2e-183b-46dd-fb2c-08dd94614f8b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?E5Nd1ZrdsX3TxJi0U53yso6XXK4NAgZauAcK2qAOjXJzytcrP3+YvclFGp6v?= =?us-ascii?Q?pzCZIYL8vCBlSdquUCuMVMgdgDtd6AVtxaCj1ptr7+9DkHerG8PPd6wAiVIB?= =?us-ascii?Q?zf0SiNYHEQbVcJUsFoItsJV9D3494rz0xkA1xSX496e2P3vsEjqANihA/3v9?= =?us-ascii?Q?D0NBef7geAKJ26LKH2PHDFA6z3pzzq8OWW/78gzj6JOPZgD85yV7DQI9kQfm?= =?us-ascii?Q?TancLEmL7Tk2y/Nm0X1yy5iJTJ/+sjNrkvhaNJYaj95xwU+NgZWpChb0OLTz?= =?us-ascii?Q?LLT4CCl/2f7pzdzrFIMXdkF1wyj1JJv92rWsbTx7WMLq8LW4RJOeN2y+6iyW?= =?us-ascii?Q?MWBqjmQMeqeWcLLlIKuoSVfDhMPi1KeAKjaWGZW20o/00QDaPXK/bSsth7aP?= =?us-ascii?Q?wSxU+HIccqLakam6MDw/De0n41iUxnyuzvpm35kJpl24kMgTpew+K/GQMLb2?= =?us-ascii?Q?X0G1MpvPSw4it2mlyjoyJ8BB/9qMR5BmCktXb3Eda4hzVcx69G8gkq8iChI8?= =?us-ascii?Q?sWOi1jtXwmZ988T8QeLGg8V6e30ESpQNcqw1miaoaDUggfr+QXqaub7Cwkdc?= =?us-ascii?Q?yHb2MKPDWfmlE8SxmZkYbB3VhZ6tWVX9NEDdgvFaR2zdrEpFn7ozKpo6zATO?= =?us-ascii?Q?jwHQIQX7Lww28r4/0pYDC//6zxmq3Q6Ulm+5aqaGv1EyHX0Fu1F4coKcMd0e?= =?us-ascii?Q?wQgGDYF66kn7YB1YQwlxJDWfT5Qb2aKCMThGlTsGWRJZ4mXjlKm/iLaumNca?= =?us-ascii?Q?hO6Lt8DyEhUG5YFEdF2lO0pyWK7w9uiFYkTHbppePB36g0e6+z9k+4p5b5LW?= =?us-ascii?Q?4b+qFoluPYaKnC921qgYA/rIrw89kL9kpbt5mDpgoIl0ckzuDmieh9JP8gzN?= =?us-ascii?Q?ZRD/fiptWFby8x2Kc2byyaSEB4WxrtDDROcKVHeBmw3AysaFOB05iqhgvgt3?= =?us-ascii?Q?WdMFdCzGlnHffTZRYJIj0hTfXJl2ZyyoyJh1AtxN0XSrIU31NKFez4HT9uBs?= =?us-ascii?Q?I+28aDAluCgA/OPsfgS/woZEi+HmqNYZJ4680cAtnbVymEWX0xjrtM+oO/U2?= =?us-ascii?Q?qaXMIv7RN+SGxw+70jFDWVjAAO//re8URi1jgpRmDEqYxE6K20/fOvfJZcZv?= =?us-ascii?Q?IYOM+Z1/ow6jUCnCNvgz6Upzzv5UfgN+snfybGNK6Bx/GpOd10R10uXjrA31?= =?us-ascii?Q?53W5oYUUz6FII5049cEEtf4JLzt/nidU/qcMZhNADp3xiFZAvcaJiJxx9Ltu?= =?us-ascii?Q?mEIhBcVUW3+hqQzdUbfedhB+WGs/EZdv+t9E1MwUvmUC8AVt358tgTktuETr?= =?us-ascii?Q?6r5xXtDv7c45r5NQ2FtKFPd0vd9ADe5UpxveCnC+OV8Y6MEBsISmzJLCG7QY?= =?us-ascii?Q?opiVMfN3YtVS/N1RNTImfXQrm+dlBkCT/2/WIONCd1BtbcHdlVx7apIk4+1Z?= =?us-ascii?Q?6AtJd3jbQxslWoe/2pW0fB2mXyoPgxzfEpGITYTaYQUtxHiFmtMLE48mL29V?= =?us-ascii?Q?Uxlrari1B8GXGDN0DRMogN2kc8I0tF9xTjHc?= 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)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2025 10:06:22.2517 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a1e33f2e-183b-46dd-fb2c-08dd94614f8b 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: BY1PEPF0001AE1A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB5616 Received-SPF: permerror client-ip=2a01:111:f403:2415::61f; envelope-from=Sairaj.ArunKodilkar@amd.com; helo=NAM11-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.686, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1747390031890116600 Content-Type: text/plain; charset="utf-8" Commit c1f46999ef506 ("amd_iommu: Add support for pass though mode") introduces the support for "pt" flag by enabling nodma memory when "pt=3Doff". This allowed VFIO devices to successfully register notifiers by using nodma region. But, This also broke things when guest is booted with the iommu=3Dnopt because, devices bypass the IOMMU and use untranslated addresses (IOVA) to perform DMA reads/writes to the nodma memory region, ultimately resulting in a failure to setup the devices in the guest. Fix the above issue by always enabling the amdvi_dev_as->iommu memory regio= n. But this will once again cause VFIO devices to fail while registering the notifiers with AMD IOMMU memory region. Fixes: c1f46999ef506 ("amd_iommu: Add support for pass though mode") Signed-off-by: Sairaj Kodilkar Reviewed-by: Vasant Hegde --- hw/i386/amd_iommu.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 5f9b95279997..df8ba5d39ada 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1426,7 +1426,6 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bus= , void *opaque, int devfn) AMDVIState *s =3D opaque; AMDVIAddressSpace **iommu_as, *amdvi_dev_as; int bus_num =3D pci_bus_num(bus); - X86IOMMUState *x86_iommu =3D X86_IOMMU_DEVICE(s); =20 iommu_as =3D s->address_spaces[bus_num]; =20 @@ -1486,15 +1485,8 @@ static AddressSpace *amdvi_host_dma_iommu(PCIBus *bu= s, void *opaque, int devfn) AMDVI_INT_ADDR_FIRST, &amdvi_dev_as->iommu_ir, 1); =20 - if (!x86_iommu->pt_supported) { - memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, false); - memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as->iommu), - true); - } else { - memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as->iommu), - false); - memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, true); - } + memory_region_set_enabled(&amdvi_dev_as->iommu_nodma, false); + memory_region_set_enabled(MEMORY_REGION(&amdvi_dev_as->iommu), tru= e); } return &iommu_as[devfn]->as; } --=20 2.34.1 From nobody Fri Dec 19 04:17:26 2025 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1747390083; cv=pass; d=zohomail.com; s=zohoarc; b=VTVdTaS14vHWmbdwy6U4CKjeW83yiyK/n6AHfNEHa8LYfwblW8ws9nS0PNVgt7FDN7el5gg1rS0YroxCkyF/bXDJJCuSVuwSeih5bbXP1a0JJCD3cmD+VLWluHna7ttkjegQ7SRuSdcFoCgFsvICAbo6luVHMKZMXYEDGtGO8W0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747390083; h=Content-Type: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=14oAf5A0EYNmXltDJ7ufxtxGt2aefGtNtiiSPgLMGRA=; b=NTwMCAEALz64uEObK7zvabf27GNk7Sem4l2MWr5QHtU8E8q77xaUpqV8CyTdorIWiY4E1vUyVQXrTYyj90x27DbuUo1CEL94XzkhKGIgzbyhCeznNLn74iqa46ppeCtyFom8mV29gMDimyTPzsSQ5B/vxKM7nhgq2hUZuTsZJcM= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1747390083816496.38484224532976; Fri, 16 May 2025 03:08:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFryr-0001Xo-Un; Fri, 16 May 2025 06:07:54 -0400 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 1uFryp-0001TE-IP for qemu-devel@nongnu.org; Fri, 16 May 2025 06:07:51 -0400 Received: from mail-bn8nam12on20620.outbound.protection.outlook.com ([2a01:111:f403:2418::620] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFryn-0006zq-Ip for qemu-devel@nongnu.org; Fri, 16 May 2025 06:07:51 -0400 Received: from PH8P221CA0009.NAMP221.PROD.OUTLOOK.COM (2603:10b6:510:2d8::12) by PH8PR12MB7254.namprd12.prod.outlook.com (2603:10b6:510:225::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.28; Fri, 16 May 2025 10:07:45 +0000 Received: from BY1PEPF0001AE1A.namprd04.prod.outlook.com (2603:10b6:510:2d8:cafe::c6) by PH8P221CA0009.outlook.office365.com (2603:10b6:510:2d8::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.20 via Frontend Transport; Fri, 16 May 2025 10:07:45 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BY1PEPF0001AE1A.mail.protection.outlook.com (10.167.242.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 16 May 2025 10:07:45 +0000 Received: from BLR-L1-SARUNKOD.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; Fri, 16 May 2025 05:07:41 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wQ89KsD5NZ4WucBXOfyvQ+F7xns9HW9MvrXqVA9Wec557GxO1lPbBEmF00qo2DFNBBvm6e4TBncgbsggJdjsgxABFNMVJsnIbOfzxK13rjN8cczucO1BZYk4iGXhKgiZqXVfxCrEPKAyueG6YGt5B9zV7ty+6tgMozaVQGwNx3EslCIXIc4EA/CjkWRpvG4LdePyZDRNhF3MIH5lGW9BbHpmSo192bn6uY4dlsuMBx395ki6/3XPEU2ifpHmRjNtKa21IqljebzcOmGFZ3j5n0d0eneoyPpt9aSYHLethdhuCOCs8TTblaLBrMXECGFbxWkNaZbMD/5N2+BdEz4eUw== 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=14oAf5A0EYNmXltDJ7ufxtxGt2aefGtNtiiSPgLMGRA=; b=GpLYNCebKD958WUc6n76YZrGAL7RkZgBW2u0I2fN3/Xg6PR98zxkL9kzz+Xot7c0og+663w9XVNwOxsfLoB6AW32cs/qdan+3DnEI0k8y2N8wd53gwm1eGxujk+EgAFd9vU03k9ssMG7gFYD6Oho5gUkPj2b/6FK5SWpHuQpuyBlGxmzyAfZC29PC6f9oaNHVksxtJXN77I09fyr9k/fw5XTtCvoQHzKOwmXuSvIJrXCdrgLG0v6fcblywcCKpsZ3KlkjHh3HdDDZlnt5czyMWZl4oAi2nfBmEvXsN+EGcJHkYYAmdEEXQied9j1kcQjTj59NpE/KCssL2czvwvBNQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org 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=14oAf5A0EYNmXltDJ7ufxtxGt2aefGtNtiiSPgLMGRA=; b=rB+uwse/1YfpOgN1UQRgAP/GF5yzmrVLWa9TzZjZV5jRXbKE5H1C88Sm5obvI1aAfNSIqkYqYxqUFSNSVlk1A99e6KKI8hoMoC6VSuIAick6KsBkU6ISnsXDPbh0uRWLAwHAbA158X35Ck03rzNzOLaarhZ0MhWHeyRIfWkPZkg= 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 (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 (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 From: Sairaj Kodilkar To: CC: , , , , , , , , , Vasant Hegde , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/2] hw/i386/amd_iommu: Fix xtsup when vcpus < 255 Date: Fri, 16 May 2025 15:35:35 +0530 Message-ID: <20250516100535.4980-3-sarunkod@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250516100535.4980-1-sarunkod@amd.com> References: <20250516100535.4980-1-sarunkod@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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: BY1PEPF0001AE1A:EE_|PH8PR12MB7254:EE_ X-MS-Office365-Filtering-Correlation-Id: c2138177-99ba-4c79-ead7-08dd946180ed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?VFFDdGdEU0hmSkVnTDFFYzFUR1FQbUl2OWNRdUhLenBxS21PSUg2ei9pbUsw?= =?utf-8?B?MGJHTVVxcXEwRFA3RG1qQXIxQUkzWCt4QXdJOG9MWXVFQXpPaGlqK3lzdzEz?= =?utf-8?B?L3djNkY4NkNuaDljYzBEZHdkM3FhWXlPN0JINE4vRUxoUGpISHZKdzVsWUlq?= =?utf-8?B?RW1MZ21uZkpRL1dESEtsa1FJcXNzY3AxRm1YOGdTbW0weFZWTUJvTmFxY2JL?= =?utf-8?B?L3ZwTnBCMXFCbVFRS0FSRUlBZjZ0ZWlUTW04VUh0VE9IdWVhZUJDNGtOYVpx?= =?utf-8?B?MUFVbFptSWxyUVFqbjVianlKZnlIeExRc0RlZEg2VFd4OThzS1poYURSTUZp?= =?utf-8?B?ZDh0T1BqYU40WjV6SkZaWGZPbnd1Y1Y0MTNWZnlESzdiZk82MEJXcjJNY2VP?= =?utf-8?B?cjVEdWZBaVFmUDZJWVdnQkFkNWlaT1R2Vm1PWEowY3ZPN2QvTnFZcmhxRFNJ?= =?utf-8?B?Q090SUk1a2x3YiszcEd2R2wyUUMrV0NvTXVyUVdmdm53dldNbFRabGVkYmtD?= =?utf-8?B?T0tiRVdoTVVBR096ODVwLzRXY1VqTE5IWmVzN3hGUG1hRWJ5ZHdCNzRXdDFW?= =?utf-8?B?RjJXVEI2TkErK0xuTjNIczhuZlpISjg5Zjk2R3QzdVpwRWh1cXJLRTlCRVBD?= =?utf-8?B?RUE3bmtDV2NkSzBMRVlJNHQ3N1lxTTZ6NGkvemRiaEN1aGFOTzhZV0VkSXc4?= =?utf-8?B?UnFUVk5PWTlOVHpheUZ1bmo4bnpmRlNja0x5TG52Z095RE1RL2xYUDJSZDcw?= =?utf-8?B?SWc1czduRFozV2ZuUWgrelAvZGw2dkNWcjlnSnJVdjhCOUp2NEJkNXhUbDVN?= =?utf-8?B?MXBER2lHWm5RdkNVMjNJbmtCOXJLWGpuK1dqTGdnZUpIWkxOUjZ2bklLSWky?= =?utf-8?B?ejJnZ1pOMEc0SGVxZUZqcXVqcVNiV010NDVTeHRHMVlKQ0RGVlJQUWxESlVN?= =?utf-8?B?RzJuTEpLSXE3ZkxnUk1lMnpBdkdBUDcwTXR5SWw0Wm9wUWVUNlh5WEVxM216?= =?utf-8?B?MDNKMDhrb2pNYTBYWlJ2QVhCa1p6TWhVU25PZzNqVDdUd1YycDFqcXBoYThP?= =?utf-8?B?emxJVTRNQzBUSGRlNEo3ZDBiV2V6djJmZ21Pd3ZJZEZHc3dNSHpTWStuR3dY?= =?utf-8?B?QnBhTVYxUE9USHExZG15Ny9UbGpTdk00S2Q0RXAzZDljZlZOSjhRL3lFNVdp?= =?utf-8?B?cDhyck9wMENsQ1hwWVFmdjJPRFVtbHR6RmhaZkU0SXdMdVN1ajhOWjJFcGo4?= =?utf-8?B?d1RyRXRFbkFtN3I1OTZuamhJd0grU3NjVE55NTEzcjJoNkdHSnluU1dGRU4z?= =?utf-8?B?Z1JFZ3BOSzNVcmJHUUh4S2pFR0E0eW9mdkJzL1N3TmE0UG12RHBQRjZnZ1dv?= =?utf-8?B?VjZ1M0VFS1J1ZzEwMHdzblJSbmh5MmRIaVZIL0JZSWNiTExMelA2R0Z2S2x4?= =?utf-8?B?R0VrZ2c5cUphb0ZpYUZyQ2Y0N3N2MFFzS1oxb0FpTUp0a2I0cVhYdXdlT1c3?= =?utf-8?B?cjlkUHh2RTR0SkRSdGI2UGVIYjBiYnlGeXUycVVRNnBGQm5pdXYrY2hYWW8x?= =?utf-8?B?Rmc1MEk4emU1WXY3QTFqdmtIOTZkc3lGbXJNai9OQlVJUDJma3RncVdmL042?= =?utf-8?B?ZDhod0tudDVhM015d0N1TDdSKzd2VURRMWhKZ1puK2VVVmRweTRUb2NxaTNB?= =?utf-8?B?QStwYW03M0lJK1ZDbW45czlCSHhjQnRvR1pRTUU0RmVNdzBlYWdRZCs2cWNu?= =?utf-8?B?K2hOR2hST1VLc3FRc1lFcFhFeHNqQTd4dENuWnZZckI4ckpNbVZwcWw1MzJZ?= =?utf-8?B?Y2d6NWNrNzgyWFQxUzFHVDdXZitneElLY2h5TFJNYW5qVTVNRlJGYTNOd09B?= =?utf-8?B?bi8zZDBMaTduSThNbks0SHNiNi9aQzdiaUo0VXdiaExtMHF5NVdhTGZVNDdt?= =?utf-8?B?WnJCNUVNbEhZbm41TFpPVzV3Sit5STdrM2x0cUJnTE9Gb2pGbTlzY1BHRkJa?= =?utf-8?B?WVAvUXNlVkhoRW44RmRLZkwwR2xlRWpwY2ltRGx0cEZqQWVuVGI5QjFOZXY5?= =?utf-8?Q?RHkSEX?= 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)(36860700013)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2025 10:07:45.0985 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c2138177-99ba-4c79-ead7-08dd946180ed 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: BY1PEPF0001AE1A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7254 Received-SPF: permerror client-ip=2a01:111:f403:2418::620; envelope-from=Sairaj.ArunKodilkar@amd.com; helo=NAM12-BN8-obe.outbound.protection.outlook.com X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.686, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1747390085309116600 From: Vasant Hegde If vCPUs > 255 then x86 common code (x86_cpus_init()) call kvm_enable_x2api= c(). But if vCPUs <=3D 255 then the common code won't calls kvm_enable_x2apic(). This is because commit 8c6619f3e692 ("hw/i386/amd_iommu: Simplify non-KVM checks on XTSup feature") removed the call to kvm_enable_x2apic when xtsup is "on", which break things when guest is booted with x2apic mode and there are <=3D 255 vCPUs. Fix this by adding back kvm_enable_x2apic() call when xtsup=3Don. Fixes: 8c6619f3e692 ("hw/i386/amd_iommu: Simplify non-KVM checks on XTSup f= eature") Reported-by: Alejandro Jimenez Tested-by: Tested-by: Alejandro Jimenez Cc: Philippe Mathieu-Daud=C3=A9 Cc: Joao Martins Signed-off-by: Vasant Hegde Signed-off-by: Sairaj Kodilkar --- hw/i386/amd_iommu.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index df8ba5d39ada..af85706b8a0d 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1649,6 +1649,14 @@ static void amdvi_sysbus_realize(DeviceState *dev, E= rror **errp) exit(EXIT_FAILURE); } =20 + if (s->xtsup) { + if (kvm_irqchip_is_split() && !kvm_enable_x2apic()) { + error_report("AMD IOMMU xtsup=3Don requires x2APIC support on " + "the KVM side"); + exit(EXIT_FAILURE); + } + } + pci_setup_iommu(bus, &amdvi_iommu_ops, s); amdvi_init(s); } --=20 2.34.1