KVM: arm/arm64: Add VCPU workarounds firmware register
Subsystems (5)
v6 cover KVM: arm/arm64: Add VCPU workarounds firmware register
Hi,
hopefully the final update on this series, rebasing on Catalin's and Will's arm64/for-next/mitigations branch.
This slightly adjusts the internal names to use "not required" instead of "unaffected", which is less precise.
As introduced in v5, this one contains the patch to propagate the new "not required" state for Spectre v2 to KVM and its guests.
Cheers,
Andre
-----------------------------
Workarounds for Spectre variant 2 or 4 vulnerabilities require some help from the firmware, so KVM implements an interface to provide that for guests. When such a guest is migrated, we want to make sure we don't loose the protection the guest relies on.
This introduces two new firmware registers in KVM's GET/SET_ONE_REG interface, so userland can save the level of protection implemented by the hypervisor and used by the guest. Upon restoring these registers, we make sure we don't downgrade and reject any values that would mean weaker protection.
The protection level is encoded in the lower 4 bits, with smaller values indicating weaker protection.
ARM(32) is a bit of a pain (again), as the firmware register interface is shared, but 32-bit does not implement all the workarounds. For now I stuffed two wrappers into kvm_emulate.h, which doesn't sound like the best solution. Happy to hear about better solutions.
This has been tested with migration between two Juno systems. Out of the box they advertise identical workaround levels, and migration succeeds. However when disabling the A57 cluster on one system, WORKAROUND_1 is not needed and the host kernel propagates this. Migration now only succeeds in one direction (from the big/LITTLE configuration to the A53-only setup).
Please have a look and comment!
This is based upon arm64/for-next/migitations.
Find a git branch here:
{git,http}://linux-arm.org/linux-ap.git branch fw-regs/v6-sysfs
Cheers,
Andre
Changelog:
v5 .. v6:
- rebase on merged sysfs vulnerabilities series
- rename ..._UNAFFECTED to ..._NOT_REQUIRED
- rename ARM64_BP_HARDEN_MITIGATED
- add tags
v4 .. v5:
- add patch to advertise ARM64_BP_HARDEN_MITIGATED state to a guest
- allow migration from KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_AVAIL to (new) KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_UNAFFECTED
- reword API documentation
- return -EINVAL on querying invalid firmware register
- add some comments
- minor fixes according to Eric's review
v3 .. v4:
- clarify API documentation for WORKAROUND_1
- check for unknown bits in userland provided register values
- report proper -ENOENT when register ID is unknown
v2 .. v3:
- rebase against latest kvm-arm/next
- introduce UNAFFECTED value for WORKAROUND_1
- require exact match for WORKAROUND_1 levels
v1 .. v2:
- complete rework of WORKAROUND_2 presentation to use a linear scale, dropping the complicated comparison routine
Andre Przywara (3):
arm64: KVM: Propagate full Spectre v2 workaround state to KVM guests
KVM: arm/arm64: Add save/restore support for firmware workaround state
KVM: doc: add API documentation on the KVM_REG_ARM_WORKAROUNDS
register
Documentation/virtual/kvm/arm/psci.txt | 31 +++++ arch/arm/include/asm/kvm_emulate.h | 10 ++ arch/arm/include/asm/kvm_host.h | 12 +- arch/arm/include/uapi/asm/kvm.h | 12 ++ arch/arm64/include/asm/cpufeature.h | 6 + arch/arm64/include/asm/kvm_emulate.h | 14 +++ arch/arm64/include/asm/kvm_host.h | 16 ++- arch/arm64/include/uapi/asm/kvm.h | 10 ++ arch/arm64/kernel/cpu_errata.c | 23 +++- virt/kvm/arm/psci.c | 149 ++++++++++++++++++++++--- 10 files changed, 257 insertions(+), 26 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v6 1/3 arm64: KVM: Propagate full Spectre v2 workaround state to KVM guests
Recent commits added the explicit notion of "workaround not required" to the state of the Spectre v2 (aka. BP_HARDENING) workaround, where we just had "needed" and "unknown" before.
Export this knowledge to the rest of the kernel and enhance the existing kvm_arm_harden_branch_predictor() to report this new state as well. Export this new state to guests when they use KVM's firmware interface emulation.
--- arch/arm/include/asm/kvm_host.h | 12 +++++++++--- arch/arm64/include/asm/cpufeature.h | 6 ++++++ arch/arm64/include/asm/kvm_host.h | 16 ++++++++++++++-- arch/arm64/kernel/cpu_errata.c | 23 ++++++++++++++++++----- virt/kvm/arm/psci.c | 10 +++++++++- 5 files changed, 56 insertions(+), 11 deletions(-)
arch/arm/include/asm/kvm_host.h +9 -3
@@ -364,7 +364,11 @@ static inline void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) {}static inline void kvm_arm_vhe_guest_enter (void ) {}static inline void kvm_arm_vhe_guest_exit (void ) {} -static inline bool kvm_arm_harden_branch_predictor (void ) +#define KVM_BP_HARDEN_UNKNOWN -1 +#define KVM_BP_HARDEN_WA_NEEDED 0 +#define KVM_BP_HARDEN_NOT_REQUIRED 1 + +static inline int kvm_arm_harden_branch_predictor (void ) {switch (read_cpuid_part ()) {#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR
@@ -372,10 +376,12 @@ static inline bool kvm_arm_harden_branch_predictor(void)case ARM_CPU_PART_CORTEX_A12 :case ARM_CPU_PART_CORTEX_A15 :case ARM_CPU_PART_CORTEX_A17 : -return true; +return KVM_BP_HARDEN_WA_NEEDED ;#endif +case ARM_CPU_PART_CORTEX_A7 : +return KVM_BP_HARDEN_NOT_REQUIRED ;default : -return false; +return KVM_BP_HARDEN_UNKNOWN ; } }
arch/arm64/include/asm/cpufeature.h +6 -0
@@ -622,6 +622,12 @@ static inline bool system_uses_irq_prio_masking(void)cpus_have_const_cap (ARM64_HAS_IRQ_PRIO_MASKING ); } +#define ARM64_BP_HARDEN_UNKNOWN -1 +#define ARM64_BP_HARDEN_WA_NEEDED 0 +#define ARM64_BP_HARDEN_NOT_REQUIRED 1 + +int get_spectre_v2_workaround_state (void ); +#define ARM64_SSBD_UNKNOWN -1#define ARM64_SSBD_FORCE_DISABLE 0#define ARM64_SSBD_KERNEL 1
arch/arm64/include/asm/kvm_host.h +14 -2
@@ -555,9 +555,21 @@ static inline void kvm_arm_vhe_guest_exit(void)isb (); } -static inline bool kvm_arm_harden_branch_predictor (void ) +#define KVM_BP_HARDEN_UNKNOWN -1 +#define KVM_BP_HARDEN_WA_NEEDED 0 +#define KVM_BP_HARDEN_NOT_REQUIRED 1 + +static inline int kvm_arm_harden_branch_predictor (void ) { -return cpus_have_const_cap (ARM64_HARDEN_BRANCH_PREDICTOR ); +switch (get_spectre_v2_workaround_state ()) { +case ARM64_BP_HARDEN_WA_NEEDED : +return KVM_BP_HARDEN_WA_NEEDED ; +case ARM64_BP_HARDEN_NOT_REQUIRED : +return KVM_BP_HARDEN_NOT_REQUIRED ; +case ARM64_BP_HARDEN_UNKNOWN : +default : +return KVM_BP_HARDEN_UNKNOWN ; + } }#define KVM_SSBD_UNKNOWN -1
arch/arm64/kernel/cpu_errata.c +18 -5
@@ -549,6 +549,17 @@ cpu_enable_cache_maint_trap(const struct arm64_cpu_capabilities *__unused)static bool __hardenbp_enab = true;static bool __spectrev2_safe = true; +int get_spectre_v2_workaround_state (void ) +{ +if (__spectrev2_safe) +return ARM64_BP_HARDEN_NOT_REQUIRED ; + +if (!__hardenbp_enab) +return ARM64_BP_HARDEN_UNKNOWN ; + +return ARM64_BP_HARDEN_WA_NEEDED ; +} +/* * List of CPUs that do not need any Spectre-v2 mitigation at all. */
@@ -828,13 +839,15 @@ ssize_t cpu_show_spectre_v1(struct device *dev, struct device_attribute *attr,ssize_t cpu_show_spectre_v2 (struct device *dev,struct device_attribute *attr,char *buf) { -if (__spectrev2_safe) +switch (get_spectre_v2_workaround_state ()) { +case ARM64_BP_HARDEN_NOT_REQUIRED :return sprintf (buf,"Not affected\n" ); - -if (__hardenbp_enab) +case ARM64_BP_HARDEN_WA_NEEDED :return sprintf (buf,"Mitigation: Branch predictor hardening\n" ); - -return sprintf (buf,"Vulnerable\n" ); +case ARM64_BP_HARDEN_UNKNOWN : +default : +return sprintf (buf,"Vulnerable\n" ); + } } ssize_t cpu_show_spec_store_bypass(struct device *dev,
virt/kvm/arm/psci.c +9 -1
@@ -412,8 +412,16 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) feature =smccc_get_arg1 (vcpu);switch (feature) {case ARM_SMCCC_ARCH_WORKAROUND_1 : -if (kvm_arm_harden_branch_predictor ()) +switch (kvm_arm_harden_branch_predictor ()) { +case KVM_BP_HARDEN_UNKNOWN : +break ; +case KVM_BP_HARDEN_WA_NEEDED : val =SMCCC_RET_SUCCESS ; +break ; +case KVM_BP_HARDEN_NOT_REQUIRED : + val =SMCCC_RET_NOT_REQUIRED ; +break ; + }break ;case ARM_SMCCC_ARCH_WORKAROUND_2 :switch (kvm_arm_have_ssbd ()) {
Signature · 6 lines
2.17.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v6 1/3] arm64: KVM: Propagate full Spectre v2 workaround state to KVM guests
Quoted 10 lines · Andre Przywara
Recent commits added the explicit notion of "workaround not required" to the state of the Spectre v2 (aka.
BP_HARDENING) workaround, where we just had "needed" and "unknown" before.Export this knowledge to the rest of the kernel and enhance the existing
kvm_arm_harden_branch_predictor()to report this new state as well. Export this new state to guests when they use KVM's firmware interface emulation.Signed-off-by Andre Przywara <[email protected]>
PATCH v6 2/3 KVM: arm/arm64: Add save/restore support for firmware workaround state
In reply to Andre PrzywaraKVM implements the firmware interface for mitigating cache speculation vulnerabilities. Guests may use this interface to ensure mitigation is active.
If we want to migrate such a guest to a host with a different support level for those workarounds, migration might need to fail, to ensure that critical guests don't loose their protection.
Introduce a way for userland to save and restore the workarounds state. On restoring we do checks that make sure we don't downgrade our mitigation level.
--- arch/arm/include/asm/kvm_emulate.h | 10 ++ arch/arm/include/uapi/asm/kvm.h | 12 +++ arch/arm64/include/asm/kvm_emulate.h | 14 +++ arch/arm64/include/uapi/asm/kvm.h | 10 ++ virt/kvm/arm/psci.c | 139 ++++++++++++++++++++++++--- 5 files changed, 170 insertions(+), 15 deletions(-)
arch/arm/include/asm/kvm_emulate.h +10 -0
@@ -283,6 +283,16 @@ static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)return vcpu_cp15 (vcpu, c0_MPIDR) &MPIDR_HWID_BITMASK ; } +static inline bool kvm_arm_get_vcpu_workaround_2_flag (struct kvm_vcpu *vcpu) +{ +return false; +} + +static inline void kvm_arm_set_vcpu_workaround_2_flag (struct kvm_vcpu *vcpu, +bool flag) +{ +} +static inline void kvm_vcpu_set_be (struct kvm_vcpu *vcpu) { *vcpu_cpsr (vcpu) |=PSR_E_BIT ;
arch/arm/include/uapi/asm/kvm.h +12 -0
@@ -214,6 +214,18 @@ struct kvm_vcpu_events {#define KVM_REG_ARM_FW_REG (r) (KVM_REG_ARM | KVM_REG_SIZE_U64 | \ KVM_REG_ARM_FW | ((r) & 0xffff))#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0) +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1 KVM_REG_ARM_FW_REG(1) +/* Higher values mean better protection. */ +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_AVAIL 0 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_AVAIL 1 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_REQUIRED 2 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2 KVM_REG_ARM_FW_REG(2) +/* Higher values mean better protection. */ +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_AVAIL 0 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_UNKNOWN 1 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_AVAIL 2 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_REQUIRED 3 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_ENABLED (1U << 4)/* Device Control API: ARM VGIC */ #define KVM_DEV_ARM_VGIC_GRP_ADDR 0
arch/arm64/include/asm/kvm_emulate.h +14 -0
@@ -348,6 +348,20 @@ static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)return vcpu_read_sys_reg (vcpu,MPIDR_EL1 ) &MPIDR_HWID_BITMASK ; } +static inline bool kvm_arm_get_vcpu_workaround_2_flag (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.workaround_flags &VCPU_WORKAROUND_2_FLAG ; +} + +static inline void kvm_arm_set_vcpu_workaround_2_flag (struct kvm_vcpu *vcpu, +bool flag) +{ +if (flag) + vcpu->arch.workaround_flags |=VCPU_WORKAROUND_2_FLAG ; +else + vcpu->arch.workaround_flags &= ~VCPU_WORKAROUND_2_FLAG ; +} +static inline void kvm_vcpu_set_be (struct kvm_vcpu *vcpu) {if (vcpu_mode_is_32bit (vcpu)) {
arch/arm64/include/uapi/asm/kvm.h +10 -0
@@ -225,6 +225,16 @@ struct kvm_vcpu_events {#define KVM_REG_ARM_FW_REG (r) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ KVM_REG_ARM_FW | ((r) & 0xffff))#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0) +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1 KVM_REG_ARM_FW_REG(1) +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_AVAIL 0 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_AVAIL 1 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_REQUIRED 2 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2 KVM_REG_ARM_FW_REG(2) +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_AVAIL 0 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_UNKNOWN 1 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_AVAIL 2 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_REQUIRED 3 +#define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_ENABLED (1U << 4)/* Device Control API: ARM VGIC */ #define KVM_DEV_ARM_VGIC_GRP_ADDR 0
virt/kvm/arm/psci.c +124 -15
172 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v6 3/3 KVM: doc: add API documentation on the KVM_REG_ARM_WORKAROUNDS register
In reply to Andre PrzywaraAdd documentation for the newly defined firmware registers to save and restore any vulnerability mitigation status.
--- Documentation/virtual/kvm/arm/psci.txt | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
Documentation/virtual/kvm/arm/psci.txt +31 -0
@@ -28,3 +28,34 @@ The following register is defined: - Allows any PSCI version implemented by KVM and compatible with v0.2 to be set with SET_ONE_REG - Affects the whole VM (even if the register view is per-vcpu) + +* KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1: + Holds the state of the firmware support to mitigate CVE-2017-5715, as + offered by KVM to the guest via a HVC call. The workaround is described + under SMCCC_ARCH_WORKAROUND_1 in [1]. + Accepted values are: + KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_AVAIL: KVM does not offer + firmware support for the workaround. The mitigation status for the + guest is unknown. + KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_AVAIL: The workaround HVC call is + available to the guest and required for the mitigation. + KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_REQUIRED: The workaround HVC call + is available to the guest, but it is not needed on this VCPU. + +* KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2: + Holds the state of the firmware support to mitigate CVE-2018-3639, as + offered by KVM to the guest via a HVC call. The workaround is described + under SMCCC_ARCH_WORKAROUND_2 in [1]. + Accepted values are: + KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_AVAIL: A workaround is not + available. KVM does not offer firmware support for the workaround. + KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_UNKNOWN: The workaround state is + unknown. KVM does not offer firmware support for the workaround. + KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_AVAIL: The workaround is available, + and can be disabled by a vCPU. If + KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_ENABLED is set, it is active for + this vCPU. + KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_REQUIRED: The workaround is + always active on this vCPU or it is not needed. + +[1] https://developer.arm.com/-/media/developer/pdf/ARM_DEN_0070A_Firmware_interfaces_for_mitigating_CVE-2017-5715.pdf
Signature · 6 lines
2.17.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm