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 14/22] KVM: arm64: ITS: vgic_its_alloc_ite/device Date: Mon, 27 Mar 2017 11:31:04 +0200 [thread overview] Message-ID: <1490607072-21610-15-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1490607072-21610-1-git-send-email-eric.auger@redhat.com> Add two new helpers to allocate an its ite and an its device. This will avoid duplication on restore path. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- v3 -> v4: - fix allocation - add comment about its_lock mutex hold v1 -> v2: - report itt_size fix and remove ITE_SIZE - s/itte/ite/g --- virt/kvm/arm/vgic/vgic-its.c | 73 ++++++++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 23 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 76dd562..2a1ccbf 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -726,6 +726,27 @@ static void vgic_its_free_collection(struct vgic_its *its, u32 coll_id) kfree(collection); } +/* Must be called with its_lock mutex held */ +static int vgic_its_alloc_ite(struct its_device *device, + struct its_ite **itep, + struct its_collection *collection, + u32 lpi_id, u32 event_id) +{ + struct its_ite *ite; + + ite = kzalloc(sizeof(*ite), GFP_KERNEL); + if (!ite) + return -ENOMEM; + + ite->event_id = event_id; + ite->collection = collection; + ite->lpi = lpi_id; + + list_add_tail(&ite->ite_list, &device->itt_head); + *itep = ite; + return 0; +} + /* * The MAPTI and MAPI commands map LPIs to ITTEs. * Must be called with its_lock mutex held. @@ -739,7 +760,7 @@ static int vgic_its_cmd_handle_mapi(struct kvm *kvm, struct vgic_its *its, struct its_ite *ite; struct its_device *device; struct its_collection *collection, *new_coll = NULL; - int lpi_nr; + int lpi_nr, ret; struct vgic_irq *irq; device = find_its_device(its, device_id); @@ -769,19 +790,13 @@ static int vgic_its_cmd_handle_mapi(struct kvm *kvm, struct vgic_its *its, new_coll = collection; } - ite = kzalloc(sizeof(struct its_ite), GFP_KERNEL); - if (!ite) { + ret = vgic_its_alloc_ite(device, &ite, collection, lpi_nr, event_id); + if (ret) { if (new_coll) vgic_its_free_collection(its, coll_id); - return -ENOMEM; + return ret; } - ite->event_id = event_id; - list_add_tail(&ite->ite_list, &device->itt_head); - - ite->collection = collection; - ite->lpi = lpi_nr; - irq = vgic_add_lpi(kvm, lpi_nr); if (IS_ERR(irq)) { if (new_coll) @@ -820,6 +835,29 @@ static void vgic_its_unmap_device(struct kvm *kvm, struct its_device *device) kfree(device); } +/* Must be called with its_lock mutex held */ +static int vgic_its_alloc_device(struct vgic_its *its, + struct its_device **devp, + u32 device_id, gpa_t itt_addr, + u8 nb_eventid_bits) +{ + struct its_device *device; + + device = kzalloc(sizeof(*device), GFP_KERNEL); + if (!device) + return -ENOMEM; + + device->device_id = device_id; + device->itt_addr = itt_addr; + device->nb_eventid_bits = nb_eventid_bits; + INIT_LIST_HEAD(&device->itt_head); + + list_add_tail(&device->dev_list, &its->device_list); + *devp = device; + + return 0; +} + /* * MAPD maps or unmaps a device ID to Interrupt Translation Tables (ITTs). * Must be called with the its_lock mutex held. @@ -856,19 +894,8 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, if (!valid) return 0; - device = kzalloc(sizeof(struct its_device), GFP_KERNEL); - if (!device) - return -ENOMEM; - - device->device_id = device_id; - device->nb_eventid_bits = nb_eventid_bits; - device->itt_addr = itt_addr; - - INIT_LIST_HEAD(&device->itt_head); - - list_add_tail(&device->dev_list, &its->device_list); - - return 0; + return vgic_its_alloc_device(its, &device, device_id, + itt_addr, nb_eventid_bits); } /* -- 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 14/22] KVM: arm64: ITS: vgic_its_alloc_ite/device Date: Mon, 27 Mar 2017 11:31:04 +0200 [thread overview] Message-ID: <1490607072-21610-15-git-send-email-eric.auger@redhat.com> (raw) In-Reply-To: <1490607072-21610-1-git-send-email-eric.auger@redhat.com> Add two new helpers to allocate an its ite and an its device. This will avoid duplication on restore path. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- v3 -> v4: - fix allocation - add comment about its_lock mutex hold v1 -> v2: - report itt_size fix and remove ITE_SIZE - s/itte/ite/g --- virt/kvm/arm/vgic/vgic-its.c | 73 ++++++++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 23 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 76dd562..2a1ccbf 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -726,6 +726,27 @@ static void vgic_its_free_collection(struct vgic_its *its, u32 coll_id) kfree(collection); } +/* Must be called with its_lock mutex held */ +static int vgic_its_alloc_ite(struct its_device *device, + struct its_ite **itep, + struct its_collection *collection, + u32 lpi_id, u32 event_id) +{ + struct its_ite *ite; + + ite = kzalloc(sizeof(*ite), GFP_KERNEL); + if (!ite) + return -ENOMEM; + + ite->event_id = event_id; + ite->collection = collection; + ite->lpi = lpi_id; + + list_add_tail(&ite->ite_list, &device->itt_head); + *itep = ite; + return 0; +} + /* * The MAPTI and MAPI commands map LPIs to ITTEs. * Must be called with its_lock mutex held. @@ -739,7 +760,7 @@ static int vgic_its_cmd_handle_mapi(struct kvm *kvm, struct vgic_its *its, struct its_ite *ite; struct its_device *device; struct its_collection *collection, *new_coll = NULL; - int lpi_nr; + int lpi_nr, ret; struct vgic_irq *irq; device = find_its_device(its, device_id); @@ -769,19 +790,13 @@ static int vgic_its_cmd_handle_mapi(struct kvm *kvm, struct vgic_its *its, new_coll = collection; } - ite = kzalloc(sizeof(struct its_ite), GFP_KERNEL); - if (!ite) { + ret = vgic_its_alloc_ite(device, &ite, collection, lpi_nr, event_id); + if (ret) { if (new_coll) vgic_its_free_collection(its, coll_id); - return -ENOMEM; + return ret; } - ite->event_id = event_id; - list_add_tail(&ite->ite_list, &device->itt_head); - - ite->collection = collection; - ite->lpi = lpi_nr; - irq = vgic_add_lpi(kvm, lpi_nr); if (IS_ERR(irq)) { if (new_coll) @@ -820,6 +835,29 @@ static void vgic_its_unmap_device(struct kvm *kvm, struct its_device *device) kfree(device); } +/* Must be called with its_lock mutex held */ +static int vgic_its_alloc_device(struct vgic_its *its, + struct its_device **devp, + u32 device_id, gpa_t itt_addr, + u8 nb_eventid_bits) +{ + struct its_device *device; + + device = kzalloc(sizeof(*device), GFP_KERNEL); + if (!device) + return -ENOMEM; + + device->device_id = device_id; + device->itt_addr = itt_addr; + device->nb_eventid_bits = nb_eventid_bits; + INIT_LIST_HEAD(&device->itt_head); + + list_add_tail(&device->dev_list, &its->device_list); + *devp = device; + + return 0; +} + /* * MAPD maps or unmaps a device ID to Interrupt Translation Tables (ITTs). * Must be called with the its_lock mutex held. @@ -856,19 +894,8 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, if (!valid) return 0; - device = kzalloc(sizeof(struct its_device), GFP_KERNEL); - if (!device) - return -ENOMEM; - - device->device_id = device_id; - device->nb_eventid_bits = nb_eventid_bits; - device->itt_addr = itt_addr; - - INIT_LIST_HEAD(&device->itt_head); - - list_add_tail(&device->dev_list, &its->device_list); - - return 0; + return vgic_its_alloc_device(its, &device, device_id, + itt_addr, nb_eventid_bits); } /* -- 2.5.5
next prev parent reply other threads:[~2017-03-27 9:31 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 ` [PATCH v4 06/22] KVM: arm64: ITS: Implement vgic_its_has_attr_regs and attr_regs_access Eric Auger 2017-03-27 9:30 ` 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 ` Eric Auger [this message] 2017-03-27 9:31 ` [PATCH v4 14/22] KVM: arm64: ITS: vgic_its_alloc_ite/device 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-15-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.