Skip to content

Commit 4d20f38

Browse files
James Morsebp3tk0v
authored andcommitted
x86/resctrl: Make prefetch_disable_bits belong to the arch code
prefetch_disable_bits is set by rdtgroup_locksetup_enter() from a value provided by the architecture, but is largely read by other architecture helpers. Make resctrl_arch_get_prefetch_disable_bits() set prefetch_disable_bits so that it can be isolated to arch-code from where the other arch-code helpers can use its cached value. Signed-off-by: James Morse <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Shaopeng Tan <[email protected]> Reviewed-by: Tony Luck <[email protected]> Reviewed-by: Reinette Chatre <[email protected]> Reviewed-by: Fenghua Yu <[email protected]> Reviewed-by: Babu Moger <[email protected]> Tested-by: Carl Worth <[email protected]> # arm64 Tested-by: Shaopeng Tan <[email protected]> Tested-by: Peter Newman <[email protected]> Tested-by: Amit Singh Tomar <[email protected]> # arm64 Tested-by: Shanker Donthineni <[email protected]> # arm64 Tested-by: Babu Moger <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7028840 commit 4d20f38

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

arch/x86/kernel/cpu/resctrl/pseudo_lock.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ static const struct class pseudo_lock_class = {
8484
*/
8585
u64 resctrl_arch_get_prefetch_disable_bits(void)
8686
{
87+
prefetch_disable_bits = 0;
88+
8789
if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ||
8890
boot_cpu_data.x86 != 6)
8991
return 0;
@@ -99,7 +101,8 @@ u64 resctrl_arch_get_prefetch_disable_bits(void)
99101
* 3 DCU IP Prefetcher Disable (R/W)
100102
* 63:4 Reserved
101103
*/
102-
return 0xF;
104+
prefetch_disable_bits = 0xF;
105+
break;
103106
case INTEL_ATOM_GOLDMONT:
104107
case INTEL_ATOM_GOLDMONT_PLUS:
105108
/*
@@ -110,10 +113,11 @@ u64 resctrl_arch_get_prefetch_disable_bits(void)
110113
* 2 DCU Hardware Prefetcher Disable (R/W)
111114
* 63:3 Reserved
112115
*/
113-
return 0x5;
116+
prefetch_disable_bits = 0x5;
117+
break;
114118
}
115119

116-
return 0;
120+
return prefetch_disable_bits;
117121
}
118122

119123
/**
@@ -713,8 +717,7 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)
713717
* Not knowing the bits to disable prefetching implies that this
714718
* platform does not support Cache Pseudo-Locking.
715719
*/
716-
prefetch_disable_bits = resctrl_arch_get_prefetch_disable_bits();
717-
if (prefetch_disable_bits == 0) {
720+
if (resctrl_arch_get_prefetch_disable_bits() == 0) {
718721
rdt_last_cmd_puts("Pseudo-locking not supported\n");
719722
return -EINVAL;
720723
}

0 commit comments

Comments
 (0)