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, drjones@redhat.com, pbonzini@redhat.com, dgilbert@redhat.com, quintela@redhat.com Subject: [PATCH v5 18/22] KVM: arm64: vgic-its: vgic_its_check_id returns the entry's GPA Date: Fri, 14 Apr 2017 12:15:30 +0200 [thread overview] Message-ID: <1492164934-988-19-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1492164934-988-1-git-send-email-eric.auger@redhat.com> As vgic_its_check_id() computes the device/collection entry's GPA, let's return it so that new callers can retrieve it easily. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- v3 -> v4: - check eaddr is not NULL to allow passing NULL eaddr parameter to vgic_its_check_id v2: new --- virt/kvm/arm/vgic/vgic-its.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 484e541..35b2ca1 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -645,7 +645,8 @@ static int vgic_its_cmd_handle_movi(struct kvm *kvm, struct vgic_its *its, * is actually valid (covered by a memslot and guest accessible). * For this we have to read the respective first level entry. */ -static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id) +static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id, + gpa_t *eaddr) { int l1_tbl_size = GITS_BASER_NR_PAGES(baser) * SZ_64K; int index; @@ -665,6 +666,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id) addr = BASER_ADDRESS(baser) + id * esz; gfn = addr >> PAGE_SHIFT; + if (eaddr) + *eaddr = addr; return kvm_is_visible_gfn(its->dev->kvm, gfn); } @@ -697,6 +700,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id) indirect_ptr += index * esz; gfn = indirect_ptr >> PAGE_SHIFT; + if (eaddr) + *eaddr = indirect_ptr; return kvm_is_visible_gfn(its->dev->kvm, gfn); } @@ -706,7 +711,7 @@ static int vgic_its_alloc_collection(struct vgic_its *its, { struct its_collection *collection; - if (!vgic_its_check_id(its, its->baser_coll_table, coll_id)) + if (!vgic_its_check_id(its, its->baser_coll_table, coll_id, NULL)) return E_ITS_MAPC_COLLECTION_OOR; collection = kzalloc(sizeof(*collection), GFP_KERNEL); @@ -889,7 +894,7 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, gpa_t itt_addr = its_cmd_get_ittaddr(its_cmd); struct its_device *device; - if (!vgic_its_check_id(its, its->baser_device_table, device_id)) + if (!vgic_its_check_id(its, its->baser_device_table, device_id, NULL)) return E_ITS_MAPD_DEVICE_OOR; if (valid && nb_eventid_bits > VITS_TYPER_IDBITS) -- 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 v5 18/22] KVM: arm64: vgic-its: vgic_its_check_id returns the entry's GPA Date: Fri, 14 Apr 2017 12:15:30 +0200 [thread overview] Message-ID: <1492164934-988-19-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1492164934-988-1-git-send-email-eric.auger@redhat.com> As vgic_its_check_id() computes the device/collection entry's GPA, let's return it so that new callers can retrieve it easily. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- v3 -> v4: - check eaddr is not NULL to allow passing NULL eaddr parameter to vgic_its_check_id v2: new --- virt/kvm/arm/vgic/vgic-its.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 484e541..35b2ca1 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -645,7 +645,8 @@ static int vgic_its_cmd_handle_movi(struct kvm *kvm, struct vgic_its *its, * is actually valid (covered by a memslot and guest accessible). * For this we have to read the respective first level entry. */ -static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id) +static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id, + gpa_t *eaddr) { int l1_tbl_size = GITS_BASER_NR_PAGES(baser) * SZ_64K; int index; @@ -665,6 +666,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id) addr = BASER_ADDRESS(baser) + id * esz; gfn = addr >> PAGE_SHIFT; + if (eaddr) + *eaddr = addr; return kvm_is_visible_gfn(its->dev->kvm, gfn); } @@ -697,6 +700,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id) indirect_ptr += index * esz; gfn = indirect_ptr >> PAGE_SHIFT; + if (eaddr) + *eaddr = indirect_ptr; return kvm_is_visible_gfn(its->dev->kvm, gfn); } @@ -706,7 +711,7 @@ static int vgic_its_alloc_collection(struct vgic_its *its, { struct its_collection *collection; - if (!vgic_its_check_id(its, its->baser_coll_table, coll_id)) + if (!vgic_its_check_id(its, its->baser_coll_table, coll_id, NULL)) return E_ITS_MAPC_COLLECTION_OOR; collection = kzalloc(sizeof(*collection), GFP_KERNEL); @@ -889,7 +894,7 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, gpa_t itt_addr = its_cmd_get_ittaddr(its_cmd); struct its_device *device; - if (!vgic_its_check_id(its, its->baser_device_table, device_id)) + if (!vgic_its_check_id(its, its->baser_device_table, device_id, NULL)) return E_ITS_MAPD_DEVICE_OOR; if (valid && nb_eventid_bits > VITS_TYPER_IDBITS) -- 2.5.5
next prev parent reply other threads:[~2017-04-14 10:17 UTC|newest] Thread overview: 264+ 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 ` Eric Auger 2017-04-14 10:15 ` [PATCH v5 01/22] KVM: arm/arm64: Add ITS save/restore API documentation Eric Auger 2017-04-14 10:15 ` Eric Auger 2017-04-25 10:38 ` Peter Maydell 2017-04-25 10:38 ` Peter Maydell 2017-04-26 12:31 ` Christoffer Dall 2017-04-26 12:31 ` Christoffer Dall 2017-04-26 15:48 ` Auger Eric 2017-04-26 15:48 ` Auger Eric 2017-04-27 8:57 ` Christoffer Dall 2017-04-27 8:57 ` Christoffer Dall 2017-04-27 9:33 ` Auger Eric 2017-04-27 9:33 ` Auger Eric 2017-04-27 11:02 ` Christoffer Dall 2017-04-27 11:02 ` Christoffer Dall 2017-04-27 12:51 ` Auger Eric 2017-04-27 12:51 ` Auger Eric 2017-04-27 14:45 ` Christoffer Dall 2017-04-27 14:45 ` Christoffer Dall 2017-04-27 15:29 ` Auger Eric 2017-04-27 15:29 ` Auger Eric 2017-04-27 16:23 ` Marc Zyngier 2017-04-27 16:23 ` Marc Zyngier 2017-04-27 17:14 ` Auger Eric 2017-04-27 17:14 ` Auger Eric 2017-04-27 17:27 ` Christoffer Dall 2017-04-27 17:27 ` Christoffer Dall 2017-04-27 16:38 ` Christoffer Dall 2017-04-27 16:38 ` Christoffer Dall 2017-04-27 17:27 ` Auger Eric 2017-04-27 17:27 ` Auger Eric 2017-04-27 17:54 ` Christoffer Dall 2017-04-27 17:54 ` Christoffer Dall 2017-04-27 19:27 ` Auger Eric 2017-04-27 19:27 ` Auger Eric 2017-05-04 7:00 ` Auger Eric 2017-05-04 7:00 ` Auger Eric 2017-05-04 7:40 ` Marc Zyngier 2017-05-04 7:40 ` Marc Zyngier 2017-05-04 7:54 ` Auger Eric 2017-05-04 7:54 ` Auger Eric 2017-05-04 7:46 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-25 10:43 ` Peter Maydell 2017-04-25 10:43 ` Peter Maydell 2017-04-26 8:26 ` Auger Eric 2017-04-26 8:26 ` Auger Eric 2017-04-26 8:44 ` Peter Maydell 2017-04-26 8:44 ` Peter Maydell 2017-04-26 8:48 ` Dr. David Alan Gilbert 2017-04-26 8:48 ` Dr. David Alan Gilbert 2017-04-26 9:57 ` Auger Eric 2017-04-26 9:57 ` Auger Eric 2017-04-26 13:00 ` Christoffer Dall 2017-04-26 13:00 ` Christoffer Dall 2017-04-26 13:01 ` Peter Maydell 2017-04-26 13:01 ` Peter Maydell 2017-04-26 13:14 ` Christoffer Dall 2017-04-26 13:14 ` Christoffer Dall 2017-04-26 13:26 ` Peter Maydell 2017-04-26 13:26 ` Peter Maydell 2017-04-26 14:47 ` Auger Eric 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-14 10:15 ` Eric Auger 2017-04-26 11:21 ` Prakash B 2017-04-26 11:21 ` Prakash B 2017-04-27 9:05 ` Christoffer Dall 2017-04-27 9:05 ` Christoffer Dall 2017-04-27 9:20 ` Andre Przywara 2017-04-27 9:20 ` Andre Przywara 2017-04-27 9:40 ` Auger Eric 2017-04-27 9:40 ` Auger Eric 2017-04-27 11:09 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-26 11:22 ` Prakash B 2017-04-26 11:22 ` Prakash B 2017-04-27 9:07 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-26 11:23 ` Prakash B 2017-04-26 11:23 ` Prakash B 2017-04-27 9:12 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-26 11:23 ` Prakash B 2017-04-26 11:23 ` Prakash B 2017-04-27 9:18 ` Christoffer Dall 2017-04-27 9:18 ` Christoffer Dall 2017-04-14 10:15 ` [PATCH v5 07/22] KVM: arm64: vgic-its: Implement vgic_its_has_attr_regs and attr_regs_access Eric Auger 2017-04-14 10:15 ` Eric Auger 2017-04-26 11:24 ` Prakash B 2017-04-26 11:24 ` Prakash B 2017-04-27 11:00 ` Christoffer Dall 2017-04-27 11:00 ` Christoffer Dall 2017-04-27 12:22 ` Auger Eric 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-14 10:15 ` Eric Auger 2017-04-26 11:24 ` Prakash B 2017-04-26 11:24 ` Prakash B 2017-04-27 11:27 ` Christoffer Dall 2017-04-27 11:27 ` Christoffer Dall 2017-04-27 12:53 ` Auger Eric 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-14 10:15 ` Eric Auger 2017-04-26 11:27 ` Prakash B 2017-04-26 11:27 ` Prakash B 2017-04-27 13:14 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-26 11:27 ` Prakash B 2017-04-26 11:27 ` Prakash B 2017-04-27 14:57 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-26 11:28 ` Prakash B 2017-04-26 11:28 ` Prakash B 2017-04-27 16:25 ` Christoffer Dall 2017-04-27 16:25 ` Christoffer Dall 2017-04-27 17:15 ` Auger Eric 2017-04-27 17:15 ` Auger Eric 2017-04-27 17:28 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-26 11:29 ` Prakash B 2017-04-26 11:29 ` Prakash B 2017-04-27 16:43 ` Christoffer Dall 2017-04-27 16:43 ` Christoffer Dall 2017-04-27 17:44 ` Auger Eric 2017-04-27 17:44 ` Auger Eric 2017-04-27 18:09 ` Christoffer Dall 2017-04-27 18:09 ` Christoffer Dall 2017-04-27 19:18 ` Auger Eric 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-14 10:15 ` Eric Auger 2017-04-26 11:29 ` Prakash B 2017-04-26 11:29 ` Prakash B 2017-04-27 16:48 ` Christoffer Dall 2017-04-27 16:48 ` Christoffer Dall 2017-04-27 17:24 ` Auger Eric 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-14 10:15 ` Eric Auger 2017-04-26 11:31 ` Prakash B 2017-04-26 11:31 ` Prakash B 2017-04-27 17:24 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-26 11:31 ` Prakash B 2017-04-26 11:31 ` Prakash B 2017-04-27 17:31 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-26 11:32 ` Prakash B 2017-04-26 11:32 ` Prakash B 2017-04-27 18:06 ` Christoffer Dall 2017-04-27 18:06 ` Christoffer Dall 2017-04-27 19:24 ` Auger Eric 2017-04-27 19:24 ` Auger Eric 2017-04-28 9:47 ` Christoffer Dall 2017-04-28 9:47 ` Christoffer Dall 2017-04-30 19:33 ` Christoffer Dall 2017-04-30 19:33 ` Christoffer Dall 2017-05-03 13:40 ` Auger Eric 2017-05-03 13:40 ` Auger Eric 2017-05-03 14:38 ` Christoffer Dall 2017-05-03 14:38 ` Christoffer Dall 2017-04-30 19:35 ` Christoffer Dall 2017-04-30 19:35 ` Christoffer Dall 2017-05-03 6:53 ` Auger Eric 2017-05-03 6:53 ` Auger Eric 2017-05-03 8:01 ` Christoffer Dall 2017-05-03 8:01 ` Christoffer Dall 2017-05-03 10:22 ` Auger Eric 2017-05-03 10:22 ` Auger Eric 2017-04-30 20:13 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-26 11:33 ` Prakash B 2017-04-26 11:33 ` Prakash B 2017-04-28 10:44 ` Christoffer Dall 2017-04-28 10:44 ` Christoffer Dall 2017-04-28 11:05 ` Auger Eric 2017-04-28 11:05 ` Auger Eric 2017-04-28 17:42 ` Christoffer Dall 2017-04-28 17:42 ` Christoffer Dall 2017-04-14 10:15 ` Eric Auger [this message] 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-04-26 11:33 ` Prakash B 2017-05-02 8:29 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-26 11:34 ` Prakash B 2017-04-26 11:34 ` Prakash B 2017-04-30 20:14 ` Christoffer Dall 2017-04-30 20:14 ` Christoffer Dall 2017-05-03 16:08 ` Auger Eric 2017-05-03 16:08 ` Auger Eric 2017-05-03 16:37 ` Christoffer Dall 2017-05-03 16:37 ` Christoffer Dall 2017-05-03 21:55 ` Auger Eric 2017-05-03 21:55 ` Auger Eric 2017-05-04 7:31 ` Christoffer Dall 2017-05-04 7:31 ` Christoffer Dall 2017-05-04 7:40 ` Auger Eric 2017-05-04 7:40 ` Auger Eric 2017-05-04 8:23 ` Christoffer Dall 2017-05-04 8:23 ` Christoffer Dall 2017-05-04 8:44 ` Auger Eric 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-14 10:15 ` Eric Auger 2017-04-26 11:34 ` Prakash B 2017-04-26 11:34 ` Prakash B 2017-04-30 20:55 ` Christoffer Dall 2017-04-30 20:55 ` Christoffer Dall 2017-05-03 14:07 ` Auger Eric 2017-05-03 14:07 ` Auger Eric 2017-05-03 15:29 ` Christoffer Dall 2017-05-03 15:29 ` Christoffer Dall 2017-05-03 21:38 ` Auger Eric 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-14 10:15 ` Eric Auger 2017-04-26 11:35 ` Prakash B 2017-04-26 11:35 ` Prakash B 2017-04-30 21:10 ` Christoffer Dall 2017-04-30 21:10 ` Christoffer Dall 2017-05-03 22:20 ` Auger Eric 2017-05-03 22:20 ` Auger Eric 2017-05-04 7:32 ` Christoffer Dall 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-14 10:15 ` Eric Auger 2017-04-26 11:35 ` Prakash B 2017-04-26 11:35 ` Prakash B 2017-04-30 21:32 ` Christoffer Dall 2017-04-30 21:32 ` Christoffer Dall 2017-05-03 22:22 ` Auger Eric 2017-05-03 22:22 ` Auger Eric 2017-04-26 11:38 ` [PATCH v5 00/22] vITS save/restore Prakash B 2017-04-26 11:38 ` Prakash B 2017-04-26 13:02 ` Christoffer Dall 2017-04-26 13:02 ` Christoffer Dall 2017-04-27 6:55 ` Auger Eric 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-19-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=drjones@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.