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 []) by mx.groups.io with SMTP id smtpd.web11.13455.1574280447980323941 for ; Wed, 20 Nov 2019 12:07:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=KvcMT7IY; 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=Iavm16P8Xr7OZoH7cglbl9mqVSijvdDqeI+9+MxikxoeJ1NmHCnPO8iAvfRn0oK83AfVITd4jnBwIKFFoMP2U3EOeSokBM2QvmqC3VeSVTDqTdaxfSyyMRdKd5wVllHKsZF62Nk/awqsliqXDcqMOxQJlv4pBsjXfHbtC5wfkMJlDlKQk+hT9SqHSZmfuNS3KwTlWMryOLse+0FN9jNbsj8avx9mJOZD5E211pFIMnDgVLvGY6vpt+cguZOlXFfbkczLevQz0OHbcI5X926MUu5BQ2YkWAWH3UpI2bUDqs8y7+Z7LXW/wxQrR6EfAl3R8t1nzK4pmR+/Ymv9/G9jjQ== 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=TL91MaI9+ncIEecplcln/JUT9/cMwXG441zKLQYCOqI=; b=oGa3E5TxnyZ3/oaABZjMxtKo2CVT5Jt0pp6QOQ0GBLv+hmL+aFW+cPDZrvZg/PCjWXCwH1KnxQ/uEoKB+Zv1yKg9SkZFeTS8IuLVD/Tfmj8rSWlDpbReaC9v0nvUv4x4VOhNTOzu+fiVxgqTmeDsbnf92PXiitqgLSkPAuHKrz3kfaKBaHJ8xSiRDJJobWoRzAaFLHvmqz2p48Adt/nomNBTsF9Hl0vHgJD9QBEy2FiNIHSDkiL//zwCvF6SB0jkr85MwpH8FIKDxwa/A+sG1m8ORmFsQdBEhgqDF37YOUchlkQKP2oAEvvMHMwABeDSg/Rgm0sjfG7qta/1fcI2/w== 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=TL91MaI9+ncIEecplcln/JUT9/cMwXG441zKLQYCOqI=; b=KvcMT7IYWphVw7l3MfIvd6CANxidHbjUerS18xamhdv520oE+psiAhqwjYyxPueWNKQngekHAdBmsKRSlgwN1Kmm4o1tnA1HX3muqRNNFyi3/YbiJEAyZXp2llEHZQ+I2YDwO4OunMjUq0E5P4OXk4/ivDhJxWOi0S6N79vjV4w= 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:28 +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:28 +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 11/43] UefiCpuPkg/CpuExceptionHandler: Add support for CPUID NAE events Date: Wed, 20 Nov 2019 14:06:33 -0600 Message-Id: <27ebc0cb5eff3ab17ab83043d3dc56bcb4f86d0d.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: 63c39f39-7c02-457d-cfc6-08d76df5448a 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:6108; 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: fmmE9DdTjgZS9hVZEr4dl/g3DIGOUbzekkLsja0u6vEUtsRUlQXsg65D1p8tmCjJ8wGx6Vnnl6jlTuaDC7HCXnDrbcw0taLVpN93xa8aAnhcK6kD9S05iQ1JDmZk8bCN2Ft53uVabX6qkvoc8+3BfwvIKCzPMjyJ+Bi7am7A8uak7ba8Ew/MoX/Gu+hfkRxgrqHCl2Tsvrb4evz2Zh49vny4ejGpGZfmO++n8TJ2T3Li7Tlh5wxBOrCzVSQc04ZzgheMpGl+sqFzR/zfpS+ae9PFAHV1TRur1MYcsSA2pwFj/QgP5ynCUls6l73OO6VmcNJdDTGWalmVKHQEBL5om2LgeGjRC2eRz5b2/rjNe3sBAvWrot6d5iH9Euk69UA4n/lnI0nHWnN53F5axdfm1xw8ukv/ml7PddAh5ShTimu5TqsBSp4JGySP+rGtgKFsgf8nOtjBxAlChL8nR72FMQ3k1PnO33stc9XNS3kma0A= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63c39f39-7c02-457d-cfc6-08d76df5448a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2019 20:07:28.2106 (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: pOHGdhxtIzCKFFJg6dBqN6Jio4bpEDA5Az0fq4jkYVSsWcB1m2+yVaraSAfDrwyUs3amY/ApHiks1C1IKzbtlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3675 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 Under SEV-ES, a CPUID 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 a CPUID NAE event. Additionally, CPUID 0x0000_000d requires XCR0 to be supplied in the GHCB, so add support to issue the XGETBV instruction. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Tom Lendacky --- .../X64/AMDSevVcCommon.c | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c index 98b62c21bbce..56f0040fff9f 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/AMDSevVcCommon.c @@ -11,6 +11,8 @@ #include #include "AMDSevVcCommon.h" +#define CR4_OSXSAVE (1 << 18) + typedef enum { LongMode64Bit = 0, LongModeCompat32Bit, @@ -488,6 +490,45 @@ IoioExit ( return 0; } +STATIC +UINTN +CpuidExit ( + GHCB *Ghcb, + EFI_SYSTEM_CONTEXT_X64 *Regs, + SEV_ES_INSTRUCTION_DATA *InstructionData + ) +{ + UINTN Status; + + Ghcb->SaveArea.Rax = Regs->Rax; + GhcbSetRegValid (Ghcb, GhcbRax); + Ghcb->SaveArea.Rcx = Regs->Rcx; + GhcbSetRegValid (Ghcb, GhcbRcx); + if (Regs->Rax == 0x0000000d) { + Ghcb->SaveArea.XCr0 = (AsmReadCr4 () & CR4_OSXSAVE) ? AsmXGetBv (0) : 1; + GhcbSetRegValid (Ghcb, GhcbXCr0); + } + + Status = VmgExit (Ghcb, SvmExitCpuid, 0, 0); + if (Status) { + return Status; + } + + if (!GhcbIsRegValid (Ghcb, GhcbRax) || + !GhcbIsRegValid (Ghcb, GhcbRbx) || + !GhcbIsRegValid (Ghcb, GhcbRcx) || + !GhcbIsRegValid (Ghcb, GhcbRdx)) { + VmgExit (Ghcb, SvmExitUnsupported, SvmExitCpuid, 0); + ASSERT (0); + } + Regs->Rax = Ghcb->SaveArea.Rax; + Regs->Rbx = Ghcb->SaveArea.Rbx; + Regs->Rcx = Ghcb->SaveArea.Rcx; + Regs->Rdx = Ghcb->SaveArea.Rdx; + + return 0; +} + UINTN DoVcCommon ( GHCB *Ghcb, @@ -504,6 +545,10 @@ DoVcCommon ( ExitCode = Regs->ExceptionData; switch (ExitCode) { + case SvmExitCpuid: + NaeExit = CpuidExit; + break; + case SvmExitIoioProt: NaeExit = IoioExit; break; -- 2.17.1