[src/trunk]: src/sys/external/bsd/common/linux linux/workqueue: Use atomic_lo...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7438032e63fe
branches:  trunk
changeset: 1028678:7438032e63fe
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:40:05 2021 +0000

description:
linux/workqueue: Use atomic_load/store.

diffstat:

 sys/external/bsd/common/linux/linux_work.c |  18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diffs (69 lines):

diff -r 9d6eb9dd82b9 -r 7438032e63fe sys/external/bsd/common/linux/linux_work.c
--- a/sys/external/bsd/common/linux/linux_work.c        Sun Dec 19 11:39:55 2021 +0000
+++ b/sys/external/bsd/common/linux/linux_work.c        Sun Dec 19 11:40:05 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_work.c,v 1.53 2021/12/19 11:38:03 riastradh Exp $        */
+/*     $NetBSD: linux_work.c,v 1.54 2021/12/19 11:40:05 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.53 2021/12/19 11:38:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.54 2021/12/19 11:40:05 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/atomic.h>
@@ -565,7 +565,7 @@
        KASSERT(work_queue(work) == wq);
        KASSERT(mutex_owned(&wq->wq_lock));
 
-       return work->work_owner & 1;
+       return atomic_load_relaxed(&work->work_owner) & 1;
 }
 
 /*
@@ -578,7 +578,7 @@
 work_pending(const struct work_struct *work)
 {
 
-       return work->work_owner & 1;
+       return atomic_load_relaxed(&work->work_owner) & 1;
 }
 
 /*
@@ -591,7 +591,8 @@
 work_queue(struct work_struct *work)
 {
 
-       return (struct workqueue_struct *)(work->work_owner & ~(uintptr_t)1);
+       return (struct workqueue_struct *)
+           (atomic_load_relaxed(&work->work_owner) & ~(uintptr_t)1);
 }
 
 /*
@@ -614,7 +615,7 @@
 
        owner = (uintptr_t)wq | 1;
        do {
-               owner0 = work->work_owner;
+               owner0 = atomic_load_relaxed(&work->work_owner);
                if (owner0 & 1) {
                        KASSERT((owner0 & ~(uintptr_t)1) == (uintptr_t)wq);
                        return false;
@@ -649,10 +650,11 @@
 
        /*
         * Non-interlocked r/m/w is safe here because nobody else can
-        * write to this while the claimed bit is setand the workqueue
+        * write to this while the claimed bit is set and the workqueue
         * lock is held.
         */
-       work->work_owner &= ~(uintptr_t)1;
+       atomic_store_relaxed(&work->work_owner,
+           atomic_load_relaxed(&work->work_owner) & ~(uintptr_t)1);
 }
 
 /*