make_cr3(v, cr3_mfn);
}
+/* Get a mapping of a PV guest's l1e for this virtual address. */
+static l1_pgentry_t *guest_map_l1e(unsigned long addr, unsigned long *gl1mfn)
+{
+ l2_pgentry_t l2e;
+
+ ASSERT(!paging_mode_translate(current->domain));
+ ASSERT(!paging_mode_external(current->domain));
+
+ if ( unlikely(!__addr_ok(addr)) )
+ return NULL;
+
+ /* Find this l1e and its enclosing l1mfn in the linear map. */
+ if ( __copy_from_user(&l2e,
+ &__linear_l2_table[l2_linear_offset(addr)],
+ sizeof(l2_pgentry_t)) )
+ return NULL;
+
+ /* Check flags that it will be safe to read the l1e. */
+ if ( (l2e_get_flags(l2e) & (_PAGE_PRESENT | _PAGE_PSE)) != _PAGE_PRESENT )
+ return NULL;
+
+ *gl1mfn = l2e_get_pfn(l2e);
+
+ return (l1_pgentry_t *)map_domain_page(_mfn(*gl1mfn)) +
+ l1_table_offset(addr);
+}
+
+/* Pull down the mapping we got from guest_map_l1e(). */
+static inline void guest_unmap_l1e(void *p)
+{
+ unmap_domain_page(p);
+}
+
+/* Read a PV guest's l1e that maps this virtual address. */
+static inline void guest_get_eff_l1e(unsigned long addr, l1_pgentry_t *eff_l1e)
+{
+ ASSERT(!paging_mode_translate(current->domain));
+ ASSERT(!paging_mode_external(current->domain));
+
+ if ( unlikely(!__addr_ok(addr)) ||
+ __copy_from_user(eff_l1e,
+ &__linear_l1_table[l1_linear_offset(addr)],
+ sizeof(l1_pgentry_t)) )
+ *eff_l1e = l1e_empty();
+}
+
+/*
+ * Read the guest's l1e that maps this address, from the kernel-mode
+ * page tables.
+ */
+static inline void guest_get_eff_kern_l1e(struct vcpu *v, unsigned long addr,
+ void *eff_l1e)
+{
+ bool_t user_mode = !(v->arch.flags & TF_kernel_mode);
+#define TOGGLE_MODE() if ( user_mode ) toggle_guest_mode(v)
+
+ TOGGLE_MODE();
+ guest_get_eff_l1e(addr, eff_l1e);
+ TOGGLE_MODE();
+}
+
static const char __section(".bss.page_aligned") zero_page[PAGE_SIZE];
static void invalidate_shadow_ldt(struct vcpu *v, int flush)
adjust_guest_l1e(nl1e, d);
- pl1e = guest_map_l1e(v, va, &gl1mfn);
+ pl1e = guest_map_l1e(va, &gl1mfn);
if ( !pl1e )
{
MEM_LOG("Could not find L1 PTE for address %lx", va);
if ( !get_page_from_pagenr(gl1mfn, current->domain) )
{
- guest_unmap_l1e(v, pl1e);
+ guest_unmap_l1e(pl1e);
return GNTST_general_error;
}
if ( !page_lock(l1pg) )
{
put_page(l1pg);
- guest_unmap_l1e(v, pl1e);
+ guest_unmap_l1e(pl1e);
return GNTST_general_error;
}
{
page_unlock(l1pg);
put_page(l1pg);
- guest_unmap_l1e(v, pl1e);
+ guest_unmap_l1e(pl1e);
return GNTST_general_error;
}
page_unlock(l1pg);
put_page(l1pg);
- guest_unmap_l1e(v, pl1e);
+ guest_unmap_l1e(pl1e);
if ( okay && !paging_mode_refcounts(d) )
put_page_from_l1e(ol1e, d);
struct page_info *l1pg;
int rc = 0;
- pl1e = guest_map_l1e(v, addr, &gl1mfn);
+ pl1e = guest_map_l1e(addr, &gl1mfn);
if ( !pl1e )
{
MEM_LOG("Could not find L1 PTE for address %lx", addr);
page_unlock(l1pg);
put_page(l1pg);
out:
- guest_unmap_l1e(v, pl1e);
+ guest_unmap_l1e(pl1e);
return rc;
}
if ( !new_addr )
return destroy_grant_va_mapping(addr, frame, curr);
- pl1e = guest_map_l1e(curr, new_addr, &gl1mfn);
+ pl1e = guest_map_l1e(new_addr, &gl1mfn);
if ( !pl1e )
{
MEM_LOG("Could not find L1 PTE for address %lx",
if ( !get_page_from_pagenr(gl1mfn, current->domain) )
{
- guest_unmap_l1e(curr, pl1e);
+ guest_unmap_l1e(pl1e);
return GNTST_general_error;
}
if ( !page_lock(l1pg) )
{
put_page(l1pg);
- guest_unmap_l1e(curr, pl1e);
+ guest_unmap_l1e(pl1e);
return GNTST_general_error;
}
{
page_unlock(l1pg);
put_page(l1pg);
- guest_unmap_l1e(curr, pl1e);
+ guest_unmap_l1e(pl1e);
return GNTST_general_error;
}
page_unlock(l1pg);
put_page(l1pg);
MEM_LOG("Cannot delete PTE entry at %p", (unsigned long *)pl1e);
- guest_unmap_l1e(curr, pl1e);
+ guest_unmap_l1e(pl1e);
return GNTST_general_error;
}
page_unlock(l1pg);
put_page(l1pg);
- guest_unmap_l1e(curr, pl1e);
+ guest_unmap_l1e(pl1e);
rc = replace_grant_va_mapping(addr, frame, ol1e, curr);
if ( rc && !paging_mode_refcounts(curr->domain) )
return rc;
rc = -EINVAL;
- pl1e = guest_map_l1e(v, va, &gl1mfn);
+ pl1e = guest_map_l1e(va, &gl1mfn);
if ( unlikely(!pl1e || !get_page_from_pagenr(gl1mfn, d)) )
goto out;
out:
if ( pl1e )
- guest_unmap_l1e(v, pl1e);
+ guest_unmap_l1e(pl1e);
switch ( flags & UVMF_FLUSHTYPE_MASK )
{
int rc;
/* Attempt to read the PTE that maps the VA being accessed. */
- guest_get_eff_l1e(v, addr, &pte);
+ guest_get_eff_l1e(addr, &pte);
/* We are looking only for read-only mappings of p.t. pages. */
if ( ((l1e_get_flags(pte) & (_PAGE_PRESENT|_PAGE_RW)) != _PAGE_PRESENT) ||
int rc;
/* Attempt to read the PTE that maps the VA being accessed. */
- guest_get_eff_l1e(v, addr, &pte);
+ guest_get_eff_l1e(addr, &pte);
/* We are looking only for read-only mappings of MMIO pages. */
if ( ((l1e_get_flags(pte) & (_PAGE_PRESENT|_PAGE_RW)) != _PAGE_PRESENT) )
* creation. */
int paging_enable(struct domain *d, u32 mode)
{
+ switch ( mode & (PG_external | PG_translate) )
+ {
+ case 0:
+ case PG_external | PG_translate:
+ break;
+ default:
+ return -EINVAL;
+ }
+
if ( hap_enabled(d) )
return hap_enable(d, mode | PG_HAP_enable);
else
/* Sanity check the arguments */
if ( shadow_mode_enabled(d) ||
- ((mode & PG_translate) && !(mode & PG_refcounts)) ||
- ((mode & PG_external) && !(mode & PG_translate)) )
+ ((mode & PG_translate) && !(mode & PG_refcounts)) )
{
rv = -EINVAL;
goto out_unlocked;
case XEN_DOMCTL_SHADOW_OP_ENABLE_TEST:
return shadow_test_enable(d);
- case XEN_DOMCTL_SHADOW_OP_ENABLE_TRANSLATE:
- return shadow_enable(d, PG_refcounts|PG_translate);
-
case XEN_DOMCTL_SHADOW_OP_ENABLE:
- return shadow_enable(d, sc->mode << PG_mode_shift);
+ return paging_enable(d, sc->mode << PG_mode_shift);
case XEN_DOMCTL_SHADOW_OP_GET_ALLOCATION:
sc->mb = shadow_get_allocation(d);
#if (CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS)
-static void *
-sh_guest_map_l1e(struct vcpu *v, unsigned long addr,
- unsigned long *gl1mfn)
-{
- void *pl1e = NULL;
- walk_t gw;
-
- ASSERT(shadow_mode_translate(v->domain));
-
- // XXX -- this is expensive, but it's easy to cobble together...
- // FIXME!
-
- if ( sh_walk_guest_tables(v, addr, &gw, PFEC_page_present) == 0
- && mfn_valid(gw.l1mfn) )
- {
- if ( gl1mfn )
- *gl1mfn = mfn_x(gw.l1mfn);
- pl1e = map_domain_page(gw.l1mfn) +
- (guest_l1_table_offset(addr) * sizeof(guest_l1e_t));
- }
-
- return pl1e;
-}
-
-static void
-sh_guest_get_eff_l1e(struct vcpu *v, unsigned long addr, void *eff_l1e)
-{
- walk_t gw;
-
- ASSERT(shadow_mode_translate(v->domain));
-
- // XXX -- this is expensive, but it's easy to cobble together...
- // FIXME!
-
- (void) sh_walk_guest_tables(v, addr, &gw, PFEC_page_present);
- *(guest_l1e_t *)eff_l1e = gw.l1e;
-}
-
/*
* Write a new value into the guest pagetable, and update the shadows
* appropriately. Returns 0 if we page-faulted, 1 for success.
#if CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS
.write_guest_entry = sh_write_guest_entry,
.cmpxchg_guest_entry = sh_cmpxchg_guest_entry,
- .guest_map_l1e = sh_guest_map_l1e,
- .guest_get_eff_l1e = sh_guest_get_eff_l1e,
#endif
.guest_levels = GUEST_PAGING_LEVELS,
.shadow.detach_old_tables = sh_detach_old_tables,
int (*cmpxchg_guest_entry )(struct vcpu *v, intpte_t *p,
intpte_t *old, intpte_t new,
mfn_t gmfn);
- void * (*guest_map_l1e )(struct vcpu *v, unsigned long va,
- unsigned long *gl1mfn);
- void (*guest_get_eff_l1e )(struct vcpu *v, unsigned long va,
- void *eff_l1e);
+
unsigned int guest_levels;
/* paging support extension */
void paging_dump_domain_info(struct domain *d);
void paging_dump_vcpu_info(struct vcpu *v);
-
-/*****************************************************************************
- * Access to the guest pagetables */
-
-/* Get a mapping of a PV guest's l1e for this virtual address. */
-static inline l1_pgentry_t *
-guest_map_l1e(struct vcpu *v, unsigned long addr, unsigned long *gl1mfn)
-{
- l2_pgentry_t l2e;
-
- if ( unlikely(!__addr_ok(addr)) )
- return NULL;
-
- if ( unlikely(paging_mode_translate(v->domain)) )
- return paging_get_hostmode(v)->guest_map_l1e(v, addr, gl1mfn);
-
- /* Find this l1e and its enclosing l1mfn in the linear map */
- if ( __copy_from_user(&l2e,
- &__linear_l2_table[l2_linear_offset(addr)],
- sizeof(l2_pgentry_t)) != 0 )
- return NULL;
- /* Check flags that it will be safe to read the l1e */
- if ( (l2e_get_flags(l2e) & (_PAGE_PRESENT | _PAGE_PSE))
- != _PAGE_PRESENT )
- return NULL;
- *gl1mfn = l2e_get_pfn(l2e);
- return (l1_pgentry_t *)map_domain_page(_mfn(*gl1mfn)) + l1_table_offset(addr);
-}
-
-/* Pull down the mapping we got from guest_map_l1e() */
-static inline void
-guest_unmap_l1e(struct vcpu *v, void *p)
-{
- unmap_domain_page(p);
-}
-
-/* Read the guest's l1e that maps this address. */
-static inline void
-guest_get_eff_l1e(struct vcpu *v, unsigned long addr, l1_pgentry_t *eff_l1e)
-{
- if ( unlikely(!__addr_ok(addr)) )
- {
- *eff_l1e = l1e_empty();
- return;
- }
-
- if ( likely(!paging_mode_translate(v->domain)) )
- {
- ASSERT(!paging_mode_external(v->domain));
- if ( __copy_from_user(eff_l1e,
- &__linear_l1_table[l1_linear_offset(addr)],
- sizeof(l1_pgentry_t)) != 0 )
- *eff_l1e = l1e_empty();
- return;
- }
-
- paging_get_hostmode(v)->guest_get_eff_l1e(v, addr, eff_l1e);
-}
-
-/* Read the guest's l1e that maps this address, from the kernel-mode
- * pagetables. */
-static inline void
-guest_get_eff_kern_l1e(struct vcpu *v, unsigned long addr, void *eff_l1e)
-{
- int user_mode = !(v->arch.flags & TF_kernel_mode);
-#define TOGGLE_MODE() if ( user_mode ) toggle_guest_mode(v)
-
- TOGGLE_MODE();
- guest_get_eff_l1e(v, addr, eff_l1e);
- TOGGLE_MODE();
-}
-
-
-
#endif /* XEN_PAGING_H */
/*
#define XEN_DOMCTL_SHADOW_OP_ENABLE_TEST 1
/* Equiv. to ENABLE with mode flag ENABLE_LOG_DIRTY. */
#define XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY 2
- /* Equiv. to ENABLE with mode flags ENABLE_REFCOUNT and ENABLE_TRANSLATE. */
+ /*
+ * No longer supported, was equiv. to ENABLE with mode flags
+ * ENABLE_REFCOUNT and ENABLE_TRANSLATE:
#define XEN_DOMCTL_SHADOW_OP_ENABLE_TRANSLATE 3
+ */
/* Mode flags for XEN_DOMCTL_SHADOW_OP_ENABLE. */
/*
projects / people / liuw / libxenctrl-split / xen.git / commitdiff