[xen master] x86/mm: Allow map_domain_page_global() to be used during boot

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen master] x86/mm: Allow map_domain_page_global() to be used during boot

patchbot
commit 70892c317fd56064b09a4b0fcaa0781735e64efc
Author:     Andrew Cooper <[hidden email]>
AuthorDate: Thu Sep 7 17:38:52 2017 +0100
Commit:     Andrew Cooper <[hidden email]>
CommitDate: Fri Sep 8 15:39:43 2017 +0100

    x86/mm: Allow map_domain_page_global() to be used during boot
   
    map_domain_page_global() uses vmap under the hood, which is set up immediately
    after switching to SYS_STATE_boot.  Relax the local_irq_is_enabled() part of
    the assertion before Xen has finished booting, so map_domain_page_global() can
    be used duing SMP preparation.
   
    Signed-off-by: Andrew Cooper <[hidden email]>
    Reviewed-by: Jan Beulich <[hidden email]>
---
 xen/arch/x86/domain_page.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c
index 0463e9a..3432a85 100644
--- a/xen/arch/x86/domain_page.c
+++ b/xen/arch/x86/domain_page.c
@@ -305,7 +305,10 @@ int mapcache_vcpu_init(struct vcpu *v)
 
 void *map_domain_page_global(mfn_t mfn)
 {
-    ASSERT(!in_irq() && local_irq_is_enabled());
+    ASSERT(!in_irq() &&
+           ((system_state >= SYS_STATE_boot &&
+             system_state < SYS_STATE_active) ||
+            local_irq_is_enabled()));
 
 #ifdef NDEBUG
     if ( mfn_x(mfn) <= PFN_DOWN(__pa(HYPERVISOR_VIRT_END - 1)) )
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog