Skip to contentSkip to conversation

lockable: Replace locks with lock guard macros

PATCH Applied Simran Singhal 7 participants 9 messages Apr 2, 2020 – Apr 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 lockable: Replace locks with lock guard macros

Replace manual lock()/unlock() calls with lock guard macros (QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD).

---
Changes in v2:
-Drop changes in file hw/rdma/rdma_utils.c

 hw/hyperv/hyperv.c     | 15 ++++++-------
 hw/rdma/rdma_backend.c | 50 +++++++++++++++++++++---------------------
 hw/rdma/rdma_rm.c      |  3 +--
 3 files changed, 33 insertions(+), 35 deletions(-)
hw/hyperv/hyperv.c +7 -8
index 8ca3706f5b..4ddafe1de1 100644
@@ -15,6 +15,7 @@
 #include "sysemu/kvm.h"
 #include "qemu/bitops.h"
 #include "qemu/error-report.h"
+#include "qemu/lockable.h"
 #include "qemu/queue.h"
 #include "qemu/rcu.h"
 #include "qemu/rcu_queue.h"
@@ -491,7 +492,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
     int ret;
     MsgHandler *mh;
 
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);
     QLIST_FOREACH(mh, &msg_handlers, link) {
         if (mh->conn_id == conn_id) {
             if (handler) {
@@ -501,7 +502,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
                 g_free_rcu(mh, rcu);
                 ret = 0;
             }
-            goto unlock;
+            return ret;
         }
     }
 
@@ -515,8 +516,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
     } else {
         ret = -ENOENT;
     }
-unlock:
-    qemu_mutex_unlock(&handlers_mutex);
+
     return ret;
 }
 
@@ -565,7 +565,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
     int ret;
     EventFlagHandler *handler;
 
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);
     QLIST_FOREACH(handler, &event_flag_handlers, link) {
         if (handler->conn_id == conn_id) {
             if (notifier) {
@@ -575,7 +575,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
                 g_free_rcu(handler, rcu);
                 ret = 0;
             }
-            goto unlock;
+            return ret;
         }
     }
 
@@ -588,8 +588,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
     } else {
         ret = -ENOENT;
     }
-unlock:
-    qemu_mutex_unlock(&handlers_mutex);
+
     return ret;
 }
 
hw/rdma/rdma_backend.c +25 -25

61 lines not on this page · raw message

hw/rdma/rdma_rm.c +1 -2
index 7e9ea283c9..60957f88db 100644
@@ -147,14 +147,13 @@ static inline void rdma_res_tbl_dealloc(RdmaRmResTbl *tbl, uint32_t handle)
 {
     trace_rdma_res_tbl_dealloc(tbl->name, handle);
 
-    qemu_mutex_lock(&tbl->lock);
+    QEMU_LOCK_GUARD(&tbl->lock);
 
     if (handle < tbl->tbl_sz) {
         clear_bit(handle, tbl->bitmap);
         tbl->used--;
     }
 
-    qemu_mutex_unlock(&tbl->lock);
 }
 
 int rdma_rm_alloc_pd(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev,
Signature · 1 line
2.17.1
#1 lore raw
Patchew URL: https://patchew.org/QEMU/20200402065035.GA15477@simran-Inspiron-5558/

Patchew URL: https://patchew.org/QEMU/20200402065035.GA15477@simran-Inspiron-5558/

Hi,

This series failed the asan build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1 === TEST SCRIPT END ===

  CC      x86_64-softmmu/hw/i386/pc_piix.o
  CC      x86_64-softmmu/hw/i386/pc_q35.o
  CC      x86_64-softmmu/hw/i386/microvm.o
/tmp/qemu-test/src/hw/hyperv/hyperv.c:495:5: error: unused variable 'qemu_lockable_auto__COUNTER__' [-Werror,-Wunused-variable]
    QEMU_LOCK_GUARD(&handlers_mutex);
    ^

/tmp/qemu-test/src/include/qemu/lockable.h:173:29: note: expanded from macro 'QEMU_LOCK_GUARD'
---
<scratch space>:24:1: note: expanded from here
qemu_lockable_auto__COUNTER__
^
/tmp/qemu-test/src/hw/hyperv/hyperv.c:568:5: error: unused variable 'qemu_lockable_auto__COUNTER__' [-Werror,-Wunused-variable]

    QEMU_LOCK_GUARD(&handlers_mutex);
    ^

/tmp/qemu-test/src/include/qemu/lockable.h:173:29: note: expanded from macro 'QEMU_LOCK_GUARD'
---
qemu_lockable_auto__COUNTER__
^
2 errors generated.
make[1]: *** [/tmp/qemu-test/src/rules.mak:69: hw/hyperv/hyperv.o] Error 1
make[1]: *** Waiting for unfinished jobs....
/tmp/qemu-test/src/hw/rdma/rdma_rm.c:150:5: error: unused variable 'qemu_lockable_auto__COUNTER__' [-Werror,-Wunused-variable]

    QEMU_LOCK_GUARD(&tbl->lock);
    ^

/tmp/qemu-test/src/include/qemu/lockable.h:173:29: note: expanded from macro 'QEMU_LOCK_GUARD'
---
qemu_lockable_auto__COUNTER__
^
1 error generated.
make[1]: *** [/tmp/qemu-test/src/rules.mak:69: hw/rdma/rdma_rm.o] Error 1
make: *** [Makefile:527: x86_64-softmmu/all] Error 2
Traceback (most recent call last):
File "./tests/docker/docker.py", line 664, in <module>

    sys.exit(main())

---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=528913c5fbdd4e42bf1946168442f34c', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=x86_64-softmmu', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-hg7wzjtd/src/docker-src.2020-04-02-03.43.13.4475:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-debug']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=528913c5fbdd4e42bf1946168442f34c
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-hg7wzjtd/src'
make: *** [docker-run-test-debug@fedora] Error 2

real 3m40.193s
user 0m8.084s

The full log is available at
http://patchew.org/logs/20200402065035.GA15477@simran-Inspiron-5558/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]

Reviewed-by Tested-by on v2 1/1
#2 lore raw
In reply to Simran Singhal
Quoted 8 lines · Simran Singhal

Replace manual lock()/unlock() calls with lock guard macros (QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD).

---
Changes in v2:
-Drop changes in file hw/rdma/rdma_utils.c

So i guess we are expected to see this back soon, right?

Ignore my r-b and t-b for v1, i did not encounter the build errors, this one is okay too.

For the hw/rdma stuff:

Thanks,
Yuval

Quoted 174 lines
 hw/hyperv/hyperv.c     | 15 ++++++-------
 hw/rdma/rdma_backend.c | 50 +++++++++++++++++++++---------------------
 hw/rdma/rdma_rm.c      |  3 +--
 3 files changed, 33 insertions(+), 35 deletions(-)
hw/hyperv/hyperv.c +2 -1
index 8ca3706f5b..4ddafe1de1 100644
@@ -15,6 +15,7 @@
 #include "sysemu/kvm.h"
 #include "qemu/bitops.h"
 #include "qemu/error-report.h"
+#include "qemu/lockable.h"
 #include "qemu/queue.h"
 #include "qemu/rcu.h"
 #include "qemu/rcu_queue.h"
@@ -491,7 +492,7 @@ int hyperv_set_msg_handler(uint32_t conn_id,
 HvMsgHandler handler, void *data)
     int ret;
     MsgHandler *mh;
 
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);
     QLIST_FOREACH(mh, &msg_handlers, link) {
         if (mh->conn_id == conn_id) {
             if (handler) {
hw/hyperv/hyperv.c +3 -4
@@ -501,7 +502,7 @@ int hyperv_set_msg_handler(uint32_t conn_id,
 HvMsgHandler handler, void *data)
                 g_free_rcu(mh, rcu);
                 ret = 0;
             }
-            goto unlock;
+            return ret;
         }
     }
@@ -515,8 +516,7 @@ int hyperv_set_msg_handler(uint32_t conn_id,
 HvMsgHandler handler, void *data)
     } else {
         ret = -ENOENT;
     }
-unlock:
-    qemu_mutex_unlock(&handlers_mutex);
+
     return ret;
 }
@@ -565,7 +565,7 @@ static int set_event_flag_handler(uint32_t conn_id,
 EventNotifier *notifier)
     int ret;
     EventFlagHandler *handler;
 
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);
     QLIST_FOREACH(handler, &event_flag_handlers, link) {
         if (handler->conn_id == conn_id) {
             if (notifier) {
hw/hyperv/hyperv.c +2 -3
@@ -575,7 +575,7 @@ static int set_event_flag_handler(uint32_t conn_id,
 EventNotifier *notifier)
                 g_free_rcu(handler, rcu);
                 ret = 0;
             }
-            goto unlock;
+            return ret;
         }
     }
@@ -588,8 +588,7 @@ static int set_event_flag_handler(uint32_t conn_id,
 EventNotifier *notifier)
     } else {
         ret = -ENOENT;
     }
-unlock:
-    qemu_mutex_unlock(&handlers_mutex);
+
     return ret;
 }
hw/rdma/rdma_backend.c +25 -25
index 3dd39fe1a7..db7e5c8be5 100644
@@ -95,36 +95,36 @@ static int rdma_poll_cq(RdmaDeviceResources
 *rdma_dev_res, struct ibv_cq *ibcq)
     struct ibv_wc wc[2];
     RdmaProtectedGSList *cqe_ctx_list;
 
-    qemu_mutex_lock(&rdma_dev_res->lock);
-    do {
-        ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);
+    WITH_QEMU_LOCK_GUARD(&rdma_dev_res->lock) {
+        do {
+            ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);
 
-        trace_rdma_poll_cq(ne, ibcq);
+            trace_rdma_poll_cq(ne, ibcq);
 
-        for (i = 0; i < ne; i++) {
-            bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id);
-            if (unlikely(!bctx)) {
-                rdma_error_report("No matching ctx for req %"PRId64,
-                                  wc[i].wr_id);
-                continue;
-            }
+            for (i = 0; i < ne; i++) {
+                bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id);
+                if (unlikely(!bctx)) {
+                    rdma_error_report("No matching ctx for req %"PRId64,
+                                      wc[i].wr_id);
+                    continue;
+                }
 
-            comp_handler(bctx->up_ctx, &wc[i]);
+                comp_handler(bctx->up_ctx, &wc[i]);
 
-            if (bctx->backend_qp) {
-                cqe_ctx_list = &bctx->backend_qp->cqe_ctx_list;
-            } else {
-                cqe_ctx_list = &bctx->backend_srq->cqe_ctx_list;
-            }
+                if (bctx->backend_qp) {
+                    cqe_ctx_list = &bctx->backend_qp->cqe_ctx_list;
+                } else {
+                    cqe_ctx_list = &bctx->backend_srq->cqe_ctx_list;
+                }
 
-            rdma_protected_gslist_remove_int32(cqe_ctx_list, wc[i].wr_id);
-            rdma_rm_dealloc_cqe_ctx(rdma_dev_res, wc[i].wr_id);
-            g_free(bctx);
-        }
-        total_ne += ne;
-    } while (ne > 0);
-    atomic_sub(&rdma_dev_res->stats.missing_cqe, total_ne);
-    qemu_mutex_unlock(&rdma_dev_res->lock);
+                rdma_protected_gslist_remove_int32(cqe_ctx_list,
 wc[i].wr_id);
+                rdma_rm_dealloc_cqe_ctx(rdma_dev_res, wc[i].wr_id);
+                g_free(bctx);
+            }
+            total_ne += ne;
+        } while (ne > 0);
+        atomic_sub(&rdma_dev_res->stats.missing_cqe, total_ne);
+    }
 
     if (ne < 0) {
         rdma_error_report("ibv_poll_cq fail, rc=%d, errno=%d", ne, errno);
hw/rdma/rdma_rm.c +1 -2
index 7e9ea283c9..60957f88db 100644
@@ -147,14 +147,13 @@ static inline void rdma_res_tbl_dealloc(RdmaRmResTbl
 *tbl, uint32_t handle)
 {
     trace_rdma_res_tbl_dealloc(tbl->name, handle);
 
-    qemu_mutex_lock(&tbl->lock);
+    QEMU_LOCK_GUARD(&tbl->lock);
 
     if (handle < tbl->tbl_sz) {
         clear_bit(handle, tbl->bitmap);
         tbl->used--;
     }
 
-    qemu_mutex_unlock(&tbl->lock);
 }
 

int rdma_rm_alloc_pd(RdmaDeviceResources *dev_res, RdmaBackendDev
*backend_dev,
--
2.17.1

Reviewed-by on v2 1/1
#3 lore raw
In reply to Simran Singhal

Hi Simran,

Quoted 157 lines · Simran Singhal

Replace manual lock()/unlock() calls with lock guard macros (QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD).

---
Changes in v2:
-Drop changes in file hw/rdma/rdma_utils.c

  hw/hyperv/hyperv.c     | 15 ++++++-------
  hw/rdma/rdma_backend.c | 50 +++++++++++++++++++++---------------------
  hw/rdma/rdma_rm.c      |  3 +--
  3 files changed, 33 insertions(+), 35 deletions(-)
hw/hyperv/hyperv.c +7 -8
index 8ca3706f5b..4ddafe1de1 100644
@@ -15,6 +15,7 @@
  #include "sysemu/kvm.h"
  #include "qemu/bitops.h"
  #include "qemu/error-report.h"
+#include "qemu/lockable.h"
  #include "qemu/queue.h"
  #include "qemu/rcu.h"
  #include "qemu/rcu_queue.h"
@@ -491,7 +492,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
      int ret;
      MsgHandler *mh;
 
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);
      QLIST_FOREACH(mh, &msg_handlers, link) {
          if (mh->conn_id == conn_id) {
              if (handler) {
@@ -501,7 +502,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
                  g_free_rcu(mh, rcu);
                  ret = 0;
              }
-            goto unlock;
+            return ret;
          }
      }
 
@@ -515,8 +516,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
      } else {
          ret = -ENOENT;
      }
-unlock:
-    qemu_mutex_unlock(&handlers_mutex);
+
      return ret;
  }
 
@@ -565,7 +565,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
      int ret;
      EventFlagHandler *handler;
 
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);
      QLIST_FOREACH(handler, &event_flag_handlers, link) {
          if (handler->conn_id == conn_id) {
              if (notifier) {
@@ -575,7 +575,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
                  g_free_rcu(handler, rcu);
                  ret = 0;
              }
-            goto unlock;
+            return ret;
          }
      }
 
@@ -588,8 +588,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
      } else {
          ret = -ENOENT;
      }
-unlock:
-    qemu_mutex_unlock(&handlers_mutex);
+
      return ret;
  }
 
hw/rdma/rdma_backend.c +25 -25
index 3dd39fe1a7..db7e5c8be5 100644
@@ -95,36 +95,36 @@ static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *ibcq)
      struct ibv_wc wc[2];
      RdmaProtectedGSList *cqe_ctx_list;
 
-    qemu_mutex_lock(&rdma_dev_res->lock);
-    do {
-        ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);
+    WITH_QEMU_LOCK_GUARD(&rdma_dev_res->lock) {
+        do {
+            ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);
 
-        trace_rdma_poll_cq(ne, ibcq);
+            trace_rdma_poll_cq(ne, ibcq);
 
-        for (i = 0; i < ne; i++) {
-            bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id);
-            if (unlikely(!bctx)) {
-                rdma_error_report("No matching ctx for req %"PRId64,
-                                  wc[i].wr_id);
-                continue;
-            }
+            for (i = 0; i < ne; i++) {
+                bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id);
+                if (unlikely(!bctx)) {
+                    rdma_error_report("No matching ctx for req %"PRId64,
+                                      wc[i].wr_id);
+                    continue;
+                }
 
-            comp_handler(bctx->up_ctx, &wc[i]);
+                comp_handler(bctx->up_ctx, &wc[i]);
 
-            if (bctx->backend_qp) {
-                cqe_ctx_list = &bctx->backend_qp->cqe_ctx_list;
-            } else {
-                cqe_ctx_list = &bctx->backend_srq->cqe_ctx_list;
-            }
+                if (bctx->backend_qp) {
+                    cqe_ctx_list = &bctx->backend_qp->cqe_ctx_list;
+                } else {
+                    cqe_ctx_list = &bctx->backend_srq->cqe_ctx_list;
+                }
 
-            rdma_protected_gslist_remove_int32(cqe_ctx_list, wc[i].wr_id);
-            rdma_rm_dealloc_cqe_ctx(rdma_dev_res, wc[i].wr_id);
-            g_free(bctx);
-        }
-        total_ne += ne;
-    } while (ne > 0);
-    atomic_sub(&rdma_dev_res->stats.missing_cqe, total_ne);
-    qemu_mutex_unlock(&rdma_dev_res->lock);
+                rdma_protected_gslist_remove_int32(cqe_ctx_list, wc[i].wr_id);
+                rdma_rm_dealloc_cqe_ctx(rdma_dev_res, wc[i].wr_id);
+                g_free(bctx);
+            }
+            total_ne += ne;
+        } while (ne > 0);
+        atomic_sub(&rdma_dev_res->stats.missing_cqe, total_ne);
+    }
 
      if (ne < 0) {
          rdma_error_report("ibv_poll_cq fail, rc=%d, errno=%d", ne, errno);
hw/rdma/rdma_rm.c +1 -1
index 7e9ea283c9..60957f88db 100644
@@ -147,14 +147,13 @@ static inline void rdma_res_tbl_dealloc(RdmaRmResTbl *tbl, uint32_t handle)
  {
      trace_rdma_res_tbl_dealloc(tbl->name, handle);
 
-    qemu_mutex_lock(&tbl->lock);
+    QEMU_LOCK_GUARD(&tbl->lock);

hw/rdma/rdma_rm.c static inline void rdma_res_tbl_dealloc(RdmaRmResTbl *tbl, uint32_t handle) · line 159

Quoted 10 lines
hw/rdma/rdma_rm.c +0 -1
 
      if (handle < tbl->tbl_sz) {
          clear_bit(handle, tbl->bitmap);
          tbl->used--;
      }
 
-    qemu_mutex_unlock(&tbl->lock);
  }
 
  int rdma_rm_alloc_pd(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev,

Thanks,
Marcel

#4 lore raw
In reply to Simran Singhal

Hi Simran,

Quoted 26 lines · Simran Singhal

Replace manual lock()/unlock() calls with lock guard macros (QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD).

---
Changes in v2:
-Drop changes in file hw/rdma/rdma_utils.c

  hw/hyperv/hyperv.c     | 15 ++++++-------
  hw/rdma/rdma_backend.c | 50 +++++++++++++++++++++---------------------
  hw/rdma/rdma_rm.c      |  3 +--
  3 files changed, 33 insertions(+), 35 deletions(-)
hw/hyperv/hyperv.c +1 -0
index 8ca3706f5b..4ddafe1de1 100644
@@ -15,6 +15,7 @@
  #include "sysemu/kvm.h"
  #include "qemu/bitops.h"
  #include "qemu/error-report.h"
+#include "qemu/lockable.h"
  #include "qemu/queue.h"
  #include "qemu/rcu.h"
  #include "qemu/rcu_queue.h"

hw/hyperv/hyperv.c int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data) · line 495

Quoted 5 lines
hw/hyperv/hyperv.c +1 -1
@@ -491,7 +492,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
      int ret;
      MsgHandler *mh;
 
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);

It does not passes compilation:
    export ARCH=x86_64
    make docker-image-fedora V=1 NETWORK=1
    make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu NETWORK=1

Error:

 CC      x86_64-softmmu/hw/net/virtio-net.o
/tmp/qemu-test/src/hw/hyperv/hyperv.c:495:5: error: unused variable 'qemu_lockable_auto__COUNTER__' [-Werror,-Wunused-variable] QEMU_LOCK_GUARD(&handlers_mutex);
    ^
/tmp/qemu-test/src/include/qemu/lockable.h:173:29: note: expanded from macro 'QEMU_LOCK_GUARD' g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \
                            ^
<scratch space>:24:1: note: expanded from here
qemu_lockable_auto__COUNTER__
^
/tmp/qemu-test/src/hw/hyperv/hyperv.c:568:5: error: unused variable 'qemu_lockable_auto__COUNTER__' [-Werror,-Wunused-variable] QEMU_LOCK_GUARD(&handlers_mutex);
    ^
/tmp/qemu-test/src/include/qemu/lockable.h:173:29: note: expanded from macro 'QEMU_LOCK_GUARD' g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \
                            ^
<scratch space>:39:1: note: expanded from here
qemu_lockable_auto__COUNTER__
^
2 errors generated.

I suggest splitting it into an pvrdma path and hyperv patch anyway. It will be nice to get an ack from the hyperv maintainer, adding Roman.

Thanks,
Marcel

Quoted 136 lines
hw/hyperv/hyperv.c +5 -7
      QLIST_FOREACH(mh, &msg_handlers, link) {
          if (mh->conn_id == conn_id) {
              if (handler) {
@@ -501,7 +502,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
                  g_free_rcu(mh, rcu);
                  ret = 0;
              }
-            goto unlock;
+            return ret;
          }
      }
 
@@ -515,8 +516,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
      } else {
          ret = -ENOENT;
      }
-unlock:
-    qemu_mutex_unlock(&handlers_mutex);
+
      return ret;
  }
 
@@ -565,7 +565,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
      int ret;
      EventFlagHandler *handler;
 
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);
      QLIST_FOREACH(handler, &event_flag_handlers, link) {
          if (handler->conn_id == conn_id) {
              if (notifier) {
@@ -575,7 +575,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
                  g_free_rcu(handler, rcu);
                  ret = 0;
              }
-            goto unlock;
+            return ret;
          }
      }
 
@@ -588,8 +588,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
      } else {
          ret = -ENOENT;
      }
-unlock:
-    qemu_mutex_unlock(&handlers_mutex);
+
      return ret;
  }
 
hw/rdma/rdma_backend.c +25 -25
index 3dd39fe1a7..db7e5c8be5 100644
@@ -95,36 +95,36 @@ static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *ibcq)
      struct ibv_wc wc[2];
      RdmaProtectedGSList *cqe_ctx_list;
 
-    qemu_mutex_lock(&rdma_dev_res->lock);
-    do {
-        ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);
+    WITH_QEMU_LOCK_GUARD(&rdma_dev_res->lock) {
+        do {
+            ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);
 
-        trace_rdma_poll_cq(ne, ibcq);
+            trace_rdma_poll_cq(ne, ibcq);
 
-        for (i = 0; i < ne; i++) {
-            bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id);
-            if (unlikely(!bctx)) {
-                rdma_error_report("No matching ctx for req %"PRId64,
-                                  wc[i].wr_id);
-                continue;
-            }
+            for (i = 0; i < ne; i++) {
+                bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id);
+                if (unlikely(!bctx)) {
+                    rdma_error_report("No matching ctx for req %"PRId64,
+                                      wc[i].wr_id);
+                    continue;
+                }
 
-            comp_handler(bctx->up_ctx, &wc[i]);
+                comp_handler(bctx->up_ctx, &wc[i]);
 
-            if (bctx->backend_qp) {
-                cqe_ctx_list = &bctx->backend_qp->cqe_ctx_list;
-            } else {
-                cqe_ctx_list = &bctx->backend_srq->cqe_ctx_list;
-            }
+                if (bctx->backend_qp) {
+                    cqe_ctx_list = &bctx->backend_qp->cqe_ctx_list;
+                } else {
+                    cqe_ctx_list = &bctx->backend_srq->cqe_ctx_list;
+                }
 
-            rdma_protected_gslist_remove_int32(cqe_ctx_list, wc[i].wr_id);
-            rdma_rm_dealloc_cqe_ctx(rdma_dev_res, wc[i].wr_id);
-            g_free(bctx);
-        }
-        total_ne += ne;
-    } while (ne > 0);
-    atomic_sub(&rdma_dev_res->stats.missing_cqe, total_ne);
-    qemu_mutex_unlock(&rdma_dev_res->lock);
+                rdma_protected_gslist_remove_int32(cqe_ctx_list, wc[i].wr_id);
+                rdma_rm_dealloc_cqe_ctx(rdma_dev_res, wc[i].wr_id);
+                g_free(bctx);
+            }
+            total_ne += ne;
+        } while (ne > 0);
+        atomic_sub(&rdma_dev_res->stats.missing_cqe, total_ne);
+    }
 
      if (ne < 0) {
          rdma_error_report("ibv_poll_cq fail, rc=%d, errno=%d", ne, errno);
hw/rdma/rdma_rm.c +1 -2
index 7e9ea283c9..60957f88db 100644
@@ -147,14 +147,13 @@ static inline void rdma_res_tbl_dealloc(RdmaRmResTbl *tbl, uint32_t handle)
  {
      trace_rdma_res_tbl_dealloc(tbl->name, handle);
 
-    qemu_mutex_lock(&tbl->lock);
+    QEMU_LOCK_GUARD(&tbl->lock);
 
      if (handle < tbl->tbl_sz) {
          clear_bit(handle, tbl->bitmap);
          tbl->used--;
      }
 
-    qemu_mutex_unlock(&tbl->lock);
  }
 
  int rdma_rm_alloc_pd(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev,
#5 lore raw
Quoted 33 lines · Marcel Apfelbaum

Hi Simran,

Quoted 29 lines · Simran Singhal

Replace manual lock()/unlock() calls with lock guard macros (QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD).

---
Changes in v2:
-Drop changes in file hw/rdma/rdma_utils.c

  hw/hyperv/hyperv.c     | 15 ++++++-------
  hw/rdma/rdma_backend.c | 50 +++++++++++++++++++++---------------------
  hw/rdma/rdma_rm.c      |  3 +--
  3 files changed, 33 insertions(+), 35 deletions(-)
hw/hyperv/hyperv.c +1 -0
index 8ca3706f5b..4ddafe1de1 100644
@@ -15,6 +15,7 @@
  #include "sysemu/kvm.h"
  #include "qemu/bitops.h"
  #include "qemu/error-report.h"
+#include "qemu/lockable.h"
  #include "qemu/queue.h"
  #include "qemu/rcu.h"
  #include "qemu/rcu_queue.h"
@@ -491,7 +492,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
      int ret;
      MsgHandler *mh;
 
Quoted 7 lines

hw/hyperv/hyperv.c int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data) · line 495

Quoted 2 lines
hw/hyperv/hyperv.c +1 -1
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);

