Re: [RESEND PATCH] perf/x86/intel/uncore: Fix invalid unit check

[Liang, Kan]

Hi Peter,

Could you please pick up the fix?
Please let me know if you have any comments/concerns.

Thanks,
Kan

On 7/19/2021 8:54 AM, kan.liang@xxxxxxxxxxxxxxx wrote:
> From: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
>
> The uncore unit with the type ID 0 and the unit ID 0 is missed.
>
> The table3 of the uncore unit maybe 0. The
> uncore_discovery_invalid_unit() mistakenly treated it as an invalid
> value.
>
> Remove the !unit.table3 check.
>
> Fixes: edae1f06c2cd ("perf/x86/intel/uncore: Parse uncore discovery tables")
> Reviewed-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
> Signed-off-by: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
> ---
>
> The patch was posted as a part of the "perf: Add Sapphire Rapids server
> uncore support" patch set. But it doesn't depend on the other patches in
> the patch set. The bugfix can be accepted and merged separately.
>
> https://lore.kernel.org/lkml/cb0d2d43-102a-994c-f777-e11d61c77bf5@xxxxxxxxxxxxxxx/
>
>   arch/x86/events/intel/uncore_discovery.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/events/intel/uncore_discovery.h b/arch/x86/events/intel/uncore_discovery.h
> index 1d65293..abfb1e8 100644
> --- a/arch/x86/events/intel/uncore_discovery.h
> +++ b/arch/x86/events/intel/uncore_discovery.h
> @@ -30,7 +30,7 @@
>   
>   
>   #define uncore_discovery_invalid_unit(unit)			\
> -	(!unit.table1 || !unit.ctl || !unit.table3 ||	\
> +	(!unit.table1 || !unit.ctl || \
>   	 unit.table1 == -1ULL || unit.ctl == -1ULL ||	\
>   	 unit.table3 == -1ULL)
>