Received: by 2002:a25:d783:0:0:0:0:0 with SMTP id o125csp428141ybg; Thu, 19 Mar 2020 02:19:25 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvl+hUO7IMT1CehYvuOkmB279tVklXiptUR6KSIRssrv6ACzkbV9hH/WKGD5REUp1VkRxOs X-Received: by 2002:a05:6830:1195:: with SMTP id u21mr1388131otq.351.1584609565694; Thu, 19 Mar 2020 02:19:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584609565; cv=none; d=google.com; s=arc-20160816; b=peeE0LiRsUFVw2DRIl95hQqemnII6CnYq9ZKicuWhjI07QLMdtDHOcAtMUtq+ixj+F n3jbG0e9LqRTOMUCMnduGYfTOBX93G77IYJ6zBBHSP49V4xpR2o/pVLBdRoHKcb2t9oj Lxp8OdLXZzUS0J+Gfge5QtqvH4pk9vnVB59eD85MH4qjDVBAvp9gvmyxSpk66gJh6xXJ mZFze8WS/MZG6ezGkexmxNlPrdHpxYWg6I4ENhmJD7T0/qHeJUZ/JkFUTLL7bV08kg7n jNHEMcB0MMjsZS7dBHrwiG4oH8riQ49fHwf55gx2JbhGy9WObQ1UTdqU1MN7EYi7UmFA hGXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=Se/a5aqsOYOgu+dWmrcXKWWUNyXv3I6VBbaHkpoialY=; b=N5QCOEJQBZRamVdMajMic7DH6uLTDpQuCa7BBdhEGHuE7ijoxOoowgGkFYwzq4g3wv pVnZaYVIWo95YrpD9E40IDjcNo0WWoVVCELsozWwFLaSGPDHxSmSJRqB7ojWXdunUDLt ig6t6y6hn0W2j1cLnM1sMUGWvZQ0BkcoDrY07XcKTtVl33WbkhbSIiAqJthYt6VUR/KW 1WcKT06izoIlDIRTNacvwA4E19+BK4RJgzX9PQjT0CEfqRJw08vP1/bAKioqTsZo4/Tc TEgc0iKYZbGGQjIbtfEd6e2V7bfO3R2OQnDql1lOEdZjPOrFxE5w1l5pKUbh0wCJpy+O WXlQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d20si925971oti.311.2020.03.19.02.19.13; Thu, 19 Mar 2020 02:19:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727816AbgCSJR1 (ORCPT + 99 others); Thu, 19 Mar 2020 05:17:27 -0400 Received: from 8bytes.org ([81.169.241.247]:51922 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727386AbgCSJOi (ORCPT ); Thu, 19 Mar 2020 05:14:38 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id CB7747D3; Thu, 19 Mar 2020 10:14:23 +0100 (CET) From: Joerg Roedel To: x86@kernel.org Cc: hpa@zytor.com, Andy Lutomirski , Dave Hansen , Peter Zijlstra , Thomas Hellstrom , Jiri Slaby , Dan Williams , Tom Lendacky , Juergen Gross , Kees Cook , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, Joerg Roedel , Joerg Roedel Subject: [PATCH 40/70] x86/sev-es: Setup per-cpu GHCBs for the runtime handler Date: Thu, 19 Mar 2020 10:13:37 +0100 Message-Id: <20200319091407.1481-41-joro@8bytes.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200319091407.1481-1-joro@8bytes.org> References: <20200319091407.1481-1-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tom Lendacky The runtime handler needs a GHCB per CPU. Set them up and map them unencrypted. Signed-off-by: Tom Lendacky Signed-off-by: Joerg Roedel --- arch/x86/include/asm/mem_encrypt.h | 2 ++ arch/x86/kernel/sev-es.c | 28 +++++++++++++++++++++++++++- arch/x86/kernel/traps.c | 3 +++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h index 6f61bb93366a..8b69b389688f 100644 --- a/arch/x86/include/asm/mem_encrypt.h +++ b/arch/x86/include/asm/mem_encrypt.h @@ -48,6 +48,7 @@ int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size); void __init mem_encrypt_init(void); void __init mem_encrypt_free_decrypted_mem(void); +void __init sev_es_init_ghcbs(void); bool sme_active(void); bool sev_active(void); bool sev_es_active(void); @@ -71,6 +72,7 @@ static inline void __init sme_early_init(void) { } static inline void __init sme_encrypt_kernel(struct boot_params *bp) { } static inline void __init sme_enable(struct boot_params *bp) { } +static inline void sev_es_init_ghcbs(void) { } static inline bool sme_active(void) { return false; } static inline bool sev_active(void) { return false; } static inline bool sev_es_active(void) { return false; } diff --git a/arch/x86/kernel/sev-es.c b/arch/x86/kernel/sev-es.c index c17980e8db78..4bf5286310a0 100644 --- a/arch/x86/kernel/sev-es.c +++ b/arch/x86/kernel/sev-es.c @@ -8,8 +8,11 @@ */ #include /* For show_regs() */ -#include +#include +#include #include +#include +#include #include #include @@ -29,6 +32,9 @@ struct ghcb boot_ghcb_page __bss_decrypted __aligned(PAGE_SIZE); */ struct ghcb __initdata *boot_ghcb; +/* Runtime GHCB pointers */ +static struct ghcb __percpu *ghcb_page; + /* Needed in vc_early_vc_forward_exception */ extern void early_exception(struct pt_regs *regs, int trapnr); @@ -197,6 +203,26 @@ static bool __init sev_es_setup_ghcb(void) return true; } +void sev_es_init_ghcbs(void) +{ + int cpu; + + if (!sev_es_active()) + return; + + /* Allocate GHCB pages */ + ghcb_page = __alloc_percpu(sizeof(struct ghcb), PAGE_SIZE); + + /* Initialize per-cpu GHCB pages */ + for_each_possible_cpu(cpu) { + struct ghcb *ghcb = (struct ghcb *)per_cpu_ptr(ghcb_page, cpu); + + set_memory_decrypted((unsigned long)ghcb, + sizeof(*ghcb) >> PAGE_SHIFT); + memset(ghcb, 0, sizeof(*ghcb)); + } +} + static void __init vc_early_vc_forward_exception(struct es_em_ctxt *ctxt) { int trapnr = ctxt->fi.vector; diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 6ef00eb6fbb9..09bebda9b053 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -918,6 +918,9 @@ void __init trap_init(void) /* Init cpu_entry_area before IST entries are set up */ setup_cpu_entry_areas(); + /* Init GHCB memory pages when running as an SEV-ES guest */ + sev_es_init_ghcbs(); + idt_setup_traps(); /* -- 2.17.1