KVM: arm64: Advertise ID_AA64PFR0_EL1.CSV2/3 to protected VMs
PATCH v3 1/1 KVM: arm64: Advertise ID_AA64PFR0_EL1.CSV2/3 to protected VMs
The existing pKVM code attempts to do that using a value initialized to 0, but never set. To advertise csv2/3 to protected guests, pass the csv values to hyp when initializing hyp's view of guests' ID_AA64PFR0_EL1.
Similar to non-protected KVM, these are system-wide, rather than per cpu, for simplicity.
Changes from V2: Fix masking not to affect bits other than CSV2/3.
--- arch/arm64/kvm/arm.c | 24 ++++++++++++++++++- .../arm64/kvm/hyp/include/nvhe/fixed_config.h | 5 +++- arch/arm64/kvm/hyp/nvhe/sys_regs.c | 7 ------ 3 files changed, 27 insertions(+), 9 deletions(-)
arch/arm64/kvm/arm.c +23 -1
@@ -1889,9 +1889,31 @@ static int __init do_pkvm_init(u32 hyp_va_bits)return ret; } +static u64 get_hyp_id_aa64pfr0_el1 (void ) +{ +u64 mask = ~0ULL ; + +/* +* Track whether the system isn't affected by spectre/meltown in the +* hypervisor's view of id_aa64pfr0_el1, used for protected VMs. +* Although this is per-CPU, we make it global for simplicity, e.g., not +* to have to worry about vcpu migration. +* +* Unlike for non-protected VMs, userspace cannot override this for +* protected VMs. +*/ +if (arm64_get_spectre_v2_state () !=SPECTRE_UNAFFECTED ) + mask &= ~ARM64_FEATURE_MASK (ID_AA64PFR0_EL1_CSV2 ); + +if (arm64_get_meltdown_state () !=SPECTRE_UNAFFECTED ) + mask &= ~ARM64_FEATURE_MASK (ID_AA64PFR0_EL1_CSV3 ); + +return read_sanitised_ftr_reg (SYS_ID_AA64PFR0_EL1 ) & mask; +} +static void kvm_hyp_init_symbols (void ) { -kvm_nvhe_sym (id_aa64pfr0_el1_sys_val) =read_sanitised_ftr_reg (SYS_ID_AA64PFR0_EL1 ); +kvm_nvhe_sym (id_aa64pfr0_el1_sys_val) =get_hyp_id_aa64pfr0_el1 ();kvm_nvhe_sym (id_aa64pfr1_el1_sys_val) =read_sanitised_ftr_reg (SYS_ID_AA64PFR1_EL1 );kvm_nvhe_sym (id_aa64isar0_el1_sys_val) =read_sanitised_ftr_reg (SYS_ID_AA64ISAR0_EL1 );kvm_nvhe_sym (id_aa64isar1_el1_sys_val) =read_sanitised_ftr_reg (SYS_ID_AA64ISAR1_EL1 );
arch/arm64/kvm/hyp/include/nvhe/fixed_config.h +4 -1
@@ -33,11 +33,14 @@* Allow for protected VMs: * - Floating-point and Advanced SIMD * - Data Independent Timing +* - Spectre/Meltdown Mitigation */ #define PVM_ID_AA64PFR0_ALLOW (\ ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_FP) | \ ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_AdvSIMD) | \ - ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_DIT) \ + ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_DIT) | \ + ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_CSV2) | \ + ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_CSV3) \ )/*
arch/arm64/kvm/hyp/nvhe/sys_regs.c +0 -7
@@ -85,19 +85,12 @@ static u64 get_restricted_features_unsigned(u64 sys_reg_val,static u64 get_pvm_id_aa64pfr0 (const struct kvm_vcpu *vcpu) { -const struct kvm *kvm = (const struct kvm *)kern_hyp_va (vcpu->kvm);u64 set_mask =0 ;u64 allow_mask =PVM_ID_AA64PFR0_ALLOW ; set_mask |=get_restricted_features_unsigned (id_aa64pfr0_el1_sys_val,PVM_ID_AA64PFR0_RESTRICT_UNSIGNED ); -/* Spectre and Meltdown mitigation in KVM */ - set_mask |=FIELD_PREP (ARM64_FEATURE_MASK (ID_AA64PFR0_EL1_CSV2 ), - (u64 )kvm->arch.pfr0_csv2); - set_mask |=FIELD_PREP (ARM64_FEATURE_MASK (ID_AA64PFR0_EL1_CSV3 ), - (u64 )kvm->arch.pfr0_csv3); -return (id_aa64pfr0_el1_sys_val & allow_mask) | set_mask; }
base-commit: 96a4627dbbd48144a65af936b321701c70876026
Signature · 1 line
2.40.0.348.gf938b09366-goog
Hi Fuad,
Thanks for catching the masking issue in v2. Few comments:
Quoted 1 line · Fuad Tabba
The existing pKVM code attempts to do that using a value
nit: it is more readable if you restate what 'that' is in the changelog, even if it is already in the shortlog.
Quoted 11 lines
initialized to 0, but never set. To advertise csv2/3 to protected guests, pass the csv values to hyp when initializing hyp's view of guests'
ID_AA64PFR0_EL1.Similar to non-protected KVM, these are system-wide, rather than per cpu, for simplicity.
Fixes 6c30bfb18d0b ("KVM: arm64: Add handlers for protected VM System Registers")Signed-off-by Fuad Tabba <[email protected]>Changes from V2: Fix masking not to affect bits other than CSV2/3.
Commentary like this that you don't want to appear in the commit when applied should appear below the '---'
Quoted 1 line
---
I.e. right here.
Quoted 21 lines
arch/arm64/kvm/arm.c | 24 ++++++++++++++++++- .../arm64/kvm/hyp/include/nvhe/fixed_config.h | 5 +++- arch/arm64/kvm/hyp/nvhe/sys_regs.c | 7 ------ 3 files changed, 27 insertions(+), 9 deletions(-)arch/arm64/kvm/arm.c +8
-0@@ -1889,9 +1889,31 @@ static int __init do_pkvm_init(u32 hyp_va_bits)return ret; } +static u64 get_hyp_id_aa64pfr0_el1 (void ) +{ +u64 mask = ~0ULL ; + +/* +* Track whether the system isn't affected by spectre/meltown in the +* hypervisor's view of id_aa64pfr0_el1, used for protected VMs. +* Although this is per-CPU, we make it global for simplicity, e.g., not
arch/arm64/kvm/arm.c static int __init do_pkvm_init(u32 hyp_va_bits) · line 1909
Quoted 10 lines
arch/arm64/kvm/arm.c +10
-0+* to have to worry about vcpu migration. +* +* Unlike for non-protected VMs, userspace cannot override this for +* protected VMs. +*/ +if (arm64_get_spectre_v2_state () !=SPECTRE_UNAFFECTED ) + mask &= ~ARM64_FEATURE_MASK (ID_AA64PFR0_EL1_CSV2 ); + +if (arm64_get_meltdown_state () !=SPECTRE_UNAFFECTED ) + mask &= ~ARM64_FEATURE_MASK (ID_AA64PFR0_EL1_CSV3 );
Doesn't this introduce a subtle change to the way that the CSV[23] values are constrained in KVM? At least for 'normal' VMs we constrain both fields to having a max value of 1.
Signature · 2 lines
Thanks, Oliver
Hi Oliver,
Thanks for your comments.
Quoted 10 lines · Oliver Upton
Hi Fuad,
Thanks for catching the masking issue in v2. Few comments:
Quoted 1 line · Fuad Tabba
The existing pKVM code attempts to do that using a value
nit: it is more readable if you restate what 'that' is in the changelog, even if it is already in the shortlog.
Will do when I repost this.
Quoted 11 lines
Quoted 11 lines
initialized to 0, but never set. To advertise csv2/3 to protected guests, pass the csv values to hyp when initializing hyp's view of guests'
ID_AA64PFR0_EL1.Similar to non-protected KVM, these are system-wide, rather than per cpu, for simplicity.
Fixes 6c30bfb18d0b ("KVM: arm64: Add handlers for protected VM System Registers")Signed-off-by Fuad Tabba <[email protected]>
Quoted 8 lines
Quoted 1 line
Changes from V2: Fix masking not to affect bits other than CSV2/3.
Commentary like this that you don't want to appear in the commit when applied should appear below the '---'
Quoted 1 line
---
I.e. right here.
Ack!
Quoted 28 lines
Quoted 28 lines
arch/arm64/kvm/arm.c | 24 ++++++++++++++++++- .../arm64/kvm/hyp/include/nvhe/fixed_config.h | 5 +++- arch/arm64/kvm/hyp/nvhe/sys_regs.c | 7 ------ 3 files changed, 27 insertions(+), 9 deletions(-)arch/arm64/kvm/arm.c +14
-0@@ -1889,9 +1889,31 @@ static int __init do_pkvm_init(u32 hyp_va_bits)return ret; } +static u64 get_hyp_id_aa64pfr0_el1 (void ) +{ +u64 mask = ~0ULL ; + +/* +* Track whether the system isn't affected by spectre/meltown in the +* hypervisor's view of id_aa64pfr0_el1, used for protected VMs. +* Although this is per-CPU, we make it global for simplicity, e.g., not +* to have to worry about vcpu migration. +* +* Unlike for non-protected VMs, userspace cannot override this for +* protected VMs. +*/ +if (arm64_get_spectre_v2_state () !=SPECTRE_UNAFFECTED )
Quoted 8 lines
arch/arm64/kvm/arm.c static int __init do_pkvm_init(u32 hyp_va_bits) · line 1909
Quoted 4 lines
arch/arm64/kvm/arm.c +4
-0+ mask &= ~ARM64_FEATURE_MASK (ID_AA64PFR0_EL1_CSV2 ); + +if (arm64_get_meltdown_state () !=SPECTRE_UNAFFECTED ) + mask &= ~ARM64_FEATURE_MASK (ID_AA64PFR0_EL1_CSV3 );Doesn't this introduce a subtle change to the way that the CSV[23] values are constrained in KVM? At least for 'normal' VMs we constrain both fields to having a max value of 1.
You're right. I'll fix this and resend the patch.
Thanks again,
/fuad
Quoted 3 lines
--
Thanks,
Oliver