Changeset d082801 in mainline

Timestamp:

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

Author:

Miroslav Cimerman <mc@…>

Children:

746e636

Parents:

1a28518

Message:

hr: refactor manual assembly

Location:

uspace

Files:

• app/hrctl/hrctl.c (modified) (6 diffs)
• lib/device/include/hr.h (modified) (1 diff)
• lib/device/src/hr.c (modified) (4 diffs)
• srv/bd/hr/hr.c (modified) (6 diffs)
• srv/bd/hr/util.c (modified) (2 diffs)
• srv/bd/hr/util.h (modified) (2 diffs)

uspace/app/hrctl/hrctl.c

@@ -62 +62 @@
     "  -F, --fail-extent         fail an extent, use with -D and set it before\n"
     "  -c, --create=NAME         create new array\n"
-    "  -a, --assemble=NAME       assemble from specified extents\n"
+    "  -a, --assemble            try to assemble from specified extents\n"
     "  -n                        non-zero number of devices\n"
     "  -l, --level=LEVEL         set the RAID level,\n"
@@ -78 +78 @@
     "    - creates new mirroring RAID device named /hr0 consisting\n"
     "      of 2 drives\n"
-    "  hrctl --assemble hr0 -n 2 devices/\\hw\\0 devices/\\hw\\1\n"
-    "    - assembles RAID device named /hr0 consisting of 2 drives,\n"
-    "      that were previously in an array\n"
+    "  hrctl --assemble -n 2 devices/\\hw\\0 devices/\\hw\\1\n"
+    "    - assembles RAID devices from specified extents,\n"
+    "      that were previously in an (active) array\n"
     "  hrctl devices/hr0 --hotspare=devices/disk10\n"
     "    - adds \"devices/disk10\" as hotspare extent\n"
@@ -91 +91 @@
         { "help", no_argument, 0, 'h' },
         { "status", no_argument, 0, 's' },
-        { "assemble", required_argument, 0, 'a' },
+        { "assemble", no_argument, 0, 'a' },
         { "create", required_argument, 0, 'c' },
         { "level", required_argument, 0, 'l' },
@@ -253 +253 @@
 
         while (c != -1) {
-                c = getopt_long(argc, argv, "hsC:c:Aa:l:0145Ln:D:F:H:",
+                c = getopt_long(argc, argv, "hsC:c:Aal:0145Ln:D:F:H:",
                     long_options, NULL);
                 switch (c) {
@@ -294 +294 @@
                         return rc;
                 case 'a':
-                        if (str_size(optarg) > sizeof(cfg->devname) - 1) {
-                                printf("hrctl: device name too long\n");
-                                free(cfg);
-                                return 1;
-                        }
-                        str_cpy(cfg->devname, sizeof(cfg->devname), optarg);
+                        /*
+                         * XXX: redo this, no devname, only svc ids...
+                         *
+                         * find some other way to rename the arrays...,
+                         *
+                         * some metadata editation tool... something like
+                         * fdisk but can only change devnames on inactive
+                         * extents...
+                         */
+
+                        /*
+                         * XXX: remake whole parsing, don't allow -a
+                         * to have any levels set or anything
+                         */
                         assemble = true;
                         break;
@@ -414 +422 @@
 
         if (create) {
-                rc = hr_create(hr, cfg, false);
+                rc = hr_create(hr, cfg);
                 printf("hrctl: hr_create() rc: %s\n", str_error(rc));
         } else if (assemble) {
-                rc = hr_create(hr, cfg, true);
-                printf("hrctl: hr_assemble() rc: %s\n", str_error(rc));
+                size_t assembled_cnt = 0;
+                rc = hr_assemble(hr, cfg, &assembled_cnt);
+                if (rc != EOK) {
+                        /* XXX: here have own error codes */
+                        printf("hrctl: auto assemble rc: %s\n", str_error(rc));
+                } else {
+                        printf("hrctl: auto assembled %lu volumes\n",
+                            assembled_cnt);
+                }
+
         }
 

uspace/lib/device/include/hr.h

@@ -117 +117 @@
 extern errno_t           hr_sess_init(hr_t **);
 extern void              hr_sess_destroy(hr_t *);
-extern errno_t           hr_create(hr_t *, hr_config_t *, bool);
+extern errno_t           hr_create(hr_t *, hr_config_t *);
+extern errno_t           hr_assemble(hr_t *, hr_config_t *, size_t *);
 extern errno_t           hr_auto_assemble(size_t *);
 extern errno_t           hr_stop(const char *, long);

uspace/lib/device/src/hr.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Miroslav Cimerman
+ * Copyright (c) 2025 Miroslav Cimerman
  * All rights reserved.
  *
@@ -88 +88 @@
 }
 
-errno_t hr_create(hr_t *hr, hr_config_t *hr_config, bool assemble)
+errno_t hr_create(hr_t *hr, hr_config_t *hr_config)
 {
         errno_t rc, retval;
@@ -98 +98 @@
                 return EINVAL;
 
-        req = async_send_0(exch, assemble ? HR_ASSEMBLE : HR_CREATE, NULL);
+        req = async_send_0(exch, HR_CREATE, NULL);
 
         rc = async_data_write_start(exch, hr_config, sizeof(hr_config_t));
@@ -113 +113 @@
 
         return EOK;
+}
+
+errno_t hr_assemble(hr_t *hr, hr_config_t *hr_config, size_t *rassembled_cnt)
+{
+        errno_t rc;
+        async_exch_t *exch;
+        aid_t req;
+        size_t assembled_cnt;
+
+        exch = async_exchange_begin(hr->sess);
+        if (exch == NULL)
+                return EINVAL;
+
+        req = async_send_0(exch, HR_ASSEMBLE, NULL);
+
+        rc = async_data_write_start(exch, hr_config, sizeof(hr_config_t));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+
+        rc = async_data_read_start(exch, &assembled_cnt, sizeof(size_t));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+
+        async_exchange_end(exch);
+        async_wait_for(req, &rc);
+
+        if (rassembled_cnt != NULL)
+                *rassembled_cnt = assembled_cnt;
+
+        return rc;
 }
 

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);