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;
Message-ID: <542c4313-3833-bcae-10ae-005084d96ea1@intel.com>
Date:   Tue, 8 Nov 2022 14:59:12 -0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.4.2
Subject: Re: [PATCH] x86/resctrl: Move MSR defines into msr-index.h
Content-Language: en-US
To:     Borislav Petkov <bp@alien8.de>, Fenghua Yu <fenghua.yu@intel.com>,
        "Babu Moger" <Babu.Moger@amd.com>
CC:     X86 ML <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
References: <20221106212923.20699-1-bp@alien8.de>
From:   Reinette Chatre <reinette.chatre@intel.com>
In-Reply-To: <20221106212923.20699-1-bp@alien8.de>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?andTTysxSVNsM1lJeXFZVDJUOEJTTU9mMnI0NXdaQWZONjRtV29FSWo2NlFy?=
 =?utf-8?B?Vk5uN0toTXV1SllqbFRzSzQ3bzVxcUlWajdzc21PY1AyUWh4akpSamRlOE14?=
 =?utf-8?B?bXU3MVJmVW1QcndtMUJFSjBiQ2hGcThjSEZGakRJdXA0U1pxdXRHTDJvMXRB?=
 =?utf-8?B?NGc4Q3BqWFhIZFJHQmNhUFJhS3E1TjVSekJkMUJ4S1A2RHBmUXRpcEZzbnZH?=
 =?utf-8?B?U000ZEpZZFoyMmlxQjhwTEVpNGhOeFdKWGtDcXY0SEtNZm1ROHlQaGxKcFgv?=
 =?utf-8?B?QmNrL3dPSnd3ejZiSXE3dVBCYklsampYWGZJdkNUa2o2am5TeVNmMkl0aWJn?=
 =?utf-8?B?dGduT3FRZEtXM3dZYUZUL25Wa0d6MTNUM0lpTXJOTzhrSjJEaVp1VTc4K2Jq?=
 =?utf-8?B?cTkvVkVmcUFjcS9tVjdudXdIckN4VnUzZ3NrTk9VS2t0eGpka3BaV21VV3c2?=
 =?utf-8?B?NklaQkJZcm9aS1BmNkxKOFhZTXhVYmhOdkJzZThaekp5U2xndzc4TEl5VU9p?=
 =?utf-8?B?K0NGdkI1M21QU0VqdE1GYlpLQlpCZFVPYjdpNkZGalFHL3VEOG40U1Fxc2p6?=
 =?utf-8?B?WGtBR3lFTWNlaFRmRDVkZ2lCOVc2NzBON3IydGdHc3JzQmY2ck9rSXgrNnc5?=
 =?utf-8?B?TWxyT1F5ZmlHUkt4ZnBLT0VEblVQeWQ2MHpsd2NaNGJKTlE4UEtPem8vS3N4?=
 =?utf-8?B?NW5iTGVlaWdNZGFGc1hxU2tEL1NWbjF4cEoyWDRDQkJ3Q0VkcTdkWlhzbm44?=
 =?utf-8?B?Q1lqUXl5RGF5QzFqa2xZNXc1R3BITlJwc2RLc3M0S21YaXNOQWZXRkN1VDNp?=
 =?utf-8?B?dXp2aDh3dEtPeE9PMDNqOXhVaWxMaE5CZTUyYlo2cjJGaThuMDBYamdadmJE?=
 =?utf-8?B?aURlalZNTUdHYlBwblRuRkMvWS9ZUWlIV0NPdVhOSTE4NHpvRjlFcVZQb0ZB?=
 =?utf-8?B?QjZ6MkdCRnJoZ3plM2tvWmJOSUtYRWFBek1zbGZZWkhNN2Z0TVludXpKUGJ2?=
 =?utf-8?B?b3NXQW52cVlRZm1rVzhBUFJVOEc2L3RZZGZCQWNyeVhEc1E5UUE3NkNNVGVK?=
 =?utf-8?B?NDA2RzVZdjIrV01NVjFIMXVrN2RFd0tlTTc2N2JHQVpUV1FiR3plSXZFYWll?=
 =?utf-8?B?N3NDMW1lT2xucTZCSjBOUlVhV0JadEJqUU1yYmhsNkFseVF0dEJMNS9aa0kz?=
 =?utf-8?B?cnhLWGk5d0NLYmdIN0Z3eXpqdWlsUGM0Qjhrbjl6Rm1tWWltVDJ0aDM1MG5M?=
 =?utf-8?B?VGs4WVBRdUd5MnYrMncreWxXQzVQSStmSVdTYjNJbTVYdXhqWGlLZTBpa1Vm?=
 =?utf-8?B?SVJpblM0RTcvZXp5WG5LS2l4K0ZqaUllamVOUnBJQzBzMkIrOEVYM0FVUEMy?=
 =?utf-8?B?WHYwUkloNUNLY3M5K0JoL0lXTVJSdDM4MldLWFZJNlhUd2tQaDZHSGpWK2hO?=
 =?utf-8?B?c2s0ZGVZRU1ueFc4SVZWZS9CYTZGUUl2VGs3elVKWVNnZlByK0FFLyt3dWdR?=
 =?utf-8?B?OEcweW5UMU9TZW5pWm1SazN3cU9jdFZ3d2VHTk1sSml6dFlqY3Bqd2VIeHZu?=
 =?utf-8?B?T0diT0hWV05uVEJEL2JEdlVKUWhWV2RFaVJUNmxqY3FPK0pDSDhNeGdycnVo?=
 =?utf-8?B?NzNENnltOUMrN2VSV1dEZHRJY3l2TWlYd0hSckZMMmtzM1FyUS9BS2kvbDZa?=
 =?utf-8?B?bXpsd05sYk5TN0lTQzFGT3h3NWpOOWFuaUdLanNmOXphMUxNeHg0aUxDUWNW?=
 =?utf-8?B?c0FJMTJ5bmNhOUEvdkpRbDlvdkcwbllsemV4QlJqcHpDUm8vOW5PWm1yOUYx?=
 =?utf-8?B?aVZoUitjb210dis1eUNPTkxIalp3S29NYkRpWE5lRVM3bndzSkM4dHg0akRC?=
 =?utf-8?B?UUlGaVZJZUZqQ25tendNQi84WFdiaXdwNFU3QXpnYS9TclRDY2RlQmFiUVV2?=
 =?utf-8?B?YTg1eG9TU3lLS0hjSGc2T2pPYmF3Q21uNVdyQ2Z6aFdpaFdNYWE2QVcrTllO?=
 =?utf-8?B?Mmx5bTIvR1o0cm16NGY3WGNGU3AycDFHdEo3S3RUUWJZWjNSU2xtQzViWG9n?=
 =?utf-8?B?OWg1Qlh0RFYzUTJzWWROaFdRaGtmYVorcFU5RGxNbUgyY3dta2JSREpFNWZJ?=
 =?utf-8?B?SlhuWGJRaFJkTmYxZmZCaFlxNTliMWlIdjFDdHJNZ3U2NUdWL0JRMDEycDJi?=
 =?utf-8?B?MlE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 22d6b76b-7e7e-400d-394f-08dac1dcdc10
