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

Commit 1595a964 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Greg Kroah-Hartman
Browse files

x86/tsc: Force inlining of cyc2ns bits 



commit 4907c68abd3f60f650f98d5a69d4ec77c0bde44f upstream.

Looking at the asm for native_sched_clock() I noticed we don't inline
enough. Mostly caused by sharing code with cyc2ns_read_begin(), which
we didn't used to do. So mark all that __force_inline to make it DTRT.

Fixes: 59eaef78 ("x86/tsc: Remodel cyc2ns to use seqcount_latch()")
Reported-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: hpa@zytor.com
Cc: eric.dumazet@gmail.com
Cc: bp@alien8.de
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20181011104019.695196158@infradead.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1220de22

arch/x86/kernel/tsc.c

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct cyc2ns { 


static DEFINE_PER_CPU_ALIGNED(struct cyc2ns, cyc2ns);



void cyc2ns_read_begin(struct cyc2ns_data *data)

void __always_inline cyc2ns_read_begin(struct cyc2ns_data *data)

{

	int seq, idx;
@@ -77,7 +77,7 @@ void cyc2ns_read_begin(struct cyc2ns_data *data) 
	} while (unlikely(seq != this_cpu_read(cyc2ns.seq.sequence)));

}



void cyc2ns_read_end(void)

void __always_inline cyc2ns_read_end(void)

{

	preempt_enable_notrace();

}
@@ -123,7 +123,7 @@ static void cyc2ns_init(int cpu) 
	seqcount_init(&c2n->seq);

}



static inline unsigned long long cycles_2_ns(unsigned long long cyc)

static __always_inline unsigned long long cycles_2_ns(unsigned long long cyc)

{

	struct cyc2ns_data data;

	unsigned long long ns;