From patchwork Mon Mar 7 21:33:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 12772494 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 55D24C4167D for ; Mon, 7 Mar 2022 21:34:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245582AbiCGVff (ORCPT ); Mon, 7 Mar 2022 16:35:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245546AbiCGVfc (ORCPT ); Mon, 7 Mar 2022 16:35:32 -0500 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2051.outbound.protection.outlook.com [40.107.243.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A986E6E2B8; Mon, 7 Mar 2022 13:34:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YXOcyIuK73yRWv0XkHWN+ntqnMe50jtJZC78PKve2EfGcs/g0wNfjD7DBZLgugrbpwEhlu4dAVR24Go85kbfDopfpw9zSDnaqaX17u0vxUsHqCLosR3JisbJL1D7x9NU9EznRcwrFXAbYo4UrqzNv7avILytVIhChGEn9aje5WYjs+HiLjycXshKmRHScYrV3sThdlXpEETmqdzHK+FSSYHJHV0ADikxg6O+tzW3aEoDcylnKmTll47m4oFg5KI0zLX8m5fOMKuXHZ+ipaSH6TszvWw95yv9kk/VP0YVq/koCNyKdlmloWlno//COPulRxskK5fTyz8wzpCcekOHHg== 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=oMPf/F0BVYKen5v2UIcIBJslo+MwG3tU9jGuazT1lTw=; b=QNOT0gmkrYt1vaZeSMWM3EL76+9yhAcA45dSiZbxyAJyqp+uwv4mBbQa59y9S96K4m/f/CWyfbRxtDblA60pQjnYZaZrTuIAZmx5vwhYmc7XbUg0FCHy8QTMgPQ+654szYl58HaRmrkkmQYPFrk9j4XuBDKDvIxKCMB7pQ+/W5hJRbfwXanTyKFEcpTZ4jWqTWcHhR8mUKAbIopdM1ixMpd5eIme1S92Jcw16Y9afsMk23RN3EeohKn0juS+dO32K5BbjUm8QPhY3hmqUGRXsbbfzlFoJkyfi28l04pbCCRAi8/s574Nvg/wduB7bWecjlBWTIXn4oPXXg2rvxz9Wg== 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=oMPf/F0BVYKen5v2UIcIBJslo+MwG3tU9jGuazT1lTw=; b=hmIIyFTx/ssyfaBsf8FQ2ia7WTNezSzQ63ZnBV0urtsSFO4LopnOUiDqx30OXDLhv3nZ4PdMgDXGnKLIKds9gYvTYG53LH5I+VLudBFnsJxUX1uxB7l62u+DCa3GpU29C+Kh8WE+xJ1bqPhw8sn5qIVcb2ER/Z3MxHNOQl/NaYs= Received: from BN9PR03CA0390.namprd03.prod.outlook.com (2603:10b6:408:f7::35) by DM6PR12MB3740.namprd12.prod.outlook.com (2603:10b6:5:1c3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.17; Mon, 7 Mar 2022 21:34:26 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f7:cafe::34) by BN9PR03CA0390.outlook.office365.com (2603:10b6:408:f7::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Mon, 7 Mar 2022 21:34:26 +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 BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5038.14 via Frontend Transport; Mon, 7 Mar 2022 21:34:26 +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; Mon, 7 Mar 2022 15:34: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 v12 04/46] KVM: SVM: Update the SEV-ES save area mapping Date: Mon, 7 Mar 2022 15:33:14 -0600 Message-ID: <20220307213356.2797205-5-brijesh.singh@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220307213356.2797205-1-brijesh.singh@amd.com> References: <20220307213356.2797205-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a17c48b9-53fe-445e-3a57-08da00824111 X-MS-TrafficTypeDiagnostic: DM6PR12MB3740:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /Z+fnQJeuwoMl2C2AfHG6gSP7Z1P0ERSaWeeg4oNCcYC1+JipBt1rvu/S2vgk1sf53HtcqM3FBxRLVHcMWURJHgx6AL9ESyfgySAON2+9Py4GWLRAdpu8fzjuu8EXS60WGy1BCDeCGb6UHPC8DQj7nWs6c6Ne33VhhpxpXY2JstxVOnf2HH0/fHrJCjqX/jJ1U1q15lIhQwiZ9TsKVyM1dDnIIiOi9dfxu0R4ZBmjRr6r89HrNAW19Ba1CBaKTD6D9OH9YeW0LoHcWcKRGHM/w9bwxwxlohRd9ww41E4rvdzioJZKqKFeHdueXM2qoih4ZsTom/iSSGzW73PucpbGOOEKugppeuLBrtC66hxUN/Gp5dscBqekFc/eUELqG/okcT3R/4I2iLslTw3Zym4AHg8UgdzNvppO50iAX6ckF90vZ/uh4wNSL0YeuCffQNsudb84pKCzQgcAQGMuh2TTHEmbJLX8eE7Er6biQi9hM9bCjCOUTIKaAVwdAA1gjG3Mq8pd7Yr2jrlLQA8KCVE65PtLR4MDW+Ho8p/bsj/LAA9FteaXbYWo6iWc5U7UrmxEvyyprZhlvQ7XonewHVXY45NEebs6+PLKl4eUkQkh+xzS1N5ce0eE5HVITaWXcqsbNC5duM1qLbpcUw2Q6woj5Aik+M9a9h+Y0E7VfSOANIwFYNZNIp8rK9CwpjcFUnZwuWxuq1evYK5rEQ4EAq7nmWJY1w+h10nT+URofw0SnE= 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)(83380400001)(82310400004)(36756003)(316002)(2616005)(16526019)(1076003)(426003)(336012)(54906003)(186003)(26005)(110136005)(81166007)(44832011)(15650500001)(36860700001)(2906002)(5660300002)(86362001)(4326008)(40460700003)(356005)(7696005)(6666004)(8936002)(8676002)(7416002)(508600001)(47076005)(7406005)(70586007)(70206006)(36900700001)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2022 21:34:26.2961 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a17c48b9-53fe-445e-3a57-08da00824111 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: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3740 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 eae5c7ab9c6c..7ab508fd8c4c 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -326,7 +326,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; @@ -339,9 +345,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; @@ -352,7 +368,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; @@ -361,12 +377,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; @@ -378,16 +394,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 { @@ -446,7 +480,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