lockable: fix __COUNTER__ macro to be referenced properly
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/2 lockable: fix __COUNTER__ macro to be referenced properly
From: Daniel Brodsky <[email protected]>
- __COUNTER__ doesn't work with ## concat
- replaced ## with glue() macro so __COUNTER__ is evaluated
--- include/qemu/lockable.h | 2 +- include/qemu/rcu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/qemu/lockable.h +1 -1
@@ -170,7 +170,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockable_auto_unlock)* } */ #define QEMU_LOCK_GUARD (x) \ - g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \ + g_autoptr(QemuLockable) glue(qemu_lockable_auto, __COUNTER__) = \ qemu_lockable_auto_lock(QEMU_MAKE_LOCKABLE((x)))#endif
include/qemu/rcu.h +1 -1
@@ -170,7 +170,7 @@ static inline void rcu_read_auto_unlock(RCUReadAuto *r) G_DEFINE_AUTOPTR_CLEANUP_FUNC(RCUReadAuto, rcu_read_auto_unlock)#define WITH_RCU_READ_LOCK_GUARD () \ - WITH_RCU_READ_LOCK_GUARD_(_rcu_read_auto##__COUNTER__) + WITH_RCU_READ_LOCK_GUARD_(glue(_rcu_read_auto, __COUNTER__))#define WITH_RCU_READ_LOCK_GUARD_ (var) \ for (g_autoptr(RCUReadAuto) var = rcu_read_auto_lock(); \
Signature · 1 line
2.25.1
Quoted 5 lines · On 3/19/20 4:34 PM, [email protected] wrote:
From: Daniel Brodsky <[email protected]>
-
__COUNTER__doesn't work with ## concat
- replaced ## withglue()macro so__COUNTER__is evaluated
Quoted 7 lines
Fixes 3284c3ddc4Signed-off-by Daniel Brodsky <[email protected]>--- include/qemu/lockable.h | 2 +- include/qemu/rcu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
r~
PATCH v2 2/2 lockable: replaced locks with lock guard macros where appropriate
In reply to a message not in the archiveFrom: Daniel Brodsky <[email protected]>
- ran regexp "qemu_mutex_lock\(.*\).*\n.*if" to find targets
- replaced result with QEMU_LOCK_GUARD if all unlocks at function end
- replaced result with WITH_QEMU_LOCK_GUARD if unlock not at end
--- block/iscsi.c | 11 +++------- block/nfs.c | 51 ++++++++++++++++++++----------------------- cpus-common.c | 13 +++++------ hw/display/qxl.c | 43 +++++++++++++++++------------------- hw/vfio/platform.c | 4 +--- migration/migration.c | 3 +-- migration/multifd.c | 8 +++---- migration/ram.c | 3 +-- monitor/misc.c | 4 +--- ui/spice-display.c | 14 ++++++------ util/log.c | 4 ++-- util/qemu-timer.c | 17 +++++++-------- util/rcu.c | 8 +++---- util/thread-pool.c | 3 +-- util/vfio-helpers.c | 4 ++-- 15 files changed, 83 insertions(+), 107 deletions(-)
block/iscsi.c +3 -8
@@ -1086,7 +1086,7 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, acb->task->expxferlen = acb->ioh->dxfer_len; data.size =0 ; -qemu_mutex_lock (&iscsilun->mutex); +QEMU_LOCK_GUARD (&iscsilun->mutex);if (acb->task->xfer_dir ==SCSI_XFER_WRITE ) {if (acb->ioh->iovec_count ==0 ) { data.data = acb->ioh->dxferp;
@@ -1102,7 +1102,6 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, iscsi_aio_ioctl_cb, (data.size > 0) ? &data : NULL, acb) != 0) { -qemu_mutex_unlock (&iscsilun->mutex);scsi_free_scsi_task (acb->task);qemu_aio_unref (acb);return NULL ;
@@ -1122,7 +1121,6 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, }iscsi_set_events (iscsilun); -qemu_mutex_unlock (&iscsilun->mutex);return &acb->common; }
@@ -1395,20 +1393,17 @@ static void iscsi_nop_timed_event(void *opaque) {IscsiLun *iscsilun = opaque; -qemu_mutex_lock (&iscsilun->mutex); +QEMU_LOCK_GUARD (&iscsilun->mutex);if (iscsi_get_nops_in_flight (iscsilun->iscsi) >=MAX_NOP_FAILURES ) {error_report ("iSCSI: NOP timeout. Reconnecting..." ); iscsilun->request_timed_out = true; }else if (iscsi_nop_out_async (iscsilun->iscsi,NULL ,NULL ,0 ,NULL ) !=0 ) {error_report ("iSCSI: failed to sent NOP-Out. Disabling NOP messages." ); - goto out; +return ; }timer_mod (iscsilun->nop_timer,qemu_clock_get_ms (QEMU_CLOCK_REALTIME ) +NOP_INTERVAL );iscsi_set_events (iscsilun); - -out: -qemu_mutex_unlock (&iscsilun->mutex); }static void iscsi_readcapacity_sync (IscsiLun *iscsilun,Error **errp)
block/nfs.c +24 -27
73 lines not on this page · raw message
cpus-common.c +5 -8
@@ -22,6 +22,7 @@#include "exec/cpu-common.h" #include "hw/core/cpu.h" #include "sysemu/cpus.h" +#include "qemu/lockable.h" static QemuMutex qemu_cpu_list_lock;static QemuCond exclusive_cond;
@@ -71,7 +72,7 @@ static int cpu_get_free_index(void)void cpu_list_add (CPUState *cpu) { -qemu_mutex_lock (&qemu_cpu_list_lock); +QEMU_LOCK_GUARD (&qemu_cpu_list_lock);if (cpu->cpu_index ==UNASSIGNED_CPU_INDEX ) { cpu->cpu_index =cpu_get_free_index ();assert (cpu->cpu_index !=UNASSIGNED_CPU_INDEX );
@@ -79,12 +80,11 @@ void cpu_list_add(CPUState *cpu)assert (!cpu_index_auto_assigned); }QTAILQ_INSERT_TAIL_RCU (&cpus, cpu, node); -qemu_mutex_unlock (&qemu_cpu_list_lock); }void cpu_list_remove (CPUState *cpu) { -qemu_mutex_lock (&qemu_cpu_list_lock); +QEMU_LOCK_GUARD (&qemu_cpu_list_lock);if (!QTAILQ_IN_USE (cpu, node)) {/* there is nothing to undo since cpu_exec_init() hasn't been called */ qemu_mutex_unlock (&qemu_cpu_list_lock);
@@ -95,7 +95,6 @@ void cpu_list_remove(CPUState *cpu)QTAILQ_REMOVE_RCU (&cpus, cpu, node); cpu->cpu_index =UNASSIGNED_CPU_INDEX ; -qemu_mutex_unlock (&qemu_cpu_list_lock); }struct qemu_work_item {
@@ -237,7 +236,7 @@ void cpu_exec_start(CPUState *cpu)* see cpu->running == true, and it will kick the CPU. */ if (unlikely (atomic_read (&pending_cpus))) { -qemu_mutex_lock (&qemu_cpu_list_lock); +QEMU_LOCK_GUARD (&qemu_cpu_list_lock);if (!cpu->has_waiter) {/* Not counted in pending_cpus, let the exclusive item * run. Since we have the lock, just set cpu->running to true
@@ -252,7 +251,6 @@ void cpu_exec_start(CPUState *cpu)* waiter at cpu_exec_end. */ } -qemu_mutex_unlock (&qemu_cpu_list_lock); } }
@@ -280,7 +278,7 @@ void cpu_exec_end(CPUState *cpu)* next cpu_exec_start. */ if (unlikely (atomic_read (&pending_cpus))) { -qemu_mutex_lock (&qemu_cpu_list_lock); +QEMU_LOCK_GUARD (&qemu_cpu_list_lock);if (cpu->has_waiter) { cpu->has_waiter = false;atomic_set (&pending_cpus, pending_cpus -1 );
@@ -288,7 +286,6 @@ void cpu_exec_end(CPUState *cpu)qemu_cond_signal (&exclusive_cond); } } -qemu_mutex_unlock (&qemu_cpu_list_lock); } }
hw/display/qxl.c +20 -23
77 lines not on this page · raw message
hw/vfio/platform.c +1 -3
@@ -216,7 +216,7 @@ static void vfio_intp_interrupt(VFIOINTp *intp)VFIOPlatformDevice *vdev = intp->vdev;bool delay_handling = false; -qemu_mutex_lock (&vdev->intp_mutex); +QEMU_LOCK_GUARD (&vdev->intp_mutex);if (intp->state ==VFIO_IRQ_INACTIVE ) { QLIST_FOREACH(tmp, &vdev->intp_list, next) { if (tmp->state == VFIO_IRQ_ACTIVE ||
@@ -236,7 +236,6 @@ static void vfio_intp_interrupt(VFIOINTp *intp)QSIMPLEQ_INSERT_TAIL (&vdev->pending_intp_queue, intp, pqnext); ret =event_notifier_test_and_clear (intp->interrupt); -qemu_mutex_unlock (&vdev->intp_mutex);return ; }
@@ -266,7 +265,6 @@ static void vfio_intp_interrupt(VFIOINTp *intp)qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ) + vdev->mmap_timeout); } -qemu_mutex_unlock (&vdev->intp_mutex); }/**
migration/migration.c +1 -2
@@ -1652,11 +1652,10 @@ static void migrate_fd_cleanup_bh(void *opaque)void migrate_set_error (MigrationState *s,const Error *error) { -qemu_mutex_lock (&s->error_mutex); +QEMU_LOCK_GUARD (&s->error_mutex);if (!s->error) { s->error =error_copy (error); } -qemu_mutex_unlock (&s->error_mutex); }void migrate_fd_error (MigrationState *s,const Error *error)
migration/multifd.c +4 -4
@@ -894,11 +894,11 @@ void multifd_recv_sync_main(void)for (i =0 ; i <migrate_multifd_channels (); i++) {MultiFDRecvParams *p = &multifd_recv_state->params[i]; -qemu_mutex_lock (&p->mutex); -if (multifd_recv_state->packet_num < p->packet_num) { - multifd_recv_state->packet_num = p->packet_num; + WITH_QEMU_LOCK_GUARD(&p->mutex) { +if (multifd_recv_state->packet_num < p->packet_num) { + multifd_recv_state->packet_num = p->packet_num; + } } -qemu_mutex_unlock (&p->mutex);trace_multifd_recv_sync_main_signal (p->id);qemu_sem_post (&p->sem_sync); }
migration/ram.c +1 -2
@@ -1368,7 +1368,7 @@ static RAMBlock *unqueue_page(RAMState *rs, ram_addr_t *offset)return NULL ; } -qemu_mutex_lock (&rs->src_page_req_mutex); +QEMU_LOCK_GUARD (&rs->src_page_req_mutex);if (!QSIMPLEQ_EMPTY (&rs->src_page_requests)) {struct RAMSrcPageRequest *entry =QSIMPLEQ_FIRST (&rs->src_page_requests);
@@ -1385,7 +1385,6 @@ static RAMBlock *unqueue_page(RAMState *rs, ram_addr_t *offset)migration_consume_urgent_request (); } } -qemu_mutex_unlock (&rs->src_page_req_mutex);return block; }
monitor/misc.c +1 -3
@@ -1473,7 +1473,7 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id,MonFdsetFd *mon_fdset_fd;AddfdInfo *fdinfo; -qemu_mutex_lock (&mon_fdsets_lock); +QEMU_LOCK_GUARD (&mon_fdsets_lock);if (has_fdset_id) { QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {/* Break if match found or match impossible due to ordering by ID */
@@ -1494,7 +1494,6 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id,if (fdset_id <0 ) {error_setg (errp,QERR_INVALID_PARAMETER_VALUE ,"fdset-id" ,"a non-negative value" ); -qemu_mutex_unlock (&mon_fdsets_lock);return NULL ; }/* Use specified fdset ID */
@@ -1545,7 +1544,6 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, fdinfo->fdset_id = mon_fdset->id; fdinfo->fd = mon_fdset_fd->fd; -qemu_mutex_unlock (&mon_fdsets_lock);return fdinfo; }
ui/spice-display.c +7 -7
@@ -18,6 +18,7 @@#include "qemu/osdep.h" #include "ui/qemu-spice.h" #include "qemu/timer.h" +#include "qemu/lockable.h" #include "qemu/main-loop.h" #include "qemu/option.h" #include "qemu/queue.h"
@@ -483,12 +484,12 @@ void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd) {graphic_hw_update (ssd->dcl.con); -qemu_mutex_lock (&ssd->lock); -if (QTAILQ_EMPTY (&ssd->updates) && ssd->ds) { -qemu_spice_create_update (ssd); - ssd->notify++; + WITH_QEMU_LOCK_GUARD(&ssd->lock) { +if (QTAILQ_EMPTY (&ssd->updates) && ssd->ds) { +qemu_spice_create_update (ssd); + ssd->notify++; + } } -qemu_mutex_unlock (&ssd->lock);trace_qemu_spice_display_refresh (ssd->qxl.id, ssd->notify);if (ssd->notify) {
@@ -580,7 +581,7 @@ static int interface_get_cursor_command(QXLInstance *sin, QXLCommandExt *ext)SimpleSpiceDisplay *ssd =container_of (sin, SimpleSpiceDisplay, qxl);int ret; -qemu_mutex_lock (&ssd->lock); +QEMU_LOCK_GUARD (&ssd->lock);if (ssd->ptr_define) { *ext = ssd->ptr_define->ext; ssd->ptr_define =NULL ;
@@ -592,7 +593,6 @@ static int interface_get_cursor_command(QXLInstance *sin, QXLCommandExt *ext) }else { ret = false; } -qemu_mutex_unlock (&ssd->lock);return ret; }
util/log.c +2 -2
@@ -25,6 +25,7 @@#include "qemu/cutils.h" #include "trace/control.h" #include "qemu/thread.h" +#include "qemu/lockable.h" static char *logfilename;static QemuMutex qemu_logfile_mutex;
@@ -94,7 +95,7 @@ void qemu_set_log(int log_flags)if (qemu_loglevel && (!is_daemonized () || logfilename)) { need_to_open_file = true; } -qemu_mutex_lock (&qemu_logfile_mutex); +QEMU_LOCK_GUARD (&qemu_logfile_mutex);if (qemu_logfile && !need_to_open_file) { logfile = qemu_logfile;atomic_rcu_set (&qemu_logfile,NULL );
@@ -136,7 +137,6 @@ void qemu_set_log(int log_flags) }atomic_rcu_set (&qemu_logfile, logfile); } -qemu_mutex_unlock (&qemu_logfile_mutex); }void qemu_log_needs_buffers (void )
util/qemu-timer.c +8 -9
@@ -459,17 +459,16 @@ void timer_mod_anticipate_ns(QEMUTimer *ts, int64_t expire_time)QEMUTimerList *timer_list = ts->timer_list;bool rearm; -qemu_mutex_lock (&timer_list->active_timers_lock); -if (ts->expire_time ==-1 || ts->expire_time > expire_time) { -if (ts->expire_time !=-1 ) { -timer_del_locked (timer_list, ts); + WITH_QEMU_LOCK_GUARD(&timer_list->active_timers_lock) { +if (ts->expire_time ==-1 || ts->expire_time > expire_time) { +if (ts->expire_time !=-1 ) { +timer_del_locked (timer_list, ts); + } + rearm =timer_mod_ns_locked (timer_list, ts, expire_time); + }else { + rearm = false; } - rearm =timer_mod_ns_locked (timer_list, ts, expire_time); - }else { - rearm = false; } -qemu_mutex_unlock (&timer_list->active_timers_lock); -if (rearm) {timerlist_rearm (timer_list); }
util/rcu.c +3 -5
@@ -31,6 +31,7 @@#include "qemu/atomic.h" #include "qemu/thread.h" #include "qemu/main-loop.h" +#include "qemu/lockable.h" #if defined(CONFIG_MALLOC_TRIM )#include <malloc.h> #endif
@@ -141,14 +142,14 @@ static void wait_for_readers(void)void synchronize_rcu (void ) { -qemu_mutex_lock (&rcu_sync_lock); +QEMU_LOCK_GUARD (&rcu_sync_lock);/* Write RCU-protected pointers before reading p_rcu_reader->ctr. * Pairs with smp_mb_placeholder() in rcu_read_lock(). */ smp_mb_global (); -qemu_mutex_lock (&rcu_registry_lock); +QEMU_LOCK_GUARD (&rcu_registry_lock);if (!QLIST_EMPTY (®istry)) {/* In either case, the atomic_mb_set below blocks stores that free * old RCU-protected pointers.
@@ -169,9 +170,6 @@ void synchronize_rcu(void)wait_for_readers (); } - -qemu_mutex_unlock (&rcu_registry_lock); -qemu_mutex_unlock (&rcu_sync_lock); }
util/thread-pool.c +1 -2
@@ -210,7 +210,7 @@ static void thread_pool_cancel(BlockAIOCB *acb)trace_thread_pool_cancel (elem, elem->common.opaque); -qemu_mutex_lock (&pool->lock); +QEMU_LOCK_GUARD (&pool->lock); if (elem->state == THREAD_QUEUED &&/* No thread has yet started working on elem. we can try to "steal" * the item from the worker if we can get a signal from the
@@ -225,7 +225,6 @@ static void thread_pool_cancel(BlockAIOCB *acb) elem->ret = -ECANCELED ; } -qemu_mutex_unlock (&pool->lock); }static AioContext *thread_pool_get_aio_context (BlockAIOCB *acb)
util/vfio-helpers.c +2 -2
@@ -21,6 +21,7 @@#include "standard-headers/linux/pci_regs.h" #include "qemu/event_notifier.h" #include "qemu/vfio-helpers.h" +#include "qemu/lockable.h" #include "trace.h" #define QEMU_VFIO_DEBUG 0
@@ -667,14 +668,13 @@ int qemu_vfio_dma_reset_temporary(QEMUVFIOState *s) .size = QEMU_VFIO_IOVA_MAX - s->high_water_mark, };trace_qemu_vfio_dma_reset_temporary (s); -qemu_mutex_lock (&s->lock); +QEMU_LOCK_GUARD (&s->lock);if (ioctl (s->container,VFIO_IOMMU_UNMAP_DMA , &unmap)) {error_report ("VFIO_UNMAP_DMA failed: %s" ,strerror (errno));qemu_mutex_unlock (&s->lock);return -errno; } s->high_water_mark =QEMU_VFIO_IOVA_MAX ; -qemu_mutex_unlock (&s->lock);return 0 ; }
Signature · 1 line
2.25.1
Re: [PATCH v2 2/2] lockable: replaced locks with lock guard macros where appropriate
Quoted 13 lines · On 20/03/20 00:34, [email protected] wrote:
index
682abd8e09..89f8a656a4100644block/iscsi.c +1
-1@@ -1086,7 +1086,7 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, acb->task->expxferlen = acb->ioh->dxfer_len; data.size =0 ; -qemu_mutex_lock (&iscsilun->mutex); +QEMU_LOCK_GUARD (&iscsilun->mutex);if (acb->task->xfer_dir ==SCSI_XFER_WRITE ) {if (acb->ioh->iovec_count ==0 ) { data.data = acb->ioh->dxferp;
block/iscsi.c static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, · line 1107
Quoted 7 lines
block/iscsi.c +0
-1@@ -1102,7 +1102,6 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, iscsi_aio_ioctl_cb, (data.size > 0) ? &data : NULL, acb) != 0) { -qemu_mutex_unlock (&iscsilun->mutex);scsi_free_scsi_task (acb->task);qemu_aio_unref (acb);return NULL ;
Not exactly the same, should be okay but it also should be noted in the changelog.
block/iscsi.c
Quoted 7 lines
void
cpu_list_remove(CPUState *cpu)
{block/iscsi.c +1
-1-qemu_mutex_lock (&qemu_cpu_list_lock); +QEMU_LOCK_GUARD (&qemu_cpu_list_lock);if (!QTAILQ_IN_USE (cpu, node)) {/* there is nothing to undo since cpu_exec_init() hasn't been called */ qemu_mutex_unlock (&qemu_cpu_list_lock);
Missed unlock.
Quoted 5 lines
block/iscsi.c +0
-0@@ -667,14 +668,13 @@ int qemu_vfio_dma_reset_temporary(QEMUVFIOState *s) .size = QEMU_VFIO_IOVA_MAX - s->high_water_mark, };trace_qemu_vfio_dma_reset_temporary (s);
block/iscsi.c int qemu_vfio_dma_reset_temporary(QEMUVFIOState *s) · line 678
Quoted 10 lines
block/iscsi.c +1
-2-qemu_mutex_lock (&s->lock); +QEMU_LOCK_GUARD (&s->lock);if (ioctl (s->container,VFIO_IOMMU_UNMAP_DMA , &unmap)) {error_report ("VFIO_UNMAP_DMA failed: %s" ,strerror (errno));qemu_mutex_unlock (&s->lock);return -errno; } s->high_water_mark =QEMU_VFIO_IOVA_MAX ; -qemu_mutex_unlock (&s->lock);return 0 ;
Missed unlock.
Otherwise looks good.
Paolo
Re: [PATCH v2 2/2] lockable: replaced locks with lock guard macros where appropriate
Quoted 17 lines · Paolo Bonzini
Quoted 15 lines · On 20/03/20 00:34, [email protected] wrote:
index
682abd8e09..89f8a656a4100644block/iscsi.c +1
-1@@ -1086,7 +1086,7 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, acb->task->expxferlen = acb->ioh->dxfer_len; data.size =0 ; -qemu_mutex_lock (&iscsilun->mutex); +QEMU_LOCK_GUARD (&iscsilun->mutex);if (acb->task->xfer_dir ==SCSI_XFER_WRITE ) {if (acb->ioh->iovec_count ==0 ) { data.data = acb->ioh->dxferp;@@ -1102,7 +1102,6 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, iscsi_aio_ioctl_cb, (data.size > 0) ? &data : NULL,
Quoted 8 lines
block/iscsi.c static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, · line 1107
Quoted 5 lines
block/iscsi.c +0
-1acb) != 0) { -qemu_mutex_unlock (&iscsilun->mutex);scsi_free_scsi_task (acb->task);qemu_aio_unref (acb);return NULL ;Not exactly the same, should be okay but it also should be noted in the changelog.
Going to drop this change in the next version, I don't want this patch to include cases
with possible side effects as I skipped other ones like this already.
Quoted 9 lines
block/iscsi.c
Quoted 7 lines
void
cpu_list_remove(CPUState *cpu)
{block/iscsi.c +1
-1-qemu_mutex_lock (&qemu_cpu_list_lock); +QEMU_LOCK_GUARD (&qemu_cpu_list_lock);if (!QTAILQ_IN_USE (cpu, node)) {/* there is nothing to undo since cpu_exec_init() hasn't been called */ qemu_mutex_unlock (&qemu_cpu_list_lock);
Quoted 6 lines
Missed unlock.
Otherwise looks good.
Paolo
Thanks for the review, I'll fix the changes you pointed out in the next version.
Daniel