From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web09.722.1583190464708073620 for ; Mon, 02 Mar 2020 15:07:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=tD0pjw38; 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=ntJRfbG9XbLTeBHepGSps3Li3hu3UgzKQxOzyI6PeV3Q/5v2VMT7/RkU50JhaoL06BKqTzCL8oiG1/bxKqvSCyOYyiQDrn7xDCRmxqCy9lNyyoi0QuN1UqgGi8H1zpEyLjeWVu7uyM2lKdRENFoVcmGz1vZXWllIus/tKvIVPSWxucNJ8kZkcTS3Ejnm+SiWg4yBW1w45sYDBdx5KMroRo9vs8hleILVDw28S5iPBzLW+qLAZH5KwnM1sU2eKDJ1seVKisrG1Bcbay7+cAVdbKAmT6YP+83zmg6npsdy1pF/DQ1FsEatZMfeltnwtbukCO+ai8z6wRfNT3gAEBmdwA== 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=sbW8EqJde6o28avVppnapLieayJdNrursyG8aUc+/oA=; b=DmRTsQ/pPZ0YK4YN5nqQNc0o26kJahnDCcTqL4bwRGQ9ELeSFiFkDOkHhsA/3Wat6klStix21PJfLavnCCfYz4cGv5n1rFsylGMFBdCnAcSROYsyyPiftJbMfUUszrkWrOekjTz3vRWU/ROsNDBdTWjVlcSXQJuqG5JDujs09OsxgU29tFQ6wreEEUBNteTmKo+BD2EnDW9daFPBMH+8V3aScr1NoyVgOkbYRdxUCZBL5TAkIb4EK4L1Pb3fJttSRk/xWCKDPHnJf7DK72eGM1zdmEKIJRfXxWn/YZwSxBsLaWOQ1n7C3O1wVnaiZj+Ul4c+TFK4V8CebHkrYZgKyw== 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=sbW8EqJde6o28avVppnapLieayJdNrursyG8aUc+/oA=; b=tD0pjw38cwb2PnbjkV8jhlDxsxUS+GXf8YczqMtH4byDLOQVLDPAs6U+qI0hsO5xLo7jGEk/C2I2/VTilyWetC8TOrWKWilJDSNNUG2I3PEAg/FRCh6ESl3+FqUYl8AYMcqBfa3tA/vmv0Cum1+3XKlWDQbl9njQBRT7Qb9ecsY= 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 DM6PR12MB4041.namprd12.prod.outlook.com (2603:10b6:5:210::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.15; Mon, 2 Mar 2020 23:07:44 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733%7]) with mapi id 15.20.2772.019; Mon, 2 Mar 2020 23:07:44 +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 v5 16/42] UefiCpuPkg/CpuExceptionHandler: Add support for WBINVD NAE events Date: Mon, 2 Mar 2020 17:06:47 -0600 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR2001CA0013.namprd20.prod.outlook.com (2603:10b6:4:16::23) 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 DM5PR2001CA0013.namprd20.prod.outlook.com (2603:10b6:4:16::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.16 via Frontend Transport; Mon, 2 Mar 2020 23:07:43 +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: 8ef6f0c0-cbe1-4279-cf91-08d7befe8407 X-MS-TrafficTypeDiagnostic: DM6PR12MB4041:|DM6PR12MB4041: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2000; X-Forefront-PRVS: 033054F29A X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(39860400002)(366004)(346002)(396003)(136003)(199004)(189003)(478600001)(86362001)(5660300002)(81156014)(36756003)(6916009)(316002)(4326008)(54906003)(2906002)(6486002)(8936002)(81166006)(8676002)(966005)(956004)(2616005)(66476007)(66556008)(7696005)(52116002)(19627235002)(66946007)(186003)(26005)(16526019);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB4041;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: YTLf1PGkdqaxCJopTBr3kT3zmKv1shSoK7mH/SphAIGss/3PVHxHIafn1uFbUfIH+CBuQN2qdhA6Xprjeae54+pzBG+FzDXJkfPdwpVVolAKreORQiJdIXZfkr7/j14Ko92McrfBcZm/6NYvcrmsXf4sW4hPKBPj2l4LAJ0c0i4p7BkjrkkXhVABK0Kbc4jE1QYVLmPEgjFapqJsNxmOPW2e+NWkOK2s219RHNbF4YWAZeQYaCHDgocjWZk1NgMmQTHoV5xYB7gLg8OgwF+f6sRr/e5vSIlIo/DP7IKBYvDlGGyrzckVJrdzkxE3imNNGxT6Trmf2LnIH3Ckjw/f4sukj73kQb4wBhs9Hbt4OokZx93RWdajytLCgqFV9asxhERQ4ti9vQVbG1yA3T5OvQZWIKsjWhKhd/h3q8YrsDdIX3RhesdN5tNlvTTUSrPJrIWEGCQZfKTeVMm5pkCmBv2E6LfZiKBuyVxHJ/g5X3yRZGYVLDlqhpF23I0QF8S+/aOpKF9suY2klWVfQTp9Yw== X-MS-Exchange-AntiSpam-MessageData: weHUgZ5LJQ2l2LVoFk8munU00Rsx1yn9y6ctblpnRw79jdWdtUJVzPkWlmT0tiaLQnDGwNbc7TsPe3XD2okqigpLUdHF/8oFvysnuKlstuwJbJR7FN6DrsCVrIVp7QChZ08esq1FiyiFjcIHO1I0mg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ef6f0c0-cbe1-4279-cf91-08d7befe8407 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2020 23:07:44.4008 (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: Dx5uXdGIHSDwQXpqhL/yaIB2KSCMWHcf+aNSwEtJ1yUL0ovoFz2MYrG1i2WVm71i9x2HoYQCSyfWDpNQ1W43Xg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4041 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 | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c index 92b15dbd146e..1096403261db 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ArchAMDSevVcHandler.c @@ -591,6 +591,24 @@ MmioExit ( return Status; } +STATIC +UINT64 +WbinvdExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 Status; + + Status = VmgExit (Ghcb, SvmExitWbinvd, 0, 0); + if (Status) { + return Status; + } + + return 0; +} + STATIC UINT64 MsrExit ( @@ -904,6 +922,10 @@ DoVcCommon ( NaeExit = MsrExit; break; + case SvmExitWbinvd: + NaeExit = WbinvdExit; + break; + case SvmExitNpf: NaeExit = MmioExit; break; -- 2.17.1