Skip to content

Commit 9f9917b

Browse files
committed
KVM: arm64: Bump up the default KVM sanitised debug version to v8p8
Since ID_AA64DFR0_EL1 and ID_DFR0_EL1 are now writable from userspace, it is safe to bump up the default KVM sanitised debug version to v8p8. Reviewed-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Oliver Upton <[email protected]>
1 parent a9bc4a1 commit 9f9917b

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

arch/arm64/kvm/sys_regs.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1496,8 +1496,7 @@ static u64 read_sanitised_id_aa64dfr0_el1(struct kvm_vcpu *vcpu,
14961496
{
14971497
u64 val = read_sanitised_ftr_reg(SYS_ID_AA64DFR0_EL1);
14981498

1499-
/* Limit debug to ARMv8.0 */
1500-
val = ID_REG_LIMIT_FIELD_ENUM(val, ID_AA64DFR0_EL1, DebugVer, IMP);
1499+
val = ID_REG_LIMIT_FIELD_ENUM(val, ID_AA64DFR0_EL1, DebugVer, V8P8);
15011500

15021501
/*
15031502
* Only initialize the PMU version if the vCPU was configured with one.
@@ -1557,6 +1556,8 @@ static u64 read_sanitised_id_dfr0_el1(struct kvm_vcpu *vcpu,
15571556
if (kvm_vcpu_has_pmu(vcpu))
15581557
val |= SYS_FIELD_PREP(ID_DFR0_EL1, PerfMon, perfmon);
15591558

1559+
val = ID_REG_LIMIT_FIELD_ENUM(val, ID_DFR0_EL1, CopDbg, Debugv8p8);
1560+
15601561
return val;
15611562
}
15621563

@@ -2013,7 +2014,8 @@ static const struct sys_reg_desc sys_reg_descs[] = {
20132014
.set_user = set_id_dfr0_el1,
20142015
.visibility = aa32_id_visibility,
20152016
.reset = read_sanitised_id_dfr0_el1,
2016-
.val = ID_DFR0_EL1_PerfMon_MASK, },
2017+
.val = ID_DFR0_EL1_PerfMon_MASK |
2018+
ID_DFR0_EL1_CopDbg_MASK, },
20172019
ID_HIDDEN(ID_AFR0_EL1),
20182020
AA32_ID_SANITISED(ID_MMFR0_EL1),
20192021
AA32_ID_SANITISED(ID_MMFR1_EL1),
@@ -2062,7 +2064,8 @@ static const struct sys_reg_desc sys_reg_descs[] = {
20622064
.get_user = get_id_reg,
20632065
.set_user = set_id_aa64dfr0_el1,
20642066
.reset = read_sanitised_id_aa64dfr0_el1,
2065-
.val = ID_AA64DFR0_EL1_PMUVer_MASK, },
2067+
.val = ID_AA64DFR0_EL1_PMUVer_MASK |
2068+
ID_AA64DFR0_EL1_DebugVer_MASK, },
20662069
ID_SANITISED(ID_AA64DFR1_EL1),
20672070
ID_UNALLOCATED(5,2),
20682071
ID_UNALLOCATED(5,3),

0 commit comments

Comments
 (0)