The nested rmap entries are used to track nested pages which map a given
guest page such that that information can be retrieved from the guest
memslot.
Increase the size of the gpa (guest physical address) field in the
nested rmap entry to 46 bits such that it can be reused to store a
nested hpt (hash page table) guest entry where this field will hold the
hpt index (which can be up to 46 bits).
Additionally introduce helper functions to access these bit fields for
simplicity.
No functional change.
Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@xxxxxxxxx>
---
arch/powerpc/include/asm/kvm_book3s_64.h | 5 ++--
arch/powerpc/kvm/book3s_hv_nested.c | 41 ++++++++++++++++++++++++--------
2 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/arch/powerpc/include/asm/kvm_book3s_64.h b/arch/powerpc/include/asm/kvm_book3s_64.h
index bec78f15e2f5..ef6af64a4451 100644
--- a/arch/powerpc/include/asm/kvm_book3s_64.h
+++ b/arch/powerpc/include/asm/kvm_book3s_64.h
@@ -50,12 +50,13 @@ struct kvm_nested_guest {
/*
* We define a nested rmap entry as a single 64-bit quantity
* 0xFFF0000000000000 12-bit lpid field
- * 0x000FFFFFFFFFF000 40-bit guest 4k page frame number
+ * 0x000FFFFFFFFFFFC0 46-bit guest page frame number (radix) or hpt index
* 0x0000000000000001 1-bit single entry flag
*/
#define RMAP_NESTED_LPID_MASK 0xFFF0000000000000UL
#define RMAP_NESTED_LPID_SHIFT (52)
-#define RMAP_NESTED_GPA_MASK 0x000FFFFFFFFFF000UL
+#define RMAP_NESTED_GPA_MASK 0x000FFFFFFFFFFFC0UL
+#define RMAP_NESTED_GPA_SHIFT (6)
#define RMAP_NESTED_IS_SINGLE_ENTRY 0x0000000000000001UL
/* Structure for a nested guest rmap entry */
diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c
index 555b45a35fec..c6304aa949c1 100644
--- a/arch/powerpc/kvm/book3s_hv_nested.c
+++ b/arch/powerpc/kvm/book3s_hv_nested.c
@@ -770,10 +770,31 @@ static struct kvm_nested_guest *kvmhv_find_nested(struct kvm *kvm, int lpid)
return kvm->arch.nested_guests[lpid];
}
-static inline bool kvmhv_n_rmap_is_equal(u64 rmap_1, u64 rmap_2)
+static inline u64 n_rmap_to_gpa(u64 rmap)
{
- return !((rmap_1 ^ rmap_2) & (RMAP_NESTED_LPID_MASK |
- RMAP_NESTED_GPA_MASK));
+ return ((rmap & RMAP_NESTED_GPA_MASK) >> RMAP_NESTED_GPA_SHIFT)
+ << PAGE_SHIFT;
+}
+
+static inline u64 gpa_to_n_rmap(u64 gpa)
+{
+ return ((gpa >> PAGE_SHIFT) << RMAP_NESTED_GPA_SHIFT) &
+ RMAP_NESTED_GPA_MASK;
+}
+
+static inline int n_rmap_to_lpid(u64 rmap)
+{
+ return (int) ((rmap & RMAP_NESTED_LPID_MASK) >> RMAP_NESTED_LPID_SHIFT);
+}
+
+static inline u64 lpid_to_n_rmap(int lpid)
+{
+ return (((u64) lpid) << RMAP_NESTED_LPID_SHIFT) & RMAP_NESTED_LPID_MASK;
+}
+
+static inline bool kvmhv_n_rmap_is_equal(u64 rmap_1, u64 rmap_2, u64 mask)
+{
+ return !((rmap_1 ^ rmap_2) & mask);
}
/* called with kvm->mmu_lock held */
@@ -792,7 +813,8 @@ void kvmhv_insert_nest_rmap(unsigned long *rmapp, struct rmap_nested **n_rmap)
/* Do any entries match what we're trying to insert? */
for_each_nest_rmap_safe(cursor, entry, &rmap) {
- if (kvmhv_n_rmap_is_equal(rmap, new_rmap))
+ if (kvmhv_n_rmap_is_equal(rmap, new_rmap, RMAP_NESTED_LPID_MASK
+ | RMAP_NESTED_GPA_MASK))
return;
}
@@ -822,8 +844,8 @@ static void kvmhv_update_nest_rmap_rc(struct kvm *kvm, u64 n_rmap,
unsigned int shift, lpid;
pte_t *ptep;
- gpa = n_rmap & RMAP_NESTED_GPA_MASK;
- lpid = (n_rmap & RMAP_NESTED_LPID_MASK) >> RMAP_NESTED_LPID_SHIFT;
+ gpa = n_rmap_to_gpa(n_rmap);
+ lpid = n_rmap_to_lpid(n_rmap);;
gp = kvmhv_find_nested(kvm, lpid);
if (!gp)
return;
@@ -878,8 +900,8 @@ static void kvmhv_invalidate_nest_rmap(struct kvm *kvm, u64 n_rmap,
unsigned int shift, lpid;
pte_t *ptep;
- gpa = n_rmap & RMAP_NESTED_GPA_MASK;
- lpid = (n_rmap & RMAP_NESTED_LPID_MASK) >> RMAP_NESTED_LPID_SHIFT;
+ gpa = n_rmap_to_gpa(n_rmap);
+ lpid = n_rmap_to_lpid(n_rmap);;
gp = kvmhv_find_nested(kvm, lpid);
if (!gp)
return;
@@ -1454,8 +1476,7 @@ static long int __kvmhv_nested_page_fault(struct kvm_run *run,
n_rmap = kzalloc(sizeof(*n_rmap), GFP_KERNEL);
if (!n_rmap)
return RESUME_GUEST; /* Let the guest try again */
- n_rmap->rmap = (n_gpa & RMAP_NESTED_GPA_MASK) |
- (((unsigned long) gp->l1_lpid) << RMAP_NESTED_LPID_SHIFT);
+ n_rmap->rmap = gpa_to_n_rmap(n_gpa) | lpid_to_n_rmap(gp->l1_lpid);
rmapp = &memslot->arch.rmap[gfn - memslot->base_gfn];
ret = kvmppc_create_pte(kvm, gp->shadow_pgtable, pte, n_gpa, level,
mmu_seq, gp->shadow_lpid, rmapp, &n_rmap);
--
2.13.6
