From: eric.auger@redhat.com (Eric Auger)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 07/22] KVM: arm64: vgic-its: Implement vgic_its_has_attr_regs and attr_regs_access
Date: Fri, 14 Apr 2017 12:15:19 +0200 [thread overview]
Message-ID: <1492164934-988-8-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1492164934-988-1-git-send-email-eric.auger@redhat.com>
This patch implements vgic_its_has_attr_regs and vgic_its_attr_regs_access
upon the MMIO framework. VGIC ITS KVM device KVM_DEV_ARM_VGIC_GRP_ITS_REGS
group becomes functional.
At least GITS_CREADR and GITS_IIDR require to differentiate a guest write
action from a user access. As such let's introduce a new uaccess_its_write
vgic_register_region callback.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v4 -> v5:
- use GITS_TYPER instead of offset 0x8
- uaccess_its_write now can return an error
v3 -> v4:
- remove changes to the REGISTER_ITS_DESC macro. This will be handled in
subsequent patch with the introduction of a new REGISTER_ITS_DESC_UACCESS
macro
- fix IIDR access and add a comment wrt full length access
- handle endianness
- add kvm lock and vcpus lock
---
virt/kvm/arm/vgic/vgic-its.c | 79 +++++++++++++++++++++++++++++++++++++++++--
virt/kvm/arm/vgic/vgic-mmio.h | 9 +++--
2 files changed, 84 insertions(+), 4 deletions(-)
diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index f687e91..a9a2c12 100644
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -1469,14 +1469,89 @@ static void vgic_its_destroy(struct kvm_device *kvm_dev)
int vgic_its_has_attr_regs(struct kvm_device *dev,
struct kvm_device_attr *attr)
{
- return -ENXIO;
+ const struct vgic_register_region *region;
+ struct vgic_io_device iodev = {
+ .regions = its_registers,
+ .nr_regions = ARRAY_SIZE(its_registers),
+ };
+ gpa_t offset = attr->attr;
+
+ region = vgic_find_mmio_region(iodev.regions,
+ iodev.nr_regions,
+ offset);
+ if (!region)
+ return -ENXIO;
+
+ return 0;
}
int vgic_its_attr_regs_access(struct kvm_device *dev,
struct kvm_device_attr *attr,
u64 *reg, bool is_write)
{
- return -ENXIO;
+ const struct vgic_register_region *region;
+ struct vgic_io_device iodev = {
+ .regions = its_registers,
+ .nr_regions = ARRAY_SIZE(its_registers),
+ };
+ struct vgic_its *its = dev->private;
+ gpa_t addr, offset = attr->attr;
+ unsigned int len;
+ unsigned long data = 0;
+ int ret = 0;
+
+ /*
+ * Among supported registers, only GITS_CTLR (0x0) and GITS_IIDR (0x4)
+ * are 32 bits. Others are 64 bits.
+ */
+ if ((offset < GITS_TYPER && offset & 0x3) ||
+ (offset >= GITS_TYPER && offset & 0x7))
+ return -EINVAL;
+
+ mutex_lock(&dev->kvm->lock);
+
+ if (IS_VGIC_ADDR_UNDEF(its->vgic_its_base)) {
+ ret = -ENXIO;
+ goto out;
+ }
+
+ region = vgic_find_mmio_region(iodev.regions,
+ iodev.nr_regions,
+ offset);
+ if (!region) {
+ ret = -ENXIO;
+ goto out;
+ }
+
+ if (!lock_all_vcpus(dev->kvm)) {
+ ret = -EBUSY;
+ goto out;
+ }
+
+ addr = its->vgic_its_base + offset;
+
+ /*
+ * Only full length register accesses are supported although
+ * the architecture spec theoretically allows upper/lower 32
+ * bits to be accessed independently
+ */
+ len = region->access_flags & VGIC_ACCESS_64bit ? 8 : 4;
+
+ if (is_write) {
+ data = vgic_data_mmio_bus_to_host(reg, len);
+ if (region->uaccess_its_write)
+ ret = region->uaccess_its_write(dev->kvm, its, addr,
+ len, data);
+ else
+ region->its_write(dev->kvm, its, addr, len, data);
+ } else {
+ data = region->its_read(dev->kvm, its, addr, len);
+ vgic_data_host_to_mmio_bus(reg, len, data);
+ }
+ unlock_all_vcpus(dev->kvm);
+out:
+ mutex_unlock(&dev->kvm->lock);
+ return ret;
}
static int vgic_its_has_attr(struct kvm_device *dev,
diff --git a/virt/kvm/arm/vgic/vgic-mmio.h b/virt/kvm/arm/vgic/vgic-mmio.h
index 6eec91b..ea4171a 100644
--- a/virt/kvm/arm/vgic/vgic-mmio.h
+++ b/virt/kvm/arm/vgic/vgic-mmio.h
@@ -36,8 +36,13 @@ struct vgic_register_region {
};
unsigned long (*uaccess_read)(struct kvm_vcpu *vcpu, gpa_t addr,
unsigned int len);
- void (*uaccess_write)(struct kvm_vcpu *vcpu, gpa_t addr,
- unsigned int len, unsigned long val);
+ union {
+ void (*uaccess_write)(struct kvm_vcpu *vcpu, gpa_t addr,
+ unsigned int len, unsigned long val);
+ int (*uaccess_its_write)(struct kvm *kvm, struct vgic_its *its,
+ gpa_t addr, unsigned int len,
+ unsigned long val);
+ };
};
extern struct kvm_io_device_ops kvm_io_gic_ops;
--
2.5.5
next prev parent reply other threads:[~2017-04-14 10:15 UTC|newest]
Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-14 10:15 [PATCH v5 00/22] vITS save/restore Eric Auger
2017-04-14 10:15 ` [PATCH v5 01/22] KVM: arm/arm64: Add ITS save/restore API documentation Eric Auger
2017-04-25 10:38 ` Peter Maydell
2017-04-26 12:31 ` Christoffer Dall
2017-04-26 15:48 ` Auger Eric
2017-04-27 8:57 ` Christoffer Dall
2017-04-27 9:33 ` Auger Eric
2017-04-27 11:02 ` Christoffer Dall
2017-04-27 12:51 ` Auger Eric
2017-04-27 14:45 ` Christoffer Dall
2017-04-27 15:29 ` Auger Eric
2017-04-27 16:23 ` Marc Zyngier
2017-04-27 17:14 ` Auger Eric
2017-04-27 17:27 ` Christoffer Dall
2017-04-27 16:38 ` Christoffer Dall
2017-04-27 17:27 ` Auger Eric
2017-04-27 17:54 ` Christoffer Dall
2017-04-27 19:27 ` Auger Eric
2017-05-04 7:00 ` Auger Eric
2017-05-04 7:40 ` Marc Zyngier
2017-05-04 7:54 ` Auger Eric
2017-05-04 7:46 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 02/22] KVM: arm/arm64: Add GICV3 pending table save " Eric Auger
2017-04-25 10:43 ` Peter Maydell
2017-04-26 8:26 ` Auger Eric
2017-04-26 8:44 ` Peter Maydell
2017-04-26 8:48 ` Dr. David Alan Gilbert
2017-04-26 9:57 ` Auger Eric
2017-04-26 13:00 ` Christoffer Dall
2017-04-26 13:01 ` Peter Maydell
2017-04-26 13:14 ` Christoffer Dall
2017-04-26 13:26 ` Peter Maydell
2017-04-26 14:47 ` Auger Eric
2017-04-14 10:15 ` [PATCH v5 03/22] KVM: arm/arm64: vgic-its: rename itte into ite Eric Auger
2017-04-26 11:21 ` Prakash B
2017-04-27 9:05 ` Christoffer Dall
2017-04-27 9:20 ` Andre Przywara
2017-04-27 9:40 ` Auger Eric
2017-04-27 11:09 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 04/22] arm/arm64: vgic: turn vgic_find_mmio_region into public Eric Auger
2017-04-26 11:22 ` Prakash B
2017-04-27 9:07 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 05/22] KVM: arm64: vgic-its: KVM_DEV_ARM_VGIC_GRP_ITS_REGS group Eric Auger
2017-04-26 11:23 ` Prakash B
2017-04-27 9:12 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 06/22] KVM: arm/arm64: vgic: expose (un)lock_all_vcpus Eric Auger
2017-04-26 11:23 ` Prakash B
2017-04-27 9:18 ` Christoffer Dall
2017-04-14 10:15 ` Eric Auger [this message]
2017-04-26 11:24 ` [PATCH v5 07/22] KVM: arm64: vgic-its: Implement vgic_its_has_attr_regs and attr_regs_access Prakash B
2017-04-27 11:00 ` Christoffer Dall
2017-04-27 12:22 ` Auger Eric
2017-04-14 10:15 ` [PATCH v5 08/22] KVM: arm64: vgic-its: Implement vgic_mmio_uaccess_write_its_creadr Eric Auger
2017-04-26 11:24 ` Prakash B
2017-04-27 11:27 ` Christoffer Dall
2017-04-27 12:53 ` Auger Eric
2017-04-14 10:15 ` [PATCH v5 09/22] KVM: arm64: vgic-its: Introduce migration ABI infrastructure Eric Auger
2017-04-26 11:27 ` Prakash B
2017-04-27 13:14 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 10/22] KVM: arm64: vgic-its: Implement vgic_mmio_uaccess_write_its_iidr Eric Auger
2017-04-26 11:27 ` Prakash B
2017-04-27 14:57 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 11/22] KVM: arm64: vgic-its: Interpret MAPD Size field and check related errors Eric Auger
2017-04-26 11:28 ` Prakash B
2017-04-27 16:25 ` Christoffer Dall
2017-04-27 17:15 ` Auger Eric
2017-04-27 17:28 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 12/22] KVM: arm64: vgic-its: Interpret MAPD ITT_addr field Eric Auger
2017-04-26 11:29 ` Prakash B
2017-04-27 16:43 ` Christoffer Dall
2017-04-27 17:44 ` Auger Eric
2017-04-27 18:09 ` Christoffer Dall
2017-04-27 19:18 ` Auger Eric
2017-04-14 10:15 ` [PATCH v5 13/22] KVM: arm64: vgic-its: Check the device id matches TYPER DEVBITS range Eric Auger
2017-04-26 11:29 ` Prakash B
2017-04-27 16:48 ` Christoffer Dall
2017-04-27 17:24 ` Auger Eric
2017-04-14 10:15 ` [PATCH v5 14/22] KVM: arm64: vgic-its: KVM_DEV_ARM_ITS_SAVE/RESTORE_TABLES Eric Auger
2017-04-26 11:31 ` Prakash B
2017-04-27 17:24 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 15/22] KVM: arm64: vgic-its: vgic_its_alloc_ite/device Eric Auger
2017-04-26 11:31 ` Prakash B
2017-04-27 17:31 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 16/22] KVM: arm64: vgic-its: Add infrastructure for table lookup Eric Auger
2017-04-26 11:32 ` Prakash B
2017-04-27 18:06 ` Christoffer Dall
2017-04-27 19:24 ` Auger Eric
2017-04-28 9:47 ` Christoffer Dall
2017-04-30 19:33 ` Christoffer Dall
2017-05-03 13:40 ` Auger Eric
2017-05-03 14:38 ` Christoffer Dall
2017-04-30 19:35 ` Christoffer Dall
2017-05-03 6:53 ` Auger Eric
2017-05-03 8:01 ` Christoffer Dall
2017-05-03 10:22 ` Auger Eric
2017-04-30 20:13 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 17/22] KVM: arm64: vgic-its: Collection table save/restore Eric Auger
2017-04-26 11:33 ` Prakash B
2017-04-28 10:44 ` Christoffer Dall
2017-04-28 11:05 ` Auger Eric
2017-04-28 17:42 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 18/22] KVM: arm64: vgic-its: vgic_its_check_id returns the entry's GPA Eric Auger
2017-04-26 11:33 ` Prakash B
2017-05-02 8:29 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 19/22] KVM: arm64: vgic-its: ITT save and restore Eric Auger
2017-04-26 11:34 ` Prakash B
2017-04-30 20:14 ` Christoffer Dall
2017-05-03 16:08 ` Auger Eric
2017-05-03 16:37 ` Christoffer Dall
2017-05-03 21:55 ` Auger Eric
2017-05-04 7:31 ` Christoffer Dall
2017-05-04 7:40 ` Auger Eric
2017-05-04 8:23 ` Christoffer Dall
2017-05-04 8:44 ` Auger Eric
2017-04-14 10:15 ` [PATCH v5 20/22] KVM: arm64: vgic-its: Device table save/restore Eric Auger
2017-04-26 11:34 ` Prakash B
2017-04-30 20:55 ` Christoffer Dall
2017-05-03 14:07 ` Auger Eric
2017-05-03 15:29 ` Christoffer Dall
2017-05-03 21:38 ` Auger Eric
2017-04-14 10:15 ` [PATCH v5 21/22] KVM: arm64: vgic-its: Fix pending table sync Eric Auger
2017-04-26 11:35 ` Prakash B
2017-04-30 21:10 ` Christoffer Dall
2017-05-03 22:20 ` Auger Eric
2017-05-04 7:32 ` Christoffer Dall
2017-04-14 10:15 ` [PATCH v5 22/22] KVM: arm64: vgic-v3: KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES Eric Auger
2017-04-26 11:35 ` Prakash B
2017-04-30 21:32 ` Christoffer Dall
2017-05-03 22:22 ` Auger Eric
2017-04-26 11:38 ` [PATCH v5 00/22] vITS save/restore Prakash B
2017-04-26 13:02 ` Christoffer Dall
2017-04-27 6:55 ` Auger Eric
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=1492164934-988-8-git-send-email-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=linux-arm-kernel@lists.infradead.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 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).