From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932582AbcI3MII (ORCPT ); Fri, 30 Sep 2016 08:08:08 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45374 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932311AbcI3MIB (ORCPT ); Fri, 30 Sep 2016 08:08:01 -0400 Date: Fri, 30 Sep 2016 05:06:46 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: david@saggiorato.net, brgerst@gmail.com, peterz@infradead.org, dave@sr71.net, dvlasenk@redhat.com, mingo@kernel.org, bp@alien8.de, jpoimboe@redhat.com, hpa@zytor.com, luto@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org Reply-To: linux-kernel@vger.kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, bp@alien8.de, jpoimboe@redhat.com, luto@kernel.org, hpa@zytor.com, dave@sr71.net, mingo@kernel.org, dvlasenk@redhat.com, brgerst@gmail.com, peterz@infradead.org, david@saggiorato.net In-Reply-To: <8de723afbf0811071185039f9088733188b606c9.1475103911.git.luto@kernel.org> References: <8de723afbf0811071185039f9088733188b606c9.1475103911.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/boot: Initialize FPU and X86_FEATURE_ALWAYS even if we don't have CPUID Git-Commit-ID: 05fb3c199bb09f5b85de56cc3ede194ac95c5e1f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 05fb3c199bb09f5b85de56cc3ede194ac95c5e1f Gitweb: http://git.kernel.org/tip/05fb3c199bb09f5b85de56cc3ede194ac95c5e1f Author: Andy Lutomirski AuthorDate: Wed, 28 Sep 2016 16:06:33 -0700 Committer: Ingo Molnar CommitDate: Fri, 30 Sep 2016 13:53:04 +0200 x86/boot: Initialize FPU and X86_FEATURE_ALWAYS even if we don't have CPUID Otherwise arch_task_struct_size == 0 and we die. While we're at it, set X86_FEATURE_ALWAYS, too. Reported-by: David Saggiorato Tested-by: David Saggiorato Signed-off-by: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: stable@vger.kernel.org Fixes: aaeb5c01c5b ("x86/fpu, sched: Introduce CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT and use it on x86") Link: http://lkml.kernel.org/r/8de723afbf0811071185039f9088733188b606c9.1475103911.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/common.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 809eda0..bcc9ccc 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -804,21 +804,20 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) identify_cpu_without_cpuid(c); /* cyrix could have cpuid enabled via c_identify()*/ - if (!have_cpuid_p()) - return; + if (have_cpuid_p()) { + cpu_detect(c); + get_cpu_vendor(c); + get_cpu_cap(c); - cpu_detect(c); - get_cpu_vendor(c); - get_cpu_cap(c); - - if (this_cpu->c_early_init) - this_cpu->c_early_init(c); + if (this_cpu->c_early_init) + this_cpu->c_early_init(c); - c->cpu_index = 0; - filter_cpuid_features(c, false); + c->cpu_index = 0; + filter_cpuid_features(c, false); - if (this_cpu->c_bsp_init) - this_cpu->c_bsp_init(c); + if (this_cpu->c_bsp_init) + this_cpu->c_bsp_init(c); + } setup_force_cpu_cap(X86_FEATURE_ALWAYS); fpu__init_system(c);