powerpc/pseries/svm: Use FW_FEATURE to detect SVM
PATCH v4 1/2 powerpc/pseries/svm: Use FW_FEATURE to detect SVM
Use FW_FEATURE_SVM to detect a secure guest (SVM). This would be more efficient than calling mfmsr() frequently.
--- arch/powerpc/include/asm/firmware.h | 3 ++- arch/powerpc/include/asm/svm.h | 6 +++++- arch/powerpc/kernel/paca.c | 6 +++++- arch/powerpc/platforms/pseries/firmware.c | 3 +++ 4 files changed, 15 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/firmware.h +2 -1
@@ -51,6 +51,7 @@#define FW_FEATURE_BLOCK_REMOVE ASM_CONST(0x0000001000000000)#define FW_FEATURE_PAPR_SCM ASM_CONST(0x0000002000000000)#define FW_FEATURE_ULTRAVISOR ASM_CONST(0x0000004000000000) +#define FW_FEATURE_SVM ASM_CONST(0x0000008000000000)#ifndef __ASSEMBLY__
@@ -69,7 +70,7 @@ enum {FW_FEATURE_TYPE1_AFFINITY |FW_FEATURE_PRRN |FW_FEATURE_HPT_RESIZE |FW_FEATURE_DRMEM_V2 |FW_FEATURE_DRC_INFO |FW_FEATURE_BLOCK_REMOVE | -FW_FEATURE_PAPR_SCM |FW_FEATURE_ULTRAVISOR , +FW_FEATURE_PAPR_SCM |FW_FEATURE_ULTRAVISOR |FW_FEATURE_SVM ,FW_FEATURE_PSERIES_ALWAYS =0 ,FW_FEATURE_POWERNV_POSSIBLE =FW_FEATURE_OPAL |FW_FEATURE_ULTRAVISOR , FW_FEATURE_POWERNV_ALWAYS = 0,
arch/powerpc/include/asm/svm.h +5 -1
@@ -10,9 +10,13 @@#ifdef CONFIG_PPC_SVM +/* +* Note that this is not usable in early boot - before FW +* features were probed +*/ static inline bool is_secure_guest (void ) { -return mfmsr () &MSR_S ; +return firmware_has_feature (FW_FEATURE_SVM ); }void dtl_cache_ctor (void *addr);
arch/powerpc/kernel/paca.c +5 -1
@@ -120,7 +120,11 @@ static struct lppaca * __init new_lppaca(int cpu, unsigned long limit)if (early_cpu_has_feature (CPU_FTR_HVMODE ))return NULL ; -if (is_secure_guest ()) +/* +* Firmware features may not have been probed yet, so check +* MSR rather than FW_FEATURE_SVM in is_secure_guest(). +*/ +if (mfmsr () &MSR_S ) lp =alloc_shared_lppaca (LPPACA_SIZE ,0x400 , limit, cpu);else lp =alloc_paca_data (LPPACA_SIZE ,0x400 , limit, cpu);
arch/powerpc/platforms/pseries/firmware.c +3 -0
@@ -175,4 +175,7 @@ static int __init probe_fw_features(unsigned long node, const char *uname, intvoid __init pseries_probe_fw_features (void ) {of_scan_flat_dt (probe_fw_features,NULL ); + +if (mfmsr () &MSR_S ) + powerpc_firmware_features |=FW_FEATURE_SVM ; }
Signature · 1 line
2.17.2
PATCH v4 2/2 powerpc/pseries/svm: Disable BHRB/EBB/PMU access
Ultravisor disables some CPU features like BHRB, EBB and PMU in secure virtual machines (SVMs) for now. Skip accessing those registers in SVMs to avoid getting a Program Interrupt.
Basic performance monitoring in SVMs is likely to be enabled in the future after adding the necessary security mechanisms in Ultravisor. Some features, like BHRB or monitoring event counts in HV-mode (e.g: perf stat -e cycles:h) may still be restricted for the longer term.
---
Changelog[v4]
- [Paul Mackerras] Drop is_secure_guest() checks in HV-only code and indicate if the disabling of PMU is temporary.
- For consistency, also skip registering PMUs in secure guests.
Changelog[v2]
- [Michael Ellerman] Optimize the code using FW_FEATURE_SVM
- Merged EBB/BHRB and PMU patches into one and reorganized code.
- Fix some build errors reported by <[email protected]>
--- arch/powerpc/kernel/cpu_setup_power.S | 21 +++++++++++++++++++ arch/powerpc/kernel/process.c | 23 ++++++++++++-------- arch/powerpc/perf/power9-pmu.c | 10 +++++++++ arch/powerpc/xmon/xmon.c | 30 +++++++++++++++++---------- 4 files changed, 64 insertions(+), 20 deletions(-)
arch/powerpc/kernel/cpu_setup_power.S +21 -0
@@ -206,14 +206,35 @@ __init_PMU_HV_ISA207: blr __init_PMU: +#ifdef CONFIG_PPC_SVM + /* + * SVM's are restricted from accessing PMU, so skip. + */ + mfmsr r5 + rldicl r5, r5, 64-MSR_S_LG, 62 + cmpwi r5,1 + beq skip1 +#endif li r5,0 mtspr SPRN_MMCRA,r5 mtspr SPRN_MMCR0,r5 mtspr SPRN_MMCR1,r5 mtspr SPRN_MMCR2,r5 +skip1: blr __init_PMU_ISA207: + +#ifdef CONFIG_PPC_SVM + /* + * SVM's are restricted from accessing PMU, so skip. + */ + mfmsr r5 + rldicl r5, r5, 64-MSR_S_LG, 62 + cmpwi r5,1 + beq skip2 +#endif li r5,0 mtspr SPRN_MMCRS,r5 +skip2: blr
arch/powerpc/kernel/process.c +14 -9
@@ -64,6 +64,7 @@#include <asm/asm-prototypes.h> #include <asm/stacktrace.h> #include <asm/hw_breakpoint.h> +#include <asm/svm.h> #include <linux/kprobes.h> #include <linux/kdebug.h>
@@ -1059,9 +1060,11 @@ static inline void save_sprs(struct thread_struct *t) t->dscr =mfspr (SPRN_DSCR );if (cpu_has_feature (CPU_FTR_ARCH_207S )) { - t->bescr =mfspr (SPRN_BESCR ); - t->ebbhr =mfspr (SPRN_EBBHR ); - t->ebbrr =mfspr (SPRN_EBBRR ); +if (!is_secure_guest ()) { + t->bescr =mfspr (SPRN_BESCR ); + t->ebbhr =mfspr (SPRN_EBBHR ); + t->ebbrr =mfspr (SPRN_EBBRR ); + } t->fscr =mfspr (SPRN_FSCR );
@@ -1097,12 +1100,14 @@ static inline void restore_sprs(struct thread_struct *old_thread, }if (cpu_has_feature (CPU_FTR_ARCH_207S )) { -if (old_thread->bescr != new_thread->bescr) -mtspr (SPRN_BESCR , new_thread->bescr); -if (old_thread->ebbhr != new_thread->ebbhr) -mtspr (SPRN_EBBHR , new_thread->ebbhr); -if (old_thread->ebbrr != new_thread->ebbrr) -mtspr (SPRN_EBBRR , new_thread->ebbrr); +if (!is_secure_guest ()) { +if (old_thread->bescr != new_thread->bescr) +mtspr (SPRN_BESCR , new_thread->bescr); +if (old_thread->ebbhr != new_thread->ebbhr) +mtspr (SPRN_EBBHR , new_thread->ebbhr); +if (old_thread->ebbrr != new_thread->ebbrr) +mtspr (SPRN_EBBRR , new_thread->ebbrr); + }if (old_thread->fscr != new_thread->fscr)mtspr (SPRN_FSCR , new_thread->fscr);
arch/powerpc/perf/power9-pmu.c +10 -0
@@ -10,6 +10,7 @@#define pr_fmt (fmt) "power9-pmu: " fmt#include "isa207-common.h" +#include <asm/svm.h> /* * Raw event encoding for Power9:
@@ -446,6 +447,15 @@ int init_power9_pmu(void) strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power9"))return -ENODEV ; +/* +* Disable PMUs in secure guests until we evaluate security +* exposure and add relevant functionality in Ultravisor. +*/ +if (is_secure_guest ()) { +printk ("Not registering Performance Monitor in secure guest\n" ); +return 0 ; + } +/* Blacklist events */ if (!(pvr &PVR_POWER9_CUMULUS )) {if ((PVR_CFG (pvr) =2 ) && (PVR_MIN (pvr) =1 )) {
arch/powerpc/xmon/xmon.c +19 -11
@@ -53,6 +53,7 @@#include <asm/firmware.h> #include <asm/code-patching.h> #include <asm/sections.h> +#include <asm/svm.h> #ifdef CONFIG_PPC64 #include <asm/hvcall.h>
@@ -1861,17 +1862,24 @@ static void dump_207_sprs(void) mfspr(SPRN_TEXASR)); } -printf ("mmcr0 = %.16lx mmcr1 = %.16lx mmcr2 = %.16lx\n" , -mfspr (SPRN_MMCR0 ),mfspr (SPRN_MMCR1 ),mfspr (SPRN_MMCR2 )); -printf ("pmc1 = %.8lx pmc2 = %.8lx pmc3 = %.8lx pmc4 = %.8lx\n" , -mfspr (SPRN_PMC1 ),mfspr (SPRN_PMC2 ), -mfspr (SPRN_PMC3 ),mfspr (SPRN_PMC4 )); -printf ("mmcra = %.16lx siar = %.16lx pmc5 = %.8lx\n" , -mfspr (SPRN_MMCRA ),mfspr (SPRN_SIAR ),mfspr (SPRN_PMC5 )); -printf ("sdar = %.16lx sier = %.16lx pmc6 = %.8lx\n" , -mfspr (SPRN_SDAR ),mfspr (SPRN_SIER ),mfspr (SPRN_PMC6 )); -printf ("ebbhr = %.16lx ebbrr = %.16lx bescr = %.16lx\n" , -mfspr (SPRN_EBBHR ),mfspr (SPRN_EBBRR ),mfspr (SPRN_BESCR )); +if (!is_secure_guest ()) { +printf ("mmcr0 = %.16lx mmcr1 = %.16lx mmcr2 = %.16lx\n" , +mfspr (SPRN_MMCR0 ),mfspr (SPRN_MMCR1 ), +mfspr (SPRN_MMCR2 )); +printf ("pmc1 = %.8lx pmc2 = %.8lx pmc3 = %.8lx pmc4 = %.8lx\n" , +mfspr (SPRN_PMC1 ),mfspr (SPRN_PMC2 ), +mfspr (SPRN_PMC3 ),mfspr (SPRN_PMC4 )); +printf ("mmcra = %.16lx siar = %.16lx pmc5 = %.8lx\n" , +mfspr (SPRN_MMCRA ),mfspr (SPRN_SIAR ),mfspr (SPRN_PMC5 )); +printf ("sdar = %.16lx sier = %.16lx pmc6 = %.8lx\n" , +mfspr (SPRN_SDAR ),mfspr (SPRN_SIER ),mfspr (SPRN_PMC6 )); + +printf ("ebbhr = %.16lx ebbrr = %.16lx bescr = %.16lx\n" , +mfspr (SPRN_EBBHR ),mfspr (SPRN_EBBRR ), +mfspr (SPRN_BESCR )); + } + +printf ("iamr = %.16lx\n" ,mfspr (SPRN_IAMR ));if (!(msr &MSR_HV ))
Signature · 1 line
2.17.2