Re: [PATCH v6 01/10] perf/x86/rapl: Remove the unused get_rapl_pmu_cpumask() function

[Zhang, Rui]

On Mon, 2024-10-28 at 12:08 +0530, Dhananjay Ugwekar wrote:
> > Hello Gautham,
> > 
> > On 10/28/2024 11:42 AM, Gautham R. Shenoy wrote:
> > > > Hello Dhananjay,
> > > > 
> > > > On Fri, Oct 25, 2024 at 11:13:39AM +0000, Dhananjay Ugwekar
> > > > wrote:
> > > > > > An earlier commit eliminates the need for this function, so
> > > > > > > > > remove it.
> > > > 
> > > > If the commit is merged, please provide the commit id. If it is
> > > > not
> > > > merged, please share the shortlog here with the link to the
> > > > patch > > on
> > > > the mailing list.
> > 
> > Sure, The commit I'm referring to here is 
> > "[PATCH V2 2/2] perf/x86/rapl: Clean up cpumask and hotplug"
> > (
> > https://lore.kernel.org/all/20241010142604.770192-2-kan.liang@linux.
> > intel.com/)
> > It is not yet merged, but I've taken it as base for this patch >
> > series.

I see the patch merged in tip tree yesterday.

> > 
> > It removes the cpumask handling from rapl.c. Hence, we no longer
> > need > the 
> > get_rapl_pmu_cpumask() function.
> > 
> > I can post a new version or provide newly drafted commit msg here,
> > > whichever way is 
> > okay with the maintainers.
> > 
> > 

Tested this patch set on top of latest tip/perf/core on an Intel
Raptorlake laptop, which has pkg/cores/gpu/psys counters, and didn't
observe any issue. So

Reviewed-by: Zhang Rui <rui.zhang@xxxxxxxxx>
Tested-by: Zhang Rui <rui.zhang@xxxxxxxxx>

thanks,
rui

> > > > 
> > > > --
> > > > Thanks and Regards
> > > > gautham.
> > > > 
> > > > > > 
> > > > > > Signed-off-by: Dhananjay Ugwekar
> > > > > > <Dhananjay.Ugwekar@xxxxxxx>
> > > > > > ---
> > > > > >  arch/x86/events/rapl.c | 8 +-------
> > > > > >  1 file changed, 1 insertion(+), 7 deletions(-)
> > > > > > 
> > > > > > diff --git a/arch/x86/events/rapl.c
> > > > > > b/arch/x86/events/rapl.c
> > > > > > index a8defc813c36..f70c49ca0ef3 100644
> > > > > > --- a/arch/x86/events/rapl.c
> > > > > > +++ b/arch/x86/events/rapl.c
> > > > > > @@ -153,7 +153,7 @@ static u64 rapl_timer_ms;
> > > > > >  static struct perf_msr *rapl_msrs;
> > > > > >  
> > > > > >  /*
> > > > > > - * Helper functions to get the correct topology macros
> > > > > > according > > > to the
> > > > > > + * Helper function to get the correct topology id
> > > > > > according to > > > the
> > > > > >   * RAPL PMU scope.
> > > > > >   */
> > > > > >  static inline unsigned int get_rapl_pmu_idx(int cpu)
> > > > > > @@ -162,12 +162,6 @@ static inline unsigned int > > >
> > > > > > get_rapl_pmu_idx(int 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 = get_rapl_pmu_idx(cpu);
> > > > > > -- 
> > > > > > 2.34.1
> > > > > >