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, bjsprakash.linux@gmail.com, pbonzini@redhat.com Subject: [PATCH v7 10/24] KVM: arm64: vgic-its: Implement vgic_mmio_uaccess_write_its_iidr Date: Sat, 6 May 2017 17:24:29 +0200 [thread overview] Message-ID: <1494084283-12723-11-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1494084283-12723-1-git-send-email-eric.auger@redhat.com> The GITS_IIDR revision field is used to encode the migration ABI revision. So we need to restore it to check the table layout is readable by the destination. By writing the IIDR, userspace thus forces the ABI revision to be used and this must be less than or equal to the max revision KVM supports. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- v6 -> v7: - use NR_ITS_ABIS - introduce & use GITS_IIDR_REV_MASK v5 -> v6: - fix typos in the commit message - dont't use update_64bit_reg anymore v4 -> v5 - rename user_revision into abi_rev and REV into MAX_ABI_REV - IIDR reports abi_rev set by userspace if any. - If value set by userspace exceeds the max supported revision, an error is reported. - add some defines v4: creation --- include/linux/irqchip/arm-gic-v3.h | 5 +++++ virt/kvm/arm/vgic/vgic-its.c | 23 ++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index 81ebe43..2eaea30 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -242,6 +242,11 @@ #define GITS_TYPER_PTA (1UL << 19) #define GITS_TYPER_HWCOLLCNT_SHIFT 24 +#define GITS_IIDR_REV_SHIFT 12 +#define GITS_IIDR_REV_MASK (0xf << GITS_IIDR_REV_SHIFT) +#define GITS_IIDR_REV(r) (((r) >> GITS_IIDR_REV_SHIFT) & 0xf) +#define GITS_IIDR_PRODUCTID_SHIFT 24 + #define GITS_CBASER_VALID (1ULL << 63) #define GITS_CBASER_SHAREABILITY_SHIFT (10) #define GITS_CBASER_INNER_CACHEABILITY_SHIFT (59) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 4f6ea46..9338efb 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -434,7 +434,23 @@ static unsigned long vgic_mmio_read_its_iidr(struct kvm *kvm, struct vgic_its *its, gpa_t addr, unsigned int len) { - return (PRODUCT_ID_KVM << 24) | (IMPLEMENTER_ARM << 0); + u32 val; + + val = (its->abi_rev << GITS_IIDR_REV_SHIFT) & GITS_IIDR_REV_MASK; + val |= (PRODUCT_ID_KVM << GITS_IIDR_PRODUCTID_SHIFT) | IMPLEMENTER_ARM; + return val; +} + +static int vgic_mmio_uaccess_write_its_iidr(struct kvm *kvm, + struct vgic_its *its, + gpa_t addr, unsigned int len, + unsigned long val) +{ + u32 rev = GITS_IIDR_REV(val); + + if (rev >= NR_ITS_ABIS) + return -EINVAL; + return vgic_its_set_abi(its, rev); } static unsigned long vgic_mmio_read_its_idregs(struct kvm *kvm, @@ -1415,8 +1431,9 @@ static struct vgic_register_region its_registers[] = { REGISTER_ITS_DESC(GITS_CTLR, vgic_mmio_read_its_ctlr, vgic_mmio_write_its_ctlr, 4, VGIC_ACCESS_32bit), - REGISTER_ITS_DESC(GITS_IIDR, - vgic_mmio_read_its_iidr, its_mmio_write_wi, 4, + REGISTER_ITS_DESC_UACCESS(GITS_IIDR, + vgic_mmio_read_its_iidr, its_mmio_write_wi, + vgic_mmio_uaccess_write_its_iidr, 4, VGIC_ACCESS_32bit), REGISTER_ITS_DESC(GITS_TYPER, vgic_mmio_read_its_typer, its_mmio_write_wi, 8, -- 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 v7 10/24] KVM: arm64: vgic-its: Implement vgic_mmio_uaccess_write_its_iidr Date: Sat, 6 May 2017 17:24:29 +0200 [thread overview] Message-ID: <1494084283-12723-11-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1494084283-12723-1-git-send-email-eric.auger@redhat.com> The GITS_IIDR revision field is used to encode the migration ABI revision. So we need to restore it to check the table layout is readable by the destination. By writing the IIDR, userspace thus forces the ABI revision to be used and this must be less than or equal to the max revision KVM supports. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- v6 -> v7: - use NR_ITS_ABIS - introduce & use GITS_IIDR_REV_MASK v5 -> v6: - fix typos in the commit message - dont't use update_64bit_reg anymore v4 -> v5 - rename user_revision into abi_rev and REV into MAX_ABI_REV - IIDR reports abi_rev set by userspace if any. - If value set by userspace exceeds the max supported revision, an error is reported. - add some defines v4: creation --- include/linux/irqchip/arm-gic-v3.h | 5 +++++ virt/kvm/arm/vgic/vgic-its.c | 23 ++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index 81ebe43..2eaea30 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -242,6 +242,11 @@ #define GITS_TYPER_PTA (1UL << 19) #define GITS_TYPER_HWCOLLCNT_SHIFT 24 +#define GITS_IIDR_REV_SHIFT 12 +#define GITS_IIDR_REV_MASK (0xf << GITS_IIDR_REV_SHIFT) +#define GITS_IIDR_REV(r) (((r) >> GITS_IIDR_REV_SHIFT) & 0xf) +#define GITS_IIDR_PRODUCTID_SHIFT 24 + #define GITS_CBASER_VALID (1ULL << 63) #define GITS_CBASER_SHAREABILITY_SHIFT (10) #define GITS_CBASER_INNER_CACHEABILITY_SHIFT (59) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 4f6ea46..9338efb 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -434,7 +434,23 @@ static unsigned long vgic_mmio_read_its_iidr(struct kvm *kvm, struct vgic_its *its, gpa_t addr, unsigned int len) { - return (PRODUCT_ID_KVM << 24) | (IMPLEMENTER_ARM << 0); + u32 val; + + val = (its->abi_rev << GITS_IIDR_REV_SHIFT) & GITS_IIDR_REV_MASK; + val |= (PRODUCT_ID_KVM << GITS_IIDR_PRODUCTID_SHIFT) | IMPLEMENTER_ARM; + return val; +} + +static int vgic_mmio_uaccess_write_its_iidr(struct kvm *kvm, + struct vgic_its *its, + gpa_t addr, unsigned int len, + unsigned long val) +{ + u32 rev = GITS_IIDR_REV(val); + + if (rev >= NR_ITS_ABIS) + return -EINVAL; + return vgic_its_set_abi(its, rev); } static unsigned long vgic_mmio_read_its_idregs(struct kvm *kvm, @@ -1415,8 +1431,9 @@ static struct vgic_register_region its_registers[] = { REGISTER_ITS_DESC(GITS_CTLR, vgic_mmio_read_its_ctlr, vgic_mmio_write_its_ctlr, 4, VGIC_ACCESS_32bit), - REGISTER_ITS_DESC(GITS_IIDR, - vgic_mmio_read_its_iidr, its_mmio_write_wi, 4, + REGISTER_ITS_DESC_UACCESS(GITS_IIDR, + vgic_mmio_read_its_iidr, its_mmio_write_wi, + vgic_mmio_uaccess_write_its_iidr, 4, VGIC_ACCESS_32bit), REGISTER_ITS_DESC(GITS_TYPER, vgic_mmio_read_its_typer, its_mmio_write_wi, 8, -- 2.5.5
next prev parent reply other threads:[~2017-05-06 15:24 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-05-06 15:24 [PATCH v7 00/24] vITS save/restore Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-06 15:24 ` [PATCH v7 01/24] KVM: arm/arm64: Add ITS save/restore API documentation Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 11:54 ` Marc Zyngier 2017-05-07 11:54 ` Marc Zyngier 2017-05-07 17:05 ` Auger Eric 2017-05-07 17:05 ` Auger Eric 2017-05-08 9:14 ` Marc Zyngier 2017-05-08 9:14 ` Marc Zyngier 2017-05-08 11:21 ` Christoffer Dall 2017-05-08 11:21 ` Christoffer Dall 2017-05-06 15:24 ` [PATCH v7 02/24] KVM: arm/arm64: Add GICV3 pending table save " Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 11:56 ` Marc Zyngier 2017-05-07 11:56 ` Marc Zyngier 2017-05-06 15:24 ` [PATCH v7 03/24] KVM: arm/arm64: vgic-its: rename itte into ite Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-06 15:24 ` [PATCH v7 04/24] arm/arm64: vgic: turn vgic_find_mmio_region into public Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-06 15:24 ` [PATCH v7 05/24] KVM: arm64: vgic-its: KVM_DEV_ARM_VGIC_GRP_ITS_REGS group Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-06 15:24 ` [PATCH v7 06/24] KVM: arm/arm64: vgic: expose (un)lock_all_vcpus Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-06 15:24 ` [PATCH v7 07/24] KVM: arm64: vgic-its: Implement vgic_its_has_attr_regs and attr_regs_access Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 11:57 ` Marc Zyngier 2017-05-07 11:57 ` Marc Zyngier 2017-05-06 15:24 ` [PATCH v7 08/24] KVM: arm64: vgic-its: Implement vgic_mmio_uaccess_write_its_creadr Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-06 15:24 ` [PATCH v7 09/24] KVM: arm64: vgic-its: Introduce migration ABI infrastructure Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-08 12:23 ` Christoffer Dall 2017-05-08 12:23 ` Christoffer Dall 2017-05-06 15:24 ` Eric Auger [this message] 2017-05-06 15:24 ` [PATCH v7 10/24] KVM: arm64: vgic-its: Implement vgic_mmio_uaccess_write_its_iidr Eric Auger 2017-05-08 12:24 ` Christoffer Dall 2017-05-08 12:24 ` Christoffer Dall 2017-05-06 15:24 ` [PATCH v7 11/24] KVM: arm64: vgic-its: Interpret MAPD Size field and check related errors Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-06 15:24 ` [PATCH v7 12/24] KVM: arm64: vgic-its: Interpret MAPD ITT_addr field Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-06 15:24 ` [PATCH v7 13/24] KVM: arm64: vgic-its: Check the device id matches TYPER DEVBITS range Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 12:01 ` Marc Zyngier 2017-05-07 12:01 ` Marc Zyngier 2017-05-06 15:24 ` [PATCH v7 14/24] KVM: arm64: vgic-v3: vgic_v3_lpi_sync_pending_status Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 12:13 ` Marc Zyngier 2017-05-07 12:13 ` Marc Zyngier 2017-05-08 12:26 ` Christoffer Dall 2017-05-08 12:26 ` Christoffer Dall 2017-05-06 15:24 ` [PATCH v7 15/24] KVM: arm64: vgic-its: Read config and pending bit in add_lpi() Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 12:16 ` Marc Zyngier 2017-05-07 12:16 ` Marc Zyngier 2017-05-08 12:28 ` Christoffer Dall 2017-05-08 12:28 ` Christoffer Dall 2017-05-06 15:24 ` [PATCH v7 16/24] KVM: arm64: vgic-its: KVM_DEV_ARM_ITS_SAVE/RESTORE_TABLES Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 13:00 ` Marc Zyngier 2017-05-07 13:00 ` Marc Zyngier 2017-05-07 13:51 ` Marc Zyngier 2017-05-07 13:51 ` Marc Zyngier 2017-05-07 15:19 ` Christoffer Dall 2017-05-07 15:19 ` Christoffer Dall 2017-05-07 17:33 ` Auger Eric 2017-05-07 17:33 ` Auger Eric 2017-05-08 12:29 ` Christoffer Dall 2017-05-08 12:29 ` Christoffer Dall 2017-05-06 15:24 ` [PATCH v7 17/24] KVM: arm64: vgic-its: vgic_its_alloc_ite/device Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 13:02 ` Marc Zyngier 2017-05-07 13:02 ` Marc Zyngier 2017-05-06 15:24 ` [PATCH v7 18/24] KVM: arm64: vgic-its: Add infrastructure for table lookup Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 13:05 ` Marc Zyngier 2017-05-07 13:05 ` Marc Zyngier 2017-05-06 15:24 ` [PATCH v7 19/24] KVM: arm64: vgic-its: Collection table save/restore Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 13:12 ` Marc Zyngier 2017-05-07 13:12 ` Marc Zyngier 2017-05-06 15:24 ` [PATCH v7 20/24] KVM: arm64: vgic-its: vgic_its_check_id returns the entry's GPA Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 13:14 ` Marc Zyngier 2017-05-07 13:14 ` Marc Zyngier 2017-05-06 15:24 ` [PATCH v7 21/24] KVM: arm64: vgic-its: Device table save/restore Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 13:30 ` Marc Zyngier 2017-05-07 13:30 ` Marc Zyngier 2017-05-07 17:22 ` Auger Eric 2017-05-07 17:22 ` Auger Eric 2017-05-08 11:30 ` Christoffer Dall 2017-05-08 11:30 ` Christoffer Dall 2017-05-06 15:24 ` [PATCH v7 22/24] KVM: arm64: vgic-its: ITT save and restore Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 13:39 ` Marc Zyngier 2017-05-07 13:39 ` Marc Zyngier 2017-05-07 17:24 ` Auger Eric 2017-05-07 17:24 ` Auger Eric 2017-05-08 11:49 ` Christoffer Dall 2017-05-08 11:49 ` Christoffer Dall 2017-05-06 15:24 ` [PATCH v7 23/24] KVM: arm64: vgic-its: Fix pending table sync Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 13:42 ` Marc Zyngier 2017-05-07 13:42 ` Marc Zyngier 2017-05-06 15:24 ` [PATCH v7 24/24] KVM: arm64: vgic-v3: KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES Eric Auger 2017-05-06 15:24 ` Eric Auger 2017-05-07 13:44 ` Marc Zyngier 2017-05-07 13:44 ` 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=1494084283-12723-11-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=bjsprakash.linux@gmail.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.