From: Andre Przywara <andre.przywara@arm.com> To: Eric Auger <eric.auger@redhat.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, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com Subject: Re: [PATCH v3 15/19] KVM: arm64: ITS: Collection table save/restore Date: Tue, 21 Mar 2017 18:13:09 +0000 [thread overview] Message-ID: <12e8bb9b-75cb-998b-fb7c-c5f96adafd59@arm.com> (raw) In-Reply-To: <1488800074-21991-16-git-send-email-eric.auger@redhat.com> Hi, On 06/03/17 11:34, Eric Auger wrote: > The flush path copies the collection entries into guest RAM > at the GPA specified in the BASER register. This obviously > requires the BASER to be set. The last written element > is a dummy collection table entry. > > We do not index by collection ID as the collection entry > can fit into 8 bytes while containing the collection ID. > > On restore path we re-allocate the collection objects. > > Signed-off-by: Eric Auger <eric.auger@redhat.com> > > --- > > v1 -> v2: > - reword commit message and directly use 8 as entry size > - no kvm parameter anymore > - add helper for flush/restore cte > - table size computed here > - add le64/cpu conversions > --- > virt/kvm/arm/vgic/vgic-its.c | 94 +++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 92 insertions(+), 2 deletions(-) > > diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c > index cf04776..ad67759 100644 > --- a/virt/kvm/arm/vgic/vgic-its.c > +++ b/virt/kvm/arm/vgic/vgic-its.c > @@ -1761,13 +1761,84 @@ static int vgic_its_restore_device_tables(struct vgic_its *its) > return -ENXIO; > } > > +static int vgic_its_flush_cte(struct vgic_its *its, > + struct its_collection *collection, u64 *ptr) I don't think "u64 *ptr" is right here, why not use "gpa_t gpa" and save the cast below? > +{ > + u64 val; > + int ret; > + > + val = ((u64)1 << 63 | ((u64)collection->target_addr << 16) | > + collection->collection_id); > + val = cpu_to_le64(val); > + ret = kvm_write_guest(its->dev->kvm, (gpa_t)ptr, &val, 8); > + return ret; > +} > + > +static int vgic_its_restore_cte(struct vgic_its *its, u64 *ptr, bool *valid) > +{ > + struct its_collection *collection; > + u32 target_addr; > + u32 coll_id; > + u64 val; > + int ret; > + > + *valid = false; > + > + ret = kvm_read_guest(its->dev->kvm, (gpa_t)ptr, &val, 8); > + if (ret) > + return ret; > + val = le64_to_cpu(val); > + *valid = val & BIT_ULL(63); > + > + if (!*valid) > + return 0; > + > + target_addr = (u32)(val >> 16); > + coll_id = val & 0xFFFF; > + ret = vgic_its_alloc_collection(its, &collection, coll_id); I think you should do as the other users do and check if there is a collection with that ID already. Or refactor vgic_its_alloc_collection() to do that for you: allocate or use an existing one. > + if (ret) > + return ret; > + collection->target_addr = target_addr; > + return 0; > +} > + > /** > * vgic_its_flush_collection_table - flush the collection table into > * guest RAM > */ > static int vgic_its_flush_collection_table(struct vgic_its *its) > { > - return -ENXIO; > + struct its_collection *collection; > + u64 val, *ptr; Please don't use a pointer for that guest address, use gpa_t instead. > + size_t max_size, filled = 0; > + int ret; > + > + ptr = (u64 *)(BASER_ADDRESS(its->baser_coll_table)); > + if (!ptr) > + return 0; > + > + max_size = GITS_BASER_NR_PAGES(its->baser_coll_table) * SZ_64K; > + > + list_for_each_entry(collection, &its->collection_list, coll_list) { > + if (filled == max_size) > + return -ENOSPC; > + ret = vgic_its_flush_cte(its, collection, ptr); > + if (ret) > + return ret; > + ptr++; > + filled += 8; > + } > + > + if (filled == max_size) > + return 0; > + > + /* > + * table is not fully filled, add a last dummy element > + * with valid bit unset > + */ > + val = 0; > + ret = kvm_write_guest(its->dev->kvm, (gpa_t)ptr, &val, 8); > + return ret; > } > > /** > @@ -1777,7 +1848,26 @@ static int vgic_its_flush_collection_table(struct vgic_its *its) > */ > static int vgic_its_restore_collection_table(struct vgic_its *its) > { > - return -ENXIO; > + size_t max_size, read = 0; > + u64 *ptr; Same comment as above, please use gpa_t. Cheers, Andre. > + int ret; > + > + ptr = (u64 *)(BASER_ADDRESS(its->baser_coll_table)); > + if (!ptr) > + return 0; > + > + max_size = GITS_BASER_NR_PAGES(its->baser_coll_table) * SZ_64K; > + > + while (read < max_size) { > + bool valid; > + > + ret = vgic_its_restore_cte(its, ptr, &valid); > + if (!valid || ret) > + break; > + ptr++; > + read += 8; > + } > + return ret; > } > > /** >
WARNING: multiple messages have this Message-ID (diff)
From: andre.przywara@arm.com (Andre Przywara) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 15/19] KVM: arm64: ITS: Collection table save/restore Date: Tue, 21 Mar 2017 18:13:09 +0000 [thread overview] Message-ID: <12e8bb9b-75cb-998b-fb7c-c5f96adafd59@arm.com> (raw) In-Reply-To: <1488800074-21991-16-git-send-email-eric.auger@redhat.com> Hi, On 06/03/17 11:34, Eric Auger wrote: > The flush path copies the collection entries into guest RAM > at the GPA specified in the BASER register. This obviously > requires the BASER to be set. The last written element > is a dummy collection table entry. > > We do not index by collection ID as the collection entry > can fit into 8 bytes while containing the collection ID. > > On restore path we re-allocate the collection objects. > > Signed-off-by: Eric Auger <eric.auger@redhat.com> > > --- > > v1 -> v2: > - reword commit message and directly use 8 as entry size > - no kvm parameter anymore > - add helper for flush/restore cte > - table size computed here > - add le64/cpu conversions > --- > virt/kvm/arm/vgic/vgic-its.c | 94 +++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 92 insertions(+), 2 deletions(-) > > diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c > index cf04776..ad67759 100644 > --- a/virt/kvm/arm/vgic/vgic-its.c > +++ b/virt/kvm/arm/vgic/vgic-its.c > @@ -1761,13 +1761,84 @@ static int vgic_its_restore_device_tables(struct vgic_its *its) > return -ENXIO; > } > > +static int vgic_its_flush_cte(struct vgic_its *its, > + struct its_collection *collection, u64 *ptr) I don't think "u64 *ptr" is right here, why not use "gpa_t gpa" and save the cast below? > +{ > + u64 val; > + int ret; > + > + val = ((u64)1 << 63 | ((u64)collection->target_addr << 16) | > + collection->collection_id); > + val = cpu_to_le64(val); > + ret = kvm_write_guest(its->dev->kvm, (gpa_t)ptr, &val, 8); > + return ret; > +} > + > +static int vgic_its_restore_cte(struct vgic_its *its, u64 *ptr, bool *valid) > +{ > + struct its_collection *collection; > + u32 target_addr; > + u32 coll_id; > + u64 val; > + int ret; > + > + *valid = false; > + > + ret = kvm_read_guest(its->dev->kvm, (gpa_t)ptr, &val, 8); > + if (ret) > + return ret; > + val = le64_to_cpu(val); > + *valid = val & BIT_ULL(63); > + > + if (!*valid) > + return 0; > + > + target_addr = (u32)(val >> 16); > + coll_id = val & 0xFFFF; > + ret = vgic_its_alloc_collection(its, &collection, coll_id); I think you should do as the other users do and check if there is a collection with that ID already. Or refactor vgic_its_alloc_collection() to do that for you: allocate or use an existing one. > + if (ret) > + return ret; > + collection->target_addr = target_addr; > + return 0; > +} > + > /** > * vgic_its_flush_collection_table - flush the collection table into > * guest RAM > */ > static int vgic_its_flush_collection_table(struct vgic_its *its) > { > - return -ENXIO; > + struct its_collection *collection; > + u64 val, *ptr; Please don't use a pointer for that guest address, use gpa_t instead. > + size_t max_size, filled = 0; > + int ret; > + > + ptr = (u64 *)(BASER_ADDRESS(its->baser_coll_table)); > + if (!ptr) > + return 0; > + > + max_size = GITS_BASER_NR_PAGES(its->baser_coll_table) * SZ_64K; > + > + list_for_each_entry(collection, &its->collection_list, coll_list) { > + if (filled == max_size) > + return -ENOSPC; > + ret = vgic_its_flush_cte(its, collection, ptr); > + if (ret) > + return ret; > + ptr++; > + filled += 8; > + } > + > + if (filled == max_size) > + return 0; > + > + /* > + * table is not fully filled, add a last dummy element > + * with valid bit unset > + */ > + val = 0; > + ret = kvm_write_guest(its->dev->kvm, (gpa_t)ptr, &val, 8); > + return ret; > } > > /** > @@ -1777,7 +1848,26 @@ static int vgic_its_flush_collection_table(struct vgic_its *its) > */ > static int vgic_its_restore_collection_table(struct vgic_its *its) > { > - return -ENXIO; > + size_t max_size, read = 0; > + u64 *ptr; Same comment as above, please use gpa_t. Cheers, Andre. > + int ret; > + > + ptr = (u64 *)(BASER_ADDRESS(its->baser_coll_table)); > + if (!ptr) > + return 0; > + > + max_size = GITS_BASER_NR_PAGES(its->baser_coll_table) * SZ_64K; > + > + while (read < max_size) { > + bool valid; > + > + ret = vgic_its_restore_cte(its, ptr, &valid); > + if (!valid || ret) > + break; > + ptr++; > + read += 8; > + } > + return ret; > } > > /** >
next prev parent reply other threads:[~2017-03-21 18:13 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 [this message] 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 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=12e8bb9b-75cb-998b-fb7c-c5f96adafd59@arm.com \ --to=andre.przywara@arm.com \ --cc=Prasun.Kapoor@cavium.com \ --cc=Vijaya.Kumar@cavium.com \ --cc=christoffer.dall@linaro.org \ --cc=dgilbert@redhat.com \ --cc=drjones@redhat.com \ --cc=eric.auger.pro@gmail.com \ --cc=eric.auger@redhat.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.