From patchwork Tue Mar 28 20:17:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 76257 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2482764vqo; Tue, 28 Mar 2023 13:22:26 -0700 (PDT) X-Google-Smtp-Source: AKy350ZZSzmojQEzvcpagA7co0h7G93Y6unHNsmJ+zf457hk3uO+i91WvgmbVSS2LiG4DX2Gg9PA X-Received: by 2002:a17:906:6702:b0:878:72f7:bd99 with SMTP id a2-20020a170906670200b0087872f7bd99mr16897464ejp.6.1680034945992; Tue, 28 Mar 2023 13:22:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680034945; cv=none; d=google.com; s=arc-20160816; b=SG3ndSG04io6RV0Hwv1da7+AAT+Spl9QvKHgL0DUVefjhqks/aT7rrq5IwNKBUwylf ZTpoBVjWTs04sbzXT//hbyMymhw2EZaARd9rDYFx7Y51WOTyO0lKxmZTrPpgXZI1qb1A 7NeLJOw2KH11CdMadg3HSqUUD9CLs4vglPWndYWn6awNv69VrDeusr8YizMn+sO08Abc rLmfbhubrGSUzRauAQ5w7d6FdqK/O6F6rAlp9vanY4YB/1iQfJXkTyPKsi5DI80wbaAe Xhts1KOKlF0OBYXT5egs7kGsf10sXpqLxqtuop+Z/xuebYe1M8iGNKZ55gZC3kvykNp4 B23w== ARC-Message-Signature: i=1; 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=kj9ZMXdOiC4j+qhb1y+6eCUnrAvvjZYAJh8azvysCpQ=; b=cTDh1q3B9Rxsk13mEFco5Y/w84AyWNiqxqKxA0LPoCapGF6Rfl1OnOyexWtWmq8sA2 V+5qqik/oSCWj/kmyFv2hrgPXi5EWH4LxJ2pCxc87JXbpbpVwKuyHF0s85ZnqZnfCRgQ 4dR2n9TNQpezjRjk0Ipo1ry+e5w2t1+8OZ3++IpTR4D+X/9p11FfOWsA9P5BsoJ3zJYg 46G5gRoHwIIHMLtUx/qvzn4RuGGIpPDz8HjGoiM05uMXPVUeCuA5zGhMMiAd+8+Ynu/3 ahC/TkgnmFABORXijNqXg1A+Mj6CbPe0aiaTES2wlG4C5nwTmzqx9CuKiW8sIDZAwrS4 A2WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b="ZzLFJ/E5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z15-20020a170906944f00b0092aedd45e14si8351991ejx.329.2023.03.28.13.22.01; Tue, 28 Mar 2023 13:22:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b="ZzLFJ/E5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229576AbjC1USL (ORCPT + 99 others); Tue, 28 Mar 2023 16:18:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229489AbjC1USK (ORCPT ); Tue, 28 Mar 2023 16:18:10 -0400 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDFC44222 for ; Tue, 28 Mar 2023 13:17:50 -0700 (PDT) Received: from zn.tnic (p5de8e687.dip0.t-ipconnect.de [93.232.230.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 06D431EC067C; Tue, 28 Mar 2023 22:17:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1680034634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kj9ZMXdOiC4j+qhb1y+6eCUnrAvvjZYAJh8azvysCpQ=; b=ZzLFJ/E5RZZt1ohUTLM3czf8JkkIzDOoX4i5eRu+X7Faaeg6V0VCb0+jQcdQtoIl/uCasM qGlf3qVqO540sZpo8O5pSXIH1XpjIEEH97EuzYA/7VJlotoBFhRkFC6m3VYc2KGiNdBo5X 8CBXduL4/rAchWkbdYZwMAp3JbqLk3E= From: Borislav Petkov To: Joerg Roedel , Tom Lendacky Cc: X86 ML , LKML Subject: [PATCH v2 1/2] x86/coco: Mark cc_platform_has() and descendants noinstr Date: Tue, 28 Mar 2023 22:17:11 +0200 Message-Id: <20230328201712.25852-2-bp@alien8.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230328201712.25852-1-bp@alien8.de> References: <20230328201712.25852-1-bp@alien8.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761644323540131266?= X-GMAIL-MSGID: =?utf-8?q?1761644323540131266?= From: "Borislav Petkov (AMD)" Those will be used in code regions where instrumentation is not allowed so mark them as such. No functional changes. Signed-off-by: Borislav Petkov (AMD) --- arch/x86/coco/core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/coco/core.c b/arch/x86/coco/core.c index 73f83233d25d..df10e75be085 100644 --- a/arch/x86/coco/core.c +++ b/arch/x86/coco/core.c @@ -16,7 +16,7 @@ enum cc_vendor cc_vendor __ro_after_init; static u64 cc_mask __ro_after_init; -static bool intel_cc_platform_has(enum cc_attr attr) +static bool noinstr intel_cc_platform_has(enum cc_attr attr) { switch (attr) { case CC_ATTR_GUEST_UNROLL_STRING_IO: @@ -34,7 +34,7 @@ static bool intel_cc_platform_has(enum cc_attr attr) * the other levels of SME/SEV functionality, including C-bit * based SEV-SNP, are not enabled. */ -static __maybe_unused bool amd_cc_platform_vtom(enum cc_attr attr) +static __maybe_unused __always_inline bool amd_cc_platform_vtom(enum cc_attr attr) { switch (attr) { case CC_ATTR_GUEST_MEM_ENCRYPT: @@ -58,7 +58,7 @@ static __maybe_unused bool amd_cc_platform_vtom(enum cc_attr attr) * the trampoline area must be encrypted. */ -static bool amd_cc_platform_has(enum cc_attr attr) +static bool noinstr amd_cc_platform_has(enum cc_attr attr) { #ifdef CONFIG_AMD_MEM_ENCRYPT @@ -97,7 +97,7 @@ static bool amd_cc_platform_has(enum cc_attr attr) #endif } -bool cc_platform_has(enum cc_attr attr) +bool noinstr cc_platform_has(enum cc_attr attr) { switch (cc_vendor) { case CC_VENDOR_AMD: From patchwork Tue Mar 28 20:17:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 76256 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2482274vqo; Tue, 28 Mar 2023 13:21:22 -0700 (PDT) X-Google-Smtp-Source: AKy350b2Iq8NzHQGYXFTlJ92y+T+iNKC18Dw4uFKK6Hg/PwXp5TyFLOiNLbNtMYiNLTGPQw1XAvX X-Received: by 2002:a05:6402:202:b0:4fb:59bb:ce6f with SMTP id t2-20020a056402020200b004fb59bbce6fmr18007725edv.35.1680034882352; Tue, 28 Mar 2023 13:21:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680034882; cv=none; d=google.com; s=arc-20160816; b=bHkAlGQ/zTK83zUkBZNSL5gLLW/8DrKD+R6Sa/fj/EK5t2Fwht5LaXXU/Qx5+aefaW f4cwYvfxr5qdIzQSv4cz2SzaUXSFDmtYUKH/oU6LeaA8WiHsQ2eXfquq7duNhoNKtYxa 6ZsJNz4tPKUdVbYf07mBmyRvXd8ihZlPiiEzSt/t1SlBr9TFBnPuva/deIX+I2QnHQav wPUokei5OktkiJUONDBYhEivEU9WLwEHnUPfekaixGuL/Qms8pAewWc01ABrUT6d8tdT eli2YP5UWISi1vsMRrfHa4Nnd7q831uNEKZ9p+Y5WS2cPhjnFtu11oQLKv72N3ORzGRo 3cLg== ARC-Message-Signature: i=1; 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=mVzCjBqiRJvpLljfR/3AfHJOhQrU6iN8fQ64FUXXH/A=; b=E40ZOEEpcbLMUK1TkJF+8XWeHASeY0Bpegft6PI2srIwJkX/E9/w/hZTPiEIIFaQQb 1a6d8GkWQteloWqMnSWU3r46DjZO5MEss064oN23rX9ILE3KkYZgAOTHZyRL32z/hWFx qI5uyr4HmAshHh9N+SOofdF4Z37qZP4Dml+zvIezYkR4iDpzvTbe6Kw/5OhZI6rHqqyB 9b4qQQ/3OHUGSuWDkdxEfPdDEfLBLvatuf/dxfwoVHFrdMLUsZytuhqZ1PCw8vYvdVL1 UoofopAWeKlNHJK1tyw67wN8yO6a6BCDvk/gVijZpai1tpBv93KCgGAzTmHneu8ib7mG 0Llg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=ocWa01MU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d12-20020a056402516c00b0048e82d753a3si31935379ede.227.2023.03.28.13.20.58; Tue, 28 Mar 2023 13:21:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=ocWa01MU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229654AbjC1URw (ORCPT + 99 others); Tue, 28 Mar 2023 16:17:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229864AbjC1URp (ORCPT ); Tue, 28 Mar 2023 16:17:45 -0400 Received: from mail.skyhub.de (mail.skyhub.de [IPv6:2a01:4f8:190:11c2::b:1457]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2DBD4231 for ; Tue, 28 Mar 2023 13:17:16 -0700 (PDT) Received: from zn.tnic (p5de8e687.dip0.t-ipconnect.de [93.232.230.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 78C0E1EC068B; Tue, 28 Mar 2023 22:17:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1680034634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mVzCjBqiRJvpLljfR/3AfHJOhQrU6iN8fQ64FUXXH/A=; b=ocWa01MU62vpXKDULW1D4MEcbqWBBYZzDUJWwUhzVjHlwTmNOqgkpmOyc7GlCUcMPCXB0h 4yzvUVXgiaZzPE8AnlaZmCCPAUEELiKifsu3DFHlqffd7Ft9iZtCgVYAAS2sM2wYzrbw5b egozXtiU6d8EaOY/RRSMQ0SHDvHYF30= From: Borislav Petkov To: Joerg Roedel , Tom Lendacky Cc: X86 ML , LKML Subject: [PATCH v2 2/2] x86/sev: Get rid of special sev_es_enable_key Date: Tue, 28 Mar 2023 22:17:12 +0200 Message-Id: <20230328201712.25852-3-bp@alien8.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230328201712.25852-1-bp@alien8.de> References: <20230328201712.25852-1-bp@alien8.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761644256803061733?= X-GMAIL-MSGID: =?utf-8?q?1761644256803061733?= From: "Borislav Petkov (AMD)" A SEV-ES guest is active on AMD when CC_ATTR_GUEST_STATE_ENCRYPT is set. I.e., MSR_AMD64_SEV, bit 1, SEV_ES_Enabled. So no need for a special static key. No functional changes. Signed-off-by: Borislav Petkov (AMD) --- arch/x86/include/asm/sev.h | 11 +++++++---- arch/x86/kernel/sev.c | 5 ----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index 13dc2a9d23c1..f14060cbead2 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -14,6 +14,7 @@ #include #include #include +#include #define GHCB_PROTOCOL_MIN 1ULL #define GHCB_PROTOCOL_MAX 2ULL @@ -136,24 +137,26 @@ struct snp_secrets_page_layout { } __packed; #ifdef CONFIG_AMD_MEM_ENCRYPT -extern struct static_key_false sev_es_enable_key; extern void __sev_es_ist_enter(struct pt_regs *regs); extern void __sev_es_ist_exit(void); static __always_inline void sev_es_ist_enter(struct pt_regs *regs) { - if (static_branch_unlikely(&sev_es_enable_key)) + if (cc_vendor == CC_VENDOR_AMD && + cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT)) __sev_es_ist_enter(regs); } static __always_inline void sev_es_ist_exit(void) { - if (static_branch_unlikely(&sev_es_enable_key)) + if (cc_vendor == CC_VENDOR_AMD && + cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT)) __sev_es_ist_exit(); } extern int sev_es_setup_ap_jump_table(struct real_mode_header *rmh); extern void __sev_es_nmi_complete(void); static __always_inline void sev_es_nmi_complete(void) { - if (static_branch_unlikely(&sev_es_enable_key)) + if (cc_vendor == CC_VENDOR_AMD && + cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT)) __sev_es_nmi_complete(); } extern int __init sev_es_efi_map_ghcbs(pgd_t *pgd); diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c index b031244d6d2d..0ec0d963b8b7 100644 --- a/arch/x86/kernel/sev.c +++ b/arch/x86/kernel/sev.c @@ -113,8 +113,6 @@ struct ghcb_state { }; static DEFINE_PER_CPU(struct sev_es_runtime_data*, runtime_data); -DEFINE_STATIC_KEY_FALSE(sev_es_enable_key); - static DEFINE_PER_CPU(struct sev_es_save_area *, sev_vmsa); struct sev_config { @@ -1395,9 +1393,6 @@ void __init sev_es_init_vc_handling(void) sev_es_terminate(SEV_TERM_SET_GEN, GHCB_SNP_UNSUPPORTED); } - /* Enable SEV-ES special handling */ - static_branch_enable(&sev_es_enable_key); - /* Initialize per-cpu GHCB pages */ for_each_possible_cpu(cpu) { alloc_runtime_data(cpu);