diff options
| author | ian <ian@FreeBSD.org> | 2014-08-01 23:06:38 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-08-01 23:06:38 +0000 |
| commit | 9d9c9630befaea330c98a1be884688a09efd0547 (patch) | |
| tree | 8c809b150db28011ffa5fc0025b640645ec10cc2 /sys/arm/include | |
| parent | 0ad8d826c35ff14064f7d5eb2fc7702dc7099ada (diff) | |
| download | FreeBSD-src-9d9c9630befaea330c98a1be884688a09efd0547.zip FreeBSD-src-9d9c9630befaea330c98a1be884688a09efd0547.tar.gz | |
Use atomic_load/store_64() in the arm implementation of counter(9), and
remove the XXX comments about non-atomic access to the counters.
Diffstat (limited to 'sys/arm/include')
| -rw-r--r-- | sys/arm/include/counter.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/arm/include/counter.h b/sys/arm/include/counter.h index a6dfa8e..c4da91f 100644 --- a/sys/arm/include/counter.h +++ b/sys/arm/include/counter.h @@ -30,6 +30,7 @@ #define __MACHINE_COUNTER_H__ #include <sys/pcpu.h> +#include <machine/atomic.h> #ifdef INVARIANTS #include <sys/proc.h> #endif @@ -38,12 +39,13 @@ #define counter_exit() critical_exit() #ifdef IN_SUBR_COUNTER_C -/* XXXKIB non-atomic 64bit read */ + static inline uint64_t counter_u64_read_one(uint64_t *p, int cpu) { - return (*(uint64_t *)((char *)p + sizeof(struct pcpu) * cpu)); + return (atomic_load_64((uint64_t *)((char *)p + sizeof(struct pcpu) * + cpu))); } static inline uint64_t @@ -59,13 +61,12 @@ counter_u64_fetch_inline(uint64_t *p) return (r); } -/* XXXKIB non-atomic 64bit store, might interrupt increment */ static void counter_u64_zero_one_cpu(void *arg) { - *((uint64_t *)((char *)arg + sizeof(struct pcpu) * - PCPU_GET(cpuid))) = 0; + atomic_store_64((uint64_t *)((char *)arg + sizeof(struct pcpu) * + PCPU_GET(cpuid)), 0); } static inline void @@ -79,7 +80,7 @@ counter_u64_zero_inline(counter_u64_t c) #define counter_u64_add_protected(c, inc) do { \ CRITICAL_ASSERT(curthread); \ - *(uint64_t *)zpcpu_get(c) += (inc); \ + atomic_add_64((uint64_t *)zpcpu_get(c), (inc)); \ } while (0) static inline void |
