On Wed, 04 Oct 2023 00:04:01 +0100,
Oliver Upton <oliver.upton@xxxxxxxxx> wrote:
>
> 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.
>
> Signed-off-by: Jing Zhang <jingzhangos@xxxxxxxxxx>
> Signed-off-by: Oliver Upton <oliver.upton@xxxxxxxxx>
The SoB sequence looks odd. Either you're the author, and Jing's SoB
shouldn't be there without a Co-DB tag, or you've lost Jing's
attribution (which sometimes happens when rebasing and squashing
patches together).
> ---
> arch/arm64/kvm/sys_regs.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
> index 8fbfe61fe7bc..b342c96e08f4 100644
> --- a/arch/arm64/kvm/sys_regs.c
> +++ b/arch/arm64/kvm/sys_regs.c
> @@ -1496,8 +1496,7 @@ static u64 read_sanitised_id_aa64dfr0_el1(struct kvm_vcpu *vcpu,
> {
> u64 val = read_sanitised_ftr_reg(SYS_ID_AA64DFR0_EL1);
>
> - /* Limit debug to ARMv8.0 */
> - val = ID_REG_LIMIT_FIELD_ENUM(val, ID_AA64DFR0_EL1, DebugVer, IMP);
> + val = ID_REG_LIMIT_FIELD_ENUM(val, ID_AA64DFR0_EL1, DebugVer, V8P8);
>
> /*
> * 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,
> if (kvm_vcpu_has_pmu(vcpu))
> val |= SYS_FIELD_PREP(ID_DFR0_EL1, PerfMon, perfmon);
>
> + val = ID_REG_LIMIT_FIELD_ENUM(val, ID_DFR0_EL1, CopDbg, Debugv8p8);
> +
For consistency, you should also repaint DBGDIDR, which has a
hardcoded '6' (ARMv8) as the supported debug version.
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
