Changeset d082801 in mainline for uspace/srv

Timestamp:

2025-03-29T14:04:37Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

746e636

Parents:

1a28518

Message:

hr: refactor manual assembly

Location:

uspace/srv/bd/hr

Files:

• hr.c (modified) (6 diffs)
• util.c (modified) (2 diffs)
• util.h (modified) (2 diffs)

uspace/srv/bd/hr/hr.c

@@ -79 +79 @@
 
         if (size != sizeof(size_t)) {
+                async_answer_0(&call, EINVAL);
                 async_answer_0(icall, EINVAL);
                 return;
         }
 
-        rc = hr_util_try_auto_assemble(&assembled_cnt);
-        if (rc != EOK) {
-                async_answer_0(&call, rc);
-                async_answer_0(icall, rc);
-                return;
-        }
+        rc = hr_util_try_assemble(NULL, &assembled_cnt);
+        if (rc != EOK)
+                goto error;
 
         rc = async_data_read_finalize(&call, &assembled_cnt, size);
-        if (rc != EOK) {
-                async_answer_0(&call, rc);
-                async_answer_0(icall, rc);
-                return;
-        }
+        if (rc != EOK)
+                goto error;
 
         async_answer_0(icall, EOK);
-}
-
-static void hr_create_srv(ipc_call_t *icall, bool assemble)
+        return;
+error:
+        async_answer_0(&call, rc);
+        async_answer_0(icall, rc);
+}
+
+static void hr_assemble_srv(ipc_call_t *icall)
+{
+        HR_DEBUG("%s()", __func__);
+
+        errno_t rc;
+        size_t size, assembled_cnt;
+        hr_config_t *cfg;
+        ipc_call_t call;
+
+        if (!async_data_write_receive(&call, &size)) {
+                async_answer_0(&call, EREFUSED);
+                async_answer_0(icall, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(hr_config_t)) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        cfg = calloc(1, sizeof(hr_config_t));
+        if (cfg == NULL) {
+                async_answer_0(&call, ENOMEM);
+                async_answer_0(icall, ENOMEM);
+                return;
+        }
+
+        rc = async_data_write_finalize(&call, cfg, size);
+        if (rc != EOK)
+                goto error;
+
+        if (!async_data_read_receive(&call, &size)) {
+                async_answer_0(icall, EREFUSED);
+                return;
+        }
+
+        if (size != sizeof(size_t)) {
+                async_answer_0(icall, EINVAL);
+                return;
+        }
+
+        rc = hr_util_try_assemble(cfg, &assembled_cnt);
+        if (rc != EOK)
+                goto error;
+
+        rc = async_data_read_finalize(&call, &assembled_cnt, size);
+        if (rc != EOK)
+                goto error;
+
+        free(cfg);
+        async_answer_0(icall, EOK);
+        return;
+error:
+        free(cfg);
+        async_answer_0(&call, rc);
+        async_answer_0(icall, rc);
+}
+
+static void hr_create_srv(ipc_call_t *icall)
 {
         HR_DEBUG("%s()", __func__);
@@ -141 +199 @@
          * for creation of a new array, abort
          */
-        if (!assemble) {
-                for (i = 0; i < cfg->dev_no; i++) {
-                        if (cfg->devs[i] == 0) {
-                                /*
-                                 * XXX: own error codes, no need to log this...
-                                 * its user error not service error
-                                 */
-                                HR_ERROR("missing device provided for array "
-                                    "creation, aborting");
-                                free(cfg);
-                                async_answer_0(icall, EINVAL);
-                                return;
-                        }
+        for (i = 0; i < cfg->dev_no; i++) {
+                if (cfg->devs[i] == 0) {
+                        /*
+                         * XXX: own error codes, no need to log this...
+                         * its user error not service error
+                         */
+                        HR_ERROR("missing device provided for array "
+                            "creation, aborting");
+                        free(cfg);
+                        async_answer_0(icall, EINVAL);
+                        return;
                 }
         }
@@ -170 +226 @@
         new_volume->extent_no = cfg->dev_no;
 
+        /* XXX: do proper initing ... */
         rc = hr_init_devs(new_volume);
         if (rc != EOK) {
@@ -178 +235 @@
         }
 
-        if (assemble) {
-                if (cfg->level != HR_LVL_UNKNOWN)
-                        HR_DEBUG("level manually set when assembling, ingoring");
-                new_volume->level = HR_LVL_UNKNOWN;
-        }
-
-        if (assemble) {
-                /* just bsize needed for reading metadata later */
-                rc = hr_check_devs(new_volume, NULL, &new_volume->bsize);
-                if (rc != EOK)
-                        goto error;
-
-                rc = hr_fill_vol_from_meta(new_volume);
-                if (rc != EOK)
-                        goto error;
-        }
-
-        if (!assemble) {
-                new_volume->hr_ops.init(new_volume);
-                if (rc != EOK)
-                        goto error;
-
-                rc = hr_write_meta_to_vol(new_volume);
-                if (rc != EOK)
-                        goto error;
-        }
+        new_volume->hr_ops.init(new_volume);
+        if (rc != EOK)
+                goto error;
+
+        rc = hr_write_meta_to_vol(new_volume);
+        if (rc != EOK)
+                goto error;
 
         rc = new_volume->hr_ops.create(new_volume);
@@ -217 +255 @@
         fibril_rwlock_write_unlock(&hr_volumes_lock);
 
-        if (assemble) {
-                HR_DEBUG("assembled volume \"%s\" (%" PRIun ")\n",
-                    new_volume->devname, new_volume->svc_id);
-        } else {
-                HR_DEBUG("created volume \"%s\" (%" PRIun ")\n",
-                    new_volume->devname, new_volume->svc_id);
-        }
+        HR_DEBUG("created volume \"%s\" (%" PRIun ")\n", new_volume->devname,
+            new_volume->svc_id);
 
         free(cfg);
@@ -390 +423 @@
                 switch (method) {
                 case HR_CREATE:
-                        hr_create_srv(&call, false);
+                        hr_create_srv(&call);
                         break;
                 case HR_ASSEMBLE:
-                        hr_create_srv(&call, true);
+                        hr_assemble_srv(&call);
                         break;
                 case HR_AUTO_ASSEMBLE:

uspace/srv/bd/hr/util.c

@@ -875 +875 @@
 }
 
-errno_t hr_util_try_auto_assemble(size_t *rassembled_cnt)
+static errno_t hr_fill_svcs_list_from_cfg(hr_config_t *cfg, list_t *list)
+{
+        errno_t rc = EOK;
+        for (size_t i = 0; i < cfg->dev_no; ++i) {
+                rc = hr_add_svc_linked_to_list(list, cfg->devs[i], false, NULL);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        return EOK;
+error:
+        free_svc_id_list(list);
+        return rc;
+}
+
+errno_t hr_util_try_assemble(hr_config_t *cfg, size_t *rassembled_cnt)
 {
         HR_DEBUG("%s()", __func__);
@@ -897 +912 @@
 
         list_initialize(&dev_id_list);
-        rc = hr_fill_disk_part_svcs_list(&dev_id_list);
+
+        if (cfg == NULL)
+                rc = hr_fill_disk_part_svcs_list(&dev_id_list);
+        else
+                rc = hr_fill_svcs_list_from_cfg(cfg, &dev_id_list);
+
         if (rc != EOK)
                 goto error;

uspace/srv/bd/hr/util.h

@@ -38 +38 @@
 
 #include <errno.h>
+#include <hr.h>
 #include <io/log.h>
 
@@ -77 +78 @@
 extern hr_range_lock_t  *hr_range_lock_acquire(hr_volume_t *, uint64_t,
     uint64_t);
-extern errno_t           hr_util_try_auto_assemble(size_t *);
+extern errno_t           hr_util_try_assemble(hr_config_t *, size_t *);
 extern errno_t           hr_util_add_hotspare(hr_volume_t *, service_id_t);