|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging] x86/p2m: collapse the two ->write_p2m_entry() hooks
commit 192b45e0e4180326b1312ae8bdabf477d086c400
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Nov 18 12:33:18 2020 +0100
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Nov 18 12:33:18 2020 +0100
x86/p2m: collapse the two ->write_p2m_entry() hooks
The struct paging_mode instances get set to the same functions
regardless of mode by both HAP and shadow code, hence there's no point
having this hook there. The hook also doesn't need moving elsewhere - we
can directly use struct p2m_domain's. This merely requires (from a
strictly formal pov; in practice this may not even be needed) making
sure we don't end up using safe_write_pte() for nested P2Ms.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Tim Deegan <tim@xxxxxxx>
Acked-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
xen/arch/x86/mm/hap/hap.c | 9 +++++----
xen/arch/x86/mm/p2m-pt.c | 38 ++++++++++++++++++++++----------------
xen/arch/x86/mm/shadow/common.c | 7 ++++++-
xen/arch/x86/mm/shadow/multi.c | 1 -
xen/arch/x86/mm/shadow/none.c | 9 ---------
xen/arch/x86/mm/shadow/private.h | 5 -----
xen/include/asm-x86/p2m.h | 3 +++
xen/include/asm-x86/paging.h | 4 ----
8 files changed, 36 insertions(+), 40 deletions(-)
diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c
index 4eedd1a995..69b06f19b5 100644
--- a/xen/arch/x86/mm/hap/hap.c
+++ b/xen/arch/x86/mm/hap/hap.c
@@ -823,6 +823,11 @@ hap_write_p2m_entry(struct p2m_domain *p2m, unsigned long
gfn, l1_pgentry_t *p,
return 0;
}
+void hap_p2m_init(struct p2m_domain *p2m)
+{
+ p2m->write_p2m_entry = hap_write_p2m_entry;
+}
+
static unsigned long hap_gva_to_gfn_real_mode(
struct vcpu *v, struct p2m_domain *p2m, unsigned long gva, uint32_t *pfec)
{
@@ -846,7 +851,6 @@ static const struct paging_mode hap_paging_real_mode = {
.p2m_ga_to_gfn = hap_p2m_ga_to_gfn_real_mode,
.update_cr3 = hap_update_cr3,
.update_paging_modes = hap_update_paging_modes,
- .write_p2m_entry = hap_write_p2m_entry,
.flush_tlb = flush_tlb,
.guest_levels = 1
};
@@ -858,7 +862,6 @@ static const struct paging_mode hap_paging_protected_mode =
{
.p2m_ga_to_gfn = hap_p2m_ga_to_gfn_2_levels,
.update_cr3 = hap_update_cr3,
.update_paging_modes = hap_update_paging_modes,
- .write_p2m_entry = hap_write_p2m_entry,
.flush_tlb = flush_tlb,
.guest_levels = 2
};
@@ -870,7 +873,6 @@ static const struct paging_mode hap_paging_pae_mode = {
.p2m_ga_to_gfn = hap_p2m_ga_to_gfn_3_levels,
.update_cr3 = hap_update_cr3,
.update_paging_modes = hap_update_paging_modes,
- .write_p2m_entry = hap_write_p2m_entry,
.flush_tlb = flush_tlb,
.guest_levels = 3
};
@@ -882,7 +884,6 @@ static const struct paging_mode hap_paging_long_mode = {
.p2m_ga_to_gfn = hap_p2m_ga_to_gfn_4_levels,
.update_cr3 = hap_update_cr3,
.update_paging_modes = hap_update_paging_modes,
- .write_p2m_entry = hap_write_p2m_entry,
.flush_tlb = flush_tlb,
.guest_levels = 4
};
diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c
index bc9c9e2da1..6887b254f3 100644
--- a/xen/arch/x86/mm/p2m-pt.c
+++ b/xen/arch/x86/mm/p2m-pt.c
@@ -126,8 +126,9 @@ static int write_p2m_entry(struct p2m_domain *p2m, unsigned
long gfn,
if ( v->domain != d )
v = d->vcpu ? d->vcpu[0] : NULL;
- if ( likely(v && paging_mode_enabled(d) && paging_get_hostmode(v)) )
- rc = paging_get_hostmode(v)->write_p2m_entry(p2m, gfn, p, new, level);
+ if ( likely(v && paging_mode_enabled(d) && paging_get_hostmode(v)) ||
+ p2m_is_nestedp2m(p2m) )
+ rc = p2m->write_p2m_entry(p2m, gfn, p, new, level);
else
safe_write_pte(p, new);
@@ -209,7 +210,7 @@ p2m_next_level(struct p2m_domain *p2m, void **table,
new_entry = l1e_from_mfn(mfn, P2M_BASE_FLAGS | _PAGE_RW);
- rc = p2m->write_p2m_entry(p2m, gfn, p2m_entry, new_entry, level + 1);
+ rc = write_p2m_entry(p2m, gfn, p2m_entry, new_entry, level + 1);
if ( rc )
goto error;
}
@@ -251,7 +252,7 @@ p2m_next_level(struct p2m_domain *p2m, void **table,
{
new_entry = l1e_from_pfn(pfn | (i << ((level - 1) *
PAGETABLE_ORDER)),
flags);
- rc = p2m->write_p2m_entry(p2m, gfn, l1_entry + i, new_entry,
level);
+ rc = write_p2m_entry(p2m, gfn, l1_entry + i, new_entry, level);
if ( rc )
{
unmap_domain_page(l1_entry);
@@ -262,8 +263,7 @@ p2m_next_level(struct p2m_domain *p2m, void **table,
unmap_domain_page(l1_entry);
new_entry = l1e_from_mfn(mfn, P2M_BASE_FLAGS | _PAGE_RW);
- rc = p2m->write_p2m_entry(p2m, gfn, p2m_entry, new_entry,
- level + 1);
+ rc = write_p2m_entry(p2m, gfn, p2m_entry, new_entry, level + 1);
if ( rc )
goto error;
}
@@ -335,7 +335,7 @@ static int p2m_pt_set_recalc_range(struct p2m_domain *p2m,
if ( (l1e_get_flags(e) & _PAGE_PRESENT) && !needs_recalc(l1, e) )
{
set_recalc(l1, e);
- err = p2m->write_p2m_entry(p2m, first_gfn, pent, e, level);
+ err = write_p2m_entry(p2m, first_gfn, pent, e, level);
if ( err )
{
ASSERT_UNREACHABLE();
@@ -412,8 +412,8 @@ static int do_recalc(struct p2m_domain *p2m, unsigned long
gfn)
!needs_recalc(l1, ent) )
{
set_recalc(l1, ent);
- err = p2m->write_p2m_entry(p2m, gfn - remainder, &ptab[i],
- ent, level);
+ err = write_p2m_entry(p2m, gfn - remainder, &ptab[i], ent,
+ level);
if ( err )
{
ASSERT_UNREACHABLE();
@@ -426,7 +426,7 @@ static int do_recalc(struct p2m_domain *p2m, unsigned long
gfn)
if ( !err )
{
clear_recalc(l1, e);
- err = p2m->write_p2m_entry(p2m, gfn, pent, e, level + 1);
+ err = write_p2m_entry(p2m, gfn, pent, e, level + 1);
ASSERT(!err);
recalc_done = true;
@@ -474,7 +474,7 @@ static int do_recalc(struct p2m_domain *p2m, unsigned long
gfn)
}
else
clear_recalc(l1, e);
- err = p2m->write_p2m_entry(p2m, gfn, pent, e, level + 1);
+ err = write_p2m_entry(p2m, gfn, pent, e, level + 1);
ASSERT(!err);
recalc_done = true;
@@ -618,7 +618,7 @@ p2m_pt_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t
mfn,
: l3e_empty();
entry_content.l1 = l3e_content.l3;
- rc = p2m->write_p2m_entry(p2m, gfn, p2m_entry, entry_content, 3);
+ rc = write_p2m_entry(p2m, gfn, p2m_entry, entry_content, 3);
/* NB: write_p2m_entry() handles tlb flushes properly */
if ( rc )
goto out;
@@ -655,7 +655,7 @@ p2m_pt_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t
mfn,
entry_content = l1e_empty();
/* level 1 entry */
- rc = p2m->write_p2m_entry(p2m, gfn, p2m_entry, entry_content, 1);
+ rc = write_p2m_entry(p2m, gfn, p2m_entry, entry_content, 1);
/* NB: write_p2m_entry() handles tlb flushes properly */
if ( rc )
goto out;
@@ -690,7 +690,7 @@ p2m_pt_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t
mfn,
: l2e_empty();
entry_content.l1 = l2e_content.l2;
- rc = p2m->write_p2m_entry(p2m, gfn, p2m_entry, entry_content, 2);
+ rc = write_p2m_entry(p2m, gfn, p2m_entry, entry_content, 2);
/* NB: write_p2m_entry() handles tlb flushes properly */
if ( rc )
goto out;
@@ -914,7 +914,7 @@ static void p2m_pt_change_entry_type_global(struct
p2m_domain *p2m,
int rc;
set_recalc(l1, e);
- rc = p2m->write_p2m_entry(p2m, gfn, &tab[i], e, 4);
+ rc = write_p2m_entry(p2m, gfn, &tab[i], e, 4);
if ( rc )
{
ASSERT_UNREACHABLE();
@@ -1132,7 +1132,13 @@ void p2m_pt_init(struct p2m_domain *p2m)
p2m->recalc = do_recalc;
p2m->change_entry_type_global = p2m_pt_change_entry_type_global;
p2m->change_entry_type_range = p2m_pt_change_entry_type_range;
- p2m->write_p2m_entry = write_p2m_entry;
+
+ /* Still too early to use paging_mode_hap(). */
+ if ( hap_enabled(p2m->domain) )
+ hap_p2m_init(p2m);
+ else if ( IS_ENABLED(CONFIG_SHADOW_PAGING) )
+ shadow_p2m_init(p2m);
+
#if P2M_AUDIT
p2m->audit_p2m = p2m_pt_audit_p2m;
#else
diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index 9c3d9a7cfd..300191450a 100644
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -3144,7 +3144,7 @@ static void sh_unshadow_for_p2m_change(struct domain *d,
unsigned long gfn,
}
}
-int
+static int
shadow_write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn,
l1_pgentry_t *p, l1_pgentry_t new,
unsigned int level)
@@ -3190,6 +3190,11 @@ shadow_write_p2m_entry(struct p2m_domain *p2m, unsigned
long gfn,
return 0;
}
+void shadow_p2m_init(struct p2m_domain *p2m)
+{
+ p2m->write_p2m_entry = shadow_write_p2m_entry;
+}
+
/**************************************************************************/
/* Log-dirty mode support */
diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
index eba5164a27..d24ccde035 100644
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -4574,7 +4574,6 @@ const struct paging_mode sh_paging_mode = {
.gva_to_gfn = sh_gva_to_gfn,
.update_cr3 = sh_update_cr3,
.update_paging_modes = shadow_update_paging_modes,
- .write_p2m_entry = shadow_write_p2m_entry,
.flush_tlb = shadow_flush_tlb,
.guest_levels = GUEST_PAGING_LEVELS,
.shadow.detach_old_tables = sh_detach_old_tables,
diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c
index 2fddf4274c..691269a59e 100644
--- a/xen/arch/x86/mm/shadow/none.c
+++ b/xen/arch/x86/mm/shadow/none.c
@@ -60,21 +60,12 @@ static void _update_paging_modes(struct vcpu *v)
ASSERT_UNREACHABLE();
}
-static int _write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn,
- l1_pgentry_t *p, l1_pgentry_t new,
- unsigned int level)
-{
- ASSERT_UNREACHABLE();
- return -EOPNOTSUPP;
-}
-
static const struct paging_mode sh_paging_none = {
.page_fault = _page_fault,
.invlpg = _invlpg,
.gva_to_gfn = _gva_to_gfn,
.update_cr3 = _update_cr3,
.update_paging_modes = _update_paging_modes,
- .write_p2m_entry = _write_p2m_entry,
};
void shadow_vcpu_init(struct vcpu *v)
diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h
index e9b304f755..911db46e73 100644
--- a/xen/arch/x86/mm/shadow/private.h
+++ b/xen/arch/x86/mm/shadow/private.h
@@ -387,11 +387,6 @@ static inline int sh_remove_write_access(struct domain *d,
mfn_t readonly_mfn,
}
#endif
-/* Functions that atomically write PT/P2M entries and update state */
-int shadow_write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn,
- l1_pgentry_t *p, l1_pgentry_t new,
- unsigned int level);
-
/* Functions that atomically write PV guest PT entries */
void sh_write_guest_entry(struct vcpu *v, intpte_t *p, intpte_t new,
mfn_t gmfn);
diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h
index 8abae345e8..3d518cba3b 100644
--- a/xen/include/asm-x86/p2m.h
+++ b/xen/include/asm-x86/p2m.h
@@ -836,6 +836,9 @@ void p2m_flush_nestedp2m(struct domain *d);
/* Flushes the np2m specified by np2m_base (if it exists) */
void np2m_flush_base(struct vcpu *v, unsigned long np2m_base);
+void hap_p2m_init(struct p2m_domain *p2m);
+void shadow_p2m_init(struct p2m_domain *p2m);
+
int nestedp2m_write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn,
l1_pgentry_t *p, l1_pgentry_t new, unsigned int level);
diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h
index ca68afae95..5cf128cf34 100644
--- a/xen/include/asm-x86/paging.h
+++ b/xen/include/asm-x86/paging.h
@@ -139,10 +139,6 @@ struct paging_mode {
void (*update_cr3 )(struct vcpu *v, int do_locking,
bool noflush);
void (*update_paging_modes )(struct vcpu *v);
- int (*write_p2m_entry )(struct p2m_domain *p2m,
- unsigned long gfn,
- l1_pgentry_t *p, l1_pgentry_t new,
- unsigned int level);
bool (*flush_tlb )(bool (*flush_vcpu)(void *ctxt,
struct vcpu *v),
void *ctxt);
--
generated by git-patchbot for /home/xen/git/xen.git#staging
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |