From patchwork Fri Oct 8 18:04:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 12545933 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44998C433EF for ; Fri, 8 Oct 2021 18:06:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id ED42A6128C for ; Fri, 8 Oct 2021 18:06:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org ED42A6128C Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 9875294001B; Fri, 8 Oct 2021 14:05:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E4FA940008; Fri, 8 Oct 2021 14:05:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 738DD94001B; Fri, 8 Oct 2021 14:05:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0123.hostedemail.com [216.40.44.123]) by kanga.kvack.org (Postfix) with ESMTP id 5B970940008 for ; Fri, 8 Oct 2021 14:05:58 -0400 (EDT) Received: from smtpin35.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 1C3C42D00A for ; Fri, 8 Oct 2021 18:05:58 +0000 (UTC) X-FDA: 78674048796.35.FAC5B3B Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2048.outbound.protection.outlook.com [40.107.92.48]) by imf24.hostedemail.com (Postfix) with ESMTP id A02B4B000BE0 for ; Fri, 8 Oct 2021 18:05:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A7vhsNSX9CPqSkiWrio7uv9j/u1KclLCRQrIwF4OqVOrcdfz0xOFxXqipFgl1NEj88OTMDOOh/oOEiD8AZ/8f/2fmw9NuNvvABPRmxsbDVPi/bvGDCiXXFN2dnCxKu8vU4BKGHxScD+2yr74GdGbYCQwkCZ826qkJ2J7PmlSSbXfWUjul8rE8GzyDXIpZNJie4wIJaVd49e38lfo28QPXYmj4asz/m3Kyg0u624TPU87bZenkISzWncsGnm6X75A0KhqVkznEbKTVkpQh54iu0Yt8TDF2X7Tn5RT8eFNMbzL26NFbIaAAX5WMKQsnpk9NdwZaDjOPSqEGNZWfphYkQ== 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=lhJ5QTkOqqfdTRvFw301utXJNpwDnGphAp0HmfMWdY0=; b=B5EUas+uqWmg2LA8ZC4+7MYAl8Vfb6Zi8g497KECeXlu15WkVin4ICt9K+46do9iU9aU3YOnJMX9BoOcd+/CFLytlCAFFUW9/3BQT/1+uG67jWgJ2IMjLOQPUaMCfGABva+hk+VXv48z0xA717whhZJGH9Cl3D7y5nhwhmXMMfJy1bqo05aHbPP62ujj+4kdp0hgYuy1dXGyTzxhSDGTop5MMXcz039mjB57GEOfkBGDNDNEvIdwX37miy9vw2FIj+x2dOuKcxjQYsfHMPr2yu4aOe66n/CQwU/YUlFwygrbQtqq4tHbpPs/NRd/L52t13IKmLzDBh1V7eHUeE6wZQ== 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=lhJ5QTkOqqfdTRvFw301utXJNpwDnGphAp0HmfMWdY0=; b=azAVqVgRBUUivyvtBoYUwJF732SpswOmmAQyunTe6osTBLGZ/eTq85fEWQLyacP/jNdGFF2UsfX8KzIePAyFEwPlfY2dpjhpF7KdxQQXENcX/6Re/DUj0hlkmCUdKc5nX+9F5QNey/rZVG/u7VNQk/tq9RxtOQG3du9x16C+avw= Received: from MWHPR22CA0042.namprd22.prod.outlook.com (2603:10b6:300:69::28) by MWHPR12MB1648.namprd12.prod.outlook.com (2603:10b6:301:11::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Fri, 8 Oct 2021 18:05:53 +0000 Received: from CO1NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:300:69:cafe::65) by MWHPR22CA0042.outlook.office365.com (2603:10b6:300:69::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Fri, 8 Oct 2021 18:05:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; kernel.org; dkim=none (message not signed) header.d=none;kernel.org; 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 CO1NAM11FT028.mail.protection.outlook.com (10.13.175.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4587.18 via Frontend Transport; Fri, 8 Oct 2021 18:05:52 +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.2308.8; Fri, 8 Oct 2021 13:05:49 -0500 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" , , , , Brijesh Singh Subject: [PATCH v6 23/42] KVM: SVM: Update the SEV-ES save area mapping Date: Fri, 8 Oct 2021 13:04:34 -0500 Message-ID: <20211008180453.462291-24-brijesh.singh@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211008180453.462291-1-brijesh.singh@amd.com> References: <20211008180453.462291-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: 9e37336b-e18d-4389-130b-08d98a86448b X-MS-TrafficTypeDiagnostic: MWHPR12MB1648: 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: CtnGNw8ostUWOEoanhbdw03SkwOV0W1uJf6kNTaEMBoYhXJ8c9xPrjcKxR3b/dvdF2aPOPb7KiBIb1RoqrE83XkABBgYTdHw1S+5TqGrAhjwgIkePbPRVxUzPO7FNXCZmzXtVmN688TXvgicd5KlfEO1o8UTBQL8dn/77m0JDyhgMLy35VW7AUv142qBupL03+h1lhyUs42Ll9Qej6NNxcnuirLEiRWqqDIeXrP+yNVorU2o4mU3IwBcbVivlXVXKH+KpGWHk1QYTV7CB8CS+yB1eM0a06SQ+bIhrIAKBU/nXDnYHAzTFObpPelxX/vlJO+iyJBcwULNQiBcFofrQmTkj3tPXTErTXkhO/5sjtVEMkq8OREH8cMKlsnoYfPiEkaoj095G2P3tRS+KHEXV48YOKm/cWTMr0zQsh8q64WV6xZUw2Zx0pBq0ipM60yaNh+IoFXgNNOVtIk0IiW6/yaR+Xx9kvVge15fawrjG3e5ksSe+9lLVdT+xU/XyZzQfWCEOKMRJy/4okuTI+MD5JypK1bSN3EfiMYcAycOR9NHkmHLJ97QZezewNLcacJpD+sRbfs7+y26gAFFTlCJiCAO1gm0+7WjG7LxkTcag6o/fHuCUll6reqWBJUwQaFUxdw2duDzj+muzh8DrvLa+J9izn7P8dF9fZ3+w7AmEc7ajVyURkwG6yhCH0zGYnSaGgdPzL7wX+mABf5lrs1fPZcJxWBSt1HWVnH/pr0ehbzTACe3jHPHv+Pu4iSMaqdH 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:(4636009)(36840700001)(46966006)(15650500001)(8936002)(47076005)(54906003)(508600001)(83380400001)(110136005)(36860700001)(356005)(316002)(81166007)(16526019)(336012)(6666004)(186003)(70586007)(1076003)(5660300002)(4326008)(86362001)(426003)(2906002)(70206006)(36756003)(7406005)(44832011)(8676002)(7696005)(7416002)(26005)(82310400003)(2616005)(36900700001)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2021 18:05:52.8212 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9e37336b-e18d-4389-130b-08d98a86448b 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: CO1NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1648 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: A02B4B000BE0 X-Stat-Signature: c3kbtngwjujqqomts5ajgehm68tfdq91 Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=azAVqVgR; dmarc=pass (policy=quarantine) header.from=amd.com; spf=pass (imf24.hostedemail.com: domain of brijesh.singh@amd.com designates 40.107.92.48 as permitted sender) smtp.mailfrom=brijesh.singh@amd.com X-HE-Tag: 1633716357-456066 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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. 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 4a4de2454ca3..c75f46cf27db 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 { @@ -408,7 +442,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