From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (NAM02-CY1-obe.outbound.protection.outlook.com [40.107.76.43]) by mx.groups.io with SMTP id smtpd.web09.13473.1574280451106774991 for ; Wed, 20 Nov 2019 12:07:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=SAvzCjwo; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.76.43, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M6nUol8h//1EfPU+gNrTBQ/BWr/tx93iXzJIYz3/xajn+5diKwdkzU5WRF34cqegpj9MGdi2Z296WQlQfnPGdGpW0TNIBDHTRVjaSHQGi/KhfmRLED8PSVc6w1MxgqG7qoMDbXFmZPSp4XD8QnqY+/YrGW+nTSPOMtpeDo42uEtaN/NV3Mik8DK13nN18oJjfolN3t0GULdJyPeXOXQjP55Uqof8Jlh8wJNORdK4Qio2o2Dho0UA0fZ66BEUf/W1Tn1MhfEJ+rg5H9uI9zBRJI+4WZHDS8E7bPHI5jH1Ees37htMqe9rRt4oJdJy0Y+Mn/H+pYEGgzczU7gzucDHRA== 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=T4Z4zjlhuMoeBpGuJ1xjDY10SfUD03tf4zfvPvscC7g=; b=HKjM/6Cf91mLpF5SGlnEdCgscEH8N3Q5E3QZVX9nhq1ywP0gwBDa9w1AYwaO3fq+5zYOzgMdjYcwz42pypsZNe5I5Flvh7lJfdZo9caEDfK2MVoIScccuKxX4jt3Xd+O14eMUW9phRSmQOcOOXnP0DcpQ9K3NFWjQsVGqd8KLjPizsAj0iXWaTluSKn7Lq2vkK9JUTWxBooO65eRjWD2i8gqbDnxsafZf0pBvanH8jx8SM/0ThHtC2ylS5c0djqExeu15QNecIMqLa/AyZ8KJaZsChBnoTVj9hwSO/Rw9AqypDvncijXCCgWr93PZJa8U3pHenotpdwf3HrIFDD3bQ== 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=T4Z4zjlhuMoeBpGuJ1xjDY10SfUD03tf4zfvPvscC7g=; b=SAvzCjwo364BbZKMwgX5xSP2NQVNl0A4SaX9uQkmKSByDlZ6kgU36W/8yFVBO/b3HmlkpDlkpfHu4q5X1ZYXwSMupPIA8GSkpDTNcJeRozHP7QopQwh2aQIgpUxOanx5Ac/Bbiz7jyzlNRnkanr9AqI6k6SQh67da1dd+JaLE3s= 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 DM6PR12MB3675.namprd12.prod.outlook.com (10.255.76.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2451.28; Wed, 20 Nov 2019 20:07:29 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::dd0c:8e53:4913:8ef4]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::dd0c:8e53:4913:8ef4%5]) with mapi id 15.20.2451.031; Wed, 20 Nov 2019 20:07:29 +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: [RFC PATCH v3 12/43] UefiCpuPkg/CpuExceptionHandler: Add support for MSR_PROT NAE events Date: Wed, 20 Nov 2019 14:06:34 -0600 Message-Id: <5a7680d8c4b3ce3d8c94d74ee4795c75e761b2ed.1574280425.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM3PR12CA0087.namprd12.prod.outlook.com (2603:10b6:0:57::31) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 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: 15df5e83-b9d2-4c2d-c5c7-08d76df5451a X-MS-TrafficTypeDiagnostic: DM6PR12MB3675: X-MS-Exchange-PUrlCount: 1 X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-Forefront-PRVS: 02272225C5 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(346002)(396003)(39860400002)(366004)(136003)(189003)(199004)(2361001)(50226002)(81156014)(81166006)(8676002)(2906002)(6486002)(99286004)(66476007)(486006)(47776003)(66556008)(25786009)(2616005)(476003)(54906003)(11346002)(118296001)(8936002)(316002)(2351001)(7736002)(305945005)(66066001)(6916009)(86362001)(16586007)(3846002)(6116002)(48376002)(14454004)(478600001)(966005)(5660300002)(66946007)(446003)(76176011)(36756003)(51416003)(6506007)(386003)(50466002)(52116002)(4326008)(6436002)(6666004)(6306002)(6512007)(19627235002)(26005)(186003);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB3675;H:DM6PR12MB3163.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A: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: AnaNJqIB+Al311/oKpeUm9rPcskDRamZL59Yn+9/y0fQ+nlHWCrt/P4TQBtzBOXn456rlCvjtQZm+LE/kD8TP6KhwHzHpx1tywkcVFxA097v5W4pB9hiUFHRS1D7WCwoAh/78oTnqigkLucXaIjqoELcJB3jBhQWCpS56gXA1KX8O+0h0AyxpCZwwlA7deZhDEo7TQtjZNl9hDNsPbA/LCX1yQlxmA5+icSdXucbVD3Klhre1NcOlwp+Kw/VptncKBRUnynuNMhs3h2omUsB2DSUgQ5kBRn4KXNu0d7Ucf8KO40dHSPyYRpXpTRK8wNGtRPJmKm1TSs0BGs3oONErH3W5Fe06ror4uXCVnfDFJ/Xq+QLN9LIDGViFSfbUYICqcCavsG5j7wqNL8oYecS55/N63XlPOfEnAQVmIvzTm7tcJvni//X5t97Jzo8HfG3M5gqjTf3m8dryJDtnoZOR43XA7jysN+qM4CWCSnyQXA= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15df5e83-b9d2-4c2d-c5c7-08d76df5451a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2019 20:07:29.2180 (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: tFJc0dQm97JAXM2gQwNZNMV1d6bqbTBu5UlhwQslqL+oOUafF8JKqvuxz0rd+H5zKNdW5g/0OPgTYPk8nWuyvQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3675 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a MSR_PROT intercept generates a #VC exception. VMGEXIT must be used to allow the hypervisor to handle this intercept. Add support to construct the required GHCB values to support an MSR_PROT NAE event. Parse the instruction that generated the #VC exception to determine whether it is RDMSR or WRMSR, setting the required register register values in the GHCB and creating the proper SW_EXIT_INFO1 value in the GHCB. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Tom Lendacky --- .../X64/AMDSevVcCommon.c | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c index 56f0040fff9f..578fee7deaad 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c @@ -285,6 +285,54 @@ UnsupportedExit ( return Status; } +STATIC +UINTN +MsrExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINT64 ExitInfo1; + UINTN Status; + + ExitInfo1 = 0; + + switch (*(InstructionData->OpCodes + 1)) { + case 0x30: // WRMSR + ExitInfo1 = 1; + Ghcb->SaveArea.Rax = Regs->Rax; + GhcbSetRegValid (Ghcb, GhcbRax); + Ghcb->SaveArea.Rdx = Regs->Rdx; + GhcbSetRegValid (Ghcb, GhcbRdx); + /* Fallthrough */ + case 0x32: // RDMSR + Ghcb->SaveArea.Rcx = Regs->Rcx; + GhcbSetRegValid (Ghcb, GhcbRcx); + break; + default: + VmgExit (Ghcb, SvmExitUnsupported, SvmExitMsr, 0); + ASSERT (0); + } + + Status = VmgExit (Ghcb, SvmExitMsr, ExitInfo1, 0); + if (Status) { + return Status; + } + + if (!ExitInfo1) { + if (!GhcbIsRegValid (Ghcb, GhcbRax) || + !GhcbIsRegValid (Ghcb, GhcbRdx)) { + VmgExit (Ghcb, SvmExitUnsupported, SvmExitMsr, 0); + ASSERT (0); + } + Regs->Rax = Ghcb->SaveArea.Rax; + Regs->Rdx = Ghcb->SaveArea.Rdx; + } + + return 0; +} + #define IOIO_TYPE_STR (1 << 2) #define IOIO_TYPE_IN 1 #define IOIO_TYPE_INS (IOIO_TYPE_IN | IOIO_TYPE_STR) @@ -553,6 +601,10 @@ DoVcCommon ( NaeExit = IoioExit; break; + case SvmExitMsr: + NaeExit = MsrExit; + break; + default: NaeExit = UnsupportedExit; } -- 2.17.1