projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
389a3fc
)
x86/xen: Add call of speculative_store_bypass_ht_init() to PV paths
author
Juergen Gross
<jgross@suse.com>
Thu, 21 Jun 2018 08:43:31 +0000
(10:43 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 11 Jul 2018 14:26:43 +0000
(16:26 +0200)
commit
74899d92e66663dc7671a8017b3146dcd4735f3b
upstream.
Commit:
1f50ddb4f418
("x86/speculation: Handle HT correctly on AMD")
... added speculative_store_bypass_ht_init() to the per-CPU initialization sequence.
speculative_store_bypass_ht_init() needs to be called on each CPU for
PV guests, too.
Reported-by: Brian Woods <brian.woods@amd.com>
Tested-by: Brian Woods <brian.woods@amd.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Cc: <stable@vger.kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: boris.ostrovsky@oracle.com
Cc: xen-devel@lists.xenproject.org
Fixes:
1f50ddb4f4189243c05926b842dc1a0332195f31
("x86/speculation: Handle HT correctly on AMD")
Link:
https://lore.kernel.org/lkml/20180621084331.21228-1-jgross@suse.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/xen/smp.c
patch
|
blob
|
history
diff --git
a/arch/x86/xen/smp.c
b/arch/x86/xen/smp.c
index
a11540e
..
8eca26e
100644
(file)
--- a/
arch/x86/xen/smp.c
+++ b/
arch/x86/xen/smp.c
@@
-28,6
+28,7
@@
#include <xen/interface/vcpu.h>
#include <xen/interface/xenpmu.h>
+#include <asm/spec-ctrl.h>
#include <asm/xen/interface.h>
#include <asm/xen/hypercall.h>
@@
-87,6
+88,8
@@
static void cpu_bringup(void)
cpu_data(cpu).x86_max_cores = 1;
set_cpu_sibling_map(cpu);
+ speculative_store_bypass_ht_init();
+
xen_setup_cpu_clockevents();
notify_cpu_starting(cpu);
@@
-375,6
+378,8
@@
static void __init xen_smp_prepare_cpus(unsigned int max_cpus)
}
set_cpu_sibling_map(0);
+ speculative_store_bypass_ht_init();
+
xen_pmu_init(0);
if (xen_smp_intr_init(0))