From: Zhichao Huang <zhichao.huang@linaro.org> To: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com, alex.bennee@linaro.org, will.deacon@arm.com Cc: huangzhichao@huawei.com, Zhichao Huang <zhichao.huang@linaro.org> Subject: [PATCH v3 07/11] KVM: arm: add trap handlers for 64-bit debug registers Date: Mon, 22 Jun 2015 18:41:30 +0800 [thread overview] Message-ID: <1434969694-7432-8-git-send-email-zhichao.huang@linaro.org> (raw) In-Reply-To: <1434969694-7432-1-git-send-email-zhichao.huang@linaro.org> Add handlers for all the 64-bit debug registers. There is an overlap between 32 and 64bit registers. Make sure that 64-bit registers preceding 32-bit ones. Signed-off-by: Zhichao Huang <zhichao.huang@linaro.org> --- arch/arm/kvm/coproc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c index 59b65b7..eeee648 100644 --- a/arch/arm/kvm/coproc.c +++ b/arch/arm/kvm/coproc.c @@ -435,9 +435,17 @@ static const struct coproc_reg cp15_regs[] = { { CRn( 1), CRm((n)), Op1( 0), Op2( 1), is32, trap_raz_wi } /* + * Architected CP14 registers. + * * Trapped cp14 registers. We generally ignore most of the external * debug, on the principle that they don't really make sense to a * guest. Revisit this one day, whould this principle change. + * + * CRn denotes the primary register number, but is copied to the CRm in the + * user space API for 64-bit register access in line with the terminology used + * in the ARM ARM. + * Important: Must be sorted ascending by CRn, CRM, Op1, Op2 and with 64-bit + * registers preceding 32-bit ones. */ static const struct coproc_reg cp14_regs[] = { /* DBGIDR */ @@ -445,10 +453,14 @@ static const struct coproc_reg cp14_regs[] = { /* DBGDTRRXext */ { CRn( 0), CRm( 0), Op1( 0), Op2( 2), is32, trap_raz_wi }, DBG_BCR_BVR_WCR_WVR(0), + /* DBGDRAR (64bit) */ + { CRn( 0), CRm( 1), Op1( 0), Op2( 0), is64, trap_raz_wi}, /* DBGDSCRint */ { CRn( 0), CRm( 1), Op1( 0), Op2( 0), is32, trap_dbgdscr, NULL, cp14_DBGDSCRext }, DBG_BCR_BVR_WCR_WVR(1), + /* DBGDSAR (64bit) */ + { CRn( 0), CRm( 2), Op1( 0), Op2( 0), is64, trap_raz_wi}, /* DBGDSCRext */ { CRn( 0), CRm( 2), Op1( 0), Op2( 2), is32, trap_debug32, reset_val, cp14_DBGDSCRext, 0 }, -- 1.7.12.4
WARNING: multiple messages have this Message-ID (diff)
From: zhichao.huang@linaro.org (Zhichao Huang) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 07/11] KVM: arm: add trap handlers for 64-bit debug registers Date: Mon, 22 Jun 2015 18:41:30 +0800 [thread overview] Message-ID: <1434969694-7432-8-git-send-email-zhichao.huang@linaro.org> (raw) In-Reply-To: <1434969694-7432-1-git-send-email-zhichao.huang@linaro.org> Add handlers for all the 64-bit debug registers. There is an overlap between 32 and 64bit registers. Make sure that 64-bit registers preceding 32-bit ones. Signed-off-by: Zhichao Huang <zhichao.huang@linaro.org> --- arch/arm/kvm/coproc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c index 59b65b7..eeee648 100644 --- a/arch/arm/kvm/coproc.c +++ b/arch/arm/kvm/coproc.c @@ -435,9 +435,17 @@ static const struct coproc_reg cp15_regs[] = { { CRn( 1), CRm((n)), Op1( 0), Op2( 1), is32, trap_raz_wi } /* + * Architected CP14 registers. + * * Trapped cp14 registers. We generally ignore most of the external * debug, on the principle that they don't really make sense to a * guest. Revisit this one day, whould this principle change. + * + * CRn denotes the primary register number, but is copied to the CRm in the + * user space API for 64-bit register access in line with the terminology used + * in the ARM ARM. + * Important: Must be sorted ascending by CRn, CRM, Op1, Op2 and with 64-bit + * registers preceding 32-bit ones. */ static const struct coproc_reg cp14_regs[] = { /* DBGIDR */ @@ -445,10 +453,14 @@ static const struct coproc_reg cp14_regs[] = { /* DBGDTRRXext */ { CRn( 0), CRm( 0), Op1( 0), Op2( 2), is32, trap_raz_wi }, DBG_BCR_BVR_WCR_WVR(0), + /* DBGDRAR (64bit) */ + { CRn( 0), CRm( 1), Op1( 0), Op2( 0), is64, trap_raz_wi}, /* DBGDSCRint */ { CRn( 0), CRm( 1), Op1( 0), Op2( 0), is32, trap_dbgdscr, NULL, cp14_DBGDSCRext }, DBG_BCR_BVR_WCR_WVR(1), + /* DBGDSAR (64bit) */ + { CRn( 0), CRm( 2), Op1( 0), Op2( 0), is64, trap_raz_wi}, /* DBGDSCRext */ { CRn( 0), CRm( 2), Op1( 0), Op2( 2), is32, trap_debug32, reset_val, cp14_DBGDSCRext, 0 }, -- 1.7.12.4
next prev parent reply other threads:[~2015-06-22 10:41 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-06-22 10:41 [PATCH v3 00/11] KVM: arm: debug infrastructure support Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-22 10:41 ` [PATCH v3 01/11] KVM: arm: plug guest debug exploit Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-29 15:49 ` Christoffer Dall 2015-06-29 15:49 ` Christoffer Dall 2015-07-01 7:04 ` zichao 2015-07-01 7:04 ` zichao 2015-07-01 9:00 ` Christoffer Dall 2015-07-01 9:00 ` Christoffer Dall 2015-07-01 9:00 ` Christoffer Dall 2015-06-22 10:41 ` [PATCH v3 02/11] KVM: arm: rename pm_fake handler to trap_raz_wi Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-30 13:20 ` Christoffer Dall 2015-06-30 13:20 ` Christoffer Dall 2015-06-22 10:41 ` [PATCH v3 03/11] KVM: arm: enable to use the ARM_DSCR_MDBGEN macro from KVM assembly code Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-30 13:20 ` Christoffer Dall 2015-06-30 13:20 ` Christoffer Dall 2015-06-22 10:41 ` [PATCH v3 04/11] KVM: arm: common infrastructure for handling AArch32 CP14/CP15 Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-29 19:43 ` Christoffer Dall 2015-06-29 19:43 ` Christoffer Dall 2015-07-01 7:09 ` zichao 2015-07-01 7:09 ` zichao 2015-07-01 9:00 ` Christoffer Dall 2015-07-01 9:00 ` Christoffer Dall 2015-06-22 10:41 ` [PATCH v3 05/11] KVM: arm: check ordering of all system register tables Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-30 13:20 ` Christoffer Dall 2015-06-30 13:20 ` Christoffer Dall 2015-06-22 10:41 ` [PATCH v3 06/11] KVM: arm: add trap handlers for 32-bit debug registers Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-29 21:16 ` Christoffer Dall 2015-06-29 21:16 ` Christoffer Dall 2015-07-01 7:14 ` zichao 2015-07-01 7:14 ` zichao 2015-06-22 10:41 ` Zhichao Huang [this message] 2015-06-22 10:41 ` [PATCH v3 07/11] KVM: arm: add trap handlers for 64-bit " Zhichao Huang 2015-06-30 13:20 ` Christoffer Dall 2015-06-30 13:20 ` Christoffer Dall 2015-07-01 7:43 ` Zhichao Huang 2015-07-01 7:43 ` Zhichao Huang 2015-06-22 10:41 ` [PATCH v3 08/11] KVM: arm: implement dirty bit mechanism for " Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-30 9:20 ` Christoffer Dall 2015-06-30 9:20 ` Christoffer Dall 2015-07-03 9:54 ` Zhichao Huang 2015-07-03 9:54 ` Zhichao Huang 2015-07-03 11:56 ` Christoffer Dall 2015-07-03 11:56 ` Christoffer Dall 2015-07-07 10:06 ` Zhichao Huang 2015-07-07 10:06 ` Zhichao Huang 2015-07-07 10:24 ` Will Deacon 2015-07-07 10:24 ` Will Deacon 2015-07-08 10:50 ` Zhichao Huang 2015-07-08 10:50 ` Zhichao Huang 2015-07-08 17:08 ` Will Deacon 2015-07-08 17:08 ` Will Deacon 2015-07-09 12:54 ` Zhichao Huang 2015-07-09 12:54 ` Zhichao Huang 2015-07-09 11:50 ` Christoffer Dall 2015-07-09 11:50 ` Christoffer Dall 2015-07-13 12:12 ` zichao 2015-07-13 12:12 ` zichao 2015-06-22 10:41 ` [PATCH v3 09/11] KVM: arm: implement lazy world switch " Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-30 13:15 ` Christoffer Dall 2015-06-30 13:15 ` Christoffer Dall 2015-07-03 10:06 ` Zhichao Huang 2015-07-03 10:06 ` Zhichao Huang 2015-07-03 21:05 ` Christoffer Dall 2015-07-03 21:05 ` Christoffer Dall 2015-06-22 10:41 ` [PATCH v3 10/11] KVM: arm: add a trace event for cp14 traps Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-30 13:20 ` Christoffer Dall 2015-06-30 13:20 ` Christoffer Dall 2015-06-22 10:41 ` [PATCH v3 11/11] KVM: arm: enable trapping of all debug registers Zhichao Huang 2015-06-22 10:41 ` Zhichao Huang 2015-06-30 13:19 ` Christoffer Dall 2015-06-30 13:19 ` Christoffer Dall
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1434969694-7432-8-git-send-email-zhichao.huang@linaro.org \ --to=zhichao.huang@linaro.org \ --cc=alex.bennee@linaro.org \ --cc=christoffer.dall@linaro.org \ --cc=huangzhichao@huawei.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.