From patchwork Wed Jan 31 07:21:26 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: 194556 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1723656dyb; Tue, 30 Jan 2024 23:27:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IHrn3Fp/xMR1eu/gMC5NspL9ayIv3FpgngDVI0ajV0hNXGb6M7fecI94pXHnLNRIc/rVNlZ X-Received: by 2002:a2e:9792:0:b0:2cd:6402:1f03 with SMTP id y18-20020a2e9792000000b002cd64021f03mr520208lji.24.1706686037308; Tue, 30 Jan 2024 23:27:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706686037; cv=pass; d=google.com; s=arc-20160816; b=IG3ckJl/Hw/zAfycg3Y12RyupvdsQFVhEQDuAdOflsGa9wB79By9CjgBwkqrpQ3bej Rd+qAWvjqiKXxhxoSNlkaKzKXS20aRS/rXVa7OazajUSRdJM5j7e2SaGqV+TBgfrQUfp hayT2LxPnA/4Wq0epqB+v8jpBW1M5n2DHvnZbbWk9JV9rpfiOZtyfL3L8MrPBqFFtnzx 1DMOtC6HJ5kKl11PsUqFIAg7gkRPM0nM7TdkPA9c+W7Mo5SQXLr1unlY2qAuZEKnjmY2 oRbkn63vC0YS+TPfUpXLRQ10MFaXQ5n0q6sn2QISQHMgnLqf9QGmfPr0wLdUwv9za+4a fu4w== 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=XfcZdL+oNfxjh9DvVcOKdYWyechIE1CKo3DZVtqSmkA=; fh=K29vKSx+L5gmCGsC1AC1rFAditj/mc/QONmB8T0WD+k=; b=kX+Rhtt0HLoXkZZTI9CZ/eHmdNUooF/ykZ+lZcNCFdWu/BXvsrVSciRlZrh0aKSP8H psYsJsaqfR2RmflkDNgPzwbgxwGKgR99kb199Yd9zAp8GAwERL6jhjdN/2tqayZz6Rqq SbYGJDudj2StqjvPhV1+69qNFadHWpV9RF6EmTXR4/nHgw92yyoR+72e888PAMejoyk3 Tehf/ksWcfOnZrlm3p8YHb/tUv+OOKTaa4VhbpZBDCY0DJr2hps4mn2rDfyjgSA/AKvC b1FjsnpMf5XtPUouNcWJz9tmDkvGl6WpXopHmcimAvOQu4wwEe/t/NRL89B9mbuFXD6n hPRQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=4c6FEwBg; 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-45913-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45913-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de X-Forwarded-Encrypted: i=1; AJvYcCVoDXXvIEF8vR4XXMXw5JZ5VnDd/VKiaONAbtVBbdj62MNQqsgr8QCSFXZEZSpiM9hqIQf+6U6r+MGbpEC8quU0AAbPZQ== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id h8-20020a50cdc8000000b0055a83daf80bsi5333178edj.665.2024.01.30.23.27.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 23:27:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-45913-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=4c6FEwBg; 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-45913-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-45913-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 BB0381F2840C for ; Wed, 31 Jan 2024 07:27:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6DBCA82890; Wed, 31 Jan 2024 07:21:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="4c6FEwBg"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="0ihX16MS" 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 75FD37BB1F; Wed, 31 Jan 2024 07:21:28 +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=1706685690; cv=none; b=U7ypbz70W/JQ4ruCRYg0d7sCL/u9bHZ1rbhY00WcfLywWnefW3IWfISV22EEBNX1uIAvGtq+U9kbhQKH1UEhRHQtHCIrfvDvvqmQWH7sMTNcS2X9N/+/bl/clY0w13tE9sulIaifjTpIo7tIlBGf7d3AhChHMtxrtlwQ8eAo0Wk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706685690; c=relaxed/simple; bh=Dcski7Ff8f5FQYZV4t84WFi0hldMxXLkCIchFQE5hcw=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Lbhh0guvaTTqp7OebqgqZikCnA+YgaSiyCNAJjY+t1nydRk2dHcdFeBngjgZjCxCBT4ho/e0klgVcYK1/aVKpN/Kr5TgYThqY/TipE00maZT6hiTRJrFInKz5vvJvmb5/F4duCbJ8DMrKVplSN1RXYyGDFPIQIPagZQJthh4X9o= 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=4c6FEwBg; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=0ihX16MS; 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 07:21:26 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1706685686; 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=XfcZdL+oNfxjh9DvVcOKdYWyechIE1CKo3DZVtqSmkA=; b=4c6FEwBgXWjuyTMrykX53yHs8Vauii+yEMFGZOojuX46nOgGb+KwsjOMYDuGWeG/ZcIduW uxB6xNwOyMtVY1XS+jB9vJDFrGfOIFLeS+o75sdhh93YN3xslm+WpYaU6S6ZJOksvvISLG AFocn/GODRWrIvmVHhIsnLgRlTRP4BmhDqNLJeC+gfW7jm+jB4Tt22D7sK4c1HvMtdOeox 2L72CDKyBdJxxlfygS5kXjvCeHIa7t5rK9kdlG0zFaZq1iKABqKmbXxGsz01TbmOJuM5X+ DSbgOxt2d20ziL91SPD8nLm7cFSxbcC+HX/UEmaf3DZpjk8DqFSq3d9rv7zFkw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1706685686; 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=XfcZdL+oNfxjh9DvVcOKdYWyechIE1CKo3DZVtqSmkA=; b=0ihX16MSFWLScXe4m9V6TVzMXbK/s68xnSsmhSpUD20WeDB7ADjGfEh3bfogxwhk1WK8sP tWTqji/siYuCthAQ== 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 , 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: <170668568608.398.10833375527354694408.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: 1789590018030783564 The following commit has been merged into the x86/fred branch of tip: Commit-ID: 0b2e6c1c724fc7b72c86a72d49b16c7617d6f5f9 Gitweb: https://git.kernel.org/tip/0b2e6c1c724fc7b72c86a72d49b16c7617d6f5f9 Author: H. Peter Anvin (Intel) AuthorDate: Tue, 05 Dec 2023 02:50:01 -08:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 30 Jan 2024 18:20:34 +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 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)