Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 963172d9 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:
 "The accumulated fixes from this and last week:

   - Fix vmalloc TLB flush and map range calculations which lead to
     stale TLBs, spurious faults and other hard to diagnose issues.

   - Use fault_in_pages_writable() for prefaulting the user stack in the
     FPU code as it's less fragile than the current solution

   - Use the PF_KTHREAD flag when checking for a kernel thread instead
     of current->mm as the latter can give the wrong answer due to
     use_mm()

   - Compute the vmemmap size correctly for KASLR and 5-Level paging.
     Otherwise this can end up with a way too small vmemmap area.

   - Make KASAN and 5-level paging work again by making sure that all
     invalid bits are masked out when computing the P4D offset. This
     worked before but got broken recently when the LDT remap area was
     moved.

   - Prevent a NULL pointer dereference in the resource control code
     which can be triggered with certain mount options when the
     requested resource is not available.

   - Enforce ordering of microcode loading vs. perf initialization on
     secondary CPUs. Otherwise perf tries to access a non-existing MSR
     as the boot CPU marked it as available.

   - Don't stop the resource control group walk early otherwise the
     control bitmaps are not updated correctly and become inconsistent.

   - Unbreak kgdb by returning 0 on success from
     kgdb_arch_set_breakpoint() instead of an error code.

   - Add more Icelake CPU model defines so depending changes can be
     queued in other trees"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode, cpuhotplug: Add a microcode loader CPU hotplug callback
  x86/kasan: Fix boot with 5-level paging and KASAN
  x86/fpu: Don't use current->mm to check for a kthread
  x86/kgdb: Return 0 from kgdb_arch_set_breakpoint()
  x86/resctrl: Prevent NULL pointer dereference when local MBM is disabled
  x86/resctrl: Don't stop walking closids when a locksetup group is found
  x86/fpu: Update kernel's FPU state before using for the fsave header
  x86/mm/KASLR: Compute the size of the vmemmap section properly
  x86/fpu: Use fault_in_pages_writeable() for pre-faulting
  x86/CPU: Add more Icelake model numbers
  mm/vmalloc: Avoid rare case of flushing TLB with weird arguments
  mm/vmalloc: Fix calculation of direct map addr range
parents efba92d5 78f4e932

arch/x86/include/asm/fpu/internal.h

+3 −3
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static inline void __fpregs_load_activate(void) 
	struct fpu *fpu = &current->thread.fpu;

	int cpu = smp_processor_id();



	if (WARN_ON_ONCE(current->mm == NULL))

	if (WARN_ON_ONCE(current->flags & PF_KTHREAD))

		return;



	if (!fpregs_state_valid(fpu, cpu)) {
@@ -567,11 +567,11 @@ static inline void __fpregs_load_activate(void) 
 * otherwise.

 *

 * The FPU context is only stored/restored for a user task and

 * ->mm is used to distinguish between kernel and user threads.

 * PF_KTHREAD is used to distinguish between kernel and user threads.

 */

static inline void switch_fpu_prepare(struct fpu *old_fpu, int cpu)

{

	if (static_cpu_has(X86_FEATURE_FPU) && current->mm) {

	if (static_cpu_has(X86_FEATURE_FPU) && !(current->flags & PF_KTHREAD)) {

		if (!copy_fpregs_to_fpstate(old_fpu))

			old_fpu->last_cpu = -1;

		else

arch/x86/include/asm/intel-family.h

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ 


#define INTEL_FAM6_CANNONLAKE_MOBILE	0x66



#define INTEL_FAM6_ICELAKE_X		0x6A

#define INTEL_FAM6_ICELAKE_XEON_D	0x6C

#define INTEL_FAM6_ICELAKE_DESKTOP	0x7D

#define INTEL_FAM6_ICELAKE_MOBILE	0x7E



/* "Small Core" Processors (Atom) */

arch/x86/kernel/cpu/microcode/core.c

+1 −1
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ int __init microcode_init(void) 
		goto out_ucode_group;



	register_syscore_ops(&mc_syscore_ops);

	cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/microcode:online",

	cpuhp_setup_state_nocalls(CPUHP_AP_MICROCODE_LOADER, "x86/microcode:online",

				  mc_cpu_online, mc_cpu_down_prep);



	pr_info("Microcode Update Driver: v%s.", DRIVER_VERSION);

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

+3 −0
Original line number Diff line number Diff line
@@ -360,6 +360,9 @@ static void update_mba_bw(struct rdtgroup *rgrp, struct rdt_domain *dom_mbm) 
	struct list_head *head;

	struct rdtgroup *entry;



	if (!is_mbm_local_enabled())

		return;



	r_mba = &rdt_resources_all[RDT_RESOURCE_MBA];

	closid = rgrp->closid;

	rmid = rgrp->mon.rmid;

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

+6 −1
Original line number Diff line number Diff line
@@ -2534,7 +2534,12 @@ static int __init_one_rdt_domain(struct rdt_domain *d, struct rdt_resource *r, 
		if (closid_allocated(i) && i != closid) {

			mode = rdtgroup_mode_by_closid(i);

			if (mode == RDT_MODE_PSEUDO_LOCKSETUP)

				break;

				/*

				 * ctrl values for locksetup aren't relevant

				 * until the schemata is written, and the mode

				 * becomes RDT_MODE_PSEUDO_LOCKED.

				 */

				continue;

			/*

			 * If CDP is active include peer domain's

			 * usage to ensure there is no overlap