From patchwork Thu May 11 04:08:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang, Weijiang" X-Patchwork-Id: 92407 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4175723vqo; Thu, 11 May 2023 00:24:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5CAzpdfNY72R1tozoxHxuJQVs93CgK6xwUU/A2BewBqXkHfGd7R5KgxhUOBK4FOpl1zm6c X-Received: by 2002:a05:6a20:8f16:b0:104:873:c3b5 with SMTP id b22-20020a056a208f1600b001040873c3b5mr400278pzk.44.1683789890088; Thu, 11 May 2023 00:24:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683789890; cv=none; d=google.com; s=arc-20160816; b=G+NTL0rSEzmWmmBCRwawzENgla+/dZ+RXPrZP/pO1N9qc1qHZ484q9DqnK+DWl366L gL1AUlM1JtB9ObsAxL54+mAris2L7ZTefgpZbskdEfDLnuFAXFEFHEg6ipHkgfBKAqs4 i4vzuHigjXBp7DzTfESxyw3EZ3MybBCAgyC0D6MWY63LqwrsL8/0kL20DOLpMsdRXmhy K1p3O6ZG3OPBP9mAumSlzs7MCuJRB0n/ZFyyTQtppe2J6v2S4yOlPqwzH/Jnw8vtFbYa Wh0OmsRo2fLfXGfqHSjJuZfnP5AL23A3+sDRQLJLro/sao8orWQFYOsJfntdQBxtXX5a g8vQ== 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=TnguLMy/LYvpW0DxSHrCcCqrNUTcr85gN24YCu4klWk=; b=Ck/mHTxVJbUO3IpzqjX9StRGkDMF/KlguvDWXlEIwBKUEiQ26boU87pFWcSzBsAMQI 53EKZqmxY3WusnyrhFyk3xuWPIn5b4Di+uy8TuJ7AHQfrxZtIET4GkUdQf0FELjWfsBm zUWIv74WbncGQFPzDPMEPXL7KLwsa7QQel5jHmB1FULRCJRBd7JomYs+zYPRRdJltwGD ZfHpwdqQZnXxbyoITjlGQwpSdmprevcqq4wZW7DrELBxyFVxEYK/ZDf7iWXmiNbNu6lH g2GnUisl9yu7TPtqPFBFNOTP9Dl5Ojf9Sa6hywdzq090Umm3WN/zVuPI3TjTnFHPhaRR YSqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OrHdLJ17; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bu17-20020a632951000000b005303d78c47asi5672971pgb.726.2023.05.11.00.24.35; Thu, 11 May 2023 00:24:50 -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=@intel.com header.s=Intel header.b=OrHdLJ17; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237688AbjEKHQZ (ORCPT + 99 others); Thu, 11 May 2023 03:16:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237678AbjEKHPu (ORCPT ); Thu, 11 May 2023 03:15:50 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5BB88A53; Thu, 11 May 2023 00:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683789291; x=1715325291; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=R1cGvPwI+TvLSQM2okFg1qOQiQqzPO7kVX+ps6fOpj0=; b=OrHdLJ17WdbjwzheHW0iQ9kLBL68Y3nhsMogeTutdGDxCchl8V9HS9Dr MnXh9tWBmYadCMAYC5xSsg69YQvYAjCJKGLNfpRHPUi05HvMUPPd/onGX 4ebW71g9eNfl7lLdegmO+nHMgwLdveov7ARzYMHfRD1hO4Ben+EE3v8AW j26K/uwZ2uzkON/ASKKAMKMumdHsYyJlB9/hgIIz9X6plJnWQ4RRNM0tw f57B4Pbn1DWKxtnYsqKV+nj4/N5ONMuVHM44opsdeI2DnIDjLFdBjuhSP 5ALov2Tmb7nBPH7PfLu7YGPmzsR+g4dhD6LYlrao7QYq5arT+yZXUT53q w==; X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="334896657" X-IronPort-AV: E=Sophos;i="5.99,266,1677571200"; d="scan'208";a="334896657" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2023 00:13:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="1029512349" X-IronPort-AV: E=Sophos;i="5.99,266,1677571200"; d="scan'208";a="1029512349" Received: from embargo.jf.intel.com ([10.165.9.183]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2023 00:13:22 -0700 From: Yang Weijiang To: seanjc@google.com, pbonzini@redhat.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: peterz@infradead.org, rppt@kernel.org, binbin.wu@linux.intel.com, rick.p.edgecombe@intel.com, weijiang.yang@intel.com, john.allen@amd.com, Yu-cheng Yu , Borislav Petkov , Kees Cook , Pengfei Xu Subject: [PATCH v3 03/21] x86/cpufeatures: Enable CET CR4 bit for shadow stack Date: Thu, 11 May 2023 00:08:39 -0400 Message-Id: <20230511040857.6094-4-weijiang.yang@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230511040857.6094-1-weijiang.yang@intel.com> References: <20230511040857.6094-1-weijiang.yang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_00,DATE_IN_PAST_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, SPF_HELO_NONE,SPF_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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765581668113071648?= X-GMAIL-MSGID: =?utf-8?q?1765581668113071648?= From: Rick Edgecombe 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/20230319001535.23210-5-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 8cd4126d8253..cc686e5039be 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -600,27 +600,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); } /* @@ -1482,6 +1498,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;