From patchwork Thu Apr 10 06:44:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sairaj Kodilkar X-Patchwork-Id: 14045966 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04137C369A2 for ; Thu, 10 Apr 2025 07:01:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2lup-0004M0-J5; Thu, 10 Apr 2025 03:01:35 -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 1u2luT-0004Js-4z for qemu-devel@nongnu.org; Thu, 10 Apr 2025 03:01:28 -0400 Received: from mail-mw2nam10on2061c.outbound.protection.outlook.com ([2a01:111:f403:2412::61c] helo=NAM10-MW2-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 1u2luP-0007gD-Iz for qemu-devel@nongnu.org; Thu, 10 Apr 2025 03:01:11 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YBj1TOHaow9I53oUjoMmNTuUGib5b40JLPB9jyvwXb7DhJvqeFTH3H9tHsoW+i3R+ZxHSUSoiO0zXr65EHg/rVvsVvV4SZrVnwSkE0P3nKOpI2Oz0wUFe2XkeJPrAYKtOroBOrH5CPm9UayHDtWFS8zGVVvuGFhfDspec60snYjMCgPNVHDuERX8tJaatENORn8KS1Ir3v+Ux451RY4mhUCUwUFdCtNcNMl2cTC3iswo2GthcTgRzmiHlJz0zptfmp01DLVOuY494T1Ghefi64nK+vigSCZOGonE2UWSJ/XR1VJWN2yy1BtbmwUD693PgpybhL6ThCtbodalZVMwjA== 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=Qx2hh3r7ca4uL831/SFU/V00VFlH2vRY49XwQjZuYdE=; b=I1vOwJmIZ5xY3sW94m+5ZuJvElPk/CssVgOtH/cs/Ra7vqyrALs2gOwt/18aAqZAhRli7RdKc6lkKaQtcexYHQz4lSdx3VC5yl1oBBvdvW3tBbYDix1ceqwNTHsK+LOYmkWqmmfl+QgZxeZdk1mCSsQcaAnhqw1mVlIvr3geeBubtS/CCLfpn+6n+3C+GBZ923/sbqKOdLUFDdRxqqkSiodWGEHAI3wh63mf2vcif9W62+5glBLU9Bor4uBZ81snkLGrLCq9JWrG2cS5Ehi9cNUSQGiQ218OJmTqzMKWZTAdppmxSTsps8+Nz0E0qed7N1qAHtl51CMVk0QxF6Yx1A== 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=Qx2hh3r7ca4uL831/SFU/V00VFlH2vRY49XwQjZuYdE=; b=tN0RnDClNinfRHlsu99T1pnlIgSBScyM9Yp7Fb0p0xqUukq14TaH+EPzF1osQw0HDTeNVei17Xk182EZrItbgUHZes1GSgJ9GIZdTlstWZOfJjZN0T/geb8UiamhxKAUjf1SaB/QGcw6Gs04dIiKMApSwIxpLcNgVbJnad2lhLo= Received: from BN9P221CA0004.NAMP221.PROD.OUTLOOK.COM (2603:10b6:408:10a::12) by MW6PR12MB8916.namprd12.prod.outlook.com (2603:10b6:303:24b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.32; Thu, 10 Apr 2025 07:01:00 +0000 Received: from BL6PEPF0001AB55.namprd02.prod.outlook.com (2603:10b6:408:10a:cafe::d4) by BN9P221CA0004.outlook.office365.com (2603:10b6:408:10a::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8632.23 via Frontend Transport; Thu, 10 Apr 2025 07:01:00 +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 BL6PEPF0001AB55.mail.protection.outlook.com (10.167.241.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8632.13 via Frontend Transport; Thu, 10 Apr 2025 07:00:59 +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; Thu, 10 Apr 2025 02:00:56 -0500 From: Sairaj Kodilkar To: CC: , , , , , Subject: [PATCH 2/2] hw/i386/amd_iommu: Fix xtsup when vcpus < 255 Date: Thu, 10 Apr 2025 12:14:47 +0530 Message-ID: <20250410064447.29583-3-sarunkod@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250410064447.29583-1-sarunkod@amd.com> References: <20250410064447.29583-1-sarunkod@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB55:EE_|MW6PR12MB8916:EE_ X-MS-Office365-Filtering-Correlation-Id: a24ff94f-b15c-4a34-bc55-08dd77fd7330 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?cU/hvW/YOFxB89LIfSOzAJ9fx4gJBA/?= =?utf-8?q?WfTvYT8cppKG1VvC06kHiW4h7x0mPerqf5Br9R/flWUBIufAtef0tJYoy8pwkdztQ?= =?utf-8?q?d4oIh2pntJwmjVXOiFMfBvatjfoFfsYEP2xqg0BaOd3xfVaHHNXyKl0Qme5RTblUA?= =?utf-8?q?/9JZAV9UU9lOuKu41hbP/jb/Sd4V4bfScd688gqfGCUhkLHRQrhvj6yBI2oZ6b0x4?= =?utf-8?q?Xh6goOrTv9/XGRGK9az8ful3VrLaa8/Vbx9qtDpQTGbHdgyoV/HrWWx0dhnBgDDzh?= =?utf-8?q?MrnMPbPN10gu+nrYLhVOd9T7W1mvXO7fh7Y863S0IOiweBliEbw3+ZKjhr1gbgxCR?= =?utf-8?q?TLSxe19w0gcHlfQBmcGJXGVsuz7JNUmFCdMmwlrtJRaty4kKOpOG2ZPArpss8lbWh?= =?utf-8?q?XVLb+nx696epL57+dAJB1NogHGBfDLyvT04FrS7YU25gaSdUNucgahTjRF1i0sPji?= =?utf-8?q?UJK0Ztps0/aOiJYuZwA5BE+fFl9alKEqx/gWAK4pNbPdqejksR2RskltP7Ow94PGL?= =?utf-8?q?BQ8rlmSrdHqX//aZz7kJbWBuT7VxhMvjIzVblG+7+XLfgEA+nb4kK99ol4EYhe6+6?= =?utf-8?q?dF7WdfQlHuhO+kNsv6rJJtxUNMZlQbPBXD0lnPxTS0XaFp9HXQ8L552S/RLSI/Vmj?= =?utf-8?q?wiW1V3IAfepOtgoWYortO2XYd5ob9QpeAoNY95NlmqSPMmwm2ciNM2wP2dWG2kBLX?= =?utf-8?q?f5soj43izvAREJoStOFFLSJnVs+BLpfuTEHzQ1BDOLCARPv8QDn/4lj63MC1CeJP0?= =?utf-8?q?i+Str/WNDdE/hVbQFw6S9eQvE41RukaAoHq/f/gtgRyz4JQhSJwAGDqmQ1Eb6sjAa?= =?utf-8?q?g83Xg6eG+bwPIN6FDpgKL8w3p+BB4SiU+WuHDwGlWhgMSGQSQr1oxBub/JEM089tf?= =?utf-8?q?RmE02xmxnVJHfRo9miDdcfK4sADoy8EchvGR0v47DaDxGtNfGkLYwyw0Qw1sa80IZ?= =?utf-8?q?6hHgYgf1HM2w4vJdTa4PPmSCag+ikzhLkraSwjLdsKLUJEzv/LLbD/a3dCpIR/26o?= =?utf-8?q?7Z44pJlxLP7SfTfsjtdBQTtIuUex8Qf1y9xHc+F3Byhjq0Ujx0ic81zau4TOe/fCe?= =?utf-8?q?kOhTzPCSIAZSFo4aC4A7SXHHB3bbjLWUrugUMhK92vPUWGX8cKHa0PY4Ya06qfvpb?= =?utf-8?q?KaArKTuTMkj+btF3xK0ZCBnJwESNH3WqL1vtz5HbGur9CQF6rNAmZiFYMkHk0bPym?= =?utf-8?q?XtiG7z/c8mHjxP0bwRjg5ZHmmN/KFVYpVV0opxWeaPJi12gocbpZLbYZ26ZXSHKNw?= =?utf-8?q?E14J4jXGSUaRRqKGAx58SjyUSc2AehNqexGpF66ppV6tPLhyYpc/YM6omFqNMiLKO?= =?utf-8?q?Z5SFW6VK4lqx/o3LhQRdfC/vqt7N2/J0HJXI1bu9PWFzD+pzAObgeQKCxHhDJgkVN?= =?utf-8?q?t0k13Un09SPyLHwdg6EOfIrwEGPDprQIWVVa7REqhr+67Q+phUv2oPjMGXeTVTODo?= =?utf-8?q?7/QmdLEyUi?= 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)(1800799024)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2025 07:00:59.9014 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a24ff94f-b15c-4a34-bc55-08dd77fd7330 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: BL6PEPF0001AB55.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8916 Received-SPF: permerror client-ip=2a01:111:f403:2412::61c; envelope-from=Sairaj.ArunKodilkar@amd.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.505, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Vasant Hegde If vCPUs > 255 then x86 common code (x86_cpus_init()) call kvm_enable_x2apic(). But if vCPUs <= 255 then it won't call kvm_enable_x2apic(). Booting guest in x2apic mode, amd-iommu,xtsup=on and <= 255 vCPUs is broken as it fails to call kvm_enable_x2apic(). Fix this by adding back kvm_enable_x2apic() call when xtsup=on. Fixes: 8c6619f3e692 ("hw/i386/amd_iommu: Simplify non-KVM checks on XTSup feature") Reported-by: Alejandro Jimenez Cc: Philippe Mathieu-Daudé Cc: Joao Martins Signed-off-by: Vasant Hegde Reviewed-by: Joao Martins Tested-by: Alejandro Jimenez --- 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, Error **errp) exit(EXIT_FAILURE); } + if (s->xtsup) { + if (kvm_irqchip_is_split() && !kvm_enable_x2apic()) { + error_report("AMD IOMMU xtsup=on requires x2APIC support on " + "the KVM side"); + exit(EXIT_FAILURE); + } + } + pci_setup_iommu(bus, &amdvi_iommu_ops, s); amdvi_init(s); }