From: Eric Auger <eric.auger@redhat.com> To: eric.auger.pro@gmail.com, eric.auger@redhat.com, marc.zyngier@arm.com, christoffer.dall@linaro.org, andre.przywara@arm.com, vijayak@caviumnetworks.com, Vijaya.Kumar@cavium.com, peter.maydell@linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: Prasun.Kapoor@cavium.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com Subject: [PATCH v4 06/22] KVM: arm64: ITS: Implement vgic_its_has_attr_regs and attr_regs_access Date: Mon, 27 Mar 2017 11:30:56 +0200 [thread overview] Message-ID: <1490607072-21610-7-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1490607072-21610-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 requires 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> --- 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 | 78 +++++++++++++++++++++++++++++++++++++++++-- virt/kvm/arm/vgic/vgic-mmio.h | 9 +++-- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index f687e91..9b9ea86 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -1469,14 +1469,88 @@ 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 < 0x8 && offset & 0x3) || (offset >= 0x8 && 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) + 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..becc473 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); + void (*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
WARNING: multiple messages have this Message-ID (diff)
From: eric.auger@redhat.com (Eric Auger) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 06/22] KVM: arm64: ITS: Implement vgic_its_has_attr_regs and attr_regs_access Date: Mon, 27 Mar 2017 11:30:56 +0200 [thread overview] Message-ID: <1490607072-21610-7-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1490607072-21610-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 requires 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> --- 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 | 78 +++++++++++++++++++++++++++++++++++++++++-- virt/kvm/arm/vgic/vgic-mmio.h | 9 +++-- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index f687e91..9b9ea86 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -1469,14 +1469,88 @@ 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 < 0x8 && offset & 0x3) || (offset >= 0x8 && 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) + 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..becc473 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); + void (*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-03-27 9:30 UTC|newest] Thread overview: 144+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-27 9:30 [PATCH v4 00/22] vITS save/restore Eric Auger 2017-03-27 9:30 ` Eric Auger 2017-03-27 9:30 ` [PATCH v4 01/22] KVM: arm/arm64: Add vITS save/restore API documentation Eric Auger 2017-03-27 9:30 ` Eric Auger 2017-04-08 10:03 ` Marc Zyngier 2017-04-08 10:03 ` Marc Zyngier 2017-04-08 13:15 ` Christoffer Dall 2017-04-08 13:15 ` Christoffer Dall 2017-04-08 17:31 ` Marc Zyngier 2017-04-08 17:31 ` Marc Zyngier 2017-04-10 10:18 ` Auger Eric 2017-04-10 10:18 ` Auger Eric 2017-04-10 10:42 ` Marc Zyngier 2017-04-10 10:42 ` Marc Zyngier 2017-04-08 18:17 ` Christoffer Dall 2017-04-08 18:17 ` Christoffer Dall 2017-04-10 14:26 ` Auger Eric 2017-04-10 14:26 ` Auger Eric 2017-04-21 9:12 ` Christoffer Dall 2017-04-21 9:12 ` Christoffer Dall 2017-03-27 9:30 ` [PATCH v4 02/22] KVM: arm/arm64: rename itte into ite Eric Auger 2017-03-27 9:30 ` Eric Auger 2017-04-08 10:04 ` Marc Zyngier 2017-04-08 10:04 ` Marc Zyngier 2017-03-27 9:30 ` [PATCH v4 03/22] arm/arm64: vgic: turn vgic_find_mmio_region into public Eric Auger 2017-03-27 9:30 ` Eric Auger 2017-04-08 10:06 ` Marc Zyngier 2017-04-08 10:06 ` Marc Zyngier 2017-04-08 10:06 ` Marc Zyngier 2017-03-27 9:30 ` [PATCH v4 04/22] KVM: arm64: ITS: KVM_DEV_ARM_VGIC_GRP_ITS_REGS group Eric Auger 2017-03-27 9:30 ` Eric Auger 2017-04-08 10:07 ` Marc Zyngier 2017-04-08 10:07 ` Marc Zyngier 2017-03-27 9:30 ` [PATCH v4 05/22] KVM: arm/arm64: vgic: expose (un)lock_all_vcpus Eric Auger 2017-03-27 9:30 ` Eric Auger 2017-04-08 10:09 ` Marc Zyngier 2017-04-08 10:09 ` Marc Zyngier 2017-03-27 9:30 ` Eric Auger [this message] 2017-03-27 9:30 ` [PATCH v4 06/22] KVM: arm64: ITS: Implement vgic_its_has_attr_regs and attr_regs_access Eric Auger 2017-04-08 10:24 ` Marc Zyngier 2017-04-08 10:24 ` Marc Zyngier 2017-04-08 10:24 ` Marc Zyngier 2017-03-27 9:30 ` [PATCH v4 07/22] KVM: arm64: ITS: Implement vgic_mmio_uaccess_write_its_creadr Eric Auger 2017-03-27 9:30 ` Eric Auger 2017-04-08 10:36 ` Marc Zyngier 2017-04-08 10:36 ` Marc Zyngier 2017-04-08 10:36 ` Marc Zyngier 2017-03-27 9:30 ` [PATCH v4 08/22] KVM: arm64: ITS: Implement vgic_mmio_uaccess_write_its_iidr Eric Auger 2017-03-27 9:30 ` Eric Auger 2017-04-08 10:42 ` Marc Zyngier 2017-04-08 10:42 ` Marc Zyngier 2017-04-08 10:42 ` Marc Zyngier 2017-04-10 14:32 ` Auger Eric 2017-04-10 14:32 ` Auger Eric 2017-04-10 14:57 ` Marc Zyngier 2017-04-10 14:57 ` Marc Zyngier 2017-04-10 15:07 ` Peter Maydell 2017-04-10 15:07 ` Peter Maydell 2017-04-10 15:17 ` Auger Eric 2017-04-10 15:17 ` Auger Eric 2017-04-11 10:05 ` Marc Zyngier 2017-04-11 10:05 ` Marc Zyngier 2017-04-11 10:08 ` Auger Eric 2017-04-11 10:08 ` Auger Eric 2017-04-11 10:16 ` Peter Maydell 2017-04-11 10:16 ` Peter Maydell 2017-04-11 10:29 ` Marc Zyngier 2017-04-11 10:29 ` Marc Zyngier 2017-04-11 10:43 ` Peter Maydell 2017-04-11 10:43 ` Peter Maydell 2017-04-11 10:56 ` Auger Eric 2017-04-11 10:56 ` Auger Eric 2017-03-27 9:30 ` [PATCH v4 09/22] KVM: arm64: ITS: Report the ITE size in GITS_TYPER Eric Auger 2017-03-27 9:30 ` Eric Auger 2017-04-08 17:42 ` Marc Zyngier 2017-04-08 17:42 ` Marc Zyngier 2017-03-27 9:31 ` [PATCH v4 10/22] KVM: arm64: ITS: Interpret MAPD Size field and check related errors Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-04-08 17:59 ` Marc Zyngier 2017-04-08 17:59 ` Marc Zyngier 2017-04-08 17:59 ` Marc Zyngier 2017-03-27 9:31 ` [PATCH v4 11/22] KVM: arm64: ITS: Interpret MAPD ITT_addr field Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-04-08 18:58 ` Marc Zyngier 2017-04-08 18:58 ` Marc Zyngier 2017-04-08 18:58 ` Marc Zyngier 2017-03-27 9:31 ` [PATCH v4 12/22] KVM: arm64: ITS: Check the device id matches TYPER DEVBITS range Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-03-27 9:31 ` [PATCH v4 13/22] KVM: arm64: ITS: KVM_DEV_ARM_VGIC_GRP_ITS_TABLES group Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-03-27 15:04 ` kbuild test robot 2017-03-27 15:04 ` kbuild test robot 2017-03-27 18:29 ` Auger Eric 2017-03-27 18:29 ` Auger Eric 2017-03-30 2:21 ` [kbuild-all] " Ye Xiaolong 2017-03-30 2:21 ` Ye Xiaolong 2017-03-30 6:46 ` Auger Eric 2017-03-30 6:46 ` Auger Eric 2017-03-30 7:29 ` Ye Xiaolong 2017-03-30 7:29 ` Ye Xiaolong 2017-03-30 8:29 ` Auger Eric 2017-03-30 8:29 ` Auger Eric 2017-04-09 10:09 ` Marc Zyngier 2017-04-09 10:09 ` Marc Zyngier 2017-03-27 9:31 ` [PATCH v4 14/22] KVM: arm64: ITS: vgic_its_alloc_ite/device Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-04-09 10:13 ` Marc Zyngier 2017-04-09 10:13 ` Marc Zyngier 2017-03-27 9:31 ` [PATCH v4 15/22] KVM: arm64: ITS: Sort the device and ITE lists Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-04-09 10:18 ` Marc Zyngier 2017-04-09 10:18 ` Marc Zyngier 2017-03-27 9:31 ` [PATCH v4 16/22] KVM: expose next_segment() Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-03-27 9:31 ` [PATCH v4 17/22] KVM: arm64: ITS: Add infrastructure for table lookup Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-04-09 10:36 ` Marc Zyngier 2017-04-09 10:36 ` Marc Zyngier 2017-03-27 9:31 ` [PATCH v4 18/22] KVM: arm64: ITS: Collection table save/restore Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-04-10 9:55 ` Marc Zyngier 2017-04-10 9:55 ` Marc Zyngier 2017-04-11 9:57 ` Auger Eric 2017-04-11 9:57 ` Auger Eric 2017-04-11 10:03 ` Marc Zyngier 2017-04-11 10:03 ` Marc Zyngier 2017-03-27 9:31 ` [PATCH v4 19/22] KVM: arm64: ITS: vgic_its_check_id returns the entry's GPA Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-03-27 9:31 ` [PATCH v4 20/22] KVM: arm64: ITS: ITT flush and restore Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-04-10 12:39 ` Marc Zyngier 2017-04-10 12:39 ` Marc Zyngier 2017-04-11 10:19 ` Auger Eric 2017-04-11 10:19 ` Auger Eric 2017-03-27 9:31 ` [PATCH v4 21/22] KVM: arm64: ITS: Device table save/restore Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-04-10 12:42 ` Marc Zyngier 2017-04-10 12:42 ` Marc Zyngier 2017-03-27 9:31 ` [PATCH v4 22/22] KVM: arm64: ITS: Pending " Eric Auger 2017-03-27 9:31 ` Eric Auger 2017-04-10 12:50 ` Marc Zyngier 2017-04-10 12:50 ` Marc Zyngier 2017-04-10 12:54 ` [PATCH v4 00/22] vITS save/restore Marc Zyngier 2017-04-10 12:54 ` Marc Zyngier
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=1490607072-21610-7-git-send-email-eric.auger@redhat.com \ --to=eric.auger@redhat.com \ --cc=Prasun.Kapoor@cavium.com \ --cc=Vijaya.Kumar@cavium.com \ --cc=andre.przywara@arm.com \ --cc=christoffer.dall@linaro.org \ --cc=dgilbert@redhat.com \ --cc=eric.auger.pro@gmail.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=quintela@redhat.com \ --cc=vijayak@caviumnetworks.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.