Received-SPF: pass (google.com: domain of linux-kernel+bounces-136201-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <bfc39b79-b3bf-4187-ba63-56db1ed6d565@intel.com>
Date: Mon, 8 Apr 2024 20:25:26 -0700
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v1 24/31] x86/resctrl: Move get_config_index() to a header
To: James Morse <james.morse@arm.com>, <x86@kernel.org>,
	<linux-kernel@vger.kernel.org>
CC: Fenghua Yu <fenghua.yu@intel.com>, Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, H Peter Anvin
	<hpa@zytor.com>, Babu Moger <Babu.Moger@amd.com>,
	<shameerali.kolothum.thodi@huawei.com>, D Scott Phillips OS
	<scott@os.amperecomputing.com>, <carl@os.amperecomputing.com>,
	<lcherian@marvell.com>, <bobo.shaobowang@huawei.com>,
	<tan.shaopeng@fujitsu.com>, <baolin.wang@linux.alibaba.com>, Jamie Iles
	<quic_jiles@quicinc.com>, Xin Hao <xhao@linux.alibaba.com>,
	<peternewman@google.com>, <dfustini@baylibre.com>, <amitsinght@marvell.com>,
	David Hildenbrand <david@redhat.com>, Rex Nie <rex.nie@jaguarmicro.com>,
	"Dave Martin" <dave.martin@arm.com>
References: <20240321165106.31602-1-james.morse@arm.com>
 <20240321165106.31602-25-james.morse@arm.com>
