From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>,
qemu-block@nongnu.org, "Klaus Jensen" <k.jensen@samsung.com>,
"Auger Eric" <eric.auger@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v2 03/11] util/vfio-helpers: Replace qemu_mutex_lock() calls with QEMU_LOCK_GUARD
Date: Thu, 26 Aug 2021 21:50:06 +0200 [thread overview]
Message-ID: <20210826195014.2180369-4-philmd@redhat.com> (raw)
In-Reply-To: <20210826195014.2180369-1-philmd@redhat.com>
Simplify qemu_vfio_dma_[un]map() handlers by replacing a pair of
qemu_mutex_lock/qemu_mutex_unlock calls by the WITH_QEMU_LOCK_GUARD
macro.
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
util/vfio-helpers.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index 1d149136299..d956866b4e9 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -735,7 +735,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,
assert(QEMU_PTR_IS_ALIGNED(host, qemu_real_host_page_size));
assert(QEMU_IS_ALIGNED(size, qemu_real_host_page_size));
trace_qemu_vfio_dma_map(s, host, size, temporary, iova);
- qemu_mutex_lock(&s->lock);
+ QEMU_LOCK_GUARD(&s->lock);
mapping = qemu_vfio_find_mapping(s, host, &index);
if (mapping) {
iova0 = mapping->iova + ((uint8_t *)host - (uint8_t *)mapping->host);
@@ -778,7 +778,6 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,
*iova = iova0;
}
out:
- qemu_mutex_unlock(&s->lock);
return ret;
}
@@ -813,14 +812,12 @@ void qemu_vfio_dma_unmap(QEMUVFIOState *s, void *host)
}
trace_qemu_vfio_dma_unmap(s, host);
- qemu_mutex_lock(&s->lock);
+ QEMU_LOCK_GUARD(&s->lock);
m = qemu_vfio_find_mapping(s, host, &index);
if (!m) {
- goto out;
+ return;
}
qemu_vfio_undo_mapping(s, m, NULL);
-out:
- qemu_mutex_unlock(&s->lock);
}
static void qemu_vfio_reset(QEMUVFIOState *s)
--
2.31.1
next prev parent reply other threads:[~2021-08-26 19:57 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 19:50 [PATCH v2 00/11] block/nvme: Rework error reporting Philippe Mathieu-Daudé
2021-08-26 19:50 ` [PATCH v2 01/11] block/nvme: Use safer trace format string Philippe Mathieu-Daudé
2021-08-26 19:50 ` [PATCH v2 02/11] util/vfio-helpers: Let qemu_vfio_verify_mappings() use error_report() Philippe Mathieu-Daudé
2021-08-27 5:52 ` Klaus Jensen
2021-08-26 19:50 ` Philippe Mathieu-Daudé [this message]
2021-08-26 19:50 ` [PATCH v2 04/11] util/vfio-helpers: Remove unreachable code in qemu_vfio_dma_map() Philippe Mathieu-Daudé
2021-08-26 19:50 ` [PATCH v2 05/11] block/nvme: Have nvme_create_queue_pair() report errors consistently Philippe Mathieu-Daudé
2021-08-27 5:54 ` Klaus Jensen
2021-08-26 19:50 ` [PATCH v2 06/11] util/vfio-helpers: Pass Error handle to qemu_vfio_dma_map() Philippe Mathieu-Daudé
2021-08-27 5:48 ` Klaus Jensen
2021-08-27 6:24 ` Philippe Mathieu-Daudé
2021-08-27 6:29 ` Klaus Jensen
2021-08-26 19:50 ` [PATCH v2 07/11] util/vfio-helpers: Extract qemu_vfio_water_mark_reached() Philippe Mathieu-Daudé
2021-08-27 5:55 ` Klaus Jensen
2021-08-26 19:50 ` [PATCH v2 08/11] util/vfio-helpers: Use error_setg in qemu_vfio_find_[fixed/temp]_iova Philippe Mathieu-Daudé
2021-08-27 5:57 ` Klaus Jensen
2021-08-27 6:25 ` Philippe Mathieu-Daudé
2021-08-26 19:50 ` [PATCH v2 09/11] util/vfio-helpers: Simplify qemu_vfio_dma_map() returning directly Philippe Mathieu-Daudé
2021-08-27 5:58 ` Klaus Jensen
2021-08-26 19:50 ` [PATCH v2 10/11] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error Philippe Mathieu-Daudé
2021-08-27 5:59 ` Klaus Jensen
2021-08-26 19:50 ` [PATCH v2 11/11] block/nvme: Only report VFIO error on failed retry Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210826195014.2180369-4-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=eric.auger@redhat.com \
--cc=fam@euphon.net \
--cc=hreitz@redhat.com \
--cc=k.jensen@samsung.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).