Commit dab34475 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

rseq: Provide tracepoint wrappers for inline code 



Provide tracepoint wrappers for the upcoming RSEQ exit to user space inline
fast path, so that the header can be safely included by code which defines
actual trace points.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://patch.msgid.link/20251027084306.967114316@linutronix.de
parent 2fc0e4b4

include/linux/rseq_entry.h

+28 −0
Original line number Diff line number Diff line
@@ -5,6 +5,34 @@ 
#ifdef CONFIG_RSEQ

#include <linux/rseq.h>



#include <linux/tracepoint-defs.h>



#ifdef CONFIG_TRACEPOINTS

DECLARE_TRACEPOINT(rseq_update);

DECLARE_TRACEPOINT(rseq_ip_fixup);

void __rseq_trace_update(struct task_struct *t);

void __rseq_trace_ip_fixup(unsigned long ip, unsigned long start_ip,

			   unsigned long offset, unsigned long abort_ip);



static inline void rseq_trace_update(struct task_struct *t, struct rseq_ids *ids)

{

	if (tracepoint_enabled(rseq_update) && ids)

		__rseq_trace_update(t);

}



static inline void rseq_trace_ip_fixup(unsigned long ip, unsigned long start_ip,

				       unsigned long offset, unsigned long abort_ip)

{

	if (tracepoint_enabled(rseq_ip_fixup))

		__rseq_trace_ip_fixup(ip, start_ip, offset, abort_ip);

}



#else /* CONFIG_TRACEPOINT */

static inline void rseq_trace_update(struct task_struct *t, struct rseq_ids *ids) { }

static inline void rseq_trace_ip_fixup(unsigned long ip, unsigned long start_ip,

				       unsigned long offset, unsigned long abort_ip) { }

#endif /* !CONFIG_TRACEPOINT */



static __always_inline void rseq_note_user_irq_entry(void)

{

	if (IS_ENABLED(CONFIG_GENERIC_IRQ_ENTRY))

kernel/rseq.c

+18 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
#include <linux/sched.h>

#include <linux/uaccess.h>

#include <linux/syscalls.h>

#include <linux/rseq.h>

#include <linux/rseq_entry.h>

#include <linux/types.h>

#include <linux/ratelimit.h>

#include <asm/ptrace.h>
@@ -91,6 +91,23 @@ 
				  RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL | \

				  RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE)



#ifdef CONFIG_TRACEPOINTS

/*

 * Out of line, so the actual update functions can be in a header to be

 * inlined into the exit to user code.

 */

void __rseq_trace_update(struct task_struct *t)

{

	trace_rseq_update(t);

}



void __rseq_trace_ip_fixup(unsigned long ip, unsigned long start_ip,

			   unsigned long offset, unsigned long abort_ip)

{

	trace_rseq_ip_fixup(ip, start_ip, offset, abort_ip);

}

#endif /* CONFIG_TRACEPOINTS */



#ifdef CONFIG_DEBUG_RSEQ

static struct rseq *rseq_kernel_fields(struct task_struct *t)

{