Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp2124902pxb; Wed, 9 Feb 2022 11:21:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzb9OLcUeTKmi8mJW2CG7mpdlLTn8liJgIPOQ/FY9bXx2cNEvb3+LaH88PrA+xqL7DO8Bbh X-Received: by 2002:a62:86c9:: with SMTP id x192mr3888716pfd.54.1644434483873; Wed, 09 Feb 2022 11:21:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1644434483; cv=pass; d=google.com; s=arc-20160816; b=yuGYM0OxUwdBVizGi88u9Qxd0TheR0vmGNkw1q/H/siIfQDCz57CThowrZNGZsFkzN VgjpkevA0f875fpBG6rTxbXRFhA8Yp/J8/f0m58GIfha1m2Qi0TvMO8huPCge73WXU6T C9ta9XsfOplhPHgaCWf1v39hjKXIjr0ltSov2IZ5tkaBXxPpagLaolqOEz9NsDn8f/DS rYKY6q9qTIiytC8E/bKKCOonwvvJquQS879ngYJjPwK2CrFCgLVIQBQ0lchTf9Hmoi3n 9oCWXrJaHys4TB+VyP2DpSBmH7AKZ43qArOWsKQPZ/HvrLEdCNdOmDTba8ic3nfCh6+x qXiA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1Fa8d3Fk+r20pn/WLkRd3bdctuOErMGFfHFL+VcLXak=; b=AinEOScb4fGWKa6K3fx2kk4bwLDQSyTIIWjqIOQAQvOMNuf87Mx1wuBwAnW0cIFPif keIwbqDsn6i+YwVEIyZCem1y1F+4UT4L4PZQkoOgmLi1P3T7dDYvTHoNXEiBQA1DgJqs YCKXGD9LKFpQd/TQDdFxg/BeQ/kHcN2OTBab26z+OcyHyXJy7q2f3cOPob2p/ZSj9dwR yEwJrzCNIxndiuomuwhBX4tLPK7LRNWkLBrFRhsBjLv+aoxI6D1ZI746naeZw3UFVnA0 brXOPUEKBH0/TwRhXKpsBCzKcFt0eqg+7fzF6+Ob51BdWdcToywt8liWpcXIQsajUJxZ DkFA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=oA3EMdxp; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id 62si16741945pgc.281.2022.02.09.11.21.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 11:21:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=oA3EMdxp; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2AC6CDD5BD0C; Wed, 9 Feb 2022 11:17:19 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233979AbiBISM7 (ORCPT + 99 others); Wed, 9 Feb 2022 13:12:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238933AbiBISMs (ORCPT ); Wed, 9 Feb 2022 13:12:48 -0500 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2070.outbound.protection.outlook.com [40.107.212.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F84CC050CE5; Wed, 9 Feb 2022 10:11:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J/YSzTvgnTRDouqM48GnaXZ8ezuaI4Bb8VZT+klCAYNBUHblNyAUJbIIfrx+s3kaDz4orLP1424vcVntJSufCTuvEOs4vWT6SVbiFfPtxVJDkhdrILoXkAicHIHNH0GP89jreN7uyJjp6UNorNAcURYJJVkjZr7m8Z9kvCJox98cei+S+zvoq7GteuKhylSShJttGQmsimS7aANDz7R4OWC3j7bFug8kDsu9F5gwB4JA2UCm2A/IOdS/X4JrxSAv0Pb6BnhFqSnh8FiNc0+YHJOI1f2YfP5zqCEK3jL7c6vTT6hrZi4tMdGg1FB8jeYfO6Y2N4yOs7edJDtUHMxtUw== 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=1Fa8d3Fk+r20pn/WLkRd3bdctuOErMGFfHFL+VcLXak=; b=kVR24YPTtX2CchUpvz9ss/c4AdNergG72Jp7QGZwC8YmAo8Ru29Dhm2aAAi5j/8QddVml4DOINAUTe6iCKn0u8NkY+wEXzcI5ZC5cSEDgW5gfNSTFnTsez3CiAlKOCxJCVcwVX/l3EH+AhniwOzi/3IXN+A5oc9HqAVxsxuMzcm/J0cJSjphX3ZiyPo8EqDOWvizWamF6EdhhFdjCYtaLxcONn5xPrwzaUv6Rf+mS/OPkM/VpARlr9qadv4Uk7fxvsa/u+MabOMUgfBp9Ma2Fu4YkeLbC9l+BDnjBTY0FNZClfFJxNdZN7fChsyCag7kBl3h9vuL0xnwJyDiwvUrfA== 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=1Fa8d3Fk+r20pn/WLkRd3bdctuOErMGFfHFL+VcLXak=; b=oA3EMdxpV8cIvJQnbIh+8H7DcPY05MyZRQmzeh3auCaHhCl4CBM7mSOFM6Hd9JLb7Kh10hasGiJgu3Y/uPMhAn4Kw4GJpDO/KBS1WWoBQZEux8y23L29RSaiqEdUiIM7u7zWOLDF86hy599dUy/zicJd9rHTCFF9pVCteyM+kZE= Received: from BN6PR19CA0100.namprd19.prod.outlook.com (2603:10b6:404:a0::14) by CY4PR1201MB2535.namprd12.prod.outlook.com (2603:10b6:903:db::15) 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:57 +0000 Received: from BN8NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:404:a0:cafe::6b) by BN6PR19CA0100.outlook.office365.com (2603:10b6:404:a0::14) 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:11:56 +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 BN8NAM11FT015.mail.protection.outlook.com (10.13.176.90) 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:56 +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:54 -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 17/45] x86/sev: Register GHCB memory when SEV-SNP is active Date: Wed, 9 Feb 2022 12:10:11 -0600 Message-ID: <20220209181039.1262882-18-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-Transfer-Encoding: 8bit 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: 28ef5dcd-a04d-4e55-d074-08d9ebf7a880 X-MS-TrafficTypeDiagnostic: CY4PR1201MB2535:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ojPnfxNiEvMjlRt2DANsutAesilv7sbwCZchn3/EPyi2lD9MYostTC/XdZN/koVpto7uQ7DZ/8evEoJtP8u5Qj3w75DwZGA3hegG29e7qx2KulPOZ7rD+6bvEpz+Zk1yrT7hSkhd2d/maX5gh0cDYNGIMw4ue1VmqTZrz7WrDKEPpEBUfFlco6+Cr2YASq56dR69ZnsS/1VqBkEn1MQ4jB1oYQ/bU6bEYTug4b0pyn6OIwClWmzESlv4OlsdpJ21ClGfNmGIxlnaRkhtyWPwSa/g2ZPEEb7uS3fbPXbjtZLZ7Kh2URbbKpR6LcCdsA2SqI8RRYBJnxmd9YRmCUc9OygJKxtGcE7I4d+PxZRMc9j0cYpAriojSI6+1gCp3NDOcoKVtOw1TLtqFUZh82ivGHrleAGl4hYj0Cx/UpT4zGcxeEi9j00QuG42EmQUB9g1yhwbZmVSbWS3oR8X3dOMgLTwK12ydph5uhV/JwsQ67QGx+XODlmb3W8NUrsoMjEb0IRL1AjB9pr9DWOYq5GjbNPLckdBX5SBSutNuLaRUH8cCVyJfvyzkjc0QdC0Ydw+rTW2ZhBDCygHdRp26J4hGtVkdHGCehHREEL7ckrgZYYImlcv0+3SWeyPN2TbEyFAmfDxh2Zce2kE0S9Jmk+LHahJjSA27gXzyyiWTlanyd88pWYnJXDAZ/C7mIO99KzmPOeRF8vUEn/nlB+c+FrsPOR6tyWAEUmmLRpkYniIREw= 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)(46966006)(36840700001)(7416002)(110136005)(82310400004)(5660300002)(44832011)(2616005)(54906003)(7696005)(40460700003)(86362001)(83380400001)(2906002)(6666004)(4326008)(7406005)(316002)(356005)(36860700001)(47076005)(426003)(8676002)(336012)(81166007)(186003)(36756003)(1076003)(16526019)(26005)(508600001)(70586007)(8936002)(70206006)(36900700001)(2101003);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 18:11:56.5474 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28ef5dcd-a04d-4e55-d074-08d9ebf7a880 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: BN8NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB2535 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The SEV-SNP guest is required by the GHCB spec to register the GHCB's Guest Physical Address (GPA). This is because the hypervisor may prefer that a guest use a consistent and/or specific GPA for the GHCB associated with a vCPU. For more information, see the GHCB specification section "GHCB GPA Registration". Signed-off-by: Brijesh Singh --- arch/x86/include/asm/sev.h | 2 ++ arch/x86/kernel/cpu/common.c | 4 +++ arch/x86/kernel/head64.c | 4 ++- arch/x86/kernel/sev-shared.c | 2 +- arch/x86/kernel/sev.c | 47 +++++++++++++++++++++++++++--------- 5 files changed, 45 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index e37451849165..48df02713ee0 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -122,6 +122,7 @@ static inline int pvalidate(unsigned long vaddr, bool rmp_psize, bool validate) return rc; } +void setup_ghcb(void); #else static inline void sev_es_ist_enter(struct pt_regs *regs) { } static inline void sev_es_ist_exit(void) { } @@ -130,6 +131,7 @@ static inline void sev_es_nmi_complete(void) { } static inline int sev_es_efi_map_ghcbs(pgd_t *pgd) { return 0; } static inline int pvalidate(unsigned long vaddr, bool rmp_psize, bool validate) { return 0; } static inline int rmpadjust(unsigned long vaddr, bool rmp_psize, unsigned long attrs) { return 0; } +static inline void setup_ghcb(void) { } #endif #endif diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 64deb7727d00..2e0dd7f4018e 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -59,6 +59,7 @@ #include #include #include +#include #include "cpu.h" @@ -2067,6 +2068,9 @@ void cpu_init_exception_handling(void) load_TR_desc(); + /* GHCB need to be setup to handle #VC. */ + setup_ghcb(); + /* Finally load the IDT */ load_current_idt(); } diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 66363f51a3ad..8075e91cff2b 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -597,8 +597,10 @@ static void startup_64_load_idt(unsigned long physbase) void early_setup_idt(void) { /* VMM Communication Exception */ - if (IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT)) + if (IS_ENABLED(CONFIG_AMD_MEM_ENCRYPT)) { + setup_ghcb(); set_bringup_idt_handler(bringup_idt_table, X86_TRAP_VC, vc_boot_ghcb); + } bringup_idt_descr.address = (unsigned long)bringup_idt_table; native_load_idt(&bringup_idt_descr); diff --git a/arch/x86/kernel/sev-shared.c b/arch/x86/kernel/sev-shared.c index e9ff13cd90b0..3aaef1a18ffe 100644 --- a/arch/x86/kernel/sev-shared.c +++ b/arch/x86/kernel/sev-shared.c @@ -68,7 +68,7 @@ static u64 get_hv_features(void) return GHCB_MSR_HV_FT_RESP_VAL(val); } -static void __maybe_unused snp_register_ghcb_early(unsigned long paddr) +static void snp_register_ghcb_early(unsigned long paddr) { unsigned long pfn = paddr >> PAGE_SHIFT; u64 val; diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c index cb20fb0c608e..cc382c4f89ef 100644 --- a/arch/x86/kernel/sev.c +++ b/arch/x86/kernel/sev.c @@ -41,7 +41,7 @@ static struct ghcb boot_ghcb_page __bss_decrypted __aligned(PAGE_SIZE); * Needs to be in the .data section because we need it NULL before bss is * cleared */ -static struct ghcb __initdata *boot_ghcb; +static struct ghcb *boot_ghcb __section(".data"); /* Bitmap of SEV features supported by the hypervisor */ static u64 sev_hv_features __ro_after_init; @@ -647,15 +647,40 @@ static enum es_result vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt) return ret; } -/* - * This function runs on the first #VC exception after the kernel - * switched to virtual addresses. - */ -static bool __init sev_es_setup_ghcb(void) +static void snp_register_per_cpu_ghcb(void) { + struct sev_es_runtime_data *data; + struct ghcb *ghcb; + + data = this_cpu_read(runtime_data); + ghcb = &data->ghcb_page; + + snp_register_ghcb_early(__pa(ghcb)); +} + +void setup_ghcb(void) +{ + if (!cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT)) + return; + /* First make sure the hypervisor talks a supported protocol. */ if (!sev_es_negotiate_protocol()) - return false; + sev_es_terminate(SEV_TERM_SET_GEN, GHCB_SEV_ES_GEN_REQ); + + /* + * Check whether the runtime #VC exception handler is active. + * The runtime exception handler uses the per-CPU GHCB page, and + * the GHCB page would be setup by sev_es_init_vc_handling(). + * + * If SNP is active, then register the per-CPU GHCB page so that + * the runtime exception handler can use it. + */ + if (initial_vc_handler == (unsigned long)kernel_exc_vmm_communication) { + if (cc_platform_has(CC_ATTR_GUEST_SEV_SNP)) + snp_register_per_cpu_ghcb(); + + return; + } /* * Clear the boot_ghcb. The first exception comes in before the bss @@ -666,7 +691,9 @@ static bool __init sev_es_setup_ghcb(void) /* Alright - Make the boot-ghcb public */ boot_ghcb = &boot_ghcb_page; - return true; + /* SNP guest requires that GHCB GPA must be registered. */ + if (cc_platform_has(CC_ATTR_GUEST_SEV_SNP)) + snp_register_ghcb_early(__pa(&boot_ghcb_page)); } #ifdef CONFIG_HOTPLUG_CPU @@ -1397,10 +1424,6 @@ bool __init handle_vc_boot_ghcb(struct pt_regs *regs) struct es_em_ctxt ctxt; enum es_result result; - /* Do initial setup or terminate the guest */ - if (unlikely(boot_ghcb == NULL && !sev_es_setup_ghcb())) - sev_es_terminate(SEV_TERM_SET_GEN, GHCB_SEV_ES_GEN_REQ); - vc_ghcb_invalidate(boot_ghcb); result = vc_init_em_ctxt(&ctxt, regs, exit_code); -- 2.25.1