Commit af1e56b7 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

context_tracking: Make guest_enter/exit() .noinstr ready 



Force inlining of the helpers and mark the instrumentable parts
accordingly.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarAlexandre Chartre <alexandre.chartre@oracle.com>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200505134341.672545766@linutronix.de
parent c86e9b98

include/linux/context_tracking.h

+16 −5
Original line number Diff line number Diff line
@@ -101,12 +101,14 @@ static inline void context_tracking_init(void) { } 


#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN

/* must be called with irqs disabled */

static inline void guest_enter_irqoff(void)

static __always_inline void guest_enter_irqoff(void)

{

	instrumentation_begin();

	if (vtime_accounting_enabled_this_cpu())

		vtime_guest_enter(current);

	else

		current->flags |= PF_VCPU;

	instrumentation_end();



	if (context_tracking_enabled())

		__context_tracking_enter(CONTEXT_GUEST);
@@ -118,39 +120,48 @@ static inline void guest_enter_irqoff(void) 
	 * one time slice). Lets treat guest mode as quiescent state, just like

	 * we do with user-mode execution.

	 */

	if (!context_tracking_enabled_this_cpu())

	if (!context_tracking_enabled_this_cpu()) {

		instrumentation_begin();

		rcu_virt_note_context_switch(smp_processor_id());

		instrumentation_end();

	}

}



static inline void guest_exit_irqoff(void)

static __always_inline void guest_exit_irqoff(void)

{

	if (context_tracking_enabled())

		__context_tracking_exit(CONTEXT_GUEST);



	instrumentation_begin();

	if (vtime_accounting_enabled_this_cpu())

		vtime_guest_exit(current);

	else

		current->flags &= ~PF_VCPU;

	instrumentation_end();

}



#else

static inline void guest_enter_irqoff(void)

static __always_inline void guest_enter_irqoff(void)

{

	/*

	 * This is running in ioctl context so its safe

	 * to assume that it's the stime pending cputime

	 * to flush.

	 */

	instrumentation_begin();

	vtime_account_kernel(current);

	current->flags |= PF_VCPU;

	rcu_virt_note_context_switch(smp_processor_id());

	instrumentation_end();

}



static inline void guest_exit_irqoff(void)

static __always_inline void guest_exit_irqoff(void)

{

	instrumentation_begin();

	/* Flush the guest cputime we spent on the guest */

	vtime_account_kernel(current);

	current->flags &= ~PF_VCPU;

	instrumentation_end();

}

#endif /* CONFIG_VIRT_CPU_ACCOUNTING_GEN */