Changeset d1d355f in mainline for uspace/srv

Timestamp:

2025-05-06T21:30:30Z (10 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

c2f0160

Parents:

40f56a4

Message:

hr: refactor hrctl and some hr IPC methods

Location:

uspace/srv/bd/hr

Files:

• hr.c (modified) (5 diffs)
• util.c (modified) (5 diffs)
• util.h (modified) (1 diff)

uspace/srv/bd/hr/hr.c

@@ -61 +61 @@
 static void hr_auto_assemble_srv(ipc_call_t *);
 static void hr_stop_srv(ipc_call_t *);
+static void hr_stop_all_srv(ipc_call_t *);
 static void hr_add_hotspare_srv(ipc_call_t *);
 static void hr_print_status_srv(ipc_call_t *);
@@ -163 +164 @@
         fibril_rwlock_write_unlock(&hr_volumes_lock);
 
-        HR_DEBUG("created volume \"%s\" (%" PRIun ")\n", vol->devname,
-            vol->svc_id);
+        HR_NOTE("created volume \"%s\"\n", vol->devname);
 
         free(cfg);
@@ -275 +275 @@
         errno_t rc = EOK;
         service_id_t svc_id;
-        long fail_extent;
         hr_volume_t *vol;
 
         svc_id = ipc_get_arg1(icall);
-        fail_extent = (long)ipc_get_arg2(icall);
 
         vol = hr_get_volume(svc_id);
@@ -287 +285 @@
         }
 
-        if (fail_extent == -1) {
-                rc = hr_remove_volume(svc_id);
-                if (rc != EOK) {
-                        async_answer_0(icall, rc);
-                        return;
+        rc = hr_remove_volume(vol);
+
+        async_answer_0(icall, rc);
+}
+
+static void hr_stop_all_srv(ipc_call_t *icall)
+{
+        HR_DEBUG("%s()", __func__);
+
+        hr_volume_t *vol;
+        errno_t rc = EOK;
+
+        while (true) {
+                fibril_rwlock_write_lock(&hr_volumes_lock);
+                if (list_empty(&hr_volumes)) {
+                        fibril_rwlock_write_unlock(&hr_volumes_lock);
+                        break;
                 }
-        } else {
-                fibril_rwlock_write_lock(&vol->states_lock);
-                fibril_rwlock_read_lock(&vol->extents_lock);
-
-                /* TODO: maybe expose extent state callbacks */
-                hr_update_ext_status(vol, fail_extent, HR_EXT_FAILED);
-                hr_mark_vol_state_dirty(vol);
-
-                fibril_rwlock_read_unlock(&vol->extents_lock);
-                fibril_rwlock_write_unlock(&vol->states_lock);
-
-                vol->hr_ops.status_event(vol);
-        }
-        async_answer_0(icall, rc);
+
+                vol = list_pop(&hr_volumes, hr_volume_t, lvolumes);
+
+                fibril_rwlock_write_unlock(&hr_volumes_lock);
+
+                rc = hr_remove_volume(vol);
+                if (rc != EOK)
+                        break;
+        }
+
+        async_answer_0(icall, rc);
+}
+
+static void hr_fail_extent_srv(ipc_call_t *icall)
+{
+        HR_DEBUG("%s()", __func__);
+
+        service_id_t svc_id;
+        size_t fail_extent;
+        hr_volume_t *vol;
+
+        svc_id = (service_id_t)ipc_get_arg1(icall);
+        fail_extent = (size_t)ipc_get_arg2(icall);
+
+        vol = hr_get_volume(svc_id);
+        if (vol == NULL) {
+                async_answer_0(icall, ENOENT);
+                return;
+        }
+
+        fibril_rwlock_write_lock(&vol->states_lock);
+        fibril_rwlock_read_lock(&vol->extents_lock);
+
+        hr_update_ext_status(vol, fail_extent, HR_EXT_FAILED);
+        hr_mark_vol_state_dirty(vol);
+
+        fibril_rwlock_read_unlock(&vol->extents_lock);
+        fibril_rwlock_write_unlock(&vol->states_lock);
+
+        vol->hr_ops.status_event(vol);
+
+        async_answer_0(icall, EOK);
 }
 
@@ -438 +476 @@
                         hr_stop_srv(&call);
                         break;
+                case HR_STOP_ALL:
+                        hr_stop_all_srv(&call);
+                        break;
+                case HR_FAIL_EXTENT:
+                        hr_fail_extent_srv(&call);
+                        break;
                 case HR_ADD_HOTSPARE:
                         hr_add_hotspare_srv(&call);

uspace/srv/bd/hr/util.c

@@ -162 +162 @@
 void hr_destroy_vol_struct(hr_volume_t *vol)
 {
+        HR_DEBUG("%s()", __func__);
+
         if (vol == NULL)
                 return;
@@ -173 +175 @@
 hr_volume_t *hr_get_volume(service_id_t svc_id)
 {
-        HR_DEBUG("hr_get_volume(): (%" PRIun ")\n", svc_id);
+        HR_DEBUG("%s()", __func__);
 
         hr_volume_t *rvol = NULL;
@@ -189 +191 @@
 }
 
-errno_t hr_remove_volume(service_id_t svc_id)
-{
-        HR_DEBUG("hr_remove_volume(): (%" PRIun ")\n", svc_id);
-
-        errno_t rc;
+errno_t hr_remove_volume(hr_volume_t *vol)
+{
+        HR_DEBUG("%s()", __func__);
 
         fibril_rwlock_write_lock(&hr_volumes_lock);
-        list_foreach(hr_volumes, lvolumes, hr_volume_t, vol) {
-                if (vol->svc_id == svc_id) {
-                        int open_cnt = atomic_load_explicit(&vol->open_cnt,
-                            memory_order_relaxed);
-                        /*
-                         * The "atomicity" of this if condition is provided
-                         * by the write lock - no new bd connection can
-                         * come, because we need to get the bd_srvs_t from
-                         * volume, which we get from the list.
-                         * (see hr_client_conn() in hr.c)
-                         */
-                        if (open_cnt > 0) {
-                                fibril_rwlock_write_unlock(&hr_volumes_lock);
-                                return EBUSY;
-                        }
-                        list_remove(&vol->lvolumes);
-                        fibril_rwlock_write_unlock(&hr_volumes_lock);
-
-                        vol->meta_ops->save(vol, NO_STATE_CALLBACK);
-
-                        hr_destroy_vol_struct(vol);
-
-                        rc = loc_service_unregister(hr_srv, svc_id);
-                        return rc;
-                }
-        }
+
+        int open_cnt = atomic_load_explicit(&vol->open_cnt,
+            memory_order_relaxed);
+        /*
+         * The atomicity of this if condition (and this whole
+         * operation) is provided by the write lock - no new
+         * bd connection can come, because we need to get the
+         * bd_srvs_t from the volume, which we get from the list.
+         * (see hr_client_conn() in hr.c)
+         */
+        if (open_cnt > 0) {
+                fibril_rwlock_write_unlock(&hr_volumes_lock);
+                return EBUSY;
+        }
+
+        list_remove(&vol->lvolumes);
 
         fibril_rwlock_write_unlock(&hr_volumes_lock);
-        return ENOENT;
+
+        /* save metadata, but we don't care about states anymore */
+        (void)vol->meta_ops->save(vol, NO_STATE_CALLBACK);
+
+        service_id_t svc_id = vol->svc_id;
+
+        HR_NOTE("deactivating volume \"%s\"\n", vol->devname);
+
+        hr_destroy_vol_struct(vol);
+
+        errno_t rc = loc_service_unregister(hr_srv, svc_id);
+        return rc;
 }
 
@@ -836 +837 @@
                 goto error;
 
-        fibril_rwlock_write_lock(&hr_volumes_lock);
-
         /*
          * XXX: register it here
@@ -852 +851 @@
          */
         rc = hr_register_volume(vol);
-        if (rc != EOK) {
-                fibril_rwlock_write_unlock(&hr_volumes_lock);
-                goto error;
-        }
+        if (rc != EOK)
+                goto error;
 
         (void)vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
 
+        fibril_rwlock_write_lock(&hr_volumes_lock);
         list_append(&vol->lvolumes, &hr_volumes);
-
         fibril_rwlock_write_unlock(&hr_volumes_lock);
+
+        HR_NOTE("assembled volume \"%s\"\n", vol->devname);
 
         return EOK;

uspace/srv/bd/hr/util.h

@@ -71 +71 @@
 extern void              hr_destroy_vol_struct(hr_volume_t *);
 extern hr_volume_t      *hr_get_volume(service_id_t);
-extern errno_t           hr_remove_volume(service_id_t);
+extern errno_t           hr_remove_volume(hr_volume_t *);
 extern errno_t           hr_init_extents_from_cfg(hr_volume_t *, hr_config_t *);
 extern void              hr_fini_devs(hr_volume_t *);