x86/mm: Aggregate get entry and populate into common funcs
PATCH v4 1/1 x86/mm: Aggregate get entry and populate into common funcs
The code for getting the entry and then populating was repeated in p2m_change_altp2m_gfn() and in p2m_set_altp2m_mem_access().
The code is now in one place with a bool param that lets the caller choose if it populates after get_entry().
If remapping is being done then both the old and new gfn's should be unshared in the hostp2m for keeping things consistent. The page type of old_gfn was already checked whether it's p2m_ram_rw and bail if it wasn't so functionality-wise this just simplifies things as a user doesn't have to request unsharing manually before remapping. Now, if the new_gfn is invalid it shouldn't query the hostp2m as that is effectively a request to remove the entry from the altp2m. But provided that scenario is used only when removing entries that were previously remapped/copied to the altp2m, those entries already went through P2M_ALLOC | P2M_UNSHARE before, so it won't have an affect so the core function get_altp2m_entry() is calling __get_gfn_type_access() with P2M_ALLOC | P2M_UNSHARE.
altp2m_get_entry_direct() is also called in p2m_set_suppress_ve() because on a new altp2m view the function will fail with invalid mfn if p2m->set_entry() was not called before.
---
Changes since V3:
- Switched over to George's version
--- xen/arch/x86/mm/mem_access.c | 30 ++----------- xen/arch/x86/mm/p2m.c | 84 ++++++++++++++++++++---------------- xen/include/asm-x86/p2m.h | 17 ++++++++ 3 files changed, 66 insertions(+), 65 deletions(-)
xen/arch/x86/mm/mem_access.c +3 -27
@@ -262,35 +262,11 @@ int p2m_set_altp2m_mem_access(struct domain *d, struct p2m_domain *hp2m,mfn_t mfn;p2m_type_t t;p2m_access_t old_a; -unsigned int page_order; -unsigned long gfn_l =gfn_x (gfn);int rc; - mfn = ap2m->get_entry (ap2m, gfn, &t, &old_a,0 ,NULL ,NULL ); - -/* Check host p2m if no valid entry in alternate */ -if ( !mfn_valid (mfn) ) - { - - mfn =__get_gfn_type_access (hp2m, gfn_l, &t, &old_a, -P2M_ALLOC |P2M_UNSHARE , &page_order,0 ); - - rc = -ESRCH ; -if ( !mfn_valid (mfn) || t != p2m_ram_rw ) -return rc; - -/* If this is a superpage, copy that first */ -if ( page_order !=PAGE_ORDER_4K ) - { -unsigned long mask = ~((1UL << page_order) -1 ); -gfn_t gfn2 =_gfn (gfn_l & mask); -mfn_t mfn2 =_mfn (mfn_x (mfn) & mask); - - rc = ap2m->set_entry (ap2m, gfn2, mfn2, page_order, t, old_a,1 ); -if ( rc ) -return rc; - } - } + rc =altp2m_get_entry_prepopulate (ap2m, gfn, &mfn, &t, &old_a); +if ( rc ) +return rc;/* * Inherit the old suppress #VE bit value if it is already set, or set it
xen/arch/x86/mm/p2m.c +46 -38
118 lines not on this page · raw message
xen/include/asm-x86/p2m.h +17 -0
@@ -514,6 +514,23 @@ static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn)return mfn_x (mfn); } +int get_altp2m_entry (struct p2m_domain *ap2m,gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a,bool prepopulate); + +static inline int altp2m_get_entry_direct (struct p2m_domain *ap2m, +gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a) +{ +return get_altp2m_entry (ap2m, gfn, mfn, t, a, false); +} + +static inline int altp2m_get_entry_prepopulate (struct p2m_domain *ap2m, +gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a) +{ +return get_altp2m_entry (ap2m, gfn, mfn, t, a, true); +} +/* Deadlock-avoidance scheme when calling get_gfn on different gfn's */ struct two_gfns {struct domain *first_domain, *second_domain;
Signature · 6 lines
2.17.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 19 lines · Alexandru Stefan ISAILA
The code for getting the entry and then populating was repeated in
p2m_change_altp2m_gfn()and inp2m_set_altp2m_mem_access().The code is now in one place with a bool param that lets the caller choose if it populates after
get_entry().If remapping is being done then both the old and new gfn's should be unshared in the hostp2m for keeping things consistent. The page type of
old_gfnwas already checked whether it'sp2m_ram_rwand bail if it wasn't so functionality-wise this just simplifies things as a user doesn't have to request unsharing manually before remapping. Now, if thenew_gfnis invalid it shouldn't query the hostp2m as that is effectively a request to remove the entry from the altp2m. But provided that scenario is used only when removing entries that were previously remapped/copied to the altp2m, those entries already went throughP2M_ALLOC|P2M_UNSHAREbefore, so it won't have an affect so the core functionget_altp2m_entry()is calling__get_gfn_type_access()withP2M_ALLOC|P2M_UNSHARE.
Quoted 6 lines
altp2m_get_entry_direct()is also called inp2m_set_suppress_ve()because on a new altp2m view the function will fail with invalid mfn ifp2m->set_entry()was not called before.Signed-off-by Alexandru Isaila <[email protected]>Signed-off-by George Dunlap <[email protected]>
Thanks for doing the expanded description; much better.
The only comment have is that we should specify 'altp2m' someplace earlier; I'd suggest making the tag "x86/altp2m" instead of "x86/mm". This can be changed on check-in.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
xen/include/asm-x86/p2m.h static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn)
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Alexandru Stefan ISAILA <[email protected]> 04/15/19 11:23 AM >>>
xen/include/asm-x86/p2m.h +0
-0@@ -514,6 +514,23 @@ static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn)
>return mfn_x(mfn);
Quoted 8 lines
xen/include/asm-x86/p2m.h +6
-0} +int get_altp2m_entry (struct p2m_domain *ap2m,gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a,bool prepopulate); + +static inline int altp2m_get_entry_direct (struct p2m_domain *ap2m, +gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a)
xen/include/asm-x86/p2m.h static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn) · line 532
Quoted 10 lines
xen/include/asm-x86/p2m.h +10
-0+{ +return get_altp2m_entry (ap2m, gfn, mfn, t, a, false); +} + +static inline int altp2m_get_entry_prepopulate (struct p2m_domain *ap2m, +gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a) +{ +return get_altp2m_entry (ap2m, gfn, mfn, t, a, true); +}
The worker function name would imo better be altp2m_get_entry(), then in line with its two wrappers.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 18 lines · Jan Beulich
xen/include/asm-x86/p2m.h static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn)
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Alexandru Stefan ISAILA <[email protected]> 04/15/19 11:23 AM >>>
xen/include/asm-x86/p2m.h +0
-0@@ -514,6 +514,23 @@ static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn)>return mfn_x(mfn);Quoted 13 lines
xen/include/asm-x86/p2m.h +11
-0} +int get_altp2m_entry (struct p2m_domain *ap2m,gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a,bool prepopulate); + +static inline int altp2m_get_entry_direct (struct p2m_domain *ap2m, +gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a) +{ +return get_altp2m_entry (ap2m, gfn, mfn, t, a, false); +} + +static inline int altp2m_get_entry_prepopulate(struct p2m_domain *ap2m,
Quoted 9 lines
xen/include/asm-x86/p2m.h static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn) · line 532
Quoted 5 lines
xen/include/asm-x86/p2m.h +5
-0+ gfn_t gfn, mfn_t *mfn, + p2m_type_t *t, p2m_access_t *a) +{ + return get_altp2m_entry(ap2m, gfn, mfn, t, a, true); +}The worker function name would imo better be
altp2m_get_entry(), then in line with its two wrappers.
Ok it will be changed in the next version.
Alex
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel