From patchwork Wed Jul 19 22:47:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 122893 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2769684vqt; Wed, 19 Jul 2023 16:23:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlH6n9aLy9R48fsu+sLPrTsK7C2v6i4Rs3XPO8vPr0RrMwvNyILmh/K0O9c5rTXEyck93J77 X-Received: by 2002:a17:90a:448d:b0:263:4305:4e82 with SMTP id t13-20020a17090a448d00b0026343054e82mr2769791pjg.6.1689808995046; Wed, 19 Jul 2023 16:23:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689808995; cv=none; d=google.com; s=arc-20160816; b=mVXBaOye3r+BXdUmB55cbyMBxOLzch7mw62F7HIYyB4SVXSOAQgWjArkxntqx8aLvR qKV3lvQPBDv+CvqXk56y7NEXF9be0T/Gi9Ez2cWQ4xtE8AWhEgUP4xy8tTYrv5i7Hk+Y Hyv0vEv7OPiQHWpSNGfXmTFOPRNYn9dS+EZkHfS4BtPsjxkvnVsVL99j7xHDnr54rzBk qzF2s1LRsQ73D1L8DpQ2bLXnTI01CAInmfjbmANXGoZxww/q7zfWFerUBfICY7vIfr+M ChkxNrnPP21CtqYABsyv7XVyhGBxwQuhhAvc6UUupl1yeq9whU6YcMSn3kduj/I0xMy1 4qVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=M9M7vbxdKItRAzi5+xQssfnAkcHGbGUvqZhEdNPKdFA=; fh=cYKsLYKlfL5GLDpOt1a9DaF93PQ8azQhO0iBCt+veh0=; b=XGnZmvT+cnqONhM+kDC1UypwwYk/nTVDmiy7QC1syeRSoGR+vHyVCTlibnYBS/kwGA MQTqHDbIvCvXj0s46rqRHb9Boipkibt71A+TnXeKEGShh8SLHa3FDNu3EoWubtpNjG6q VCj8YxrwMwwW0ed0lbGuM730usgYG/41xmCSX6kz9qjxfItPjTokmuZb1nHmCsmLZKPQ d9kkrXQEw5VLQYzsXsb9lEhV+CF5IbI9ckGPT+d+EHZFVQXbn1jgIf142GUYWI/ObdoQ D8vVThKVme4R3/iT425Jv4rF28faqHVbPPUdyda/OzyTYOR5jkVszJY9+36ki5cKaqRL nnVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=P8C4bqgA; dkim=neutral (no key) header.i=@linutronix.de header.b=Zd39l3x0; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cl1-20020a17090af68100b0025e404ffb21si2235994pjb.18.2023.07.19.16.23.02; Wed, 19 Jul 2023 16:23:15 -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=@linutronix.de header.s=2020 header.b=P8C4bqgA; dkim=neutral (no key) header.i=@linutronix.de header.b=Zd39l3x0; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230388AbjGSWrl (ORCPT + 99 others); Wed, 19 Jul 2023 18:47:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229872AbjGSWrb (ORCPT ); Wed, 19 Jul 2023 18:47:31 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F4841FF1; Wed, 19 Jul 2023 15:47:30 -0700 (PDT) Date: Wed, 19 Jul 2023 22:47:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1689806848; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9M7vbxdKItRAzi5+xQssfnAkcHGbGUvqZhEdNPKdFA=; b=P8C4bqgAehc7OwpWiI04UtcS9+s+Wf2IcBIeBwP0/VRpXSwcjSqq6N0QkYD1Ttga3batad 0FgI8TDXYQCa3RpxFCXrtrEjUg6i6nVKD/+nPBlO/ZgEd8AYri9oOb93CFVsKOTPMEyNzJ TVjef8dX026COsPEJyQlHlnyRN9ZAkM00LwWxNuaE88HrH2rEyda1gxUBl1Pm/9S87KRgk rLE+DC/c+yv7I8ceEjDNUNnoER4OCe797ROUqY6MiBR5Btw5jUbub4vHRuJ1QVHHeHXLTf 2z6H47HgNXHdsc/Jr5fnW+XAlE7EBxxDOJ0f/vd04WGyg19iEbqZC4pupoKtag== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1689806848; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9M7vbxdKItRAzi5+xQssfnAkcHGbGUvqZhEdNPKdFA=; b=Zd39l3x0NBI2Fs3a5IddeO28luyP46IAKg6qR1AO0sAlnfR6To5VhgvbF767c6JyEr8sfe o3MhREHz4yztUYDw== From: "tip-bot2 for Rick Edgecombe" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/shstk] x86/cpufeatures: Enable CET CR4 bit for shadow stack Cc: "Yu-cheng Yu" , Rick Edgecombe , Dave Hansen , "Borislav Petkov (AMD)" , Kees Cook , "Mike Rapoport (IBM)" , Pengfei Xu , John Allen , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <168980684752.28540.56367628692535822.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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: INBOX X-GMAIL-THRID: 1771893156953270065 X-GMAIL-MSGID: 1771893156953270065 The following commit has been merged into the x86/shstk branch of tip: Commit-ID: 3e355a630fb01098623524115735156944b5b0bc Gitweb: https://git.kernel.org/tip/3e355a630fb01098623524115735156944b5b0bc Author: Rick Edgecombe AuthorDate: Mon, 12 Jun 2023 17:11:04 -07:00 Committer: Rick Edgecombe CommitterDate: Tue, 11 Jul 2023 14:13:46 -07:00 x86/cpufeatures: Enable CET CR4 bit for shadow stack Setting CR4.CET is a prerequisite for utilizing any CET features, most of which also require setting MSRs. Kernel IBT already enables the CET CR4 bit when it detects IBT HW support and is configured with kernel IBT. However, future patches that enable userspace shadow stack support will need the bit set as well. So change the logic to enable it in either case. Clear MSR_IA32_U_CET in cet_disable() so that it can't live to see userspace in a new kexec-ed kernel that has CR4.CET set from kernel IBT. Co-developed-by: Yu-cheng Yu Signed-off-by: Yu-cheng Yu Signed-off-by: Rick Edgecombe Signed-off-by: Dave Hansen Reviewed-by: Borislav Petkov (AMD) Reviewed-by: Kees Cook Acked-by: Mike Rapoport (IBM) Tested-by: Pengfei Xu Tested-by: John Allen Tested-by: Kees Cook Link: https://lore.kernel.org/all/20230613001108.3040476-39-rick.p.edgecombe%40intel.com --- arch/x86/kernel/cpu/common.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 52683fd..cf5275a 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -588,27 +588,43 @@ __noendbr void ibt_restore(u64 save) static __always_inline void setup_cet(struct cpuinfo_x86 *c) { - u64 msr = CET_ENDBR_EN; + bool user_shstk, kernel_ibt; - if (!HAS_KERNEL_IBT || - !cpu_feature_enabled(X86_FEATURE_IBT)) + if (!IS_ENABLED(CONFIG_X86_CET)) return; - wrmsrl(MSR_IA32_S_CET, msr); + kernel_ibt = HAS_KERNEL_IBT && cpu_feature_enabled(X86_FEATURE_IBT); + user_shstk = cpu_feature_enabled(X86_FEATURE_SHSTK) && + IS_ENABLED(CONFIG_X86_USER_SHADOW_STACK); + + if (!kernel_ibt && !user_shstk) + return; + + if (user_shstk) + set_cpu_cap(c, X86_FEATURE_USER_SHSTK); + + if (kernel_ibt) + wrmsrl(MSR_IA32_S_CET, CET_ENDBR_EN); + else + wrmsrl(MSR_IA32_S_CET, 0); + cr4_set_bits(X86_CR4_CET); - if (!ibt_selftest()) { + if (kernel_ibt && !ibt_selftest()) { pr_err("IBT selftest: Failed!\n"); wrmsrl(MSR_IA32_S_CET, 0); setup_clear_cpu_cap(X86_FEATURE_IBT); - return; } } __noendbr void cet_disable(void) { - if (cpu_feature_enabled(X86_FEATURE_IBT)) - wrmsrl(MSR_IA32_S_CET, 0); + if (!(cpu_feature_enabled(X86_FEATURE_IBT) || + cpu_feature_enabled(X86_FEATURE_SHSTK))) + return; + + wrmsrl(MSR_IA32_S_CET, 0); + wrmsrl(MSR_IA32_U_CET, 0); } /* @@ -1470,6 +1486,9 @@ static void __init cpu_parse_early_param(void) if (cmdline_find_option_bool(boot_command_line, "noxsaves")) setup_clear_cpu_cap(X86_FEATURE_XSAVES); + if (cmdline_find_option_bool(boot_command_line, "nousershstk")) + setup_clear_cpu_cap(X86_FEATURE_USER_SHSTK); + arglen = cmdline_find_option(boot_command_line, "clearcpuid", arg, sizeof(arg)); if (arglen <= 0) return;