Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 3 Jul 2018 00:54:47 -0700
From:   tip-bot for Zhenzhong Duan <tipbot@zytor.com>
Message-ID: <tip-4fb5f58e8d191f7c81637ad81284e4848afb4244@git.kernel.org>
Cc:     hpa@zytor.com, tglx@linutronix.de, bp@alien8.de,
        zhenzhong.duan@oracle.com, linux-kernel@vger.kernel.org,
        mingo@kernel.org, luto@kernel.org, peterz@infradead.org,
        torvalds@linux-foundation.org
Reply-To: torvalds@linux-foundation.org, luto@kernel.org, mingo@kernel.org,
          peterz@infradead.org, zhenzhong.duan@oracle.com,
          linux-kernel@vger.kernel.org, bp@alien8.de, tglx@linutronix.de,
          hpa@zytor.com
In-Reply-To: <b07b6ae9-4b57-4b40-b9bc-50c2c67f1d91@default>
References: <b07b6ae9-4b57-4b40-b9bc-50c2c67f1d91@default>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:x86/urgent] x86/mm/32: Initialize the CR4 shadow before
 __flush_tlb_all()
Git-Commit-ID: 4fb5f58e8d191f7c81637ad81284e4848afb4244
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  4fb5f58e8d191f7c81637ad81284e4848afb4244
Gitweb:     https://git.kernel.org/tip/4fb5f58e8d191f7c81637ad81284e4848afb4244
Author:     Zhenzhong Duan <zhenzhong.duan@oracle.com>
AuthorDate: Mon, 2 Jul 2018 23:49:54 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 3 Jul 2018 09:26:10 +0200

x86/mm/32: Initialize the CR4 shadow before __flush_tlb_all()

On 32-bit kernels, __flush_tlb_all() may have read the CR4 shadow before the
initialization of CR4 shadow in cpu_init().

Fix it by adding an explicit cr4_init_shadow() call into start_secondary()
which is the first function called on non-boot SMP CPUs - ahead of the
__flush_tlb_all() call.

( This is somewhat of a layering violation, but start_secondary() does
  CR4 bootstrap in the PCID case anyway. )

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Link: http://lkml.kernel.org/r/b07b6ae9-4b57-4b40-b9bc-50c2c67f1d91@default
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/smpboot.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index c2f7d1d2a5c3..db9656e13ea0 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -221,6 +221,11 @@ static void notrace start_secondary(void *unused)
 #ifdef CONFIG_X86_32
 	/* switch away from the initial page table */
 	load_cr3(swapper_pg_dir);
+	/*
+	 * Initialize the CR4 shadow before doing anything that could
+	 * try to read it.
+	 */
+	cr4_init_shadow();
 	__flush_tlb_all();
 #endif
 	load_current_idt();