From: eric.auger@redhat.com (Auger Eric)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 19/22] KVM: arm64: vgic-its: ITT save and restore
Date: Wed, 3 May 2017 23:55:34 +0200 [thread overview]
Message-ID: <3af9ae62-1e20-e0f4-a2a9-db0a7a1b10ef@redhat.com> (raw)
In-Reply-To: <20170503163742.GA29506@cbox>
Hi Christoffer,
On 03/05/2017 18:37, Christoffer Dall wrote:
> On Wed, May 03, 2017 at 06:08:58PM +0200, Auger Eric wrote:
>> Hi Christoffer,
>>
>> On 30/04/2017 22:14, Christoffer Dall wrote:
>>> On Fri, Apr 14, 2017 at 12:15:31PM +0200, Eric Auger wrote:
>>>> Introduce routines to save and restore device ITT and their
>>>> interrupt table entries (ITE).
>>>>
>>>> The routines will be called on device table save and
>>>> restore. They will become static in subsequent patches.
>>>
>>> Why this bottom-up approach? Couldn't you start by having the patch
>>> that restores the device table and define the static functions that
>>> return an error there
>> done
>> , and then fill them in with subsequent patches
>>> (liek this one)?
>>>
>>> That would have the added benefit of being able to tell how things are
>>> designed to be called.
>>>
>>>>
>>>> Signed-off-by: Eric Auger <eric.auger@redhat.com>
>>>>
>>>> ---
>>>> v4 -> v5:
>>>> - ITE are now sorted by eventid on the flush
>>>> - rename *flush* into *save*
>>>> - use macros for shits and masks
>>>> - pass ite_esz to vgic_its_save_ite
>>>>
>>>> v3 -> v4:
>>>> - lookup_table and compute_next_eventid_offset become static in this
>>>> patch
>>>> - remove static along with vgic_its_flush/restore_itt to avoid
>>>> compilation warnings
>>>> - next field only computed with a shift (mask removed)
>>>> - handle the case where the last element has not been found
>>>>
>>>> v2 -> v3:
>>>> - add return 0 in vgic_its_restore_ite (was in subsequent patch)
>>>>
>>>> v2: creation
>>>> ---
>>>> virt/kvm/arm/vgic/vgic-its.c | 128 ++++++++++++++++++++++++++++++++++++++++++-
>>>> virt/kvm/arm/vgic/vgic.h | 4 ++
>>>> 2 files changed, 129 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
>>>> index 35b2ca1..b02fc3f 100644
>>>> --- a/virt/kvm/arm/vgic/vgic-its.c
>>>> +++ b/virt/kvm/arm/vgic/vgic-its.c
>>>> @@ -23,6 +23,7 @@
>>>> #include <linux/interrupt.h>
>>>> #include <linux/list.h>
>>>> #include <linux/uaccess.h>
>>>> +#include <linux/list_sort.h>
>>>>
>>>> #include <linux/irqchip/arm-gic-v3.h>
>>>>
>>>> @@ -1695,7 +1696,7 @@ u32 compute_next_devid_offset(struct list_head *h, struct its_device *dev)
>>>> return min_t(u32, next_offset, VITS_DTE_MAX_DEVID_OFFSET);
>>>> }
>>>>
>>>> -u32 compute_next_eventid_offset(struct list_head *h, struct its_ite *ite)
>>>> +static u32 compute_next_eventid_offset(struct list_head *h, struct its_ite *ite)
>>>> {
>>>> struct list_head *e = &ite->ite_list;
>>>> struct its_ite *next;
>>>> @@ -1737,8 +1738,8 @@ typedef int (*entry_fn_t)(struct vgic_its *its, u32 id, void *entry,
>>>> *
>>>> * Return: < 0 on error, 1 if last element identified, 0 otherwise
>>>> */
>>>> -int lookup_table(struct vgic_its *its, gpa_t base, int size, int esz,
>>>> - int start_id, entry_fn_t fn, void *opaque)
>>>> +static int lookup_table(struct vgic_its *its, gpa_t base, int size, int esz,
>>>> + int start_id, entry_fn_t fn, void *opaque)
>>>> {
>>>> void *entry = kzalloc(esz, GFP_KERNEL);
>>>> struct kvm *kvm = its->dev->kvm;
>>>> @@ -1773,6 +1774,127 @@ int lookup_table(struct vgic_its *its, gpa_t base, int size, int esz,
>>>> }
>>>>
>>>> /**
>>>> + * vgic_its_save_ite - Save an interrupt translation entry at @gpa
>>>> + */
>>>> +static int vgic_its_save_ite(struct vgic_its *its, struct its_device *dev,
>>>> + struct its_ite *ite, gpa_t gpa, int ite_esz)
>>>> +{
>>>> + 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 << KVM_ITS_ITE_NEXT_SHIFT) |
>>>> + ((u64)ite->lpi << KVM_ITS_ITE_PINTID_SHIFT) |
>>>> + ite->collection->collection_id;
>>>> + val = cpu_to_le64(val);
>>>> + return kvm_write_guest(kvm, gpa, &val, ite_esz);
>>>> +}
>>>> +
>>>> +/**
>>>> + * vgic_its_restore_ite - restore an interrupt translation entry
>>>> + * @event_id: id used for indexing
>>>> + * @ptr: pointer to the ITE entry
>>>> + * @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;
>>>
>>> nit: initializations on separate line (and possible do that just above
>>> assigning val).
>> done
>>>
>>>> + 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 & KVM_ITS_ITE_ICID_MASK;
>>>> + lpi_id = (val & KVM_ITS_ITE_PINTID_MASK) >> KVM_ITS_ITE_PINTID_SHIFT;
>>>> +
>>>> + if (!lpi_id)
>>>> + return 0;
>>>
>>> are all non-zero LPI IDs valid? Don't we have a wrapper that tests if
>>> the ID is valid?
>> no, lpi_id must be >= GIC_MIN_LPI=8192; added that check.
>> ABI Doc says lpi_id==0 is interpreted as invalid. Other values <
>> GIC_MIN_LPI cause an -EINVAL error
>>>
>>> (looks like it's possible to add LPIs with the INTID range of SPIs, SGIs
>>> and PPIs here)
>>
>>>
>>>> +
>>>> + *next = val >> KVM_ITS_ITE_NEXT_SHIFT;
>>>
>>> Don't we need to validate this somehow since it will presumably be used
>>> to forward a pointer somehow by the caller?
>> checked against max number of eventids supported by the device
>>>
>>>> +
>>>> + 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_ite_cmp(void *priv, struct list_head *a,
>>>> + struct list_head *b)
>>>> +{
>>>> + struct its_ite *itea = container_of(a, struct its_ite, ite_list);
>>>> + struct its_ite *iteb = container_of(b, struct its_ite, ite_list);
>>>> +
>>>> + if (itea->event_id < iteb->event_id)
>>>> + return -1;
>>>> + else
>>>> + return 1;
>>>> +}
>>>> +
>>>> +int vgic_its_save_itt(struct vgic_its *its, struct its_device *device)
>>>> +{
>>>> + const struct vgic_its_abi *abi = vgic_its_get_abi(its);
>>>> + gpa_t base = device->itt_addr;
>>>> + struct its_ite *ite;
>>>> + int ret, ite_esz = abi->ite_esz;
>>>
>>> nit: initializations on separate line
>> OK
>>>
>>>> +
>>>> + list_sort(NULL, &device->itt_head, vgic_its_ite_cmp);
>>>> +
>>>> + list_for_each_entry(ite, &device->itt_head, ite_list) {
>>>> + gpa_t gpa = base + ite->event_id * ite_esz;
>>>> +
>>>> + ret = vgic_its_save_ite(its, device, ite, gpa, ite_esz);
>>>> + if (ret)
>>>> + return ret;
>>>> + }
>>>> + return 0;
>>>> +}
>>>> +
>>>> +int vgic_its_restore_itt(struct vgic_its *its, struct its_device *dev)
>>>> +{
>>>> + const struct vgic_its_abi *abi = vgic_its_get_abi(its);
>>>> + gpa_t base = dev->itt_addr;
>>>> + int ret, ite_esz = abi->ite_esz;
>>>> + size_t max_size = BIT_ULL(dev->nb_eventid_bits) * ite_esz;
>>>
>>> nit: initializations on separate line
>> OK
>>>
>>>> +
>>>> + ret = lookup_table(its, base, max_size, ite_esz, 0,
>>>> + vgic_its_restore_ite, dev);
>>>
>>> nit: extra white space
>>>
>>>> +
>>>> + if (ret < 0)
>>>> + return ret;
>>>> +
>>>> + /* if the last element has not been found we are in trouble */
>>>> + return ret ? 0 : -EINVAL;
>>>
>>> hmm, these are values potentially created by the guest in guest RAM,
>>> right? So do we really abort migration and return an error to userspace
>>> in this case?
>> So we discussed with Peter/dave we shouldn't abort() in qemu in case of
>> such error. The restore table IOCTL will return an error. Up to qemu to
>> print the error. Destination guest will not be functional though.
>>
>
> ok, I'm just wondering if userspace can make a qualified decision based
> on this error code. EINVAL typically means that userspace provided
> something incorrect, which I suppose in a sense is true, but this should
> be the only case where we return EINVAL here.
Userspace must be able to
> tell the cases apart where the guest programmed bogus into memory before
> migration started, in which case we should ignore-and-resume, and where
> QEMU errornously provide some bogus value where the machine state
> becomes unreliable and must be powered down.
guest does not feed much besides few registers the ITS table restore
depends on. In case we want a more subtle error management at userspace
level all the error codes need to be revisited I am afraid. My plan was
to be more rough at the beginning and ignore & resume if ITS table
restore fails.
Thanks
Eric
>
> Thanks,
> -Christoffer
>
next prev parent reply other threads:[~2017-05-03 21:55 UTC|newest]
Thread overview: 132+ 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 ` [PATCH v5 01/22] KVM: arm/arm64: Add ITS save/restore API documentation Eric Auger
2017-04-25 10:38 ` Peter Maydell
2017-04-26 12:31 ` Christoffer Dall
2017-04-26 15:48 ` Auger Eric
2017-04-27 8:57 ` Christoffer Dall
2017-04-27 9:33 ` Auger Eric
2017-04-27 11:02 ` Christoffer Dall
2017-04-27 12:51 ` Auger Eric
2017-04-27 14:45 ` Christoffer Dall
2017-04-27 15:29 ` Auger Eric
2017-04-27 16:23 ` Marc Zyngier
2017-04-27 17:14 ` Auger Eric
2017-04-27 17:27 ` Christoffer Dall
2017-04-27 16:38 ` Christoffer Dall
2017-04-27 17:27 ` Auger Eric
2017-04-27 17:54 ` Christoffer Dall
2017-04-27 19:27 ` Auger Eric
2017-05-04 7:00 ` Auger Eric
2017-05-04 7:40 ` Marc Zyngier
2017-05-04 7:54 ` Auger Eric
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-25 10:43 ` Peter Maydell
2017-04-26 8:26 ` Auger Eric
2017-04-26 8:44 ` Peter Maydell
2017-04-26 8:48 ` Dr. David Alan Gilbert
2017-04-26 9:57 ` Auger Eric
2017-04-26 13:00 ` Christoffer Dall
2017-04-26 13:01 ` Peter Maydell
2017-04-26 13:14 ` Christoffer Dall
2017-04-26 13:26 ` Peter Maydell
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-26 11:21 ` Prakash B
2017-04-27 9:05 ` Christoffer Dall
2017-04-27 9:20 ` Andre Przywara
2017-04-27 9:40 ` Auger Eric
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-26 11:22 ` Prakash B
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-26 11:23 ` Prakash B
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-26 11:23 ` Prakash B
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-26 11:24 ` Prakash B
2017-04-27 11:00 ` Christoffer Dall
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-26 11:24 ` Prakash B
2017-04-27 11:27 ` Christoffer Dall
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-26 11:27 ` Prakash B
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-26 11:27 ` Prakash B
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-26 11:28 ` Prakash B
2017-04-27 16:25 ` Christoffer Dall
2017-04-27 17:15 ` Auger Eric
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-26 11:29 ` Prakash B
2017-04-27 16:43 ` Christoffer Dall
2017-04-27 17:44 ` Auger Eric
2017-04-27 18:09 ` Christoffer Dall
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-26 11:29 ` Prakash B
2017-04-27 16:48 ` Christoffer Dall
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-26 11:31 ` Prakash B
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-26 11:31 ` Prakash B
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-26 11:32 ` Prakash B
2017-04-27 18:06 ` Christoffer Dall
2017-04-27 19:24 ` Auger Eric
2017-04-28 9:47 ` Christoffer Dall
2017-04-30 19:33 ` Christoffer Dall
2017-05-03 13:40 ` Auger Eric
2017-05-03 14:38 ` Christoffer Dall
2017-04-30 19:35 ` Christoffer Dall
2017-05-03 6:53 ` Auger Eric
2017-05-03 8:01 ` Christoffer Dall
2017-05-03 10:22 ` Auger Eric
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-26 11:33 ` Prakash B
2017-04-28 10:44 ` Christoffer Dall
2017-04-28 11:05 ` Auger Eric
2017-04-28 17:42 ` Christoffer Dall
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-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-26 11:34 ` Prakash B
2017-04-30 20:14 ` Christoffer Dall
2017-05-03 16:08 ` Auger Eric
2017-05-03 16:37 ` Christoffer Dall
2017-05-03 21:55 ` Auger Eric [this message]
2017-05-04 7:31 ` Christoffer Dall
2017-05-04 7:40 ` Auger Eric
2017-05-04 8:23 ` Christoffer Dall
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-26 11:34 ` Prakash B
2017-04-30 20:55 ` Christoffer Dall
2017-05-03 14:07 ` Auger Eric
2017-05-03 15:29 ` Christoffer Dall
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-26 11:35 ` Prakash B
2017-04-30 21:10 ` Christoffer Dall
2017-05-03 22:20 ` Auger Eric
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-26 11:35 ` Prakash B
2017-04-30 21:32 ` Christoffer Dall
2017-05-03 22:22 ` Auger Eric
2017-04-26 11:38 ` [PATCH v5 00/22] vITS save/restore Prakash B
2017-04-26 13:02 ` Christoffer Dall
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=3af9ae62-1e20-e0f4-a2a9-db0a7a1b10ef@redhat.com \
--to=eric.auger@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).