Probably contains fixes for https://github.com/QubesOS/updates-status/issues/401#issuecomment-365726878pull/17/head
Simon Gaiser
6 years ago
parent
5468bc3f11
commit
b70202bead
@ -0,0 +1,94 @@
|
||||
From 63e708f826bb21470155d37b103a75d8a9e25b18 Mon Sep 17 00:00:00 2001
|
||||
From: Prarit Bhargava <prarit@redhat.com>
|
||||
Date: Wed, 7 Feb 2018 18:49:23 -0500
|
||||
Subject: [PATCH] x86/xen: Calculate __max_logical_packages on PV domains
|
||||
|
||||
The kernel panics on PV domains because native_smp_cpus_done() is
|
||||
only called for HVM domains.
|
||||
|
||||
Calculate __max_logical_packages for PV domains.
|
||||
|
||||
Fixes: b4c0a7326f5d ("x86/smpboot: Fix __max_logical_packages estimate")
|
||||
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
|
||||
Tested-and-reported-by: Simon Gaiser <simon@invisiblethingslab.com>
|
||||
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: Ingo Molnar <mingo@redhat.com>
|
||||
Cc: "H. Peter Anvin" <hpa@zytor.com>
|
||||
Cc: x86@kernel.org
|
||||
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
||||
Cc: Juergen Gross <jgross@suse.com>
|
||||
Cc: Dou Liyang <douly.fnst@cn.fujitsu.com>
|
||||
Cc: Prarit Bhargava <prarit@redhat.com>
|
||||
Cc: Kate Stewart <kstewart@linuxfoundation.org>
|
||||
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
Cc: Andy Lutomirski <luto@kernel.org>
|
||||
Cc: Andi Kleen <ak@linux.intel.com>
|
||||
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
Cc: xen-devel@lists.xenproject.org
|
||||
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
||||
Signed-off-by: Juergen Gross <jgross@suse.com>
|
||||
---
|
||||
arch/x86/include/asm/smp.h | 1 +
|
||||
arch/x86/kernel/smpboot.c | 10 ++++++++--
|
||||
arch/x86/xen/smp.c | 2 ++
|
||||
3 files changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
|
||||
index 461f53d27708..a4189762b266 100644
|
||||
--- a/arch/x86/include/asm/smp.h
|
||||
+++ b/arch/x86/include/asm/smp.h
|
||||
@@ -129,6 +129,7 @@ static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask)
|
||||
void cpu_disable_common(void);
|
||||
void native_smp_prepare_boot_cpu(void);
|
||||
void native_smp_prepare_cpus(unsigned int max_cpus);
|
||||
+void calculate_max_logical_packages(void);
|
||||
void native_smp_cpus_done(unsigned int max_cpus);
|
||||
void common_cpu_up(unsigned int cpunum, struct task_struct *tidle);
|
||||
int native_cpu_up(unsigned int cpunum, struct task_struct *tidle);
|
||||
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
|
||||
index cfc61e1d45e2..9eee25d07586 100644
|
||||
--- a/arch/x86/kernel/smpboot.c
|
||||
+++ b/arch/x86/kernel/smpboot.c
|
||||
@@ -1281,11 +1281,10 @@ void __init native_smp_prepare_boot_cpu(void)
|
||||
cpu_set_state_online(me);
|
||||
}
|
||||
|
||||
-void __init native_smp_cpus_done(unsigned int max_cpus)
|
||||
+void __init calculate_max_logical_packages(void)
|
||||
{
|
||||
int ncpus;
|
||||
|
||||
- pr_debug("Boot done\n");
|
||||
/*
|
||||
* Today neither Intel nor AMD support heterogenous systems so
|
||||
* extrapolate the boot cpu's data to all packages.
|
||||
@@ -1293,6 +1292,13 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
|
||||
ncpus = cpu_data(0).booted_cores * topology_max_smt_threads();
|
||||
__max_logical_packages = DIV_ROUND_UP(nr_cpu_ids, ncpus);
|
||||
pr_info("Max logical packages: %u\n", __max_logical_packages);
|
||||
+}
|
||||
+
|
||||
+void __init native_smp_cpus_done(unsigned int max_cpus)
|
||||
+{
|
||||
+ pr_debug("Boot done\n");
|
||||
+
|
||||
+ calculate_max_logical_packages();
|
||||
|
||||
if (x86_has_numa_in_package)
|
||||
set_sched_topology(x86_numa_in_package_topology);
|
||||
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
|
||||
index 77c959cf81e7..7a43b2ae19f1 100644
|
||||
--- a/arch/x86/xen/smp.c
|
||||
+++ b/arch/x86/xen/smp.c
|
||||
@@ -122,6 +122,8 @@ void __init xen_smp_cpus_done(unsigned int max_cpus)
|
||||
|
||||
if (xen_hvm_domain())
|
||||
native_smp_cpus_done(max_cpus);
|
||||
+ else
|
||||
+ calculate_max_logical_packages();
|
||||
|
||||
if (xen_have_vcpu_info_placement)
|
||||
return;
|
||||
--
|
||||
2.16.1
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 09c7513ec86caec1a1c304cf34d512011712f5c4 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Gaiser <simon@invisiblethingslab.com>
|
||||
Date: Wed, 7 Feb 2018 18:30:53 +0100
|
||||
Subject: [PATCH 1/2] Revert "x86/smpboot: Do not use smp_num_siblings in
|
||||
__max_logical_packages calculation"
|
||||
|
||||
This reverts commit 947134d9b00f342415af7eddd42a5fce7262a1b9.
|
||||
---
|
||||
arch/x86/kernel/smpboot.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
|
||||
index ed556d50d7ed..3dd6a6a5ffbc 100644
|
||||
--- a/arch/x86/kernel/smpboot.c
|
||||
+++ b/arch/x86/kernel/smpboot.c
|
||||
@@ -106,7 +106,7 @@ EXPORT_SYMBOL(__max_logical_packages);
|
||||
static unsigned int logical_packages __read_mostly;
|
||||
|
||||
/* Maximum number of SMT threads on any online core */
|
||||
-int __read_mostly __max_smt_threads = 1;
|
||||
+int __max_smt_threads __read_mostly;
|
||||
|
||||
/* Flag to indicate if a complete sched domain rebuild is required */
|
||||
bool x86_topology_update;
|
||||
@@ -1291,7 +1291,7 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
|
||||
* Today neither Intel nor AMD support heterogenous systems so
|
||||
* extrapolate the boot cpu's data to all packages.
|
||||
*/
|
||||
- ncpus = cpu_data(0).booted_cores * topology_max_smt_threads();
|
||||
+ ncpus = cpu_data(0).booted_cores * smp_num_siblings;
|
||||
__max_logical_packages = DIV_ROUND_UP(nr_cpu_ids, ncpus);
|
||||
pr_info("Max logical packages: %u\n", __max_logical_packages);
|
||||
|
||||
--
|
||||
2.15.1
|
||||
|
||||
@ -1,101 +0,0 @@
|
||||
From 3379207879b4f1b6dff0cca0a713d5309e045c12 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Gaiser <simon@invisiblethingslab.com>
|
||||
Date: Wed, 7 Feb 2018 18:31:03 +0100
|
||||
Subject: [PATCH 2/2] Revert "x86/smpboot: Fix __max_logical_packages estimate"
|
||||
|
||||
This reverts commit b4c0a7326f5dc0ef7a64128b0ae7d081f4b2cbd1.
|
||||
---
|
||||
arch/x86/kernel/smpboot.c | 55 ++++++++++++++++++++++++++++++++++++++---------
|
||||
1 file changed, 45 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
|
||||
index 3dd6a6a5ffbc..72b3eb321b49 100644
|
||||
--- a/arch/x86/kernel/smpboot.c
|
||||
+++ b/arch/x86/kernel/smpboot.c
|
||||
@@ -301,6 +301,12 @@ int topology_update_package_map(unsigned int pkg, unsigned int cpu)
|
||||
if (new >= 0)
|
||||
goto found;
|
||||
|
||||
+ if (logical_packages >= __max_logical_packages) {
|
||||
+ pr_warn("Package %u of CPU %u exceeds BIOS package data %u.\n",
|
||||
+ logical_packages, cpu, __max_logical_packages);
|
||||
+ return -ENOSPC;
|
||||
+ }
|
||||
+
|
||||
new = logical_packages++;
|
||||
if (new != pkg) {
|
||||
pr_info("CPU %u Converting physical %u to logical package %u\n",
|
||||
@@ -311,6 +317,44 @@ int topology_update_package_map(unsigned int pkg, unsigned int cpu)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static void __init smp_init_package_map(struct cpuinfo_x86 *c, unsigned int cpu)
|
||||
+{
|
||||
+ unsigned int ncpus;
|
||||
+
|
||||
+ /*
|
||||
+ * Today neither Intel nor AMD support heterogenous systems. That
|
||||
+ * might change in the future....
|
||||
+ *
|
||||
+ * While ideally we'd want '* smp_num_siblings' in the below @ncpus
|
||||
+ * computation, this won't actually work since some Intel BIOSes
|
||||
+ * report inconsistent HT data when they disable HT.
|
||||
+ *
|
||||
+ * In particular, they reduce the APIC-IDs to only include the cores,
|
||||
+ * but leave the CPUID topology to say there are (2) siblings.
|
||||
+ * This means we don't know how many threads there will be until
|
||||
+ * after the APIC enumeration.
|
||||
+ *
|
||||
+ * By not including this we'll sometimes over-estimate the number of
|
||||
+ * logical packages by the amount of !present siblings, but this is
|
||||
+ * still better than MAX_LOCAL_APIC.
|
||||
+ *
|
||||
+ * We use total_cpus not nr_cpu_ids because nr_cpu_ids can be limited
|
||||
+ * on the command line leading to a similar issue as the HT disable
|
||||
+ * problem because the hyperthreads are usually enumerated after the
|
||||
+ * primary cores.
|
||||
+ */
|
||||
+ ncpus = boot_cpu_data.x86_max_cores;
|
||||
+ if (!ncpus) {
|
||||
+ pr_warn("x86_max_cores == zero !?!?");
|
||||
+ ncpus = 1;
|
||||
+ }
|
||||
+
|
||||
+ __max_logical_packages = DIV_ROUND_UP(total_cpus, ncpus);
|
||||
+ pr_info("Max logical packages: %u\n", __max_logical_packages);
|
||||
+
|
||||
+ topology_update_package_map(c->phys_proc_id, cpu);
|
||||
+}
|
||||
+
|
||||
void __init smp_store_boot_cpu_info(void)
|
||||
{
|
||||
int id = 0; /* CPU 0 */
|
||||
@@ -318,7 +362,7 @@ void __init smp_store_boot_cpu_info(void)
|
||||
|
||||
*c = boot_cpu_data;
|
||||
c->cpu_index = id;
|
||||
- topology_update_package_map(c->phys_proc_id, id);
|
||||
+ smp_init_package_map(c, id);
|
||||
c->initialized = true;
|
||||
}
|
||||
|
||||
@@ -1284,16 +1328,7 @@ void __init native_smp_prepare_boot_cpu(void)
|
||||
|
||||
void __init native_smp_cpus_done(unsigned int max_cpus)
|
||||
{
|
||||
- int ncpus;
|
||||
-
|
||||
pr_debug("Boot done\n");
|
||||
- /*
|
||||
- * Today neither Intel nor AMD support heterogenous systems so
|
||||
- * extrapolate the boot cpu's data to all packages.
|
||||
- */
|
||||
- ncpus = cpu_data(0).booted_cores * smp_num_siblings;
|
||||
- __max_logical_packages = DIV_ROUND_UP(nr_cpu_ids, ncpus);
|
||||
- pr_info("Max logical packages: %u\n", __max_logical_packages);
|
||||
|
||||
if (x86_has_numa_in_package)
|
||||
set_sched_topology(x86_numa_in_package_topology);
|
||||
--
|
||||
2.15.1
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
From 137e4287ebd6ccdc0982c622825c90bba940f7cf Mon Sep 17 00:00:00 2001
|
||||
From: Simon Gaiser <simon@invisiblethingslab.com>
|
||||
Date: Tue, 27 Feb 2018 18:14:15 +0100
|
||||
Subject: [PATCH] Revert "xenbus: track caller request id"
|
||||
|
||||
This reverts commit 54de83d07a18bfa30bd90294bebced839bb7132f.
|
||||
---
|
||||
drivers/xen/xenbus/xenbus.h | 1 -
|
||||
drivers/xen/xenbus/xenbus_comms.c | 1 -
|
||||
drivers/xen/xenbus/xenbus_xs.c | 3 ---
|
||||
3 files changed, 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/xen/xenbus/xenbus.h b/drivers/xen/xenbus/xenbus.h
|
||||
index 092981171df1..149c5e7efc89 100644
|
||||
--- a/drivers/xen/xenbus/xenbus.h
|
||||
+++ b/drivers/xen/xenbus/xenbus.h
|
||||
@@ -76,7 +76,6 @@ struct xb_req_data {
|
||||
struct list_head list;
|
||||
wait_queue_head_t wq;
|
||||
struct xsd_sockmsg msg;
|
||||
- uint32_t caller_req_id;
|
||||
enum xsd_sockmsg_type type;
|
||||
char *body;
|
||||
const struct kvec *vec;
|
||||
diff --git a/drivers/xen/xenbus/xenbus_comms.c b/drivers/xen/xenbus/xenbus_comms.c
|
||||
index d239fc3c5e3d..5b081a01779d 100644
|
||||
--- a/drivers/xen/xenbus/xenbus_comms.c
|
||||
+++ b/drivers/xen/xenbus/xenbus_comms.c
|
||||
@@ -309,7 +309,6 @@ static int process_msg(void)
|
||||
goto out;
|
||||
|
||||
if (req->state == xb_req_state_wait_reply) {
|
||||
- req->msg.req_id = req->caller_req_id;
|
||||
req->msg.type = state.msg.type;
|
||||
req->msg.len = state.msg.len;
|
||||
req->body = state.body;
|
||||
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
|
||||
index 3f3b29398ab8..3e59590c7254 100644
|
||||
--- a/drivers/xen/xenbus/xenbus_xs.c
|
||||
+++ b/drivers/xen/xenbus/xenbus_xs.c
|
||||
@@ -227,8 +227,6 @@ static void xs_send(struct xb_req_data *req, struct xsd_sockmsg *msg)
|
||||
req->state = xb_req_state_queued;
|
||||
init_waitqueue_head(&req->wq);
|
||||
|
||||
- /* Save the caller req_id and restore it later in the reply */
|
||||
- req->caller_req_id = req->msg.req_id;
|
||||
req->msg.req_id = xs_request_enter(req);
|
||||
|
||||
mutex_lock(&xb_write_mutex);
|
||||
@@ -312,7 +310,6 @@ static void *xs_talkv(struct xenbus_transaction t,
|
||||
req->num_vecs = num_vecs;
|
||||
req->cb = xs_wake_up;
|
||||
|
||||
- msg.req_id = 0;
|
||||
msg.tx_id = t.id;
|
||||
msg.type = type;
|
||||
msg.len = 0;
|
||||
--
|
||||
2.16.1
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
From d3c8038919ffb95553ff2b6878f6eae46579abe7 Mon Sep 17 00:00:00 2001
|
||||
From: Juergen Gross <jgross@suse.com>
|
||||
Date: Thu, 1 Feb 2018 13:40:19 +0100
|
||||
Subject: [PATCH] x86/xen: init %gs very early to avoid page faults with stack
|
||||
protector
|
||||
|
||||
When running as Xen pv guest %gs is initialized some time after
|
||||
C code is started. Depending on stack protector usage this might be
|
||||
too late, resulting in page faults.
|
||||
|
||||
So setup %gs and MSR_GS_BASE in assembly code already.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Juergen Gross <jgross@suse.com>
|
||||
---
|
||||
arch/x86/xen/xen-head.S | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
|
||||
index 497cc55a0c16..96f26e026783 100644
|
||||
--- a/arch/x86/xen/xen-head.S
|
||||
+++ b/arch/x86/xen/xen-head.S
|
||||
@@ -9,7 +9,9 @@
|
||||
|
||||
#include <asm/boot.h>
|
||||
#include <asm/asm.h>
|
||||
+#include <asm/msr.h>
|
||||
#include <asm/page_types.h>
|
||||
+#include <asm/percpu.h>
|
||||
#include <asm/unwind_hints.h>
|
||||
|
||||
#include <xen/interface/elfnote.h>
|
||||
@@ -35,6 +37,20 @@ ENTRY(startup_xen)
|
||||
mov %_ASM_SI, xen_start_info
|
||||
mov $init_thread_union+THREAD_SIZE, %_ASM_SP
|
||||
|
||||
+#ifdef CONFIG_X86_64
|
||||
+ /* Set up %gs.
|
||||
+ *
|
||||
+ * The base of %gs always points to the bottom of the irqstack
|
||||
+ * union. If the stack protector canary is enabled, it is
|
||||
+ * located at %gs:40. Note that, on SMP, the boot cpu uses
|
||||
+ * init data section till per cpu areas are set up.
|
||||
+ */
|
||||
+ movl $MSR_GS_BASE,%ecx
|
||||
+ movq $INIT_PER_CPU_VAR(irq_stack_union),%rax
|
||||
+ cdq
|
||||
+ wrmsr
|
||||
+#endif
|
||||
+
|
||||
jmp xen_start_kernel
|
||||
END(startup_xen)
|
||||
__FINIT
|
||||
--
|
||||
2.15.1
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From c71b9388cef5106ad8aa4f8db3d03388e74e5b89 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Gaiser <simon@invisiblethingslab.com>
|
||||
Date: Fri, 5 Jan 2018 18:28:39 +0100
|
||||
Subject: [PATCH] xen: Fix {set,clear}_foreign_p2m_mapping on autotranslating
|
||||
guests
|
||||
|
||||
Commit 82616f9599a7 ("xen: remove tests for pvh mode in pure pv paths")
|
||||
removed the check for autotranslation from {set,clear}_foreign_p2m_mapping
|
||||
but those are called by grant-table.c also on PVH/HVM guests.
|
||||
---
|
||||
arch/x86/xen/p2m.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
|
||||
index 6083ba462f35..15812e553b95 100644
|
||||
--- a/arch/x86/xen/p2m.c
|
||||
+++ b/arch/x86/xen/p2m.c
|
||||
@@ -694,6 +694,9 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,
|
||||
int i, ret = 0;
|
||||
pte_t *pte;
|
||||
|
||||
+ if (xen_feature(XENFEAT_auto_translated_physmap))
|
||||
+ return 0;
|
||||
+
|
||||
if (kmap_ops) {
|
||||
ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref,
|
||||
kmap_ops, count);
|
||||
@@ -736,6 +739,9 @@ int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,
|
||||
{
|
||||
int i, ret = 0;
|
||||
|
||||
+ if (xen_feature(XENFEAT_auto_translated_physmap))
|
||||
+ return 0;
|
||||
+
|
||||
for (i = 0; i < count; i++) {
|
||||
unsigned long mfn = __pfn_to_mfn(page_to_pfn(pages[i]));
|
||||
unsigned long pfn = page_to_pfn(pages[i]);
|
||||
--
|
||||
2.15.1
|
||||
|
||||
Loading…
Reference in new issue