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

Commit d4e79615 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:

   - Make schedstats a runtime tunable (disabled by default) and
     optimize it via static keys.

     As most distributions enable CONFIG_SCHEDSTATS=y due to its
     instrumentation value, this is a nice performance enhancement.
     (Mel Gorman)

   - Implement 'simple waitqueues' (swait): these are just pure
     waitqueues without any of the more complex features of full-blown
     waitqueues (callbacks, wake flags, wake keys, etc.).  Simple
     waitqueues have less memory overhead and are faster.

     Use simple waitqueues in the RCU code (in 4 different places) and
     for handling KVM vCPU wakeups.

     (Peter Zijlstra, Daniel Wagner, Thomas Gleixner, Paul Gortmaker,
     Marcelo Tosatti)

   - sched/numa enhancements (Rik van Riel)

   - NOHZ performance enhancements (Rik van Riel)

   - Various sched/deadline enhancements (Steven Rostedt)

   - Various fixes (Peter Zijlstra)

   - ... and a number of other fixes, cleanups and smaller enhancements"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (29 commits)
  sched/cputime: Fix steal_account_process_tick() to always return jiffies
  sched/deadline: Remove dl_new from struct sched_dl_entity
  Revert "kbuild: Add option to turn incompatible pointer check into error"
  sched/deadline: Remove superfluous call to switched_to_dl()
  sched/debug: Fix preempt_disable_ip recording for preempt_disable()
  sched, time: Switch VIRT_CPU_ACCOUNTING_GEN to jiffy granularity
  time, acct: Drop irq save & restore from __acct_update_integrals()
  acct, time: Change indentation in __acct_update_integrals()
  sched, time: Remove non-power-of-two divides from __acct_update_integrals()
  sched/rt: Kick RT bandwidth timer immediately on start up
  sched/debug: Add deadline scheduler bandwidth ratio to /proc/sched_debug
  sched/debug: Move sched_domain_sysctl to debug.c
  sched/debug: Move the /sys/kernel/debug/sched_features file setup into debug.c
  sched/rt: Fix PI handling vs. sched_setscheduler()
  sched/core: Remove duplicated sched_group_set_shares() prototype
  sched/fair: Consolidate nohz CPU load update code
  sched/fair: Avoid using decay_load_missed() with a negative value
  sched/deadline: Always calculate end of period on sched_yield()
  sched/cgroup: Fix cgroup entity load tracking tear-down
  rcu: Use simple wait queues where possible in rcutree
  ...
parents d88bfe1d f9c904b7

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -3532,6 +3532,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	sched_debug	[KNL] Enables verbose scheduler debug messages.



	schedstats=	[KNL,X86] Enable or disable scheduled statistics.

			Allowed values are enable and disable. This feature

			incurs a small amount of overhead in the scheduler

			but is useful for debugging and performance tuning.



	skew_tick=	[KNL] Offset the periodic timer tick per cpu to mitigate

			xtime_lock contention on larger systems, and/or RCU lock

			contention on all systems with CONFIG_MAXSMP set.

Documentation/sysctl/kernel.txt

+8 −0
Original line number Diff line number Diff line
@@ -773,6 +773,14 @@ rtsig-nr shows the number of RT signals currently queued. 


==============================================================



sched_schedstats:



Enables/disables scheduler statistics. Enabling this feature

incurs a small amount of overhead in the scheduler but is

useful for debugging and performance tuning.



==============================================================



sg-big-buff:



This file shows the size of the generic SCSI (sg) buffer.

arch/arm/kvm/arm.c

+4 −4
Original line number Diff line number Diff line
@@ -506,18 +506,18 @@ static void kvm_arm_resume_guest(struct kvm *kvm) 
	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm) {

		wait_queue_head_t *wq = kvm_arch_vcpu_wq(vcpu);

		struct swait_queue_head *wq = kvm_arch_vcpu_wq(vcpu);



		vcpu->arch.pause = false;

		wake_up_interruptible(wq);

		swake_up(wq);

	}

}



static void vcpu_sleep(struct kvm_vcpu *vcpu)

{

	wait_queue_head_t *wq = kvm_arch_vcpu_wq(vcpu);

	struct swait_queue_head *wq = kvm_arch_vcpu_wq(vcpu);



	wait_event_interruptible(*wq, ((!vcpu->arch.power_off) &&

	swait_event_interruptible(*wq, ((!vcpu->arch.power_off) &&

				       (!vcpu->arch.pause)));

}

arch/arm/kvm/psci.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) 
{

	struct kvm *kvm = source_vcpu->kvm;

	struct kvm_vcpu *vcpu = NULL;

	wait_queue_head_t *wq;

	struct swait_queue_head *wq;

	unsigned long cpu_id;

	unsigned long context_id;

	phys_addr_t target_pc;
@@ -119,7 +119,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) 
	smp_mb();		/* Make sure the above is visible */



	wq = kvm_arch_vcpu_wq(vcpu);

	wake_up_interruptible(wq);

	swake_up(wq);



	return PSCI_RET_SUCCESS;

}

arch/mips/kvm/mips.c

+4 −4
Original line number Diff line number Diff line
@@ -445,8 +445,8 @@ int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, 


	dvcpu->arch.wait = 0;



	if (waitqueue_active(&dvcpu->wq))

		wake_up_interruptible(&dvcpu->wq);

	if (swait_active(&dvcpu->wq))

		swake_up(&dvcpu->wq);



	return 0;

}
@@ -1174,8 +1174,8 @@ static void kvm_mips_comparecount_func(unsigned long data) 
	kvm_mips_callbacks->queue_timer_int(vcpu);



	vcpu->arch.wait = 0;

	if (waitqueue_active(&vcpu->wq))

		wake_up_interruptible(&vcpu->wq);

	if (swait_active(&vcpu->wq))

		swake_up(&vcpu->wq);

}



/* low level hrtimer wake routine */