Skip to content

Commit 307e157

Browse files
marcanjannau
authored andcommitted
arm64: Implement PR_{GET,SET}_MEM_MODEL for always-TSO CPUs
Some ARM64 implementations are known to always use the TSO memory model. Add trivial support for the PR_{GET,SET}_MEM_MODEL prctl, which allows userspace to learn this fact. Known TSO implementations: - Nvidia Denver - Nvidia Carmel - Fujitsu A64FX Signed-off-by: Hector Martin <marcan@marcan.st> Reviewed-by: Neal Gompa <neal@gompa.dev>
1 parent 8d92257 commit 307e157

7 files changed

Lines changed: 83 additions & 5 deletions

File tree

arch/arm64/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2305,6 +2305,15 @@ config ARM64_DEBUG_PRIORITY_MASKING
23052305
If unsure, say N
23062306
endif # ARM64_PSEUDO_NMI
23072307

2308+
config ARM64_MEMORY_MODEL_CONTROL
2309+
bool "Runtime memory model control"
2310+
help
2311+
Some ARM64 CPUs support runtime switching of the CPU memory
2312+
model, which can be useful to emulate other CPU architectures
2313+
which have different memory models. Say Y to enable support
2314+
for the PR_SET_MEM_MODEL/PR_GET_MEM_MODEL prctl() calls on
2315+
CPUs with this feature.
2316+
23082317
config RELOCATABLE
23092318
bool "Build a relocatable kernel image" if EXPERT
23102319
select ARCH_HAS_RELR

arch/arm64/include/asm/cpufeature.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,10 @@ static inline bool cpu_has_lpa2(void)
10661066
#endif
10671067
}
10681068

1069+
void __init init_cpucap_indirect_list_impdef(void);
1070+
void __init init_cpucap_indirect_list_from_array(const struct arm64_cpu_capabilities *caps);
1071+
bool cpufeature_matches(u64 reg, const struct arm64_cpu_capabilities *entry);
1072+
10691073
#endif /* __ASSEMBLY__ */
10701074

10711075
#endif

arch/arm64/kernel/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ obj-y := debug-monitors.o entry.o irq.o fpsimd.o \
3434
cpufeature.o alternative.o cacheinfo.o \
3535
smp.o smp_spin_table.o topology.o smccc-call.o \
3636
syscall.o proton-pack.o idle.o patching.o pi/ \
37+
cpufeature_impdef.o \
3738
rsi.o
3839

3940
obj-$(CONFIG_COMPAT) += sys32.o signal32.o \

arch/arm64/kernel/cpufeature.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ static void init_cpu_ftr_reg(u32 sys_reg, u64 new)
10631063
extern const struct arm64_cpu_capabilities arm64_errata[];
10641064
static const struct arm64_cpu_capabilities arm64_features[];
10651065

1066-
static void __init
1066+
void __init
10671067
init_cpucap_indirect_list_from_array(const struct arm64_cpu_capabilities *caps)
10681068
{
10691069
for (; caps->matches; caps++) {
@@ -1570,8 +1570,8 @@ has_always(const struct arm64_cpu_capabilities *entry, int scope)
15701570
return true;
15711571
}
15721572

1573-
static bool
1574-
feature_matches(u64 reg, const struct arm64_cpu_capabilities *entry)
1573+
bool
1574+
cpufeature_matches(u64 reg, const struct arm64_cpu_capabilities *entry)
15751575
{
15761576
int val, min, max;
15771577
u64 tmp;
@@ -1624,14 +1624,14 @@ has_user_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope)
16241624
if (!mask)
16251625
return false;
16261626

1627-
return feature_matches(val, entry);
1627+
return cpufeature_matches(val, entry);
16281628
}
16291629

16301630
static bool
16311631
has_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope)
16321632
{
16331633
u64 val = read_scoped_sysreg(entry, scope);
1634-
return feature_matches(val, entry);
1634+
return cpufeature_matches(val, entry);
16351635
}
16361636

