Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Peter Anvin: "A couple of crash fixes, plus a fix that on 32 bits would cause a missing -ENOSYS for nonexistent system calls" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, cpu: Fix cache topology for early P4-SMT x86_32, entry: Store badsys error code in %eax x86, MCE: Robustify mcheck_init_device

Linus Torvalds committed 12 years ago

Commit 43a255c2 parents fbf08ef bf72f5d4 files · +34 −19Browse files

Unified · Split

4 files

arch/x86/kernel/cpu/intel.c +11 −11
arch/x86/kernel/cpu/intel_cacheinfo.c +12 −0
arch/x86/kernel/cpu/mcheck/mce.c +6 −4
arch/x86/kernel/entry_32.S +5 −4

arch/x86/kernel/cpu/intel.c+11−11

 	 */
 	detect_extended_topology(c);
+	if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) {
+		/*
+		 * let's use the legacy cpuid vector 0x1 and 0x4 for topology
+		 * detection.
+		 */
+		c->x86_max_cores = intel_num_cpu_cores(c);
+#ifdef CONFIG_X86_32
+		detect_ht(c);
+#endif
+	}
 	l2 = init_intel_cacheinfo(c);
 	if (c->cpuid_level > 9) {
 		unsigned eax = cpuid_eax(10);
 		set_cpu_cap(c, X86_FEATURE_P3);
 #endif
-	if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) {
-		/*
-		 * let's use the legacy cpuid vector 0x1 and 0x4 for topology
-		 * detection.
-		 */
-		c->x86_max_cores = intel_num_cpu_cores(c);
-#ifdef CONFIG_X86_32
-		detect_ht(c);
-#endif
-	}
 	/* Work around errata */
 	srat_detect_node(c);

arch/x86/kernel/cpu/intel_cacheinfo.c+12−0

@@ -730,6 +730,18 @@ unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c) · 729 unmodified lines
730	#endif	730	#endif
731	}	731	}
732		732
		733	#ifdef CONFIG_X86_HT
		734	/*
		735	* If cpu_llc_id is not yet set, this means cpuid_level < 4 which in
		736	* turns means that the only possibility is SMT (as indicated in
		737	* cpuid1). Since cpuid2 doesn't specify shared caches, and we know
		738	* that SMT shares all caches, we can unconditionally set cpu_llc_id to
		739	* c->phys_proc_id.
		740	*/
		741	if (per_cpu(cpu_llc_id, cpu) == BAD_APICID)
		742	per_cpu(cpu_llc_id, cpu) = c->phys_proc_id;
		743	#endif
		744
733	c->x86_cache_size = l3 ? l3 : (l2 ? l2 : (l1i+l1d));	745	c->x86_cache_size = l3 ? l3 : (l2 ? l2 : (l1i+l1d));
734		746
735	return l2;	747	return l2;

arch/x86/kernel/cpu/mcheck/mce.c+6−4

 	for_each_online_cpu(i) {
 		err = mce_device_create(i);
 		if (err) {
+			/*
+			 * Register notifier anyway (and do not unreg it) so
+			 * that we don't leave undeleted timers, see notifier
+			 * callback above.
+			 */
+			__register_hotcpu_notifier(&mce_cpu_notifier);
 			cpu_notifier_register_done();
 			goto err_device_create;
 		}
 err_register:
 	unregister_syscore_ops(&mce_syscore_ops);
-	cpu_notifier_register_begin();
-	__unregister_hotcpu_notifier(&mce_cpu_notifier);
-	cpu_notifier_register_done();
 err_device_create:
 	/*
 	 * We didn't keep track of which devices were created above, but

arch/x86/kernel/entry_32.S+5−4

 	cmpl $(NR_syscalls), %eax
 	jae sysenter_badsys
 	call *sys_call_table(,%eax,4)
-	movl %eax,PT_EAX(%esp)
 sysenter_after_call:
+	movl %eax,PT_EAX(%esp)
 	LOCKDEP_SYS_EXIT
 	DISABLE_INTERRUPTS(CLBR_ANY)
 	TRACE_IRQS_OFF
 	jae syscall_badsys
 syscall_call:
 	call *sys_call_table(,%eax,4)
+syscall_after_call:
 	movl %eax,PT_EAX(%esp)		# store the return value
 syscall_exit:
 	LOCKDEP_SYS_EXIT
 END(syscall_fault)
 syscall_badsys:
-	movl $-ENOSYS,PT_EAX(%esp)
+	movl $-ENOSYS,%eax
-	jmp syscall_exit
+	jmp syscall_after_call
 END(syscall_badsys)
 sysenter_badsys:
-	movl $-ENOSYS,PT_EAX(%esp)
+	movl $-ENOSYS,%eax
 	jmp sysenter_after_call
 END(syscall_badsys)
 	CFI_ENDPROC