From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2E99E7C4E2 for ; Wed, 4 Oct 2023 17:46:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233386AbjJDRqW (ORCPT ); Wed, 4 Oct 2023 13:46:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233941AbjJDRqV (ORCPT ); Wed, 4 Oct 2023 13:46:21 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4404D9E for ; Wed, 4 Oct 2023 10:46:18 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D68ECC433C7; Wed, 4 Oct 2023 17:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696441577; bh=S513Ne6NcQHwCGIuqmrMSD1LeBkTcaYaXLRBEA41udo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=fY//19IGB4yMG+SxppmX23Ftz7Sa1x5Oz+pXf6lM5MiGj3t6y/0KJQsMkGHeeFium jgq72WsAgLgg10tndQmDfI/sfU9ow5NjX7JrWZAIZA8/cZJ3DS6kJm1i+GNawRc/n9 FIY2tFCzTkIhOmB48FVdPhwGVFYnoIbquiIkdsktYwnEBFE48324feeNhjMGZGSO1u 8UdadUhLH/OYZoXEEzmbbMAPphIFIoCyF4aAqmZ23NxLiH78xmGaZPFSlf4NO0oZtN AvQ1F0x/oRgO/9RADS0QA/mTVx3ieTyGcWCOW1G1yROHGiZcWZ1uYVvHoXUpsl4ilG GFukdxrcO0eeA== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qo5wt-0019H3-Ao; Wed, 04 Oct 2023 18:46:15 +0100 Date: Wed, 04 Oct 2023 18:46:14 +0100 Message-ID: <86bkdenuvt.wl-maz@kernel.org> From: Marc Zyngier To: Oliver Upton Cc: kvmarm@lists.linux.dev, kvm@vger.kernel.org, James Morse , Suzuki K Poulose , Zenghui Yu , Jing Zhang , Cornelia Huck Subject: Re: [PATCH v11 05/12] KVM: arm64: Bump up the default KVM sanitised debug version to v8p8 In-Reply-To: References: <20231003230408.3405722-1-oliver.upton@linux.dev> <20231003230408.3405722-6-oliver.upton@linux.dev> <86pm1uojcn.wl-maz@kernel.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: oliver.upton@linux.dev, kvmarm@lists.linux.dev, kvm@vger.kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, jingzhangos@google.com, cohuck@redhat.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Wed, 04 Oct 2023 18:08:33 +0100, Oliver Upton wrote: > > On Wed, Oct 04, 2023 at 09:57:44AM +0100, Marc Zyngier wrote: > > On Wed, 04 Oct 2023 00:04:01 +0100, > > Oliver Upton 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 > > > Signed-off-by: Oliver Upton > > > > 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). > > This is an artifact of me applying Jing's version of the series and > hacking on top of it. > > > > --- > > > 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. > > Ah, good point. I'll extract the value from the ID register much like we > do for other fields in DBGDIDR: > > commit b92565ca433f611ea0901a6098d72f91be84cdb0 > Author: Oliver Upton > Date: Wed Oct 4 17:03:17 2023 +0000 > > KVM: arm64: Advertise selected DebugVer in DBGDIDR.Version > > Much like we do for other fields, extract the Debug architecture version > from the ID register to populate the corresponding field in DBGDIDR. > Rewrite the existing sysreg field extractors to use SYS_FIELD_GET() for > consistency. > > Suggested-by: Marc Zyngier > Signed-off-by: Oliver Upton Reviewed-by: Marc Zyngier M. -- Without deviation from the norm, progress is not possible.