Re: [PATCH 7/7] perf/x86/intel/P4: Fix smp_num_siblings usage

Zhang Rui
2022-08-13T17:29:49Z

Hi, Ingo,

On Sat, 2022-08-13 at 12:50 +0200, Ingo Molnar wrote:
>
> * Zhang Rui <rui.zhang@intel.com> wrote:
>
> > smp_num_siblings can be larger than 2.
> >
> > Any value larger than 1 suggests HT is supported.
> >
> > Reviewed-by: Len Brown <len.brown@intel.com>
> > Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> > ---
> >  arch/x86/include/asm/perf_event_p4.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/x86/include/asm/perf_event_p4.h
> > b/arch/x86/include/asm/perf_event_p4.h
> > index 94de1a05aeba..b14e9a20a7c0 100644
> > --- a/arch/x86/include/asm/perf_event_p4.h
> > +++ b/arch/x86/include/asm/perf_event_p4.h
> > @@ -189,7 +189,7 @@ static inline int p4_ht_active(void)
> >  static inline int p4_ht_thread(int cpu)
> >  {
> >  #ifdef CONFIG_SMP
> > -       if (smp_num_siblings == 2)
> > +       if (smp_num_siblings > 1)
> >                 return cpu !=
> > cpumask_first(this_cpu_cpumask_var_ptr(cpu_sibling_map));
>
> This fix too should probably come before all the other changes.
>
> (Not that Pentium 4 code is expected to ever see such SMT thread
> values.)
>
Do you mean that this is a clean fix, and there is no reason for this
patch to be blocked by any of the other patches in this series?

thanks,
rui