It does not passes compilation:
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu NETWORK=1

This is a problem with the macros themselves, not with this patch. This is fixed (concat '##' problem and warnings) in
[PATCH v5 0/2] Replaced locks with lock guard macros
and the patch should be based on it.

Best regards, Julia Suvorova.

#6 lore raw

Hi Julia,

Quoted 40 lines · Julia Suvorova
Quoted 32 lines · Marcel Apfelbaum

Hi Simran,

Quoted 29 lines · Simran Singhal

Replace manual lock()/unlock() calls with lock guard macros (QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD).

---
Changes in v2:
-Drop changes in file hw/rdma/rdma_utils.c

   hw/hyperv/hyperv.c     | 15 ++++++-------
   hw/rdma/rdma_backend.c | 50 +++++++++++++++++++++---------------------
   hw/rdma/rdma_rm.c      |  3 +--
   3 files changed, 33 insertions(+), 35 deletions(-)
hw/hyperv/hyperv.c +1 -0
index 8ca3706f5b..4ddafe1de1 100644
@@ -15,6 +15,7 @@
   #include "sysemu/kvm.h"
   #include "qemu/bitops.h"
   #include "qemu/error-report.h"
+#include "qemu/lockable.h"
   #include "qemu/queue.h"
   #include "qemu/rcu.h"
   #include "qemu/rcu_queue.h"
@@ -491,7 +492,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
       int ret;
       MsgHandler *mh;
 
Quoted 6 lines

hw/hyperv/hyperv.c int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data) · line 495

Quoted 2 lines
hw/hyperv/hyperv.c +1 -1
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);

It does not passes compilation:
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu NETWORK=1

Quoted 4 lines

This is a problem with the macros themselves, not with this patch. This is fixed (concat '##' problem and warnings) in
[PATCH v5 0/2] Replaced locks with lock guard macros
and the patch should be based on it.

Thanks for the pointer.
I'll wait for the fix to be merged then.

Thanks,
Marcel

Quoted 2 lines

Best regards, Julia Suvorova.

#7 lore raw
In reply to Simran Singhal
Quoted 5 lines · Simran Singhal

Replace manual lock()/unlock() calls with lock guard macros (QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD).

---

You can give a hint to reviewers by adding:

This patch is based on:
"Replace locks with lock guard macros"
https://www.mail-archive.com/[email protected]/msg694412.html

Similar hint to build bots:
Based-on: <[email protected]>

You should Cc Paolo Bonzini on your v3, since he'll likely queue the base series.

Patch looks good otherwise.

Quoted 163 lines

Changes in v2:
-Drop changes in file hw/rdma/rdma_utils.c

  hw/hyperv/hyperv.c     | 15 ++++++-------
  hw/rdma/rdma_backend.c | 50 +++++++++++++++++++++---------------------
  hw/rdma/rdma_rm.c      |  3 +--
  3 files changed, 33 insertions(+), 35 deletions(-)
hw/hyperv/hyperv.c +7 -8
index 8ca3706f5b..4ddafe1de1 100644
@@ -15,6 +15,7 @@
  #include "sysemu/kvm.h"
  #include "qemu/bitops.h"
  #include "qemu/error-report.h"
+#include "qemu/lockable.h"
  #include "qemu/queue.h"
  #include "qemu/rcu.h"
  #include "qemu/rcu_queue.h"
@@ -491,7 +492,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
      int ret;
      MsgHandler *mh;
 
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);
      QLIST_FOREACH(mh, &msg_handlers, link) {
          if (mh->conn_id == conn_id) {
              if (handler) {
@@ -501,7 +502,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
                  g_free_rcu(mh, rcu);
                  ret = 0;
              }
-            goto unlock;
+            return ret;
          }
      }
 
@@ -515,8 +516,7 @@ int hyperv_set_msg_handler(uint32_t conn_id, HvMsgHandler handler, void *data)
      } else {
          ret = -ENOENT;
      }
-unlock:
-    qemu_mutex_unlock(&handlers_mutex);
+
      return ret;
  }
 
@@ -565,7 +565,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
      int ret;
      EventFlagHandler *handler;
 
-    qemu_mutex_lock(&handlers_mutex);
+    QEMU_LOCK_GUARD(&handlers_mutex);
      QLIST_FOREACH(handler, &event_flag_handlers, link) {
          if (handler->conn_id == conn_id) {
              if (notifier) {
@@ -575,7 +575,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
                  g_free_rcu(handler, rcu);
                  ret = 0;
              }
-            goto unlock;
+            return ret;
          }
      }
 
