From patchwork Tue Dec 20 06:36:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 34922 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2813281wrn; Mon, 19 Dec 2022 23:03:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXsDmD8/tqpUoSy3FASiBwi1WgxDG5CFGg+7um/EuNQvfoWVUyF6IO1cLl43Tibiqw8ffHtf X-Received: by 2002:a17:902:e149:b0:186:5f5a:5842 with SMTP id d9-20020a170902e14900b001865f5a5842mr12228016pla.11.1671519798079; Mon, 19 Dec 2022 23:03:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671519798; cv=none; d=google.com; s=arc-20160816; b=VHVndkixFsIQEl06J01tgUKhLSUJLjv02nQZDK6i0+fuuwfzCYVqBKjStvm+BU4HzW QhYJC3zeX5CWULzy+ljbdfyD6CdaB91D8rJXaJEfLZgs0dkZN2fIxj0eWmx/XThf4GIJ 8Pl2G9eX6DH13FqCDekaGFpqEKWbfs6KPH+nL/vQdcY2s+NLBzgzBEJ/vhAFZF3YgVmy nQuRJUqwPneOXrd2RnSNTMN7orDiz0zze/SAcRYLAy9w9mW0ArWS1OBTtoJNpOvFYhUc avSDper19ISj2k5JOLNrjGZkLhoFhZo9Y3B+QZrxg+XBIZZlCA+17EYs96KXj1VhvLA2 T+QA== 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=HwbVGYe1Zbj4u409YU1ldMYjyOiuY42cCRBkhvUQpxI=; b=R/OkAwzuS5wqW20ngpKspQw6dd7YoIRFDBMi8X88olrowus5zB6TepQqedHJkm5EK7 6YomEFl/4lwtbqPOJL+fdncLMpdo1a3/2Pw9+/V+RpgcoQngBURyqOQl6ZoPjNkT1Ded IErXXpqMsbPtIikS7ogi/PwMlXIu26M5Aem1Kk5gLM87areEYjzYV9La+5qFDiWjZzjl AaxQ0+zVNYD5C4kYRpgSEeAYCI412iAXlK82u8KZuJJJqTUYjEjChOQEQ2qp80lt8PGy HdI325KKS2n4Z4yRF8mOoClxjOjAfc3gV6joSi1uOrty1iKIDJ2lnxcX/tzfdcb7MzL8 MlpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TM0H2CXg; 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 f14-20020a170902684e00b00190fde95ac5si12140406pln.411.2022.12.19.23.03.04; Mon, 19 Dec 2022 23:03:18 -0800 (PST) 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=TM0H2CXg; 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 S233516AbiLTHCn (ORCPT + 99 others); Tue, 20 Dec 2022 02:02:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233158AbiLTHBe (ORCPT ); Tue, 20 Dec 2022 02:01:34 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D5762ADE; Mon, 19 Dec 2022 23:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671519693; x=1703055693; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=msUUkkdZ4tNoxXqmpYk+fBav1/cjI+hkwg5c4Hl6h2s=; b=TM0H2CXgXGMtsXVQ5l26GZT3ZWEm4wUTmJbrEcbR1iQFWDDzKNTA3iQf 2fqu653LqprU44/sBs4rJcj5WlOXAWf8ayp9ozxO2U/HHm9oua4/JaQK7 DQ1ppY1bte+gZVNQcRQCYVoN6DUpuvey9udTPzP5RpfEbUpdPXenz7Xw8 khn2cWW0hBICcNJczZi4idx+SDdqF8TwYeLNMI9uCQOA0p1zXxOnZrMZc jGYGdNvDgmk4RWoC20TCuuZZ+y2ppYQ3mHqaOfxO+ioTw0dnhUCL0VbyP lZwhZX/PrejiDT4ttOSKcxJT5z7TXw9KurtkebGt6Nv6Qi90ma7kvs9/F g==; X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="302971969" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="302971969" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 23:01:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="644326445" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="644326445" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga007.jf.intel.com with ESMTP; 19 Dec 2022 23:01:11 -0800 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 Subject: [RFC PATCH 09/32] x86/cpu: add X86_CR4_FRED macro Date: Mon, 19 Dec 2022 22:36:35 -0800 Message-Id: <20221220063658.19271-10-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221220063658.19271-1-xin3.li@intel.com> References: <20221220063658.19271-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_NONE 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752715543480378537?= X-GMAIL-MSGID: =?utf-8?q?1752715543480378537?= 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) 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 d6eb4f60b47d..05a5538052ad 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -411,10 +411,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;