From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC30952F27F; Wed, 30 Sep 2026 18:42:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790793762; cv=none; b=lKub5HI4iYEEB6tyDH58bgKQYQ56uvgd6bPEV90ZDEwlP2KIkgxjIv9EJNRzvzYJHoX+q2e6e+Mr1KNcGAtzCoAqbIMOeqAW42bMnmdqTrR0EGmNmMiEr2XPhksPHZXSIq0pz0kpyVjpBwkpHC4xYoXPHOV3pmMFhiOfbKCLMtQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790793762; c=relaxed/simple; bh=rtcYbWK/Z/Q8+Y5dtzMfq9UvCwN89WcoYC1nkDKno2A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aM0xJADOyKMvBAxvFFIW7qbbmC2ailFFKhFDCp4zgszHkET7ifSt9VvqWxnlNN+IJMyUhIXUkptsqzrylM7jIRoInmbGzxqZNIH2XM5QDbNry4iccvLKEI1A+INlsCSfcirI4bx+CohdsySx/+cNlqm7RxX9KGQ3CXAvk3tCAWY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lN21bqyv; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lN21bqyv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31B5C1F000FF; Wed, 30 Sep 2026 18:42:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790793761; bh=tG4Bnfgvu4pp5ckj/oZgC7BUo+3EjEaOswzF+ldbKaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lN21bqyvQ8qk+3K0h5pxihoaQGfV4XGrqm4eS98N10ZCRz4qmZUrGWrmSjC4C5BNH bj0OXZPQ1vcR+BdyLVehJ7MITzkGoX9edusYrHmWvMfJ4+7R9TcjQzuBH6qv9Hu6ZS Fr8oeiqU82a6x3N7JaeLf49I4UZIAWgJhB8igTWo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Karl Mehltretter , Marc Zyngier , Oliver Upton Subject: [PATCH 6.18 314/395] KVM: arm64: Fix AArch32 DBGBXVR handling Date: Wed, 30 Sep 2026 17:29:36 +0200 Message-ID: <20260930152347.468865849@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152340.591469096@linuxfoundation.org> References: <20260930152340.591469096@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Karl Mehltretter commit 6b1bca1b1ab77f60a62087337bfe6e2f0efb9e6d upstream. The consolidation of the breakpoint and watchpoint register accessors switched DBGBXVR from trap_bvr() to trap_dbg_wb_reg(). The latter selects backing storage with demux_wb_reg(), which only handles Op2 values 4 through 7. Since DBGBXVR uses Op2 1, an AArch32 guest access hits KVM_BUG_ON() and marks the VM dead. DBGBXVR aliases DBGBVR_EL1[63:32], and its AA32(HI) descriptor already selects the upper half. Map Op2 1 to dbg_bvr[] alongside Op2 4, restoring the pre-regression behavior. Fixes: 3ce9f3357e9e ("KVM: arm64: Fold DBGxVR/DBGxCR accessors into common set") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-5 Signed-off-by: Karl Mehltretter Reviewed-by: Marc Zyngier Link: https://patch.msgid.link/20260810005616.13227-1-kmehltretter@gmail.com Signed-off-by: Oliver Upton Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kvm/sys_regs.c | 1 + 1 file changed, 1 insertion(+) --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -792,6 +792,7 @@ static u64 *demux_wb_reg(struct kvm_vcpu struct kvm_guest_debug_arch *dbg = &vcpu->arch.vcpu_debug_state; switch (rd->Op2) { + case 0b001: case 0b100: return &dbg->dbg_bvr[rd->CRm]; case 0b101: