From nobody Sat Oct 11 08:18:38 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8C9392DC1F0; Wed, 11 Jun 2025 10:51:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749639074; cv=none; b=srs0VzGg+9quRokDbTuDwZXClRRgkahUVY01lSomYGF+7dZLjEFpBFpJpjHItbsYYGg185vvAuQ9PNKq/qPInSF9/PewEZKxhAax1aeXaIiyTj8z/fGhWMGlc4VVUcC5EEE2QmW3659kIxDUc90DGGngAuhlBaGD1Qdt+4R5784= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749639074; c=relaxed/simple; bh=CRL4U/FKCLBK/ZgTIdt2mRtwylA//iVokskuz6vPV9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ELWgYmgdCR2j2tRudGsuIBrF2gqeIxUlCCCHQM9nAHEvM2jna3EV0UxatrT8vZpjSnNyB/yU7Z6kLhYQWq0nFRoOsoX1aQ2TGUG3qxE+2cfctbZUbUgH+aixPCQ45DZsCf2mstNmEL8DiyEJYphsRTvxUSvGV64xGQyjB5thihw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 96C572A31; Wed, 11 Jun 2025 03:50:52 -0700 (PDT) Received: from e122027.arm.com (unknown [10.57.67.107]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C9FB93F673; Wed, 11 Jun 2025 03:51:07 -0700 (PDT) From: Steven Price To: kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: Jean-Philippe Brucker , Catalin Marinas , Marc Zyngier , Will Deacon , James Morse , Oliver Upton , Suzuki K Poulose , Zenghui Yu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Joey Gouly , Alexandru Elisei , Christoffer Dall , Fuad Tabba , linux-coco@lists.linux.dev, Ganapatrao Kulkarni , Gavin Shan , Shanker Donthineni , Alper Gun , "Aneesh Kumar K . V" , Emi Kisanuki , Steven Price Subject: [PATCH v9 35/43] arm64: RME: Set breakpoint parameters through SET_ONE_REG Date: Wed, 11 Jun 2025 11:48:32 +0100 Message-ID: <20250611104844.245235-36-steven.price@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250611104844.245235-1-steven.price@arm.com> References: <20250611104844.245235-1-steven.price@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jean-Philippe Brucker Allow userspace to configure the number of breakpoints and watchpoints of a Realm VM through KVM_SET_ONE_REG ID_AA64DFR0_EL1. The KVM sys_reg handler checks the user value against the maximum value given by RMM (arm64_check_features() gets it from the read_sanitised_id_aa64dfr0_el1() reset handler). Userspace discovers that it can write these fields by issuing a KVM_ARM_GET_REG_WRITABLE_MASKS ioctl. Signed-off-by: Jean-Philippe Brucker Signed-off-by: Steven Price Reviewed-by: Gavin Shan Reviewed-by: Suzuki K Poulose --- arch/arm64/kvm/guest.c | 2 ++ arch/arm64/kvm/rme.c | 3 +++ arch/arm64/kvm/sys_regs.c | 17 +++++++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index f151b9ce31c0..338c527021d2 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -803,6 +803,7 @@ int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct= kvm_one_reg *reg) } =20 #define KVM_REG_ARM_PMCR_EL0 ARM64_SYS_REG(3, 3, 9, 12, 0) +#define KVM_REG_ARM_ID_AA64DFR0_EL1 ARM64_SYS_REG(3, 0, 0, 5, 0) =20 /* * The RMI ABI only enables setting some GPRs and PC. The selection of GPRs @@ -821,6 +822,7 @@ static bool validate_realm_set_reg(struct kvm_vcpu *vcp= u, } else { switch (reg->id) { case KVM_REG_ARM_PMCR_EL0: + case KVM_REG_ARM_ID_AA64DFR0_EL1: return true; } } diff --git a/arch/arm64/kvm/rme.c b/arch/arm64/kvm/rme.c index ce8e48ab8753..bf814f45a387 100644 --- a/arch/arm64/kvm/rme.c +++ b/arch/arm64/kvm/rme.c @@ -586,6 +586,7 @@ static int realm_create_rd(struct kvm *kvm) void *rd =3D NULL; phys_addr_t rd_phys, params_phys; size_t pgd_size =3D kvm_pgtable_stage2_pgd_size(kvm->arch.mmu.vtcr); + u64 dfr0 =3D kvm_read_vm_id_reg(kvm, SYS_ID_AA64DFR0_EL1); int i, r; int rtt_num_start; =20 @@ -622,6 +623,8 @@ static int realm_create_rd(struct kvm *kvm) params->rtt_num_start =3D rtt_num_start; params->rtt_base =3D kvm->arch.mmu.pgd_phys; params->vmid =3D realm->vmid; + params->num_bps =3D SYS_FIELD_GET(ID_AA64DFR0_EL1, BRPs, dfr0); + params->num_wps =3D SYS_FIELD_GET(ID_AA64DFR0_EL1, WRPs, dfr0); =20 if (kvm->arch.arm_pmu) { params->pmu_num_ctrs =3D kvm->arch.nr_pmu_counters; diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index b974eddfad53..ffe6b58d5c04 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1856,6 +1856,9 @@ static int set_id_aa64dfr0_el1(struct kvm_vcpu *vcpu, { u8 debugver =3D SYS_FIELD_GET(ID_AA64DFR0_EL1, DebugVer, val); u8 pmuver =3D SYS_FIELD_GET(ID_AA64DFR0_EL1, PMUVer, val); + u8 bps =3D SYS_FIELD_GET(ID_AA64DFR0_EL1, BRPs, val); + u8 wps =3D SYS_FIELD_GET(ID_AA64DFR0_EL1, WRPs, val); + u8 ctx_cmps =3D SYS_FIELD_GET(ID_AA64DFR0_EL1, CTX_CMPs, val); =20 /* * Prior to commit 3d0dba5764b9 ("KVM: arm64: PMU: Move the @@ -1875,10 +1878,11 @@ static int set_id_aa64dfr0_el1(struct kvm_vcpu *vcp= u, val &=3D ~ID_AA64DFR0_EL1_PMUVer_MASK; =20 /* - * ID_AA64DFR0_EL1.DebugVer is one of those awkward fields with a - * nonzero minimum safe value. + * ID_AA64DFR0_EL1.DebugVer, BRPs and WRPs all have to be greater than + * zero. CTX_CMPs is never greater than BRPs. */ - if (debugver < ID_AA64DFR0_EL1_DebugVer_IMP) + if (debugver < ID_AA64DFR0_EL1_DebugVer_IMP || !bps || !wps || + ctx_cmps > bps) return -EINVAL; =20 return set_id_reg(vcpu, rd, val); @@ -2087,10 +2091,11 @@ static int set_id_reg(struct kvm_vcpu *vcpu, const = struct sys_reg_desc *rd, mutex_lock(&vcpu->kvm->arch.config_lock); =20 /* - * Once the VM has started the ID registers are immutable. Reject any - * write that does not match the final register value. + * Once the VM has started or the Realm descriptor is created, the ID + * registers are immutable. Reject any write that does not match the + * final register value. */ - if (kvm_vm_has_ran_once(vcpu->kvm)) { + if (kvm_vm_has_ran_once(vcpu->kvm) || kvm_realm_is_created(vcpu->kvm)) { if (val !=3D read_id_reg(vcpu, rd)) ret =3D -EBUSY; else --=20 2.43.0