Changeset 10005fd in mainline

Timestamp:

2025-03-06T20:13:51Z (4 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

d6fe2a1

Parents:

4d42a1b

Message:

hr: remove vol→halt_please bit and vol→halt_lock

RW locks are not write-starved now

Location:

uspace/srv/bd/hr

Files:

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

uspace/srv/bd/hr/hr.c

@@ -249 +249 @@
         fibril_mutex_initialize(&new_volume->lock); /* XXX: will remove this */
 
-        fibril_mutex_initialize(&new_volume->halt_lock);
-        new_volume->halt_please = false;
-
         fibril_rwlock_initialize(&new_volume->extents_lock);
         fibril_rwlock_initialize(&new_volume->states_lock);

uspace/srv/bd/hr/raid1.c

@@ -344 +344 @@
 
         /*
-         * this is to allow adding hotspare or start a rebuild on
-         * very busy array, because of how rwlocks are implemented
-         * in HelenOS (no writer priority, so if there are multiple
-         * continuos readers, writer will never own the lock)
-         */
-        if (vol->halt_please) {
-                fibril_mutex_lock(&vol->halt_lock);
-                fibril_mutex_unlock(&vol->halt_lock);
-        }
-
-        /*
          * extent order has to be locked for the whole IO duration,
          * so that workers have consistent targets
@@ -591 +580 @@
         errno_t rc = EOK;
 
-        fibril_mutex_lock(&vol->halt_lock);
-        vol->halt_please = true;
         fibril_rwlock_write_lock(&vol->extents_lock);
         fibril_rwlock_write_lock(&vol->states_lock);
@@ -651 +638 @@
         fibril_rwlock_write_unlock(&vol->states_lock);
         fibril_rwlock_write_unlock(&vol->extents_lock);
-        vol->halt_please = false;
-        fibril_mutex_unlock(&vol->halt_lock);
 
         return rc;

uspace/srv/bd/hr/var.h

@@ -106 +106 @@
         fibril_rwlock_t states_lock;
 
-        /* for halting IO requests when a REBUILD start waits */
-        bool halt_please;
-        fibril_mutex_t halt_lock;
-
         _Atomic bool state_changed;
         _Atomic uint64_t rebuild_blk;