Received-SPF: pass (google.com: domain of linux-kernel+bounces-190067-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <a95b1963-5f54-46d2-a2b4-159730ff7fed@amd.com>
Date: Mon, 27 May 2024 11:57:17 +0530
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2 2/2] perf/x86/rapl: Fix the energy-pkg event for AMD
 CPUs
To: mingo@redhat.com, tglx@linutronix.de, bp@alien8.de,
 dave.hansen@linux.intel.com, x86@kernel.org
Cc: peterz@infradead.org, ananth.narayan@amd.com, gautham.shenoy@amd.com,
 linux-perf-users@vger.kernel.org, linux-hardening@vger.kernel.org,
 linux-kernel@vger.kernel.org, sandipan.das@amd.com,
 alexander.shishkin@linux.intel.com, irogers@google.com,
 gustavoars@kernel.org, kprateek.nayak@amd.com, ravi.bangoria@amd.com
References: <ZjS0Uio+nvZLLmyb@gmail.com>
 <20240504040935.123007-1-Dhananjay.Ugwekar@amd.com>
Content-Language: en-US
From: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
In-Reply-To: <20240504040935.123007-1-Dhananjay.Ugwekar@amd.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?R2Q1LzdhVXg2OVNYZlZKSysyTW16QUFENWVid1kxcDZWY1l2M3lONXhhZDJC?=
 =?utf-8?B?cGJ4dVUwYSs5K21IK3lPSlVYemt5YnB0bHphZTlycmhCUGVaYWtXc1NUb0hP?=
 =?utf-8?B?VTdaaG4yRzc2K2RUTHdydEFyTkhSK0p0WkxXVnF6aWJVN1NQbExuNnRVd0N3?=
 =?utf-8?B?VW5HUUxYS0YzL21NdEgvQlVPbVdYcDZ3MGNMV3ZzMWlEM213T2diS0hiTllM?=
 =?utf-8?B?S3NyaXU2Rm5iOGtwTTdQMThBb25mTzFpUE1aWDNieDF0QTd1OWNxU0dOaEFk?=
 =?utf-8?B?a1JBY2xVQTRCZmw3R2VHQlFJdFFMN3ZRaE5tWHRIRXdkZnBNQ0FBNU1VSG5X?=
 =?utf-8?B?MHhhLythMUxNM3AwN3dEbWcwei9GMERYK3RaL2daTDYyWEZyVXpTOWdqbUFw?=
 =?utf-8?B?UE54TzR1aXNpeGg3SUFza3hPMWR4WFovYVZWMGRjaE41V3E0UE05aVVEVm5K?=
 =?utf-8?B?RGUySitYczJaZkphYi9idlBIcVJES3VEdnorZlo1TmYyYUtMdDhOb3JHVzNG?=
 =?utf-8?B?QzJGS2Q2TFk0VnEwOU5TKzR5WjZ0VVdTbGFRcjlCa2FYWmxRdGxER1E3aDNH?=
 =?utf-8?B?OTZVdmhsTnR6YU5CbzZDQlNOaU5HWkVjTVE2eWZlZ3llSGd1U3Y3K2hiTGVJ?=
 =?utf-8?B?cWFLdjNSckJSWHdQQUFZY2hnYllwSlFpQXNHR09vWXJ6TGpZZ1M5UE9vZXAr?=
 =?utf-8?B?alpxdXNYY200YjAwUG8zVHRMSmdVZ1o3RmhiM2ZPTXQzTTBFeUVobHQ2OFpH?=
 =?utf-8?B?SjVWeXN2TVNSSjJiaTJtUUJWWTJuYlZ0MnRiNjhLL2JnVjVEbkRsdHZ3MlhY?=
 =?utf-8?B?VDFoK2xBNXcvZTVCcFFoOExVYStudTcra1czYUZIMkVEbHdYdzcyVlZiMzhR?=
 =?utf-8?B?Q25BT2pHVmJFWGRtbFhjSzZPN2p2SzROVGVqdTl3bzBFL3NOWkNEOXp6V3gw?=
 =?utf-8?B?em1BdDhZMVBVR1Y1MFEzdmk2TjJ3dG5vSWZUUEo4OXJ4TVpaQVdkWWd2dXBV?=
 =?utf-8?B?b3RCMWFjSGlmZ2VMcGxEL01lWExMbVZwbzFYUDF2WWFLOE5lMC96d0FISVc3?=
 =?utf-8?B?YzZoclJMZWJsZnM4Zk1oN0lOWkorVnZlWGlNM3BJWk9hUWJFU3crK1hET3o3?=
 =?utf-8?B?Zm5ua0laNVNCWnVqRUJCMUl6Nkd1Y3hGQjJYdW1OZk5jSXFMQlFBTnByWXpD?=
 =?utf-8?B?NTRmSVJiejZON0NLRS9KNXp2R041TXpDdGlzaEtRYUxJR3R3NkRUVlYvKzJH?=
 =?utf-8?B?Yit2bmxuL3dGblNGZVh6OHh3Qks3dUpvbTNKcHY2bWNtSEIvTFJYNVJaK3JI?=
 =?utf-8?B?V21MbGxiTTVDT1RaM2N0aU9hcWJZdkxQZDI5bDBNWWFQL1ljK1dmNm5zSDJR?=
 =?utf-8?B?R2p5U2tkUzR3R0ExcHNvVHVvTUltV3dsdlNvUW1hMHMzRGEwSm1PbGNyZXBN?=
 =?utf-8?B?Q0JJQng2d0hTOXBhRXNsVE5LRkJnYmdFcHF5NWFYR3RjVUY4OEhiMERZU3RN?=
 =?utf-8?B?WWMzeFMrc2ZGUStUUTBJREowSDdramxPYUNFeHR1N2cva2YweFE1N3MxeitV?=
 =?utf-8?B?Qlk2UjgzQ2RzZFc1S2FaOHZBaUIxRCtrd1AvNHFzRVIxa09MakFzd05YZVdy?=
 =?utf-8?B?djE2RTVQQUNaMFhvQ0RzRzlPeWtXd0pybktsekh3K2JhVjltcE9wV0ZGMjdJ?=
 =?utf-8?B?b3JkNWl6RnNJNXZEeFdNYzZ5MEtGUkFkS0hFdXlzdVBrYTZhTGhXK1J3QTUx?=
 =?utf-8?B?YTFweWtOOUtuZHJyV0Eyd2pzbGU1bFdvaldDZ3M0TEdrNFVRbFk5K0pJdkdB?=
 =?utf-8?B?Q0NHTkJGNlBTTlcwUmVyUWpaVkUxcVpmZ1BkVFRKdVNRaUN1bHp4V0xlSXNK?=
 =?utf-8?B?QjI4VUVLU0dhL0lEUTgzNHAxcmhGbUM4bjdqOHVlY0RkMlBFb2RYSXRmSkpD?=
 =?utf-8?B?NEpnMFNBYm1XY0g1by9PQzlpL0NzOXMwdmZ0d2c0Z1Y0UDdXUVQ1SGE0cmJa?=
 =?utf-8?B?NnErcjd1cXl4clJwZVRVRXlCYUNuWGNpemhYZlZDakovbU9RVWVDUU9nWmJ4?=
 =?utf-8?B?bVZpMWpJbGN0VFIzZDBUWmh3czE5ZlA0eVNMcUxPNVc0ai9SVWkrREZCR1cy?=
 =?utf-8?Q?XTQtFrVObQ6uEBItWJh+1S92Z?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d095b48a-321d-4e28-f4b2-08dc7e1617db
