nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

hrtimers: Make callback function pointer private

Browse source 
Make the struct hrtimer::function field private, to prevent users from
changing this field in an unsafe way. hrtimer_update_function() should be
used if the callback function needs to be changed.

Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/all/7d0e6e0c5c59a64a9bea940051aac05d750bc0c2.1738746927.git.namcao@linutronix.de
This commit is contained in:
Nam Cao 2025-02-05 11:55:16 +01:00 committed by Ingo Molnar
parent 87d82cff38
commit 04257da0c9
4 changed files with 8 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/hrtimer_types.h
View file

@ -39,7 +39,7 @@ enum hrtimer_restart {
struct hrtimer { struct hrtimer {
struct timerqueue_node node; struct timerqueue_node node;
ktime_t _softexpires; ktime_t _softexpires;
enum hrtimer_restart (*function)(struct hrtimer *); enum hrtimer_restart (*__private function)(struct hrtimer *);
struct hrtimer_clock_base *base; struct hrtimer_clock_base *base;
u8 state; u8 state;
u8 is_rel; u8 is_rel;

4
include/trace/events/timer.h
View file

@ -235,7 +235,7 @@ TRACE_EVENT(hrtimer_start,
TP_fast_assign( TP_fast_assign(
__entry->hrtimer = hrtimer; __entry->hrtimer = hrtimer;
__entry->function = hrtimer->function; __entry->function = ACCESS_PRIVATE(hrtimer, function);
__entry->expires = hrtimer_get_expires(hrtimer); __entry->expires = hrtimer_get_expires(hrtimer);
__entry->softexpires = hrtimer_get_softexpires(hrtimer); __entry->softexpires = hrtimer_get_softexpires(hrtimer);
__entry->mode = mode; __entry->mode = mode;
@ -271,7 +271,7 @@ TRACE_EVENT(hrtimer_expire_entry,
TP_fast_assign( TP_fast_assign(
__entry->hrtimer = hrtimer; __entry->hrtimer = hrtimer;
__entry->now = *now; __entry->now = *now;
__entry->function = hrtimer->function; __entry->function = ACCESS_PRIVATE(hrtimer, function);
), ),
TP_printk("hrtimer=%p function=%ps now=%llu", TP_printk("hrtimer=%p function=%ps now=%llu",

8
kernel/time/hrtimer.c
View file

@ -1316,7 +1316,7 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
struct hrtimer_clock_base *base; struct hrtimer_clock_base *base;
unsigned long flags; unsigned long flags;
if (WARN_ON_ONCE(!timer->function)) if (WARN_ON_ONCE(!ACCESS_PRIVATE(timer, function)))
return; return;
/* /*
* Check whether the HRTIMER_MODE_SOFT bit and hrtimer.is_soft * Check whether the HRTIMER_MODE_SOFT bit and hrtimer.is_soft
@ -1629,9 +1629,9 @@ static void __hrtimer_setup(struct hrtimer *timer,
timerqueue_init(&timer->node); timerqueue_init(&timer->node);
if (WARN_ON_ONCE(!function)) if (WARN_ON_ONCE(!function))
timer->function = hrtimer_dummy_timeout; ACCESS_PRIVATE(timer, function) = hrtimer_dummy_timeout;
else else
timer->function = function; ACCESS_PRIVATE(timer, function) = function;
} }
/** /**
@ -1743,7 +1743,7 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base,
raw_write_seqcount_barrier(&base->seq); raw_write_seqcount_barrier(&base->seq);
__remove_hrtimer(timer, base, HRTIMER_STATE_INACTIVE, 0); __remove_hrtimer(timer, base, HRTIMER_STATE_INACTIVE, 0);
fn = timer->function; fn = ACCESS_PRIVATE(timer, function);
/* /*
* Clear the 'is relative' flag for the TIME_LOW_RES case. If the * Clear the 'is relative' flag for the TIME_LOW_RES case. If the

2
kernel/time/timer_list.c
View file

@ -46,7 +46,7 @@ static void
print_timer(struct seq_file *m, struct hrtimer *taddr, struct hrtimer *timer, print_timer(struct seq_file *m, struct hrtimer *taddr, struct hrtimer *timer,
int idx, u64 now) int idx, u64 now)
{ {
SEQ_printf(m, " #%d: <%p>, %ps", idx, taddr, timer->function); SEQ_printf(m, " #%d: <%p>, %ps", idx, taddr, ACCESS_PRIVATE(timer, function));
SEQ_printf(m, ", S:%02x", timer->state); SEQ_printf(m, ", S:%02x", timer->state);
SEQ_printf(m, "\n"); SEQ_printf(m, "\n");
SEQ_printf(m, " # expires at %Lu-%Lu nsecs [in %Ld to %Ld nsecs]\n", SEQ_printf(m, " # expires at %Lu-%Lu nsecs [in %Ld to %Ld nsecs]\n",