From patchwork Tue Mar 7 02:39:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 65217 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2209565wrd; Mon, 6 Mar 2023 19:07:05 -0800 (PST) X-Google-Smtp-Source: AK7set83ImzdGbV8Wsuio6s+S2CXPvhP8q51/iKGXiAnI9uDavCrj8DfOuANZ3fRTbJOQoltPmxe X-Received: by 2002:a17:90b:1c90:b0:233:ee50:d26d with SMTP id oo16-20020a17090b1c9000b00233ee50d26dmr14711768pjb.4.1678158424879; Mon, 06 Mar 2023 19:07:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678158424; cv=none; d=google.com; s=arc-20160816; b=u7cP3uQg28+gPUWasm2vAebj0P0ZOWMGE5u6MC9AMpOvFt/NV0JqRcMaIbY7gIC7QD YzUanWkHWeUhIYbyqw36ZIbkWaGB+9fig9zIJrY6uRx7iHJBwgmtmu1bFldq6sbKBTnt y7yE0U7cFoAgAiTGDNDRDEbMV1rplPrR6pnNu+Ib/vl9FR4RPaZpJmnj7xi3u9AIfVI7 jzBWf+4S0ZcsyCnvWMbkDdCahv/9uTPdOAU1OWP7jJsFdO81XHHGmrJrNNzDxeIsIQLt mGB4oipGvEZkt8P6WkF/uT4JF3arlCLAUuMt2OYJ8C64ih/SflLcFV+ogM3PEaMsmfy3 XdtQ== 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=q+8JP4anwG6l+/JdCeF+0m7dWhOfWBniSuiCFZPmZQ9V0AoM6zZATOlqXIdzHQMRW3 +nwKZdhB4iT5d6Hkc2ANIoaZAJ2O1CuWhyi7mgcCzEY/eQu9yk61D4HN/a8g9wHz573q 8JiCP5FUgLR+XH+3rj1aXBNoZMu97kJQskzaHiYKg3zcoZkrIPz2FaNd8YDWTk8QJS63 xCSyB1+K1S3ureD+aWOg5cCz8qhoVS6k/8RmDoq4uDl5WUZspIVcFqO9rsyHWLHtyw/U SingLg4pZApEJBHjyTXXTk6sqKaawwltDD7jsxaBhg/4FrG3YvGIkxaxDaXnAcmXWveR Dfuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GRkPYp2x; 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 my13-20020a17090b4c8d00b002199a16366csi11154536pjb.173.2023.03.06.19.06.52; Mon, 06 Mar 2023 19:07:04 -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=GRkPYp2x; 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 S229905AbjCGDF4 (ORCPT + 99 others); Mon, 6 Mar 2023 22:05:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230239AbjCGDF1 (ORCPT ); Mon, 6 Mar 2023 22:05:27 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3E3E7C9D6; Mon, 6 Mar 2023 19:05:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678158324; x=1709694324; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xePdNXHU682aUfMVCFmcmPRxw9pVvyjrZ2d9bkzRB0U=; b=GRkPYp2x11rkic9xApV0XpPQ4unL5Bq77bkGA6yI1l572qf4GV7eeaLY f4z+U53zFjUsfEPnhwtOjlNCoA5mKcEStXGSvCQMPZZeB83WxkCAwAGbk feVUXd6iWsOiomrUOC/NMBG8i5okxY9wxC9aws8oyD2UAjs3eCkr4CFK+ H/ImX5xg5uetJN2wnxqHRE7rRrkuzospIG+pQ5YTNhEmIbeTSt1dzOQkd uSNOOi01IsDAFpw9Bvxf03BI2F8SBnON5mBvil8OAfjXx57GnDy9bBPTX WpK0Pp0Nk9k62M7A4FBEcieHPpie7UVkuWBBwuYECUjGjrt9JAilEGxWy Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="338072391" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="338072391" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 19:05:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10641"; a="676409771" X-IronPort-AV: E=Sophos;i="5.98,238,1673942400"; d="scan'208";a="676409771" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga002.jf.intel.com with ESMTP; 06 Mar 2023 19:05:13 -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: [PATCH v5 09/34] x86/cpu: add X86_CR4_FRED macro Date: Mon, 6 Mar 2023 18:39:21 -0800 Message-Id: <20230307023946.14516-10-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230307023946.14516-1-xin3.li@intel.com> References: <20230307023946.14516-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759676648359784305?= X-GMAIL-MSGID: =?utf-8?q?1759676648359784305?= 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;