From patchwork Mon Mar 27 07:58:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 75267 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1357274vqo; Mon, 27 Mar 2023 01:38:01 -0700 (PDT) X-Google-Smtp-Source: AKy350aov8DYYWUKvMN9yqtt0XdzlQezamY4hIf1CXk+KIu0yAf3Z31Kkjh6BVOgDuRg4lwSKFRB X-Received: by 2002:a17:906:4b08:b0:8b1:7de3:cfaa with SMTP id y8-20020a1709064b0800b008b17de3cfaamr12253584eju.3.1679906281049; Mon, 27 Mar 2023 01:38:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679906281; cv=none; d=google.com; s=arc-20160816; b=ImlBaO2+C0Rb3MMHF+dk+SDIhSmIsAgZH5aXuESdIvDAGuNVnL2+kw6bIXhRKpQ9F1 EReMb1Mq9xtRkNmJsomsRyxjDrhCcWGztpB/kCiT+cQc/JRuhTRurLCxT5DrAgyhr3sz NQjR2DO6YaIB8QzGpYzd4GoVF90XTfXmufQNsfNWNAde1ul9u1ygMdG582B1GBV3hgtN 2egCb8Z1qqXkN3oe6sG8dAyY9znqqPVLH2TXiDltqUfMvk6eSXStpUw8LkZa7i8lbEG1 pxJgaPZJ4CJxCdmu8VbspbrL1DPiM3XsAHwVesq8cah3wX/YYOPwLlHl2DX4leGa2xd7 K3WA== 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=xiBkMNop4zUxT+iIfOnmWuMSopGG/t7/1Amns2i3v5k=; b=WG/TbE0n/TPV5NWV41Jmv7JiPOTns2Y3BguAJqA/nx9YhQ2NtdwJq08viv2WPd5mWu FJGRy31Aq2dkvS4rauT2TuFFM4EZBukwexb1RcUCvN5pRuVks0znO75YQrRr6Vt4OvD3 3Ik+APXLh5QVuxNERNmELI/yjU9mS5QQBHmku0A8Jxt0fSHDfBoiX9/mxDkS82E5UTFh 9BhtGjA9/P5MjUDVT2flW+LKC7VO3Btewri2VOIVdlsOEsgRpbAqzm3VfGeV42IYGPwH 0EuKZmEJXERVlFdAPOBYw7ltQntHuOeuWwoql+ddQfmjGHFeOHhmCc8mVyrkLhds6zF0 xixQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HC2p1kBc; 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 t2-20020a1709063e4200b0092d55987bcesi22810348eji.268.2023.03.27.01.37.38; Mon, 27 Mar 2023 01:38:01 -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=HC2p1kBc; 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 S232750AbjC0IZW (ORCPT + 99 others); Mon, 27 Mar 2023 04:25:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233004AbjC0IYf (ORCPT ); Mon, 27 Mar 2023 04:24:35 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6BFC3A91; Mon, 27 Mar 2023 01:24:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679905474; x=1711441474; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xePdNXHU682aUfMVCFmcmPRxw9pVvyjrZ2d9bkzRB0U=; b=HC2p1kBcGnUg0XxAGVB3fZ9z+bvwTw3FFOZu+KvQ7tTUREHWQEVPw/Wq TBzxcQMBQ1F+1uc58hwhmw5av2x0/d/E5DHcbPb4qux1NuVcqPaFgf9pC eWjzkRP/g4Ksvh8zMp9+IKVvsnBbjc9JC8SRtq9JZL6z67z9YR9un8KzH Lvg9BdPRjFMQAjccnP5AzaXVQaHE9tDZ6oLrS+FBaf8rOd2nFV9lzUboa 2HmGw2/v0NyvpS4/4cUnQGWWs3j3p/zU7BnF9B+eZiMKntcu0Rl0plbde Ep0LWD/3fwQi3XATA2Nh0dUhkJqNjLglDLmNqmLbDftmGUz+b27MZ4cuk g==; X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="338930170" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="338930170" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2023 01:24:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="713787060" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="713787060" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga008.jf.intel.com with ESMTP; 27 Mar 2023 01:24:32 -0700 From: Xin Li To: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, peterz@infradead.org, andrew.cooper3@citrix.com, seanjc@google.com, pbonzini@redhat.com, ravi.v.shankar@intel.com, jiangshanlai@gmail.com, shan.kang@intel.com Subject: [PATCH v6 09/33] x86/cpu: add X86_CR4_FRED macro Date: Mon, 27 Mar 2023 00:58:14 -0700 Message-Id: <20230327075838.5403-10-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327075838.5403-1-xin3.li@intel.com> References: <20230327075838.5403-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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?1761509408971898682?= X-GMAIL-MSGID: =?utf-8?q?1761509408971898682?= From: "H. Peter Anvin (Intel)" Add X86_CR4_FRED macro for the FRED bit in %cr4. This bit should be a pinned bit, not to be changed after initialization. Signed-off-by: H. Peter Anvin (Intel) Tested-by: Shan Kang Signed-off-by: Xin Li --- arch/x86/include/uapi/asm/processor-flags.h | 2 ++ arch/x86/kernel/cpu/common.c | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/uapi/asm/processor-flags.h b/arch/x86/include/uapi/asm/processor-flags.h index c47cc7f2feeb..a90933f1ff41 100644 --- a/arch/x86/include/uapi/asm/processor-flags.h +++ b/arch/x86/include/uapi/asm/processor-flags.h @@ -132,6 +132,8 @@ #define X86_CR4_PKE _BITUL(X86_CR4_PKE_BIT) #define X86_CR4_CET_BIT 23 /* enable Control-flow Enforcement Technology */ #define X86_CR4_CET _BITUL(X86_CR4_CET_BIT) +#define X86_CR4_FRED_BIT 32 /* enable FRED kernel entry */ +#define X86_CR4_FRED _BITULL(X86_CR4_FRED_BIT) /* * x86-64 Task Priority Register, CR8 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 8cd4126d8253..e8cf6f4cfb52 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -412,10 +412,15 @@ static __always_inline void setup_umip(struct cpuinfo_x86 *c) cr4_clear_bits(X86_CR4_UMIP); } -/* These bits should not change their value after CPU init is finished. */ +/* + * These bits should not change their value after CPU init is finished. + * The explicit cast to unsigned long suppresses a warning on i386 for + * x86-64 only feature bits >= 32. + */ static const unsigned long cr4_pinned_mask = - X86_CR4_SMEP | X86_CR4_SMAP | X86_CR4_UMIP | - X86_CR4_FSGSBASE | X86_CR4_CET; + (unsigned long) + (X86_CR4_SMEP | X86_CR4_SMAP | X86_CR4_UMIP | + X86_CR4_FSGSBASE | X86_CR4_CET | X86_CR4_FRED); static DEFINE_STATIC_KEY_FALSE_RO(cr_pinning); static unsigned long cr4_pinned_bits __ro_after_init;