From patchwork Thu Mar 2 05:24:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 63216 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4063355wrd; Wed, 1 Mar 2023 21:52:53 -0800 (PST) X-Google-Smtp-Source: AK7set9AlnRtM1i3DVwbHn60eUHXR3nMMA2qPn9gDHrMXJYDFvn9u8TktlpDyfMdVZ2iKmlr/YFd X-Received: by 2002:a17:907:392:b0:878:78f9:d1be with SMTP id ss18-20020a170907039200b0087878f9d1bemr8598924ejb.23.1677736373092; Wed, 01 Mar 2023 21:52:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677736373; cv=none; d=google.com; s=arc-20160816; b=lmqQyVsZ4fUxSiCBRiKKVARAn6Yd7buMSlL9dJ0o987WsAtbbEIqr6wf3Ky2kUUb1V gatBjdhrZGPjhr1Qc5UHSRwTpY+D5fD83nM0E7dQOQ4DSICXiOc3JaEYNBicty3V85Lz zptsV+b1BJQD02mmhuJlmXUO5McGQbRF8P88NuPYILjsijrbLZI9xkllYynlLtoK0q9f u1Oy75Tk17cbPrUWUXT8CTFASxgr2IP+WbGMKYVtN5JdXmkTo9baeM+xXp8gUHyLXWLx NlQg4wKnX8iPUzPrhF7PhWw0gckQ1555lC0RfbV/JINEF0Olv72pTwTumRyqQGCKWC6s dqyQ== 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=zR1geMWw4pQesNdbH/+rzd5WEFZnV7xSlM4gzM2Oo6GdfjAor0j9eIDtOSdBrBlg6p neZ5GDYd2CIchM547F8nFQflMxYo1GsbaFbIFnrhTFrDweamYusWf3wXfWjvGbk+Bl5P pzYOePFQ7FYEL/VZ7erEJMANJShqZVX83uRTtPcpI99n4SjhKlJvbdyCZrbGYDN20rMG wHAmJHAi1O2ZJstvsqMmtIzgHqvHcZvN3SwAu60D8o8t7S5jcu07MZk8VvseUyoDZyM5 R+c4BNG6TZPNrp5K6sXgMflxTZzDwGEJVhWopp6yNmlymUzWsGY+CiAs6WONna6XUGtV 7akw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CLzNobft; 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 q7-20020aa7d447000000b004ab4d025978si17587379edr.245.2023.03.01.21.52.27; Wed, 01 Mar 2023 21:52:53 -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=CLzNobft; 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 S229950AbjCBFv0 (ORCPT + 99 others); Thu, 2 Mar 2023 00:51:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229836AbjCBFu5 (ORCPT ); Thu, 2 Mar 2023 00:50:57 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C3D438EBF; Wed, 1 Mar 2023 21:50:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677736255; x=1709272255; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xePdNXHU682aUfMVCFmcmPRxw9pVvyjrZ2d9bkzRB0U=; b=CLzNobftOYhJIANZjkSdArN2/BUj79100PuNwX4FfDu8NNR4kxGLVrG1 7VLjyUn9C58UGE4eEzTk6URP+pkmaN8bQJFMOIsC17eeAjqRfCxOQE4Ey pHvLj0kTKonz7YPD1I/2xdVPm+/jxQVhi6lInv/GfbEX3pMN1rzBYW/lF 8QOYwVxzAPHODuynw9CzAPLxXrViMmGLmINM1FVnF/mQ5UVMRu018tUUb swq2sIPsa+iHlvIPELVmDJpFWNasxGWdPie47p9OvJU2SzNjrIl/1J1cU mTWZ4SVy8A2ASembyY+DXBodfYYPxkpWqk2lNBNJ/BiaqznB4LlWyhVTs A==; X-IronPort-AV: E=McAfee;i="6500,9779,10636"; a="420887123" X-IronPort-AV: E=Sophos;i="5.98,226,1673942400"; d="scan'208";a="420887123" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2023 21:50:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10636"; a="920530896" X-IronPort-AV: E=Sophos;i="5.98,226,1673942400"; d="scan'208";a="920530896" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga006.fm.intel.com with ESMTP; 01 Mar 2023 21:50:47 -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 v4 09/34] x86/cpu: add X86_CR4_FRED macro Date: Wed, 1 Mar 2023 21:24:46 -0800 Message-Id: <20230302052511.1918-10-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230302052511.1918-1-xin3.li@intel.com> References: <20230302052511.1918-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 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?1759234095205093049?= X-GMAIL-MSGID: =?utf-8?q?1759234095205093049?= 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;