Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1363686
| From | Toshi Kani <toshi.kani@hpe.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 5/7] x86/mtrr: Fix PAT init handling when MTRR is disabled |
| Date | 2016-03-23 22:00 +0100 |
| Message-ID | <rfY2K-ua-7@gated-at.bofh.it> (permalink) |
| References | <rfXT4-qz-15@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
get_mtrr_state() calls pat_init() on BSP even if MTRR is disabled.
This results in calling pat_init() on BSP only since APs do not call
pat_init() when MTRR is disabled. This inconsistency between BSP
and APs leads to undefined behavior.
Make BSP's calling condition to pat_init() consistent with AP's,
mtrr_ap_init() and mtrr_aps_init().
Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/kernel/cpu/mtrr/generic.c | 24 ++++++++++++++----------
arch/x86/kernel/cpu/mtrr/main.c | 3 +++
arch/x86/kernel/cpu/mtrr/mtrr.h | 1 +
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index fcbcb2f..a9d2e54 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -444,11 +444,24 @@ static void __init print_mtrr_state(void)
pr_debug("TOM2: %016llx aka %lldM\n", mtrr_tom2, mtrr_tom2>>20);
}
+/* PAT setup for BP. We need to go through sync steps here */
+void __init mtrr_bp_pat_init(void)
+{
+ unsigned long flags;
+
+ local_irq_save(flags);
+ prepare_set();
+
+ pat_init();
+
+ post_set();
+ local_irq_restore(flags);
+}
+
/* Grab all of the MTRR state for this CPU into *state */
bool __init get_mtrr_state(void)
{
struct mtrr_var_range *vrs;
- unsigned long flags;
unsigned lo, dummy;
unsigned int i;
@@ -481,15 +494,6 @@ bool __init get_mtrr_state(void)
mtrr_state_set = 1;
- /* PAT setup for BP. We need to go through sync steps here */
- local_irq_save(flags);
- prepare_set();
-
- pat_init();
-
- post_set();
- local_irq_restore(flags);
-
return !!(mtrr_state.enabled & MTRR_STATE_MTRR_ENABLED);
}
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 8b1947b..7d393ec 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -752,6 +752,9 @@ void __init mtrr_bp_init(void)
/* BIOS may override */
__mtrr_enabled = get_mtrr_state();
+ if (mtrr_enabled())
+ mtrr_bp_pat_init();
+
if (mtrr_cleanup(phys_addr)) {
changed_by_mtrr_cleanup = 1;
mtrr_if->set_all();
diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
index 951884d..6c7ced0 100644
--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
@@ -52,6 +52,7 @@ void set_mtrr_prepare_save(struct set_mtrr_context *ctxt);
void fill_mtrr_var_range(unsigned int index,
u32 base_lo, u32 base_hi, u32 mask_lo, u32 mask_hi);
bool get_mtrr_state(void);
+void mtrr_bp_pat_init(void);
extern void set_mtrr_ops(const struct mtrr_ops *ops);
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 0/7] Enhance PAT init to fix Xorg crashes Toshi Kani <toshi.kani@hpe.com> - 2016-03-23 21:50 +0100
[PATCH v3 1/7] x86/mm/pat: Add support of non-default PAT MSR setting Toshi Kani <toshi.kani@hpe.com> - 2016-03-23 21:50 +0100
[tip:x86/mm] x86/mm/pat: Add support of non-default PAT MSR setting tip-bot for Toshi Kani <tipbot@zytor.com> - 2016-03-29 12:40 +0200
[PATCH v3 5/7] x86/mtrr: Fix PAT init handling when MTRR is disabled Toshi Kani <toshi.kani@hpe.com> - 2016-03-23 22:00 +0100
[tip:x86/mm] x86/mtrr: Fix PAT init handling when MTRR is disabled tip-bot for Toshi Kani <tipbot@zytor.com> - 2016-03-29 12:50 +0200
[PATCH v3 6/7] x86/xen,pat: Remove PAT table init code from Xen Toshi Kani <toshi.kani@hpe.com> - 2016-03-23 22:00 +0100
[tip:x86/mm] x86/xen, pat: Remove PAT table init code from Xen tip-bot for Toshi Kani <tipbot@zytor.com> - 2016-03-29 12:50 +0200
[PATCH v3 3/7] x86/mm/pat: Replace cpu_has_pat with boot_cpu_has Toshi Kani <toshi.kani@hpe.com> - 2016-03-23 22:00 +0100
[tip:x86/mm] x86/mm/pat: Replace cpu_has_pat with boot_cpu_has() tip-bot for Toshi Kani <tipbot@zytor.com> - 2016-03-29 12:50 +0200
[PATCH v3 2/7] x86/mm/pat: Add pat_disable() interface Toshi Kani <toshi.kani@hpe.com> - 2016-03-23 22:00 +0100
[tip:x86/mm] x86/mm/pat: Add pat_disable() interface tip-bot for Toshi Kani <tipbot@zytor.com> - 2016-03-29 12:50 +0200
[PATCH v3 7/7] x86/pat: Document PAT initialization Toshi Kani <toshi.kani@hpe.com> - 2016-03-23 22:00 +0100
[tip:x86/mm] x86/pat: Document the PAT initialization sequence tip-bot for Toshi Kani <tipbot@zytor.com> - 2016-03-29 12:50 +0200
[PATCH v3 4/6] x86/mtrr: Fix Xorg crashes in Qemu sessions Toshi Kani <toshi.kani@hpe.com> - 2016-03-23 22:00 +0100
[tip:x86/mm] x86/mtrr: Fix Xorg crashes in Qemu sessions tip-bot for Toshi Kani <tipbot@zytor.com> - 2016-03-29 12:50 +0200
Re: [PATCH v3 0/7] Enhance PAT init to fix Xorg crashes Ingo Molnar <mingo@kernel.org> - 2016-03-29 12:40 +0200
Re: [PATCH v3 0/7] Enhance PAT init to fix Xorg crashes Toshi Kani <toshi.kani@hpe.com> - 2016-03-29 15:30 +0200
Re: [Xen-devel] [PATCH v3 0/7] Enhance PAT init to fix Xorg crashes Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-03-29 16:50 +0200
Re: [Xen-devel] [PATCH v3 0/7] Enhance PAT init to fix Xorg crashes Toshi Kani <toshi.kani@hpe.com> - 2016-03-29 17:00 +0200
Re: [Xen-devel] [PATCH v3 0/7] Enhance PAT init to fix Xorg crashes "Luis R. Rodriguez" <mcgrof@suse.com> - 2016-03-30 20:10 +0200
Re: [LKP] [Xen-devel] [PATCH v3 0/7] Enhance PAT init to fix Xorg crashes "Luis R. Rodriguez" <mcgrof@suse.com> - 2016-03-30 22:20 +0200
Re: [LKP] [Xen-devel] [PATCH v3 0/7] Enhance PAT init to fix Xorg crashes "Luis R. Rodriguez" <mcgrof@suse.com> - 2016-03-30 22:50 +0200
csiph-web