From patchwork Fri Jan 28 17:17:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 12728860 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6FA5C433FE for ; Fri, 28 Jan 2022 17:18:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343590AbiA1RSf (ORCPT ); Fri, 28 Jan 2022 12:18:35 -0500 Received: from mail-bn8nam12on2081.outbound.protection.outlook.com ([40.107.237.81]:52961 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S235580AbiA1RS2 (ORCPT ); Fri, 28 Jan 2022 12:18:28 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E4Zz32quolaOu4rjWDvWUFZn0hoheBAcJ2xlmlaRuTyUGDDz2DLF68qEVzv2Y4z5uVzWw9uR/o2DIFsmoyWQ6Y78ikyjgizmqzgJ9YrQnC2Zg5MPaMJuX5ggoaQdK3GunkJVh/sUagMzf6i8djoojTYQbs9g5UIrOXQLOq6CdgxFRD8JpDfoNsFzbin0tXGpNiAN1/zkPScFvrzUxAQR/Ur74vzW+WncTcb540f+IyYPS3vRC88m+PIU5N9emv7iv53RijdXgkKUlJ4pw0hhZccsTfp5jAVoPk2BBwkT3hRrRu7MO+N05Z9Nnzgx0vGE7DJEASsHgCN87TB55qSW0g== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ibnvmqw1NFAfG7gMDyxXZLLhlEbSaN9em3nNJOmCJ5E=; b=C3vJNihRtXW7fSwv1P9W4JICQrdl7ApCDc4ahiPWkHWNUT9zU/bw4pyF59XJty5gclHm4RBUODt1ZLCax2u4gzQU6RsbXhHBaJdyX8QgIaQihJOwmE+bSOpqRSaKLUPLINofRHdcKcfhA4zlAuYJpxy+Gl/KAiPY5jz9uMNxBIHpvZl7hi8jnn1khfdutmq7O7IFm8MhNxaV5MxKanjfsvmXYDt6qBKb73E6CjKAgsmIDxNDcPInBuZxQuiBqWrqfIPWE5x7ImofAs8saas+onWaq+l6EJKLgS9xeLmGB8GPSQVnX96BJIDFVDzl4RGPNLZ73jy5BKNy12xL1idtbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ibnvmqw1NFAfG7gMDyxXZLLhlEbSaN9em3nNJOmCJ5E=; b=bRDt0AoNPHKjG8NbYDwqNuxcJQ9fbuyU4J3lXWq++MjucrQNBhZQa37uR0nPkctXXIdamb4T1W9JD53cxczCBWqNXefYqpvodjGe8vvsXC3PLFR3gb231oCsDf44OniE8/GXJlw4p4DIFcMUcieWKHMraF6DkIDd0UpVUkmK2wQ= Received: from DM6PR06CA0061.namprd06.prod.outlook.com (2603:10b6:5:54::38) by DM4PR12MB5101.namprd12.prod.outlook.com (2603:10b6:5:390::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Fri, 28 Jan 2022 17:18:25 +0000 Received: from DM6NAM11FT061.eop-nam11.prod.protection.outlook.com (2603:10b6:5:54:cafe::bc) by DM6PR06CA0061.outlook.office365.com (2603:10b6:5:54::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15 via Frontend Transport; Fri, 28 Jan 2022 17:18:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT061.mail.protection.outlook.com (10.13.173.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4930.15 via Frontend Transport; Fri, 28 Jan 2022 17:18:25 +0000 Received: from sbrijesh-desktop.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Fri, 28 Jan 2022 11:18:23 -0600 From: Brijesh Singh To: , , , , , , CC: Thomas Gleixner , Ingo Molnar , Joerg Roedel , Tom Lendacky , "H. Peter Anvin" , Ard Biesheuvel , Paolo Bonzini , Sean Christopherson , "Vitaly Kuznetsov" , Jim Mattson , "Andy Lutomirski" , Dave Hansen , Sergio Lopez , Peter Gonda , "Peter Zijlstra" , Srinivas Pandruvada , David Rientjes , Dov Murik , Tobin Feldman-Fitzthum , Borislav Petkov , Michael Roth , Vlastimil Babka , "Kirill A . Shutemov" , Andi Kleen , "Dr . David Alan Gilbert" , , , , , Venu Busireddy , Brijesh Singh Subject: [PATCH v9 04/43] KVM: SVM: Update the SEV-ES save area mapping Date: Fri, 28 Jan 2022 11:17:25 -0600 Message-ID: <20220128171804.569796-5-brijesh.singh@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220128171804.569796-1-brijesh.singh@amd.com> References: <20220128171804.569796-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0386d6f5-475a-4218-9825-08d9e28231a7 X-MS-TrafficTypeDiagnostic: DM4PR12MB5101:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I6XED3ZVAnjugEi70MZo05sImhY6CPpJcORB1IWVJTIsWgMmKs279qKVMAJsUAjWmq2a4uwmtdAkUpKXY9xKs7Zkcj3x+Mp8FG9G8wmA6qOUUd8pW4Ew6Xz82PUMrEThjEuiO7JrEIk2qnQ8udL0zMo6qNTtEBG+tFNuSWg6qM6lwQh4pz40rSg2Xm5HRkmY4e/wjeLaL31kpM66j7sgG0UVmFJJfJD2efziLOSEaXo+LMdONw9qTsHszzDLIW+qoofK/Pmg6wECBWalL6IHWptUP1LoNa11XjclLIJnSYWmvxfB5rjP4i2XVtyuuIn1JCSFiJNhAJtXYpK3WzFlbWi/I/zpR9TVp8yPfDbj9bKGOc09xlbZuX8x++2wkACyd6/wo6Ri1pNRkYuYfp9zAGjbkzlSPXVxzml5vevN8VX9W3+4dtPJXXC+iMUFhGGNXXl0n4KDrgP3C0KwUuZHdm4zgQbWpZnJWDJxyvuFZLeGFmFpHpvx4xOO+3XkSyFIoYcjWYtxDKcjOVwVNL4rpQyhNk65GChTKiogrdyxBlIhdqTD7L5I4jlTpSMotmi/q8sFe9vMp7Ql9qZ/oOzf89UToKbhBpY/eBMTChvV7UA7cC3PSjtiZOUUGHLuOg1sEweLG2ejyhsVLNjTu0f9MSix8b/ckZCXAgMb7K+NSYLQLKEg8/kksrxfJrsgqqcAulN4wFXml6KfaZK+dhb52E8iBHTu0uZuxUmyP4gNKPw= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(15650500001)(40460700003)(2906002)(2616005)(336012)(5660300002)(36860700001)(7406005)(7416002)(36756003)(47076005)(508600001)(426003)(110136005)(8676002)(4326008)(8936002)(83380400001)(316002)(54906003)(82310400004)(7696005)(16526019)(356005)(86362001)(44832011)(26005)(1076003)(81166007)(70586007)(70206006)(186003)(36900700001)(2101003)(20210929001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2022 17:18:25.5391 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0386d6f5-475a-4218-9825-08d9e28231a7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT061.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5101 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Tom Lendacky This is the final step in defining the multiple save areas to keep them separate and ensuring proper operation amongst the different types of guests. Update the SEV-ES/SEV-SNP save area to match the APM. This save area will be used for the upcoming SEV-SNP AP Creation NAE event support. Reviewed-by: Venu Busireddy Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh --- arch/x86/include/asm/svm.h | 66 +++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 16 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 5ff1fa364a31..7d90321e7775 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -290,7 +290,13 @@ struct sev_es_save_area { struct vmcb_seg ldtr; struct vmcb_seg idtr; struct vmcb_seg tr; - u8 reserved_1[43]; + u64 vmpl0_ssp; + u64 vmpl1_ssp; + u64 vmpl2_ssp; + u64 vmpl3_ssp; + u64 u_cet; + u8 reserved_1[2]; + u8 vmpl; u8 cpl; u8 reserved_2[4]; u64 efer; @@ -303,9 +309,19 @@ struct sev_es_save_area { u64 dr6; u64 rflags; u64 rip; - u8 reserved_4[88]; + u64 dr0; + u64 dr1; + u64 dr2; + u64 dr3; + u64 dr0_addr_mask; + u64 dr1_addr_mask; + u64 dr2_addr_mask; + u64 dr3_addr_mask; + u8 reserved_4[24]; u64 rsp; - u8 reserved_5[24]; + u64 s_cet; + u64 ssp; + u64 isst_addr; u64 rax; u64 star; u64 lstar; @@ -316,7 +332,7 @@ struct sev_es_save_area { u64 sysenter_esp; u64 sysenter_eip; u64 cr2; - u8 reserved_6[32]; + u8 reserved_5[32]; u64 g_pat; u64 dbgctl; u64 br_from; @@ -325,12 +341,12 @@ struct sev_es_save_area { u64 last_excp_to; u8 reserved_7[80]; u32 pkru; - u8 reserved_9[20]; - u64 reserved_10; /* rax already available at 0x01f8 */ + u8 reserved_8[20]; + u64 reserved_9; /* rax already available at 0x01f8 */ u64 rcx; u64 rdx; u64 rbx; - u64 reserved_11; /* rsp already available at 0x01d8 */ + u64 reserved_10; /* rsp already available at 0x01d8 */ u64 rbp; u64 rsi; u64 rdi; @@ -342,16 +358,34 @@ struct sev_es_save_area { u64 r13; u64 r14; u64 r15; - u8 reserved_12[16]; - u64 sw_exit_code; - u64 sw_exit_info_1; - u64 sw_exit_info_2; - u64 sw_scratch; + u8 reserved_11[16]; + u64 guest_exit_info_1; + u64 guest_exit_info_2; + u64 guest_exit_int_info; + u64 guest_nrip; u64 sev_features; - u8 reserved_13[48]; + u64 vintr_ctrl; + u64 guest_exit_code; + u64 virtual_tom; + u64 tlb_id; + u64 pcpu_id; + u64 event_inj; u64 xcr0; - u8 valid_bitmap[16]; - u64 x87_state_gpa; + u8 reserved_12[16]; + + /* Floating point area */ + u64 x87_dp; + u32 mxcsr; + u16 x87_ftw; + u16 x87_fsw; + u16 x87_fcw; + u16 x87_fop; + u16 x87_ds; + u16 x87_cs; + u64 x87_rip; + u8 fpreg_x87[80]; + u8 fpreg_xmm[256]; + u8 fpreg_ymm[256]; } __packed; struct ghcb_save_area { @@ -410,7 +444,7 @@ struct ghcb { #define EXPECTED_VMCB_SAVE_AREA_SIZE 740 #define EXPECTED_GHCB_SAVE_AREA_SIZE 1032 -#define EXPECTED_SEV_ES_SAVE_AREA_SIZE 1032 +#define EXPECTED_SEV_ES_SAVE_AREA_SIZE 1648 #define EXPECTED_VMCB_CONTROL_AREA_SIZE 1024 #define EXPECTED_GHCB_SIZE PAGE_SIZE