c608e23838
Turn off building the KMPs now that we are using the pvops kernel xen.spec - Upstream patches from Jan 561bbc8b-VT-d-don-t-suppress-invalidation-address-write-when-it-is-zero.patch 561d20a0-x86-hide-MWAITX-from-PV-domains.patch 561e3283-x86-NUMA-fix-SRAT-table-processor-entry-parsing-and-consumption.patch 5632118e-arm-Support-hypercall_create_continuation-for-multicall.patch 56321222-arm-rate-limit-logging-from-unimplemented-PHYSDEVOP-and-HVMOP.patch 56321249-arm-handle-races-between-relinquish_memory-and-free_domheap_pages.patch 5632127b-x86-guard-against-undue-super-page-PTE-creation.patch 5632129c-free-domain-s-vcpu-array.patch (Replaces CVE-2015-7969-xsa149.patch) 563212c9-x86-PoD-Eager-sweep-for-zeroed-pages.patch 563212e4-xenoprof-free-domain-s-vcpu-array.patch 563212ff-x86-rate-limit-logging-in-do_xen-oprof-pmu-_op.patch 56323737-libxl-adjust-PoD-target-by-memory-fudge-too.patch 56377442-x86-PoD-Make-p2m_pod_empty_cache-restartable.patch 5641ceec-x86-HVM-always-intercept-AC-and-DB.patch (Replaces CVE-2015-5307-xsa156.patch) 5644b756-x86-HVM-don-t-inject-DB-with-error-code.patch - Dropped 55b0a2db-x86-MSI-track-guest-masking.patch - Use upstream variants of block-iscsi and block-nbd - Remove xenalyze.hg, its part of xen-4.6 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=389
115 lines
3.8 KiB
Diff
115 lines
3.8 KiB
Diff
# Commit 83281fc9b31396e94c0bfb6550b75c165037a0ad
|
|
# Date 2015-10-14 12:46:27 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/NUMA: fix SRAT table processor entry parsing and consumption
|
|
|
|
- don't overrun apicid_to_node[] (possible in the x2APIC case)
|
|
- don't limit number of processor related SRAT entries we can consume
|
|
- make acpi_numa_{processor,x2apic}_affinity_init() as similar to one
|
|
another as possible
|
|
- print APIC IDs in hex (to ease matching with other log messages), at
|
|
once making legacy and x2APIC ones distinguishable (by width)
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
|
|
--- a/xen/arch/x86/numa.c
|
|
+++ b/xen/arch/x86/numa.c
|
|
@@ -349,7 +349,7 @@ void __init init_cpu_to_node(void)
|
|
u32 apicid = x86_cpu_to_apicid[i];
|
|
if ( apicid == BAD_APICID )
|
|
continue;
|
|
- node = apicid_to_node[apicid];
|
|
+ node = apicid < MAX_LOCAL_APIC ? apicid_to_node[apicid] : NUMA_NO_NODE;
|
|
if ( node == NUMA_NO_NODE || !node_online(node) )
|
|
node = 0;
|
|
numa_set_node(i, node);
|
|
--- a/xen/arch/x86/setup.c
|
|
+++ b/xen/arch/x86/setup.c
|
|
@@ -200,7 +200,7 @@ void __devinit srat_detect_node(int cpu)
|
|
nodeid_t node;
|
|
u32 apicid = x86_cpu_to_apicid[cpu];
|
|
|
|
- node = apicid_to_node[apicid];
|
|
+ node = apicid < MAX_LOCAL_APIC ? apicid_to_node[apicid] : NUMA_NO_NODE;
|
|
if ( node == NUMA_NO_NODE )
|
|
node = 0;
|
|
|
|
--- a/xen/arch/x86/smpboot.c
|
|
+++ b/xen/arch/x86/smpboot.c
|
|
@@ -993,7 +993,8 @@ int cpu_add(uint32_t apic_id, uint32_t a
|
|
cpu = node;
|
|
goto out;
|
|
}
|
|
- apicid_to_node[apic_id] = node;
|
|
+ if ( apic_id < MAX_LOCAL_APIC )
|
|
+ apicid_to_node[apic_id] = node;
|
|
}
|
|
|
|
/* Physically added CPUs do not have synchronised TSC. */
|
|
--- a/xen/arch/x86/srat.c
|
|
+++ b/xen/arch/x86/srat.c
|
|
@@ -209,7 +209,6 @@ acpi_numa_x2apic_affinity_init(struct ac
|
|
{
|
|
unsigned pxm;
|
|
nodeid_t node;
|
|
- u32 apic_id;
|
|
|
|
if (srat_disabled())
|
|
return;
|
|
@@ -217,8 +216,13 @@ acpi_numa_x2apic_affinity_init(struct ac
|
|
bad_srat();
|
|
return;
|
|
}
|
|
- if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
|
|
+ if (!(pa->flags & ACPI_SRAT_CPU_ENABLED))
|
|
+ return;
|
|
+ if (pa->apic_id >= MAX_LOCAL_APIC) {
|
|
+ printk(KERN_INFO "SRAT: APIC %08x ignored\n", pa->apic_id);
|
|
return;
|
|
+ }
|
|
+
|
|
pxm = pa->proximity_domain;
|
|
node = setup_node(pxm);
|
|
if (node == NUMA_NO_NODE) {
|
|
@@ -226,11 +230,11 @@ acpi_numa_x2apic_affinity_init(struct ac
|
|
return;
|
|
}
|
|
|
|
- apic_id = pa->apic_id;
|
|
- apicid_to_node[apic_id] = node;
|
|
+ apicid_to_node[pa->apic_id] = node;
|
|
+ node_set(node, processor_nodes_parsed);
|
|
acpi_numa = 1;
|
|
- printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n",
|
|
- pxm, apic_id, node);
|
|
+ printk(KERN_INFO "SRAT: PXM %u -> APIC %08x -> Node %u\n",
|
|
+ pxm, pa->apic_id, node);
|
|
}
|
|
|
|
/* Callback for Proximity Domain -> LAPIC mapping */
|
|
@@ -262,7 +266,7 @@ acpi_numa_processor_affinity_init(struct
|
|
apicid_to_node[pa->apic_id] = node;
|
|
node_set(node, processor_nodes_parsed);
|
|
acpi_numa = 1;
|
|
- printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n",
|
|
+ printk(KERN_INFO "SRAT: PXM %u -> APIC %02x -> Node %u\n",
|
|
pxm, pa->apic_id, node);
|
|
}
|
|
|
|
--- a/xen/drivers/acpi/numa.c
|
|
+++ b/xen/drivers/acpi/numa.c
|
|
@@ -198,9 +198,9 @@ int __init acpi_numa_init(void)
|
|
/* SRAT: Static Resource Affinity Table */
|
|
if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
|
|
acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY,
|
|
- acpi_parse_x2apic_affinity, NR_CPUS);
|
|
+ acpi_parse_x2apic_affinity, 0);
|
|
acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
|
|
- acpi_parse_processor_affinity, NR_CPUS);
|
|
+ acpi_parse_processor_affinity, 0);
|
|
acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
|
|
acpi_parse_memory_affinity,
|
|
NR_NODE_MEMBLKS);
|