X-MS-Exchange-CrossTenant-AuthSource: LV8PR12MB9207.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2024 06:27:34.0273
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: AcVkYbpV/wJS52kKXNunmUW+zz94BZ2QSwHOFi2S1z57KPWTDz97wTDRpNqUkaGYwxTulhhpb5lFy2iv3vC4PA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4048

Hello Ingo,

Gentle ping, since the commit 63edbaa48a57 ("x86/cpu/topology: Add support for the AMD 0x80000026 leaf"),
went in 6.10-rc1 as a part of https://lore.kernel.org/lkml/ZkHBjIwLlEkVD2Vu@gmail.com/, can this fix be 
considered for 6.10-rc material.

This still cleanly applies on top of 6.10-rc1.

Thanks,
Dhananjay

On 5/4/2024 9:39 AM, Dhananjay Ugwekar wrote:
> After commit ("x86/cpu/topology: Add support for the AMD 0x80000026 leaf"),
> on AMD processors that support extended CPUID leaf 0x80000026, the
> topology_die_cpumask() and topology_logical_die_id() macros, no longer 
> return the package cpumask and package id, instead they return the CCD 
> (Core Complex Die) mask and id respectively. This leads to the energy-pkg 
> event scope to be modified to CCD instead of package.
> 
> Replacing these macros with their package counterparts fixes the
> energy-pkg event for AMD CPUs.
> 
> However due to the difference between the scope of energy-pkg event for 
> Intel and AMD CPUs, we have to replace these macros conditionally only for
> AMD CPUs.
> 
> On a 12 CCD 1 Package AMD Zen4 Genoa machine:
> 
> Before:
> $ cat /sys/devices/power/cpumask
> 0,8,16,24,32,40,48,56,64,72,80,88.
> 
> The expected cpumask here is supposed to be just "0", as it is a package 
> scope event, only one CPU will be collecting the event for all the CPUs in 
> the package.
> 
> After:
> $ cat /sys/devices/power/cpumask
> 0
> 
> Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
> Fixes: 63edbaa48a57 ("x86/cpu/topology: Add support for the AMD 0x80000026 leaf")
> ---
> v1->v2:
> * Fix the const qualifier discarded error (kernel test bot)
> * Change the cpumask variable name from cpumask to rapl_pmu_cpumask
> ---
>  arch/x86/events/rapl.c | 30 ++++++++++++++++++++++++++----
>  1 file changed, 26 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
> index 46e673585560..d77bf7959a43 100644
> --- a/arch/x86/events/rapl.c
> +++ b/arch/x86/events/rapl.c
> @@ -102,6 +102,10 @@ static struct perf_pmu_events_attr event_attr_##v = {				\
>  	.event_str	= str,							\
>  };
>  
> +#define rapl_pmu_is_pkg_scope()				\
> +	(boot_cpu_data.x86_vendor == X86_VENDOR_AMD ||	\
> +	 boot_cpu_data.x86_vendor == X86_VENDOR_HYGON)
> +
>  struct rapl_pmu {
>  	raw_spinlock_t		lock;
>  	int			n_active;
> @@ -139,9 +143,21 @@ static unsigned int rapl_cntr_mask;
>  static u64 rapl_timer_ms;
>  static struct perf_msr *rapl_msrs;
>  
> +static inline unsigned int get_rapl_pmu_idx(int cpu)
> +{
> +	return rapl_pmu_is_pkg_scope() ? topology_logical_package_id(cpu) :
> +					 topology_logical_die_id(cpu);
> +}
> +
> +static inline const struct cpumask *get_rapl_pmu_cpumask(int cpu)
> +{
> +	return rapl_pmu_is_pkg_scope() ? topology_core_cpumask(cpu) :
> +					 topology_die_cpumask(cpu);
> +}
> +
>  static inline struct rapl_pmu *cpu_to_rapl_pmu(unsigned int cpu)
>  {
> -	unsigned int rapl_pmu_idx = topology_logical_die_id(cpu);
> +	unsigned int rapl_pmu_idx = get_rapl_pmu_idx(cpu);
>  
>  	/*
>  	 * The unsigned check also catches the '-1' return value for non
> @@ -542,6 +558,7 @@ static struct perf_msr amd_rapl_msrs[] = {
>  
>  static int rapl_cpu_offline(unsigned int cpu)
>  {
> +	const struct cpumask *rapl_pmu_cpumask = get_rapl_pmu_cpumask(cpu);
>  	struct rapl_pmu *pmu = cpu_to_rapl_pmu(cpu);
>  	int target;
>  
> @@ -551,7 +568,7 @@ static int rapl_cpu_offline(unsigned int cpu)
>  
>  	pmu->cpu = -1;
>  	/* Find a new cpu to collect rapl events */
> -	target = cpumask_any_but(topology_die_cpumask(cpu), cpu);
> +	target = cpumask_any_but(rapl_pmu_cpumask, cpu);
>  
>  	/* Migrate rapl events to the new target */
>  	if (target < nr_cpu_ids) {
> @@ -564,6 +581,8 @@ static int rapl_cpu_offline(unsigned int cpu)
>  
>  static int rapl_cpu_online(unsigned int cpu)
>  {
> +	unsigned int rapl_pmu_idx = get_rapl_pmu_idx(cpu);
> +	const struct cpumask *rapl_pmu_cpumask = get_rapl_pmu_cpumask(cpu);
>  	struct rapl_pmu *pmu = cpu_to_rapl_pmu(cpu);
>  	int target;
>  
> @@ -578,14 +597,14 @@ static int rapl_cpu_online(unsigned int cpu)
>  		pmu->timer_interval = ms_to_ktime(rapl_timer_ms);
>  		rapl_hrtimer_init(pmu);
>  
> -		rapl_pmus->pmus[topology_logical_die_id(cpu)] = pmu;
> +		rapl_pmus->pmus[rapl_pmu_idx] = pmu;
>  	}
>  
>  	/*
>  	 * Check if there is an online cpu in the package which collects rapl
>  	 * events already.
>  	 */
> -	target = cpumask_any_and(&rapl_cpu_mask, topology_die_cpumask(cpu));
> +	target = cpumask_any_and(&rapl_cpu_mask, rapl_pmu_cpumask);
>  	if (target < nr_cpu_ids)
>  		return 0;
>  
> @@ -676,6 +695,9 @@ static int __init init_rapl_pmus(void)
>  {
>  	int nr_rapl_pmu = topology_max_packages() * topology_max_dies_per_package();
>  
> +	if (rapl_pmu_is_pkg_scope())
> +		nr_rapl_pmu = topology_max_packages();
> +
>  	rapl_pmus = kzalloc(struct_size(rapl_pmus, pmus, nr_rapl_pmu), GFP_KERNEL);
>  	if (!rapl_pmus)
>  		return -ENOMEM;