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

Commit 86c6a2fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull scheduler updates from Ingo Molnar:
 "The main changes in this cycle are:

   - 'Nested Sleep Debugging', activated when CONFIG_DEBUG_ATOMIC_SLEEP=y.

     This instruments might_sleep() checks to catch places that nest
     blocking primitives - such as mutex usage in a wait loop.  Such
     bugs can result in hard to debug races/hangs.

     Another category of invalid nesting that this facility will detect
     is the calling of blocking functions from within schedule() ->
     sched_submit_work() -> blk_schedule_flush_plug().

     There's some potential for false positives (if secondary blocking
     primitives themselves are not ready yet for this facility), but the
     kernel will warn once about such bugs per bootup, so the warning
     isn't much of a nuisance.

     This feature comes with a number of fixes, for problems uncovered
     with it, so no messages are expected normally.

   - Another round of sched/numa optimizations and refinements, for
     CONFIG_NUMA_BALANCING=y.

   - Another round of sched/dl fixes and refinements.

  Plus various smaller fixes and cleanups"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (54 commits)
  sched: Add missing rcu protection to wake_up_all_idle_cpus
  sched/deadline: Introduce start_hrtick_dl() for !CONFIG_SCHED_HRTICK
  sched/numa: Init numa balancing fields of init_task
  sched/deadline: Remove unnecessary definitions in cpudeadline.h
  sched/cpupri: Remove unnecessary definitions in cpupri.h
  sched/deadline: Fix rq->dl.pushable_tasks bug in push_dl_task()
  sched/fair: Fix stale overloaded status in the busiest group finding logic
  sched: Move p->nr_cpus_allowed check to select_task_rq()
  sched/completion: Document when to use wait_for_completion_io_*()
  sched: Update comments about CLONE_NEWUTS and CLONE_NEWIPC
  sched/fair: Kill task_struct::numa_entry and numa_group::task_list
  sched: Refactor task_struct to use numa_faults instead of numa_* pointers
  sched/deadline: Don't check CONFIG_SMP in switched_from_dl()
  sched/deadline: Reschedule from switched_from_dl() after a successful pull
  sched/deadline: Push task away if the deadline is equal to curr during wakeup
  sched/deadline: Add deadline rq status print
  sched/deadline: Fix artificial overrun introduced by yield_task_dl()
  sched/rt: Clean up check_preempt_equal_prio()
  sched/core: Use dl_bw_of() under rcu_read_lock_sched()
  sched: Check if we got a shallowest_idle_cpu before searching for least_loaded_cpu
  ...
parents bee2782f fd7de1e8

arch/x86/include/asm/preempt.h

+0 −3
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ static __always_inline void preempt_count_set(int pc) 
/*

 * must be macros to avoid header recursion hell

 */

#define task_preempt_count(p) \

	(task_thread_info(p)->saved_preempt_count & ~PREEMPT_NEED_RESCHED)



#define init_task_preempt_count(p) do { \

	task_thread_info(p)->saved_preempt_count = PREEMPT_DISABLED; \

} while (0)

drivers/tty/n_tty.c

+5 −12
Original line number Diff line number Diff line
@@ -2123,7 +2123,7 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, 
{

	struct n_tty_data *ldata = tty->disc_data;

	unsigned char __user *b = buf;

	DECLARE_WAITQUEUE(wait, current);

	DEFINE_WAIT_FUNC(wait, woken_wake_function);

	int c;

	int minimum, time;

	ssize_t retval = 0;
@@ -2186,10 +2186,6 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, 
			nr--;

			break;

		}

		/* This statement must be first before checking for input

		   so that any interrupt will set the state back to

		   TASK_RUNNING. */

		set_current_state(TASK_INTERRUPTIBLE);



		if (((minimum - (b - buf)) < ldata->minimum_to_wake) &&

		    ((minimum - (b - buf)) >= 1))
@@ -2220,13 +2216,13 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, 
				n_tty_set_room(tty);

				up_read(&tty->termios_rwsem);



				timeout = schedule_timeout(timeout);

				timeout = wait_woken(&wait, TASK_INTERRUPTIBLE,

						     timeout);



				down_read(&tty->termios_rwsem);

				continue;

			}

		}

		__set_current_state(TASK_RUNNING);



		/* Deal with packet mode. */

		if (packet && b == buf) {
@@ -2273,7 +2269,6 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, 


	mutex_unlock(&ldata->atomic_read_lock);



	__set_current_state(TASK_RUNNING);

	if (b - buf)

		retval = b - buf;
@@ -2306,7 +2301,7 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file, 
			   const unsigned char *buf, size_t nr)

