Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp832448pxb; Tue, 3 Nov 2020 13:51:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzL//DK1UxnEtrmmoRnFhbgxLqLwizIy2SFqZHOqPM7TryDbA/pViDAq5LE+dvYgERT+oRb X-Received: by 2002:a05:6402:1750:: with SMTP id v16mr22207356edx.241.1604440261143; Tue, 03 Nov 2020 13:51:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604440261; cv=none; d=google.com; s=arc-20160816; b=07/3oWPQftyYzlhYFlstJr/VjOnSaxAMNBTmdT1SIvXeJcISdm0rmjbhnR1LGRxd2U tlxreZJXY3PfjCdZDG5WVXl8b4XXqnkTO0Au0sA+9hRmBuoKmfulOdw3njRO/3rU20Lz TBSs1Rg6GmmRPim/PDpAgImjzUZr6sX7YZPnZIVGVGwIrg0SxCKqFQorpafpxwKfvK43 FkP9um1YK01j4p/FPWlfOW3IRb/OaVmMQG/MqwpPt6d+1a9bJXyh2Lkq9KYx5lpgJ/bl 73qNlmuWBDC/L6IzXneoEca7Fu0lly8A1jp0A51mtZByrCq/2xatvQPl7ZRB4MWAwQPJ 33EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rbF14tG69169zCkwFKWEjaRaGuaKoQIUZZQ0jauN5hA=; b=y4NtgWFN8Q5LWFRrm2e54Vga97WR0m7eBCGPljAi9Kw4KH3KUt0P292K6Y01vdvdAf NuwM32KFKIu+39JurwpVUKSeeY3wZLes84QOv+Ckieg/uawAxqK0yD7OdvCWvaQV018l oeb+qg0kpvjNowz3z+8hwRRdtkk7u2duDEEX8cbptDh0hJ1K41vdn0GuEruVc1vHB9W2 8M0pY+lLlFEJPlAPW5fpUwa05qA8Lw4YxXTGxjdvHqoQbACXHx1eBE9x+y4VyXgV5zmj SNBL9O2lkMBcgfcOK2ee2md6zf1Mg43241TjKvJszLsH/B8OVn52XinQ/sUJ28kh/Q/k 1lSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CI6ppAWo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c11si8978ejd.748.2020.11.03.13.50.38; Tue, 03 Nov 2020 13:51:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CI6ppAWo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732694AbgKCVqO (ORCPT + 99 others); Tue, 3 Nov 2020 16:46:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:48626 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732039AbgKCUwR (ORCPT ); Tue, 3 Nov 2020 15:52:17 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B8EFF2071E; Tue, 3 Nov 2020 20:52:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436736; bh=2q1v40z+OY4TjbHK4lKbE5D1FzgIZhELt5pKXY7sr70=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CI6ppAWoMnAsfw9fCEIQBiF1aXg/3iK0EL1KwxDX25hiKePLiCPdy0NvGiL9H1OIX 4jcDXUY+Qa+Tc9+5/0dzo8hB/a4K2p7e+mAEmiiTbIZGuN2G4GDWtG8cCPIQWy/RH0 taLQaC1dugtM4zmDNniVINc6cfUFCnZJtZBCeKpE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marc Zyngier Subject: [PATCH 5.9 379/391] KVM: arm64: Fix AArch32 handling of DBGD{CCINT,SCRext} and DBGVCR Date: Tue, 3 Nov 2020 21:37:10 +0100 Message-Id: <20201103203412.739474378@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marc Zyngier commit 4a1c2c7f63c52ccb11770b5ae25920a6b79d3548 upstream. The DBGD{CCINT,SCRext} and DBGVCR register entries in the cp14 array are missing their target register, resulting in all accesses being targetted at the guard sysreg (indexed by __INVALID_SYSREG__). Point the emulation code at the actual register entries. Fixes: bdfb4b389c8d ("arm64: KVM: add trap handlers for AArch32 debug registers") Signed-off-by: Marc Zyngier Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20201029172409.2768336-1-maz@kernel.org Signed-off-by: Greg Kroah-Hartman --- arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/sys_regs.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -231,6 +231,7 @@ enum vcpu_sysreg { #define cp14_DBGWCR0 (DBGWCR0_EL1 * 2) #define cp14_DBGWVR0 (DBGWVR0_EL1 * 2) #define cp14_DBGDCCINT (MDCCINT_EL1 * 2) +#define cp14_DBGVCR (DBGVCR32_EL2 * 2) #define NR_COPRO_REGS (NR_SYS_REGS * 2) --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1881,9 +1881,9 @@ static const struct sys_reg_desc cp14_re { Op1( 0), CRn( 0), CRm( 1), Op2( 0), trap_raz_wi }, DBG_BCR_BVR_WCR_WVR(1), /* DBGDCCINT */ - { Op1( 0), CRn( 0), CRm( 2), Op2( 0), trap_debug32 }, + { Op1( 0), CRn( 0), CRm( 2), Op2( 0), trap_debug32, NULL, cp14_DBGDCCINT }, /* DBGDSCRext */ - { Op1( 0), CRn( 0), CRm( 2), Op2( 2), trap_debug32 }, + { Op1( 0), CRn( 0), CRm( 2), Op2( 2), trap_debug32, NULL, cp14_DBGDSCRext }, DBG_BCR_BVR_WCR_WVR(2), /* DBGDTR[RT]Xint */ { Op1( 0), CRn( 0), CRm( 3), Op2( 0), trap_raz_wi }, @@ -1898,7 +1898,7 @@ static const struct sys_reg_desc cp14_re { Op1( 0), CRn( 0), CRm( 6), Op2( 2), trap_raz_wi }, DBG_BCR_BVR_WCR_WVR(6), /* DBGVCR */ - { Op1( 0), CRn( 0), CRm( 7), Op2( 0), trap_debug32 }, + { Op1( 0), CRn( 0), CRm( 7), Op2( 0), trap_debug32, NULL, cp14_DBGVCR }, DBG_BCR_BVR_WCR_WVR(7), DBG_BCR_BVR_WCR_WVR(8), DBG_BCR_BVR_WCR_WVR(9),