From patchwork Tue Dec 20 06:36:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 34924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp2813388wrn; Mon, 19 Dec 2022 23:03:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXs6Uk6tIS85gvv2nYzUUQJ2cZ6PnxhFV0uCf5KZe/OZ8Q6d58DWfOQzOdjHwmCTbSpvraUy X-Received: by 2002:a05:6a20:7d8a:b0:b0:1051:2a96 with SMTP id v10-20020a056a207d8a00b000b010512a96mr18905295pzj.57.1671519810981; Mon, 19 Dec 2022 23:03:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671519810; cv=none; d=google.com; s=arc-20160816; b=dqYlXWKRxdTjDT/fXMyW4sB35c/aAULqkxLh+q+Fq+bPM7F/wtzAS4ofOagrUvu7wH nB//7LIo7+gV/xmE1UmDA22XewmXB6lKQNxVdwEO6JJ54fCZiYGEhcF1saqy4kshBjbz aY0Hsdgwo34QXip3hKLkBN8kPGPDqSqDSFYm5ufs6KLjnETcyx2bJM8AZKgE6s3obTqC k+7O5nKjEdeZGx+PBnekCJD2/qH4Mpg1ZJE9EBLE+CSCXBUlRgN8c/Ay2Q+PTm5xJg3x mNoclRc6tm70JNsvcKeunASyi7NIFtPSyDTkGGqCfHkDDI/t65DgAQSU7wJAcZ8tEvsl FkjQ== 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=Bc6ebKOweX1mZeNnsjmvtv2UmlSNDYKVtPtekKIWIHY=; b=VfKspVVtrnFiQmHEmyGxWVebS/ZJALVfQLBeLS/ksn2ikpjAKmo3K+B1kpWrOrrwYL JjHBDqAS/DGjRGlgRcYcAUsit/CVDqksyXU1pQTDppCeMCpEgnmh9SPn58b7E0pD9pY3 yr+cNS7Wy3BvcZWiAlzLT9F0IObHWTR4ozUZ+owVamOoG5yziA6VtWQ8CNpWERWQrHNV M67AjBqY/tBFMZqwJYj6xiw5olpyCuB6ksZhrfnwbs55tXOfXEDNTcOSvic60UpLYn/0 1b7wa/aC/iS0w68+ohsHSORo0/KAZurVQxpa3mQu8NrWRTq2KFymcqaDPG0J4R+HPFK6 judQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SdCJBRj1; 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 l13-20020a056a00140d00b0056da577864fsi12784118pfu.241.2022.12.19.23.03.17; Mon, 19 Dec 2022 23:03:30 -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=SdCJBRj1; 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 S233554AbiLTHCz (ORCPT + 99 others); Tue, 20 Dec 2022 02:02:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233215AbiLTHBg (ORCPT ); Tue, 20 Dec 2022 02:01:36 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D343140AC; Mon, 19 Dec 2022 23:01:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671519695; x=1703055695; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=o65+j06rKvTvMzwdKVOrgkkK4xTrmwbR1mLB3PAtwFI=; b=SdCJBRj1XRf/FOIHQsq9wzdLAGCA1LYDFIrOnY8W4OhA4WbCxOFJ6JXA sOXm44uS/4BiznPtHHhUAx56+heIw231TDpKQhRSNMS4+hIjPWJ2qodlb ie9LCuLk7ONKaWGIUne7FA7eORisT4e2BeGI7a2MIaGdPYi4AREfYKvLy 1LtEQl6Vy1kDCOlC7Sf5U9huLsrf3NcthL/kA9DddeELDWj6LwThv84Ub iV04vFI7wCLciZmBqbNYvwm65pAUmr6uiykWUyTZmvMFhQ6H1h0MIqcLf AphFF2FG6YzEMQCtOsezoqjmj3v0lniW3SbOBsmk9G70eCr9UtUI+pEbX g==; X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="302972002" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="302972002" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 23:01:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="644326459" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="644326459" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga007.jf.intel.com with ESMTP; 19 Dec 2022 23:01:12 -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: [RFC PATCH 12/32] x86/cpu: add MSR numbers for FRED configuration Date: Mon, 19 Dec 2022 22:36:38 -0800 Message-Id: <20221220063658.19271-13-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221220063658.19271-1-xin3.li@intel.com> References: <20221220063658.19271-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1752715556965253000?= X-GMAIL-MSGID: =?utf-8?q?1752715556965253000?= From: "H. Peter Anvin (Intel)" Add MSR numbers for the FRED configuration registers. Originally-by: Megha Dey Signed-off-by: H. Peter Anvin (Intel) Signed-off-by: Xin Li --- arch/x86/include/asm/msr-index.h | 12 +++++++++++- tools/arch/x86/include/asm/msr-index.h | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 4a2af82553e4..dea9223ec9ba 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -39,8 +39,18 @@ #define EFER_LMSLE (1<<_EFER_LMSLE) #define EFER_FFXSR (1<<_EFER_FFXSR) -/* 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_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 f17ade084720..5c9d9040dd04 100644 --- a/tools/arch/x86/include/asm/msr-index.h +++ b/tools/arch/x86/include/asm/msr-index.h @@ -39,8 +39,18 @@ #define EFER_LMSLE (1<<_EFER_LMSLE) #define EFER_FFXSR (1<<_EFER_FFXSR) -/* 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_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)