X-MS-Exchange-CrossTenant-AuthSource: CY4PR11MB1862.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 22:59:15.7081
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5zaqSuIyBIuEVXztTGlR3iMeOKxxwYjm70UES264apejWkIPkC7iokO3RJcaH88R0tloHbh5RL6ajORO6O5AJWg6LaO6HlnU8HxbfhuKGaQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4803
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_HI,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Boris,

On 11/6/2022 1:29 PM, Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
> 
> msr-index.h should contain all MSRs for easier grepping for MSR numbers
> when dealing with unchecked MSR access warnings, for example.
> 
> Move the resctrl ones. Prefix IA32_PQR_ASSOC with "MSR_" while at it.
> 
> No functional changes.
> 
> Signed-off-by: Borislav Petkov <bp@suse.de>
> ---
>  arch/x86/include/asm/msr-index.h          | 22 ++++++++++++++++------
>  arch/x86/include/asm/resctrl.h            |  8 +++-----
>  arch/x86/kernel/cpu/resctrl/core.c        |  2 +-
>  arch/x86/kernel/cpu/resctrl/internal.h    | 10 +---------
>  arch/x86/kernel/cpu/resctrl/pseudo_lock.c |  4 ++--
>  5 files changed, 23 insertions(+), 23 deletions(-)
> 
> diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
> index a3eb4d3e70b8..c29cf6d1935b 100644
> --- a/arch/x86/include/asm/msr-index.h
> +++ b/arch/x86/include/asm/msr-index.h
> @@ -4,12 +4,7 @@
>  
>  #include <linux/bits.h>
>  
> -/*
> - * CPU model specific register (MSR) numbers.
> - *
> - * Do not add new entries to this file unless the definitions are shared
> - * between multiple compilation units.
> - */
> +/* CPU model specific register (MSR) numbers. */
>  

Not an objection, just an observation: the above is a significant
change for a patch with the x86/resctrl prefix.

>  /* x86-64 specific MSRs */
>  #define MSR_EFER		0xc0000080 /* extended feature register */
> @@ -1051,6 +1046,21 @@
>  #define VMX_BASIC_MEM_TYPE_WB	6LLU
>  #define VMX_BASIC_INOUT		0x0040000000000000LLU
>  
> +/* Resctrl MSRs: */
> +/* - Intel: */
> +#define MSR_IA32_L3_QOS_CFG		0xc81
> +#define MSR_IA32_L2_QOS_CFG		0xc82
> +#define MSR_IA32_QM_EVTSEL		0xc8d
> +#define MSR_IA32_QM_CTR			0xc8e
> +#define MSR_IA32_PQR_ASSOC		0xc8f
> +#define MSR_IA32_L3_CBM_BASE		0xc90
> +#define MSR_IA32_L2_CBM_BASE		0xd10
> +#define MSR_IA32_MBA_THRTL_BASE		0xd50
> +
> +
> +/* - AMD: */
> +#define MSR_IA32_MBA_BW_BASE		0xc0000200
> +

Is it important to distinguish between Intel and AMD?
All but one (MSR_IA32_MBA_THRTL_BASE) of the register values
under the "Intel" heading are also used by AMD.

(sidenote: multiple blank lines above)

> diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
> index 5f7128686cfd..4f43da46243d 100644
> --- a/arch/x86/kernel/cpu/resctrl/internal.h
> +++ b/arch/x86/kernel/cpu/resctrl/internal.h
> @@ -8,15 +8,7 @@
>  #include <linux/fs_context.h>
>  #include <linux/jump_label.h>
>  
> -#define MSR_IA32_L3_QOS_CFG		0xc81
> -#define MSR_IA32_L2_QOS_CFG		0xc82
> -#define MSR_IA32_L3_CBM_BASE		0xc90
> -#define MSR_IA32_L2_CBM_BASE		0xd10
> -#define MSR_IA32_MBA_THRTL_BASE		0xd50
> -#define MSR_IA32_MBA_BW_BASE		0xc0000200
> -
> -#define MSR_IA32_QM_CTR			0x0c8e
> -#define MSR_IA32_QM_EVTSEL		0x0c8d
> +
>  
>  #define L3_QOS_CDP_ENABLE		0x01ULL

This new empty line results in a multiple blank lines
warning in this area.
  
Reinette