From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.74]) by mx.groups.io with SMTP id smtpd.web12.961.1589925109062763784 for ; Tue, 19 May 2020 14:51:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=Ne4MNbYx; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.220.74, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nuLULj1UP7qQVMam3jp1HwvuU7ahLwLoT8CiLjs3fP0tXzulzt0pT+HbFuT3eVLZbvXQNm/hjZTBn7AOgd0BbbQD1kcj74kJtKSCnHN41/ALt6QMb79pDSVNAtBKwv83cPuG7+/1jRv62J1Bm+ckNSeVdWp8TeR1VG0tQ6GXvCPfxuSs1yic6vGPoVYeVM4lYs5qhQoIXbqYqd2CBSJKQPuPPxR31DSGqcbarolI9cgCZjEc4YrgXoWoINFLJ+U4O4LT/PdY/Nvx4ys/5s5qcKF8JGmbpKOBFeg3ANs1/DVbUdgBaErahXW+VLodHdd/CWBBORPruiniOC3hlr51LQ== 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=VRkXr9wafBx+JkQkLZlLYUNcNBMHtSDbqgVTYcK9XGw=; b=iEiBJ+h6koiT9TAoMymvfpBbaV0R2NEVZwMTSayu5LHTsFBJsyxnGGtzMM/WUA44ai5pxJQjPcqRo+YVtp8WNWOLkwsxd8ZuoUXrm8na4E+Op/++ZNYOC9H9S6dEL/ciWg1EHN04ITDPGjRLEaUKnnnfzDLrLm6HQxJe1xmwfqUB1BY3XwyVdWCeFnKYVsiihvE/+Br7ui4WJD5TEsQ+cdkRwuJr2+b90X3mRvOlSvsrhCDErWEecwpZPm6BZAEkBcD1f2z9BP0kk6MCqNBEDrWU5Yk4SXO/AyDDtDaZf3er3p8M9C+Pt0F/oNumI63G83r0TxEPgd0DK69+asjNJA== 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=VRkXr9wafBx+JkQkLZlLYUNcNBMHtSDbqgVTYcK9XGw=; b=Ne4MNbYxYg4DErW83WMvDM/d8wGkoUrSS3r5K00UcmjpNfMZ7l/iYvSNouZ01hoQv/+xOFuzCo8NkkwkUAaSiVIDuVs+nzd0cmmAHDVSmPkjYjrvs9ZLxB1YOvtYgahWCXcyxHKHtiXxPVbWCLR47G4S7AnagldlLwI2epFXPME= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR12MB2504.namprd12.prod.outlook.com (2603:10b6:4:b5::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20; Tue, 19 May 2020 21:51:47 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1%10]) with mapi id 15.20.3000.034; Tue, 19 May 2020 21:51:47 +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 , Ard Biesheuvel Subject: [PATCH v8 18/46] OvmfPkg/VmgExitLib: Add support for WBINVD NAE events Date: Tue, 19 May 2020 16:50:46 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM6PR11CA0048.namprd11.prod.outlook.com (2603:10b6:5:14c::25) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) 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 DM6PR11CA0048.namprd11.prod.outlook.com (2603:10b6:5:14c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.25 via Frontend Transport; Tue, 19 May 2020 21:51:46 +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: 2a71024a-6482-4d66-a244-08d7fc3ed42e X-MS-TrafficTypeDiagnostic: DM5PR12MB2504: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 040866B734 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YyR/REEgDP7mdgFLCDYWzYSvT+DndT5PSo17WaHPO07/NrSuw5idFrBB9Bq4sw8AIMx6gqkdr1kn2HF5O7cKhuctDMETygcFyDMUClsY+A8AcNcsj6TG4YUzUR6HGuxW0wF1U4H6Q5WpfsZ1CCgBC4cO+V2QQ6VSfhoY0gy4MCuKKgxrz++cXqgxUi6vizi4tHSU2oVwNzMYgziJy76xa4PNLUYb6HuRFezIsMCHSQ5dTJthoG9CCe5CFQEu413qYu1mKW2vpWvSWvxj7j55hSrz5Oi8cR7JGTqU8gy+O4BsXR9g8nIzN6q0GMmyhYUqzk0GN5tdNQhMq9B08Yl3Rfd62/ZvqoFC26CFM/Me1PgU70PSXrfQGbNy6xw9fab/la1fDMuxUCJ5v61LVCuxLeLf4ZYvLeB3OsD9LrECiRTFK044iLk48p7N+aHtC6+zpLoDlKJym2y7MxYceYZCdk1FdAC/qhm+0iLKoseGfON9RfopAHHpvHTiTb4GixeErhsroOFU1UAPPciBnJ0CTK/r7DXD5QGSVc+B8fkzhUyJ2Rm7mbzWzmfeSOR1RIvadJyxDyZqR2UTpqaSx/h+kA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(376002)(39860400002)(136003)(346002)(396003)(366004)(316002)(86362001)(2906002)(54906003)(7696005)(52116002)(2616005)(956004)(66946007)(66476007)(19627235002)(66556008)(36756003)(26005)(16526019)(186003)(4326008)(8676002)(5660300002)(966005)(6486002)(8936002)(6916009)(478600001)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: DJaQSMap0rj4cwNuoKFeDQZiy1lFDu6W56G60VMo3u4kb+CLK9EGhGw/jz+a3ANfavkUnQBFJ/yiuvvuedM+IGtgKnVbVBKnCYxPGjOY/Ahzvwdw5r0BBbltsm2OJruev6kt7HrgTgMpAKhunR2J35PrPAb8V4kVpY+xQQdMKPuqfMq/Wrh/vE2H4SXJzsNBqEl8QyU+mKAIbMneJU6m4Ya+diXyhPX5SKjLt+cMxnrfhbLA2hu7HJlZSq0qgU2WsMLL8aHPICU3F3n+4f7XZgnG/M1cLRoCUqB/51p2oEHGh1q4z93kBJ2NW4wNjMdBt0HFe++36WMcbtzMKo/uCSftO6g2XmBkPvEpxEq9SxULZeLsWhXShY38ttbOg9HrzYcq5AeyyvosZVEPLzztFOkP9nNNV29KSJigVkKS+qmu2tkYwjofJ/wWT+0nCszqdm7crcgH7S90yKwIUamYFp58yYqQcVT3iHBjB/1Fp5c= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a71024a-6482-4d66-a244-08d7fc3ed42e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2020 21:51:47.6631 (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: Om0ziKHyTB9oSkZzQ3W3CZyZSsQEf9pUzTsFwGS7ClYIjOqGc/hC6jf5m4StQodTJk0uXUf8x9zehrfwPcyTtw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2504 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: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Tom Lendacky --- .../Library/VmgExitLib/X64/VmgExitVcHandler.c | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c b/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c index 50199845ceef..0cf26c052b32 100644 --- a/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c +++ b/OvmfPkg/Library/VmgExitLib/X64/VmgExitVcHandler.c @@ -843,6 +843,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, SVM_EXIT_WBINVD, 0, 0); + if (Status) { + return Status; + } + + return 0; +} + /** Handle an MSR event. @@ -1238,6 +1270,10 @@ VmgExitHandleVc ( NaeExit = MsrExit; break; + case SVM_EXIT_WBINVD: + NaeExit = WbinvdExit; + break; + case SVM_EXIT_NPF: NaeExit = MmioExit; break; -- 2.17.1