Content-Language: en-US
From: Reinette Chatre <reinette.chatre@intel.com>
In-Reply-To: <20240321165106.31602-25-james.morse@arm.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SUl1eEZSd1loQWdCa3R4YnVyYUU1YTJqK1lDQmFaZzE4ZmlhTGJIOHppb05T?=
 =?utf-8?B?NE9DNXdxNWFQanA1ZklJbUROWGFjd2F5ZFN1UGdHeTJ6R0JWMUJpcGpjdEVt?=
 =?utf-8?B?MDVuZnlMSWk3R3hYWEpLcU9HbkJwYWdZNUZiVEFFN2hnZEFXVithbXdJdDhv?=
 =?utf-8?B?WFVHRkxESlZyNFZGajRiNUJ2UmRaYSsvZWYzM2JQYXBPMUplcFVBOVN1RUY3?=
 =?utf-8?B?Wld6ZFM5NzhuVWxWSUJrU0tUT3IzSjY0N0dBa0FpT1hqUmtNcFVVL1F0Rnc5?=
 =?utf-8?B?NHRONEljblpvajhod1ZVMFN1cm11c01vNFlYWnRnWjlTcEhvd0VVN0Rmb2RN?=
 =?utf-8?B?TVBjbzBDTWNEdEtTN2QxV3ZUbVllOHZkSlJWOGRWQWZpTE9YbjZ6bmQ0eEVq?=
 =?utf-8?B?Q2c1ME1ucG9tc1BsY0xjYm5RODBXMGJ2MjNDTjNObk1CRjFjWVkrRmR4Zmkr?=
 =?utf-8?B?aWgrMFFNemZ5T0F3emVIV3hKUmxNUTR0SjBjUmxuM2pzRGN0c2pSQURoUDVG?=
 =?utf-8?B?WWp6NGNWcHlybWNscXo2b1BwRDRkelpvM0Fnd2NjR040UFBvd1gvM2tabkNw?=
 =?utf-8?B?aXdPa1RSNkd4UEFidS8wNGVsNDBIN1BYZ05UaHBDVndZdEp5NHZGYmVDVmpt?=
 =?utf-8?B?bHdmbTNtVjJ6RDNuZkRLeHhkWmp2TlBlazVSNVoyaDhMQVlzVHA3N3NqSXRr?=
 =?utf-8?B?NzJWbjBkcVZGZWhzTE1vS0J1NzhFVGU2SEI3OGp2eGxFVGYwbER5enk4VmRB?=
 =?utf-8?B?ZG5LcWZSOGk2YWxWWUx4clJyT0lMajA0QjE5dlZNT1VzQUJUU3hqYm9WQzY2?=
 =?utf-8?B?UW0wSUpLM254K1pJTVpEUTdTNzR1RnJxWnYrNU13eFU2L2ZzMmFjODNEZXZT?=
 =?utf-8?B?ZDhqQVZyMXhmd2dUTHpNR2wyU2l1cHJNYkVTTldRMCtBcDhodWdlYWtXNTQy?=
 =?utf-8?B?czYwU1lEL1RGUzVFdCs3cXdZRnNPRWNqSkZHTVpKNEtFNmRvSm9iWHdZQ1NG?=
 =?utf-8?B?SkhMZW9GeFVDbHFlZndwL3Z0YXRKenVxZXl0c3lyTytkSno5YVZZU3lLZERm?=
 =?utf-8?B?d2J0ODRpWWdLUzAycGhpT2ZwK3A5NVMxOTI0L2ZISjFHNlhHd0Iza04xdmlz?=
 =?utf-8?B?ZTBFR3F0TG40TTJVRmRxcXNyRVAva3FySDUxL21pUWtyb0k4RGVkOWZYWk9j?=
 =?utf-8?B?RWJEVkkzc08xK2ZDMVBrT21mTy80djRxSXdFZUZHcEY0Q0dLWmFyUHFxVEdE?=
 =?utf-8?B?clU3R3VQdTlrY3l5eWtVbytTL1lLVlg2cE1rbmlRN1RjSFFzd2NPSjRRMTBH?=
 =?utf-8?B?OFJBVUhMeGVVaEVrdWRWMlVpOFlDT2hzMnZvanNteFQ4UnhaS0htQy80ZExG?=
 =?utf-8?B?Q3MvT2JjMW5LOFcyVUQvcGxsdHFlbU56L3FTWUU2bXNmUEdRSkZmOGs5TVlS?=
 =?utf-8?B?YmxEbGkxK3F0cW54ekJpMXdZd1M4bjBDN2FxK2p6VnVQS1NVcWNFSmtmVUFQ?=
 =?utf-8?B?ek9ncllHMXhBNmR6WCs0Q2RocGFwMFBRZmoxdFp2WEwvL203T0xpcmxZdGs0?=
 =?utf-8?B?WWxOSjJWTVc2RmRqZVlPTzhna3ZFNVBXc1VhdmRqU2tnb0pMU2h6cytET01S?=
 =?utf-8?B?dEY0Mnd2QWJ2c29saVliYjJYdktEWWhtR2l1cU9ZaUIrYTlpSXdGRFBMSVIv?=
 =?utf-8?B?OXgvY25tVkVJSXpRc0JsdVdua1V0TXY1cHp1U1o2eFNCY2dUdi9SQUo2SERK?=
 =?utf-8?B?ZFNZOGN6cnJPcTFTbU1QVytrd3hjNTVnRVF6Vk5hYTJCZHpScG1TYWcvRS9h?=
 =?utf-8?B?Q05ZbTJHOUU5MDNiOWEyc2Y1SUFSWnNuZ3lxTjZzQkNvT1NnTzAwMFpkSkJt?=
 =?utf-8?B?d2JzdmFOc1o2NVV5VEJKdFZHZTg3eHFpL01kbklPTGs5L1hNNkJ4eDRoWE1s?=
 =?utf-8?B?WlkzWFE3UkFwMzZPSUQ3R0FXYk1xajdHVnVSTXZmbmJoZ3hsZndlSnc2emJN?=
 =?utf-8?B?K0tWcTdSMHVtSEE3bm9RQzhiRnBpbFg1OXFoRGN0aGt3eG5URWw1NEQ1U2pF?=
 =?utf-8?B?ekdLdmY0SDA2WEhzVjA3QllYT0dnUTNzSzZEUTJrUG1MM2FqQTRJaFpzY0c5?=
 =?utf-8?B?T2FNRElFZkVsT0RKcUZKOWVadVFIb3hPN0VnM1NOT3F0a1dOa29ndENCL0lR?=
 =?utf-8?B?N0E9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: d7de31ec-86f6-4684-98f5-08dc5844bddf
