diff options
| -rw-r--r-- | sys/arm/include/counter.h | 18 | ||||
| -rw-r--r-- | sys/arm64/include/counter.h | 20 | ||||
| -rw-r--r-- | sys/kern/subr_sfbuf.c | 1 |
3 files changed, 12 insertions, 27 deletions
diff --git a/sys/arm/include/counter.h b/sys/arm/include/counter.h index c4da91f..950516e 100644 --- a/sys/arm/include/counter.h +++ b/sys/arm/include/counter.h @@ -31,12 +31,9 @@ #include <sys/pcpu.h> #include <machine/atomic.h> -#ifdef INVARIANTS -#include <sys/proc.h> -#endif -#define counter_enter() critical_enter() -#define counter_exit() critical_exit() +#define counter_enter() do {} while (0) +#define counter_exit() do {} while (0) #ifdef IN_SUBR_COUNTER_C @@ -55,7 +52,7 @@ counter_u64_fetch_inline(uint64_t *p) int i; r = 0; - for (i = 0; i < mp_ncpus; i++) + CPU_FOREACH(i) r += counter_u64_read_one((uint64_t *)p, i); return (r); @@ -78,18 +75,13 @@ counter_u64_zero_inline(counter_u64_t c) } #endif -#define counter_u64_add_protected(c, inc) do { \ - CRITICAL_ASSERT(curthread); \ - atomic_add_64((uint64_t *)zpcpu_get(c), (inc)); \ -} while (0) +#define counter_u64_add_protected(c, inc) counter_u64_add(c, inc) static inline void counter_u64_add(counter_u64_t c, int64_t inc) { - counter_enter(); - counter_u64_add_protected(c, inc); - counter_exit(); + atomic_add_64((uint64_t *)zpcpu_get(c), inc); } #endif /* ! __MACHINE_COUNTER_H__ */ diff --git a/sys/arm64/include/counter.h b/sys/arm64/include/counter.h index 9d56cce..cfa521f 100644 --- a/sys/arm64/include/counter.h +++ b/sys/arm64/include/counter.h @@ -30,12 +30,10 @@ #define _MACHINE_COUNTER_H_ #include <sys/pcpu.h> -#ifdef INVARIANTS -#include <sys/proc.h> -#endif +#include <machine/atomic.h> -#define counter_enter() critical_enter() -#define counter_exit() critical_exit() +#define counter_enter() do {} while (0) +#define counter_exit() do {} while (0) #ifdef IN_SUBR_COUNTER_C static inline uint64_t @@ -52,13 +50,12 @@ counter_u64_fetch_inline(uint64_t *p) int i; r = 0; - for (i = 0; i < mp_ncpus; i++) + CPU_FOREACH(i) r += counter_u64_read_one((uint64_t *)p, i); return (r); } -/* XXXKIB might interrupt increment */ static void counter_u64_zero_one_cpu(void *arg) { @@ -76,18 +73,13 @@ counter_u64_zero_inline(counter_u64_t c) } #endif -#define counter_u64_add_protected(c, inc) do { \ - CRITICAL_ASSERT(curthread); \ - *(uint64_t *)zpcpu_get(c) += (inc); \ -} while (0) +#define counter_u64_add_protected(c, inc) counter_u64_add(c, inc) static inline void counter_u64_add(counter_u64_t c, int64_t inc) { - counter_enter(); - counter_u64_add_protected(c, inc); - counter_exit(); + atomic_add_64((uint64_t *)zpcpu_get(c), inc); } #endif /* ! _MACHINE_COUNTER_H_ */ diff --git a/sys/kern/subr_sfbuf.c b/sys/kern/subr_sfbuf.c index 707ace2..fa1aa42 100644 --- a/sys/kern/subr_sfbuf.c +++ b/sys/kern/subr_sfbuf.c @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/proc.h> #include <sys/sf_buf.h> #include <sys/smp.h> #include <sys/sysctl.h> |
