From: eric.auger@redhat.com (Eric Auger)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 18/19] KVM: arm64: ITS: Device table save/restore
Date: Mon, 6 Mar 2017 12:34:33 +0100 [thread overview]
Message-ID: <1488800074-21991-19-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1488800074-21991-1-git-send-email-eric.auger@redhat.com>
This patch flushes the device table entries into guest RAM.
Both flat table and 2 stage tables are supported. DeviceId
indexing is used.
For each device listed in the device table, we also flush
the translation table using the vgic_its_flush/restore_itt
routines.
On restore, devices are re-allocated and their itte are
re-built.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
v2 -> v3:
- fix itt_addr bitmask in vgic_its_restore_dte
- addition of return 0 in vgic_its_restore_ite moved to
the ITE related patch
v1 -> v2:
- use 8 byte format for DTE and ITE
- support 2 stage format
- remove kvm parameter
- ITT flush/restore moved in a separate patch
- use deviceid indexing
---
virt/kvm/arm/vgic/vgic-its.c | 144 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 142 insertions(+), 2 deletions(-)
diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index a216849..27ebabd 100644
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -1849,12 +1849,137 @@ static int vgic_its_restore_itt(struct vgic_its *its,
}
/**
+ * vgic_its_flush_dte - Flush a device table entry at a given GPA
+ *
+ * @its: ITS handle
+ * @dev: ITS device
+ * @ptr: GPA
+ */
+static int vgic_its_flush_dte(struct vgic_its *its,
+ struct its_device *dev, gpa_t ptr)
+{
+ struct kvm *kvm = its->dev->kvm;
+ u64 val, itt_addr_field;
+ int ret;
+ u32 next_offset;
+
+ itt_addr_field = dev->itt_addr >> 8;
+ next_offset = compute_next_devid_offset(&its->device_list, dev);
+ val = (((u64)next_offset << 45) | (itt_addr_field << 5) |
+ (dev->nb_eventid_bits - 1));
+ val = cpu_to_le64(val);
+ ret = kvm_write_guest(kvm, ptr, &val, 8);
+ return ret;
+}
+
+/**
+ * vgic_its_restore_dte - restore a device table entry
+ *
+ * @its: its handle
+ * @id: device id the DTE corresponds to
+ * @ptr: kernel VA where the 8 byte DTE is located
+ * @opaque: unused
+ * @next: offset to the next valid device id
+ *
+ * Return: < 0 on error, 0 otherwise
+ */
+static int vgic_its_restore_dte(struct vgic_its *its, u32 id,
+ void *ptr, void *opaque, u32 *next)
+{
+ struct its_device *dev;
+ gpa_t itt_addr;
+ size_t size;
+ u64 val, *p = (u64 *)ptr;
+ int ret;
+
+ val = *p;
+ val = le64_to_cpu(val);
+
+ size = val & GENMASK_ULL(4, 0);
+ itt_addr = (val & GENMASK_ULL(44, 5)) >> 5;
+ *next = 1;
+
+ if (!itt_addr)
+ return 0;
+
+ /* dte entry is valid */
+ *next = (val & GENMASK_ULL(63, 45)) >> 45;
+
+ ret = vgic_its_alloc_device(its, &dev, id,
+ itt_addr, size);
+ if (ret)
+ return ret;
+ ret = vgic_its_restore_itt(its, dev);
+
+ return ret;
+}
+
+/**
* vgic_its_flush_device_tables - flush the device table and all ITT
* into guest RAM
*/
static int vgic_its_flush_device_tables(struct vgic_its *its)
{
- return -ENXIO;
+ struct its_device *dev;
+ u64 baser;
+
+ baser = its->baser_device_table;
+
+ list_for_each_entry(dev, &its->device_list, dev_list) {
+ int ret;
+ gpa_t eaddr;
+
+ if (!vgic_its_check_id(its, baser,
+ dev->device_id, &eaddr))
+ return -EINVAL;
+
+ ret = vgic_its_flush_itt(its, dev);
+ if (ret)
+ return ret;
+
+ ret = vgic_its_flush_dte(its, dev, eaddr);
+ if (ret)
+ return ret;
+ }
+ return 0;
+}
+
+/**
+ * handle_l1_entry - callback used for L1 entries (2 stage case)
+ *
+ * @its: its handle
+ * @id: id
+ * @addr: kernel VA
+ * @opaque: unused
+ * @next_offset: offset to the next L1 entry: 0 if the last element
+ * was found, 1 otherwise
+ */
+static int handle_l1_entry(struct vgic_its *its, u32 id, void *addr,
+ void *opaque, u32 *next_offset)
+{
+ u64 *pe = addr;
+ gpa_t gpa;
+ int l2_start_id = id * (SZ_64K / 8);
+ int ret;
+
+ *pe = le64_to_cpu(*pe);
+ *next_offset = 1;
+
+ if (!(*pe & BIT_ULL(63)))
+ return 0;
+
+ gpa = *pe & GENMASK_ULL(51, 16);
+
+ ret = lookup_table(its, gpa, SZ_64K, 8,
+ l2_start_id, vgic_its_restore_dte, NULL);
+
+ if (ret == 1) {
+ /* last entry was found in this L2 table */
+ *next_offset = 0;
+ ret = 0;
+ }
+
+ return ret;
}
/**
@@ -1863,7 +1988,22 @@ static int vgic_its_flush_device_tables(struct vgic_its *its)
*/
static int vgic_its_restore_device_tables(struct vgic_its *its)
{
- return -ENXIO;
+ u64 baser = its->baser_device_table;
+ int l1_tbl_size = GITS_BASER_NR_PAGES(baser) * SZ_64K;
+ int l1_esz = GITS_BASER_ENTRY_SIZE(baser);
+ gpa_t l1_gpa;
+
+ l1_gpa = BASER_ADDRESS(baser);
+ if (!l1_gpa)
+ return 0;
+
+ if (!(baser & GITS_BASER_INDIRECT))
+ return lookup_table(its, l1_gpa, l1_tbl_size, l1_esz,
+ 0, vgic_its_restore_dte, NULL);
+
+ /* two stage table */
+ return lookup_table(its, l1_gpa, l1_tbl_size, 8, 0,
+ handle_l1_entry, NULL);
}
static int vgic_its_flush_cte(struct vgic_its *its,
--
2.5.5
next prev parent reply other threads:[~2017-03-06 11:34 UTC|newest]
Thread overview: 66+ 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 ` [PATCH v3 01/19] KVM: arm/arm64: Add vITS save/restore API documentation Eric Auger
2017-03-13 13:08 ` Peter Maydell
2017-03-13 14:42 ` Auger Eric
2017-03-13 17:38 ` Peter Maydell
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 ` [PATCH v3 03/19] arm/arm64: vgic: turn vgic_find_mmio_region into public Eric Auger
2017-03-17 14:38 ` Andre Przywara
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-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-20 18:13 ` Andre Przywara
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-20 18:14 ` Andre Przywara
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-17 14:39 ` Andre Przywara
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-17 15:03 ` Andre Przywara
2017-03-21 17:40 ` Auger Eric
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-17 15:19 ` Andre Przywara
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-17 15:41 ` Andre Przywara
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-20 18:14 ` Andre Przywara
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-17 17:01 ` Andre Przywara
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-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-21 18:12 ` Andre Przywara
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-21 18:13 ` Andre Przywara
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-21 18:12 ` Andre Przywara
2017-03-22 14:11 ` 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-21 18:13 ` Andre Przywara
2017-03-22 14:17 ` Auger Eric
2017-03-06 11:34 ` Eric Auger [this message]
2017-03-22 14:39 ` [PATCH v3 18/19] KVM: arm64: ITS: Device table save/restore Andre Przywara
2017-03-24 10:38 ` Auger Eric
2017-03-24 10:45 ` Auger Eric
2017-03-24 11:12 ` Andre Przywara
2017-03-24 11:27 ` Auger Eric
2017-03-24 11:14 ` Andre Przywara
2017-03-24 11:28 ` Auger Eric
2017-03-06 11:34 ` [PATCH v3 19/19] KVM: arm64: ITS: Pending " Eric Auger
2017-03-20 18:21 ` Andre Przywara
2017-03-22 15:12 ` Auger Eric
2017-03-22 16:22 ` André Przywara
2017-03-22 14:39 ` Andre Przywara
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=1488800074-21991-19-git-send-email-eric.auger@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).