On Tue, Feb 11, 2020 at 05:48:36PM +0000, Marc Zyngier wrote:
> As there is a number of features that we either can't support,
> or don't want to support right away with NV, let's add some
> basic filtering so that we don't advertize silly things to the
> EL2 guest.
>
> Signed-off-by: Marc Zyngier <[email protected]>
> ---
> arch/arm64/include/asm/kvm_nested.h | 6 ++
> arch/arm64/include/asm/sysreg.h | 11 +++
> arch/arm64/kvm/nested.c | 115 ++++++++++++++++++++++++++++
> arch/arm64/kvm/sys_regs.c | 5 +-
> 4 files changed, 136 insertions(+), 1 deletion(-)
> +/*
> + * Our emulated CPU doesn't support all the possible features. For the
> + * sake of simplicity (and probably mental sanity), wipe out a number
> + * of feature bits we don't intend to support for the time being.
> + * This list should get updated as new features get added to the NV
> + * support, and new extension to the architecture.
> + *
> + * Revisit: Implement as a whitelist rather than a blacklist?
I certainly think we want this to be a whitelist; blacklists are awful
for both forwards-compatibility and backporting.
I realise that's pain up-front, but I think it saves us much much more
in the long run.
Thanks,
Mark.
> + */
> +void access_nested_id_reg(struct kvm_vcpu *v, struct sys_reg_params *p,
> + const struct sys_reg_desc *r)
> +{
> + u32 id = sys_reg((u32)r->Op0, (u32)r->Op1,
> + (u32)r->CRn, (u32)r->CRm, (u32)r->Op2);
> + u64 val, tmp;
> +
> + if (!nested_virt_in_use(v))
> + return;
> +
> + val = p->regval;
> +
> + switch (id) {
> + case SYS_ID_AA64DFR0_EL1:
> + /* No SPE */
> + val &= ~FEATURE(ID_AA64DFR0_PMSVER);
> + /* Cap PMU to ARMv8.1 */
> + tmp = FIELD_GET(FEATURE(ID_AA64DFR0_PMUVER), val);
> + if (tmp > 0b0100) {
> + val &= FEATURE(ID_AA64DFR0_PMUVER);
> + val |= FIELD_PREP(FEATURE(ID_AA64DFR0_PMUVER), 0b0100);
> + }
> + /* No trace */
> + val &= FEATURE(ID_AA64DFR0_TRACEVER);
> + /* Cap Debug to ARMv8.1 */
> + tmp = FIELD_GET(FEATURE(ID_AA64DFR0_DEBUGVER), val);
> + if (tmp > 0b0111) {
> + val &= FEATURE(ID_AA64DFR0_DEBUGVER);
> + val |= FIELD_PREP(FEATURE(ID_AA64DFR0_DEBUGVER),
> 0b0111);
> + }
> + break;
> +
> + case SYS_ID_AA64ISAR1_EL1:
> + /* No PtrAuth */
> + val &= ~(FEATURE(ID_AA64ISAR1_APA) |
> + FEATURE(ID_AA64ISAR1_API) |
> + FEATURE(ID_AA64ISAR1_GPA) |
> + FEATURE(ID_AA64ISAR1_GPI));
> + break;
> +
> + case SYS_ID_AA64MMFR0_EL1:
> + /* Cap PARange to 40bits */
> + tmp = FIELD_GET(FEATURE(ID_AA64MMFR0_PARANGE), val);
> + if (tmp > 0b0010) {
> + val &= ~FEATURE(ID_AA64MMFR0_PARANGE);
> + val |= FIELD_PREP(FEATURE(ID_AA64MMFR0_PARANGE),
> 0b0010);
> + }
> + break;
> +
> + case SYS_ID_AA64MMFR1_EL1:
> + /* No XNX */
> + val &= ~FEATURE(ID_AA64MMFR1_XNX);
> + /* No RAS */
> + val &= ~FEATURE(ID_AA64MMFR1_SpecSEI);
> + /* No Hierarchical Permission Disable */
> + val &= ~FEATURE(ID_AA64MMFR1_HPD);
> + /* No Hardward Access flags and Dirty Bit State update */
> + val &= ~FEATURE(ID_AA64MMFR1_HADBS);
> + break;
> +
> + case SYS_ID_AA64MMFR2_EL1:
> + /* No ARMv8.2-EVT */
> + val &= ~FEATURE(ID_AA64MMFR2_EVT);
> + /* No ARMv8.4-TTRem */
> + val &= ~FEATURE(ID_AA64MMFR2_BBM);
> + /* No ARMv8.4-TTST */
> + val &= ~FEATURE(ID_AA64MMFR2_ST);
> + /* No ARMv8.3-CCIDX */
> + val &= ~FEATURE(ID_AA64MMFR2_CCIDX);
> + /* No ARMv8.2-LVA */
> + val &= ~FEATURE(ID_AA64MMFR2_LVA);
> + break;
> +
> + case SYS_ID_AA64PFR0_EL1:
> + /* No AMU */
> + val &= ~FEATURE(ID_AA64PFR0_AMU);
> + /* No MPAM */
> + val &= ~FEATURE(ID_AA64PFR0_MPAM);
> + /* No Secure EL2 */
> + val &= ~FEATURE(ID_AA64PFR0_SEL2);
> + /* No RAS */
> + val &= ~FEATURE(ID_AA64PFR0_RAS);
> + /* No SVE */
> + val &= ~FEATURE(ID_AA64PFR0_SVE);
> + /* EL2 is AArch64 only */
> + val &= ~FEATURE(ID_AA64PFR0_EL2);
> + val |= FIELD_PREP(FEATURE(ID_AA64PFR0_EL2), 0b0001);
> + break;
> +
> + case SYS_ID_AA64PFR1_EL1:
> + /* No MTE */
> + val &= ~FEATURE(ID_AA64PFR1_MTE);
> + /* No BT */
> + val &= ~FEATURE(ID_AA64PFR1_BT);
> + break;
> + }
> +
> + p->regval = val;
> +}
> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
> index 435340a49634..966eb31a84e6 100644
> --- a/arch/arm64/kvm/sys_regs.c
> +++ b/arch/arm64/kvm/sys_regs.c
> @@ -1414,7 +1414,10 @@ static bool access_id_reg(struct kvm_vcpu *vcpu,
> struct sys_reg_params *p,
> const struct sys_reg_desc *r)
> {
> - return __access_id_reg(vcpu, p, r, false);
> + bool ret = __access_id_reg(vcpu, p, r, false);
> +
> + access_nested_id_reg(vcpu, p, r);
> + return ret;
> }
>
> static bool access_raz_id_reg(struct kvm_vcpu *vcpu,
> --
> 2.20.1
>
> _______________________________________________
> kvmarm mailing list
> [email protected]
> https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
