[PATCH V3 5/6] perf/x86/intel/uncore: Fix invalid unit check

[PATCH V3 5/6] perf/x86/intel/uncore: Fix invalid unit check

[kan.liang]

From: Kan Liang <kan.liang@linux.intel.com>

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@linux.intel.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Cc: stable@vger.kernel.org
---
 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 7280c8a..6d735611 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)
 
-- 
2.7.4

Re: [PATCH V3 5/6] perf/x86/intel/uncore: Fix invalid unit check

[Greg KH]

On Tue, Jun 29, 2021 at 11:14:02AM -0700, kan.liang@linux.intel.com wrote:
> From: Kan Liang <kan.liang@linux.intel.com>
> 
> 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@linux.intel.com>
> Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
> Cc: stable@vger.kernel.org
> ---
>  arch/x86/events/intel/uncore_discovery.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Why is a bugfix that needs to be backported patch 5 in the series?
Shouldn't that be totally independant and sent on its own and not part
of this series at all so that it can be accepted and merged much
quicker?  It also should not depened on the previous 4 patches, right?

Andi, you know better than this...

greg k-h

Re: [PATCH V3 5/6] perf/x86/intel/uncore: Fix invalid unit check

[Liang, Kan]

On 6/30/2021 5:36 AM, Greg KH wrote:
> On Tue, Jun 29, 2021 at 11:14:02AM -0700, kan.liang@linux.intel.com wrote:
>> From: Kan Liang <kan.liang@linux.intel.com>
>>
>> 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@linux.intel.com>
>> Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
>> Cc: stable@vger.kernel.org
>> ---
>>   arch/x86/events/intel/uncore_discovery.h | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Why is a bugfix that needs to be backported patch 5 in the series?
> Shouldn't that be totally independant and sent on its own and not part
> of this series at all so that it can be accepted and merged much
> quicker?  It also should not depened on the previous 4 patches, right?
>

Yes, you are right.

I found the bug when I tested this patch set. so I appended it at the 
end of the patch set. I will split the patch and send it separately.

Thanks,
Kan