Changeset f0360ec in mainline

Timestamp:

2025-06-17T22:33:02Z (5 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

f0cc1c64

Parents:

3c518fc

Message:

hr: RAID 0, 1: use ENOMEM safe primitives

Location:

uspace/srv/bd/hr

Files:

• io.c (modified) (3 diffs)
• io.h (modified) (2 diffs)
• raid0.c (modified) (2 diffs)
• raid1.c (modified) (6 diffs)
• raid5.c (modified) (1 diff)
• util.c (modified) (1 diff)

uspace/srv/bd/hr/io.c

@@ -48 +48 @@
 #include "var.h"
 
-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,
@@ -95 +93 @@
         hr_io_t *io = arg;
 
-        errno_t rc = exec_io_op(io);
-
-        /*
-         * We don't have to invalidate extents who got ENOMEM
-         * on READ/SYNC. But when we get ENOMEM on a WRITE, we have
-         * to invalidate it, because there could have been
-         * other writes, there is no way to rollback.
-         */
-        if (rc != EOK && (rc != ENOMEM || io->type == HR_BD_WRITE))
-                io->vol->hr_ops.ext_state_cb(io->vol, io->extent, rc);
-
-        return rc;
-}
-
-errno_t hr_io_worker_basic(void *arg)
-{
-        hr_io_t *io = arg;
-
-        errno_t rc = exec_io_op(io);
+        errno_t rc;
+        size_t e = io->extent;
+        hr_extent_t *extents = (hr_extent_t *)&io->vol->extents;
+
+        switch (io->type) {
+        case HR_BD_READ:
+                rc = hr_read_direct(extents[e].svc_id, io->ba, io->cnt,
+                    io->data_read);
+                break;
+        case HR_BD_WRITE:
+                rc = hr_write_direct(extents[e].svc_id, io->ba, io->cnt,
+                    io->data_write);
+                break;
+        default:
+                assert(0);
+        }
+
+        if (rc != EOK)
+                io->vol->hr_ops.ext_state_cb(io->vol, io->extent, rc);
 
         return rc;
@@ -322 +320 @@
 }
 
-static errno_t exec_io_op(hr_io_t *io)
-{
-        size_t ext_idx = io->extent;
-        hr_extent_t *extents = (hr_extent_t *)&io->vol->extents;
-        errno_t rc;
-
-        const char *debug_type_str = NULL;
-        switch (io->type) {
-        case HR_BD_SYNC:
-                debug_type_str = "SYNC";
-                break;
-        case HR_BD_READ:
-                debug_type_str = "READ";
-                break;
-        case HR_BD_WRITE:
-                debug_type_str = "WRITE";
-                break;
-        }
-
-        HR_DEBUG("%s WORKER (%p) on extent: %zu, ba: %" PRIu64 ", "
-            "cnt: %" PRIu64 "\n",
-            debug_type_str, io, io->extent, io->ba, io->cnt);
-
-        switch (io->type) {
-        case HR_BD_SYNC:
-                rc = block_sync_cache(extents[ext_idx].svc_id,
-                    io->ba, io->cnt);
-                if (rc == ENOTSUP)
-                        rc = EOK;
-                break;
-        case HR_BD_READ:
-                rc = block_read_direct(extents[ext_idx].svc_id, io->ba,
-                    io->cnt, io->data_read);
-                break;
-        case HR_BD_WRITE:
-                rc = block_write_direct(extents[ext_idx].svc_id, io->ba,
-                    io->cnt, io->data_write);
-                break;
-        default:
-                assert(0);
-        }
-
-        HR_DEBUG("WORKER (%p) rc: %s\n", io, str_error(rc));
-
-        return rc;
-}
-
 /** @}
  */

uspace/srv/bd/hr/io.h

