Commit 8ec3bf5c authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by Martin KaFai Lau

bpf: Add bpf_guard_preempt() convenience macro

Add bpf_guard_preempt() macro that uses newly introduced
bpf_preempt_disable/enable() kfuncs to guard a critical section.
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20240424225529.16782-1-alexei.starovoitov@gmail.comSigned-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent 52578f7f
...@@ -397,6 +397,28 @@ l_true: \ ...@@ -397,6 +397,28 @@ l_true: \
, [as]"i"((dst_as << 16) | src_as)); , [as]"i"((dst_as << 16) | src_as));
#endif #endif
void bpf_preempt_disable(void) __weak __ksym;
void bpf_preempt_enable(void) __weak __ksym;
typedef struct {
} __bpf_preempt_t;
static inline __bpf_preempt_t __bpf_preempt_constructor(void)
{
__bpf_preempt_t ret = {};
bpf_preempt_disable();
return ret;
}
static inline void __bpf_preempt_destructor(__bpf_preempt_t *t)
{
bpf_preempt_enable();
}
#define bpf_guard_preempt() \
__bpf_preempt_t ___bpf_apply(preempt, __COUNTER__) \
__attribute__((__unused__, __cleanup__(__bpf_preempt_destructor))) = \
__bpf_preempt_constructor()
/* Description /* Description
* Assert that a conditional expression is true. * Assert that a conditional expression is true.
* Returns * Returns
......
...@@ -3,9 +3,7 @@ ...@@ -3,9 +3,7 @@
#include <bpf/bpf_helpers.h> #include <bpf/bpf_helpers.h>
#include <bpf/bpf_tracing.h> #include <bpf/bpf_tracing.h>
#include "bpf_misc.h" #include "bpf_misc.h"
#include "bpf_experimental.h"
void bpf_preempt_disable(void) __ksym;
void bpf_preempt_enable(void) __ksym;
SEC("?tc") SEC("?tc")
__failure __msg("1 bpf_preempt_enable is missing") __failure __msg("1 bpf_preempt_enable is missing")
...@@ -92,8 +90,7 @@ static __noinline void preempt_balance_subprog(void) ...@@ -92,8 +90,7 @@ static __noinline void preempt_balance_subprog(void)
SEC("?tc") SEC("?tc")
__success int preempt_balance(struct __sk_buff *ctx) __success int preempt_balance(struct __sk_buff *ctx)
{ {
bpf_preempt_disable(); bpf_guard_preempt();
bpf_preempt_enable();
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment