From: Marc Zyngier <marc.zyngier@arm.com> To: "Radim Krčmář" <rkrcmar@redhat.com>, "Paolo Bonzini" <pbonzini@redhat.com> Cc: Christoffer Dall <cdall@linaro.org>, Stefan Traby <stefan@hello-penguin.com>, kvm@vger.kernel.org, David Daney <david.daney@cavium.com>, Catalin Marinas <catalin.marinas@arm.com>, Hu Huajun <huhuajun@huawei.com>, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH 53/58] KVM: arm64: Log an error if trapping a write-to-read-only GICv3 access Date: Fri, 30 Jun 2017 09:45:09 +0100 [thread overview] Message-ID: <20170630084514.6779-54-marc.zyngier@arm.com> (raw) In-Reply-To: <20170630084514.6779-1-marc.zyngier@arm.com> A write-to-read-only GICv3 access should UNDEF at EL1. But since we're in complete paranoia-land with broken CPUs, let's assume the worse and gracefully handle the case. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Christoffer Dall <cdall@linaro.org> Signed-off-by: Christoffer Dall <cdall@linaro.org> --- arch/arm64/kvm/sys_regs.c | 15 +++++++++++++++ virt/kvm/arm/hyp/vgic-v3-sr.c | 6 ++++++ 2 files changed, 21 insertions(+) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 8d51c075966d..77862881ae86 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -65,6 +65,16 @@ static bool read_from_write_only(struct kvm_vcpu *vcpu, return false; } +static bool write_to_read_only(struct kvm_vcpu *vcpu, + struct sys_reg_params *params, + const struct sys_reg_desc *r) +{ + WARN_ONCE(1, "Unexpected sys_reg write to read-only register\n"); + print_sys_reg_instr(params); + kvm_inject_undefined(vcpu); + return false; +} + /* 3 bits per cache level, as per CLIDR, but non-existent caches always 0 */ static u32 cache_levels; @@ -954,10 +964,15 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_VBAR_EL1), NULL, reset_val, VBAR_EL1, 0 }, + { SYS_DESC(SYS_ICC_IAR0_EL1), write_to_read_only }, { SYS_DESC(SYS_ICC_EOIR0_EL1), read_from_write_only }, + { SYS_DESC(SYS_ICC_HPPIR0_EL1), write_to_read_only }, { SYS_DESC(SYS_ICC_DIR_EL1), read_from_write_only }, + { SYS_DESC(SYS_ICC_RPR_EL1), write_to_read_only }, { SYS_DESC(SYS_ICC_SGI1R_EL1), access_gic_sgi }, + { SYS_DESC(SYS_ICC_IAR1_EL1), write_to_read_only }, { SYS_DESC(SYS_ICC_EOIR1_EL1), read_from_write_only }, + { SYS_DESC(SYS_ICC_HPPIR1_EL1), write_to_read_only }, { SYS_DESC(SYS_ICC_SRE_EL1), access_gic_sre }, { SYS_DESC(SYS_CONTEXTIDR_EL1), access_vm_reg, reset_val, CONTEXTIDR_EL1, 0 }, diff --git a/virt/kvm/arm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c index b26ce58b012a..79e3c2d3b754 100644 --- a/virt/kvm/arm/hyp/vgic-v3-sr.c +++ b/virt/kvm/arm/hyp/vgic-v3-sr.c @@ -976,6 +976,8 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) switch (sysreg) { case SYS_ICC_IAR0_EL1: case SYS_ICC_IAR1_EL1: + if (unlikely(!is_read)) + return 0; fn = __vgic_v3_read_iar; break; case SYS_ICC_EOIR0_EL1: @@ -1026,6 +1028,8 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) break; case SYS_ICC_HPPIR0_EL1: case SYS_ICC_HPPIR1_EL1: + if (unlikely(!is_read)) + return 0; fn = __vgic_v3_read_hppir; break; case SYS_ICC_GRPEN0_EL1: @@ -1046,6 +1050,8 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) fn = __vgic_v3_write_dir; break; case SYS_ICC_RPR_EL1: + if (unlikely(!is_read)) + return 0; fn = __vgic_v3_read_rpr; break; case SYS_ICC_CTLR_EL1: -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 53/58] KVM: arm64: Log an error if trapping a write-to-read-only GICv3 access Date: Fri, 30 Jun 2017 09:45:09 +0100 [thread overview] Message-ID: <20170630084514.6779-54-marc.zyngier@arm.com> (raw) In-Reply-To: <20170630084514.6779-1-marc.zyngier@arm.com> A write-to-read-only GICv3 access should UNDEF at EL1. But since we're in complete paranoia-land with broken CPUs, let's assume the worse and gracefully handle the case. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Reviewed-by: Christoffer Dall <cdall@linaro.org> Signed-off-by: Christoffer Dall <cdall@linaro.org> --- arch/arm64/kvm/sys_regs.c | 15 +++++++++++++++ virt/kvm/arm/hyp/vgic-v3-sr.c | 6 ++++++ 2 files changed, 21 insertions(+) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 8d51c075966d..77862881ae86 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -65,6 +65,16 @@ static bool read_from_write_only(struct kvm_vcpu *vcpu, return false; } +static bool write_to_read_only(struct kvm_vcpu *vcpu, + struct sys_reg_params *params, + const struct sys_reg_desc *r) +{ + WARN_ONCE(1, "Unexpected sys_reg write to read-only register\n"); + print_sys_reg_instr(params); + kvm_inject_undefined(vcpu); + return false; +} + /* 3 bits per cache level, as per CLIDR, but non-existent caches always 0 */ static u32 cache_levels; @@ -954,10 +964,15 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_VBAR_EL1), NULL, reset_val, VBAR_EL1, 0 }, + { SYS_DESC(SYS_ICC_IAR0_EL1), write_to_read_only }, { SYS_DESC(SYS_ICC_EOIR0_EL1), read_from_write_only }, + { SYS_DESC(SYS_ICC_HPPIR0_EL1), write_to_read_only }, { SYS_DESC(SYS_ICC_DIR_EL1), read_from_write_only }, + { SYS_DESC(SYS_ICC_RPR_EL1), write_to_read_only }, { SYS_DESC(SYS_ICC_SGI1R_EL1), access_gic_sgi }, + { SYS_DESC(SYS_ICC_IAR1_EL1), write_to_read_only }, { SYS_DESC(SYS_ICC_EOIR1_EL1), read_from_write_only }, + { SYS_DESC(SYS_ICC_HPPIR1_EL1), write_to_read_only }, { SYS_DESC(SYS_ICC_SRE_EL1), access_gic_sre }, { SYS_DESC(SYS_CONTEXTIDR_EL1), access_vm_reg, reset_val, CONTEXTIDR_EL1, 0 }, diff --git a/virt/kvm/arm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c index b26ce58b012a..79e3c2d3b754 100644 --- a/virt/kvm/arm/hyp/vgic-v3-sr.c +++ b/virt/kvm/arm/hyp/vgic-v3-sr.c @@ -976,6 +976,8 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) switch (sysreg) { case SYS_ICC_IAR0_EL1: case SYS_ICC_IAR1_EL1: + if (unlikely(!is_read)) + return 0; fn = __vgic_v3_read_iar; break; case SYS_ICC_EOIR0_EL1: @@ -1026,6 +1028,8 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) break; case SYS_ICC_HPPIR0_EL1: case SYS_ICC_HPPIR1_EL1: + if (unlikely(!is_read)) + return 0; fn = __vgic_v3_read_hppir; break; case SYS_ICC_GRPEN0_EL1: @@ -1046,6 +1050,8 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) fn = __vgic_v3_write_dir; break; case SYS_ICC_RPR_EL1: + if (unlikely(!is_read)) + return 0; fn = __vgic_v3_read_rpr; break; case SYS_ICC_CTLR_EL1: -- 2.11.0
next prev parent reply other threads:[~2017-06-30 8:45 UTC|newest] Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-30 8:44 [GIT PULL] KVM/ARM updates for 4.13 Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 01/58] KVM: arm: Restore banked registers and physical timer access on hyp_panic() Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 02/58] KVM: arm64: Restore host " Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 03/58] KVM: arm/arm64: Allow GICv2 to supply a uaccess register function Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 04/58] KVM: arm/arm64: Separate guest and uaccess writes to dist {sc}active Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 05/58] KVM: arm/arm64: Simplify active_change_prepare and plug race Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 06/58] KVM: arm/arm64: Use uaccess functions for GICv3 {sc}active Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 07/58] KVM: improve arch vcpu request defining Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 08/58] KVM: add kvm_request_pending Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 09/58] KVM: Add documentation for VCPU requests Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 10/58] KVM: arm/arm64: properly use vcpu requests Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 11/58] KVM: arm/arm64: replace pause checks with vcpu request checks Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 12/58] KVM: arm/arm64: use vcpu requests for power_off Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 13/58] KVM: arm/arm64: optimize VCPU RUN Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 14/58] KVM: arm/arm64: change exit request to sleep request Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 15/58] KVM: arm/arm64: use vcpu requests for irq injection Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 16/58] KVM: arm/arm64: PMU: remove request-less vcpu kick Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 17/58] KVM: arm/arm64: timer: " Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 18/58] KVM: arm64: Allow creating the PMU without the in-kernel GIC Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 19/58] KVM: arm: Handle VCPU device attributes in guest.c Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 20/58] KVM: arm/arm64: Move irq_is_ppi() to header file Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 21/58] KVM: arm/arm64: Move timer IRQ default init to arch_timer.c Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 22/58] KVM: arm/arm64: Allow setting the timer IRQ numbers from userspace Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 23/58] KVM: arm/arm64: Introduce an allocator for in-kernel irq lines Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 24/58] KVM: arm/arm64: Check if irq lines to the GIC are already used Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 25/58] KVM: arm/arm64: Disallow userspace control of in-kernel IRQ lines Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 26/58] KVM: arm/arm64: Don't assume initialized vgic when setting PMU IRQ Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 27/58] arm64: Add a facility to turn an ESR syndrome into a sysreg encoding Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 28/58] KVM: arm/arm64: vgic-v3: Add accessors for the ICH_APxRn_EL2 registers Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 29/58] KVM: arm64: Make kvm_condition_valid32() accessible from EL2 Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 30/58] KVM: arm64: vgic-v3: Add hook to handle guest GICv3 sysreg accesses at EL2 Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 31/58] KVM: arm64: vgic-v3: Add ICV_BPR1_EL1 handler Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 32/58] KVM: arm64: vgic-v3: Add ICV_IGRPEN1_EL1 handler Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 33/58] KVM: arm64: vgic-v3: Add ICV_IAR1_EL1 handler Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 34/58] KVM: arm64: vgic-v3: Add ICV_EOIR1_EL1 handler Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 35/58] KVM: arm64: vgic-v3: Add ICV_AP1Rn_EL1 handler Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 36/58] KVM: arm64: vgic-v3: Add ICV_HPPIR1_EL1 handler Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 37/58] KVM: arm64: vgic-v3: Enable trapping of Group-1 system registers Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 38/58] KVM: arm64: Enable GICv3 Group-1 sysreg trapping via command-line Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 39/58] KVM: arm64: vgic-v3: Add ICV_BPR0_EL1 handler Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 40/58] KVM: arm64: vgic-v3: Add ICV_IGNREN0_EL1 handler Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 41/58] KVM: arm64: vgic-v3: Add misc Group-0 handlers Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 42/58] KVM: arm64: vgic-v3: Enable trapping of Group-0 system registers Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:44 ` [PATCH 43/58] KVM: arm64: Enable GICv3 Group-0 sysreg trapping via command-line Marc Zyngier 2017-06-30 8:44 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 44/58] arm64: Add MIDR values for Cavium cn83XX SoCs Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 45/58] arm64: Add workaround for Cavium Thunder erratum 30115 Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 46/58] KVM: arm64: vgic-v3: Add ICV_DIR_EL1 handler Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 47/58] KVM: arm64: vgic-v3: Add ICV_RPR_EL1 handler Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 48/58] KVM: arm64: vgic-v3: Add ICV_CTLR_EL1 handler Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 49/58] KVM: arm64: vgic-v3: Add ICV_PMR_EL1 handler Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 50/58] KVM: arm64: Enable GICv3 common sysreg trapping via command-line Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 51/58] KVM: arm64: vgic-v3: Log which GICv3 system registers are trapped Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 52/58] KVM: arm64: Log an error if trapping a read-from-write-only GICv3 access Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier [this message] 2017-06-30 8:45 ` [PATCH 53/58] KVM: arm64: Log an error if trapping a write-to-read-only " Marc Zyngier 2017-06-30 8:45 ` [PATCH 54/58] arm64/kvm: sysreg: fix typo'd SYS_ICC_IGRPEN*_EL1 Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 55/58] arm64/kvm: vgic: use SYS_DESC() Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 56/58] KVM: ARM64: fix phy counter access failure in guest Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 57/58] KVM: arm/arm64: Signal SIGBUS when stage2 discovers hwpoison memory Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 8:45 ` [PATCH 58/58] arm64: Remove a redundancy in sysreg.h Marc Zyngier 2017-06-30 8:45 ` Marc Zyngier 2017-06-30 10:39 ` [GIT PULL] KVM/ARM updates for 4.13 Paolo Bonzini 2017-06-30 10:39 ` Paolo Bonzini
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=20170630084514.6779-54-marc.zyngier@arm.com \ --to=marc.zyngier@arm.com \ --cc=catalin.marinas@arm.com \ --cc=cdall@linaro.org \ --cc=david.daney@cavium.com \ --cc=huhuajun@huawei.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=pbonzini@redhat.com \ --cc=rkrcmar@redhat.com \ --cc=stefan@hello-penguin.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.