[PULL 01/59] kvm: arm64: Fix EC field in inject_abt64

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Christoffer Dall <christoffer.dall@linaro.org>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Radim Krčmář" <rkrcmar@redhat.com>
Cc: kvmarm@lists.cs.columbia.edu,
	linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org,
	Marc Zyngier <marc.zyngier@arm.com>,
	Matt Evans <matt.evans@arm.com>, <stable@vger.kernel.org>,
	Christoffer Dall <christoffer.dall@linaro.org>
Subject: [PULL 01/59] kvm: arm64: Fix EC field in inject_abt64
Date: Tue, 24 May 2016 11:08:55 +0200	[thread overview]
Message-ID: <1464080993-10884-2-git-send-email-christoffer.dall@linaro.org> (raw)
In-Reply-To: <1464080993-10884-1-git-send-email-christoffer.dall@linaro.org>

From: Matt Evans <matt.evans@arm.com>

The EC field of the constructed ESR is conditionally modified by ORing in
ESR_ELx_EC_DABT_LOW for a data abort.  However, ESR_ELx_EC_SHIFT is missing
from this condition.

Signed-off-by: Matt Evans <matt.evans@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
 arch/arm64/kvm/inject_fault.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c
index 4d1ac81..e9e0e6d 100644
--- a/arch/arm64/kvm/inject_fault.c
+++ b/arch/arm64/kvm/inject_fault.c
@@ -162,7 +162,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
 		esr |= (ESR_ELx_EC_IABT_CUR << ESR_ELx_EC_SHIFT);
 
 	if (!is_iabt)
-		esr |= ESR_ELx_EC_DABT_LOW;
+		esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT;
 
 	vcpu_sys_reg(vcpu, ESR_EL1) = esr | ESR_ELx_FSC_EXTABT;
 }
-- 
2.1.2.330.g565301e.dirty

WARNING: multiple messages have this Message-ID (diff)

From: Christoffer Dall <christoffer.dall@linaro.org>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Radim Krčmář" <rkrcmar@redhat.com>
Cc: kvm@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>,
	stable@vger.kernel.org, Matt Evans <matt.evans@arm.com>,
	kvmarm@lists.cs.columbia.edu,
	linux-arm-kernel@lists.infradead.org
Subject: [PULL 01/59] kvm: arm64: Fix EC field in inject_abt64
Date: Tue, 24 May 2016 11:08:55 +0200	[thread overview]
Message-ID: <1464080993-10884-2-git-send-email-christoffer.dall@linaro.org> (raw)
In-Reply-To: <1464080993-10884-1-git-send-email-christoffer.dall@linaro.org>

From: Matt Evans <matt.evans@arm.com>

The EC field of the constructed ESR is conditionally modified by ORing in
ESR_ELx_EC_DABT_LOW for a data abort.  However, ESR_ELx_EC_SHIFT is missing
from this condition.

Signed-off-by: Matt Evans <matt.evans@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
 arch/arm64/kvm/inject_fault.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c
index 4d1ac81..e9e0e6d 100644
--- a/arch/arm64/kvm/inject_fault.c
+++ b/arch/arm64/kvm/inject_fault.c
@@ -162,7 +162,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
 		esr |= (ESR_ELx_EC_IABT_CUR << ESR_ELx_EC_SHIFT);
 
 	if (!is_iabt)
-		esr |= ESR_ELx_EC_DABT_LOW;
+		esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT;
 
 	vcpu_sys_reg(vcpu, ESR_EL1) = esr | ESR_ELx_FSC_EXTABT;
 }
-- 
2.1.2.330.g565301e.dirty

WARNING: multiple messages have this Message-ID (diff)

From: christoffer.dall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PULL 01/59] kvm: arm64: Fix EC field in inject_abt64
Date: Tue, 24 May 2016 11:08:55 +0200	[thread overview]
Message-ID: <1464080993-10884-2-git-send-email-christoffer.dall@linaro.org> (raw)
In-Reply-To: <1464080993-10884-1-git-send-email-christoffer.dall@linaro.org>

