Changeset 4d42a1b in mainline

Timestamp:

2025-03-06T20:13:11Z (2 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

10005fd

Parents:

6123753

Message:

hr: remove deferred invalidations

Location:

uspace/srv/bd/hr

Files:

• hr.c (modified) (1 diff)
• raid1.c (modified) (2 diffs)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)
• var.h (modified) (1 diff)

uspace/srv/bd/hr/hr.c

@@ -260 +260 @@
         fibril_mutex_initialize(&new_volume->range_lock_list_lock);
 
-        fibril_mutex_initialize(&new_volume->deferred_list_lock);
-        list_initialize(&new_volume->deferred_invalidations_list);
-
         atomic_init(&new_volume->rebuild_blk, 0);
         atomic_init(&new_volume->state_changed, false);
-        atomic_init(&new_volume->pending_invalidation, false);
 
         rc = new_volume->hr_ops.create(new_volume);

uspace/srv/bd/hr/raid1.c

@@ -228 +228 @@
                 return;
 
-        if (atomic_compare_exchange_strong(&vol->pending_invalidation, &exp,
-            false)) {
-                fibril_mutex_lock(&vol->deferred_list_lock);
-                hr_process_deferred_invalidations(vol);
-                fibril_mutex_unlock(&vol->deferred_list_lock);
-        }
-
         fibril_rwlock_read_lock(&vol->extents_lock);
         fibril_rwlock_read_lock(&vol->states_lock);
@@ -289 +282 @@
         switch (rc) {
         case ENOMEM:
-                fibril_mutex_lock(&vol->deferred_list_lock);
-
-                service_id_t invalid_svc_id = vol->extents[extent].svc_id;
-
-                list_foreach(vol->deferred_invalidations_list, link,
-                    hr_deferred_invalidation_t, di) {
-                        if (di->svc_id == invalid_svc_id) {
-                                assert(vol->extents[extent].status ==
-                                    HR_EXT_INVALID);
-                                goto deferring_end;
-                        }
-                }
-
-                assert(vol->extents[extent].svc_id != HR_EXT_INVALID);
-
                 hr_update_ext_status(vol, extent, HR_EXT_INVALID);
-
-                size_t i = list_count(&vol->deferred_invalidations_list);
-                vol->deferred_inval[i].svc_id = invalid_svc_id;
-                vol->deferred_inval[i].index = extent;
-
-                list_append(&vol->deferred_inval[i].link,
-                    &vol->deferred_invalidations_list);
-
-                atomic_store(&vol->pending_invalidation, true);
-        deferring_end:
-
-                fibril_mutex_unlock(&vol->deferred_list_lock);
                 break;
         case ENOENT:

uspace/srv/bd/hr/util.c

@@ -410 +410 @@
 }
 
-void hr_process_deferred_invalidations(hr_volume_t *vol)
-{
-        HR_DEBUG("hr_raid1_update_vol_status(): deferred invalidations\n");
-
-        fibril_mutex_lock(&vol->halt_lock);
-        vol->halt_please = true;
-        fibril_rwlock_write_lock(&vol->extents_lock);
-        fibril_rwlock_write_lock(&vol->states_lock);
-        fibril_mutex_lock(&vol->hotspare_lock);
-
-        list_foreach(vol->deferred_invalidations_list, link,
-            hr_deferred_invalidation_t, di) {
-                assert(vol->extents[di->index].status == HR_EXT_INVALID);
-
-                HR_DEBUG("moving invalidated extent no. %lu to hotspares\n",
-                    di->index);
-
-                block_fini(di->svc_id);
-
-                size_t hs_idx = vol->hotspare_no;
-
-                vol->hotspare_no++;
-
-                hr_update_hotspare_svc_id(vol, hs_idx, di->svc_id);
-                hr_update_hotspare_status(vol, hs_idx, HR_EXT_HOTSPARE);
-
-                hr_update_ext_svc_id(vol, di->index, 0);
-                hr_update_ext_status(vol, di->index, HR_EXT_MISSING);
-
-                assert(vol->hotspare_no < HR_MAX_HOTSPARES + HR_MAX_EXTENTS);
-        }
-
-        for (size_t i = 0; i < HR_MAX_EXTENTS; i++) {
-                hr_deferred_invalidation_t *di = &vol->deferred_inval[i];
-                if (di->svc_id != 0) {
-                        list_remove(&di->link);
-                        di->svc_id = 0;
-                }
-        }
-
-        fibril_mutex_unlock(&vol->hotspare_lock);
-        fibril_rwlock_write_unlock(&vol->states_lock);
-        fibril_rwlock_write_unlock(&vol->extents_lock);
-        vol->halt_please = false;
-        fibril_mutex_unlock(&vol->halt_lock);
-}
-
 /** @}
  */

uspace/srv/bd/hr/util.h

@@ -67 +67 @@
     uint64_t);
 extern void hr_range_lock_release(hr_range_lock_t *rl);
-extern void hr_process_deferred_invalidations(hr_volume_t *);
 
 #endif

uspace/srv/bd/hr/var.h

@@ -110 +110 @@
         fibril_mutex_t halt_lock;
 
-        /*
-         * For deferring invalidations of extents. Used when
-         * an extent has to be invalidated (got ENOMEM on a WRITE),
-         * but workers - therefore state callbacks cannot lock
-         * extents for writing (they are readers), so invalidations
-         * are harvested later when we are able to.
-         */
-        _Atomic bool pending_invalidation;
-        fibril_mutex_t deferred_list_lock;
-        list_t deferred_invalidations_list;
-        hr_deferred_invalidation_t deferred_inval[HR_MAX_EXTENTS];
-
         _Atomic bool state_changed;
         _Atomic uint64_t rebuild_blk;