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 03/12] KVM: arm/arm64: Record RDIST Last bit at registration
Date: Mon, 19 Mar 2018 10:20:11 +0100 [thread overview]
Message-ID: <1521451220-27754-4-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1521451220-27754-1-git-send-email-eric.auger@redhat.com>
To prepare for multiple RDIST regions, let's record the RDIST
Last bit field when registering the IO device.
As a reminder the Last bit indicates whether the redistributor
is the highest one in a series of contiguous redistributor pages.
Since at the moment KVM only supports a single redist region,
the RDIST tagged with the last bit set to true corresponds to the
highest vCPU one.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
include/kvm/arm_vgic.h | 1 +
virt/kvm/arm/vgic/vgic-mmio-v3.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index cdbd142..1c8c0ff 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -312,6 +312,7 @@ struct vgic_cpu {
*/
struct vgic_io_device rd_iodev;
struct vgic_io_device sgi_iodev;
+ bool rdist_last; /* Is the RDIST the last one of the RDIST region? */
/* Contains the attributes and gpa of the LPI pending tables. */
u64 pendbaser;
diff --git a/virt/kvm/arm/vgic/vgic-mmio-v3.c b/virt/kvm/arm/vgic/vgic-mmio-v3.c
index 671fe81..75fe689 100644
--- a/virt/kvm/arm/vgic/vgic-mmio-v3.c
+++ b/virt/kvm/arm/vgic/vgic-mmio-v3.c
@@ -184,12 +184,13 @@ static unsigned long vgic_mmio_read_v3r_typer(struct kvm_vcpu *vcpu,
gpa_t addr, unsigned int len)
{
unsigned long mpidr = kvm_vcpu_get_mpidr_aff(vcpu);
+ struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
int target_vcpu_id = vcpu->vcpu_id;
u64 value;
value = (u64)(mpidr & GENMASK(23, 0)) << 32;
value |= ((target_vcpu_id & 0xffff) << 8);
- if (target_vcpu_id == atomic_read(&vcpu->kvm->online_vcpus) - 1)
+ if (vgic_cpu->rdist_last)
value |= GICR_TYPER_LAST;
if (vgic_has_its(vcpu->kvm))
value |= GICR_TYPER_PLPIS;
@@ -580,6 +581,7 @@ int vgic_register_redist_iodev(struct kvm_vcpu *vcpu)
{
struct kvm *kvm = vcpu->kvm;
struct vgic_dist *vgic = &kvm->arch.vgic;
+ struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
struct vgic_io_device *rd_dev = &vcpu->arch.vgic_cpu.rd_iodev;
struct vgic_io_device *sgi_dev = &vcpu->arch.vgic_cpu.sgi_iodev;
gpa_t rd_base, sgi_base;
@@ -632,6 +634,8 @@ int vgic_register_redist_iodev(struct kvm_vcpu *vcpu)
}
vgic->vgic_redist_free_offset += 2 * SZ_64K;
+ vgic_cpu->rdist_last =
+ (vcpu->vcpu_id == atomic_read(&vcpu->kvm->online_vcpus) - 1);
out:
mutex_unlock(&kvm->slots_lock);
return ret;
--
2.5.5
next prev parent reply other threads:[~2018-03-19 9:20 UTC|newest]
Thread overview: 21+ 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 ` [RFC 01/12] KVM: arm/arm64: Avoid multiple dist->spis kfree 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 14:15 ` Marc Zyngier
2018-03-19 20:56 ` Auger Eric
2018-03-23 14:01 ` Peter Maydell
2018-03-19 9:20 ` Eric Auger [this message]
2018-03-19 15:57 ` [RFC 03/12] KVM: arm/arm64: Record RDIST Last bit at registration 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 ` [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 ` [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 ` [RFC 09/12] KVM: arm/arm64: Check vcpu redist base before registering an iodev Eric Auger
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-4-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).