[v2,07/11] util/vfio-helpers: Extract qemu_vfio_water_mark_reached()

Commit Message

Philippe Mathieu-Daudé Aug. 26, 2021, 7:50 p.m. UTC

Extract qemu_vfio_water_mark_reached() for readability,
and have it provide an error hint it its Error* handle.

Suggested-by: Klaus Jensen <[e-mail]>
Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
---
 util/vfio-helpers.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

Comments

Klaus Jensen Aug. 27, 2021, 5:55 a.m. UTC | #1

On Aug 26 21:50, Philippe Mathieu-Daudé wrote:
> Extract qemu_vfio_water_mark_reached() for readability,
> and have it provide an error hint it its Error* handle.
> 
> Suggested-by: Klaus Jensen <[e-mail]>
> Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>

Reviewed-by: Klaus Jensen <[e-mail]>

Patch

diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index 77cdec845d9..306b5a83e48 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -721,6 +721,21 @@  qemu_vfio_find_temp_iova(QEMUVFIOState *s, size_t size, uint64_t *iova)
     return -ENOMEM;
 }
 
+/**
+ * qemu_vfio_water_mark_reached:
+ *
+ * Returns %true if high watermark has been reached, %false otherwise.
+ */
+static bool qemu_vfio_water_mark_reached(QEMUVFIOState *s, size_t size,
+                                         Error **errp)
+{
+    if (s->high_water_mark - s->low_water_mark + 1 < size) {
+        error_setg(errp, "iova exhausted (water mark reached)");
+        return true;
+    }
+    return false;
+}
+
 /* Map [host, host + size) area into a contiguous IOVA address space, and store
  * the result in @iova if not NULL. The caller need to make sure the area is
  * aligned to page size, and mustn't overlap with existing mapping areas (split
@@ -742,7 +757,7 @@  int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,
     if (mapping) {
         iova0 = mapping->iova + ((uint8_t *)host - (uint8_t *)mapping->host);
     } else {
-        if (s->high_water_mark - s->low_water_mark + 1 < size) {
+        if (qemu_vfio_water_mark_reached(s, size, errp)) {
             ret = -ENOMEM;
             goto out;
         }