From patchwork Thu Jan 25 18:21:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 192234 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:e09d:b0:103:945f:af90 with SMTP id gm29csp171597dyb; Thu, 25 Jan 2024 10:28:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IEhtQwMy5KBh2UQW4HLXXEStnuJiUKsj3gRAj4c3beTPU9LprQ/nQdi10T+lQSNzi57XxOP X-Received: by 2002:a17:906:ce4c:b0:a30:8657:e9eb with SMTP id se12-20020a170906ce4c00b00a308657e9ebmr603ejb.131.1706207308623; Thu, 25 Jan 2024 10:28:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706207308; cv=pass; d=google.com; s=arc-20160816; b=yoM94PpRopQUEq5SexAa7vPbdDcRg/i1KhPWjNIZAsY2UzpyvjS+eEgZ8Dih/1rPx9 dryeecmoOOPh+mG0VEnlla2NTu1Xby4L5cwwJFyZgkZm4fWFTQbZQhkaqZbdLyLRwfF0 GewNnAZ/TiSuiWjI74l3vu3xeShoZW3egwrYK0PVW3yrSIpsgQ55oBPOqXSzpQxMizhP 1n/MCBj4lcTq729LeSde7k2yyiSm7bzI9DEo98rihDKCGTC+4p+1pm9njh6Xgt2VCauo Y8N+h3TFC0N4cf/+7bQn4FEiHRpaOGCvlJSTvV/S3UNJ1KLMeF6dv812LGUWizCujPc+ 5VmQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=opfhapgWd5sBJyKyS1cpL+Owg1lDw/SwVoorEMlQR+k=; fh=U/Hd0cPmVpmsXI9UC370Q88/l4pozXEkKxB1Pi0MTn0=; b=sQl3OTl58Rtu2cD4ycsNwxNzBreerCvPqLVSSZ93WrSC9EHijwdKCXCSveKxdKiqP/ ih01EQSDwH5tL7kVYwWZtL2WxJH/qhiXNFCcom0duq/BxaQMDTdOa3TDR+64nBKsfwVU V87gvjioFwy2Hr17ykZLCj5Q8QTov6Nug7ZyGXh0f3rGEt/fKRAaIggp35NXvUw11pN5 TCeU/p/2J0k9y5GT7wy2H4r4IpzjxJl/hhf6no9vvqBFJBwhoZVCCBuvnVAbtUr2NblQ cu9C9J7GOAHPgs0eDYGdsciNGojLqsT3rpFjkHMzXjV6IxYxMrL200p96+X8QWbRqve6 sRaA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=EQ22uxjt; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-39105-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-39105-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id lx15-20020a170906af0f00b00a3178e881e3si831971ejb.783.2024.01.25.10.28.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 10:28:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-39105-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=EQ22uxjt; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-39105-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-39105-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 40E8D1F21D84 for ; Thu, 25 Jan 2024 18:28:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 99AED1350E4; Thu, 25 Jan 2024 18:21:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="EQ22uxjt"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="H95bCOzo" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D79FF13A242; Thu, 25 Jan 2024 18:21:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706206898; cv=none; b=DVwdvPk8e/3k5TzXDpwqxBQQDPxNavKiGIe7MFCotCPGOnhiZ8tfZxcFz+ZcURnGq/KX+ekTBohIKMlVD2k7mkaA5EXYcX6TN4xNgC3i28UqU26lENHERiI3xW6qtLmPsHa6V2ZEi0CNodxLuOrFpL/+ruZVfDDXCoFBe+JHyao= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706206898; c=relaxed/simple; bh=ilBs16Zx/EspvmyGTE2gwN1gK6EvIN7UMg3cF8k+2yA=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=MGPgBDkeW1YoXGRMajtRgK7i/LmqS0+WAkmpCFR8i/TpsrjV1hQ/OkcB/2UqN4k2A3OfH2bjVpUGOYpPMu79jr+1HXnwMvbkWFrCh1WVkFU2WIszvTo8lw3e5Uuh0pIEDTvETPSxaDW6Ajb7EiUCDono5z5Y68pZtuqF/JeN6jE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=EQ22uxjt; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=H95bCOzo; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Thu, 25 Jan 2024 18:21:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1706206894; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=opfhapgWd5sBJyKyS1cpL+Owg1lDw/SwVoorEMlQR+k=; b=EQ22uxjtdoj0Me60jrBv8QTTv4+x7kPpys78BcRuGl0IoUvPge1y09aVUDjByrKUzCDod2 qeHX2XfKmlPF1zZKqvWXAFfVu+PtlvC0h8MVrrHjMVVkJaRtNpDy7wKvExLob1rBwqibbp WOqCBTgWGa7E9WWiac1GKRuELt1JHluUr6arwL6o0g3+2jn9mdxlz39IFDpJ5HQdPiVElO Dso1lGVWEQBR1fKe6icHHHcLnqz6oHO3XYGZ5VvjC7JgaN+DvjWg1IuiiLDD40UyEzhQGW knM4WixcM/cesCmXBJLfuQW11fvZ95F6JNWIdl9BKXlzA7J80+Vqd1ZfxWAaqA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1706206894; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=opfhapgWd5sBJyKyS1cpL+Owg1lDw/SwVoorEMlQR+k=; b=H95bCOzoi5JrDvnTq94Bn6DHWgrJnJm2vfwg9yWAF8ARILiA8TNmTSOrF8bLwWLPWd6GMn yl+ulIRUTkt/AbCw== From: "tip-bot2 for H. Peter Anvin (Intel)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/fred] x86/cpu: Add X86_CR4_FRED macro Cc: "H. Peter Anvin (Intel)" , Xin Li , Thomas Gleixner , Shan Kang , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231205105030.8698-12-xin3.li@intel.com> References: <20231205105030.8698-12-xin3.li@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170620689363.398.2996630752876971026.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784440835177456283 X-GMAIL-MSGID: 1789088034808912562 The following commit has been merged into the x86/fred branch of tip: Commit-ID: 22a5d8d8daf22e98eb472be6c4c9f3a195ed6025 Gitweb: https://git.kernel.org/tip/22a5d8d8daf22e98eb472be6c4c9f3a195ed6025 Author: H. Peter Anvin (Intel) AuthorDate: Tue, 05 Dec 2023 02:50:00 -08:00 Committer: Thomas Gleixner CommitterDate: Thu, 25 Jan 2024 19:10:30 +01:00 x86/cpu: Add X86_CR4_FRED macro 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) Signed-off-by: Xin Li Signed-off-by: Thomas Gleixner Tested-by: Shan Kang Link: https://lore.kernel.org/r/20231205105030.8698-12-xin3.li@intel.com --- 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 d898432..f1a4adc 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 2121ec6..204f4c7 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -382,9 +382,8 @@ out: } /* 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;