X-MS-Exchange-CrossTenant-AuthSource: SJ2PR11MB7573.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2024 03:25:44.7328
 (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: tD52rFlxpKWAcvn3y1GkG/bdcYSh1XOt03qfcC86QlQ1/A+U+r1xEDjwT4PhgQLyYP2wRymN7Jztw7Fzw1fuBll8Q7axnnViZo1fxwzw8gE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7506
X-OriginatorOrg: intel.com

Hi James,

On 3/21/2024 9:50 AM, James Morse wrote:
> get_config_index() is used by the architecture specific code to map a
> CLOSID+type pair to an index in the configuration arrays.
> 
> MPAM needs to do this too to preserve the ABI to user-space, there is
> no reason to do it differently.
> 
> Move the helper to a header file.
> 
> Signed-off-by: James Morse <james.morse@arm.com>
> ---
>  arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 19 +++----------------
>  include/linux/resctrl.h                   | 15 +++++++++++++++
>  2 files changed, 18 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
> index 3603ade95f1d..b4627ae19291 100644
> --- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
> +++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
> @@ -277,19 +277,6 @@ static int parse_line(char *line, struct resctrl_schema *s,
>  	return -EINVAL;
>  }
>  
> -static u32 get_config_index(u32 closid, enum resctrl_conf_type type)
> -{
> -	switch (type) {
> -	default:
> -	case CDP_NONE:
> -		return closid;
> -	case CDP_CODE:
> -		return closid * 2 + 1;
> -	case CDP_DATA:
> -		return closid * 2;
> -	}
> -}
> -
>  static bool apply_config(struct rdt_hw_domain *hw_dom,
>  			 struct resctrl_staged_config *cfg, u32 idx,
>  			 cpumask_var_t cpu_mask)
> @@ -311,7 +298,7 @@ int resctrl_arch_update_one(struct rdt_resource *r, struct rdt_domain *d,
>  {
>  	struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
>  	struct rdt_hw_domain *hw_dom = resctrl_to_arch_dom(d);
> -	u32 idx = get_config_index(closid, t);
> +	u32 idx = resctrl_get_config_index(closid, t);
>  	struct msr_param msr_param;
>  
>  	if (!cpumask_test_cpu(smp_processor_id(), &d->cpu_mask))
> @@ -351,7 +338,7 @@ int resctrl_arch_update_domains(struct rdt_resource *r, u32 closid)
>  			if (!cfg->have_new_ctrl)
>  				continue;
>  
> -			idx = get_config_index(closid, t);
> +			idx = resctrl_get_config_index(closid, t);
>  			if (!apply_config(hw_dom, cfg, idx, cpu_mask))
>  				continue;
>  
> @@ -476,7 +463,7 @@ u32 resctrl_arch_get_config(struct rdt_resource *r, struct rdt_domain *d,
>  			    u32 closid, enum resctrl_conf_type type)
>  {
>  	struct rdt_hw_domain *hw_dom = resctrl_to_arch_dom(d);
> -	u32 idx = get_config_index(closid, type);
> +	u32 idx = resctrl_get_config_index(closid, type);
>  
>  	return hw_dom->ctrl_val[idx];
>  }
> diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
> index 3de5bc63ace0..73c111963433 100644
> --- a/include/linux/resctrl.h
> +++ b/include/linux/resctrl.h
> @@ -258,6 +258,21 @@ bool resctrl_arch_is_evt_configurable(enum resctrl_event_id evt);
>  void resctrl_arch_mon_event_config_write(void *info);
>  void resctrl_arch_mon_event_config_read(void *info);
>  
> +/* For use by arch code to remap resctrl's smaller CDP CLOSID range */
> +static inline u32 resctrl_get_config_index(u32 closid,
> +					   enum resctrl_conf_type type)
> +{
> +	switch (type) {
> +	default:
> +	case CDP_NONE:
> +		return closid;
> +	case CDP_CODE:
> +			return (closid * 2) + 1;
> +	case CDP_DATA:
> +			return (closid * 2);
> +	}
> +}

(please check the tabs)

This change is unexpected to me. Could you please elaborate how
MPAM's variant of CDP works?

Thank you very much.

Reinette