From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web12.481.1587577354031961659 for ; Wed, 22 Apr 2020 10:42:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=PzlHaC2z; 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=lMcm1rdE1OkPjP53cXPtNhL7fqmIOqDUABtU4fJekV1red439Yjm6wW/lTm5kWIqSfMdFprYw/f6l+HGgJRqT0UXCk7IsVqk2WRwWhq6ZSLQd8YvMPkc5Xf2nsNZsJncwXuV363kQUNt6yEDquJju2VxcH6lz9o+JF+QZTZ0pja3e1UX04cRvCm2wsyomtkqN3EpCkYB77BcfOJWOwDURUJ9gJq+qPYVsLXxxml6ysX3XT2a4Dpw4XYCx3lRT1lrs2FOx/XhjtrRQQrAZRto7jBeGsPmpesHNL9Lz6UGkFgq8qi8Lhw7qhPX+e7KET2cfdcGbpS2sikMKO9hUFE0+g== 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=L5/O7KisXde8Igqfy0oYZDMOBupP+NL85pCPg2qUcQM=; b=jnyXqbiTbeFy4961iUC8i8Qm+B1ZiuoTN3dCbhznOiKGfzIS6a6HsWdQSrSAvXKnVcCVb9Vk11rqtK03SfHDSBSXwL8sAUQgYdhFHvqHy61H3IAzj+QTKAqVvM9IBNfvyoLLdSS980MK6ACPW4qbTJN+I+mpSuYxEafa19E8k4QzHajVXRL3QN+Z3aIij1pGxB2wN2sl+zQoZoOKBi2IYNubYwhRBqNNC+HqWkRfluGdlPNekrkJW8iYx9uNpGls9WTcpTYHBDRNQLdAjDhVSFGvwSYDduUWekVLuFfHA1AiQVv36AfyfqXwAHEP9NvFrGVmZhzujzHmW1lqzMoAWQ== 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=L5/O7KisXde8Igqfy0oYZDMOBupP+NL85pCPg2qUcQM=; b=PzlHaC2zllrUSTMk3YZPAYbOj9csvpVUasVFDdA03hSbQ58HtzpfxHyyYUELjE7SLOq1O9oaVA6k8IKmVPieBz6j7NzCIwnlQWd35hyxqezEVf/sODsWdj4pDAdzpYrZCvtoR8j2gkmyTdgah4XTjdIY37u/DAlES2Zb26tgF2U= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) by DM6PR12MB4580.namprd12.prod.outlook.com (2603:10b6:5:2a8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.29; Wed, 22 Apr 2020 17:42:33 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::9ae:cb95:c925:d5bf]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::9ae:cb95:c925:d5bf%4]) with mapi id 15.20.2921.030; Wed, 22 Apr 2020 17:42:33 +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 v7 17/43] UefiCpuPkg/CpuExceptionHandler: Add support for WBINVD NAE events Date: Wed, 22 Apr 2020 12:41:32 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR04CA0060.namprd04.prod.outlook.com (2603:10b6:3:ef::22) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tlendack-t1.amd.com (165.204.77.1) by DM5PR04CA0060.namprd04.prod.outlook.com (2603:10b6:3:ef::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Wed, 22 Apr 2020 17:42:32 +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: 7f2eef12-b0b2-4e9d-2e0c-08d7e6e48978 X-MS-TrafficTypeDiagnostic: DM6PR12MB4580:|DM6PR12MB4580: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 03818C953D X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB3163.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10009020)(4636009)(376002)(136003)(346002)(39860400002)(366004)(396003)(36756003)(8676002)(6916009)(186003)(86362001)(8936002)(81156014)(4326008)(54906003)(52116002)(7696005)(966005)(2906002)(16526019)(316002)(478600001)(66476007)(19627235002)(6486002)(2616005)(26005)(956004)(66946007)(66556008)(5660300002)(136400200001);DIR:OUT;SFP:1101; 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: hRMlHIeWnPXuIW8k8DBpqdH7A6BE1DQG/0utPnE0vGNXSpV7SMHRTb2xQSVnYt60gY1hHe/y/aI5cgVG9qqeu8RVc3BoSEbVlPC3lEprj7mwgXPbFN/dEYGqTZuYn1fyzjAivlauCRLgjGEBxQqdm+KcpmzGblHXMrmRwIwyyMl6XuOLNOjyrnJLYv3CdkEN+00+YTfvxFPuMk0Vp1m3OeBA7CSquyu4Rm+GgnlGmv8Zw56lHYE+UfUYIfMwoob9MvKlxLpzcFyNabJT3pJKKPwGUh9EJ1stWmfwZ6T5ZSJgmRl1RTaBEet2BIbW5d2VxVNxBAt8mG9pVA8UKg9XJAOl5zMkj3Oye5j3P28m49enYVR6yBWuWyODxET44WkBrHCfLi59sl67ABjTkBeioipVRa8f6vCFWHCcBlhfqe/FpK6OIoI2kR/J7wr08wd/S1wZzJ6I30GAgRWYZ9EmOQz34hi/m3UnHUweSvlnmie0/P9bA2KOHJtGYkCNXLep7c6uA1alBuL0sfJ76O8DtDJMFeG8wC43zq+CjgLcSUvpbuZGnYO+sNYDsotXG06a2JwIaEEKeiY/pX8DEbTItA== X-MS-Exchange-AntiSpam-MessageData: UXcmbjM06O8lYCfSOQmfvoKbvFLnMOUHGz+BrRWN2JttZ26jgz/kFV3R+Bc9LTmh1BFc69yydODfxbtLfdN9VgmFRyiOdSLtfHvyAWArAlciHJ4HKCdQ40sfh0opRpvYgCt/ju8W0dwftLU/CAa/cQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f2eef12-b0b2-4e9d-2e0c-08d7e6e48978 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2020 17:42:33.2119 (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: fprugSotWI1vcEDUVkRUYwRqIvQ3oE/k+9XZgJrB0//W6WTmqoBZRyebJ8ss2SqDcY/2M2Ww6UGhbRuaCqcesQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4580 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a WBINVD 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/ArchAMDSevVcHandler.c | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c index d3aba54b90fe..29e88147aab3 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -836,6 +836,38 @@ MmioExit ( return Status; } +/** + Handle a WBINVD event. + + Use the VMGEXIT instruction to handle a WBINVD event. + + @param[in, out] Ghcb Pointer to the Guest-Hypervisor Communication + Block + @param[in, out] Regs x64 processor context + @param[in] InstructionData Instruction parsing context + + @retval 0 Event handled successfully + @retval Others New exception value to propagate + +**/ +STATIC +UINT64 +WbinvdExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + Status = VmgExit (Ghcb, SvmExitWbinvd, 0, 0); + if (Status) { + return Status; + } + + return 0; +} + /** Handle an MSR event. @@ -1217,6 +1249,10 @@ DoVcCommon ( NaeExit = MsrExit; break; + case SvmExitWbinvd: + NaeExit = WbinvdExit; + break; + case SvmExitNpf: NaeExit = MmioExit; break; -- 2.17.1