From patchwork Mon Apr 10 08:14: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: 81415 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1760539vqo; Mon, 10 Apr 2023 01:52:23 -0700 (PDT) X-Google-Smtp-Source: AKy350bC5w6TvYSDFCWMRgFCgnBrUsvTsVXAdSIPkT7b+mrSVb08G1YIFNCItn0RpTJ7MOBYAMB+ X-Received: by 2002:a05:6a20:3b1a:b0:cc:ac05:88f7 with SMTP id c26-20020a056a203b1a00b000ccac0588f7mr6702823pzh.34.1681116742884; Mon, 10 Apr 2023 01:52:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681116742; cv=none; d=google.com; s=arc-20160816; b=tw0MsUnJNnMdw0k6yMsMic2V+TTCNfQy+2X6em30gRAclBNNW2+WVVDbHvQIUeUtW+ 97Hmuj+u1o9BUJxAf8jZ3VGCsLVAt2IFyHJrgMKBSt+i9PeQZkZXyFtvb3eNqc9gWTTh LuEIxWiB890gFD49XIHrcX/qZByw8Ho/OHqaoSaF0BxbsQZluDZ2we8rlUSxL09+EUkg o+nouiIEqkXhvaUZUDtRJQbT16FbQuTXHB++K/dxj/KONhnzeJD/Am78ZjFgCCQ2CCsr q4Ad8cEA6zyuLxiDSfHkqavKo9fZAo277Pfz8qwUmwdhEwuc8WdpPHtE3CmpBpgI6ho4 SoQg== 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=AZhchYObxkyddnYtujzFvb8mnBUV3KC37YjJXcAOn4RBaBpRA+KmiJp4JnmQ07p59/ j+/xY/SbGRh9cLcnn/OmuRdu30OgbTC0bzrmKldPbSbEQUEpreNndUk5HmvByoVSrsyj CuapC0C2QxOqQm5NVAl66usnr+Zt/CePVKC9kMhf7MWc0uv6k5JHII9PCwHEmJ8Pm+Lg A8B+R/81pFfgnuSjX+01gXp2DsNshco7bevi/Op7VMUfXm2kq8RmVNuEWcNfz2A0vva8 0/mslUS0DoFiLwS8o5QXSqohtPYoOyKJ3oKY3GWrvdvRCj6qLIoNMi662klzzRsL/k7C EEig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Y69myD9Z; 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 f6-20020aa79d86000000b006257ed5354bsi10248257pfq.195.2023.04.10.01.52.11; Mon, 10 Apr 2023 01:52:22 -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=Y69myD9Z; 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 S229839AbjDJIlj (ORCPT + 99 others); Mon, 10 Apr 2023 04:41:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229707AbjDJIlG (ORCPT ); Mon, 10 Apr 2023 04:41:06 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17C0C44B1; Mon, 10 Apr 2023 01:41:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681116066; x=1712652066; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xePdNXHU682aUfMVCFmcmPRxw9pVvyjrZ2d9bkzRB0U=; b=Y69myD9Z6b+jUs/UiGhCOCgToSWc9BJHgtMulA2rUB0PuibrQU781Z78 +qJ4MM7bLxx8J6VBywC7xkbroZfOfks3REZ4pP9ZZxwlzDOWMWgpM7pBP UHi5RUiZRuwRsqnpM/onQzZ+8RzW/J3KcnOIkkzlIRe9X+6qoqFmEBn4X cm11DNV5r3bst6Y9b69z5tr9XzAz31BStn2yxaMB00ir4bF+HgC/P0vyO F6keW6qx3jJ8oZgp+EDnxBVR3mk751iGOwsDtF3Hla6fdBwFAl2x9ojeN SRjFHCk879oFJkd3wQMDv3MWIJqdNbamNzBGkyM0OzkgrlYtWREMav1kI Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="342077956" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="342077956" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2023 01:41:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="799436269" X-IronPort-AV: E=Sophos;i="5.98,333,1673942400"; d="scan'208";a="799436269" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga002.fm.intel.com with ESMTP; 10 Apr 2023 01:41:03 -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 v8 09/33] x86/cpu: add X86_CR4_FRED macro Date: Mon, 10 Apr 2023 01:14:14 -0700 Message-Id: <20230410081438.1750-10-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410081438.1750-1-xin3.li@intel.com> References: <20230410081438.1750-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?1762778669573793511?= X-GMAIL-MSGID: =?utf-8?q?1762778669573793511?= 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;