From: eric.auger@redhat.com (Eric Auger)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 18/22] KVM: arm64: ITS: Collection table save/restore
Date: Mon, 27 Mar 2017 11:31:08 +0200 [thread overview]
Message-ID: <1490607072-21610-19-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1490607072-21610-1-git-send-email-eric.auger@redhat.com>
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>
---
v3 -> v4:
- replaced u64 *ptr by gpa_t gpa
- check the collection does not exist before allocating it
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 | 99 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 97 insertions(+), 2 deletions(-)
diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index 8eaeba4..df984b6 100644
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -1828,13 +1828,89 @@ 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, gpa_t gpa)
+{
+ 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, &val, 8);
+ return ret;
+}
+
+static int vgic_its_restore_cte(struct vgic_its *its, gpa_t gpa, 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, &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;
+
+ collection = find_collection(its, coll_id);
+ if (collection)
+ return -EEXIST;
+ ret = vgic_its_alloc_collection(its, &collection, coll_id);
+ 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;
+ gpa_t gpa;
+ size_t max_size, filled = 0;
+ int ret;
+
+ gpa = BASER_ADDRESS(its->baser_coll_table);
+ if (!gpa)
+ 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, gpa);
+ if (ret)
+ return ret;
+ gpa += 8;
+ 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, &val, 8);
+ return ret;
}
/**
@@ -1844,7 +1920,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;
+ gpa_t gpa;
+ int ret;
+
+ gpa = BASER_ADDRESS(its->baser_coll_table);
+ if (!gpa)
+ 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, gpa, &valid);
+ if (!valid || ret)
+ break;
+ gpa += 8;
+ read += 8;
+ }
+ return ret;
}
/**
--
2.5.5
next prev parent reply other threads:[~2017-03-27 9:31 UTC|newest]
Thread overview: 69+ 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 ` [PATCH v4 01/22] KVM: arm/arm64: Add vITS save/restore API documentation Eric Auger
2017-04-08 10:03 ` Marc Zyngier
2017-04-08 13:15 ` Christoffer Dall
2017-04-08 17:31 ` Marc Zyngier
2017-04-10 10:18 ` Auger Eric
2017-04-10 10:42 ` Marc Zyngier
2017-04-08 18:17 ` Christoffer Dall
2017-04-10 14:26 ` Auger Eric
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-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-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-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-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-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-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-04-08 10:42 ` Marc Zyngier
2017-04-10 14:32 ` Auger Eric
2017-04-10 14:57 ` Marc Zyngier
2017-04-10 15:07 ` Peter Maydell
2017-04-10 15:17 ` Auger Eric
2017-04-11 10:05 ` Marc Zyngier
2017-04-11 10:08 ` Auger Eric
2017-04-11 10:16 ` Peter Maydell
2017-04-11 10:29 ` Marc Zyngier
2017-04-11 10:43 ` Peter Maydell
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-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-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-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 ` [PATCH v4 13/22] KVM: arm64: ITS: KVM_DEV_ARM_VGIC_GRP_ITS_TABLES group Eric Auger
2017-03-27 15:04 ` kbuild test robot
2017-03-27 18:29 ` Auger Eric
2017-03-30 2:21 ` [kbuild-all] " Ye Xiaolong
2017-03-30 6:46 ` Auger Eric
2017-03-30 7:29 ` Ye Xiaolong
2017-03-30 8:29 ` Auger Eric
2017-04-09 10:09 ` Marc Zyngier
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-03-27 9:31 ` [PATCH v4 15/22] KVM: arm64: ITS: Sort the device and ITE lists Eric Auger
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 ` [PATCH v4 17/22] KVM: arm64: ITS: Add infrastructure for table lookup Eric Auger
2017-04-09 10:36 ` Marc Zyngier
2017-03-27 9:31 ` Eric Auger [this message]
2017-04-10 9:55 ` [PATCH v4 18/22] KVM: arm64: ITS: Collection table save/restore Marc Zyngier
2017-04-11 9:57 ` Auger Eric
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 ` [PATCH v4 20/22] KVM: arm64: ITS: ITT flush and restore Eric Auger
2017-04-10 12:39 ` Marc Zyngier
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-04-10 12:42 ` Marc Zyngier
2017-03-27 9:31 ` [PATCH v4 22/22] KVM: arm64: ITS: Pending " Eric Auger
2017-04-10 12:50 ` Marc Zyngier
2017-04-10 12:54 ` [PATCH v4 00/22] vITS save/restore 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-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).