diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-25 02:09:44 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-25 13:59:16 -0400 |
| commit | 9799b119c34d7be1ee96d143209cfe5fc543d92a (patch) | |
| tree | f973e4d166a98c57d7ddb32b15eed16a7382278e /include/linux | |
| parent | bd9e0153342c51390ec655b4e78eda1aa1c32a84 (diff) | |
Update bcachefs sources to 0d63ed13ea3d closures: Fix race in closure_sync()v1.3
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/atomic.h | 6 | ||||
| -rw-r--r-- | include/linux/closure.h | 12 | ||||
| -rw-r--r-- | include/linux/sched.h | 8 |
3 files changed, 23 insertions, 3 deletions
diff --git a/include/linux/atomic.h b/include/linux/atomic.h index f4d047c1..f1464cf3 100644 --- a/include/linux/atomic.h +++ b/include/linux/atomic.h @@ -47,6 +47,7 @@ typedef struct { #define smp_rmb() cmm_smp_rmb() #define smp_mb() cmm_smp_mb() #define smp_read_barrier_depends() cmm_smp_read_barrier_depends() +#define smp_acquire__after_ctrl_dep() cmm_smp_mb() #else /* C11_ATOMICS */ @@ -205,6 +206,11 @@ static inline i_type a_type##_dec_return(a_type##_t *v) \ return __ATOMIC_DEC_RETURN(&v->counter); \ } \ \ +static inline i_type a_type##_dec_return_release(a_type##_t *v) \ +{ \ + return __ATOMIC_SUB_RETURN_RELEASE(1, &v->counter); \ +} \ + \ static inline void a_type##_inc(a_type##_t *v) \ { \ __ATOMIC_INC(&v->counter); \ diff --git a/include/linux/closure.h b/include/linux/closure.h index 722a586b..de7bb47d 100644 --- a/include/linux/closure.h +++ b/include/linux/closure.h @@ -154,6 +154,7 @@ struct closure { struct closure *parent; atomic_t remaining; + bool closure_get_happened; #ifdef CONFIG_DEBUG_CLOSURES #define CLOSURE_MAGIC_DEAD 0xc054dead @@ -185,7 +186,11 @@ static inline unsigned closure_nr_remaining(struct closure *cl) */ static inline void closure_sync(struct closure *cl) { - if (closure_nr_remaining(cl) != 1) +#ifdef CONFIG_DEBUG_CLOSURES + BUG_ON(closure_nr_remaining(cl) != 1 && !cl->closure_get_happened); +#endif + + if (cl->closure_get_happened) __closure_sync(cl); } @@ -233,8 +238,6 @@ static inline void set_closure_fn(struct closure *cl, closure_fn *fn, closure_set_ip(cl); cl->fn = fn; cl->wq = wq; - /* between atomic_dec() in closure_put() */ - smp_mb__before_atomic(); } static inline void closure_queue(struct closure *cl) @@ -259,6 +262,8 @@ static inline void closure_queue(struct closure *cl) */ static inline void closure_get(struct closure *cl) { + cl->closure_get_happened = true; + #ifdef CONFIG_DEBUG_CLOSURES BUG_ON((atomic_inc_return(&cl->remaining) & CLOSURE_REMAINING_MASK) <= 1); @@ -281,6 +286,7 @@ static inline void closure_init(struct closure *cl, struct closure *parent) closure_get(parent); atomic_set(&cl->remaining, CLOSURE_REMAINING_INITIALIZER); + cl->closure_get_happened = false; closure_debug_create(cl); closure_set_ip(cl); diff --git a/include/linux/sched.h b/include/linux/sched.h index 825eea5c..7afb6d54 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -151,6 +151,14 @@ static inline u64 ktime_get_seconds(void) return ts.tv_sec; } +static inline u64 ktime_get_real_ns(void) +{ + struct timespec ts; + + clock_gettime(CLOCK_REALTIME, &ts); + return timespec_to_ns(&ts); +} + static inline u64 ktime_get_real_seconds(void) { struct timespec ts; |