From patchwork Fri Feb 28 18:07:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Babu Moger X-Patchwork-Id: 13996876 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 E8902C282D1 for ; Fri, 28 Feb 2025 18:08:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1to4m1-0005f7-Lw; Fri, 28 Feb 2025 13:07:45 -0500 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 1to4m0-0005ey-9u for qemu-devel@nongnu.org; Fri, 28 Feb 2025 13:07:44 -0500 Received: from mail-mw2nam10on2062a.outbound.protection.outlook.com ([2a01:111:f403:2412::62a] 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 1to4ly-0002R6-EA for qemu-devel@nongnu.org; Fri, 28 Feb 2025 13:07:44 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=shdFDGgjBXkjR7op+WV59SECAfuenrX/clvqhOmn6FCfxhbQ0aS2TxtFSGnaWH5zMpaMiQkbuxaeSRmscy++x2fs1TGu9mGybITyt8hJ0xvaG7+a461V6UkO/VVigIs0vdZ1V48zdh9rBo8AB5PSWNAzIHEF9AAEW8+j+4xQib1UEppBkPOD2sDoxOMD1CtldgOUnZ/DSDm9g+iX+ej6Ge1DzD6zLnc7Zw2ObN8/q82ZHtdohBS8rFCtjdvZhkVNRzRMdPCDGFSkqolVUtoM68RvI5GrzZWf5wlhUfrdGC5sMogxbmZMrf0lop/KLbhogDoczp6o53S3dUeStz+dLQ== 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=xYxwmqX6ky61U1XG+7TT/rmSPx0hSfYAV2hfrt46OU8=; b=aMLfet1SB2aQnQqZjNfKBcup6Xa/qPVdmjK1dbxNVOjH+J3osjzTBy//61pbhfBq2NxFaSdPmO4PsVz7Mr7PGH4BwUho4TF/iPTyNb60GfFOciL9+9PNEblUJt/1dCxhTqaQfkJy2HjGPNf5OChqNeFmVZ5xEu/qFYkDftjsAhagNr/Hz0cWJmWlVQbbpGk7IPQuQTfvU2q1Ch8FwHfAk+bMEQzf+h5TGUajtaRxlN4BQEQWrVyNysoPDr0y3og36VL0v0HP/nJal0KcYqnImMGuw3eR/UlXi4E/+4rJ3OJblmRNdlgMFvDbfyuqLohiFm9/t8hBQsdyoqBfsFshbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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=xYxwmqX6ky61U1XG+7TT/rmSPx0hSfYAV2hfrt46OU8=; b=mBSTiMuUNVFy3sm9Btudzdo0JtRpyAyi7YnfUNcHBVlQqwfQAXEpNLegJmjLzxwVxuWy+TUS1XVp8OY8HGdCsXDWbUmpZTpfONk6QYBXZDhZJqW8r7fc9a9maVb8r7qUJDni4w03mP4ulYSp3qlCjvxcFtoxZlTh1KEwSj8gWaU= Received: from CY5PR13CA0044.namprd13.prod.outlook.com (2603:10b6:930:11::14) by PH0PR12MB8775.namprd12.prod.outlook.com (2603:10b6:510:28e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Fri, 28 Feb 2025 18:07:37 +0000 Received: from CY4PEPF0000EE3F.namprd03.prod.outlook.com (2603:10b6:930:11:cafe::82) by CY5PR13CA0044.outlook.office365.com (2603:10b6:930:11::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.9 via Frontend Transport; Fri, 28 Feb 2025 18:07:36 +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 CY4PEPF0000EE3F.mail.protection.outlook.com (10.167.242.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8489.16 via Frontend Transport; Fri, 28 Feb 2025 18:07:36 +0000 Received: from bmoger-ubuntu.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, 28 Feb 2025 12:07:35 -0600 From: Babu Moger To: CC: , , , Subject: [PATCH v6 3/6] target/i386: Update EPYC-Milan CPU model for Cache property, RAS, SVM feature bits Date: Fri, 28 Feb 2025 12:07:03 -0600 Message-ID: <7ab1807506c87d54242044e68aa20c82d7fd3561.1740766026.git.babu.moger@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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: CY4PEPF0000EE3F:EE_|PH0PR12MB8775:EE_ X-MS-Office365-Filtering-Correlation-Id: 29c9c54f-894d-4165-acfd-08dd5822c84e 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: D3xjdrmOy1J41MWtS031hajEfpLC2tkmlTu4gLqcbechEHe/3CWbJm/seH6ZmyPdmHnu+iaNPdTP5aJeGjSY6gN+r25eiRDvxwZfiwfChHfkFIAAtKGxg83dHJCwVZgzYgGMLk4aCIlEbJ313NnJMN1Vv1MJQyJ+rhm/9g/9b9dnoLgAjaJOmI1AMaDqldGzC1k1QbgUqdHlaJ+vVi+DJnmgfNwZXPAiqFJbDpat4WUQOgyApS2pdaQx62XxbRdFsLBj9WI0VbbOVQV2r0EeJH1M9KADBMVH8+svZySpYlbivpMefYUiOVM1zlKFzS32P/7KunsHHBbZ8f6fdApk8Grnpb2yuiEZ4ilhWd5T7V9rFvsP8A48VHJ0GzzoV+yIEK899CW6IiMH8FMz60IffGZjAXdHg1tsRoDR6uyqodm/3Iz63fk54fzf9BlEl9HPvSpuJdWsle8FR7Q+C6JzNktQ4XCI6CYdvtnxHf8xQRbUTgxX1FC4/MWg26/LJGZQwZaJ2WUuuisYOnRLRYLm/hnk4bEl3FOw+p7yA5I+0JcCwYtTrLBXYU7XA0dmfDPMw6uzexk5twz7WkzroZV3z5OqXUrhzORxrTJzE65sUn8UnchPuUWbxYzdR/XbOlmeNkgTQsD/tnCUmiQb9xyGjoc+3s6+c+pNlQY43c4wTyXFlsf1HFN9Qg6YlPFeqMrrnLdr2HdTD78oiRU9qNarUKzoUpIpUoq9Kkw+dBUrUeFbA6mHCILmAlCf0PQvdIfdIEEm5FKSqYquDDCcLVrymHlfxXpLBaYn6wYiCuM66D5UDCt4P0aRkLYZvQVzFCi0orbRe1rvS9sKMoN4gJYBQfsEd42VLzykJjDFjxgJyp+yKaa7a5CHjQ+KMHxdpGXrTGb4Z5Ap/xgTtGPmsm8HVzZIxC6ql4vcC2RZ8cHqRQQPKvPlR6OOArxe39rqF3ub91l43rETPLF5Vz+5iGmC/7oAEht7Xs1vVkDmaCKYAlOYEAYCVJ8HtWRFlFgEMi0tj63LrsZW8beDcLVKW6tgqu+dC2FhSTa+mj3gDBgtU1yRgNmkh2abAwLhzhvMc8/2NdAuYZG8FkiCaTuXlSHVkN2DASLiFygV+UV7Jlk4CNgSt+dk1FC7qp+T8XlaesPqqn0sb/dZwtb7QnbyOgV+TomrxzR7tUP0X7iz/g/cfgNxHOarVRn3Y+40J6FdSh2hEqz2LEFd9xcy0VgvI8O8L7qiyAbXwOrqOqo5cvkvxA+0i7yMmbV8VFUrwNk4US9LeZh61rmSDrXnn7SHfYiNyDiUUGamdQBTRZRRRe9hJRHkGIpV6BPtHSsWdNCAQpoZ/II/t4NAlSJaunMM7bCgMlUSFFVIujVxGK/dwXARmaVS2eYvtvTIT39S6yZIjkUDPRp3di1jSDLo7nf/9W3UL9mGMsVFw3zYJSHWp67o9B6ta52LH7YDq//AD8k07TYB4DXtey7BIDdRO3bcZRePtbmSI1LgtOCrq4frJ1cHA10= 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: 28 Feb 2025 18:07:36.7647 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 29c9c54f-894d-4165-acfd-08dd5822c84e 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: CY4PEPF0000EE3F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8775 Received-SPF: permerror client-ip=2a01:111:f403:2412::62a; envelope-from=Babu.Moger@amd.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.444, 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 Found that some of the cache properties are not set correctly for EPYC models. l1d_cache.no_invd_sharing should not be true. l1i_cache.no_invd_sharing should not be true. L2.self_init should be true. L2.inclusive should be true. L3.inclusive should not be true. L3.no_invd_sharing should be true. Fix these cache properties. Also add the missing RAS and SVM features bits on AMD EPYC-Milan model. The SVM feature bits are used in nested guests. succor : Software uncorrectable error containment and recovery capability. overflow-recov : MCA overflow recovery support. lbrv : LBR virtualization tsc-scale : MSR based TSC rate control vmcb-clean : VMCB clean bits flushbyasid : Flush by ASID pause-filter : Pause intercept filter pfthreshold : PAUSE filter threshold v-vmsave-vmload : Virtualized VMLOAD and VMSAVE vgif : Virtualized GIF Signed-off-by: Babu Moger Reviewed-by: Maksim Davydov Reviewed-by: Zhao Liu --- target/i386/cpu.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index be8dcf9739..a5427620d0 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2504,6 +2504,60 @@ static const CPUCaches epyc_milan_v2_cache_info = { }, }; +static const CPUCaches epyc_milan_v3_cache_info = { + .l1d_cache = &(CPUCacheInfo) { + .type = DATA_CACHE, + .level = 1, + .size = 32 * KiB, + .line_size = 64, + .associativity = 8, + .partitions = 1, + .sets = 64, + .lines_per_tag = 1, + .self_init = true, + .share_level = CPU_TOPOLOGY_LEVEL_CORE, + }, + .l1i_cache = &(CPUCacheInfo) { + .type = INSTRUCTION_CACHE, + .level = 1, + .size = 32 * KiB, + .line_size = 64, + .associativity = 8, + .partitions = 1, + .sets = 64, + .lines_per_tag = 1, + .self_init = true, + .share_level = CPU_TOPOLOGY_LEVEL_CORE, + }, + .l2_cache = &(CPUCacheInfo) { + .type = UNIFIED_CACHE, + .level = 2, + .size = 512 * KiB, + .line_size = 64, + .associativity = 8, + .partitions = 1, + .sets = 1024, + .lines_per_tag = 1, + .self_init = true, + .inclusive = true, + .share_level = CPU_TOPOLOGY_LEVEL_CORE, + }, + .l3_cache = &(CPUCacheInfo) { + .type = UNIFIED_CACHE, + .level = 3, + .size = 32 * MiB, + .line_size = 64, + .associativity = 16, + .partitions = 1, + .sets = 32768, + .lines_per_tag = 1, + .self_init = true, + .no_invd_sharing = true, + .complex_indexing = false, + .share_level = CPU_TOPOLOGY_LEVEL_DIE, + }, +}; + static const CPUCaches epyc_genoa_cache_info = { .l1d_cache = &(CPUCacheInfo) { .type = DATA_CACHE, @@ -5566,6 +5620,25 @@ static const X86CPUDefinition builtin_x86_defs[] = { }, .cache_info = &epyc_milan_v2_cache_info }, + { + .version = 3, + .props = (PropValue[]) { + { "overflow-recov", "on" }, + { "succor", "on" }, + { "lbrv", "on" }, + { "tsc-scale", "on" }, + { "vmcb-clean", "on" }, + { "flushbyasid", "on" }, + { "pause-filter", "on" }, + { "pfthreshold", "on" }, + { "v-vmsave-vmload", "on" }, + { "vgif", "on" }, + { "model-id", + "AMD EPYC-Milan-v3 Processor" }, + { /* end of list */ } + }, + .cache_info = &epyc_milan_v3_cache_info + }, { /* end of list */ } } },