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 [40.107.94.87]) by mx.groups.io with SMTP id smtpd.web11.480.1587577358043605166 for ; Wed, 22 Apr 2020 10:42:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=MGs0fvFU; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.94.87, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YNymT1lK4p1OiwZ/cLaP8JpE+il6ttgP9HE8CX9HYnT8CfFElTIoG7WqpqSMd1Fklo++UuwmkLHeWUB4OeFnY8ngbWv9Ex0wIZT+TKw65OVBz7tQL7vctCzbQ1Q8ZjgSwx5mNQB4m/fxgYZV0boavd3xTyaCw1tyqlSOD+IfqWsagRxrsvbyugY6pVWWv6xwe/V8c72aJPhVtKUlHBT9prgzjf3j9sgMwRlbStqXLzejZdDJxuUmCHFffF6Bg9jJF0d9GLH4neFBEZL0ga2el/wnMvJADkyUl0C4I3ntNnOfX6qRHygDef2xvcFI7Odl0c2GHAYEDBKZw6j3xKPAwQ== 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=dYADsZ5rPBjx2Efs4k+vpTkE6cTiXHLcfwNvRqlfQq0=; b=YKGNMYjr3xG3AJUiNZc/v0AOFge53L/IQksJUmsbjyyc5WW5oq/mYAVTT3asNfuSDJuvCBTyxmauAIW6BQi5obizOoaLmlY0ooKQwy9fJFr1tL19OXBzOcUINj2Azk+NoJS37cPtpfUjwXBSBOwSW59yrbFmCczwvAtN6WuhjDq0AgYfXUHMTexWqp9eUlmJYRTXClqX37o5CBh0pxgCbYA2Z6HzO6rK+ZkVTBjvmwd8RW3KW2KucVOjqpqIPoEodUIlBBAQVU2kknwhAKBZ3Vg+tlYFPu9QRupZD+o492Sl3XNlWq9Ru49XBtID+qOcmFbDWhyRhQHcKXXRa+XahQ== 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=dYADsZ5rPBjx2Efs4k+vpTkE6cTiXHLcfwNvRqlfQq0=; b=MGs0fvFUfk3+WepvO+WqiTZKsBu3TtnVQ0t9bETcSPn8SWZwOa00uwnNnvk1uo6q2N4zvapdePDpAfnZGeFlJcn/lI3MxJ9OJMacdfQ0l96hsp7gvp5E8p9vI/aZ7HQkQmtsnt3TYc5DCD5EFT69yRIbjehmYfu42vn56lAKpGk= 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:37 +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:37 +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 20/43] UefiCpuPkg/CpuExceptionHandler: Add support for INVD NAE events Date: Wed, 22 Apr 2020 12:41:35 -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:36 +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: 01becb9a-f1d2-490a-2383-08d7e6e48ba5 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: +lWK5xDlZQvegwJAXwbo3+43U0s9lft4mFQ3oS0bPkflPlTd7nF0b6BDzWNVQKdobo2csnuzDd6TwdM76T3gG+rltxWKcYVcj1SWIiE+KaLWcYXama3mJgoC7iFzYJzmP7RXTLqxwfkp6jB2T+dpykJhFH0HLxQ/09+o6ZjqOTeNiXD3R2zYVRLvcQkBAFEcvWSpzE3OtpRrEC9zMp+TbF4l435uveWSpwRwsqSgm+v8J5euUOr3wZWB2s0gSIabHxqoT8PwwabtmKSrX3uEBN4acCucRrKkB7HUMuLLyN/b8Uxgzb3yANvu9y1vY/zcSYmuf6BwOS2SvVJ90CFiR+9ELL8Bjfllvubmjr+C9irt/tGevd6H1eGfGlZmyVTLA0jI3TL1teWn7K+Tf/8LubJrDFq11RGmaT5MZcN6hi2Zq2LT6cvEDCrf8EHNRA37RbngfT7LpnjV2CahY2/7sdeTdOoB8GwNBQTUb4w/AqRnzyjz6ki0y5le39AYuBZR/BzhcTUD+T2lcYXht8hQ+3l3fGbJv1wyMO9M8m1zGl286HbQ9sKOZtbA4o3TZWOit4Uz01wk0+HUVFr62N/LLg== X-MS-Exchange-AntiSpam-MessageData: fFb/f/NDHYKI7eUp6RanVGv5OkZJpt+QTKkQJdFNQzJwYWBIl1F9MWg5zcSAEYRBkf0qrGH5XqV/vZPyzCvAimYeHAyG/MWmZnbT7Gj3e+rP7u7Zr725ly6V96EBw719sH6q/G2zfzeYKTTFv5zmdQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01becb9a-f1d2-490a-2383-08d7e6e48ba5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2020 17:42:36.8470 (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: j/No9SaMe4rbnpw4B7oCd2nH430RKfo74rOMAjxqkOK3oiZpLTdx36kwWMWTWtDQcPK4NkILDQs6sR8d4LoNdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4580 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a INVD 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 64db5eef128f..d42d84608854 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -1155,6 +1155,38 @@ IoioExit ( return 0; } +/** + Handle a INVD event. + + Use the VMGEXIT instruction to handle a INVD 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 +InvdExit ( + IN OUT GHCB *Ghcb, + IN OUT EFI_SYSTEM_CONTEXT_X64 *Regs, + IN SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + Status = VmgExit (Ghcb, SvmExitInvd, 0, 0); + if (Status) { + return Status; + } + + return 0; +} + /** Handle a CPUID event. @@ -1330,6 +1362,10 @@ DoVcCommon ( NaeExit = CpuidExit; break; + case SvmExitInvd: + NaeExit = InvdExit; + break; + case SvmExitIoioProt: NaeExit = IoioExit; break; -- 2.17.1