From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9946C433EF for ; Wed, 9 Feb 2022 18:12:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E7EA8D0021; Wed, 9 Feb 2022 13:12:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 174D98D0020; Wed, 9 Feb 2022 13:12:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F03DB8D0021; Wed, 9 Feb 2022 13:12:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0009.hostedemail.com [216.40.44.9]) by kanga.kvack.org (Postfix) with ESMTP id D4AA08D0020 for ; Wed, 9 Feb 2022 13:12:39 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 964F91822D2D8 for ; Wed, 9 Feb 2022 18:12:39 +0000 (UTC) X-FDA: 79124036838.11.CFE0703 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2089.outbound.protection.outlook.com [40.107.244.89]) by imf07.hostedemail.com (Postfix) with ESMTP id C8B074000A for ; Wed, 9 Feb 2022 18:12:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=liUwOLnpTezXp+FZv3bhUBAJ5IWOxJ9R9eCgVHxrHVNrduWHQg3OQm6vsH48Ac8kYQKaFYdvklBAAUprkTBlpEdCpdJohIeSI+Vmz6QE4I0h2Oq9Cp2xzo1dHD3OAzdfmP5DMCCUQUqPX9pTOiHR3NF3wNtDo6SGtaWVzhWmCUu2vLR+Xwqljjh76PGwZGu3pWDMjmwfHTPL9y3iUI/nttjwqrc+HhKnAMxewogzpHtu83be97TV87wSScRMgyKRepxFqZgpw4cTtj2qLkFzqg6h8k2Is9JYUrNFRXcph59yVpA1PmkXUC7arr0axMhuAqkU+yFsDjAQzFCbdElTQw== 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=5NvohDStQZZ0rcznZHgVVc5LOHJft4HGdoplMNFP2ZY=; b=OUG6Aqi6An+7f7V/Vsft/pK1GvocJmGTvyDIy8UUm3/knPHDEUrNsyFkj/jGhi8fKVxg6dexrtih16Y2sU4+0bmdxf7InpCm6zxXC4hb/DRrtDoVaQ/fDxn/iamLhI4xGbCetPB/5Gr60kpX5gch/invXrQyufKNvn+QHWIKOnHmyD3wcUHEYJPsGXEH3gyOQKGTwZhM3lzHPpmQgBd097IVdKn/iGU3g5kZNfVeM5uA5GX294kb0lZ5OVq5mcxHdVcUauLWjoKS1pC3/GN3kf1aIKsUDosEyQwM69jKHBJEii7yR4rslBwvgcMyuZfiRmNE7r2wePHuXMDEpNGvwQ== 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=5NvohDStQZZ0rcznZHgVVc5LOHJft4HGdoplMNFP2ZY=; b=ohLJpqyTZUTardtRbA5mKAQvpcO+BppPZBBO24SpC8FKTcJ5sZW54ycMWbG9LROtqKIH89b6HL1am/vMxmOqedUIdcS6XHeGO5dBPapGeYtrxxOEQdcjirM4T36JuZJBP9E5eaK5OWlODx9ogkaRKqFMmIwhfpUQNnm2upTcuRM= Received: from MWHPR08CA0060.namprd08.prod.outlook.com (2603:10b6:300:c0::34) by BY5PR12MB4258.namprd12.prod.outlook.com (2603:10b6:a03:20d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.11; Wed, 9 Feb 2022 18:12:36 +0000 Received: from CO1NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:300:c0:cafe::8d) by MWHPR08CA0060.outlook.office365.com (2603:10b6:300:c0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11 via Frontend Transport; Wed, 9 Feb 2022 18:12:35 +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 CO1NAM11FT034.mail.protection.outlook.com (10.13.174.248) 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:12:35 +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:12:32 -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 Subject: [PATCH v10 39/45] x86/sev: Use firmware-validated CPUID for SEV-SNP guests Date: Wed, 9 Feb 2022 12:10:33 -0600 Message-ID: <20220209181039.1262882-40-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 Content-Type: text/plain 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: 4924d81e-1a99-49f0-9a8c-08d9ebf7bfe1 X-MS-TrafficTypeDiagnostic: BY5PR12MB4258:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RpUQUJL2VtcDv34z92KLKK5bdh0PUOXuwMubWZRG3XI5rJ9twQu+ETwmMXWtcAzFb8UnDkUgmFQGNWdklTveJ7+QDvtmqKaXL1cnyaoroRyWiHtvtCTjRe9oZEe1yqPOhEwjv+wrcel6MRLL16MPxovKFVMuaOi3Q5YnFszOZn7+Fge/r3eBzVVLxAhbYV4maGKnBr3O1b9vWRLAct0wknOQ4ety2T2+csPB2/Fd49xEuaGe0xfRANBjWIJ7C0qkGXoXFolmL40GYPAGAL7g0ShKg/QBBooD21MrQK5eCsJBZhwpDR3WT1lXeGAl4oOtdB2VX5yHt2xABbvtGq8G99Ye2oVgh3KCQppQRplKfRNxfVjD18PNORPOzBA7VZ8qs5fFdnfSBYcPf6NrfUJBeLZHE5mJ8eNUAe2S+hEkSwzgmvRVwV7YooXMZknBxe9PhuSHv2Pecg6h+qv/kJcKcbxCMzmp0b238XRFKhaGMHY6AwwHaEirWWZzpOAhv/PHrYapjktDJJE393x13GYD64ZxmpXMdIZtzaoaSdwtgMHQtg+Eq6QCut2CzMnD9Ig9OiamW2TndryQzzD16i9el5xqnIJaHS1Z8C8QqQB6+ibG6AxSZRnvqHw8asiRGWXxXp+ijJfdEsw/dpFpnhdOoIKYdb5/NA9CpjBGMdvLVSriMhdBL44hfh+c+DEEioJaIxlvRpD3RJXaQbWN10M40N9t20PJV1zHnnD5LRWGyt0= 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)(70206006)(54906003)(82310400004)(36860700001)(86362001)(70586007)(8676002)(8936002)(508600001)(40460700003)(4326008)(7696005)(316002)(110136005)(356005)(15650500001)(47076005)(44832011)(5660300002)(7406005)(7416002)(83380400001)(81166007)(2906002)(1076003)(36756003)(26005)(336012)(426003)(186003)(2616005)(16526019)(36900700001)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 18:12:35.6443 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4924d81e-1a99-49f0-9a8c-08d9ebf7bfe1 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: CO1NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4258 Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=ohLJpqyT; dmarc=pass (policy=quarantine) header.from=amd.com; spf=pass (imf07.hostedemail.com: domain of brijesh.singh@amd.com designates 40.107.244.89 as permitted sender) smtp.mailfrom=brijesh.singh@amd.com X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C8B074000A X-Stat-Signature: h1cj76f17xogas7grirtfrjbb69jqszy X-HE-Tag: 1644430358-451182 Content-Transfer-Encoding: quoted-printable 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: Michael Roth SEV-SNP guests will be provided the location of special 'secrets' and 'CPUID' pages via the Confidential Computing blob. This blob is provided to the run-time kernel either through a bootparams field that was initialized by the boot/compressed kernel, or via a setup_data structure as defined by the Linux Boot Protocol. Locate the Confidential Computing blob from these sources and, if found, use the provided CPUID page/table address to create a copy that the run-time kernel will use when servicing CPUID instructions via a #VC handler. Also add an "sev_debug" kernel command-line parameter that will be used (initially) to dump the CPUID table for debugging/analysis. Signed-off-by: Michael Roth Signed-off-by: Brijesh Singh --- .../admin-guide/kernel-parameters.txt | 4 ++ arch/x86/boot/compressed/sev.c | 37 --------------- arch/x86/kernel/sev-shared.c | 37 +++++++++++++++ arch/x86/kernel/sev.c | 45 +++++++++++++++++++ 4 files changed, 86 insertions(+), 37 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentat= ion/admin-guide/kernel-parameters.txt index f5a27f067db9..990125cc701c 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -5229,6 +5229,10 @@ =20 serialnumber [BUGS=3DX86-32] =20 + sev_debug [X86-64] + Enable verbose debug messages related to AMD Secure + Encrypted Virtualization. + shapers=3D [NET] Maximal number of shapers. =20 diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/se= v.c index 2911137bf37f..79a59027f3d8 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -381,43 +381,6 @@ static struct cc_blob_sev_info *find_cc_blob(struct = boot_params *bp) return cc_info; } =20 -/* - * Initialize the kernel's copy of the SNP CPUID table, and set up the - * pointer that will be used to access it. - * - * Maintaining a direct mapping of the SNP CPUID table used by firmware = would - * be possible as an alternative, but the approach is brittle since the - * mapping needs to be updated in sync with all the changes to virtual m= emory - * layout and related mapping facilities throughout the boot process. - */ -static void setup_cpuid_table(const struct cc_blob_sev_info *cc_info) -{ - const struct snp_cpuid_table *cpuid_table_fw, *cpuid_table; - int i; - - if (!cc_info || !cc_info->cpuid_phys || cc_info->cpuid_len < PAGE_SIZE) - sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_CPUID); - - cpuid_table_fw =3D (const struct snp_cpuid_table *)cc_info->cpuid_phys; - if (!cpuid_table_fw->count || cpuid_table_fw->count > SNP_CPUID_COUNT_M= AX) - sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_CPUID); - - cpuid_table =3D snp_cpuid_get_table(); - memcpy((void *)cpuid_table, cpuid_table_fw, sizeof(*cpuid_table)); - - /* Initialize CPUID ranges for range-checking. */ - for (i =3D 0; i < cpuid_table->count; i++) { - const struct snp_cpuid_fn *fn =3D &cpuid_table->fn[i]; - - if (fn->eax_in =3D=3D 0x0) - cpuid_std_range_max =3D fn->eax; - else if (fn->eax_in =3D=3D 0x40000000) - cpuid_hyp_range_max =3D fn->eax; - else if (fn->eax_in =3D=3D 0x80000000) - cpuid_ext_range_max =3D fn->eax; - } -} - /* * Indicate SNP based on presence of SNP-specific CC blob. Subsequent ch= ecks * will verify the SNP CPUID/MSR bits. diff --git a/arch/x86/kernel/sev-shared.c b/arch/x86/kernel/sev-shared.c index a7a1c0fb298e..2b4270d5559e 100644 --- a/arch/x86/kernel/sev-shared.c +++ b/arch/x86/kernel/sev-shared.c @@ -964,3 +964,40 @@ static struct cc_blob_sev_info *find_cc_blob_setup_d= ata(struct boot_params *bp) =20 return NULL; } + +/* + * Initialize the kernel's copy of the SNP CPUID table, and set up the + * pointer that will be used to access it. + * + * Maintaining a direct mapping of the SNP CPUID table used by firmware = would + * be possible as an alternative, but the approach is brittle since the + * mapping needs to be updated in sync with all the changes to virtual m= emory + * layout and related mapping facilities throughout the boot process. + */ +static void __init setup_cpuid_table(const struct cc_blob_sev_info *cc_i= nfo) +{ + const struct snp_cpuid_table *cpuid_table_fw, *cpuid_table; + int i; + + if (!cc_info || !cc_info->cpuid_phys || cc_info->cpuid_len < PAGE_SIZE) + sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_CPUID); + + cpuid_table_fw =3D (const struct snp_cpuid_table *)cc_info->cpuid_phys; + if (!cpuid_table_fw->count || cpuid_table_fw->count > SNP_CPUID_COUNT_M= AX) + sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_CPUID); + + cpuid_table =3D snp_cpuid_get_table(); + memcpy((void *)cpuid_table, cpuid_table_fw, sizeof(*cpuid_table)); + + /* Initialize CPUID ranges for range-checking. */ + for (i =3D 0; i < cpuid_table->count; i++) { + const struct snp_cpuid_fn *fn =3D &cpuid_table->fn[i]; + + if (fn->eax_in =3D=3D 0x0) + cpuid_std_range_max =3D fn->eax; + else if (fn->eax_in =3D=3D 0x40000000) + cpuid_hyp_range_max =3D fn->eax; + else if (fn->eax_in =3D=3D 0x80000000) + cpuid_ext_range_max =3D fn->eax; + } +} diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c index a79ddacf0478..7bef422b428f 100644 --- a/arch/x86/kernel/sev.c +++ b/arch/x86/kernel/sev.c @@ -34,6 +34,7 @@ #include #include #include +#include =20 #define DR7_RESET_VALUE 0x400 =20 @@ -2035,6 +2036,8 @@ bool __init snp_init(struct boot_params *bp) if (!cc_info) return false; =20 + setup_cpuid_table(cc_info); + /* * The CC blob will be used later to access the secrets page. Cache * it here like the boot kernel does. @@ -2048,3 +2051,45 @@ void __init snp_abort(void) { sev_es_terminate(SEV_TERM_SET_GEN, GHCB_SNP_UNSUPPORTED); } + +static void dump_cpuid_table(void) +{ + const struct snp_cpuid_table *cpuid_table =3D snp_cpuid_get_table(); + int i =3D 0; + + pr_info("count=3D%d reserved=3D0x%x reserved2=3D0x%llx\n", + cpuid_table->count, cpuid_table->__reserved1, cpuid_table->__reserved2= ); + + for (i =3D 0; i < SNP_CPUID_COUNT_MAX; i++) { + const struct snp_cpuid_fn *fn =3D &cpuid_table->fn[i]; + + pr_info("index=3D%3d fn=3D0x%08x subfn=3D0x%08x: eax=3D0x%08x ebx=3D0x= %08x ecx=3D0x%08x edx=3D0x%08x xcr0_in=3D0x%016llx xss_in=3D0x%016llx res= erved=3D0x%016llx\n", + i, fn->eax_in, fn->ecx_in, fn->eax, fn->ebx, fn->ecx, + fn->edx, fn->xcr0_in, fn->xss_in, fn->__reserved); + } +} + +/* + * It is useful from an auditing/testing perspective to provide an easy = way + * for the guest owner to know that the CPUID table has been initialized= as + * expected, but that initialization happens too early in boot to print = any + * sort of indicator, and there's not really any other good place to do = it, + * so do it here. + */ +static int __init report_cpuid_table(void) +{ + const struct snp_cpuid_table *cpuid_table =3D snp_cpuid_get_table(); + + if (!cpuid_table->count) + return 0; + + pr_info("Using SNP CPUID table, %d entries present.\n", + cpuid_table->count); + + if (cmdline_find_option_bool(boot_command_line, "sev_debug")) + dump_cpuid_table(); + + return 0; +} + +arch_initcall(report_cpuid_table); --=20 2.25.1