remove one more shared xenheap page: shared_info
v3 cover remove one more shared xenheap page: shared_info
From: Paul Durrant <[email protected]>
Paul Durrant (6):
domain: introduce alloc/free_shared_info() helpers...
x86 / p2m: remove page_list check in p2m_alloc_table
x86 / pv: do not treat PGC_extra pages as RAM when constructing dom0 x86 / ioreq: use a MEMF_no_refcount allocation for server pages...
mm: add 'is_special_page' macro...
domain: use PGC_extra domheap page for shared_info
xen/arch/arm/domain.c | 10 +++---- xen/arch/arm/mm.c | 2 +- xen/arch/x86/domain.c | 12 ++++----- xen/arch/x86/domctl.c | 2 +- xen/arch/x86/hvm/ioreq.c | 2 +- xen/arch/x86/mm.c | 11 ++++---- xen/arch/x86/mm/altp2m.c | 2 +- xen/arch/x86/mm/mem_sharing.c | 3 +-- xen/arch/x86/mm/p2m.c | 8 ------ xen/arch/x86/mm/shadow/common.c | 13 ++++++---- xen/arch/x86/pv/dom0_build.c | 6 ++++- xen/arch/x86/pv/shim.c | 2 +- xen/common/domain.c | 46 +++++++++++++++++++++++++++++++++ xen/common/domctl.c | 2 +- xen/common/event_channel.c | 3 +++ xen/common/time.c | 19 ++++++++++++-- xen/include/asm-x86/shared.h | 15 ++++++----- xen/include/xen/domain.h | 3 +++ xen/include/xen/mm.h | 3 +++ xen/include/xen/sched.h | 5 +++- xen/include/xen/shared.h | 2 +- 21 files changed, 119 insertions(+), 52 deletions(-)
---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Paul Durrant <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tamas K Lengyel <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Volodymyr Babchuk <[email protected]>
Cc: Wei Liu <[email protected]>
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v3 1/6 domain: introduce alloc/free_shared_info() helpers...
From: Paul Durrant <[email protected]>
... and save the MFN.
This patch modifies the 'shared_info' field of struct domain to be a structure comprising an MFN and a virtual address. Allocations are still done from xenheap, so the virtual address still equates to virt_to_mfn() called on the MFN but subsequent patch will change this. Hence the need to save the MFN.
NOTE: Whist defining the new helpers, virt_to_mfn() in common/domain.c
is made type safe.
The definition of nmi_reason() in asm-x86/shared.h is also re- flowed to avoid overly long lines.
---
Cc: Stefano Stabellini <[email protected]>
Cc: Volodymyr Babchuk <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
--- xen/arch/arm/domain.c | 8 ++------ xen/arch/arm/mm.c | 2 +- xen/arch/x86/domain.c | 11 ++++------- xen/arch/x86/mm.c | 2 +- xen/arch/x86/pv/dom0_build.c | 2 +- xen/arch/x86/pv/shim.c | 2 +- xen/common/domain.c | 26 ++++++++++++++++++++++++++ xen/common/domctl.c | 2 +- xen/common/time.c | 4 ++-- xen/include/asm-x86/shared.h | 15 ++++++++------- xen/include/xen/domain.h | 3 +++ xen/include/xen/sched.h | 5 ++++- xen/include/xen/shared.h | 2 +- 13 files changed, 55 insertions(+), 29 deletions(-)
xen/arch/arm/domain.c +2 -6
@@ -689,13 +689,9 @@ int arch_domain_create(struct domain *d,if ( (rc =p2m_init (d)) !=0 ) goto fail; - rc = -ENOMEM ; -if ( (d->shared_info =alloc_xenheap_pages (0 ,0 )) ==NULL ) +if ( (rc =alloc_shared_info (d,0 )) !=0 ) goto fail; -clear_page (d->shared_info); -share_xen_page_with_guest (virt_to_page (d->shared_info), d, SHARE_rw); -switch ( config->arch.gic_version ) {case XEN_DOMCTL_CONFIG_GIC_V2 :
@@ -766,7 +762,7 @@ void arch_domain_destroy(struct domain *d)p2m_teardown (d);domain_vgic_free (d);domain_vuart_free (d); -free_xenheap_page (d->shared_info); +free_shared_info (d);#ifdef CONFIG_ACPI free_xenheap_pages (d->arch.efi_acpi_table,get_order_from_bytes (d->arch.efi_acpi_len));
xen/arch/arm/mm.c +1 -1
@@ -1424,7 +1424,7 @@ int xenmem_add_to_physmap_one(if ( idx !=0 )return -EINVAL ; - mfn =virt_to_mfn (d->shared_info); + mfn = d->shared_info.mfn; t = p2m_ram_rw;break ;
xen/arch/x86/domain.c +4 -7
@@ -611,12 +611,9 @@ int arch_domain_create(struct domain *d,* The shared_info machine address must fit in a 32-bit field within a * 32-bit guest's start_info structure. Hence we specify MEMF_bits(32). */ -if ( (d->shared_info =alloc_xenheap_pages (0 ,MEMF_bits (32 ))) ==NULL ) +if ( (rc =alloc_shared_info (d,MEMF_bits (32 ))) !=0 ) goto fail; -clear_page (d->shared_info); -share_xen_page_with_guest (virt_to_page (d->shared_info), d, SHARE_rw); -if ( (rc =init_domain_irq_mapping (d)) !=0 ) goto fail;
@@ -664,7 +661,7 @@ int arch_domain_create(struct domain *d,psr_domain_free (d);iommu_domain_destroy (d);cleanup_domain_irq_mapping (d); -free_xenheap_page (d->shared_info); +free_shared_info (d);xfree (d->arch.cpuid);xfree (d->arch.msr);if ( paging_initialised )
@@ -693,7 +690,7 @@ void arch_domain_destroy(struct domain *d)pv_domain_destroy (d);free_perdomain_mappings (d); -free_xenheap_page (d->shared_info); +free_shared_info (d);cleanup_domain_irq_mapping (d);psr_domain_free (d);
@@ -719,7 +716,7 @@ void arch_domain_unpause(struct domain *d)int arch_domain_soft_reset (struct domain *d) { -struct page_info *page =virt_to_page (d->shared_info), *new_page; +struct page_info *page =mfn_to_page (d->shared_info.mfn), *new_page;int ret =0 ;struct domain *owner;mfn_t mfn;
xen/arch/x86/mm.c +1 -1
@@ -4540,7 +4540,7 @@ int xenmem_add_to_physmap_one( {case XENMAPSPACE_shared_info:if ( idx ==0 ) - mfn =virt_to_mfn (d->shared_info); + mfn = d->shared_info.mfn;break ;case XENMAPSPACE_grant_table: rc =gnttab_map_frame (d, idx, gpfn, &mfn);
xen/arch/x86/pv/dom0_build.c +1 -1
@@ -743,7 +743,7 @@ int __init dom0_construct_pv(struct domain *d,clear_page (si); si->nr_pages = nr_pages; - si->shared_info =virt_to_maddr (d->shared_info); + si->shared_info =mfn_to_maddr (d->shared_info.mfn);if ( !pv_shim ) si->flags =SIF_PRIVILEGED |SIF_INITDOMAIN ;
xen/arch/x86/pv/shim.c +1 -1
@@ -282,7 +282,7 @@ static void write_start_info(struct domain *d)snprintf (si->magic,sizeof (si->magic),"xen-3.0-x86_%s" ,is_pv_32bit_domain (d) ?"32p" :"64" ); si->nr_pages =domain_tot_pages (d); - si->shared_info =virt_to_maddr (d->shared_info); + si->shared_info =mfn_to_maddr (d->shared_info.mfn); si->flags =0 ;BUG_ON (xen_hypercall_hvm_get_param (HVM_PARAM_STORE_PFN , &si->store_mfn));BUG_ON (xen_hypercall_hvm_get_param (HVM_PARAM_STORE_EVTCHN , ¶m));
xen/common/domain.c +26 -0
@@ -47,6 +47,10 @@#include <asm/guest.h> #endif +/* Override macros from asm/page.h to make them work with mfn_t */ +#undef virt_to_mfn +#define virt_to_mfn (v) _mfn(__virt_to_mfn(v)) +/* Linux config option: propageted to domain0 */ /* xen_processor_pmbits: xen control Cx, Px, ... */ unsigned int xen_processor_pmbits =XEN_PROCESSOR_PM_PX ;
@@ -1644,6 +1648,28 @@ int continue_hypercall_on_cpu(return 0 ; } +int alloc_shared_info (struct domain *d,unsigned int memflags) +{ +if ( (d->shared_info.virt =alloc_xenheap_pages (0 , memflags)) ==NULL ) +return -ENOMEM ; + + d->shared_info.mfn =virt_to_mfn (d->shared_info.virt); + +clear_page (d->shared_info.virt); +share_xen_page_with_guest (mfn_to_page (d->shared_info.mfn), d, SHARE_rw); + +return 0 ; +} + +void free_shared_info (struct domain *d) +{ +if ( !d->shared_info.virt ) +return ; + +free_xenheap_page (d->shared_info.virt); + d->shared_info.virt =NULL ; +} +/* * Local variables: * mode: C
xen/common/domctl.c +1 -1
@@ -196,7 +196,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) info->outstanding_pages = d->outstanding_pages; info->shr_pages =atomic_read (&d->shr_pages); info->paged_pages =atomic_read (&d->paged_pages); - info->shared_info_frame =mfn_to_gmfn (d,virt_to_mfn (d->shared_info)); + info->shared_info_frame =mfn_to_gmfn (d,mfn_x (d->shared_info.mfn));BUG_ON (SHARED_M2P (info->shared_info_frame)); info->cpupool =cpupool_get_id (d);
xen/common/time.c +2 -2
@@ -110,9 +110,9 @@ void update_domain_wallclock_time(struct domain *d)shared_info (d, wc_nsec) = wc_nsec;#ifdef CONFIG_X86 if (likely (!has_32bit_shinfo (d)) ) - d->shared_info->native.wc_sec_hi = sec >>32 ; + d->shared_info.virt->native.wc_sec_hi = sec >>32 ;else - d->shared_info->compat.arch.wc_sec_hi = sec >>32 ; + d->shared_info.virt->compat.arch.wc_sec_hi = sec >>32 ;#else shared_info (d, wc_sec_hi) = sec >>32 ;#endif
xen/include/asm-x86/shared.h +8 -7
@@ -1,24 +1,25 @@#ifndef __XEN_X86_SHARED_H__#define __XEN_X86_SHARED_H__ -#define nmi_reason (d) (!has_32bit_shinfo(d) ? \ - (u32 *)&(d)->shared_info->native.arch.nmi_reason : \ - (u32 *)&(d)->shared_info->compat.arch.nmi_reason) +#define nmi_reason (d) \ + (!has_32bit_shinfo(d) ? \ + (u32 *)&(d)->shared_info.virt->native.arch.nmi_reason : \ + (u32 *)&(d)->shared_info.virt->compat.arch.nmi_reason)#define GET_SET_SHARED (type, field) \ static inline type arch_get_##field(const struct domain *d) \ { \ return !has_32bit_shinfo(d) ? \ - d->shared_info->native.arch.field : \ - d->shared_info->compat.arch.field; \ + d->shared_info.virt->native.arch.field : \ + d->shared_info.virt->compat.arch.field; \ } \ static inline void arch_set_##field(struct domain *d, \ type val) \ { \ if ( !has_32bit_shinfo(d) ) \ - d->shared_info->native.arch.field = val; \ + d->shared_info.virt->native.arch.field = val; \ else \ - d->shared_info->compat.arch.field = val; \ + d->shared_info.virt->compat.arch.field = val; \ }#define GET_SET_VCPU (type, field) \
xen/include/xen/domain.h +3 -0
@@ -130,4 +130,7 @@ struct vnuma_info {void vnuma_destroy (struct vnuma_info *vnuma); +int alloc_shared_info (struct domain *d,unsigned int memflags); +void free_shared_info (struct domain *d); +#endif /* __XEN_DOMAIN_H__ */
xen/include/xen/sched.h +4 -1
@@ -346,7 +346,10 @@ struct domainunsigned int max_vcpus;struct vcpu **vcpu; -shared_info_t *shared_info;/* shared data area */ +struct { +mfn_t mfn; +shared_info_t *virt; + } shared_info;/* shared data area */ spinlock_t domain_lock;
xen/include/xen/shared.h +1 -1
@@ -43,7 +43,7 @@ typedef struct vcpu_info vcpu_info_t;extern vcpu_info_t dummy_vcpu_info; -#define shared_info (d, field) __shared_info(d, (d)->shared_info, field) +#define shared_info (d, field) __shared_info(d, (d)->shared_info.virt, field)#define vcpu_info (v, field) __vcpu_info(v, (v)->vcpu_info, field)#endif /* __XEN_SHARED_H__ */
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 1/6] domain: introduce alloc/free_shared_info() helpers...
Quoted 35 lines · On Thu, 2020-03-05 at 12:44 +0000, [email protected] wrote:
From: Paul Durrant <[email protected]>
... and save the MFN.
This patch modifies the '
shared_info' field of struct domain to be a structure comprising an MFN and a virtual address. Allocations are still done from xenheap, so the virtual address still equates tovirt_to_mfn()called on the MFN but subsequent patch will change this.
Hence the need to save the MFN.NOTE: Whist defining the new helpers,
virt_to_mfn()incommon/domain.c
is made type safe.
The definition ofnmi_reason()inasm-x86/shared.his also re- flowed to avoid overly long lines.Signed-off-by Paul Durrant <[email protected]>Reviewed-by Julien Grall <[email protected]>...
xen/common/domain.c +3
-0+int alloc_shared_info (struct domain *d,unsigned int memflags) +{ + if ( (d->shared_info.virt = alloc_xenheap_pages(0, memflags)) ==NULL )
xen/common/domain.c +6
-0+return -ENOMEM ; + + d->shared_info.mfn =virt_to_mfn (d->shared_info.virt); + +clear_page (d->shared_info.virt); + share_xen_page_with_guest(mfn_to_page(d->shared_info.mfn), d,
SHARE_rw);xen/common/domain.c +3
-0+ +return 0 ; +}
xen/common/domain.c int continue_hypercall_on_cpu( · line 1672
Quoted 10 lines
xen/common/domain.c +10
-0+ +void free_shared_info (struct domain *d) +{ +if ( !d->shared_info.virt ) +return ; + +free_xenheap_page (d->shared_info.virt); + d->shared_info.virt =NULL ; +} +
I was going to say that free_xenheap_page() can deal with NULL so we do not have to return on NULL. But then I found that the final patch needs to unmap it which cannot deal with NULL anyway, so I no longer have a strong opinion to do clean-ups here.
Other than that,
Hongyan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 1/6] domain: introduce alloc/free_shared_info() helpers...
Quoted 5 lines · Hongyan Xia
Quoted 1 line · On Thu, 2020-03-05 at 12:44 +0000, [email protected] wrote:
...
Other than that,
Reviewed-by Hongyan Xia <[email protected]>
Sorry, I meant [email protected]
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 1/6] domain: introduce alloc/free_shared_info() helpers...
In reply to [email protected]Quoted 10 lines · On 05.03.2020 13:44, [email protected] wrote:
From: Paul Durrant <[email protected]>
... and save the MFN.
This patch modifies the '
shared_info' field of struct domain to be a structure comprising an MFN and a virtual address. Allocations are still done from xenheap, so the virtual address still equates tovirt_to_mfn()called on the MFN but subsequent patch will change this. Hence the need to save the MFN.
Quoted 7 lines
NOTE: Whist defining the new helpers,
virt_to_mfn()incommon/domain.c
is made type safe.
The definition ofnmi_reason()inasm-x86/shared.his also re- flowed to avoid overly long lines.Signed-off-by Paul Durrant <[email protected]>Reviewed-by Julien Grall <[email protected]>
This patch by itself looks okay, but of course increases storage requirements a little. Therefore
only if we reach agreement that the final patch in this series is also to go in, which I'm yet to be convinced of.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v3 2/6 x86 / p2m: remove page_list check in p2m_alloc_table
In reply to [email protected]From: Paul Durrant <[email protected]>
There does not seem to be any justification for refusing to create the domain's p2m table simply because it may have assigned pages. Particularly it prevents the prior allocation of PGC_extra pages.
---
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
v2:
- New in v2
--- xen/arch/x86/mm/p2m.c | 8 -------- 1 file changed, 8 deletions(-)
xen/arch/x86/mm/p2m.c +0 -8
@@ -695,14 +695,6 @@ int p2m_alloc_table(struct p2m_domain *p2m)p2m_lock (p2m); -if (p2m_is_hostp2m (p2m) - && !page_list_empty (&d->page_list) ) - { -P2M_ERROR ("dom %d already has memory allocated\n" , d->domain_id); -p2m_unlock (p2m); -return -EINVAL ; - } -if (pagetable_get_pfn (p2m_get_pagetable (p2m)) !=0 ) {P2M_ERROR ("p2m already allocated for this domain\n" );
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 2/6] x86 / p2m: remove page_list check in p2m_alloc_table
Quoted 4 lines · On 05.03.2020 13:45, [email protected] wrote:
From: Paul Durrant <[email protected]>
There does not seem to be any justification for refusing to create the domain's p2m table simply because it may have assigned pages.
I think there is: If any such allocation had happened before, how would it be represented in the domain's p2m?
Quoted 2 lines
Particularly
it prevents the prior allocation ofPGC_extrapages.
That's unfortunate, but will need taking care of differently then:
xen/arch/x86/mm/p2m.c int p2m_alloc_table(struct p2m_domain *p2m) · line 704
Quoted 13 lines
xen/arch/x86/mm/p2m.c +0
-7@@ -695,14 +695,6 @@ int p2m_alloc_table(struct p2m_domain *p2m)p2m_lock (p2m); -if (p2m_is_hostp2m (p2m) - && !page_list_empty (&d->page_list) ) - { -P2M_ERROR ("dom %d already has memory allocated\n" , d->domain_id); -p2m_unlock (p2m); -return -EINVAL ; - }
Instead of checking the list to be empty, how about checking domain_tot_pages() to return zero?
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 2/6] x86 / p2m: remove page_list check in p2m_alloc_table
Quoted 9 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 11:46
To: [email protected]
Cc: [email protected]; Durrant, Paul <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>
Subject: Re: [PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_table
Quoted 8 lines
Quoted 4 lines · On 05.03.2020 13:45, [email protected] wrote:
From: Paul Durrant <[email protected]>
There does not seem to be any justification for refusing to create the domain's p2m table simply because it may have assigned pages.
I think there is: If any such allocation had happened before, how would it be represented in the domain's p2m?
Insertion into the p2m is a separate action from page allocation. Why should they be linked?
Quoted 12 lines
Quoted 3 lines
Particularly
it prevents the prior allocation ofPGC_extrapages.That's unfortunate, but will need taking care of differently then:
Quoted 6 lines
xen/arch/x86/mm/p2m.c +0
-0@@ -695,14 +695,6 @@ int p2m_alloc_table(struct p2m_domain *p2m)p2m_lock (p2m);
Quoted 10 lines
xen/arch/x86/mm/p2m.c int p2m_alloc_table(struct p2m_domain *p2m) · line 704
Quoted 7 lines
xen/arch/x86/mm/p2m.c +0
-7-if (p2m_is_hostp2m (p2m) - && !page_list_empty (&d->page_list) ) - { -P2M_ERROR ("dom %d already has memory allocated\n" , d->domain_id); -p2m_unlock (p2m); -return -EINVAL ; - }Instead of checking the list to be empty, how about checking
domain_tot_pages()to return zero?
I could do that, and in fact my original code did, but with more consideration the whole test just didn't make sense to me. Yes, clearly the p2m has to be there before pages can be added into it, but I can't see any reason why you couldn't even allocate the entire guest RAM, then create the p2m and then add the pages into it.
Paul
Quoted 2 lines
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 2/6] x86 / p2m: remove page_list check in p2m_alloc_table
Quoted 12 lines · Paul
Quoted 12 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 11:46
To: [email protected]
Cc: [email protected]; Durrant, Paul <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>
Subject: Re: [PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_tableQuoted 2 lines · On 05.03.2020 13:45, [email protected] wrote:
From: Paul Durrant <[email protected]>
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
There does not seem to be any justification for refusing to create the domain's p2m table simply because it may have assigned pages.
I think there is: If any such allocation had happened before, how would it be represented in the domain's p2m?
Insertion into the p2m is a separate action from page allocation. Why should they be linked?
They are, because of how XENMEM_populate_physmap works. Yes, they _could_ be separate steps, but that's only a theoretical consideration.
Quoted 22 lines
Quoted 11 lines
Quoted 2 lines
Particularly
it prevents the prior allocation ofPGC_extrapages.That's unfortunate, but will need taking care of differently then:
Quoted 6 lines
xen/arch/x86/mm/p2m.c +0
-0@@ -695,14 +695,6 @@ int p2m_alloc_table(struct p2m_domain *p2m)p2m_lock (p2m);Quoted 10 lines
xen/arch/x86/mm/p2m.c int p2m_alloc_table(struct p2m_domain *p2m) · line 704
Quoted 7 lines
xen/arch/x86/mm/p2m.c +0
-7-if (p2m_is_hostp2m (p2m) - && !page_list_empty (&d->page_list) ) - { -P2M_ERROR ("dom %d already has memory allocated\n" , d->domain_id); -p2m_unlock (p2m); -return -EINVAL ; - }Instead of checking the list to be empty, how about checking
domain_tot_pages()to return zero?
Quoted 6 lines
I could do that, and in fact my original code did, but with more consideration the whole test just didn't make sense to me. Yes, clearly the p2m has to be there before pages can be added into it, but I can't see any reason why you couldn't even allocate the entire guest RAM, then create the p2m and then add the pages into it.
Right - more hypercalls (XENMEM_increase_reservation + operations like XENMAPSPACE_gmfn), and hence slower overall domain creation. Plus - XENMEM_increase_reservation is not very useful for translated domains, as it won't return the MFNs allocated, and there's no way to specify where they should appear in GFN space. Hence in practice I don't see how this whole operation could work without XENMEM_populate_physmap.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 2/6] x86 / p2m: remove page_list check in p2m_alloc_table
Quoted 25 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 12:47
To: Durrant, Paul <[email protected]>
Cc: [email protected]; [email protected]; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>
Subject: Re: [PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_tableQuoted 6 lines · Paul
Quoted 6 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 11:46
To: [email protected]
Cc: [email protected]; Durrant, Paul <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; RogerPau
Quoted 9 lines
Quoted 9 lines
Monné <[email protected]>
Subject: Re: [PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_tableQuoted 4 lines · On 05.03.2020 13:45, [email protected] wrote:
From: Paul Durrant <[email protected]>
There does not seem to be any justification for refusing to create the domain's p2m table simply because it may have assigned pages.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
I think there is: If any such allocation had happened before, how would it be represented in the domain's p2m?
Insertion into the p2m is a separate action from page allocation. Why should they be linked?
They are, because of how
XENMEM_populate_physmapworks. Yes, they _could_ be separate steps, but that's only a theoretical consideration.
Then surely the check should be in the XENMEM_populate_physmap code?
Quoted 30 lines
Quoted 23 lines
Quoted 12 lines
Quoted 3 lines
Particularly
it prevents the prior allocation ofPGC_extrapages.That's unfortunate, but will need taking care of differently then:
Quoted 6 lines
xen/arch/x86/mm/p2m.c +0
-0@@ -695,14 +695,6 @@ int p2m_alloc_table(struct p2m_domain *p2m)p2m_lock (p2m);Quoted 10 lines
xen/arch/x86/mm/p2m.c int p2m_alloc_table(struct p2m_domain *p2m) · line 704
Quoted 7 lines
xen/arch/x86/mm/p2m.c +0
-7-if (p2m_is_hostp2m (p2m) - && !page_list_empty (&d->page_list) ) - { -P2M_ERROR ("dom %d already has memory allocated\n" , d->domain_id); -p2m_unlock (p2m); -return -EINVAL ; - }Instead of checking the list to be empty, how about checking
domain_tot_pages()to return zero?Quoted 6 lines
I could do that, and in fact my original code did, but with more consideration the whole test just didn't make sense to me. Yes, clearly the p2m has to be there before pages can be added into it, but I can't see any reason why you couldn't even allocate the entire guest RAM, then create the p2m and then add the pages into it.
Quoted 8 lines
Right - more hypercalls (
XENMEM_increase_reservation+ operations likeXENMAPSPACE_gmfn), and hence slower overall domain creation. Plus -XENMEM_increase_reservationis not very useful for translated domains, as it won't return the MFNs allocated, and there's no way to specify where they should appear in GFN space. Hence in practice I don't see how this whole operation could work withoutXENMEM_populate_physmap.
Oh, it would mean a big change in the tools etc. so I'm not saying it's a good idea or even possible at the moment. I was just pointing out that, as far as the lower layers of code in Xen go, page allocation and p2m insertion are distinct actions.
Paul
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 2/6] x86 / p2m: remove page_list check in p2m_alloc_table
Quoted 28 lines · Paul
Quoted 28 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 12:47
To: Durrant, Paul <[email protected]>
Cc: [email protected]; [email protected]; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>
Subject: Re: [PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_tableQuoted 6 lines · Paul
Quoted 6 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 11:46
To: [email protected]
Cc: [email protected]; Durrant, Paul <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; RogerPau
Quoted 12 lines
Quoted 11 lines
Monné <[email protected]>
Subject: Re: [PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_tableQuoted 4 lines · On 05.03.2020 13:45, [email protected] wrote:
From: Paul Durrant <[email protected]>
There does not seem to be any justification for refusing to create the domain's p2m table simply because it may have assigned pages.
I think there is: If any such allocation had happened before, how would it be represented in the domain's p2m?
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Insertion into the p2m is a separate action from page allocation. Why should they be linked?
They are, because of how
XENMEM_populate_physmapworks. Yes, they _could_ be separate steps, but that's only a theoretical consideration.Then surely the check should be in the
XENMEM_populate_physmapcode?
How that? populate-physmap can be called any number of times. We can't refuse a 2nd call there just because a 1st one had happened already. Or did you mean the inverse check (i.e. that there already is a p2m)? This surely wouldn't be a bad idea, as otherwise both ept_get_entry() and p2m_pt_get_entry() would blindly map MFN 0. But adding such a check wouldn't eliminate the reason to also have the check that you're proposing to drop.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [EXTERNAL][PATCH v3 2/6] x86 / p2m: remove page_list check in p2m_alloc_table
Quoted 50 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 13:07
To: Durrant, Paul <[email protected]>
Cc: [email protected]; [email protected]; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>
Subject: RE: [EXTERNAL][PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_tableCAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.
Quoted 6 lines · Paul
Quoted 6 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 12:47
To: Durrant, Paul <[email protected]>
Cc: [email protected]; [email protected]; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; Roger Pau MonnéQuoted 9 lines
Quoted 9 lines
Subject: Re: [PATCH v3 2/6] x86 / p2m: remove
page_listcheck inp2m_alloc_tableQuoted 6 lines · Paul
Quoted 6 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 11:46
To: [email protected]
Cc: [email protected]; Durrant, Paul <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>;Roger
Quoted 19 lines
Quoted 18 lines
Pau
Quoted 6 lines
Quoted 6 lines
Monné <[email protected]>
Subject: Re: [PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_tableQuoted 2 lines · On 05.03.2020 13:45, [email protected] wrote:
From: Paul Durrant <[email protected]>
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
There does not seem to be any justification for refusing to create the domain's p2m table simply because it may have assigned pages.
I think there is: If any such allocation had happened before, how would it be represented in the domain's p2m?
Insertion into the p2m is a separate action from page allocation. Why should they be linked?
They are, because of how
XENMEM_populate_physmapworks. Yes, they _could_ be separate steps, but that's only a theoretical consideration.
Quoted 6 lines
Quoted 1 line
Then surely the check should be in the
XENMEM_populate_physmapcode?How that? populate-physmap can be called any number of times. We can't refuse a 2nd call there just because a 1st one had happened already. Or did you mean the inverse check (i.e. that there already is a p2m)?
Yes, I mean check the p2m has been initialized there.
Quoted 5 lines
This surely wouldn't be a bad idea, as
otherwise bothept_get_entry()andp2m_pt_get_entry()would blindly map MFN 0. But adding such a check wouldn't eliminate the reason to also have the check that you're proposing to drop.
Why not? Anywhere assuming the existence of a p2m ought to check for it; I still can't see why initialising the p2m after having allocated pages (PGC_extra or otherwise) is inherently wrong.
Paul
Quoted 1 line
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [EXTERNAL][PATCH v3 2/6] x86 / p2m: remove page_list check in p2m_alloc_table
Quoted 59 lines · Paul Durrant
Quoted 50 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 13:07
To: Durrant, Paul <[email protected]>
Cc: [email protected]; [email protected]; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>
Subject: RE: [EXTERNAL][PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_tableCAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.
Quoted 6 lines · Paul
Quoted 6 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 12:47
To: Durrant, Paul <[email protected]>
Cc: [email protected]; [email protected]; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; Roger Pau MonnéQuoted 9 lines
Quoted 9 lines
Subject: Re: [PATCH v3 2/6] x86 / p2m: remove
page_listcheck inp2m_alloc_tableQuoted 6 lines · Paul
Quoted 6 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 11:46
To: [email protected]
Cc: [email protected]; Durrant, Paul <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>;Roger
Quoted 19 lines
Quoted 18 lines
Pau
Quoted 6 lines
Quoted 6 lines
Monné <[email protected]>
Subject: Re: [PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_tableQuoted 2 lines · On 05.03.2020 13:45, [email protected] wrote:
From: Paul Durrant <[email protected]>
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
There does not seem to be any justification for refusing to create the domain's p2m table simply because it may have assigned pages.
I think there is: If any such allocation had happened before, how would it be represented in the domain's p2m?
Insertion into the p2m is a separate action from page allocation. Why should they be linked?
They are, because of how
XENMEM_populate_physmapworks. Yes, they _could_ be separate steps, but that's only a theoretical consideration.Quoted 6 lines
Quoted 1 line
Then surely the check should be in the
XENMEM_populate_physmapcode?How that? populate-physmap can be called any number of times. We can't refuse a 2nd call there just because a 1st one had happened already. Or did you mean the inverse check (i.e. that there already is a p2m)?
Yes, I mean check the p2m has been initialized there.
Quoted 8 lines
Quoted 5 lines
This surely wouldn't be a bad idea, as
otherwise bothept_get_entry()andp2m_pt_get_entry()would blindly map MFN 0. But adding such a check wouldn't eliminate the reason to also have the check that you're proposing to drop.Why not? Anywhere assuming the existence of a p2m ought to check for it;
As said - I agree this wouldn't be a bad thing to do. It would be a requirement if paging_enable() wasn't called from hvm_domain_initialise(), but via a distinct domctl. But since it is, there's no way to invoke populate-physmap on a domain without its p2m root table already allocated.
Quoted 2 lines
I still can't see why initialising the p2m after having allocated pages (
PGC_extraor otherwise) is inherently wrong.
"inherently" as in "from an abstract pov" - yes. But within the constraints of the hypercalls available - no. Yet what gets checked has to be of practical use, not just of theoretical one. I.e. I'd be fine to see the check go away when a viable alternative mechanism to allocate and _then_ populate p2m gets introduced.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [EXTERNAL][PATCH v3 2/6] x86 / p2m: remove page_list check in p2m_alloc_table
Quoted 88 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 13:19
To: Paul Durrant <[email protected]>
Cc: [email protected]; [email protected]; 'Andrew Cooper' <[email protected]>; 'George Dunlap' <[email protected]>; 'Wei Liu' <[email protected]>; 'Roger Pau Monné' <[email protected]>
Subject: Re: [EXTERNAL][PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_tableQuoted 6 lines · Paul Durrant
Quoted 6 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 13:07
To: Durrant, Paul <[email protected]>
Cc: [email protected]; [email protected]; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; Roger Pau MonnéQuoted 53 lines
Quoted 44 lines
Subject: RE: [EXTERNAL][PATCH v3 2/6] x86 / p2m: remove
page_listcheck inp2m_alloc_tableCAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.
Quoted 6 lines · Paul
Quoted 6 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 12:47
To: Durrant, Paul <[email protected]>
Cc: [email protected]; [email protected]; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>; Roger Pau MonnéQuoted 9 lines
Quoted 9 lines
Subject: Re: [PATCH v3 2/6] x86 / p2m: remove
page_listcheck inp2m_alloc_tableQuoted 6 lines · Paul
Quoted 6 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 11:46
To: [email protected]
Cc: [email protected]; Durrant, Paul <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Wei Liu <[email protected]>;Roger
Quoted 19 lines
Quoted 18 lines
Pau
Quoted 6 lines
Quoted 6 lines
Monné <[email protected]>
Subject: Re: [PATCH v3 2/6] x86 / p2m: removepage_listcheck inp2m_alloc_tableQuoted 2 lines · On 05.03.2020 13:45, [email protected] wrote:
From: Paul Durrant <[email protected]>
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
There does not seem to be any justification for refusing to create the domain's p2m table simply because it may have assigned pages.
I think there is: If any such allocation had happened before, how would it be represented in the domain's p2m?
Insertion into the p2m is a separate action from page allocation. Why should they be linked?
They are, because of how
XENMEM_populate_physmapworks. Yes, they _could_ be separate steps, but that's only a theoretical consideration.Quoted 6 lines
Quoted 1 line
Then surely the check should be in the
XENMEM_populate_physmapcode?How that? populate-physmap can be called any number of times. We can't refuse a 2nd call there just because a 1st one had happened already. Or did you mean the inverse check (i.e. that there already is a p2m)?
Yes, I mean check the p2m has been initialized there.
Quoted 8 lines
Quoted 5 lines
This surely wouldn't be a bad idea, as
otherwise bothept_get_entry()andp2m_pt_get_entry()would blindly map MFN 0. But adding such a check wouldn't eliminate the reason to also have the check that you're proposing to drop.Why not? Anywhere assuming the existence of a p2m ought to check for it;
As said - I agree this wouldn't be a bad thing to do. It would be a requirement if
paging_enable()wasn't called fromhvm_domain_initialise(), but via a distinct domctl. But since it is, there's no way to invoke populate-physmap on a domain without its p2m root table already allocated.Quoted 2 lines
I still can't see why initialising the p2m after having allocated pages (
PGC_extraor otherwise) is inherently wrong.
Quoted 7 lines
"inherently" as in "from an abstract pov" - yes. But within the constraints of the hypercalls available - no. Yet what gets checked has to be of practical use, not just of theoretical one. I.e. I'd be fine to see the check go away when a viable alternative mechanism to allocate and _then_ populate p2m gets introduced.
OK... it still seems like the wrong place to me, but I'll leave the check and simply exclude PGG_extra pages.
Paul
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v3 3/6 x86 / pv: do not treat PGC_extra pages as RAM when constructing dom0
In reply to [email protected]From: Paul Durrant <[email protected]>
The walk of page_list in dom0_construct_pv() should ignore PGC_extra pages as they are only created for special purposes and, if mapped, will be mapped explicitly for whatever purpose is relevant.
---
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
v2:
- New in v2
--- xen/arch/x86/pv/dom0_build.c | 4 ++++ 1 file changed, 4 insertions(+)
xen/arch/x86/pv/dom0_build.c +4 -0
@@ -792,6 +792,10 @@ int __init dom0_construct_pv(struct domain *d, { mfn =mfn_x (page_to_mfn (page));BUG_ON (SHARED_M2P (get_gpfn_from_mfn (mfn))); + +if ( page->count_info & PGC_extra ) +continue ; +if (get_gpfn_from_mfn (mfn) >= count ) {BUG_ON (is_pv_32bit_domain (d));
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 3/6] x86 / pv: do not treat PGC_extra pages as RAM when constructing dom0
xen/arch/x86/pv/dom0_build.c int __init dom0_construct_pv(struct domain *d, · line 797
Quoted 9 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/pv/dom0_build.c +3
-0@@ -792,6 +792,10 @@ int __init dom0_construct_pv(struct domain *d, { mfn =mfn_x (page_to_mfn (page));BUG_ON (SHARED_M2P (get_gpfn_from_mfn (mfn))); + +if ( page->count_info & PGC_extra ) +continue ;
This surely is a pattern, i.e. there are more similar changes to
make: tboot_gen_domain_integrity() e.g. ignores d->xenpage_list, and hence with the goal of converting the shared info page would also want adjustment. For dump_numa() it may be less important, but it would still look more correct if it too got changed. audit_p2m() might apparently complain about such pages (and hence might be a problem with the one PGC_extra page VMX domains now have). And this is only from me looking at page_list_for_each(..., &d->page_list) constructs; who knows what else there is.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 3/6] x86 / pv: do not treat PGC_extra pages as RAM when constructing dom0
Quoted 22 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 11:56
To: [email protected]
Cc: [email protected]; Durrant, Paul <[email protected]>; Roger Pau Monné <[email protected]>; Wei Liu <[email protected]>; Andrew Cooper <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 3/6] x86 / pv: do not treatPGC_extrapages as RAM when constructing dom0xen/arch/x86/pv/dom0_build.c int __init dom0_construct_pv(struct domain *d, · line 797
Quoted 9 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/pv/dom0_build.c +3
-0@@ -792,6 +792,10 @@ int __init dom0_construct_pv(struct domain *d, { mfn =mfn_x (page_to_mfn (page));BUG_ON (SHARED_M2P (get_gpfn_from_mfn (mfn))); + +if ( page->count_info & PGC_extra ) +continue ;This surely is a pattern, i.e. there are more similar changes to
make:tboot_gen_domain_integrity()e.g. ignoresd->xenpage_list,
Quoted 9 lines
and hence with the goal of converting the shared info page would also want adjustment. For
dump_numa()it may be less important, but it would still look more correct if it too got changed.audit_p2m()might apparently complain about such pages (and hence might be a problem with the onePGC_extrapage VMX domains now have). And this is only from me looking atpage_list_for_each(..., &d->page_list)constructs; who knows what else there is.
Those are dealt with by the is_special_page() patch later on I think. It didn't seem appropriate to use that macro here though since we know pages on the page list cannot be xenheap pages.
Paul
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 3/6] x86 / pv: do not treat PGC_extra pages as RAM when constructing dom0
Quoted 32 lines · Paul
Quoted 22 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 11:56
To: [email protected]
Cc: [email protected]; Durrant, Paul <[email protected]>; Roger Pau Monné <[email protected]>; Wei Liu <[email protected]>; Andrew Cooper <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 3/6] x86 / pv: do not treatPGC_extrapages as RAM when constructing dom0xen/arch/x86/pv/dom0_build.c int __init dom0_construct_pv(struct domain *d, · line 797
Quoted 9 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/pv/dom0_build.c +3
-0@@ -792,6 +792,10 @@ int __init dom0_construct_pv(struct domain *d, { mfn =mfn_x (page_to_mfn (page));BUG_ON (SHARED_M2P (get_gpfn_from_mfn (mfn))); + +if ( page->count_info & PGC_extra ) +continue ;This surely is a pattern, i.e. there are more similar changes to
make:tboot_gen_domain_integrity()e.g. ignoresd->xenpage_list,Quoted 9 lines
and hence with the goal of converting the shared info page would also want adjustment. For
dump_numa()it may be less important, but it would still look more correct if it too got changed.audit_p2m()might apparently complain about such pages (and hence might be a problem with the onePGC_extrapage VMX domains now have). And this is only from me looking atpage_list_for_each(..., &d->page_list)constructs; who knows what else there is.
Quoted 1 line
Those are dealt with by the
is_special_page()patch later on I think.
Having already looked at that patch as well - I don't think so, no. That one only replaces uses of is_xen_heap_page(), but doesn't add any checks where such uses simply aren't needed because code is looking at ->page_list only.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 3/6] x86 / pv: do not treat PGC_extra pages as RAM when constructing dom0
Quoted 42 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 13:39
To: Durrant, Paul <[email protected]>
Cc: [email protected]; Andrew Cooper <[email protected]>; Wei Liu <[email protected]>; [email protected]; Roger Pau Monné <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 3/6] x86 / pv: do not treatPGC_extrapages as RAM when constructing dom0Quoted 32 lines · Paul
Quoted 31 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 11:56
To: [email protected]
Cc: [email protected]; Durrant, Paul <[email protected]>; Roger Pau Monné <[email protected]>; Wei Liu <[email protected]>; Andrew Cooper <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 3/6] x86 / pv: do not treatPGC_extrapages as RAM when constructing dom0xen/arch/x86/pv/dom0_build.c int __init dom0_construct_pv(struct domain *d, · line 797
Quoted 9 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/pv/dom0_build.c +3
-0@@ -792,6 +792,10 @@ int __init dom0_construct_pv(struct domain *d, { mfn =mfn_x (page_to_mfn (page));BUG_ON (SHARED_M2P (get_gpfn_from_mfn (mfn))); + +if ( page->count_info & PGC_extra ) +continue ;This surely is a pattern, i.e. there are more similar changes to
make:tboot_gen_domain_integrity()e.g. ignoresd->xenpage_list, and hence with the goal of converting the shared info page would also want adjustment. Fordump_numa()it may be less important, but it would still look more correct if it too got changed.audit_p2m()might apparently complain about such pages (and hence might be a problem with the onePGC_extrapage VMX domains now have). And this is only from me looking atpage_list_for_each(..., &d->page_list)constructs; who knows what else there is.
Quoted 6 lines
Quoted 1 line
Those are dealt with by the
is_special_page()patch later on I think.Having already looked at that patch as well - I don't think so, no. That one only replaces uses of
is_xen_heap_page(), but doesn't add any checks where such uses simply aren't needed because code is looking at ->page_list only.
Well, I did say:
"It didn't seem appropriate to use that macro here though since we know pages on the page list cannot be xenheap pages."
i.e. an open coded check here seems like the right thing to do. If I've missed other places where I need to account for pages which are specifically PGC_extra pages then I'll need to fix them similarly.
Paul
Quoted 7 lines
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 3/6] x86 / pv: do not treat PGC_extra pages as RAM when constructing dom0
Quoted 49 lines · Paul Durrant
Quoted 42 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 13:39
To: Durrant, Paul <[email protected]>
Cc: [email protected]; Andrew Cooper <[email protected]>; Wei Liu <[email protected]>; [email protected]; Roger Pau Monné <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 3/6] x86 / pv: do not treatPGC_extrapages as RAM when constructing dom0Quoted 32 lines · Paul
Quoted 31 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 11:56
To: [email protected]
Cc: [email protected]; Durrant, Paul <[email protected]>; Roger Pau Monné <[email protected]>; Wei Liu <[email protected]>; Andrew Cooper <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 3/6] x86 / pv: do not treatPGC_extrapages as RAM when constructing dom0xen/arch/x86/pv/dom0_build.c int __init dom0_construct_pv(struct domain *d, · line 797
Quoted 9 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/pv/dom0_build.c +3
-0@@ -792,6 +792,10 @@ int __init dom0_construct_pv(struct domain *d, { mfn =mfn_x (page_to_mfn (page));BUG_ON (SHARED_M2P (get_gpfn_from_mfn (mfn))); + +if ( page->count_info & PGC_extra ) +continue ;This surely is a pattern, i.e. there are more similar changes to
make:tboot_gen_domain_integrity()e.g. ignoresd->xenpage_list, and hence with the goal of converting the shared info page would also want adjustment. Fordump_numa()it may be less important, but it would still look more correct if it too got changed.audit_p2m()might apparently complain about such pages (and hence might be a problem with the onePGC_extrapage VMX domains now have). And this is only from me looking atpage_list_for_each(..., &d->page_list)constructs; who knows what else there is.Quoted 6 lines
Quoted 1 line
Those are dealt with by the
is_special_page()patch later on I think.Having already looked at that patch as well - I don't think so, no. That one only replaces uses of
is_xen_heap_page(), but doesn't add any checks where such uses simply aren't needed because code is looking at ->page_list only.
Quoted 4 lines
Well, I did say:
"It didn't seem appropriate to use that macro here though since we know pages on the page list cannot be xenheap pages."
And I agree and understand.
Quoted 1 line
i.e. an open coded check here seems like the right thing to do.
Indeed.
Quoted 2 lines
If I've missed other places where I need to account for pages which are specifically
PGC_extrapages then I'll need to fix them similarly.
Yes please. Thanks.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v3 4/6 x86 / ioreq: use a MEMF_no_refcount allocation for server pages...
In reply to [email protected]From: Paul Durrant <[email protected]>
... now that it is safe to assign them.
This avoids relying on libxl (or whatever toolstack is in use) setting max_pages up with sufficient 'slop' to allow all necessary ioreq server pages to be allocated.
---
Cc: Paul Durrant <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
v2:
- New in v2
--- xen/arch/x86/hvm/ioreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
xen/arch/x86/hvm/ioreq.c +1 -1
@@ -375,7 +375,7 @@ static int hvm_alloc_ioreq_mfn(struct hvm_ioreq_server *s, bool buf)return 0 ; } - page =alloc_domheap_page (s->target,0 ); + page =alloc_domheap_page (s->target, MEMF_no_refcount);if ( !page )return -ENOMEM ;
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 4/6] x86 / ioreq: use a MEMF_no_refcount allocation for server pages...
Quoted 9 lines · On 05.03.2020 13:45, [email protected] wrote:
From: Paul Durrant <[email protected]>
... now that it is safe to assign them.
This avoids relying on libxl (or whatever toolstack is in use) setting
max_pagesup with sufficient 'slop' to allow all necessary ioreq server pages to be allocated.Signed-off-by Paul Durrant <[email protected]>
While this one looks to be independent of earlier patches in this series (and hence could be considered a candidate for committing early), I don't think we want this committed ahead of (to be extended) patch 3, to avoid having more pages which may get mis- handled in a few places. It would be nice if in v4 you could add a respective post-commit-message remark.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v3 5/6 mm: add 'is_special_page' macro...
In reply to [email protected]From: Paul Durrant <[email protected]>
... to cover xenheap and PGC_extra pages.
PGC_extra pages are intended to hold data structures that are associated with a domain and my be mapped by that domain. They should not be treated as 'normal' guest pages (i.e. RAM or page tables). Hence, in many cases where code currently tests is_xen_heap_page() it should also check for the PGC_extra bit in 'count_info'.
This patch therefore defines is_special_page() to cover both cases and converts tests if is_xen_heap_page() to is_special_page() where appropriate.
---
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tamas K Lengyel <[email protected]>
Cc: Tim Deegan <[email protected]>
v3:
- Delete obsolete comment.
v2:
- New in v2
--- xen/arch/x86/domctl.c | 2 +- xen/arch/x86/mm.c | 9 ++++----- xen/arch/x86/mm/altp2m.c | 2 +- xen/arch/x86/mm/mem_sharing.c | 3 +-- xen/arch/x86/mm/shadow/common.c | 13 ++++++++----- xen/include/xen/mm.h | 3 +++ 6 files changed, 18 insertions(+), 14 deletions(-)
xen/arch/x86/domctl.c +1 -1
@@ -394,7 +394,7 @@ long arch_do_domctl( page =get_page_from_gfn (d, gfn, &t,P2M_ALLOC );if (unlikely (!page) || -unlikely (is_xen_heap_page (page)) ) +unlikely (is_special_page (page)) ) {if (unlikely (p2m_is_broken (t)) ) type =XEN_DOMCTL_PFINFO_BROKEN ;
xen/arch/x86/mm.c +4 -5
@@ -1014,7 +1014,7 @@ get_page_from_l1e(unsigned long cacheattr =pte_flags_to_cacheattr (l1f);int err; -if (is_xen_heap_page (page) ) +if (is_special_page (page) ) {if ( write )put_page_type (page);
@@ -2447,7 +2447,7 @@ static int cleanup_page_mappings(struct page_info *page) { page->count_info &= ~PGC_cacheattr_mask; -BUG_ON (is_xen_heap_page (page)); +BUG_ON (is_special_page (page)); rc =update_xen_mappings (mfn,0 ); }
@@ -2477,7 +2477,7 @@ static int cleanup_page_mappings(struct page_info *page) rc = rc2; } -if (likely (!is_xen_heap_page (page)) ) +if (likely (!is_special_page (page)) ) {ASSERT ((page->u.inuse.type_info & (PGT_type_mask | PGT_count_mask)) == PGT_writable_page);
@@ -4216,8 +4216,7 @@ int steal_page(if ( !(owner =page_get_owner_and_reference (page)) ) goto fail; -if ( owner != d ||is_xen_heap_page (page) || - (page->count_info & PGC_extra) ) +if ( owner != d ||is_special_page (page) ) goto fail_put;/*
xen/arch/x86/mm/altp2m.c +1 -1
@@ -77,7 +77,7 @@ int altp2m_vcpu_enable_ve(struct vcpu *v, gfn_t gfn)* pageable() predicate for this, due to it having the same properties * that we want. */ -if ( !p2m_is_pageable (p2mt) ||is_xen_heap_page (pg) ) +if ( !p2m_is_pageable (p2mt) ||is_special_page (pg) ) { rc = -EINVAL ; goto err;
xen/arch/x86/mm/mem_sharing.c +1 -2
@@ -840,9 +840,8 @@ static int nominate_page(struct domain *d, gfn_t gfn,if ( !p2m_is_sharable (p2mt) ) goto out; -/* Skip xen heap pages */ page =mfn_to_page (mfn); -if ( !page ||is_xen_heap_page (page) ) +if ( !page ||is_special_page (page) ) goto out;/* Check if there are mem_access/remapped altp2m entries for this page */
xen/arch/x86/mm/shadow/common.c +8 -5
@@ -2087,19 +2087,22 @@ static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn)* The qemu helper process has an untyped mapping of this dom's RAM * and the HVM restore program takes another. * Also allow one typed refcount for -* - Xen heap pages, to match share_xen_page_with_guest(), -* - ioreq server pages, to match prepare_ring_for_helper(). +* - special pages, which are explicitly referenced and mapped by +* Xen. +* - ioreq server pages, which may be special pages or normal +* guest pages with an extra reference taken by +* prepare_ring_for_helper(). */ if ( !(shadow_mode_external (d) && (page->count_info & PGC_count_mask) <=3 && ((page->u.inuse.type_info & PGT_count_mask) - == (is_xen_heap_page (page) || + == (is_special_page (page) || (is_hvm_domain (d) &&is_ioreq_server_page (d, page))))) )printk (XENLOG_G_ERR "can't find all mappings of mfn %" PRI_mfn -" (gfn %" PRI_gfn"): c=%lx t=%lx x=%d i=%d\n" , +" (gfn %" PRI_gfn"): c=%lx t=%lx s=%d i=%d\n" ,mfn_x (gmfn),gfn_x (gfn), page->count_info, page->u.inuse.type_info, - !!is_xen_heap_page (page), + !!is_special_page (page), (is_hvm_domain (d) &&is_ioreq_server_page (d, page))); }
xen/include/xen/mm.h +3 -0
@@ -285,6 +285,9 @@ extern struct domain *dom_cow;#include <asm/mm.h> +#define is_special_page (page) \ + (is_xen_heap_page(page) || ((page)->count_info & PGC_extra)) +#ifndef page_list_entrystruct page_list_head {
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
Quoted 11 lines · On Thu, Mar 5, 2020 at 5:45 AM <[email protected]> wrote:
From: Paul Durrant <[email protected]>
... to cover xenheap and
PGC_extrapages.
PGC_extrapages are intended to hold data structures that are associated with a domain and my be mapped by that domain. They should not be treated as 'normal' guest pages (i.e. RAM or page tables). Hence, in many cases where code currently testsis_xen_heap_page()it should also check for thePGC_extrabit in 'count_info'.
Quoted 3 lines
This patch therefore defines
is_special_page()to cover both cases and converts tests ifis_xen_heap_page()tois_special_page()where appropriate.
In context of VM forking, are these pages only used by some type of PV mechanism? If not, would we need to get them copied somehow or are these setup during the regular createdomain routine? Can they be copied on-demand, ie. do these pages pass a p2m_is_ram() check?
Thanks,
Tamas
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
Quoted 28 lines
-----Original Message-----
From: Tamas K Lengyel <[email protected]>
Sent: 05 March 2020 15:10
To: [email protected]
Cc: Xen-devel <[email protected]>; Durrant, Paul <[email protected]>; Jan Beulich <[email protected]>; Andrew Cooper <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>; George Dunlap <[email protected]>; Ian Jackson <[email protected]>; Julien Grall <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Stefano Stabellini <[email protected]>; Tim Deegan <[email protected]>
Subject: RE: [EXTERNAL][PATCH v3 5/6] mm: add 'is_special_page' macro...CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.
Quoted 11 lines · On Thu, Mar 5, 2020 at 5:45 AM <[email protected]> wrote:
From: Paul Durrant <[email protected]>
... to cover xenheap and
PGC_extrapages.
PGC_extrapages are intended to hold data structures that are associated with a domain and my be mapped by that domain. They should not be treated as 'normal' guest pages (i.e. RAM or page tables). Hence, in many cases where code currently testsis_xen_heap_page()it should also check for thePGC_extrabit in 'count_info'.
Quoted 8 lines
Quoted 3 lines
This patch therefore defines
is_special_page()to cover both cases and converts tests ifis_xen_heap_page()tois_special_page()where appropriate.In context of VM forking, are these pages only used by some type of PV mechanism? If not, would we need to get them copied somehow or are these setup during the regular createdomain routine? Can they be copied on-demand, ie. do these pages pass a
p2m_is_ram()check?
PGC_extra domheap pages are intended as direct replacements for shared xenheap pages and should be treated the same way. Thus they do not form part of the migration stream. Their p2m type depends entirely on how they are added to the p2m, as it is for any other page.
Paul
Quoted 3 lines
Thanks,
Tamas
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Tamas K Lengyel
Acked-byRe: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
Quoted 33 lines · Paul
Quoted 33 lines
-----Original Message-----
From: Tamas K Lengyel <[email protected]>
Sent: 05 March 2020 15:10
To: [email protected]
Cc: Xen-devel <[email protected]>; Durrant, Paul <[email protected]>; Jan Beulich <[email protected]>; Andrew Cooper <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monné <[email protected]>; George Dunlap <[email protected]>; Ian Jackson <[email protected]>; Julien Grall <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Stefano Stabellini <[email protected]>; Tim Deegan <[email protected]>
Subject: RE: [EXTERNAL][PATCH v3 5/6] mm: add 'is_special_page' macro...CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.
Quoted 14 lines · On Thu, Mar 5, 2020 at 5:45 AM <[email protected]> wrote:
From: Paul Durrant <[email protected]>
... to cover xenheap and
PGC_extrapages.
PGC_extrapages are intended to hold data structures that are associated with a domain and my be mapped by that domain. They should not be treated as 'normal' guest pages (i.e. RAM or page tables). Hence, in many cases where code currently testsis_xen_heap_page()it should also check for thePGC_extrabit in 'count_info'.This patch therefore defines
is_special_page()to cover both cases and converts tests ifis_xen_heap_page()tois_special_page()where appropriate.
Quoted 6 lines
Quoted 4 lines
In context of VM forking, are these pages only used by some type of PV mechanism? If not, would we need to get them copied somehow or are these setup during the regular createdomain routine? Can they be copied on-demand, ie. do these pages pass a
p2m_is_ram()check?
PGC_extradomheap pages are intended as direct replacements for shared xenheap pages and should be treated the same way. Thus they do not form part of the migration stream. Their p2m type depends entirely on how they are added to the p2m, as it is for any other page.
OK, thanks. For the mem_sharing bits:
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
In reply to [email protected]A typo...
Quoted 3 lines · On Thu, Mar 05, 2020 at 01:45:03PM +0100, [email protected] wrote:
PGC_extrapages are intended to hold data structures that are associated with a domain and my be mapped by that domain. They should not be treated
s/my/may/
Quoted 8 lines
as 'normal' guest pages (i.e. RAM or page tables). Hence, in many cases where code currently tests
is_xen_heap_page()it should also check for thePGC_extrabit in 'count_info'.This patch therefore defines
is_special_page()to cover both cases and converts tests ifis_xen_heap_page()tois_special_page()where appropriate.
Alan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
Quoted 17 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Alan Robinson
Sent: 06 March 2020 07:02
To: [email protected]
Cc: [email protected]; Stefano Stabellini <[email protected]>; Julien Grall <[email protected]>; Wei Liu <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Andrew Cooper <[email protected]>; Durrant, Paul <[email protected]>; Ian Jackson <[email protected]>; George Dunlap <[email protected]>; Tim Deegan <[email protected]>; Tamas K Lengyel <[email protected]>; Jan Beulich <[email protected]>; Roger Pau Monné <[email protected]>
Subject: RE: [EXTERNAL][Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you can confirm the sender and know the content is safe.
Quoted 8 lines
A typo...
Quoted 3 lines · On Thu, Mar 05, 2020 at 01:45:03PM +0100, [email protected] wrote:
PGC_extrapages are intended to hold data structures that are associated with a domain and my be mapped by that domain. They should not be treateds/my/may/
Good spot. Will fix. Thanks,
Paul
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
In reply to [email protected]Quoted 10 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/mm/shadow/common.c +2
-2@@ -2087,19 +2087,22 @@ static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn)* The qemu helper process has an untyped mapping of this dom's RAM * and the HVM restore program takes another. * Also allow one typed refcount for -* - Xen heap pages, to match share_xen_page_with_guest(), -* - ioreq server pages, to match prepare_ring_for_helper(). +* - special pages, which are explicitly referenced and mapped by +* Xen.
xen/arch/x86/mm/shadow/common.c static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn) · line 2100
Quoted 10 lines
xen/arch/x86/mm/shadow/common.c +4
-1+* - ioreq server pages, which may be special pages or normal +* guest pages with an extra reference taken by +* prepare_ring_for_helper(). */ if ( !(shadow_mode_external (d) && (page->count_info & PGC_count_mask) <=3 && ((page->u.inuse.type_info & PGT_count_mask) - == (is_xen_heap_page (page) || + == (is_special_page (page) || (is_hvm_domain (d) &&is_ioreq_server_page (d, page))))) )
Shouldn't you delete most of this line, after the previous patch converted the ioreq server pages to PGC_extra ones?
xen/arch/x86/mm/shadow/common.c static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn) · line 2105
Quoted 7 lines
xen/arch/x86/mm/shadow/common.c +2
-2printk(XENLOG_G_ERR "can't find all mappings of mfn %"PRI_mfn - " (gfn %"PRI_gfn"): c=%lx t=%lx x=%d i=%d\n", + " (gfn %"PRI_gfn"): c=%lx t=%lx s=%d i=%d\n", mfn_x(gmfn), gfn_x(gfn), page->count_info, page->u.inuse.type_info, - !!is_xen_heap_page(page), + !!is_special_page(page),
The !! would be nice to go away at this occasion:
xen/include/xen/mm.h extern struct domain *dom_cow; · line 289
Quoted 8 lines
xen/include/xen/mm.h +2
-0@@ -285,6 +285,9 @@ extern struct domain *dom_cow;#include <asm/mm.h> +#define is_special_page (page) \ + (is_xen_heap_page(page) || ((page)->count_info & PGC_extra))
Can this become an inline function returning bool?
Also I notice this construct is used by x86 code only - is there a particular reason it doesn't get placed in an x86 header (at least for the time being)?
Further I notice you neither take care of is_xen_heap_mfn(), nor does the description explain why that would not also need at least considering conversion. _sh_propagate(), for example, has an instance that I think would need changing.
Finally I notice there are two is_xen_heap_page() uses in tboot.c, both of which look like they also want converting.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
Quoted 27 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 12:20
To: [email protected]
Cc: Stefano Stabellini <[email protected]>; Julien Grall <[email protected]>; Wei Liu <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Andrew Cooper <[email protected]>; Paul Durrant <[email protected]>; Ian Jackson <[email protected]>; George Dunlap <[email protected]>; Tim Deegan <[email protected]>; Tamas K Lengyel <[email protected]>; xen- [email protected]; Roger Pau Monné <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...Quoted 15 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/mm/shadow/common.c +5
-2@@ -2087,19 +2087,22 @@ static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn)* The qemu helper process has an untyped mapping of this dom's RAM * and the HVM restore program takes another. * Also allow one typed refcount for -* - Xen heap pages, to match share_xen_page_with_guest(), -* - ioreq server pages, to match prepare_ring_for_helper(). +* - special pages, which are explicitly referenced and mapped by +* Xen. +* - ioreq server pages, which may be special pages or normal +* guest pages with an extra reference taken by +* prepare_ring_for_helper(). */ if ( !(shadow_mode_external(d)
Quoted 8 lines
xen/arch/x86/mm/shadow/common.c static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn) · line 2100
Quoted 5 lines
xen/arch/x86/mm/shadow/common.c +1
-1&& (page->count_info & PGC_count_mask) <=3 && ((page->u.inuse.type_info & PGT_count_mask) - == (is_xen_heap_page (page) || + == (is_special_page (page) || (is_hvm_domain(d) && is_ioreq_server_page(d, page))))) )Shouldn't you delete most of this line, after the previous patch converted the ioreq server pages to
PGC_extraones?
I thought that too originally but then I realise we still have to cater for the 'legacy' emulators that still require IOREQ server pages to be mapped through the p2m, in which case they will not be PGC_extra pages.
Quoted 11 lines
xen/arch/x86/mm/shadow/common.c static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn) · line 2105
Quoted 8 lines
xen/arch/x86/mm/shadow/common.c +2
-2printk(XENLOG_G_ERR "can't find all mappings of mfn %"PRI_mfn - " (gfn %"PRI_gfn"): c=%lx t=%lx x=%d i=%d\n", + " (gfn %"PRI_gfn"): c=%lx t=%lx s=%d i=%d\n", mfn_x(gmfn), gfn_x(gfn), page->count_info, page->u.inuse.type_info, - !!is_xen_heap_page(page), + !!is_special_page(page),The !! would be nice to go away at this occasion:
Ok.
Quoted 11 lines
xen/include/xen/mm.h extern struct domain *dom_cow; · line 289
Quoted 8 lines
xen/include/xen/mm.h +2
-0@@ -285,6 +285,9 @@ extern struct domain *dom_cow;#include <asm/mm.h> +#define is_special_page (page) \ + (is_xen_heap_page(page) || ((page)->count_info & PGC_extra))Can this become an inline function returning bool?
I guess so. Hopefully there are no header inclusion orderings that would bite.
Quoted 4 lines
Also I notice this construct is used by x86 code only - is there a particular reason it doesn't get placed in an x86 header (at least for the time being)?
PGC_extra pages are common so maybe it is better off defined here so it is available to ARM code?
Quoted 5 lines
Further I notice you neither take care of
is_xen_heap_mfn(), nor does the description explain why that would not also need at least considering conversion._sh_propagate(), for example, has an instance that I think would need changing.
Ok; I'd simply not spotted any users that were vulnerable... I'll fix that one and re-check.
Quoted 3 lines
Finally I notice there are two
is_xen_heap_page()uses intboot.c, both of which look like they also want converting.
OK; I'd seen those so no idea why I didn't do the conversion. I'll fix.
Paul
Quoted 6 lines
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
Quoted 36 lines · Paul Durrant
Quoted 27 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 12:20
To: [email protected]
Cc: Stefano Stabellini <[email protected]>; Julien Grall <[email protected]>; Wei Liu <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Andrew Cooper <[email protected]>; Paul Durrant <[email protected]>; Ian Jackson <[email protected]>; George Dunlap <[email protected]>; Tim Deegan <[email protected]>; Tamas K Lengyel <[email protected]>; xen- [email protected]; Roger Pau Monné <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...Quoted 15 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/mm/shadow/common.c +5
-2@@ -2087,19 +2087,22 @@ static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn)* The qemu helper process has an untyped mapping of this dom's RAM * and the HVM restore program takes another. * Also allow one typed refcount for -* - Xen heap pages, to match share_xen_page_with_guest(), -* - ioreq server pages, to match prepare_ring_for_helper(). +* - special pages, which are explicitly referenced and mapped by +* Xen. +* - ioreq server pages, which may be special pages or normal +* guest pages with an extra reference taken by +* prepare_ring_for_helper(). */ if ( !(shadow_mode_external(d)Quoted 8 lines
xen/arch/x86/mm/shadow/common.c static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn) · line 2100
Quoted 5 lines
xen/arch/x86/mm/shadow/common.c +1
-1&& (page->count_info & PGC_count_mask) <=3 && ((page->u.inuse.type_info & PGT_count_mask) - == (is_xen_heap_page (page) || + == (is_special_page (page) || (is_hvm_domain(d) && is_ioreq_server_page(d, page))))) )Shouldn't you delete most of this line, after the previous patch converted the ioreq server pages to
PGC_extraones?
Quoted 4 lines
I thought that too originally but then I realise we still have to cater for the 'legacy' emulators that still require IOREQ server pages to be mapped through the p2m, in which case they will not be
PGC_extrapages.
Oh, indeed. (I don't suppose we can ever do away with this legacy mechanism?)
Quoted 6 lines
Quoted 3 lines
Also I notice this construct is used by x86 code only - is there a particular reason it doesn't get placed in an x86 header (at least for the time being)?
PGC_extrapages are common so maybe it is better off defined here so it is available to ARM code?
To be honest, my question was mainly based on me being puzzled that Arm (or common) code doesn't need any such adjustment. As a result I'm wondering whether that's just "luck" (in which case I'd agree the placement could remain as is), or whether there's a deeper reason behind that, largely guaranteeing Arm would also never need it.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
Quoted 50 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 13:44
To: Paul Durrant <[email protected]>
Cc: [email protected]; 'Stefano Stabellini' <[email protected]>; 'Julien Grall' <[email protected]>; 'Wei Liu' <[email protected]>; 'Konrad Rzeszutek Wilk' <[email protected]>; 'Andrew Cooper' <[email protected]>; Durrant, Paul <[email protected]>; 'Ian Jackson' <[email protected]>; 'George Dunlap' <[email protected]>; 'Tim Deegan' <[email protected]>; 'Tamas K Lengyel' <[email protected]>; [email protected]; 'Roger Pau Monné' <[email protected]>
Subject: Re: [PATCH v3 5/6] mm: add 'is_special_page' macro...Quoted 5 lines · Paul Durrant
Quoted 5 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 12:20
To: [email protected]
Cc: Stefano Stabellini <[email protected]>; Julien Grall <[email protected]>; Wei LiuQuoted 31 lines
Quoted 30 lines
Konrad Rzeszutek Wilk <[email protected]>; Andrew Cooper <[email protected]>; Paul Durrant <[email protected]>; Ian Jackson <[email protected]>; George Dunlap <[email protected]>; Tim Deegan <[email protected]>; Tamas K Lengyel <[email protected]>; xen- [email protected]; Roger Pau Monné <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...Quoted 10 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/mm/shadow/common.c +2
-2@@ -2087,19 +2087,22 @@ static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn)* The qemu helper process has an untyped mapping of this dom's RAM * and the HVM restore program takes another. * Also allow one typed refcount for -* - Xen heap pages, to match share_xen_page_with_guest(), -* - ioreq server pages, to match prepare_ring_for_helper(). +* - special pages, which are explicitly referenced and mapped by +* Xen. xen/arch/x86/mm/shadow/common.c static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn) · line 2100
Quoted 10 lines
xen/arch/x86/mm/shadow/common.c +4
-1+* - ioreq server pages, which may be special pages or normal +* guest pages with an extra reference taken by +* prepare_ring_for_helper(). */ if ( !(shadow_mode_external (d) && (page->count_info & PGC_count_mask) <=3 && ((page->u.inuse.type_info & PGT_count_mask) - == (is_xen_heap_page (page) || + == (is_special_page (page) || (is_hvm_domain (d) &&is_ioreq_server_page (d, page))))) )Shouldn't you delete most of this line, after the previous patch converted the ioreq server pages to
PGC_extraones?
Quoted 7 lines
Quoted 4 lines
I thought that too originally but then I realise we still have to cater for the 'legacy' emulators that still require IOREQ server pages to be mapped through the p2m, in which case they will not be
PGC_extrapages.Oh, indeed. (I don't suppose we can ever do away with this legacy mechanism?)
It's tricky because it would either mean breaking older (pre resource-mapping) QEMUs, or allowing the toolstack to allocate the 'special' pages with an extra flag to make them PGC_extra.
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
Also I notice this construct is used by x86 code only - is there a particular reason it doesn't get placed in an x86 header (at least for the time being)?
PGC_extrapages are common so maybe it is better off defined here so it is available to ARM code?
Quoted 7 lines
To be honest, my question was mainly based on me being puzzled that Arm (or common) code doesn't need any such adjustment. As a result I'm wondering whether that's just "luck" (in which case I'd agree the placement could remain as is), or whether there's a deeper reason behind that, largely guaranteeing Arm would also never need it.
I'll have a chat with Julien and see what he thinks.
Paul
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
Quoted 55 lines · Paul Durrant
Quoted 55 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 13:44
To: Paul Durrant <[email protected]>
Cc: [email protected]; 'Stefano Stabellini' <[email protected]>; 'Julien Grall' <[email protected]>; 'Wei Liu' <[email protected]>; 'Konrad Rzeszutek Wilk' <[email protected]>; 'Andrew Cooper' <[email protected]>; Durrant, Paul <[email protected]>; 'Ian Jackson' <[email protected]>; 'George Dunlap' <[email protected]>; 'Tim Deegan' <[email protected]>; 'Tamas K Lengyel' <[email protected]>; [email protected]; 'Roger Pau Monné' <[email protected]>
Subject: Re: [PATCH v3 5/6] mm: add 'is_special_page' macro...Quoted 5 lines · Paul Durrant
Quoted 5 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 12:20
To: [email protected]
Cc: Stefano Stabellini <[email protected]>; Julien Grall <[email protected]>; Wei LiuQuoted 35 lines
Quoted 22 lines
Konrad Rzeszutek Wilk <[email protected]>; Andrew Cooper <[email protected]>; Paul Durrant <[email protected]>; Ian Jackson <[email protected]>; George Dunlap <[email protected]>; Tim Deegan <[email protected]>; Tamas K Lengyel <[email protected]>; xen- [email protected]; Roger Pau Monné <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...Quoted 15 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/mm/shadow/common.c +5
-2@@ -2087,19 +2087,22 @@ static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn)* The qemu helper process has an untyped mapping of this dom's RAM * and the HVM restore program takes another. * Also allow one typed refcount for -* - Xen heap pages, to match share_xen_page_with_guest(), -* - ioreq server pages, to match prepare_ring_for_helper(). +* - special pages, which are explicitly referenced and mapped by +* Xen. +* - ioreq server pages, which may be special pages or normal +* guest pages with an extra reference taken by +* prepare_ring_for_helper(). */ if ( !(shadow_mode_external(d)Quoted 8 lines
xen/arch/x86/mm/shadow/common.c static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn) · line 2100
Quoted 5 lines
xen/arch/x86/mm/shadow/common.c +1
-1&& (page->count_info & PGC_count_mask) <=3 && ((page->u.inuse.type_info & PGT_count_mask) - == (is_xen_heap_page (page) || + == (is_special_page (page) || (is_hvm_domain(d) && is_ioreq_server_page(d, page))))) )Shouldn't you delete most of this line, after the previous patch converted the ioreq server pages to
PGC_extraones?I thought that too originally but then I realise we still have to cater for the 'legacy' emulators that still require IOREQ server pages to be mapped through the p2m, in which case they will not be
PGC_extrapages.
Quoted 5 lines
Quoted 2 lines
Oh, indeed. (I don't suppose we can ever do away with this legacy mechanism?)
It's tricky because it would either mean breaking older (pre resource-mapping) QEMUs,
Didn't even qemu-trad get switched? (Anyway, not a big deal here, just would have been nice if this large conditional could have been shrunk a little in size.)
Quoted 2 lines
or allowing the toolstack to allocate the 'special' pages with an extra flag to make them
PGC_extra.
Doesn't sound impossible, but also not something we want to eagerly go for.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
Quoted 73 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 13:52
To: Paul Durrant <[email protected]>
Cc: [email protected]; 'Stefano Stabellini' <[email protected]>; 'Julien Grall' <[email protected]>; 'Wei Liu' <[email protected]>; 'Konrad Rzeszutek Wilk' <[email protected]>; 'Andrew Cooper' <[email protected]>; 'Ian Jackson' <[email protected]>; 'George Dunlap' <[email protected]>; 'Tim Deegan' <[email protected]>; 'Tamas K Lengyel' <[email protected]>; xen- [email protected]; 'Roger Pau Monné' <[email protected]>
Subject: Re: [PATCH v3 5/6] mm: add 'is_special_page' macro...Quoted 5 lines · Paul Durrant
Quoted 5 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 06 March 2020 13:44
To: Paul Durrant <[email protected]>
Cc: [email protected]; 'Stefano Stabellini' <[email protected]>; 'Julien Grall'Quoted 3 lines
Quoted 3 lines
'Wei Liu' <[email protected]>; 'Konrad Rzeszutek Wilk' <[email protected]>; 'Andrew Cooper' <[email protected]>; Durrant, Paul <[email protected]>; 'Ian Jackson' <[email protected]>; 'George Dunlap' <[email protected]>; 'Tim Deegan'
Quoted 17 lines
Quoted 17 lines
'Tamas K Lengyel' <[email protected]>; [email protected]; 'Roger Pau Monné' <[email protected]>
Subject: Re: [PATCH v3 5/6] mm: add 'is_special_page' macro...Quoted 5 lines · Paul Durrant
Quoted 5 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 12:20
To: [email protected]
Cc: Stefano Stabellini <[email protected]>; Julien Grall <[email protected]>; Wei LiuQuoted 6 lines
Quoted 6 lines
Konrad Rzeszutek Wilk <[email protected]>; Andrew Cooper <[email protected]>; Paul Durrant <[email protected]>; Ian Jackson <[email protected]>; George Dunlap <[email protected]>; Tim Deegan <[email protected]>; Tamas K Lengyel <[email protected]>; xen- [email protected]; Roger Pau Monné <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/mm/shadow/common.c static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t
Quoted 3 lines
xen/arch/x86/mm/shadow/common.c +0
-0@@ -2087,19 +2087,22 @@ static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_tgfn)
Quoted 29 lines
Quoted 28 lines
Quoted 18 lines
Quoted 18 lines
Quoted 17 lines
xen/arch/x86/mm/shadow/common.c +6
-3* The qemu helper process has an untyped mapping of this dom's RAM * and the HVM restore program takes another. * Also allow one typed refcount for -* - Xen heap pages, to match share_xen_page_with_guest(), -* - ioreq server pages, to match prepare_ring_for_helper(). +* - special pages, which are explicitly referenced and mapped by +* Xen. +* - ioreq server pages, which may be special pages or normal +* guest pages with an extra reference taken by +* prepare_ring_for_helper(). */ if ( !(shadow_mode_external (d) && (page->count_info & PGC_count_mask) <=3 && ((page->u.inuse.type_info & PGT_count_mask) - == (is_xen_heap_page (page) || + == (is_special_page (page) || (is_hvm_domain (d) &&is_ioreq_server_page (d, page))))) )Quoted 7 lines
Quoted 2 lines
Shouldn't you delete most of this line, after the previous patch converted the ioreq server pages to
PGC_extraones?I thought that too originally but then I realise we still have to cater for the 'legacy' emulators that still require IOREQ server pages to be mapped through the p2m, in which case they will not be
PGC_extrapages.Oh, indeed. (I don't suppose we can ever do away with this legacy mechanism?)
Quoted 6 lines
Quoted 2 lines
It's tricky because it would either mean breaking older (pre resource-mapping) QEMUs,
Didn't even qemu-trad get switched? (Anyway, not a big deal here, just would have been nice if this large conditional could have been shrunk a little in size.)
Yes, trad is switched but I thought our position was that we supported use of arbitrary distro versions of QEMU in which case any compat code really does have to stick around for a very long time :-(
Quoted 7 lines
Quoted 3 lines
or allowing the toolstack to allocate the 'special' pages with an extra flag to make them
PGC_extra.Doesn't sound impossible, but also not something we want to eagerly go for.
No, probably not worth it just to save doing this test.
Paul
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
In reply to Jan BeulichHi Jan,
Quoted 52 lines · Jan Beulich
Quoted 36 lines · Paul Durrant
Quoted 27 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 12:20
To: [email protected]
Cc: Stefano Stabellini <[email protected]>; Julien Grall <[email protected]>; Wei Liu <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Andrew Cooper <[email protected]>; Paul Durrant <[email protected]>; Ian Jackson <[email protected]>; George Dunlap <[email protected]>; Tim Deegan <[email protected]>; Tamas K Lengyel <[email protected]>; xen- [email protected]; Roger Pau Monné <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...Quoted 15 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/mm/shadow/common.c +5
-2@@ -2087,19 +2087,22 @@ static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn)* The qemu helper process has an untyped mapping of this dom's RAM * and the HVM restore program takes another. * Also allow one typed refcount for -* - Xen heap pages, to match share_xen_page_with_guest(), -* - ioreq server pages, to match prepare_ring_for_helper(). +* - special pages, which are explicitly referenced and mapped by +* Xen. +* - ioreq server pages, which may be special pages or normal +* guest pages with an extra reference taken by +* prepare_ring_for_helper(). */ if ( !(shadow_mode_external(d)Quoted 8 lines
xen/arch/x86/mm/shadow/common.c static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn) · line 2100
Quoted 5 lines
xen/arch/x86/mm/shadow/common.c +1
-1&& (page->count_info & PGC_count_mask) <=3 && ((page->u.inuse.type_info & PGT_count_mask) - == (is_xen_heap_page (page) || + == (is_special_page (page) || (is_hvm_domain(d) && is_ioreq_server_page(d, page))))) )Shouldn't you delete most of this line, after the previous patch converted the ioreq server pages to
PGC_extraones?Quoted 4 lines
I thought that too originally but then I realise we still have to cater for the 'legacy' emulators that still require IOREQ server pages to be mapped through the p2m, in which case they will not be
PGC_extrapages.Oh, indeed. (I don't suppose we can ever do away with this legacy mechanism?)
Quoted 6 lines
Quoted 3 lines
Also I notice this construct is used by x86 code only - is there a particular reason it doesn't get placed in an x86 header (at least for the time being)?
PGC_extrapages are common so maybe it is better off defined here so it is available to ARM code?
Quoted 6 lines
To be honest, my question was mainly based on me being puzzled that Arm (or common) code doesn't need any such adjustment. As a result I'm wondering whether that's just "luck" (in which case I'd agree the placement could remain as is), or whether there's a deeper reason behind that, largely guaranteeing Arm would also never need it.
is_special_page() is used in features that are not supported on Arm yet (e.g migration). So we will need it in the future and therefore the helper should be defined in common header.
Cheers,
Signature · 6 lines
Julien Grall _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 5/6] mm: add 'is_special_page' macro...
Quoted 52 lines · Julien Grall
Quoted 44 lines · Jan Beulich
Quoted 28 lines · Paul Durrant
Quoted 19 lines
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 06 March 2020 12:20Quoted 15 lines · On 05.03.2020 13:45, [email protected] wrote:
xen/arch/x86/mm/shadow/common.c +5
-2@@ -2087,19 +2087,22 @@ static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn)* The qemu helper process has an untyped mapping of this dom's RAM * and the HVM restore program takes another. * Also allow one typed refcount for -* - Xen heap pages, to match share_xen_page_with_guest(), -* - ioreq server pages, to match prepare_ring_for_helper(). +* - special pages, which are explicitly referenced and mapped by +* Xen. +* - ioreq server pages, which may be special pages or normal +* guest pages with an extra reference taken by +* prepare_ring_for_helper(). */ if ( !(shadow_mode_external(d)Quoted 8 lines
xen/arch/x86/mm/shadow/common.c static int sh_remove_all_mappings(struct domain *d, mfn_t gmfn, gfn_t gfn) · line 2100
Quoted 5 lines
xen/arch/x86/mm/shadow/common.c +1
-1&& (page->count_info & PGC_count_mask) <=3 && ((page->u.inuse.type_info & PGT_count_mask) - == (is_xen_heap_page (page) || + == (is_special_page (page) || (is_hvm_domain(d) && is_ioreq_server_page(d, page))))) )Shouldn't you delete most of this line, after the previous patch converted the ioreq server pages to
PGC_extraones?Quoted 4 lines
I thought that too originally but then I realise we still have to cater for the 'legacy' emulators that still require IOREQ server pages to be mapped through the p2m, in which case they will not be
PGC_extrapages.Oh, indeed. (I don't suppose we can ever do away with this legacy mechanism?)
Quoted 6 lines
Quoted 3 lines
Also I notice this construct is used by x86 code only - is there a particular reason it doesn't get placed in an x86 header (at least for the time being)?
PGC_extrapages are common so maybe it is better off defined here so it is available to ARM code?Quoted 6 lines
To be honest, my question was mainly based on me being puzzled that Arm (or common) code doesn't need any such adjustment. As a result I'm wondering whether that's just "luck" (in which case I'd agree the placement could remain as is), or whether there's a deeper reason behind that, largely guaranteeing Arm would also never need it.
Quoted 3 lines
is_special_page()is used in features that are not supported on Arm yet (e.g migration). So we will need it in the future and therefore the helper should be defined in common header.
Okay then, thanks for clarifying.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v3 6/6 domain: use PGC_extra domheap page for shared_info
In reply to [email protected]From: Paul Durrant <[email protected]>
Currently shared_info is a shared xenheap page but shared xenheap pages complicate future plans for live-update of Xen so it is desirable to, where possible, not use them [1]. This patch therefore converts shared_info into a PGC_extra domheap page. This does entail freeing shared_info during domain_relinquish_resources() rather than domain_destroy() so care is needed to avoid de-referencing a NULL shared_info pointer hence some extra checks of 'is_dying' are needed.
NOTE: For Arm, the call to free_shared_info() in arch_domain_destroy() is
left in place since it is idempotent and called in the error path for arch_domain_create().
[1] See https://lists.xenproject.org/archives/html/xen-devel/2020-02/msg02018.html
---
Cc: Stefano Stabellini <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Volodymyr Babchuk <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Wei Liu <[email protected]>
v2:
- Addressed comments from Julien
- Expanded the commit comment to explain why this patch is wanted
--- xen/arch/arm/domain.c | 2 ++ xen/arch/x86/domain.c | 3 ++- xen/common/domain.c | 28 ++++++++++++++++++++++++---- xen/common/event_channel.c | 3 +++ xen/common/time.c | 15 +++++++++++++++ 5 files changed, 46 insertions(+), 5 deletions(-)
xen/arch/arm/domain.c +2 -0
@@ -1005,6 +1005,8 @@ int domain_relinquish_resources(struct domain *d)BUG (); } +free_shared_info (d); +return 0 ; }
xen/arch/x86/domain.c +2 -1
@@ -690,7 +690,6 @@ void arch_domain_destroy(struct domain *d)pv_domain_destroy (d);free_perdomain_mappings (d); -free_shared_info (d);cleanup_domain_irq_mapping (d);psr_domain_free (d);
@@ -2245,6 +2244,8 @@ int domain_relinquish_resources(struct domain *d)if (is_hvm_domain (d) )hvm_domain_relinquish_resources (d); +free_shared_info (d); +return 0 ; }
xen/common/domain.c +24 -4
@@ -1650,24 +1650,44 @@ int continue_hypercall_on_cpu(int alloc_shared_info (struct domain *d,unsigned int memflags) { -if ( (d->shared_info.virt =alloc_xenheap_pages (0 , memflags)) ==NULL ) +struct page_info *pg; + + pg =alloc_domheap_page (d, MEMF_no_refcount | memflags); +if ( !pg )return -ENOMEM ; - d->shared_info.mfn =virt_to_mfn (d->shared_info.virt); +if ( !get_page_and_type (pg, d, PGT_writable_page) ) + { +/* +* The domain should not be running at this point so there is +* no way we should reach this error path. +*/ +ASSERT_UNREACHABLE (); +return -ENODATA ; + } + + d->shared_info.mfn =page_to_mfn (pg); + d->shared_info.virt =__map_domain_page_global (pg);clear_page (d->shared_info.virt); -share_xen_page_with_guest (mfn_to_page (d->shared_info.mfn), d, SHARE_rw);return 0 ; }void free_shared_info (struct domain *d) { +struct page_info *pg; +if ( !d->shared_info.virt )return ; -free_xenheap_page (d->shared_info.virt); +unmap_domain_page_global (d->shared_info.virt); d->shared_info.virt =NULL ; + + pg =mfn_to_page (d->shared_info.mfn); + +put_page_alloc_ref (pg); +put_page_and_type (pg); }/*
xen/common/event_channel.c +3 -0
@@ -1325,6 +1325,9 @@ void evtchn_destroy(struct domain *d) {unsigned int i; +/* This must be done before shared_info is freed */ +BUG_ON (!d->shared_info.virt); +/* After this barrier no new event-channel allocations can occur. */ BUG_ON (!d->is_dying);spin_barrier (&d->event_lock);
xen/common/time.c +15 -0
@@ -99,6 +99,18 @@ void update_domain_wallclock_time(struct domain *d)uint32_t *wc_version;uint64_t sec; +if ( d != current->domain ) + { +/* +* We need to check is_dying here as, if it is set, the +* shared_info may have been freed. To do this safely we need +* hold the domain lock. +*/ +domain_lock (d); +if ( d->is_dying ) + goto unlock; + } +spin_lock (&wc_lock); wc_version = &shared_info (d, wc_version);
@@ -121,6 +133,9 @@ void update_domain_wallclock_time(struct domain *d) *wc_version =version_update_end (*wc_version);spin_unlock (&wc_lock); + unlock: +if ( d != current->domain ) +domain_unlock (d); }/* Set clock to <secs,usecs> after 00:00:00 UTC, 1 January, 1970. */
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel