Skip to content

Commit 7e35eba

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 <[email protected]> Reviewed-by: Neal Gompa <[email protected]>
1 parent fe00859 commit 7e35eba

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
@@ -1048,6 +1048,10 @@ static inline bool cpu_has_lpa2(void)
10481048
#endif
10491049
}
10501050

1051+
void __init init_cpucap_indirect_list_impdef(void);
1052+
void __init init_cpucap_indirect_list_from_array(const struct arm64_cpu_capabilities *caps);
1053+
bool cpufeature_matches(u64 reg, const struct arm64_cpu_capabilities *entry);
1054+
10511055
#endif /* __ASSEMBLY__ */
10521056

10531057
#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 jump_label.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
@@ -1073,7 +1073,7 @@ static void init_cpu_ftr_reg(u32 sys_reg, u64 new)
10731073
extern const struct arm64_cpu_capabilities arm64_errata[];
10741074
static const struct arm64_cpu_capabilities arm64_features[];
10751075

1076-
static void __init
1076+
void __init
10771077
init_cpucap_indirect_list_from_array(const struct arm64_cpu_capabilities *caps)
10781078
{
10791079
for (; caps->matches; caps++) {
@@ -1585,8 +1585,8 @@ has_always(const struct arm64_cpu_capabilities *entry, int scope)
15851585
return true;
15861586
}
15871587

1588-
static bool
1589-
feature_matches(u64 reg, const struct arm64_cpu_capabilities *entry)
1588+
bool
1589+
cpufeature_matches(u64 reg, const struct arm64_cpu_capabilities *entry)
15901590
{
15911591
int val, min, max;
15921592
u64 tmp;
@@ -1639,14 +1639,14 @@ has_user_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope)
16391639
if (!mask)
16401640
return false;
16411641

1642-
return feature_matches(val, entry);
1642+
return cpufeature_matches(val, entry);
16431643
}
16441644

16451645
static bool
16461646
has_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope)
16471647
{
16481648
u64 val = read_scoped_sysreg(entry, scope);
1649-
return feature_matches(val, entry);
1649+
return cpufeature_matches(val, entry);
16501650
}
16511651

16521652
const struct cpumask *system_32bit_el0_cpumask(void)
@@ -3767,6 +3767,7 @@ void __init setup_boot_cpu_features(void)
37673767
* handle the boot CPU.
37683768
*/
37693769
init_cpucap_indirect_list();
3770+
init_cpucap_indirect_list_impdef();
37703771

37713772
/*
37723773
* 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(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>
@@ -699,6 +700,25 @@ void update_sctlr_el1(u64 sctlr)
699700
isb();
700701
}
701702

703+
#ifdef CONFIG_ARM64_MEMORY_MODEL_CONTROL
704+
int arch_prctl_mem_model_get(struct task_struct *t)
705+
{
706+
return PR_SET_MEM_MODEL_DEFAULT;
707+
}
708+
709+
int arch_prctl_mem_model_set(struct task_struct *t, unsigned long val)
710+
{
711+
if (alternative_has_cap_unlikely(ARM64_HAS_TSO_FIXED) &&
712+
val == PR_SET_MEM_MODEL_TSO)
713+
return 0;
714+
715+
if (val == PR_SET_MEM_MODEL_DEFAULT)
716+
return 0;
717+
718+
return -EINVAL;
719+
}
720+
#endif
721+
702722
/*
703723
* Thread switching.
704724
*/
@@ -840,6 +860,10 @@ void arch_setup_new_exec(void)
840860
arch_prctl_spec_ctrl_set(current, PR_SPEC_STORE_BYPASS,
841861
PR_SPEC_ENABLE);
842862
}
863+
864+
#ifdef CONFIG_ARM64_MEMORY_MODEL_CONTROL
865+
arch_prctl_mem_model_set(current, PR_SET_MEM_MODEL_DEFAULT);
866+
#endif
843867
}
844868

845869
#ifdef CONFIG_ARM64_TAGGED_ADDR_ABI

arch/arm64/tools/cpucaps

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ HAS_STAGE2_FWB
5656
HAS_TCR2
5757
HAS_TIDCP1
5858
HAS_TLB_RANGE
59+
HAS_TSO_FIXED
5960
HAS_VA52
6061
HAS_VIRT_HOST_EXTN
6162
HAS_WFXT

0 commit comments

Comments
 (0)