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

Commit ab93eb82 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and... 

Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull RCU, perf, and scheduler fixes from Ingo Molnar.

The RCU fix is a revert for an optimization that could cause deadlocks.

One of the scheduler commits (164c33c6 "sched: Fix fork() error path
to not crash") is correct but not complete (some architectures like Tile
are not covered yet) - the resulting additional fixes are still WIP and
Ingo did not want to delay these pending fixes.  See this thread on
lkml:

  [PATCH] fork: fix error handling in dup_task()

The perf fixes are just trivial oneliners.

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Revert "rcu: Move PREEMPT_RCU preemption to switch_to() invocation"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf kvm: Fix segfault with report and mixed guestmount use
  perf kvm: Fix regression with guest machine creation
  perf script: Fix format regression due to libtraceevent merge
  ring-buffer: Fix accounting of entries when removing pages
  ring-buffer: Fix crash due to uninitialized new_pages list head

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  MAINTAINERS/sched: Update scheduler file pattern
  sched/nohz: Rewrite and fix load-avg computation -- again
  sched: Fix fork() error path to not crash
parents fdb1335a 40b3c43f 25c037d6 95c0d71d

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5910,7 +5910,7 @@ M: Ingo Molnar <mingo@redhat.com> 
M:	Peter Zijlstra <peterz@infradead.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core

S:	Maintained

F:	kernel/sched*

F:	kernel/sched/

F:	include/linux/sched.h



SCORE ARCHITECTURE

arch/um/drivers/mconsole_kern.c

+0 −1
Original line number Diff line number Diff line
@@ -705,7 +705,6 @@ static void stack_proc(void *arg) 
	struct task_struct *from = current, *to = arg;



	to->thread.saved_task = from;

	rcu_switch_from(from);

	switch_to(from, to, from);

}

include/linux/rcupdate.h

+0 −1
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ static inline int rcu_preempt_depth(void) 
/* Internal to kernel */

extern void rcu_sched_qs(int cpu);

extern void rcu_bh_qs(int cpu);

extern void rcu_preempt_note_context_switch(void);

extern void rcu_check_callbacks(int cpu, int user);

struct notifier_block;

extern void rcu_idle_enter(void);

include/linux/rcutiny.h

+6 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ static inline void kfree_call_rcu(struct rcu_head *head, 


#ifdef CONFIG_TINY_RCU



static inline void rcu_preempt_note_context_switch(void)

{

}



static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)

{

	*delta_jiffies = ULONG_MAX;
@@ -95,6 +99,7 @@ static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies) 


#else /* #ifdef CONFIG_TINY_RCU */



void rcu_preempt_note_context_switch(void);

int rcu_preempt_needs_cpu(void);



static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)
@@ -108,6 +113,7 @@ static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies) 
static inline void rcu_note_context_switch(int cpu)

{

	rcu_sched_qs(cpu);

	rcu_preempt_note_context_switch();

}



/*

include/linux/sched.h

+8 −10
Original line number Diff line number Diff line
@@ -1871,22 +1871,12 @@ static inline void rcu_copy_process(struct task_struct *p) 
	INIT_LIST_HEAD(&p->rcu_node_entry);

}



static inline void rcu_switch_from(struct task_struct *prev)

{

	if (prev->rcu_read_lock_nesting != 0)

		rcu_preempt_note_context_switch();

}



#else



static inline void rcu_copy_process(struct task_struct *p)

{

}



static inline void rcu_switch_from(struct task_struct *prev)

{

}



#endif



#ifdef CONFIG_SMP
@@ -1909,6 +1899,14 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p, 
}

#endif



#ifdef CONFIG_NO_HZ

void calc_load_enter_idle(void);

void calc_load_exit_idle(void);

#else

static inline void calc_load_enter_idle(void) { }

static inline void calc_load_exit_idle(void) { }

#endif /* CONFIG_NO_HZ */



#ifndef CONFIG_CPUMASK_OFFSTACK

static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)

{