From patchwork Wed Feb 9 18:09:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 541256 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 A6B7EC4167E for ; Wed, 9 Feb 2022 18:11:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238690AbiBISLh (ORCPT ); Wed, 9 Feb 2022 13:11:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238631AbiBISLa (ORCPT ); Wed, 9 Feb 2022 13:11:30 -0500 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2071.outbound.protection.outlook.com [40.107.212.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 732D6C05CB97; Wed, 9 Feb 2022 10:11:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a6JSAct7IUZpFy/1fjp6ttU8AqNG2IHIRG6Be6t5/Fyv5OVZsciYaO1NbiclNHbKJWkHgOSmOildeifnmJ/eAoSy5hWHPNjwNA2eS1PZkCoYXewqwKFrD7FAxUyYFaU+fn/DIDLiS5HkaE1DZYuc+nV7264oynsAkzRp1Vi9aiYPbCpCmQegmd7+bjhHoclP6+LbAHp7nZ1+ltttuLz3tgYi14TnOJ1z16TCMeGDfo2RCL2RMJflaNFPh5FWIE+CvnpBcZk6A4QIfskhQHsC4owiM62b+EipZN9Hx6/cIJZh6aOxv+zRgVBANnmubf8Wa/OfCBezkFrzvvvPVamF9g== 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=vqnwVrEtHATvzrrd42KATgZiqqkEKwU59Ww2A88lbjA=; b=E5o4kcYf7/I1j0mMYfjg+UOIbltymy0eyS8+1nBSAEUxmuTUNdu6uEWk2dZL61FUw5rFbDttrewLXlu5+HbBvgloIwBRNfGtp7YFqxPNauy6dNAJ9SVD6NYR8WnEJYF1bt7kw0AGaa2f1zYNf8G1henY/U5dG2ERb5Xc2uOuvF9hLYtdSPJWazvZ4KhM6qKNooC/+OqGa3eBXaLthIotZSEcim8y4gN4ys49n5LWe6Lbs4PAXBajoM3LdLtGbDMkZdLu1iY41KYTDQuymTg+AnqUZQi9KbCT0kVRiInD//rQSj6j9jXH8D7nfH4SKRQg7GsXH5p3aw1kG+8dAbsggg== 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=vqnwVrEtHATvzrrd42KATgZiqqkEKwU59Ww2A88lbjA=; b=iGidzl4Y+EcgJlqlNcy5JJNEBpA5tC1JwQ8YgSloOFMo0qZeFt5lz+Q7q8GWN3F7g934a/0/tw131phwAFwEabRA2VKEd5obeTAPbhRPUEOY/WYV4dZOV0OFsDzQ3E34RGsj3xDknCreECMWNqhAEVSiu0nbQVqmavQPhmLXpI0= Received: from BN8PR03CA0025.namprd03.prod.outlook.com (2603:10b6:408:94::38) by BN7PR12MB2802.namprd12.prod.outlook.com (2603:10b6:408:25::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Wed, 9 Feb 2022 18:11:28 +0000 Received: from BN8NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:408:94:cafe::c6) by BN8PR03CA0025.outlook.office365.com (2603:10b6:408:94::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 18:11:28 +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 BN8NAM11FT005.mail.protection.outlook.com (10.13.176.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4975.11 via Frontend Transport; Wed, 9 Feb 2022 18:11:27 +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; Wed, 9 Feb 2022 12:11:25 -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" , , , , , Brijesh Singh , Venu Busireddy Subject: [PATCH v10 01/45] KVM: SVM: Define sev_features and vmpl field in the VMSA Date: Wed, 9 Feb 2022 12:09:55 -0600 Message-ID: <20220209181039.1262882-2-brijesh.singh@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220209181039.1262882-1-brijesh.singh@amd.com> References: <20220209181039.1262882-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: 8af501bd-bd88-4466-5803-08d9ebf79775 X-MS-TrafficTypeDiagnostic: BN7PR12MB2802:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VCQNjFtMYF8x3rhGEioKcJn9ZQ+ZIndycKxgiLT0A6nIiNdedqoJd6XsYEoTl3alH8WGSK2fR5GNPLnAOOs76Z0k4dvpY/nl2+wpQLy0F7OL2jLzumm1mIwcgqN4/9H9XVJjZSA1daozW9zhPoGO6epyae48accDyzhIJROk6S6SBowxoPqw21Syjs8p+xOqqroZ0ey6vVOH0YwF1xjT2GHIkRV7Cj80ws3TCRoWlwev2901YSdgx4HYVOiJH1AhFhFE0U2D0zMjgEcfvDLu2P02PN76Q+khk9YLqw4RLhTwf3PpClXCt+lEUKJEbm2qNZXkfLpZpbm2JiTd/nXOKB6ZPTCtOlHWYiorH6A4f64au3cA0uXd+oGlXz2aVdYtHGb6RgbM3U3r8Xsqbli/Xkc2Qw0HD7E/LMbBf8RtBoWfzTmrXOXbwWI3gI5WNibZKIaOvSBOafYSfGQO/y+f8Lo5xP9BnKErpz9z5SXmoYWxTq25bZs/Nu9WDkd4MHTrj0bmKZTv3opFuaoxBit6tU0+LTTxax1vz6pfGmVdmDgjWasqy1dmXo6IOeBF5wxwCJhsLTOXnBnrdFVms9z+3TcblpFEy3ydLwezuie4XGJkWiNNnd0GTJ1wf/8doTcFVkmPn/Hgtx/H8h1D3lLhePE+ezw6zgypZPxo829G3a1L7y3csCvJWumpgZ+izE8G35OsoMQpUbwWWQR5AUdv4NLjqnggfKabIpurxcNy7mg= 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)(40470700004)(36840700001)(46966006)(47076005)(4326008)(5660300002)(7416002)(8676002)(7406005)(40460700003)(83380400001)(81166007)(356005)(2906002)(36756003)(82310400004)(8936002)(508600001)(44832011)(54906003)(6666004)(2616005)(16526019)(336012)(186003)(426003)(1076003)(316002)(36860700001)(110136005)(7696005)(86362001)(26005)(70206006)(70586007)(2101003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 18:11:27.9353 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8af501bd-bd88-4466-5803-08d9ebf79775 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: BN8NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2802 Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org The hypervisor uses the sev_features field (offset 3B0h) in the Save State Area to control the SEV-SNP guest features such as SNPActive, vTOM, ReflectVC etc. An SEV-SNP guest can read the SEV_FEATURES fields through the SEV_STATUS MSR. While at it, update the dump_vmcb() to log the VMPL level. See APM2 Table 15-34 and B-4 for more details. Reviewed-by: Venu Busireddy Signed-off-by: Brijesh Singh --- arch/x86/include/asm/svm.h | 6 ++++-- arch/x86/kvm/svm/svm.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index b00dbc5fac2b..7c9cf4f3c164 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -238,7 +238,8 @@ struct vmcb_save_area { struct vmcb_seg ldtr; struct vmcb_seg idtr; struct vmcb_seg tr; - u8 reserved_1[43]; + u8 reserved_1[42]; + u8 vmpl; u8 cpl; u8 reserved_2[4]; u64 efer; @@ -303,7 +304,8 @@ struct vmcb_save_area { u64 sw_exit_info_1; u64 sw_exit_info_2; u64 sw_scratch; - u8 reserved_11[56]; + u64 sev_features; + u8 reserved_11[48]; u64 xcr0; u8 valid_bitmap[16]; u64 x87_state_gpa; diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index a290efb272ad..cb447eecb9ac 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3095,8 +3095,8 @@ static void dump_vmcb(struct kvm_vcpu *vcpu) "tr:", save01->tr.selector, save01->tr.attrib, save01->tr.limit, save01->tr.base); - pr_err("cpl: %d efer: %016llx\n", - save->cpl, save->efer); + pr_err("vmpl: %d cpl: %d efer: %016llx\n", + save->vmpl, save->cpl, save->efer); pr_err("%-15s %016llx %-13s %016llx\n", "cr0:", save->cr0, "cr2:", save->cr2); pr_err("%-15s %016llx %-13s %016llx\n",