Skip to content

Commit cccf984

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 4244937 commit cccf984

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
@@ -2306,6 +2306,15 @@ config ARM64_DEBUG_PRIORITY_MASKING
23062306
If unsure, say N
23072307
endif # ARM64_PSEUDO_NMI
23082308

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

arch/arm64/include/asm/cpufeature.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,10 @@ static inline bool cpu_has_lpa2(void)
10761076
#endif
10771077
}
10781078

1079+
void __init init_cpucap_indirect_list_impdef(void);
1080+
void __init init_cpucap_indirect_list_from_array(const struct arm64_cpu_capabilities *caps);
1081+
bool cpufeature_matches(u64 reg, const struct arm64_cpu_capabilities *entry);
1082+
10791083
#endif /* __ASSEMBLY__ */
10801084

10811085
#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
@@ -1078,7 +1078,7 @@ static void init_cpu_ftr_reg(u32 sys_reg, u64 new)
10781078
extern const struct arm64_cpu_capabilities arm64_errata[];
10791079
static const struct arm64_cpu_capabilities arm64_features[];
10801080

1081-
static void __init
1081+
void __init
10821082
init_cpucap_indirect_list_from_array(const struct arm64_cpu_capabilities *caps)
10831083
{
10841084
for (; caps->matches; caps++) {
@@ -1590,8 +1590,8 @@ has_always(const struct arm64_cpu_capabilities *entry, int scope)
15901590
return true;
15911591
}
15921592

1593-
static bool
1594-
feature_matches(u64 reg, const struct arm64_cpu_capabilities *entry)
1593+
bool
1594+
cpufeature_matches(u64 reg, const struct arm64_cpu_capabilities *entry)
15951595
{
15961596
int val, min, max;
15971597
u64 tmp;
@@ -1644,14 +1644,14 @@ has_user_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope)
16441644
if (!mask)
16451645
return false;
16461646

1647-
return feature_matches(val, entry);
1647+
return cpufeature_matches(val, entry);
16481648
}
16491649

16501650
static bool
16511651
has_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope)
16521652
{
16531653
u64 val = read_scoped_sysreg(entry, scope);
1654-
return feature_matches(val, entry);
1654+
return cpufeature_matches(val, entry);
16551655
}
16561656

16571657
const struct cpumask *system_32bit_el0_cpumask(void)
@@ -3895,6 +3895,7 @@ void __init setup_boot_cpu_features(void)
38953895
* handle the boot CPU.
38963896
*/
38973897
init_cpucap_indirect_list();
3898+
init_cpucap_indirect_list_impdef();
38983899

38993900
/*
39003901
* 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 = ARM64_CPUCAP_EARLY_LOCAL_CPU_FEATURE,
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>
@@ -698,6 +699,25 @@ void update_sctlr_el1(u64 sctlr)
698699
isb();
699700
}
700701

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

844868
#ifdef CONFIG_ARM64_TAGGED_ADDR_ABI

arch/arm64/tools/cpucaps

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ HAS_STAGE2_FWB
6060
HAS_TCR2
6161
HAS_TIDCP1
6262
HAS_TLB_RANGE
63+
HAS_TSO_FIXED
6364
HAS_VA52
6465
HAS_VIRT_HOST_EXTN
6566
HAS_WFXT

0 commit comments

Comments
 (0)