Subject: Re: [PATCH 1/2] amd: uncore: Rename cpufeatures macro for cache
 counters
To: Borislav Petkov <bp@alien8.de>
References: <cover.1496418338.git.Janakarajan.Natarajan@amd.com>
 <246e6f4dc54d8b9043b82baa09951dc90c2737e9.1496418338.git.Janakarajan.Natarajan@amd.com>
 <20170606163141.3gbjbxahhvkm6saa@pd.tnic>
Cc: linux-kernel@vger.kernel.org, Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
From: "Natarajan, Janakarajan" <Janakarajan.Natarajan@amd.com>
Message-ID: <9daf5e04-0a1e-818f-f8b7-536e3dae3ba4@amd.com>
Date: Thu, 6 Jul 2017 15:58:36 -0500
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.8.0
MIME-Version: 1.0
In-Reply-To: <20170606163141.3gbjbxahhvkm6saa@pd.tnic>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2017 20:58:40.4952 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1670
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1999
Lines: 45


On 6/6/2017 11:31 AM, Borislav Petkov wrote:
> On Mon, Jun 05, 2017 at 11:13:18AM -0500, Janakarajan Natarajan wrote:
>> In Family 17h, L3 is the last level cache as opposed to L2 in previous
>> families. Avoid this name confusion and rename X86_FEATURE_PERFCT_L2 to
>> X86_FEATURE_PERFCTR_LLC to indicate the performance counter on the last
>> level of cache.
>>
>> Signed-off-by: Janakarajan Natarajan <Janakarajan.Natarajan@amd.com>
>> ---
>>   arch/x86/events/amd/uncore.c       | 2 +-
>>   arch/x86/include/asm/cpufeatures.h | 2 +-
>>   2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
>> index 4d1f7f2d..8fea711 100644
>> --- a/arch/x86/events/amd/uncore.c
>> +++ b/arch/x86/events/amd/uncore.c
>> @@ -569,7 +569,7 @@ static int __init amd_uncore_init(void)
>>   		ret = 0;
>>   	}
>>   
>> -	if (boot_cpu_has(X86_FEATURE_PERFCTR_L2)) {
>> +	if (boot_cpu_has(X86_FEATURE_PERFCTR_LLC)) {
>>   		amd_uncore_llc = alloc_percpu(struct amd_uncore *);
>>   		if (!amd_uncore_llc) {
>>   			ret = -ENOMEM;
>> diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
>> index b04bb6d..da422d6 100644
>> --- a/arch/x86/include/asm/cpufeatures.h
>> +++ b/arch/x86/include/asm/cpufeatures.h
>> @@ -177,7 +177,7 @@
>>   #define X86_FEATURE_PERFCTR_NB  ( 6*32+24) /* NB performance counter extensions */
>>   #define X86_FEATURE_BPEXT	(6*32+26) /* data breakpoint extension */
>>   #define X86_FEATURE_PTSC	( 6*32+27) /* performance time-stamp counter */
>> -#define X86_FEATURE_PERFCTR_L2	( 6*32+28) /* L2 performance counter extensions */
>> +#define X86_FEATURE_PERFCTR_LLC	( 6*32+28) /* Last Level Cache performance counter extensions */
> Bah, the Zen PPR calls this PerfCtrExtL3 now. And F16h BKDG calls it
> PerfCtrExtL2I.
>
> Can this be fixed to be PerfCtrExtLLC in the docs so that there is no
> more confusion?

The PerfCtrExtL3 will be changed to PerfCtrExtLLC in the next PPR update.