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

Commit 4db88eb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull timer fixes from Thomas Gleixner:
 - Fix inconstinant clock usage in virtual time accounting
 - Fix a build error in KVM caused by the NOHZ work
 - Remove a pointless timekeeping duty assignment which breaks NOHZ
 - Use a proper notifier return value to avoid random behaviour

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tick: Remove useless timekeeping duty attribution to broadcast source
  nohz: Fix notifier return val that enforce timekeeping
  kvm: Move guest entry/exit APIs to context_tracking
  vtime: Use consistent clocks among nohz accounting
parents 53d5defc f5d00c1f

include/linux/context_tracking.h

+35 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/sched.h>

#include <linux/percpu.h>

#include <linux/vtime.h>

#include <asm/ptrace.h>



struct context_tracking {
@@ -19,6 +20,26 @@ struct context_tracking { 
	} state;

};



static inline void __guest_enter(void)

{

	/*

	 * This is running in ioctl context so we can avoid

	 * the call to vtime_account() with its unnecessary idle check.

	 */

	vtime_account_system(current);

	current->flags |= PF_VCPU;

}



static inline void __guest_exit(void)

{

	/*

	 * This is running in ioctl context so we can avoid

	 * the call to vtime_account() with its unnecessary idle check.

	 */

	vtime_account_system(current);

	current->flags &= ~PF_VCPU;

}



#ifdef CONFIG_CONTEXT_TRACKING

DECLARE_PER_CPU(struct context_tracking, context_tracking);
@@ -35,6 +56,9 @@ static inline bool context_tracking_active(void) 
extern void user_enter(void);

extern void user_exit(void);



extern void guest_enter(void);

extern void guest_exit(void);



static inline enum ctx_state exception_enter(void)

{

	enum ctx_state prev_ctx;
@@ -57,6 +81,17 @@ extern void context_tracking_task_switch(struct task_struct *prev, 
static inline bool context_tracking_in_user(void) { return false; }

static inline void user_enter(void) { }

static inline void user_exit(void) { }



static inline void guest_enter(void)

{

	__guest_enter();

}



static inline void guest_exit(void)

{

	__guest_exit();

}



static inline enum ctx_state exception_enter(void) { return 0; }

static inline void exception_exit(enum ctx_state prev_ctx) { }

static inline void context_tracking_task_switch(struct task_struct *prev,

include/linux/kvm_host.h

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

#include <linux/err.h>

#include <linux/irqflags.h>

#include <linux/context_tracking.h>

#include <asm/signal.h>



#include <linux/kvm.h>
@@ -760,42 +761,6 @@ static inline int kvm_iommu_unmap_guest(struct kvm *kvm) 
}

#endif



static inline void __guest_enter(void)

{

	/*

	 * This is running in ioctl context so we can avoid

	 * the call to vtime_account() with its unnecessary idle check.

	 */

	vtime_account_system(current);

	current->flags |= PF_VCPU;

}



static inline void __guest_exit(void)

{

	/*

	 * This is running in ioctl context so we can avoid

	 * the call to vtime_account() with its unnecessary idle check.

	 */

	vtime_account_system(current);

	current->flags &= ~PF_VCPU;

}



#ifdef CONFIG_CONTEXT_TRACKING

extern void guest_enter(void);

extern void guest_exit(void);



#else /* !CONFIG_CONTEXT_TRACKING */

static inline void guest_enter(void)

{

	__guest_enter();

}



static inline void guest_exit(void)

{

	__guest_exit();

}

#endif /* !CONFIG_CONTEXT_TRACKING */



static inline void kvm_guest_enter(void)

{

	unsigned long flags;

include/linux/vtime.h

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static inline void vtime_user_exit(struct task_struct *tsk) 
}

extern void vtime_guest_enter(struct task_struct *tsk);

extern void vtime_guest_exit(struct task_struct *tsk);

extern void vtime_init_idle(struct task_struct *tsk);

extern void vtime_init_idle(struct task_struct *tsk, int cpu);

#else

static inline void vtime_account_irq_exit(struct task_struct *tsk)

{
@@ -45,7 +45,7 @@ static inline void vtime_user_enter(struct task_struct *tsk) { } 
static inline void vtime_user_exit(struct task_struct *tsk) { }

static inline void vtime_guest_enter(struct task_struct *tsk) { }

static inline void vtime_guest_exit(struct task_struct *tsk) { }

static inline void vtime_init_idle(struct task_struct *tsk) { }

static inline void vtime_init_idle(struct task_struct *tsk, int cpu) { }

#endif



#ifdef CONFIG_IRQ_TIME_ACCOUNTING

kernel/context_tracking.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include <linux/context_tracking.h>

#include <linux/kvm_host.h>

#include <linux/rcupdate.h>

#include <linux/sched.h>

#include <linux/hardirq.h>

kernel/sched/core.c

+1 −1
Original line number Diff line number Diff line
@@ -4745,7 +4745,7 @@ void __cpuinit init_idle(struct task_struct *idle, int cpu) 
	 */

	idle->sched_class = &idle_sched_class;

	ftrace_graph_init_idle_task(idle, cpu);

	vtime_init_idle(idle);

	vtime_init_idle(idle, cpu);

#if defined(CONFIG_SMP)

	sprintf(idle->comm, "%s/%d", INIT_TASK_COMM, cpu);

#endif