From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web09.1692.1580857338005546073 for ; Tue, 04 Feb 2020 15:02:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=hirjGLLG; spf=none, err=SPF record not found (domain: amd.com, ip: , mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hrd9uCtZ/ggnKUi2hT/Vo6y9xbZ1IbWvQLY9RjgXt6uL1VPA8vDaXi4jWHAWPQpliKftySennnJ5HbSJWJQ61gzcPuOdPBwxdEoGgOgHVqIhuigVhhP+/C6nXiJ5JVxz6Yxws/Qqucfqs5KYA0X7TNUlEANVKjxEIzGpLQV/QIg/XWx7KJUVmkNMYU4lYvEXoE0fgfmJh+2MLQfQMRYtpE3MeJvNSBVfAucCPsxqb8ALYPMiBK3jb3OIgGIAr1HDPL3rn6QhCTsHFtRx/TuJGOKnQzvlHM0Wa8cdTOG/ddGFozO9u4nlCUZt2/MSUTFigW8SmqTOD/NUFHJFKqVd6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jIzo5r3O2Wk+iHnmj3iDu3sJq0FTPdRiUdYrpSak6t0=; b=gZtAx/gHmb4H80hyNweSULnm/MQMaPYRtfRZbjX20p9rd3Tgo3AZXDVa7A5RViB/BAbjOnUOOJxYh0dO9PR2SzzO3DD3g7IR63MJCduKNPs7cwM9goRKfgTJWzzK6uqEEsv1gSahSQg9EDsEOqZq42NpwAiiqQRTJGBwG9SjQMIYxiB7DtpR2KiYH5Pgsc3zC/DE8Jh8OmarJkYQne+rVCQ5G8mL6r9WPQPOrEgG5qSCQ7uAc2tOsbY6mZ9sE9epo/zHK+Xu9W9F78kYJTdGaU3FfBhvtadBWCWDLoQC1Tv2D7E7V28Unq/JrReVl/5GAZE6I8tpZqJNX9nmD/Wiuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jIzo5r3O2Wk+iHnmj3iDu3sJq0FTPdRiUdYrpSak6t0=; b=hirjGLLG9lrUIt3t+NDLEyt+ZhhzzJONEpDsN4y41k3QYuJzHsjM5R0oYl0z3C99WFJwldrykcPJS2RLLTKFynmhilWlDnbXVcDkne6gLpPA9h31HoVuSM3/Y6NNBaOiCSmQ95drGZPOKPzL6zGrXtvQ5M+23/QikFu1LxRrmH4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from DM6PR12MB3163.namprd12.prod.outlook.com (20.179.71.154) by DM6PR12MB3930.namprd12.prod.outlook.com (10.255.174.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.29; Tue, 4 Feb 2020 23:02:17 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::a0cd:463:f444:c270]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::a0cd:463:f444:c270%7]) with mapi id 15.20.2707.020; Tue, 4 Feb 2020 23:02:17 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Michael D Kinney , Liming Gao , Eric Dong , Ray Ni , Brijesh Singh Subject: [PATCH v4 15/40] UefiCpuPkg/CpuExceptionHandler: Add support for RDTSC NAE events Date: Tue, 4 Feb 2020 17:01:19 -0600 Message-Id: <3fd96d42cc3e735733605f46b8bb8a0d7a9be708.1580857303.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: SN6PR16CA0062.namprd16.prod.outlook.com (2603:10b6:805:ca::39) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 Received: from tlendack-t1.amd.com (165.204.77.1) by SN6PR16CA0062.namprd16.prod.outlook.com (2603:10b6:805:ca::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.32 via Frontend Transport; Tue, 4 Feb 2020 23:02:16 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ec47cf4b-76fc-4303-7ee3-08d7a9c647ac X-MS-TrafficTypeDiagnostic: DM6PR12MB3930:|DM6PR12MB3930: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2000; X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(39860400002)(366004)(376002)(136003)(396003)(346002)(199004)(189003)(4326008)(478600001)(6916009)(81156014)(2616005)(956004)(81166006)(8676002)(966005)(316002)(54906003)(19627235002)(2906002)(6486002)(66476007)(66556008)(52116002)(7696005)(186003)(26005)(16526019)(5660300002)(86362001)(36756003)(66946007)(8936002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB3930;H:DM6PR12MB3163.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S9rZco8bbUkCZHspHY/c2Ut0WCfa1++4z0VWY5bvY6CAeNggf27MuX2haKhllm3g7LNl62UCDwKucFi5I8/cqiB9T/2qdKldjhzctVArT4P/3Oi/mZJf5l8QlJnp0obSx2kbGvLQfve5eW9ZOlUehRQiFLXr2jERHO7B9eNCumQcs5pqVRVTvArE+KUFFitlOolTUtMwIGycCIV0gIMCwV99P5KQp4JpowxFkFpNvzd35shLsfqGxgGx1QNG/1T1yySaFgUpeROFmUuogXOTbzGzr76x0ddzux8TLuKmMJT+jKEwR68hqm9xa85qlUBPDpIP4jUhUWRjitMNUzOJgX7tx092j/vaH/3tfK7997VHGPSStSH5GmyesVDs2U9+UQy1L7R0E3ayLWd0YFCLVECDKG+fYl/fiDBUYl4lLdcRMVtRo0MjeQ9PV/fehBDSlIuR7kKOaPkqkTxlqPTro5LVVaSFuyfH512f8Tl9NbhhGNUUGWT34yaHpVTFPDxadvAnctA0nNRAZUw/8TGhMQ== X-MS-Exchange-AntiSpam-MessageData: gmVHi33/Q95cGw37ocRucL9sK6C0nle9HqgWG5fbtrJZrBLLVmpd5bYDtYrvHIYVSqcCmTFXg+5U8y8N4ZLGyCXv5buWGVj6qVM8wDrqF4bI0RAQ9Gj7wV7XbQJhW1hdUZ3WcbJS9aico1CghSYo6Q== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec47cf4b-76fc-4303-7ee3-08d7a9c647ac X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2020 23:02:16.9569 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QfMp4SdFd9rXRPfYx6nUaSDIeXq0a/kEeC7pqnZ69vPK3ttMTBuzHCzy75y92U1Jd7wWwCfUabIB0gkvTSi9qQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3930 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a RDTSC intercept generates a #VC exception. VMGEXIT must be used to allow the hypervisor to handle this intercept. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Tom Lendacky --- .../X64/AMDSevVcCommon.c | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c index 03003e9113fa..552fe2e1a343 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c @@ -894,6 +894,31 @@ CpuidExit ( return 0; } +STATIC +UINT64 +RdtscExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + Status = VmgExit (Ghcb, SvmExitRdtsc, 0, 0); + if (Status) { + return Status; + } + + if (!GhcbIsRegValid (Ghcb, GhcbRax) || + !GhcbIsRegValid (Ghcb, GhcbRdx)) { + return UnsupportedExit (Ghcb, Regs, InstructionData); + } + Regs->Rax = Ghcb->SaveArea.Rax; + Regs->Rdx = Ghcb->SaveArea.Rdx; + + return 0; +} + UINTN DoVcCommon ( GHCB *Ghcb, @@ -910,6 +935,10 @@ DoVcCommon ( ExitCode = Regs->ExceptionData; switch (ExitCode) { + case SvmExitRdtsc: + NaeExit = RdtscExit; + break; + case SvmExitCpuid: NaeExit = CpuidExit; break; -- 2.17.1