Changeset 9d1685b in mainline

Timestamp:

2025-06-17T14:14:09Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

a3486f2

Parents:

b22ea202

Message:

hr: ENOMEM safe wrappers for block_direct_* ops

Location:

uspace/srv/bd/hr

Files:

• fge.c (modified) (1 diff)
• io.c (modified) (1 diff)
• io.h (modified) (1 diff)

uspace/srv/bd/hr/fge.c

@@ -327 +327 @@
                         fibril_mutex_lock(&group->lock);
                         group->finished_fail++;
-                        if (rc == ENOMEM)
-                                group->final_errno = ENOMEM;
+                        if (rc == EAGAIN)
+                                group->final_errno = EAGAIN;
                         fibril_mutex_unlock(&group->lock);
                 }

uspace/srv/bd/hr/io.c

@@ -46 +46 @@
 
 static errno_t exec_io_op(hr_io_t *);
+
+/** Wrapper for block_write_direct(), never returns ENOMEM */
+errno_t hr_write_direct(service_id_t service_id, uint64_t ba, size_t cnt,
+    const void *data)
+{
+        errno_t rc;
+        while ((rc = block_write_direct(service_id, ba, cnt, data)) == ENOMEM)
+                fibril_usleep(MSEC2USEC(250)); /* sleep 250ms */
+
+        if (rc == EAGAIN)
+                rc = EIO;
+
+        return rc;
+}
+
+/** Wrapper for block_read_direct(), never returns ENOMEM */
+errno_t hr_read_direct(service_id_t service_id, uint64_t ba, size_t cnt,
+    void *data)
+{
+        errno_t rc;
+        while ((rc = block_read_direct(service_id, ba, cnt, data)) == ENOMEM)
+                fibril_usleep(MSEC2USEC(250)); /* sleep 250ms */
+
+        if (rc == EAGAIN)
+                rc = EIO;
+
+        return rc;
+}
+
+/** Wrapper for block_sync_cache(), never returns ENOMEM */
+errno_t hr_sync_cache(service_id_t service_id, uint64_t ba, size_t cnt)
+{
+        errno_t rc;
+        while ((rc = block_sync_cache(service_id, ba, cnt)) == ENOMEM)
+                fibril_usleep(MSEC2USEC(250)); /* sleep 250ms */
+
+        if (rc == EAGAIN)
+                rc = EIO;
+
+        return rc;
+}
 
 errno_t hr_io_worker(void *arg)

uspace/srv/bd/hr/io.h

@@ -52 +52 @@
 errno_t hr_io_worker_basic(void *);
 
+extern errno_t hr_write_direct(service_id_t, uint64_t, size_t, const void *);
+extern errno_t hr_read_direct(service_id_t, uint64_t, size_t, void *);
+extern errno_t hr_sync_cache(service_id_t, uint64_t, size_t);
+
 #endif