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

Commit 66e1c94d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86/pti updates from Thomas Gleixner:
 "A mixed bag of fixes and updates for the ghosts which are hunting us.

  The scheduler fixes have been pulled into that branch to avoid
  conflicts.

   - A set of fixes to address a khread_parkme() race which caused lost
     wakeups and loss of state.

   - A deadlock fix for stop_machine() solved by moving the wakeups
     outside of the stopper_lock held region.

   - A set of Spectre V1 array access restrictions. The possible
     problematic spots were discuvered by Dan Carpenters new checks in
     smatch.

   - Removal of an unused file which was forgotten when the rest of that
     functionality was removed"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Remove unused file
  perf/x86/cstate: Fix possible Spectre-v1 indexing for pkg_msr
  perf/x86/msr: Fix possible Spectre-v1 indexing in the MSR driver
  perf/x86: Fix possible Spectre-v1 indexing for x86_pmu::event_map()
  perf/x86: Fix possible Spectre-v1 indexing for hw_perf_event cache_*
  perf/core: Fix possible Spectre-v1 indexing for ->aux_pages[]
  sched/autogroup: Fix possible Spectre-v1 indexing for sched_prio_to_weight[]
  sched/core: Fix possible Spectre-v1 indexing for sched_prio_to_weight[]
  sched/core: Introduce set_special_state()
  kthread, sched/wait: Fix kthread_parkme() completion issue
  kthread, sched/wait: Fix kthread_parkme() wait-loop
  sched/fair: Fix the update of blocked load when newly idle
  stop_machine, sched: Fix migrate_swap() vs. active_balance() deadlock
parents 86a4ac43 e0f6d1a5

arch/x86/entry/vdso/vdso32/vdso-fakesections.c

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include "../vdso-fakesections.c"

arch/x86/events/core.c

+7 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/cpu.h>

#include <linux/bitops.h>

#include <linux/device.h>

#include <linux/nospec.h>



#include <asm/apic.h>

#include <asm/stacktrace.h>
@@ -307,14 +308,17 @@ set_ext_hw_attr(struct hw_perf_event *hwc, struct perf_event *event) 
	cache_type = (config >> 0) & 0xff;

	if (cache_type >= PERF_COUNT_HW_CACHE_MAX)

		return -EINVAL;

	cache_type = array_index_nospec(cache_type, PERF_COUNT_HW_CACHE_MAX);



	cache_op = (config >>  8) & 0xff;

	if (cache_op >= PERF_COUNT_HW_CACHE_OP_MAX)

		return -EINVAL;

	cache_op = array_index_nospec(cache_op, PERF_COUNT_HW_CACHE_OP_MAX);



	cache_result = (config >> 16) & 0xff;

	if (cache_result >= PERF_COUNT_HW_CACHE_RESULT_MAX)

		return -EINVAL;

	cache_result = array_index_nospec(cache_result, PERF_COUNT_HW_CACHE_RESULT_MAX);



	val = hw_cache_event_ids[cache_type][cache_op][cache_result];
@@ -421,6 +425,8 @@ int x86_setup_perfctr(struct perf_event *event) 
	if (attr->config >= x86_pmu.max_events)

		return -EINVAL;



	attr->config = array_index_nospec((unsigned long)attr->config, x86_pmu.max_events);



	/*

	 * The generic map:

	 */

arch/x86/events/intel/cstate.c

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
#include <linux/module.h>

#include <linux/slab.h>

#include <linux/perf_event.h>

#include <linux/nospec.h>

#include <asm/cpu_device_id.h>

#include <asm/intel-family.h>

#include "../perf_event.h"
@@ -302,6 +303,7 @@ static int cstate_pmu_event_init(struct perf_event *event) 
	} else if (event->pmu == &cstate_pkg_pmu) {

		if (cfg >= PERF_CSTATE_PKG_EVENT_MAX)

			return -EINVAL;

		cfg = array_index_nospec((unsigned long)cfg, PERF_CSTATE_PKG_EVENT_MAX);

		if (!pkg_msr[cfg].attr)

			return -EINVAL;

		event->hw.event_base = pkg_msr[cfg].msr;

arch/x86/events/msr.c

+6 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/perf_event.h>

#include <linux/nospec.h>

#include <asm/intel-family.h>



enum perf_msr_id {
@@ -158,9 +159,6 @@ static int msr_event_init(struct perf_event *event) 
	if (event->attr.type != event->pmu->type)

		return -ENOENT;



	if (cfg >= PERF_MSR_EVENT_MAX)

		return -EINVAL;



	/* unsupported modes and filters */

	if (event->attr.exclude_user   ||

	    event->attr.exclude_kernel ||
@@ -171,6 +169,11 @@ static int msr_event_init(struct perf_event *event) 
	    event->attr.sample_period) /* no sampling */

		return -EINVAL;



	if (cfg >= PERF_MSR_EVENT_MAX)

		return -EINVAL;



	cfg = array_index_nospec((unsigned long)cfg, PERF_MSR_EVENT_MAX);



	if (!msr[cfg].attr)

		return -EINVAL;

include/linux/kthread.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ void *kthread_probe_data(struct task_struct *k); 
int kthread_park(struct task_struct *k);

void kthread_unpark(struct task_struct *k);

void kthread_parkme(void);

void kthread_park_complete(struct task_struct *k);



int kthreadd(void *unused);

extern struct task_struct *kthreadd_task;