@@ -588,8 +588,7 @@ static int set_event_flag_handler(uint32_t conn_id, EventNotifier *notifier)
      } else {
          ret = -ENOENT;
      }
-unlock:
-    qemu_mutex_unlock(&handlers_mutex);
+
      return ret;
  }
 
hw/rdma/rdma_backend.c +25 -25
index 3dd39fe1a7..db7e5c8be5 100644
@@ -95,36 +95,36 @@ static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *ibcq)
      struct ibv_wc wc[2];
      RdmaProtectedGSList *cqe_ctx_list;
 
-    qemu_mutex_lock(&rdma_dev_res->lock);
-    do {
-        ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);
+    WITH_QEMU_LOCK_GUARD(&rdma_dev_res->lock) {
+        do {
+            ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);
 
-        trace_rdma_poll_cq(ne, ibcq);
+            trace_rdma_poll_cq(ne, ibcq);
 
-        for (i = 0; i < ne; i++) {
-            bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id);
-            if (unlikely(!bctx)) {
-                rdma_error_report("No matching ctx for req %"PRId64,
-                                  wc[i].wr_id);
-                continue;
-            }
+            for (i = 0; i < ne; i++) {
+                bctx = rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id);
+                if (unlikely(!bctx)) {
+                    rdma_error_report("No matching ctx for req %"PRId64,
+                                      wc[i].wr_id);
+                    continue;
+                }
 
-            comp_handler(bctx->up_ctx, &wc[i]);
+                comp_handler(bctx->up_ctx, &wc[i]);
 
-            if (bctx->backend_qp) {
-                cqe_ctx_list = &bctx->backend_qp->cqe_ctx_list;
-            } else {
-                cqe_ctx_list = &bctx->backend_srq->cqe_ctx_list;
-            }
+                if (bctx->backend_qp) {
+                    cqe_ctx_list = &bctx->backend_qp->cqe_ctx_list;
+                } else {
+                    cqe_ctx_list = &bctx->backend_srq->cqe_ctx_list;
+                }
 
-            rdma_protected_gslist_remove_int32(cqe_ctx_list, wc[i].wr_id);
-            rdma_rm_dealloc_cqe_ctx(rdma_dev_res, wc[i].wr_id);
-            g_free(bctx);
-        }
-        total_ne += ne;
-    } while (ne > 0);
-    atomic_sub(&rdma_dev_res->stats.missing_cqe, total_ne);
-    qemu_mutex_unlock(&rdma_dev_res->lock);
+                rdma_protected_gslist_remove_int32(cqe_ctx_list, wc[i].wr_id);
+                rdma_rm_dealloc_cqe_ctx(rdma_dev_res, wc[i].wr_id);
+                g_free(bctx);
+            }
+            total_ne += ne;
+        } while (ne > 0);
+        atomic_sub(&rdma_dev_res->stats.missing_cqe, total_ne);
+    }
 
      if (ne < 0) {
          rdma_error_report("ibv_poll_cq fail, rc=%d, errno=%d", ne, errno);
hw/rdma/rdma_rm.c +1 -2
index 7e9ea283c9..60957f88db 100644
@@ -147,14 +147,13 @@ static inline void rdma_res_tbl_dealloc(RdmaRmResTbl *tbl, uint32_t handle)
  {
      trace_rdma_res_tbl_dealloc(tbl->name, handle);
 
-    qemu_mutex_lock(&tbl->lock);
+    QEMU_LOCK_GUARD(&tbl->lock);
 
      if (handle < tbl->tbl_sz) {
          clear_bit(handle, tbl->bitmap);
          tbl->used--;
      }
 
-    qemu_mutex_unlock(&tbl->lock);
  }
 
  int rdma_rm_alloc_pd(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev,
#8 lore raw
In reply to Simran Singhal
Quoted 4 lines · Simran Singhal

Replace manual lock()/unlock() calls with lock guard macros (QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD).

Quoted 8 lines

---
Changes in v2:
-Drop changes in file hw/rdma/rdma_utils.c

 hw/hyperv/hyperv.c     | 15 ++++++-------
 hw/rdma/rdma_backend.c | 50 +++++++++++++++++++++---------------------
 hw/rdma/rdma_rm.c      |  3 +--
 3 files changed, 33 insertions(+), 35 deletions(-)

Thanks, applied to my block-next tree:
https://github.com/stefanha/qemu/commits/block-next

Stefan