Commit 9805a683 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes from Thomas Gleixner:
 "A small set of fixes for x86:

   - Make the tsc=reliable/nowatchdog command line parameter work again.
     It was broken with the introduction of the early TSC clocksource.

   - Prevent the evaluation of exception stacks before they are set up.
     This causes a crash in dumpstack because the stack walk termination
     gets screwed up.

   - Prevent a NULL pointer dereference in the rescource control file
     system.

   - Avoid bogus warnings about APIC id mismatch related to the LDR
     which can happen when the LDR is not in use and therefore not
     initialized. Only evaluate that when the APIC is in logical
     destination mode"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/tsc: Respect tsc command line paraemeter for clocksource_tsc_early
  x86/dumpstack/64: Don't evaluate exception stacks before setup
  x86/apic/32: Avoid bogus LDR warnings
  x86/resctrl: Prevent NULL pointer dereference when reading mondata
parents 621084cd 63ec58b4

arch/x86/kernel/apic/apic.c

+15 −13
Original line number Diff line number Diff line
@@ -1586,9 +1586,6 @@ static void setup_local_APIC(void) 
{

	int cpu = smp_processor_id();

	unsigned int value;

#ifdef CONFIG_X86_32

	int logical_apicid, ldr_apicid;

#endif



	if (disable_apic) {

		disable_ioapic_support();
@@ -1626,16 +1623,21 @@ static void setup_local_APIC(void) 
	apic->init_apic_ldr();



#ifdef CONFIG_X86_32

	if (apic->dest_logical) {

		int logical_apicid, ldr_apicid;



		/*

		 * APIC LDR is initialized.  If logical_apicid mapping was

	 * initialized during get_smp_config(), make sure it matches the

	 * actual value.

		 * initialized during get_smp_config(), make sure it matches

		 * the actual value.

		 */

		logical_apicid = early_per_cpu(x86_cpu_to_logical_apicid, cpu);

		ldr_apicid = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR));

	WARN_ON(logical_apicid != BAD_APICID && logical_apicid != ldr_apicid);

	/* always use the value from LDR */

		if (logical_apicid != BAD_APICID)

			WARN_ON(logical_apicid != ldr_apicid);

		/* Always use the value from LDR. */

		early_per_cpu(x86_cpu_to_logical_apicid, cpu) = ldr_apicid;

	}

#endif



	/*

arch/x86/kernel/cpu/resctrl/ctrlmondata.c

+4 −0
Original line number Diff line number Diff line
@@ -522,6 +522,10 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg) 
	int ret = 0;



	rdtgrp = rdtgroup_kn_lock_live(of->kn);

	if (!rdtgrp) {

		ret = -ENOENT;

		goto out;

	}



	md.priv = of->kn->priv;

	resid = md.u.rid;

arch/x86/kernel/dumpstack_64.c

+7 −0
Original line number Diff line number Diff line
@@ -94,6 +94,13 @@ static bool in_exception_stack(unsigned long *stack, struct stack_info *info) 
	BUILD_BUG_ON(N_EXCEPTION_STACKS != 6);



	begin = (unsigned long)__this_cpu_read(cea_exception_stacks);

	/*

	 * Handle the case where stack trace is collected _before_

	 * cea_exception_stacks had been initialized.

	 */

	if (!begin)

		return false;



	end = begin + sizeof(struct cea_exception_stacks);

	/* Bail if @stack is outside the exception stack area. */

	if (stk < begin || stk >= end)

arch/x86/kernel/tsc.c

+3 −0
Original line number Diff line number Diff line
@@ -1505,6 +1505,9 @@ void __init tsc_init(void) 
		return;

	}



	if (tsc_clocksource_reliable || no_tsc_watchdog)

		clocksource_tsc_early.flags &= ~CLOCK_SOURCE_MUST_VERIFY;



	clocksource_register_khz(&clocksource_tsc_early, tsc_khz);

	detect_art();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE