From patchwork Sat Sep 23 09:41:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 144016 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp407626vqu; Sat, 23 Sep 2023 16:15:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyKv1doPXkVgwJE95NRPNVDdmlk/RB/PutGolWVUX4TdybcZtzrhoG1HgnZoeULvdHR7Qk X-Received: by 2002:a05:6a00:2492:b0:691:21:d9b9 with SMTP id c18-20020a056a00249200b006910021d9b9mr2850342pfv.30.1695510956152; Sat, 23 Sep 2023 16:15:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695510956; cv=none; d=google.com; s=arc-20160816; b=NkZ2oSvHzwHTl3mA+1H6z0I4L6DrcjTCWfXHQCh6jZhECZ0pfSTNATjfBm0BCKrJD7 W9s9kJ3NsL9yIrsKPv62Zrg5De0eBNoGcEP7uDaoKCGTrKI2DNzJJEFSdze64eeRL0wN d/iVrdm5T5dYbiZ3B7EDr4v0BuWk1oADUYXxtH4sPnben1OgAjSLkI7qT2cPDPkQVRxD pE1tMbCz+mJTaa/YMsOPfS+itwFA7/bfD5rCm0BH2sJzorUNj1rh4byZTUy8vON/uyN3 PcQre85uNRttT9xZ/DLdj9qQIP/sDn7GPCh6K5qstoaDqTofqLJoyjlqB9UZOD6xbUKG 8ljA== 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=HhJim99jBrPG1triQAjIkjG+udEseNe8P5m/qf+Fd6M=; fh=Tb1p8S3iOxe/kX/WSNC3xEJzSVgGJ5DaxSrKb+pzH+4=; b=rj3YcA4Pgpb4aq9W+X0olOubxKLCheI4WklB7sPIEk9/PyCAgC8lLx1tDz5fT5DTHF z1wmdhnDXzBfCDANxVKvSiQpE1nkj08rnpHOAkD9iKkgslOhHqirEuVj3C9uXM6iQQQ/ 6OV87vrSa+cpK/FBrr4xO8yR/i7uWNP3pkUtZhJKHWXKnzGXD993eApjGzLiWnWLtsA3 ydFuadPK1ssQmUkGhliSPqBVxllAQ3hyM/SKkczw6sSU7HkLk5kQVWIgXeo3diDBEJGx 6Mk/o+v0KtGBjZ6aWmcP0ta1TKe0eAUjO6WEGTbSgQBK7XrbAlWdJe9ojZRklE+qjNnA cjtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lU3kY2b1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id u71-20020a63854a000000b00565d05b2211si6788095pgd.819.2023.09.23.16.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 16:15:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lU3kY2b1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 9BA0082D2907; Sat, 23 Sep 2023 03:13:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231710AbjIWKMd (ORCPT + 29 others); Sat, 23 Sep 2023 06:12:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231367AbjIWKLu (ORCPT ); Sat, 23 Sep 2023 06:11:50 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC4C51A5; Sat, 23 Sep 2023 03:11:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695463904; x=1726999904; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HpayuDP0G6ySf2KQMWwvFighiKo7ZJmuZuQ215k2l1g=; b=lU3kY2b1mloP/Llhpm5fhd7XanC1j8u/Mj+maRUbTQ+yfhC4Gji0a6BA 09GznR4PtexVP+NwOywvflZagIG0EtyWgzQUKeJ/LZB79H0dyV9OxapJP hBRl5q6Cq1LYngMRI4ZnKgbfwS7WT31jwvbhWjXs8u5XxaTr8Ndezomer d0WYeiHJTyJLgL64pKSEK++/IU+UeX8bHDiz3XVHYdaH0SFcJPeXAZ+MM vB5suDP+E6Ae6IU2boqB8tXIewFkymgAdODWtstsojuJoPJ/2WRdKCt/P u/3X/+/j9+6/07VypQH+qUYnG/4eDntJNsweH6tC6fj5xH+gY2A7MSWuR A==; X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="447492228" X-IronPort-AV: E=Sophos;i="6.03,171,1694761200"; d="scan'208";a="447492228" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2023 03:11:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="813388144" X-IronPort-AV: E=Sophos;i="6.03,171,1694761200"; d="scan'208";a="813388144" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga008.fm.intel.com with ESMTP; 23 Sep 2023 03:11:42 -0700 From: Xin Li To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, linux-hyperv@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, luto@kernel.org, pbonzini@redhat.com, seanjc@google.com, peterz@infradead.org, jgross@suse.com, ravi.v.shankar@intel.com, mhiramat@kernel.org, andrew.cooper3@citrix.com, jiangshanlai@gmail.com, nik.borisov@suse.com Subject: [PATCH v11 13/37] x86/cpu: Add X86_CR4_FRED macro Date: Sat, 23 Sep 2023 02:41:48 -0700 Message-Id: <20230923094212.26520-14-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230923094212.26520-1-xin3.li@intel.com> References: <20230923094212.26520-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 23 Sep 2023 03:13:42 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777872096365076092 X-GMAIL-MSGID: 1777872096365076092 From: "H. Peter Anvin (Intel)" Add X86_CR4_FRED macro for the FRED bit in %cr4. This bit must not be changed after initialization, so add it to the pinned CR4 bits. Signed-off-by: H. Peter Anvin (Intel) Tested-by: Shan Kang Signed-off-by: Xin Li --- Changes since v9: * Avoid a type cast by defining X86_CR4_FRED as 0 on 32-bit (Thomas Gleixner). --- arch/x86/include/uapi/asm/processor-flags.h | 7 +++++++ arch/x86/kernel/cpu/common.c | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/uapi/asm/processor-flags.h b/arch/x86/include/uapi/asm/processor-flags.h index d898432947ff..f1a4adc78272 100644 --- a/arch/x86/include/uapi/asm/processor-flags.h +++ b/arch/x86/include/uapi/asm/processor-flags.h @@ -139,6 +139,13 @@ #define X86_CR4_LAM_SUP_BIT 28 /* LAM for supervisor pointers */ #define X86_CR4_LAM_SUP _BITUL(X86_CR4_LAM_SUP_BIT) +#ifdef __x86_64__ +#define X86_CR4_FRED_BIT 32 /* enable FRED kernel entry */ +#define X86_CR4_FRED _BITUL(X86_CR4_FRED_BIT) +#else +#define X86_CR4_FRED (0) +#endif + /* * x86-64 Task Priority Register, CR8 */ diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 4dec7822a291..20bbedbf6dcb 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -401,9 +401,8 @@ static __always_inline void setup_umip(struct cpuinfo_x86 *c) } /* These bits should not change their value after CPU init is finished. */ -static const unsigned long cr4_pinned_mask = - X86_CR4_SMEP | X86_CR4_SMAP | X86_CR4_UMIP | - X86_CR4_FSGSBASE | X86_CR4_CET; +static const unsigned long cr4_pinned_mask = 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;