16371637
const struct cpumask *system_32bit_el0_cpumask(void)
@@ -3697,6 +3697,7 @@ void __init setup_boot_cpu_features(void)
36973697
* handle the boot CPU.
36983698
*/
36993699
init_cpucap_indirect_list();
3700+
init_cpucap_indirect_list_impdef();
37003701

37013702
/*
37023703
* Detect broken pseudo-NMI. Must be called _before_ the call to
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
/*
3+
* Contains implementation-defined CPU feature definitions.
4+
*/
5+
6+
#include <asm/cpufeature.h>
7+
8+
#ifdef CONFIG_ARM64_MEMORY_MODEL_CONTROL
9+
static bool has_tso_fixed(const struct arm64_cpu_capabilities *entry, int scope)
10+
{
11+
/* List of CPUs that always use the TSO memory model */
12+
static const struct midr_range fixed_tso_list[] = {
13+
MIDR_ALL_VERSIONS(MIDR_NVIDIA_DENVER),
14+
MIDR_ALL_VERSIONS(MIDR_NVIDIA_CARMEL),
15+
MIDR_ALL_VERSIONS(MIDR_FUJITSU_A64FX),
16+
{ /* sentinel */ }
17+
};
18+
19+
return is_midr_in_range_list(read_cpuid_id(), fixed_tso_list);
20+
}
21+
#endif
22+
23+
static const struct arm64_cpu_capabilities arm64_impdef_features[] = {
24+
#ifdef CONFIG_ARM64_MEMORY_MODEL_CONTROL
25+
{
26+
.desc = "TSO memory model (Fixed)",
27+
.capability = ARM64_HAS_TSO_FIXED,
28+
.type = SCOPE_LOCAL_CPU | ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU,
29+
.matches = has_tso_fixed,
30+
},
31+
#endif
32+
{},
33+
};
34+
35+
void __init init_cpucap_indirect_list_impdef(void)
36+
{
37+
init_cpucap_indirect_list_from_array(arm64_impdef_features);
38+
}

arch/arm64/kernel/process.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include <linux/thread_info.h>
4242
#include <linux/prctl.h>
4343
#include <linux/stacktrace.h>
44+
#include <linux/memory_ordering_model.h>
4445

4546
#include <asm/alternative.h>
4647
#include <asm/arch_timer.h>
@@ -659,6 +660,25 @@ void update_sctlr_el1(u64 sctlr)
659660
isb();
660661
}
661662

663+
#ifdef CONFIG_ARM64_MEMORY_MODEL_CONTROL
664+
int arch_prctl_mem_model_get(struct task_struct *t)
665+
{
666+
return PR_SET_MEM_MODEL_DEFAULT;
667+
}
668+
669+
int arch_prctl_mem_model_set(struct task_struct *t, unsigned long val)
670+
{
671+
if (alternative_has_cap_unlikely(ARM64_HAS_TSO_FIXED) &&
672+
val == PR_SET_MEM_MODEL_TSO)
673+
return 0;
674+
675+
if (val == PR_SET_MEM_MODEL_DEFAULT)
676+
return 0;
677+
678+
return -EINVAL;
679+
}
680+
#endif
681+
662682
/*
663683
* Thread switching.
664684
*/
@@ -799,6 +819,10 @@ void arch_setup_new_exec(void)
799819
arch_prctl_spec_ctrl_set(current, PR_SPEC_STORE_BYPASS,
800820
PR_SPEC_ENABLE);
801821
}
822+
823+
#ifdef CONFIG_ARM64_MEMORY_MODEL_CONTROL
824+
arch_prctl_mem_model_set(current, PR_SET_MEM_MODEL_DEFAULT);
825+
#endif
802826
}
803827

804828
#ifdef CONFIG_ARM64_TAGGED_ADDR_ABI

arch/arm64/tools/cpucaps

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ HAS_STAGE2_FWB
5454
HAS_TCR2
5555
HAS_TIDCP1
5656
HAS_TLB_RANGE
57+
HAS_TSO_FIXED
5758
HAS_VA52
5859
HAS_VIRT_HOST_EXTN
5960
HAS_WFXT

0 commit comments

Comments
 (0)