@@ -42 +42 @@
 
 typedef struct hr_io {
-        hr_bd_op_type_t type; /* read/write/sync */
+        hr_bd_op_type_t type; /* read/write */
         uint64_t ba;
         uint64_t cnt;
@@ -67 +67 @@
 
 extern errno_t hr_io_worker(void *);
-extern errno_t hr_io_worker_basic(void *);
 
 extern errno_t hr_io_raid5_basic_reader(void *);

uspace/srv/bd/hr/raid0.c

@@ -280 +280 @@
 
         hr_fgroup_t *group = hr_fgroup_create(vol->fge, span);
-        if (group == NULL)
-                return ENOMEM;
 
         while (left != 0) {
@@ -316 +314 @@
 
         size_t bad;
-        rc = hr_fgroup_wait(group, NULL, &bad);
-        if (rc == ENOMEM && type == HR_BD_READ)
-                return ENOMEM;
+        (void)hr_fgroup_wait(group, NULL, &bad);
 
         if (bad > 0)

uspace/srv/bd/hr/raid1.c

@@ -174 +174 @@
 
         switch (rc) {
-        case ENOMEM:
-                hr_update_ext_state(vol, extent, HR_EXT_INVALID);
-                break;
         case ENOENT:
                 hr_update_ext_state(vol, extent, HR_EXT_MISSING);
@@ -372 +369 @@
                         }
 
-                        rc = block_read_direct(vol->extents[i].svc_id, ba, cnt,
+                        rc = hr_read_direct(vol->extents[i].svc_id, ba, cnt,
                             data_read);
-
-                        if (rc == ENOMEM && i + 1 == vol->extent_no)
-                                goto end;
-
-                        if (rc == ENOMEM)
-                                continue;
-
                         if (rc != EOK) {
                                 hr_raid1_ext_state_cb(vol, i, rc);
@@ -389 +379 @@
                 }
                 break;
-        case HR_BD_SYNC:
         case HR_BD_WRITE:
-                if (type == HR_BD_WRITE) {
-                        rl = hr_range_lock_acquire(vol, ba, cnt);
-                        if (rl == NULL) {
-                                rc = ENOMEM;
-                                goto end;
-                        }
-                }
+                rl = hr_range_lock_acquire(vol, ba, cnt);
 
                 fibril_rwlock_read_lock(&vol->states_lock);
@@ -408 +391 @@
 
                 hr_fgroup_t *group = hr_fgroup_create(vol->fge, good);
-                if (group == NULL) {
-                        if (type == HR_BD_WRITE)
-                                hr_range_lock_release(rl);
-                        rc = ENOMEM;
-                        fibril_rwlock_read_unlock(&vol->states_lock);
-                        goto end;
-                }
 
                 for (i = 0; i < vol->extent_no; i++) {
@@ -446 +422 @@
                 (void)hr_fgroup_wait(group, &successful, NULL);
 
-                if (type == HR_BD_WRITE)
-                        hr_range_lock_release(rl);
+                hr_range_lock_release(rl);
 
                 break;
         default:
-                rc = EINVAL;
-                goto end;
+                assert(0);
         }
 
@@ -460 +434 @@
                 rc = EIO;
 
-end:
         fibril_rwlock_read_unlock(&vol->extents_lock);
 

uspace/srv/bd/hr/raid5.c

@@ -180 +180 @@
 
         switch (rc) {
-        case ENOMEM:
-                hr_update_ext_state(vol, extent, HR_EXT_INVALID);
-                break;
         case ENOENT:
                 hr_update_ext_state(vol, extent, HR_EXT_MISSING);

uspace/srv/bd/hr/util.c

@@ -524 +524 @@
     uint64_t cnt)
 {
-        hr_range_lock_t *rl = malloc(sizeof(hr_range_lock_t));
-        if (rl == NULL)
-                return NULL;
+        hr_range_lock_t *rl = malloc_waitok(sizeof(hr_range_lock_t));
 
         return hr_range_lock_acquire_internal(rl, vol, ba, cnt);