File 5cf8da09-adjust-sysdom-creation-call-earlier-on-x86.patch of Package xen.16552
References: bsc#1135799
# Commit 7177f589ba84433e1ca8bb97a5d074545133c49c
# Date 2019-06-06 11:16:57 +0200
# Author Jan Beulich <jbeulich@suse.com>
# Committer Jan Beulich <jbeulich@suse.com>
adjust system domain creation (and call it earlier on x86)
Split out this mostly arch-independent code into a common-code helper
function. (This does away with Arm's arch_init_memory() altogether.)
On x86 this needs to happen before acpi_boot_init(): Commit 9fa94e1058
("x86/ACPI: also parse AMD IOMMU tables early") only appeared to work
fine - it's really broken, and doesn't crash (on non-EFI AMD systems)
only because of there being a mapping of linear address 0 during early
boot. On EFI there is:
Early fatal page fault at e008:ffff82d08024d58e (cr2=0000000000000220, ec=0000)
----[ Xen-4.13-unstable x86_64 debug=y Not tainted ]----
CPU: 0
RIP: e008:[<ffff82d08024d58e>] pci.c#_pci_hide_device+0x17/0x3a
RFLAGS: 0000000000010046 CONTEXT: hypervisor
rax: 0000000000000000 rbx: 0000000000006000 rcx: 0000000000000000
rdx: ffff83104f2ee9b0 rsi: ffff82e0209e5d48 rdi: ffff83104f2ee9a0
rbp: ffff82d08081fce0 rsp: ffff82d08081fcb8 r8: 0000000000000000
r9: 8000000000000000 r10: 0180000000000000 r11: 7fffffffffffffff
r12: ffff83104f2ee9a0 r13: 0000000000000002 r14: ffff83104f2ee4b0
r15: 0000000000000064 cr0: 0000000080050033 cr4: 00000000000000a0
cr3: 000000009f614000 cr2: 0000000000000220
fsb: 0000000000000000 gsb: 0000000000000000 gss: 0000000000000000
ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: 0000 cs: e008
Xen code around <ffff82d08024d58e> (pci.c#_pci_hide_device+0x17/0x3a):
48 89 47 38 48 8d 57 10 <48> 8b 88 20 02 00 00 48 89 51 08 48 89 4f 10 48
Xen stack trace from rsp=ffff82d08081fcb8:
[...]
Xen call trace:
[<ffff82d08024d58e>] pci.c#_pci_hide_device+0x17/0x3a
[ [< >] pci_ro_device+...]
[<ffff82d080617fe1>] amd_iommu_detect_one_acpi+0x161/0x249
[<ffff82d0806186ac>] iommu_acpi.c#detect_iommu_acpi+0xb5/0xe7
[<ffff82d08061cde0>] acpi_table_parse+0x61/0x90
[<ffff82d080619e7d>] amd_iommu_detect_acpi+0x17/0x19
[<ffff82d08061790b>] acpi_ivrs_init+0x20/0x5b
[<ffff82d08062e838>] acpi_boot_init+0x301/0x30f
[<ffff82d080628b10>] __start_xen+0x1daf/0x28a2
Pagetable walk from 0000000000000220:
L4[0x000] = 000000009f44f063 ffffffffffffffff
L3[0x000] = 000000009f44b063 ffffffffffffffff
L2[0x000] = 0000000000000000 ffffffffffffffff
****************************************
Panic on CPU 0:
FATAL TRAP: vector = 14 (page fault)
[error_code=0000] , IN INTERRUPT CONTEXT
****************************************
Of course the bug would nevertheless have lead to post-boot crashes as
soon as the list would actually get traversed.
Take the opportunity and
- convert BUG_ON()s being moved to panic(),
- add __read_mostly annotations to the dom_* definitions.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Julien Grall <julien.grall@arm.com>
--- xen-4.12.2-testing.orig/xen/arch/arm/mm.c
+++ xen-4.12.2-testing/xen/arch/arm/mm.c
@@ -44,8 +44,6 @@
#include <asm/guest_atomics.h>
#include <asm/setup.h>
-struct domain *dom_xen, *dom_io, *dom_cow;
-
/* Override macros from asm/page.h to make them work with mfn_t */
#undef virt_to_mfn
#define virt_to_mfn(va) _mfn(__virt_to_mfn(va))
@@ -516,32 +514,6 @@ void flush_page_to_ram(unsigned long mfn
invalidate_icache();
}
-void __init arch_init_memory(void)
-{
- /*
- * Initialise our DOMID_XEN domain.
- * Any Xen-heap pages that we will allow to be mapped will have
- * their domain field set to dom_xen.
- */
- dom_xen = domain_create(DOMID_XEN, NULL, false);
- BUG_ON(IS_ERR(dom_xen));
-
- /*
- * Initialise our DOMID_IO domain.
- * This domain owns I/O pages that are within the range of the page_info
- * array. Mappings occur at the priv of the caller.
- */
- dom_io = domain_create(DOMID_IO, NULL, false);
- BUG_ON(IS_ERR(dom_io));
-
- /*
- * Initialise our COW domain.
- * This domain owns sharable pages.
- */
- dom_cow = domain_create(DOMID_COW, NULL, false);
- BUG_ON(IS_ERR(dom_cow));
-}
-
static inline lpae_t pte_of_xenaddr(vaddr_t va)
{
paddr_t ma = va + phys_offset;
--- xen-4.12.2-testing.orig/xen/arch/arm/setup.c
+++ xen-4.12.2-testing/xen/arch/arm/setup.c
@@ -850,7 +850,7 @@ void __init start_xen(unsigned long boot
rcu_init();
- arch_init_memory();
+ setup_system_domains();
local_irq_enable();
local_abort_enable();
--- xen-4.12.2-testing.orig/xen/arch/x86/mm.c
+++ xen-4.12.2-testing/xen/arch/x86/mm.c
@@ -158,9 +158,6 @@ l1_pgentry_t __section(".bss.page_aligne
paddr_t __read_mostly mem_hotplug;
-/* Private domain structs for DOMID_XEN and DOMID_IO. */
-struct domain *dom_xen, *dom_io, *dom_cow;
-
/* Frame table size in pages. */
unsigned long max_page;
unsigned long total_pages;
@@ -281,34 +278,6 @@ void __init arch_init_memory(void)
_PAGE_DIRTY | _PAGE_AVAIL | _PAGE_AVAIL_HIGH | _PAGE_NX);
/*
- * Initialise our DOMID_XEN domain.
- * Any Xen-heap pages that we will allow to be mapped will have
- * their domain field set to dom_xen.
- * Hidden PCI devices will also be associated with this domain
- * (but be [partly] controlled by Dom0 nevertheless).
- */
- dom_xen = domain_create(DOMID_XEN, NULL, false);
- BUG_ON(IS_ERR(dom_xen));
- INIT_LIST_HEAD(&dom_xen->arch.pdev_list);
-
- /*
- * Initialise our DOMID_IO domain.
- * This domain owns I/O pages that are within the range of the page_info
- * array. Mappings occur at the priv of the caller.
- * Quarantined PCI devices will be associated with this domain.
- */
- dom_io = domain_create(DOMID_IO, NULL, false);
- BUG_ON(IS_ERR(dom_io));
- INIT_LIST_HEAD(&dom_io->arch.pdev_list);
-
- /*
- * Initialise our COW domain.
- * This domain owns sharable pages.
- */
- dom_cow = domain_create(DOMID_COW, NULL, false);
- BUG_ON(IS_ERR(dom_cow));
-
- /*
* First 1MB of RAM is historically marked as I/O.
* Note that apart from IO Xen also uses the low 1MB to store the AP boot
* trampoline and boot information metadata. Due to this always special
--- xen-4.12.2-testing.orig/xen/arch/x86/setup.c
+++ xen-4.12.2-testing/xen/arch/x86/setup.c
@@ -1538,6 +1538,8 @@ void __init noreturn __start_xen(unsigne
mmio_ro_ranges = rangeset_new(NULL, "r/o mmio ranges",
RANGESETF_prettyprint_hex);
+ setup_system_domains();
+
acpi_boot_init();
if ( smp_found_config )
--- xen-4.12.2-testing.orig/xen/common/domain.c
+++ xen-4.12.2-testing/xen/common/domain.c
@@ -72,6 +72,11 @@ domid_t hardware_domid __read_mostly;
integer_param("hardware_dom", hardware_domid);
#endif
+/* Private domain structs for DOMID_XEN, DOMID_IO, etc. */
+struct domain *__read_mostly dom_xen;
+struct domain *__read_mostly dom_io;
+struct domain *__read_mostly dom_cow;
+
struct vcpu *idle_vcpu[NR_CPUS] __read_mostly;
vcpu_info_t dummy_vcpu_info;
@@ -518,6 +523,43 @@ struct domain *domain_create(domid_t dom
return ERR_PTR(err);
}
+void __init setup_system_domains(void)
+{
+ /*
+ * Initialise our DOMID_XEN domain.
+ * Any Xen-heap pages that we will allow to be mapped will have
+ * their domain field set to dom_xen.
+ * Hidden PCI devices will also be associated with this domain
+ * (but be [partly] controlled by Dom0 nevertheless).
+ */
+ dom_xen = domain_create(DOMID_XEN, NULL, false);
+ if ( IS_ERR(dom_xen) )
+ panic("Failed to create d[XEN]: %ld\n", PTR_ERR(dom_xen));
+#ifdef CONFIG_HAS_PCI
+ INIT_LIST_HEAD(&dom_xen->arch.pdev_list);
+#endif
+
+ /*
+ * Initialise our DOMID_IO domain.
+ * This domain owns I/O pages that are within the range of the page_info
+ * array. Mappings occur at the priv of the caller.
+ * Quarantined PCI devices will be associated with this domain.
+ */
+ dom_io = domain_create(DOMID_IO, NULL, false);
+ if ( IS_ERR(dom_io) )
+ panic("Failed to create d[IO]: %ld\n", PTR_ERR(dom_io));
+#ifdef CONFIG_HAS_PCI
+ INIT_LIST_HEAD(&dom_io->arch.pdev_list);
+#endif
+
+ /*
+ * Initialise our COW domain.
+ * This domain owns sharable pages.
+ */
+ dom_cow = domain_create(DOMID_COW, NULL, false);
+ if ( IS_ERR(dom_cow) )
+ panic("Failed to create d[COW]: %ld\n", PTR_ERR(dom_cow));
+}
void domain_update_node_affinity(struct domain *d)
{
--- xen-4.12.2-testing.orig/xen/include/asm-arm/mm.h
+++ xen-4.12.2-testing/xen/include/asm-arm/mm.h
@@ -336,8 +336,6 @@ long arch_memory_op(int op, XEN_GUEST_HA
unsigned long domain_get_maximum_gpfn(struct domain *d);
-extern struct domain *dom_xen, *dom_io, *dom_cow;
-
#define memguard_guard_stack(_p) ((void)0)
#define memguard_guard_range(_p,_l) ((void)0)
#define memguard_unguard_range(_p,_l) ((void)0)
--- xen-4.12.2-testing.orig/xen/include/asm-arm/setup.h
+++ xen-4.12.2-testing/xen/include/asm-arm/setup.h
@@ -77,8 +77,6 @@ extern struct bootinfo bootinfo;
extern domid_t max_init_domid;
-void arch_init_memory(void);
-
void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len);
size_t estimate_efi_size(int mem_nr_banks);
--- xen-4.12.2-testing.orig/xen/include/asm-x86/mm.h
+++ xen-4.12.2-testing/xen/include/asm-x86/mm.h
@@ -612,8 +612,6 @@ unsigned int domain_clamp_alloc_bitsize(
unsigned long domain_get_maximum_gpfn(struct domain *d);
-extern struct domain *dom_xen, *dom_io, *dom_cow; /* for vmcoreinfo */
-
/* Definition of an mm lock: spinlock with extra fields for debugging */
typedef struct mm_lock {
spinlock_t lock;
--- xen-4.12.2-testing.orig/xen/include/xen/domain.h
+++ xen-4.12.2-testing/xen/include/xen/domain.h
@@ -22,6 +22,8 @@ struct vcpu *alloc_dom0_vcpu0(struct dom
int vcpu_reset(struct vcpu *);
int vcpu_up(struct vcpu *v);
+void setup_system_domains(void);
+
struct xen_domctl_getdomaininfo;
void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info);
void arch_get_domain_info(const struct domain *d,
--- xen-4.12.2-testing.orig/xen/include/xen/mm.h
+++ xen-4.12.2-testing/xen/include/xen/mm.h
@@ -276,6 +276,9 @@ struct npfec {
#define MAX_ORDER 20 /* 2^20 contiguous pages */
#endif
+/* Private domain structs for DOMID_XEN, DOMID_IO, etc. */
+extern struct domain *dom_xen, *dom_io, *dom_cow;
+
#define page_list_entry list_head
#include <asm/mm.h>
