From: Auger Eric <eric.auger@redhat.com> To: Andre Przywara <andre.przywara@arm.com>, eric.auger.pro@gmail.com, marc.zyngier@arm.com, christoffer.dall@linaro.org, vijayak@caviumnetworks.com, Vijaya.Kumar@cavium.com, peter.maydell@linaro.org, linux-arm-kernel@lists.infradead.org, drjones@redhat.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: Prasun.Kapoor@cavium.com, pbonzini@redhat.com, dgilbert@redhat.com, quintela@redhat.com Subject: Re: [PATCH v3 17/19] KVM: arm64: ITS: ITT flush and restore Date: Wed, 22 Mar 2017 15:17:38 +0100 [thread overview] Message-ID: <3e332896-bf38-7ebc-f50d-0598f6c3058a@redhat.com> (raw) In-Reply-To: <41f6b5b7-275e-8752-cdd7-96bb1e53ab04@arm.com> Hi Andre, On 21/03/2017 19:13, Andre Przywara wrote: > Hi, > > On 06/03/17 11:34, Eric Auger wrote: >> Introduce routines to flush and restore device ITT and their >> interrupt table entries (ITE). >> >> The routines will be called on device table flush and >> restore. >> >> Signed-off-by: Eric Auger <eric.auger@redhat.com> >> >> --- >> v2 -> v3: >> - add return 0 in vgic_its_restore_ite (was in subsequent patch) >> >> v2: creation >> --- >> virt/kvm/arm/vgic/vgic-its.c | 100 +++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 100 insertions(+) >> >> diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c >> index 1060125..a216849 100644 >> --- a/virt/kvm/arm/vgic/vgic-its.c >> +++ b/virt/kvm/arm/vgic/vgic-its.c >> @@ -1748,6 +1748,106 @@ static int vgic_its_restore_pending_tables(struct vgic_its *its) >> return -ENXIO; >> } >> >> +static int vgic_its_flush_ite(struct vgic_its *its, struct its_device *dev, >> + struct its_ite *ite, gpa_t gpa) >> +{ >> + struct kvm *kvm = its->dev->kvm; >> + u32 next_offset; >> + u64 val; >> + >> + next_offset = compute_next_eventid_offset(&dev->itt_head, ite); >> + val = ((u64)next_offset << 48) | ((u64)ite->lpi << 16) | >> + ite->collection->collection_id; >> + val = cpu_to_le64(val); >> + return kvm_write_guest(kvm, gpa, &val, VITS_ESZ); >> +} >> + >> +/** >> + * vgic_its_restore_ite - restore an interrupt translation entry >> + * @event_id: id used for indexing >> + * @ptr: kernel VA where the 8 byte ITE is located >> + * @opaque: pointer to the its_device >> + * @next: id offset to the next entry >> + */ >> +static int vgic_its_restore_ite(struct vgic_its *its, u32 event_id, >> + void *ptr, void *opaque, u32 *next) >> +{ >> + struct its_device *dev = (struct its_device *)opaque; >> + struct its_collection *collection; >> + struct kvm *kvm = its->dev->kvm; >> + u64 val, *p = (u64 *)ptr; >> + struct vgic_irq *irq; >> + u32 coll_id, lpi_id; >> + struct its_ite *ite; >> + int ret; >> + >> + val = *p; >> + *next = 1; >> + >> + val = le64_to_cpu(val); >> + >> + coll_id = val & GENMASK_ULL(15, 0); >> + lpi_id = (val & GENMASK_ULL(47, 16)) >> 16; >> + >> + if (!lpi_id) >> + return 0; >> + >> + *next = (val & GENMASK_ULL(63, 48)) >> 48; > > No need for the mask here, just ">> 48" would be enough. sure > >> + >> + collection = find_collection(its, coll_id); >> + if (!collection) >> + return -EINVAL; >> + >> + ret = vgic_its_alloc_ite(dev, &ite, collection, >> + lpi_id, event_id); >> + if (ret) >> + return ret; >> + >> + irq = vgic_add_lpi(kvm, lpi_id); >> + if (IS_ERR(irq)) >> + return PTR_ERR(irq); >> + ite->irq = irq; >> + >> + /* restore the configuration of the LPI */ >> + ret = update_lpi_config(kvm, irq, NULL); >> + if (ret) >> + return ret; >> + >> + update_affinity_ite(kvm, ite); >> + return 0; >> +} >> + >> +static int vgic_its_flush_itt(struct vgic_its *its, struct its_device *device) >> +{ >> + gpa_t base = device->itt_addr; >> + struct its_ite *ite; >> + int ret; >> + >> + list_for_each_entry(ite, &device->itt_head, ite_list) { >> + gpa_t gpa = base + ite->event_id * VITS_ESZ; >> + >> + ret = vgic_its_flush_ite(its, device, ite, gpa); >> + if (ret) >> + return ret; >> + } >> + return 0; >> +} >> + >> +static int vgic_its_restore_itt(struct vgic_its *its, >> + struct its_device *dev) >> +{ >> + size_t max_size = (2 << dev->nb_eventid_bits) * VITS_ESZ; > > I think that depends on your usage of nb_eventid_bits, but this "2 <<" > is really confusing here. So I really think you should just hold the > actual number of bits in this variable and handle the +/- 1 encoding > just once when sourcing the information. fixed now as dev->nb_eventid_bits actually matches the number of bits. Sorry for the confusion. I must have been in orbit when I wrote that 2 << stuff. Thanks Eric > > The rest looks fine. > > Cheers, > Andre. > >> + gpa_t base = dev->itt_addr; >> + int ret; >> + >> + ret = lookup_table(its, base, max_size, VITS_ESZ, 0, >> + vgic_its_restore_ite, dev); >> + >> + if (ret < 0) >> + return ret; >> + return 0; >> +} >> + >> /** >> * vgic_its_flush_device_tables - flush the device table and all ITT >> * into guest RAM >>
WARNING: multiple messages have this Message-ID (diff)
From: eric.auger@redhat.com (Auger Eric) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 17/19] KVM: arm64: ITS: ITT flush and restore Date: Wed, 22 Mar 2017 15:17:38 +0100 [thread overview] Message-ID: <3e332896-bf38-7ebc-f50d-0598f6c3058a@redhat.com> (raw) In-Reply-To: <41f6b5b7-275e-8752-cdd7-96bb1e53ab04@arm.com> Hi Andre, On 21/03/2017 19:13, Andre Przywara wrote: > Hi, > > On 06/03/17 11:34, Eric Auger wrote: >> Introduce routines to flush and restore device ITT and their >> interrupt table entries (ITE). >> >> The routines will be called on device table flush and >> restore. >> >> Signed-off-by: Eric Auger <eric.auger@redhat.com> >> >> --- >> v2 -> v3: >> - add return 0 in vgic_its_restore_ite (was in subsequent patch) >> >> v2: creation >> --- >> virt/kvm/arm/vgic/vgic-its.c | 100 +++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 100 insertions(+) >> >> diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c >> index 1060125..a216849 100644 >> --- a/virt/kvm/arm/vgic/vgic-its.c >> +++ b/virt/kvm/arm/vgic/vgic-its.c >> @@ -1748,6 +1748,106 @@ static int vgic_its_restore_pending_tables(struct vgic_its *its) >> return -ENXIO; >> } >> >> +static int vgic_its_flush_ite(struct vgic_its *its, struct its_device *dev, >> + struct its_ite *ite, gpa_t gpa) >> +{ >> + struct kvm *kvm = its->dev->kvm; >> + u32 next_offset; >> + u64 val; >> + >> + next_offset = compute_next_eventid_offset(&dev->itt_head, ite); >> + val = ((u64)next_offset << 48) | ((u64)ite->lpi << 16) | >> + ite->collection->collection_id; >> + val = cpu_to_le64(val); >> + return kvm_write_guest(kvm, gpa, &val, VITS_ESZ); >> +} >> + >> +/** >> + * vgic_its_restore_ite - restore an interrupt translation entry >> + * @event_id: id used for indexing >> + * @ptr: kernel VA where the 8 byte ITE is located >> + * @opaque: pointer to the its_device >> + * @next: id offset to the next entry >> + */ >> +static int vgic_its_restore_ite(struct vgic_its *its, u32 event_id, >> + void *ptr, void *opaque, u32 *next) >> +{ >> + struct its_device *dev = (struct its_device *)opaque; >> + struct its_collection *collection; >> + struct kvm *kvm = its->dev->kvm; >> + u64 val, *p = (u64 *)ptr; >> + struct vgic_irq *irq; >> + u32 coll_id, lpi_id; >> + struct its_ite *ite; >> + int ret; >> + >> + val = *p; >> + *next = 1; >> + >> + val = le64_to_cpu(val); >> + >> + coll_id = val & GENMASK_ULL(15, 0); >> + lpi_id = (val & GENMASK_ULL(47, 16)) >> 16; >> + >> + if (!lpi_id) >> + return 0; >> + >> + *next = (val & GENMASK_ULL(63, 48)) >> 48; > > No need for the mask here, just ">> 48" would be enough. sure > >> + >> + collection = find_collection(its, coll_id); >> + if (!collection) >> + return -EINVAL; >> + >> + ret = vgic_its_alloc_ite(dev, &ite, collection, >> + lpi_id, event_id); >> + if (ret) >> + return ret; >> + >> + irq = vgic_add_lpi(kvm, lpi_id); >> + if (IS_ERR(irq)) >> + return PTR_ERR(irq); >> + ite->irq = irq; >> + >> + /* restore the configuration of the LPI */ >> + ret = update_lpi_config(kvm, irq, NULL); >> + if (ret) >> + return ret; >> + >> + update_affinity_ite(kvm, ite); >> + return 0; >> +} >> + >> +static int vgic_its_flush_itt(struct vgic_its *its, struct its_device *device) >> +{ >> + gpa_t base = device->itt_addr; >> + struct its_ite *ite; >> + int ret; >> + >> + list_for_each_entry(ite, &device->itt_head, ite_list) { >> + gpa_t gpa = base + ite->event_id * VITS_ESZ; >> + >> + ret = vgic_its_flush_ite(its, device, ite, gpa); >> + if (ret) >> + return ret; >> + } >> + return 0; >> +} >> + >> +static int vgic_its_restore_itt(struct vgic_its *its, >> + struct its_device *dev) >> +{ >> + size_t max_size = (2 << dev->nb_eventid_bits) * VITS_ESZ; > > I think that depends on your usage of nb_eventid_bits, but this "2 <<" > is really confusing here. So I really think you should just hold the > actual number of bits in this variable and handle the +/- 1 encoding > just once when sourcing the information. fixed now as dev->nb_eventid_bits actually matches the number of bits. Sorry for the confusion. I must have been in orbit when I wrote that 2 << stuff. Thanks Eric > > The rest looks fine. > > Cheers, > Andre. > >> + gpa_t base = dev->itt_addr; >> + int ret; >> + >> + ret = lookup_table(its, base, max_size, VITS_ESZ, 0, >> + vgic_its_restore_ite, dev); >> + >> + if (ret < 0) >> + return ret; >> + return 0; >> +} >> + >> /** >> * vgic_its_flush_device_tables - flush the device table and all ITT >> * into guest RAM >>
next prev parent reply other threads:[~2017-03-22 14:17 UTC|newest] Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-06 11:34 [PATCH v3 00/19] vITS save/restore Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-06 11:34 ` [PATCH v3 01/19] KVM: arm/arm64: Add vITS save/restore API documentation Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-13 13:08 ` Peter Maydell 2017-03-13 13:08 ` Peter Maydell 2017-03-13 14:42 ` Auger Eric 2017-03-13 14:42 ` Auger Eric 2017-03-13 17:38 ` Peter Maydell 2017-03-13 17:38 ` Peter Maydell 2017-03-16 15:25 ` Auger Eric 2017-03-16 15:25 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 02/19] KVM: arm/arm64: rename itte into ite Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-06 11:34 ` [PATCH v3 03/19] arm/arm64: vgic: turn vgic_find_mmio_region into public Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-17 14:38 ` Andre Przywara 2017-03-17 14:38 ` Andre Przywara 2017-03-21 17:38 ` Auger Eric 2017-03-21 17:38 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 04/19] KVM: arm64: ITS: KVM_DEV_ARM_VGIC_GRP_ITS_REGS group Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:12 ` Andre Przywara 2017-03-20 18:12 ` Andre Przywara 2017-03-06 11:34 ` [PATCH v3 05/19] KVM: arm64: ITS: Implement vgic_its_has_attr_regs and attr_regs_access Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:13 ` Andre Przywara 2017-03-20 18:13 ` Andre Przywara 2017-03-22 14:15 ` Auger Eric 2017-03-22 14:15 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 06/19] KVM: arm64: ITS: Implement vgic_mmio_uaccess_write_its_creadr Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:14 ` Andre Przywara 2017-03-20 18:14 ` Andre Przywara 2017-03-24 10:38 ` Auger Eric 2017-03-24 10:38 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 07/19] KVM: arm64: ITS: Report the ITE size in GITS_TYPER Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-17 14:39 ` Andre Przywara 2017-03-17 14:39 ` Andre Przywara 2017-03-21 17:38 ` Auger Eric 2017-03-21 17:38 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 08/19] KVM: arm64: ITS: Interpret MAPD Size field and check related errors Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-17 15:03 ` Andre Przywara 2017-03-17 15:03 ` Andre Przywara 2017-03-21 17:40 ` Auger Eric 2017-03-21 17:40 ` Auger Eric 2017-03-21 17:57 ` Andre Przywara 2017-03-21 17:57 ` Andre Przywara 2017-03-06 11:34 ` [PATCH v3 09/19] KVM: arm64: ITS: Interpret MAPD ITT_addr field Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-17 15:19 ` Andre Przywara 2017-03-17 15:19 ` Andre Przywara 2017-03-21 17:41 ` Auger Eric 2017-03-21 17:41 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 10/19] KVM: arm64: ITS: Check the device id matches TYPER DEVBITS range Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-17 15:41 ` Andre Przywara 2017-03-17 15:41 ` Andre Przywara 2017-03-21 17:42 ` Auger Eric 2017-03-21 17:42 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 11/19] KVM: arm64: ITS: KVM_DEV_ARM_VGIC_GRP_ITS_TABLES group Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:14 ` Andre Przywara 2017-03-20 18:14 ` Andre Przywara 2017-03-22 14:29 ` Auger Eric 2017-03-22 14:29 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 12/19] KVM: arm64: ITS: vgic_its_alloc_ite/device Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-17 17:01 ` Andre Przywara 2017-03-17 17:01 ` Andre Przywara 2017-03-21 17:42 ` Auger Eric 2017-03-21 17:42 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 13/19] KVM: arm64: ITS: Sort the device and ITE lists Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:14 ` Andre Przywara 2017-03-20 18:14 ` Andre Przywara 2017-03-06 11:34 ` [PATCH v3 14/19] KVM: arm64: ITS: Add infrastructure for table lookup Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-21 18:12 ` Andre Przywara 2017-03-21 18:12 ` Andre Przywara 2017-03-22 14:40 ` Auger Eric 2017-03-22 14:40 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 15/19] KVM: arm64: ITS: Collection table save/restore Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-21 18:13 ` Andre Przywara 2017-03-21 18:13 ` Andre Przywara 2017-03-22 14:12 ` Auger Eric 2017-03-22 14:12 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 16/19] KVM: arm64: ITS: vgic_its_check_id returns the entry's GPA Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-21 18:12 ` Andre Przywara 2017-03-21 18:12 ` Andre Przywara 2017-03-22 14:11 ` Auger Eric 2017-03-22 14:11 ` Auger Eric 2017-03-22 14:22 ` Auger Eric 2017-03-22 14:22 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 17/19] KVM: arm64: ITS: ITT flush and restore Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-21 18:13 ` Andre Przywara 2017-03-21 18:13 ` Andre Przywara 2017-03-22 14:17 ` Auger Eric [this message] 2017-03-22 14:17 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 18/19] KVM: arm64: ITS: Device table save/restore Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-22 14:39 ` Andre Przywara 2017-03-22 14:39 ` Andre Przywara 2017-03-24 10:38 ` Auger Eric 2017-03-24 10:38 ` Auger Eric 2017-03-24 10:45 ` Auger Eric 2017-03-24 10:45 ` Auger Eric 2017-03-24 11:12 ` Andre Przywara 2017-03-24 11:12 ` Andre Przywara 2017-03-24 11:27 ` Auger Eric 2017-03-24 11:27 ` Auger Eric 2017-03-24 11:14 ` Andre Przywara 2017-03-24 11:14 ` Andre Przywara 2017-03-24 11:28 ` Auger Eric 2017-03-24 11:28 ` Auger Eric 2017-03-06 11:34 ` [PATCH v3 19/19] KVM: arm64: ITS: Pending " Eric Auger 2017-03-06 11:34 ` Eric Auger 2017-03-20 18:21 ` Andre Przywara 2017-03-20 18:21 ` Andre Przywara 2017-03-22 15:12 ` Auger Eric 2017-03-22 15:12 ` Auger Eric 2017-03-22 16:22 ` André Przywara 2017-03-22 16:22 ` André Przywara 2017-03-22 14:39 ` Andre Przywara 2017-03-22 14:39 ` Andre Przywara 2017-03-24 11:20 ` Auger Eric 2017-03-24 11:20 ` 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=3e332896-bf38-7ebc-f50d-0598f6c3058a@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.