From patchwork Wed Jan 31 21:14:52 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: 194952 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:106:209c:c626 with SMTP id mn5csp32309dyc; Wed, 31 Jan 2024 13:22:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IGoBzCLcftsXtsBgqdx6e2cr2W7sLgOKuDUmFPwxUN8iT7w3cwwdbBtJ6JNIqfPGiceb0n9 X-Received: by 2002:aa7:9821:0:b0:6de:25b9:573b with SMTP id q1-20020aa79821000000b006de25b9573bmr3075788pfl.5.1706736171345; Wed, 31 Jan 2024 13:22:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706736171; cv=pass; d=google.com; s=arc-20160816; b=UuBnAYIEyoAHTTySNm+5ZI0dYYfzXjY7nNtWhIQ8RtqzWvlAAmZl18e2RD90LjuYmg cV/hysQq/7zF6ocm+1lcagdBKcc/UP25g4BduYmc/G3PdRe3WGoDE6aCkYGELo3Y+J43 JHYAfkDrk+OiRXpEzuA7ZwVPAdPvcGfJHHQsxKJdVPOUzJgci3jDWi/8u8NPclC7wL5M jGQr261HRc3FTibOjbythJ70oP0WWDUx00L2bwY/fNKcPWtD5twn2ReEDz4ANvlQulWl 10pxX0pY0IK4lnESz0Vzjc7sYvhvGB55XbM7hsx0F+Dg5UhleFVnWqPvAma15n3vO1rC Tx/g== 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=a4mOrkThonDMdzj9hsnaed7Jjjg6dSJ+AnrkaRKz/CM=; fh=Nkj62rcrnsYtUy3a5qenmfGnQ2K0mXgoY6gkVs03a2A=; b=KfzgolTw5ptmroKzD3vxwXtFK+jaXk/OByDYu7ttEehAC16cEo1Ov7B7dF3apEbT7j YnMk0ttAa63BNVni0jGDUQZdTajenk7w8NMfV495+AxYbrfa82G6Bi9eMhB3YcDOyl3K LLUzjUYaElSailYEPmeIyZnXApXe7NmYKt+Hk2FL/BpyxPUZbdOWiqVwE3t6BsAOdt7M iGAG8f5g3UPnO9YeTj3wD0eWj2PMFwz0jHW4y9ehbC2DVPXMLGz9hBLLYsaUsPsOGtZ7 QJXBwbGsiIfwQW6PcDUnuW/tuKYjY7aNi1J15vEbx7TuNFHh0z0gUWjzYsKh3FaD1AtM XRHw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=BxQnW4Vb; 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-47141-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47141-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de X-Forwarded-Encrypted: i=1; AJvYcCXekMKpIuTIKSmExrBqqrwxWWJgbWSXZYASb9HZc03Rk/nQ4S1UvpJtU7LR3upcCNwZqTwpPMSGdRuSxf2CflPwEoHTmg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id u32-20020a056a0009a000b006ddc78331easi10466713pfg.401.2024.01.31.13.22.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 13:22:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-47141-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=BxQnW4Vb; 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-47141-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47141-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 9810328A733 for ; Wed, 31 Jan 2024 21:21:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F1EDE47F74; Wed, 31 Jan 2024 21:15:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="BxQnW4Vb"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="+eFQopcb" 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 1EC693BB47; Wed, 31 Jan 2024 21:14:55 +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=1706735698; cv=none; b=AJHXGj+PvXIvm1BQ1YeAZ+XMhT7pJ+wcaMIg8EdoU8QSIK7/ZUjwRLkqMcUnZzl/BUoOJwneZavZUdXW5jeZLABVIk60R52I7xAFTT0tWc7bgtDXkVW8G97wEl+BdQpjXsxtKCy3MJ4ckZNlm8NYo65u3ljVFc5jEIcpWGK5xfg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706735698; c=relaxed/simple; bh=lm5xyBXUHW7nrV7vkqJpZ367IKHsHpufQhe586XuoRk=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=VediRxMpe55K7/Pb9R1uIaKRpg6XB29WtV8UDAqKAET4xFgubk7fzOoAOaWliUyN9ruC9qTn6jOM0F267NZfbWQLNpdWvMa8bASSrXTOsgrTxvMf6lXIVjWSWRjRN0P8TMDhqNJ4Pm0WPGulMQNHpQSfsChyk0I3UmjCA/9rvtY= 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=BxQnW4Vb; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=+eFQopcb; 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: Wed, 31 Jan 2024 21:14:52 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1706735693; 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=a4mOrkThonDMdzj9hsnaed7Jjjg6dSJ+AnrkaRKz/CM=; b=BxQnW4VblKfv1L1o56ufw0+kCdWrnyYlb/X2DJuczY2NoYnRw+Ky9j1Rgp2QctVwfibhDb 1vB0THAJFGRamBPlNqKmNZotl0R8wmMKlxvS8l5S1nfLs5DYxbYVAI9wuTswnp8afrm88M 2B/ll8cSuhTW/fMKLKj03AeOSDYPC9bUrtj8VuEEImMyBO+G0kUjcnr8c29oMBb0TgSSPp yqiV9+seLpbRFx2MpdcfJFx2fG1gAJmUChKMpOo5dsNjmtngYF5lu5nUwy486GQswP0CNL Tx+Mu7Hg09vz/5CNwAc5+bSuqISpKzCX1bKlFz2HHDDmzAeT8heSUIkVU8LUHQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1706735693; 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=a4mOrkThonDMdzj9hsnaed7Jjjg6dSJ+AnrkaRKz/CM=; b=+eFQopcbV1i6l00tC+BGNZ24ePn9bGGU7sRqShlnHRz5cgpNcrMJs10cZPbQRn0FQPK+iy qeZRzz/7tsn//nDQ== 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 MSR numbers for FRED configuration Cc: Megha Dey , "H. Peter Anvin (Intel)" , Xin Li , Thomas Gleixner , "Borislav Petkov (AMD)" , Shan Kang , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231205105030.8698-13-xin3.li@intel.com> References: <20231205105030.8698-13-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: <170673569292.398.7382050929198104727.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: 1784440798651029528 X-GMAIL-MSGID: 1789642587738966457 The following commit has been merged into the x86/fred branch of tip: Commit-ID: cd6df3f378f63f5d6dce0987169b182be1cb427c Gitweb: https://git.kernel.org/tip/cd6df3f378f63f5d6dce0987169b182be1cb427c Author: H. Peter Anvin (Intel) AuthorDate: Tue, 05 Dec 2023 02:50:01 -08:00 Committer: Borislav Petkov (AMD) CommitterDate: Wed, 31 Jan 2024 22:01:05 +01:00 x86/cpu: Add MSR numbers for FRED configuration Add MSR numbers for the FRED configuration registers per FRED spec 5.0. Originally-by: Megha Dey Signed-off-by: H. Peter Anvin (Intel) Signed-off-by: Xin Li Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov (AMD) Tested-by: Shan Kang Link: https://lore.kernel.org/r/20231205105030.8698-13-xin3.li@intel.com --- arch/x86/include/asm/msr-index.h | 13 ++++++++++++- tools/arch/x86/include/asm/msr-index.h | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index f1bd7b9..1f9dc9b 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -36,8 +36,19 @@ #define EFER_FFXSR (1<<_EFER_FFXSR) #define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS) -/* Intel MSRs. Some also available on other CPUs */ +/* FRED MSRs */ +#define MSR_IA32_FRED_RSP0 0x1cc /* Level 0 stack pointer */ +#define MSR_IA32_FRED_RSP1 0x1cd /* Level 1 stack pointer */ +#define MSR_IA32_FRED_RSP2 0x1ce /* Level 2 stack pointer */ +#define MSR_IA32_FRED_RSP3 0x1cf /* Level 3 stack pointer */ +#define MSR_IA32_FRED_STKLVLS 0x1d0 /* Exception stack levels */ +#define MSR_IA32_FRED_SSP0 MSR_IA32_PL0_SSP /* Level 0 shadow stack pointer */ +#define MSR_IA32_FRED_SSP1 0x1d1 /* Level 1 shadow stack pointer */ +#define MSR_IA32_FRED_SSP2 0x1d2 /* Level 2 shadow stack pointer */ +#define MSR_IA32_FRED_SSP3 0x1d3 /* Level 3 shadow stack pointer */ +#define MSR_IA32_FRED_CONFIG 0x1d4 /* Entrypoint and interrupt stack level */ +/* Intel MSRs. Some also available on other CPUs */ #define MSR_TEST_CTRL 0x00000033 #define MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT 29 #define MSR_TEST_CTRL_SPLIT_LOCK_DETECT BIT(MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT) diff --git a/tools/arch/x86/include/asm/msr-index.h b/tools/arch/x86/include/asm/msr-index.h index 1d51e18..74f2c63 100644 --- a/tools/arch/x86/include/asm/msr-index.h +++ b/tools/arch/x86/include/asm/msr-index.h @@ -36,8 +36,19 @@ #define EFER_FFXSR (1<<_EFER_FFXSR) #define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS) -/* Intel MSRs. Some also available on other CPUs */ +/* FRED MSRs */ +#define MSR_IA32_FRED_RSP0 0x1cc /* Level 0 stack pointer */ +#define MSR_IA32_FRED_RSP1 0x1cd /* Level 1 stack pointer */ +#define MSR_IA32_FRED_RSP2 0x1ce /* Level 2 stack pointer */ +#define MSR_IA32_FRED_RSP3 0x1cf /* Level 3 stack pointer */ +#define MSR_IA32_FRED_STKLVLS 0x1d0 /* Exception stack levels */ +#define MSR_IA32_FRED_SSP0 MSR_IA32_PL0_SSP /* Level 0 shadow stack pointer */ +#define MSR_IA32_FRED_SSP1 0x1d1 /* Level 1 shadow stack pointer */ +#define MSR_IA32_FRED_SSP2 0x1d2 /* Level 2 shadow stack pointer */ +#define MSR_IA32_FRED_SSP3 0x1d3 /* Level 3 shadow stack pointer */ +#define MSR_IA32_FRED_CONFIG 0x1d4 /* Entrypoint and interrupt stack level */ +/* Intel MSRs. Some also available on other CPUs */ #define MSR_TEST_CTRL 0x00000033 #define MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT 29 #define MSR_TEST_CTRL_SPLIT_LOCK_DETECT BIT(MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT)