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 [40.107.93.64]) by mx.groups.io with SMTP id smtpd.web11.11817.1595390762495615758 for ; Tue, 21 Jul 2020 21:06:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=WUBaAjhI; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.93.64, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UnWv6zisUPF403WBTUS86bukJ0QxcL2bpOXSBXoCZkn1nXco6ESiSiMgs36lWBBYQizK31y7x97E0UjfyUL3mxxM6L2/MHxeQ9Ja6qjs9BXOp55czwKu6RyraiUeJr9vZfCkilMP0J1TjQ3EfioaZvC+PWAA3FVmTv7RaLaVyyY94UW60CLmBiiwFW+/vVtLAc+XPp9+bNhrnh34LBDuLjfEGXNSfTHD65YuIRe46/1wYTP45aD6qJXlW4zVpzl2hVUIo8y5uXsD917GnBl7FqVsVi7pBaYOUZQTThUyfJOp+FRqvSW6sR/LgPwDg64nzsqYM8bglHloRfJNXibO9w== 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=y42cNfhmfyz07xseYeQYH9zbpfMlzMLWf83yCfosPcg=; b=cAI47V/7OpQ784k2xQXe6xEIASxr0XL06CLQSLv0EMh/nN4kpKYiwx6laD9yMNvsqQJbIIlujFoeoktCt9fnYxXGQ2QJ1ZVHTpX6G/8qks/E40Gqrc9KfKZLiDrGRa/qyqMJJfq1gCz+FQ5OOy6cOjNxKWDmFzrjdBc4t7SdEWw0PHGOps4ph30QsiJ/IqU5Rph4eO8S0LEUb3NyMYGIEW+D3dZyV5Rg6f1iGU7rCTr0AEeF8JXWtokOW9HXMI1+LTmZW+fXPPvWd2TjYCd77sVmtG8K7RpCGpIS9rLb2T8mYCcT2oGtlEGDBAGYtBHg2vrGt1vVKbNypqiKugLh7Q== 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=y42cNfhmfyz07xseYeQYH9zbpfMlzMLWf83yCfosPcg=; b=WUBaAjhIUrngAFmXZ69ijDAyAfI5LE0QV6mBqID8BfZCLmErnXh3YWY4fE0Fv2CcknH06+N/UU9ajGPsx7UgnNqMEfE7cSSxRlloxeRjVXWNqzyZbbajxjlx7t0Kw276I7qdQha6sGhUERBM1zGHkgfJmb2V4UAs+xt6KnBnAok= 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 DM6PR12MB2827.namprd12.prod.outlook.com (2603:10b6:5:7f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.18; Wed, 22 Jul 2020 04:06:01 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0%8]) with mapi id 15.20.3216.021; Wed, 22 Jul 2020 04:06:01 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Subject: [PATCH v11 40/46] UefiCpuPkg: Add a 16-bit protected mode code segment descriptor Date: Tue, 21 Jul 2020 23:05:44 -0500 Message-ID: <805cc06d70f87d1744af7b64ac7a7c69d3faf747.1595366363.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) 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 SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.16 via Frontend Transport; Wed, 22 Jul 2020 04:06:00 +0000 X-Mailer: git-send-email 2.27.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b46605a2-f4bc-4c9b-2a80-08d82df48b66 X-MS-TrafficTypeDiagnostic: DM6PR12MB2827: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LnHqZgFiLO6EUyVjXIw2cmQmmNzjqtoHfo9x1wnbEXXs1X3IboQnRQSlPs64MM8wR1l0yWo8p8LEXhbgsNbDDHFLBFnA0zqtD1Zca5muqGmbFApuSBNlu1QcB/eTJuF4E/rP1radzmxzMYQUv6S4mfgKn16GDTyj4+4Nhlx8L1U6NBW5OX/srdUAfsq4BCameUKKFkX09LxyuAnBnHfDAJXRmlZxiwywodzGrgCX/RK31dtiBH49FDJSxios5Pfe10cTAEpXrSv4fL0Mlyr0cGbgXS3TjEDwtIt5W2B6Jjt1P3t6UHU2yErA01+wlJVnIAgaxAmLJaaI9OkIq+QKlCeT5pqOThb34JzyBqzVlC8p0wkUe9MhEBvUE4GPHnAa9aSz8ErCqWh/8C/arHblTsZqlBDReTKuD025AW6Qh9G0MeAkMwxbefC3yKkwTEyNFL0YJzTs0/NZv+NQ6BVLUQ== 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)(366004)(8676002)(16526019)(498600001)(186003)(6486002)(66946007)(7696005)(26005)(66476007)(66556008)(6916009)(956004)(2616005)(52116002)(966005)(83380400001)(5660300002)(2906002)(36756003)(86362001)(8936002)(6666004)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: skYeZ/+lk9lZNZEmPI5wZrWKEgwO3uuc55TEFptM0I40unA5bYATrQS3QpAvFBnwv1le55XqDk6QqOCaxTc8N59RHuuxnnbja7ltX9PINdnqbfooeXlo3r27CVNQbt1fUrN4VTQW42mtMHJT4PTADxxD/xk/ESkc+Q7p47zzBBO6VjtpGuhea3CN9kw0mZWo/z46lYN6pIqBqK7k/zMo/Z9TVejxD8APH/nLoYOPXoOmOGz//Ld0ae8I9Quvm44CS9mZQm+m2NPCcGizEuqK6gR6Kf7Qh2J4VevC5iUXSMWOZhFx0PMQ6TZdMYGgNnZcJR6HqiYRKhlVW3NBcsNhZvyhsu/LdfkMy27cApQHV4UDvJSI3uroQY1c6DIPvUgjxk52iuH5e/G8HMSU5bT3yUcJXjRj9BcyPPuiZfomKqezeClO/VVvUq5IEqBira7ZiFHYorHAVoOBCyD8xPAZcXqkPugvJMLmCqEiC0dJAMM= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: b46605a2-f4bc-4c9b-2a80-08d82df48b66 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2020 04:06:01.0082 (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: GNYw1IdTVHRq7JA4UGwenb4RGMt8B14X54bkWtHRMGVwgctQ66VzTZN644H+vugVfISLGImtJqfDJh8+o8SlwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2827 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2198 A hypervisor is not allowed to update an SEV-ES guests register state, so when booting an SEV-ES guest AP, the hypervisor is not allowed to set the RIP to the guest requested value. Instead, an SEV-ES AP must be transition from 64-bit long mode to 16-bit real mode in response to an INIT-SIPI-SIPI sequence. This requires a 16-bit code segment descriptor. For PEI, create this descriptor in the reset vector GDT table. For DXE, create this descriptor from the newly reserved entry at location 0x28. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Reviewed-by: Eric Dong Signed-off-by: Tom Lendacky --- UefiCpuPkg/CpuDxe/CpuGdt.h | 4 ++-- UefiCpuPkg/CpuDxe/CpuGdt.c | 8 ++++---- UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm | 9 +++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.h b/UefiCpuPkg/CpuDxe/CpuGdt.h index 3a0210b2f172..1c94487cbee8 100644 --- a/UefiCpuPkg/CpuDxe/CpuGdt.h +++ b/UefiCpuPkg/CpuDxe/CpuGdt.h @@ -36,7 +36,7 @@ struct _GDT_ENTRIES { GDT_ENTRY LinearCode; GDT_ENTRY SysData; GDT_ENTRY SysCode; - GDT_ENTRY Spare4; + GDT_ENTRY SysCode16; GDT_ENTRY LinearData64; GDT_ENTRY LinearCode64; GDT_ENTRY Spare5; @@ -49,7 +49,7 @@ struct _GDT_ENTRIES { #define LINEAR_CODE_SEL OFFSET_OF (GDT_ENTRIES, LinearCode) #define SYS_DATA_SEL OFFSET_OF (GDT_ENTRIES, SysData) #define SYS_CODE_SEL OFFSET_OF (GDT_ENTRIES, SysCode) -#define SPARE4_SEL OFFSET_OF (GDT_ENTRIES, Spare4) +#define SYS_CODE16_SEL OFFSET_OF (GDT_ENTRIES, SysCode16) #define LINEAR_DATA64_SEL OFFSET_OF (GDT_ENTRIES, LinearData64) #define LINEAR_CODE64_SEL OFFSET_OF (GDT_ENTRIES, LinearCode64) #define SPARE5_SEL OFFSET_OF (GDT_ENTRIES, Spare5) diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.c b/UefiCpuPkg/CpuDxe/CpuGdt.c index 64efadeba601..a1ab543f2da5 100644 --- a/UefiCpuPkg/CpuDxe/CpuGdt.c +++ b/UefiCpuPkg/CpuDxe/CpuGdt.c @@ -70,14 +70,14 @@ STATIC GDT_ENTRIES GdtTemplate =3D { 0x0, }, // - // SPARE4_SEL + // SYS_CODE16_SEL // { - 0x0, // limit 15:0 + 0x0FFFF, // limit 15:0 0x0, // base 15:0 0x0, // base 23:16 - 0x0, // type - 0x0, // limit 19:16, flags + 0x09A, // present, ring 0, code, execute/read + 0x08F, // page-granular, 16-bit 0x0, // base 31:24 }, // diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm b/UefiCpuP= kg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm index ce4ebfffb688..0e79a3984b16 100644 --- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm +++ b/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm @@ -129,5 +129,14 @@ LINEAR_CODE64_SEL equ $-GDT_BASE DB 0 ; base 31:24 %endif =20 +; linear code segment descriptor +LINEAR_CODE16_SEL equ $-GDT_BASE + DW 0xffff ; limit 15:0 + DW 0 ; base 15:0 + DB 0 ; base 23:16 + DB PRESENT_FLAG(1)|DPL(0)|SYSTEM_FLAG(1)|DESC_TYPE(CODE32_TYPE) + DB GRANULARITY_FLAG(1)|DEFAULT_SIZE32(0)|CODE64_FLAG(0)|UPPER_LIM= IT(0xf) + DB 0 ; base 31:24 + GDT_END: =20 --=20 2.27.0