{

	const unsigned char *b = buf;

	DECLARE_WAITQUEUE(wait, current);

	DEFINE_WAIT_FUNC(wait, woken_wake_function);

	int c;

	ssize_t retval = 0;
@@ -2324,7 +2319,6 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file, 


	add_wait_queue(&tty->write_wait, &wait);

	while (1) {

		set_current_state(TASK_INTERRUPTIBLE);

		if (signal_pending(current)) {

			retval = -ERESTARTSYS;

			break;
@@ -2378,12 +2372,11 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file, 
		}

		up_read(&tty->termios_rwsem);



		schedule();

		wait_woken(&wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);



		down_read(&tty->termios_rwsem);

	}

break_out:

	__set_current_state(TASK_RUNNING);

	remove_wait_queue(&tty->write_wait, &wait);

	if (b - buf != nr && tty->fasync)

		set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);

fs/notify/inotify/inotify_user.c

+4 −5
Original line number Diff line number Diff line
@@ -227,14 +227,13 @@ static ssize_t inotify_read(struct file *file, char __user *buf, 
	struct fsnotify_event *kevent;

	char __user *start;

	int ret;

	DEFINE_WAIT(wait);

	DEFINE_WAIT_FUNC(wait, woken_wake_function);



	start = buf;

	group = file->private_data;



	add_wait_queue(&group->notification_waitq, &wait);

	while (1) {

		prepare_to_wait(&group->notification_waitq, &wait, TASK_INTERRUPTIBLE);



		mutex_lock(&group->notification_mutex);

		kevent = get_one_event(group, count);

		mutex_unlock(&group->notification_mutex);
@@ -264,10 +263,10 @@ static ssize_t inotify_read(struct file *file, char __user *buf, 
		if (start != buf)

			break;



		schedule();

		wait_woken(&wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);

	}

	remove_wait_queue(&group->notification_waitq, &wait);



	finish_wait(&group->notification_waitq, &wait);

	if (start != buf && ret != -EFAULT)

		ret = buf - start;

	return ret;

include/asm-generic/preempt.h

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ static __always_inline void preempt_count_set(int pc) 
/*

 * must be macros to avoid header recursion hell

 */

#define task_preempt_count(p) \

	(task_thread_info(p)->preempt_count & ~PREEMPT_NEED_RESCHED)



#define init_task_preempt_count(p) do { \

	task_thread_info(p)->preempt_count = PREEMPT_DISABLED; \

} while (0)

include/linux/freezer.h

+0 −50
Original line number Diff line number Diff line
@@ -246,15 +246,6 @@ static inline int freezable_schedule_hrtimeout_range(ktime_t *expires, 
 * defined in <linux/wait.h>

 */



#define wait_event_freezekillable(wq, condition)			\

({									\

	int __retval;							\

	freezer_do_not_count();						\

	__retval = wait_event_killable(wq, (condition));		\

	freezer_count();						\

	__retval;							\

})



/* DO NOT ADD ANY NEW CALLERS OF THIS FUNCTION */

#define wait_event_freezekillable_unsafe(wq, condition)			\

({									\
@@ -265,35 +256,6 @@ static inline int freezable_schedule_hrtimeout_range(ktime_t *expires, 
	__retval;							\

})



#define wait_event_freezable(wq, condition)				\

({									\

	int __retval;							\

	freezer_do_not_count();						\

	__retval = wait_event_interruptible(wq, (condition));		\

	freezer_count();						\

	__retval;							\

})



#define wait_event_freezable_timeout(wq, condition, timeout)		\

({									\

	long __retval = timeout;					\

	freezer_do_not_count();						\

	__retval = wait_event_interruptible_timeout(wq,	(condition),	\

				__retval);				\

	freezer_count();						\

	__retval;							\

})



#define wait_event_freezable_exclusive(wq, condition)			\

({									\

	int __retval;							\

	freezer_do_not_count();						\

	__retval = wait_event_interruptible_exclusive(wq, condition);	\

	freezer_count();						\

	__retval;							\

})





#else /* !CONFIG_FREEZER */

static inline bool frozen(struct task_struct *p) { return false; }

static inline bool freezing(struct task_struct *p) { return false; }
@@ -331,18 +293,6 @@ static inline void set_freezable(void) {} 
#define freezable_schedule_hrtimeout_range(expires, delta, mode)	\

	schedule_hrtimeout_range(expires, delta, mode)



#define wait_event_freezable(wq, condition)				\

		wait_event_interruptible(wq, condition)



#define wait_event_freezable_timeout(wq, condition, timeout)		\

		wait_event_interruptible_timeout(wq, condition, timeout)



#define wait_event_freezable_exclusive(wq, condition)			\

		wait_event_interruptible_exclusive(wq, condition)



#define wait_event_freezekillable(wq, condition)		\

		wait_event_killable(wq, condition)



#define wait_event_freezekillable_unsafe(wq, condition)			\

		wait_event_killable(wq, condition)