x86/altp2m: Aggregate get entry and populate into common funcs
PATCH v6 1/1 x86/altp2m: 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 V5:
- Change altp2m_get_entry() to altp2m_get_effective_entry()
- Add comment before altp2m_get_effective_entry()
- Add AP2MGET_prepopulate and AP2MGET_query defines
- Remove altp2m_get_entry_direct() andaltp2m_get_entry_prepopulate().
--- xen/arch/x86/mm/mem_access.c | 31 ++----------- xen/arch/x86/mm/p2m.c | 86 ++++++++++++++++++++---------------- xen/include/asm-x86/p2m.h | 12 +++++ 3 files changed, 64 insertions(+), 65 deletions(-)
xen/arch/x86/mm/mem_access.c +4 -27
@@ -262,35 +262,12 @@ 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_effective_entry (ap2m, gfn, &mfn, &t, &old_a, + AP2MGET_prepopulate); +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 +48 -38
120 lines not on this page · raw message
xen/include/asm-x86/p2m.h +12 -0
@@ -514,6 +514,18 @@ static inline unsigned long mfn_to_gfn(struct domain *d, mfn_t mfn)return mfn_x (mfn); } +#define AP2MGET_prepopulate true +#define AP2MGET_query false + +/* +* Looks up altp2m entry. If the entry is not found it looks up the entry in +* hostp2m. +* The prepopulate param is used to set the found entry in altp2m. +*/ +int altp2m_get_effective_entry (struct p2m_domain *ap2m,gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a, +bool prepopulate); +/* 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 20 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 7 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]>Reviewed-by George Dunlap <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 37 lines
Quoted 1 line
Quoted 1 line · On 23.04.19 at 16:30, <[email protected]> wrote:
xen/arch/x86/mm/p2m.c +30
-0@@ -478,6 +478,43 @@ void p2m_unlock_and_tlb_flush(struct p2m_domain *p2m)mm_write_unlock (&p2m->lock); } +int altp2m_get_effective_entry (struct p2m_domain *ap2m,gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a, +bool prepopulate) +{ + *mfn = ap2m->get_entry (ap2m, gfn, t, a,0 ,NULL ,NULL ); + +/* Check host p2m if no valid entry in alternate */ +if ( !mfn_valid (*mfn) && !p2m_is_hostp2m (ap2m) ) + { +struct p2m_domain *hp2m =p2m_get_hostp2m (ap2m->domain); +unsigned int page_order; +int rc; + + *mfn =__get_gfn_type_access (hp2m,gfn_x (gfn), t, 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 ( prepopulate && page_order !=PAGE_ORDER_4K ) + { +unsigned long mask = ~((1UL << page_order) -1 ); +gfn_t gfn_aligned =_gfn (gfn_x (gfn) & mask); +mfn_t mfn_aligned =_mfn (mfn_x (*mfn) & mask); + + rc = ap2m->set_entry (ap2m, gfn_aligned, mfn_aligned, page_order, *t, *a,1 ); +if ( rc ) +return rc;
xen/arch/x86/mm/p2m.c void p2m_unlock_and_tlb_flush(struct p2m_domain *p2m) · line 520
Quoted 10 lines
xen/arch/x86/mm/p2m.c +7
-0+ } + } + +return 0 ; +} + +mfn_t __get_gfn_type_access (struct p2m_domain *p2m,unsigned long gfn_l,p2m_type_t *t,p2m_access_t *a,p2m_query_t q,unsigned int *page_order,bool_t locked)
Can you please avoid introducing double blank lines like this? (Easy enough to take care of while committing, of course.)
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 41 lines · Jan Beulich
Quoted 41 lines
Quoted 1 line
Quoted 1 line · On 23.04.19 at 16:30, <[email protected]> wrote:
xen/arch/x86/mm/p2m.c +34
-0@@ -478,6 +478,43 @@ void p2m_unlock_and_tlb_flush(struct p2m_domain *p2m)mm_write_unlock (&p2m->lock); } +int altp2m_get_effective_entry (struct p2m_domain *ap2m,gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a, +bool prepopulate) +{ + *mfn = ap2m->get_entry (ap2m, gfn, t, a,0 ,NULL ,NULL ); + +/* Check host p2m if no valid entry in alternate */ +if ( !mfn_valid (*mfn) && !p2m_is_hostp2m (ap2m) ) + { +struct p2m_domain *hp2m =p2m_get_hostp2m (ap2m->domain); +unsigned int page_order; +int rc; + + *mfn =__get_gfn_type_access (hp2m,gfn_x (gfn), t, 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 ( prepopulate && page_order !=PAGE_ORDER_4K ) + { +unsigned long mask = ~((1UL << page_order) -1 ); +gfn_t gfn_aligned =_gfn (gfn_x (gfn) & mask); +mfn_t mfn_aligned =_mfn (mfn_x (*mfn) & mask); + + rc = ap2m->set_entry (ap2m, gfn_aligned, mfn_aligned, page_order, *t, *a,1 ); +if ( rc ) +return rc; + } + } + +return 0 ;
Quoted 8 lines
xen/arch/x86/mm/p2m.c void p2m_unlock_and_tlb_flush(struct p2m_domain *p2m) · line 520
Quoted 6 lines
xen/arch/x86/mm/p2m.c +3
-0+} + +mfn_t __get_gfn_type_access (struct p2m_domain *p2m,unsigned long gfn_l,p2m_type_t *t,p2m_access_t *a,p2m_query_t q,unsigned int *page_order,bool_t locked)Can you please avoid introducing double blank lines like this? (Easy enough to take care of while committing, of course.)
Pulled into x86-next with this adjustment taken care of.
~Andrew
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 37 lines
Quoted 1 line
Quoted 1 line · On 23.04.19 at 16:30, <[email protected]> wrote:
xen/arch/x86/mm/p2m.c +30
-0@@ -478,6 +478,43 @@ void p2m_unlock_and_tlb_flush(struct p2m_domain *p2m)mm_write_unlock (&p2m->lock); } +int altp2m_get_effective_entry (struct p2m_domain *ap2m,gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a, +bool prepopulate) +{ + *mfn = ap2m->get_entry (ap2m, gfn, t, a,0 ,NULL ,NULL ); + +/* Check host p2m if no valid entry in alternate */ +if ( !mfn_valid (*mfn) && !p2m_is_hostp2m (ap2m) ) + { +struct p2m_domain *hp2m =p2m_get_hostp2m (ap2m->domain); +unsigned int page_order; +int rc; + + *mfn =__get_gfn_type_access (hp2m,gfn_x (gfn), t, 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 ( prepopulate && page_order !=PAGE_ORDER_4K ) + { +unsigned long mask = ~((1UL << page_order) -1 ); +gfn_t gfn_aligned =_gfn (gfn_x (gfn) & mask); +mfn_t mfn_aligned =_mfn (mfn_x (*mfn) & mask); + + rc = ap2m->set_entry (ap2m, gfn_aligned, mfn_aligned, page_order, *t, *a,1 ); +if ( rc ) +return rc;
xen/arch/x86/mm/p2m.c void p2m_unlock_and_tlb_flush(struct p2m_domain *p2m) · line 520
Quoted 10 lines
xen/arch/x86/mm/p2m.c +7
-0+ } + } + +return 0 ; +} + +mfn_t __get_gfn_type_access (struct p2m_domain *p2m,unsigned long gfn_l,p2m_type_t *t,p2m_access_t *a,p2m_query_t q,unsigned int *page_order,bool_t locked)
May I ask how the placement of this function was chosen? It looks as if all its callers live inside #ifdef CONFIG_HVM sections, just this function doesn't (reportedly causing build issues together with later changes).
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 44 lines · Jan Beulich
Quoted 44 lines
Quoted 1 line
Quoted 1 line · On 23.04.19 at 16:30, <[email protected]> wrote:
xen/arch/x86/mm/p2m.c +37
-0@@ -478,6 +478,43 @@ void p2m_unlock_and_tlb_flush(struct p2m_domain *p2m)mm_write_unlock (&p2m->lock); } +int altp2m_get_effective_entry (struct p2m_domain *ap2m,gfn_t gfn,mfn_t *mfn, +p2m_type_t *t,p2m_access_t *a, +bool prepopulate) +{ + *mfn = ap2m->get_entry (ap2m, gfn, t, a,0 ,NULL ,NULL ); + +/* Check host p2m if no valid entry in alternate */ +if ( !mfn_valid (*mfn) && !p2m_is_hostp2m (ap2m) ) + { +struct p2m_domain *hp2m =p2m_get_hostp2m (ap2m->domain); +unsigned int page_order; +int rc; + + *mfn =__get_gfn_type_access (hp2m,gfn_x (gfn), t, 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 ( prepopulate && page_order !=PAGE_ORDER_4K ) + { +unsigned long mask = ~((1UL << page_order) -1 ); +gfn_t gfn_aligned =_gfn (gfn_x (gfn) & mask); +mfn_t mfn_aligned =_mfn (mfn_x (*mfn) & mask); + + rc = ap2m->set_entry (ap2m, gfn_aligned, mfn_aligned, page_order, *t, *a,1 ); +if ( rc ) +return rc; + } + } + +return 0 ; +} + +
Quoted 8 lines
xen/arch/x86/mm/p2m.c void p2m_unlock_and_tlb_flush(struct p2m_domain *p2m) · line 520
Quoted 3 lines
xen/arch/x86/mm/p2m.c +0
-0mfn_t __get_gfn_type_access (struct p2m_domain *p2m,unsigned long gfn_l,p2m_type_t *t,p2m_access_t *a,p2m_query_t q,unsigned int *page_order,bool_t locked)May I ask how the placement of this function was chosen? It looks as if all its callers live inside #ifdef
CONFIG_HVMsections, just this function doesn't (reportedly causing build issues together with later changes).
I believe it's just an oversight. I've sent out a patch that hopefully fixes this in a satisfactory manner.
Thanks,
Razvan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel