Commit eab60d4e 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:
 "An assorted pile of fixes along with some hardware enablement:

   - a fix for a KASAN / branch profiling related boot failure

   - some more fallout of the PUD rework

   - a fix for the Always Running Timer which is not initialized when
     the TSC frequency is known at boot time (via MSR/CPUID)

   - a resource leak fix for the RDT filesystem

   - another unwinder corner case fixup

   - removal of the warning for duplicate NMI handlers because there are
     legitimate cases where more than one handler can be registered at
     the last level

   - make a function static - found by sparse

   - a set of updates for the Intel MID platform which got delayed due
     to merge ordering constraints. It's hardware enablement for a non
     mainstream platform, so there is no risk"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mpx: Make unnecessarily global function static
  x86/intel_rdt: Put group node in rdtgroup_kn_unlock
  x86/unwind: Fix last frame check for aligned function stacks
  mm, x86: Fix native_pud_clear build error
  x86/kasan: Fix boot with KASAN=y and PROFILE_ANNOTATED_BRANCHES=y
  x86/platform/intel-mid: Add power button support for Merrifield
  x86/platform/intel-mid: Use common power off sequence
  x86/platform: Remove warning message for duplicate NMI handlers
  x86/tsc: Fix ART for TSC_KNOWN_FREQ
  x86/platform/intel-mid: Correct MSI IRQ line for watchdog device
parents ae133733 6bce725a

arch/x86/kernel/cpu/intel_rdt_rdtgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ void rdtgroup_kn_unlock(struct kernfs_node *kn) 
	if (atomic_dec_and_test(&rdtgrp->waitcount) &&

	    (rdtgrp->flags & RDT_DELETED)) {

		kernfs_unbreak_active_protection(kn);

		kernfs_put(kn);

		kernfs_put(rdtgrp->kn);

		kfree(rdtgrp);

	} else {

		kernfs_unbreak_active_protection(kn);

arch/x86/kernel/head64.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 *  Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE

 */



#define DISABLE_BRANCH_PROFILING

#include <linux/init.h>

#include <linux/linkage.h>

#include <linux/types.h>

arch/x86/kernel/nmi.c

+2 −4
Original line number Diff line number Diff line
@@ -166,11 +166,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action) 
	spin_lock_irqsave(&desc->lock, flags);



	/*

	 * most handlers of type NMI_UNKNOWN never return because

	 * they just assume the NMI is theirs.  Just a sanity check

	 * to manage expectations

	 * Indicate if there are multiple registrations on the

	 * internal NMI handler call chains (SERR and IO_CHECK).

	 */

	WARN_ON_ONCE(type == NMI_UNKNOWN && !list_empty(&desc->head));

	WARN_ON_ONCE(type == NMI_SERR && !list_empty(&desc->head));

	WARN_ON_ONCE(type == NMI_IO_CHECK && !list_empty(&desc->head));

arch/x86/kernel/tsc.c

+2 −0
Original line number Diff line number Diff line
@@ -1333,6 +1333,8 @@ static int __init init_tsc_clocksource(void) 
	 * the refined calibration and directly register it as a clocksource.

	 */

	if (boot_cpu_has(X86_FEATURE_TSC_KNOWN_FREQ)) {

		if (boot_cpu_has(X86_FEATURE_ART))

			art_related_clocksource = &clocksource_tsc;

		clocksource_register_khz(&clocksource_tsc, tsc_khz);

		return 0;

	}

arch/x86/kernel/unwind_frame.c

+30 −6
Original line number Diff line number Diff line
@@ -82,19 +82,43 @@ static size_t regs_size(struct pt_regs *regs) 
	return sizeof(*regs);

}



#ifdef CONFIG_X86_32

#define GCC_REALIGN_WORDS 3

#else

#define GCC_REALIGN_WORDS 1

#endif



static bool is_last_task_frame(struct unwind_state *state)

{

	unsigned long bp = (unsigned long)state->bp;

	unsigned long regs = (unsigned long)task_pt_regs(state->task);

	unsigned long *last_bp = (unsigned long *)task_pt_regs(state->task) - 2;

	unsigned long *aligned_bp = last_bp - GCC_REALIGN_WORDS;



	/*

	 * We have to check for the last task frame at two different locations

	 * because gcc can occasionally decide to realign the stack pointer and

	 * change the offset of the stack frame by a word in the prologue of a

	 * function called by head/entry code.

	 * change the offset of the stack frame in the prologue of a function

	 * called by head/entry code.  Examples:

	 *

	 * <start_secondary>:

	 *      push   %edi

	 *      lea    0x8(%esp),%edi

	 *      and    $0xfffffff8,%esp

	 *      pushl  -0x4(%edi)

	 *      push   %ebp

	 *      mov    %esp,%ebp

	 *

	 * <x86_64_start_kernel>:

	 *      lea    0x8(%rsp),%r10

	 *      and    $0xfffffffffffffff0,%rsp

	 *      pushq  -0x8(%r10)

	 *      push   %rbp

	 *      mov    %rsp,%rbp

	 *

	 * Note that after aligning the stack, it pushes a duplicate copy of

	 * the return address before pushing the frame pointer.

	 */

	return bp == regs - FRAME_HEADER_SIZE ||

	       bp == regs - FRAME_HEADER_SIZE - sizeof(long);

	return (state->bp == last_bp ||

		(state->bp == aligned_bp && *(aligned_bp+1) == *(last_bp+1)));

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE