bpf: Absolute timer support
Subsystems (3)
v2 cover bpf: Absolute timer support
Hi,
v2 of this series just adds the selftest support. Patch #1 is modified slightly (bpf.h modified under tools/include) so that the new selftest compiles properly. I also added suggested-by tag from Artem whom I forgot to add in the initial upstream post.
-Tero
PATCH v2 1/2 bpf: Add support for absolute value BPF timers
Add a new flag BPF_F_TIMER_ABS that can be passed to bpf_timer_start() to start an absolute value timer instead of the default relative value. This makes the timer expire at an exact point in time, instead of a time with latencies induced by both the BPF and timer subsystems.
---
v2:
- added suggested by from Artem
- copied the change from include/uapi/linux/bpf.h to tools/include also
include/uapi/linux/bpf.h | 15 +++++++++++++++ kernel/bpf/helpers.c | 11 +++++++++-- tools/include/uapi/linux/bpf.h | 15 +++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-)
include/uapi/linux/bpf.h +15 -0
@@ -4951,6 +4951,12 @@ union bpf_attr {* different maps if key/value layout matches across maps. * Every bpf_timer_set_callback() can have different callback_fn. * +* *flags* can be one of: +* +* **BPF_F_TIMER_ABS** +* Start the timer in absolute expire value instead of the +* default relative one. +* * Return * 0 on success. * **-EINVAL** if *timer* was not initialized with bpf_timer_init() earlier
@@ -7050,4 +7056,13 @@ struct bpf_core_relo { enum bpf_core_relo_kind kind; }; +/* +* Flags to control bpf_timer_start() behaviour. +* - BPF_F_TIMER_ABS: Timeout passed is absolute time, by default it is +* relative to current time. +*/ +enum { +BPF_F_TIMER_ABS = (1ULL <<0 ), +}; +#endif /* _UAPI__LINUX_BPF_H__ */
kernel/bpf/helpers.c +9 -2
@@ -1253,10 +1253,11 @@ BPF_CALL_3(bpf_timer_start, struct bpf_timer_kern *, timer, u64, nsecs, u64, fla {struct bpf_hrtimer *t;int ret =0 ; +enum hrtimer_mode mode;if (in_nmi ())return -EOPNOTSUPP ; -if (flags) +if (flags >BPF_F_TIMER_ABS )return -EINVAL ;__bpf_spin_lock_irqsave (&timer->lock); t = timer->timer;
@@ -1264,7 +1265,13 @@ BPF_CALL_3(bpf_timer_start, struct bpf_timer_kern *, timer, u64, nsecs, u64, fla ret = -EINVAL ; goto out; } -hrtimer_start (&t->timer,ns_to_ktime (nsecs),HRTIMER_MODE_REL_SOFT ); + +if (flags &BPF_F_TIMER_ABS ) + mode =HRTIMER_MODE_ABS_SOFT ; +else + mode =HRTIMER_MODE_REL_SOFT ; + +hrtimer_start (&t->timer,ns_to_ktime (nsecs), mode); out:__bpf_spin_unlock_irqrestore (&timer->lock);return ret;
tools/include/uapi/linux/bpf.h +15 -0
@@ -4951,6 +4951,12 @@ union bpf_attr {* different maps if key/value layout matches across maps. * Every bpf_timer_set_callback() can have different callback_fn. * +* *flags* can be one of: +* +* **BPF_F_TIMER_ABS** +* Start the timer in absolute expire value instead of the +* default relative one. +* * Return * 0 on success. * **-EINVAL** if *timer* was not initialized with bpf_timer_init() earlier
@@ -7050,4 +7056,13 @@ struct bpf_core_relo { enum bpf_core_relo_kind kind; }; +/* +* Flags to control bpf_timer_start() behaviour. +* - BPF_F_TIMER_ABS: Timeout passed is absolute time, by default it is +* relative to current time. +*/ +enum { +BPF_F_TIMER_ABS = (1ULL <<0 ), +}; +#endif /* _UAPI__LINUX_BPF_H__ */
Signature · 1 line
2.25.1
PATCH v2 2/2 selftests/bpf: Add absolute timer test
In reply to Tero KristoAdd test for the absolute BPF timer under the existing timer tests. This will run the timer two times with 1us expiration time, and then re-arm the timer at ~35s in the future. At the end, it is verified that the absolute timer expired exactly two times.
---
v2: new patch added
.../testing/selftests/bpf/prog_tests/timer.c | 3 ++ tools/testing/selftests/bpf/progs/timer.c | 45 +++++++++++++++++++ 2 files changed, 48 insertions(+)
tools/testing/selftests/bpf/prog_tests/timer.c +3 -0
@@ -29,6 +29,9 @@ static int timer(struct timer *timer_skel)/* check that timer_cb2() was executed twice */ ASSERT_EQ (timer_skel->bss->bss_data,10 ,"bss_data" ); +/* check that timer_cb3() was executed twice */ +ASSERT_EQ (timer_skel->bss->abs_data,12 ,"abs_data" ); +/* check that there were no errors in timer execution */ ASSERT_EQ (timer_skel->bss->err,0 ,"err" );
tools/testing/selftests/bpf/progs/timer.c +45 -0
55 lines not on this page · raw message
Signature · 1 line
2.25.1
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Thu, 2 Mar 2023 13:46:12 +0200 you wrote:
Hi,
v2 of this series just adds the selftest support. Patch #1 is modified slightly (
bpf.hmodified undertools/include) so that the new selftest compiles properly. I also added suggested-by tag from Artem whom I forgot to add in the initial upstream post.[...]
Here is the summary with links:
- [PATCHv2,1/2] bpf: Add support for absolute value BPF timers
https://git.kernel.org/bpf/bpf-next/c/f71f8530494b - [PATCHv2,2/2] selftests/bpf: Add absolute timer test https://git.kernel.org/bpf/bpf-next/c/944459e88b4f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html