All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
	linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
	kvmarm@lists.cs.columbia.edu, marc.zyngier@arm.com,
	cdall@kernel.org, peter.maydell@linaro.org
Cc: andre.przywara@arm.com, drjones@redhat.com, wei@redhat.com
Subject: [RFC 09/12] KVM: arm/arm64: Check vcpu redist base before registering an iodev
Date: Mon, 19 Mar 2018 10:20:17 +0100	[thread overview]
Message-ID: <1521451220-27754-10-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1521451220-27754-1-git-send-email-eric.auger@redhat.com>

As we are going to register several redist regions,
vgic_register_all_redist_iodevs() may be called several times. We need
to register a redist_iodev for a given vcpu only once. So let's
check if the base address has already been set. Initialize this latter
in kvm_vgic_vcpu_early_init().

Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
 virt/kvm/arm/vgic/vgic-init.c    | 3 +++
 virt/kvm/arm/vgic/vgic-mmio-v3.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
index b6b4db0..03f97ce 100644
--- a/virt/kvm/arm/vgic/vgic-init.c
+++ b/virt/kvm/arm/vgic/vgic-init.c
@@ -82,6 +82,9 @@ void kvm_vgic_vcpu_early_init(struct kvm_vcpu *vcpu)
 	INIT_LIST_HEAD(&vgic_cpu->ap_list_head);
 	spin_lock_init(&vgic_cpu->ap_list_lock);
 
+	vgic_cpu->rd_iodev.base_addr = VGIC_ADDR_UNDEF;
+	vgic_cpu->sgi_iodev.base_addr = VGIC_ADDR_UNDEF;
+
 	/*
 	 * Enable and configure all SGIs to be edge-triggered and
 	 * configure all PPIs as level-triggered.
diff --git a/virt/kvm/arm/vgic/vgic-mmio-v3.c b/virt/kvm/arm/vgic/vgic-mmio-v3.c
index f139382..ea34412 100644
--- a/virt/kvm/arm/vgic/vgic-mmio-v3.c
+++ b/virt/kvm/arm/vgic/vgic-mmio-v3.c
@@ -589,6 +589,9 @@ int vgic_register_redist_iodev(struct kvm_vcpu *vcpu)
 	uint32_t free_pfn_offset;
 	int ret;
 
+	if (!IS_VGIC_ADDR_UNDEF(vgic_cpu->rd_iodev.base_addr))
+		return 0;
+
 	/*
 	 * We may be creating VCPUs before having set the base address for the
 	 * redistributor region, in which case we will come back to this
-- 
2.5.5

  parent reply	other threads:[~2018-03-19  9:21 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-19  9:20 [RFC 00/12] KVM: arm/arm64: Allow multiple GICv3 redistributor regions Eric Auger
2018-03-19  9:20 ` Eric Auger
2018-03-19  9:20 ` [RFC 01/12] KVM: arm/arm64: Avoid multiple dist->spis kfree Eric Auger
2018-03-19  9:20   ` Eric Auger
2018-03-19 13:46   ` Marc Zyngier
2018-03-19 20:51     ` Auger Eric
2018-03-19  9:20 ` [RFC 02/12] KVM: arm/arm64: Document KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION Eric Auger
2018-03-19  9:20   ` Eric Auger
2018-03-19 14:15   ` Marc Zyngier
2018-03-19 20:56     ` Auger Eric
2018-03-23 14:01   ` Peter Maydell
2018-03-19  9:20 ` [RFC 03/12] KVM: arm/arm64: Record RDIST Last bit at registration Eric Auger
2018-03-19  9:20   ` Eric Auger
2018-03-19 15:57   ` Marc Zyngier
2018-03-19 15:57     ` Marc Zyngier
2018-03-19 21:06     ` Auger Eric
2018-03-21 11:35       ` Marc Zyngier
2018-03-19  9:20 ` [RFC 04/12] KVM: arm/arm64: Replace the single rdist region by a list Eric Auger
2018-03-19  9:20   ` Eric Auger
2018-03-19  9:20 ` [RFC 05/12] KVM: arm/arm64: Helper to locate free rdist space Eric Auger
2018-03-19  9:20 ` [RFC 06/12] KVM: arm/arm64: Helper to detect whether an RDIST is the last one Eric Auger
2018-03-19  9:20   ` Eric Auger
2018-03-19  9:20 ` [RFC 07/12] KVM: arm/arm64: Helper to register a new redistributor region Eric Auger
2018-03-19  9:20 ` [RFC 08/12] KVM: arm/arm64: Adapt vgic_v3_check_base to multiple rdist regions Eric Auger
2018-03-19  9:20 ` Eric Auger [this message]
2018-03-19  9:20 ` [RFC 10/12] KVM: arm/arm64: Check all vcpu redistributors are set on map_resources Eric Auger
2018-03-19  9:20 ` [RFC 11/12] KVM: arm/arm64: Add KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION Eric Auger
2018-03-19  9:20 ` [RFC 12/12] KVM: arm/arm64: Implement KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION Eric Auger

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=1521451220-27754-10-git-send-email-eric.auger@redhat.com \
    --to=eric.auger@redhat.com \
    --cc=andre.przywara@arm.com \
    --cc=cdall@kernel.org \
    --cc=drjones@redhat.com \
    --cc=eric.auger.pro@gmail.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=peter.maydell@linaro.org \
    --cc=wei@redhat.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: 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.