From: Matt Evans <matt.evans@arm.com>

The EC field of the constructed ESR is conditionally modified by ORing in
ESR_ELx_EC_DABT_LOW for a data abort.  However, ESR_ELx_EC_SHIFT is missing
from this condition.

Signed-off-by: Matt Evans <matt.evans@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
 arch/arm64/kvm/inject_fault.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c
index 4d1ac81..e9e0e6d 100644
--- a/arch/arm64/kvm/inject_fault.c
+++ b/arch/arm64/kvm/inject_fault.c
@@ -162,7 +162,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr
 		esr |= (ESR_ELx_EC_IABT_CUR << ESR_ELx_EC_SHIFT);
 
 	if (!is_iabt)
-		esr |= ESR_ELx_EC_DABT_LOW;
+		esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT;
 
 	vcpu_sys_reg(vcpu, ESR_EL1) = esr | ESR_ELx_FSC_EXTABT;
 }
-- 
2.1.2.330.g565301e.dirty

next prev parent reply	other threads:[~2016-05-24  9:09 UTC|newest]

Thread overview: 121+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-24  9:08 [PULL 00/59] KVM/ARM Changes for v4.7 take 2 Christoffer Dall
2016-05-24  9:08 ` Christoffer Dall
2016-05-24  9:08 ` Christoffer Dall [this message]
2016-05-24  9:08   ` [PULL 01/59] kvm: arm64: Fix EC field in inject_abt64 Christoffer Dall
2016-05-24  9:08   ` Christoffer Dall
2016-05-24  9:08 ` [PULL 02/59] KVM: arm/arm64: vgic: streamline vgic_update_irq_pending() interface Christoffer Dall
2016-05-24  9:08   ` Christoffer Dall
2016-05-24  9:08 ` [PULL 03/59] KVM: arm/arm64: vgic: avoid map in kvm_vgic_inject_mapped_irq() Christoffer Dall
2016-05-24  9:08   ` Christoffer Dall
2016-05-24  9:08 ` [PULL 04/59] KVM: arm/arm64: vgic: avoid map in kvm_vgic_map_is_active() Christoffer Dall
2016-05-24  9:08   ` Christoffer Dall
2016-05-24  9:08 ` [PULL 05/59] KVM: arm/arm64: vgic: avoid map in kvm_vgic_unmap_phys_irq() Christoffer Dall
2016-05-24  9:08   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 06/59] KVM: arm/arm64: Remove the IRQ field from struct irq_phys_map Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 07/59] KVM: arm/arm64: arch_timer: Remove irq_phys_map Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 08/59] KVM: arm/arm64: vgic: Remove irq_phys_map from interface Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 09/59] KVM: arm/arm64: Move timer IRQ map to latest possible time Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 10/59] KVM: arm/arm64: Get rid of vgic_cpu->nr_lr Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 11/59] KVM: arm/arm64: Fix MMIO emulation data handling Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 12/59] KVM: arm/arm64: Export mmio_read/write_bus Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 13/59] KVM: arm/arm64: pmu: abstract access to number of SPIs Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 14/59] KVM: arm/arm64: Provide functionality to pause and resume a guest Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 15/59] KVM: arm/arm64: move GICv2 emulation defines into arm-gic-v3.h Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 16/59] KVM: arm/arm64: vgic-new: Add data structure definitions Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 17/59] KVM: arm/arm64: vgic-new: Add acccessor to new struct vgic_irq instance Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 18/59] KVM: arm/arm64: vgic-new: Implement virtual IRQ injection Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 19/59] KVM: arm/arm64: vgic-new: Add IRQ sorting Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 20/59] KVM: arm/arm64: vgic-new: Add IRQ sync/flush framework Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 21/59] KVM: arm/arm64: vgic-new: Add GICv2 world switch backend Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 22/59] KVM: arm/arm64: vgic-new: Add GICv3 " Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 23/59] KVM: arm/arm64: vgic-new: Implement kvm_vgic_vcpu_pending_irq Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 24/59] KVM: arm/arm64: vgic-new: Add MMIO handling framework Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 25/59] KVM: arm/arm64: vgic-new: Add GICv2 " Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 26/59] KVM: arm/arm64: vgic-new: Add CTLR, TYPER and IIDR handlers Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 27/59] KVM: arm/arm64: vgic-new: Add ENABLE registers handlers Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 28/59] KVM: arm/arm64: vgic-new: Add PENDING " Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 29/59] KVM: arm/arm64: vgic-new: Add ACTIVE " Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 30/59] KVM: arm/arm64: vgic-new: Add PRIORITY " Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 31/59] KVM: arm/arm64: vgic-new: Add CONFIG " Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 32/59] KVM: arm/arm64: vgic-new: Add TARGET " Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 33/59] KVM: arm/arm64: vgic-new: Add SGIR register handler Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 34/59] KVM: arm/arm64: vgic-new: Add SGIPENDR register handlers Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 35/59] KVM: arm/arm64: vgic-new: Add GICv3 MMIO handling framework Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 36/59] KVM: arm/arm64: vgic-new: Add GICv3 CTLR, IIDR, TYPER handlers Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 37/59] KVM: arm/arm64: vgic-new: Add GICv3 redistributor IIDR and TYPER handler Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 38/59] KVM: arm/arm64: vgic-new: Add GICv3 IDREGS register handler Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 39/59] KVM: arm/arm64: vgic-new: Add GICv3 IROUTER register handlers Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 40/59] KVM: arm/arm64: vgic-new: Add GICv3 SGI system register trap handler Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 41/59] KVM: arm/arm64: vgic-new: vgic_kvm_device: KVM device ops registration Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 42/59] KVM: arm/arm64: vgic-new: vgic_kvm_device: KVM_DEV_ARM_VGIC_GRP_NR_IRQS Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 43/59] KVM: arm/arm64: vgic-new: vgic_kvm_device: KVM_DEV_ARM_VGIC_GRP_CTRL Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 44/59] KVM: arm/arm64: vgic-new: vgic_kvm_device: implement kvm_vgic_addr Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 45/59] KVM: arm/arm64: vgic-new: vgic_kvm_device: KVM_DEV_ARM_VGIC_GRP_ADDR Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 46/59] KVM: arm/arm64: vgic-new: vgic_kvm_device: access to VGIC registers Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 47/59] KVM: arm/arm64: vgic-new: Export register access interface Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 48/59] KVM: arm/arm64: vgic-new: Add userland access to VGIC dist registers Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 49/59] KVM: arm/arm64: vgic-new: Add GICH_VMCR accessors Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 50/59] KVM: arm/arm64: vgic-new: Add userland GIC CPU interface access Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 51/59] KVM: arm/arm64: vgic-new: vgic_init: implement kvm_vgic_hyp_init Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 52/59] KVM: arm/arm64: vgic-new: vgic_init: implement vgic_create Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 53/59] KVM: arm/arm64: vgic-new: vgic_init: implement vgic_init Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 54/59] KVM: arm/arm64: vgic-new: vgic_init: implement map_resources Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 55/59] KVM: arm/arm64: vgic-new: Add vgic_v2/v3_enable Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 56/59] KVM: arm/arm64: vgic-new: Wire up irqfd injection Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 57/59] KVM: arm/arm64: vgic-new: implement mapped IRQ handling Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 58/59] KVM: arm/arm64: vgic-new: enable build Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall
2016-05-24  9:09 ` [PULL 59/59] KVM: arm/arm64: vgic-new: Synchronize changes to active state Christoffer Dall
2016-05-24  9:09   ` Christoffer Dall

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:4d1ac81 dfblob:4d1ac81 dfblob:4d1ac81 dfblob:e9e0e6d
dfblob:e9e0e6d dfblob:e9e0e6d
	(help)

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=1464080993-10884-2-git-send-email-christoffer.dall@linaro.org \
    --to=christoffer.dall@linaro.org \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=marc.zyngier@arm.com \
    --cc=matt.evans@arm.com \
    --cc=pbonzini@redhat.com \
    --cc=rkrcmar@redhat.com \
    --cc=stable@vger.kernel.org \
    /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: link

Be 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.