openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf/amd/uncore: Make L3 thread mask code more readable 

Convert the l3_thread_slice_mask() function to use the more readable
topology_* helper functions, more intuitive variable names like shift
and thread_mask, and BIT_ULL().

No functional changes.

Signed-off-by: Kim Phillips <kim.phillips@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200313231024.17601-2-kim.phillips@amd.com
This commit is contained in:
Kim Phillips 2020-03-13 18:10:23 -05:00 committed by Borislav Petkov
parent 4dcc3df825
commit 9689dbbeae
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/events/amd/uncore.c
View File

@ -185,13 +185,16 @@ static void amd_uncore_del(struct perf_event *event, int flags)
*/
static u64 l3_thread_slice_mask(int cpu)
{
int thread = 2 * (cpu_data(cpu).cpu_core_id % 4);
u64 thread_mask, core = topology_core_id(cpu);
unsigned int shift, thread = 0;
if (smp_num_siblings > 1)
thread += cpu_data(cpu).apicid & 1;
if (topology_smt_supported() && !topology_is_primary_thread(cpu))
thread = 1;
return (1ULL << (AMD64_L3_THREAD_SHIFT + thread) &
AMD64_L3_THREAD_MASK) | AMD64_L3_SLICE_MASK;
shift = AMD64_L3_THREAD_SHIFT + 2 * (core % 4) + thread;
thread_mask = BIT_ULL(shift);
return AMD64_L3_SLICE_MASK | thread_mask;
}
static int amd_uncore_event_init(struct perf_event *event)