Changeset 9323bb8 in mainline

Timestamp:

2025-07-07T16:04:02Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

f7169a6

Parents:

15e51b05

Message:

hr: raid5.c: make the critical section smaller

File:

• uspace/srv/bd/hr/raid5.c (modified) (6 diffs)

uspace/srv/bd/hr/raid5.c

@@ -98 +98 @@
         }
 
-        bd_srvs_init(&new_volume->hr_bds);
-        new_volume->hr_bds.ops = &hr_raid5_bd_ops;
-        new_volume->hr_bds.sarg = new_volume;
-
         hr_raid5_vol_state_eval_forced(new_volume);
 
@@ -113 +109 @@
         }
 
+        bd_srvs_init(&new_volume->hr_bds);
+        new_volume->hr_bds.ops = &hr_raid5_bd_ops;
+        new_volume->hr_bds.sarg = new_volume;
+
         return EOK;
 }
@@ -241 +241 @@
             stripes_cnt, false);
 
+        uint64_t phys_block, len;
+        size_t left;
+
+        hr_layout_t layout = vol->layout;
+        hr_level_t level = vol->level;
+
+        /* parity extent */
+        size_t p_extent = hr_raid5_parity_extent(level, layout,
+            vol->extent_no, strip_no);
+
+        uint64_t strip_off = ba % strip_size;
+
+        left = cnt;
+
+        while (left != 0) {
+                if (level == HR_LVL_5) {
+                        p_extent = hr_raid5_parity_extent(level, layout,
+                            vol->extent_no, strip_no);
+                }
+
+                size_t extent = hr_raid5_data_extent(level, layout,
+                    vol->extent_no, strip_no, p_extent);
+
+                uint64_t stripe_no = strip_no / (vol->extent_no - 1);
+                size_t relative_si = stripe_no - start_stripe; /* relative stripe index */
+                hr_stripe_t *stripe = &stripes[relative_si];
+                stripe->p_extent = p_extent;
+
+                stripe->strips_touched++;
+
+                phys_block = stripe_no * strip_size + strip_off;
+                cnt = min(left, strip_size - strip_off);
+                len = vol->bsize * cnt;
+                hr_add_data_offset(vol, &phys_block);
+
+                stripe->extent_span[extent].range.start = phys_block;
+                stripe->extent_span[extent].range.end = phys_block + cnt - 1;
+                stripe->extent_span[extent].cnt = cnt;
+                stripe->extent_span[extent].data_read = data_read;
+                stripe->extent_span[extent].strip_off = strip_off;
+
+                data_read += len;
+                left -= cnt;
+                strip_off = 0;
+                strip_no++;
+        }
+
         hr_range_lock_t **rlps = hr_malloc_waitok(stripes_cnt * sizeof(*rlps));
 
@@ -252 +299 @@
                 uint64_t relative = s - start_stripe;
                 rlps[relative] = hr_range_lock_acquire(vol, s, 1);
-        }
-
-        uint64_t phys_block, len;
-        size_t left;
-
-        hr_layout_t layout = vol->layout;
-        hr_level_t level = vol->level;
-
-        /* parity extent */
-        size_t p_extent = hr_raid5_parity_extent(level, layout,
-            vol->extent_no, strip_no);
-
-        uint64_t strip_off = ba % strip_size;
-
-        left = cnt;
-
-        while (left != 0) {
-                if (level == HR_LVL_5) {
-                        p_extent = hr_raid5_parity_extent(level, layout,
-                            vol->extent_no, strip_no);
-                }
-
-                size_t extent = hr_raid5_data_extent(level, layout,
-                    vol->extent_no, strip_no, p_extent);
-
-                uint64_t stripe_no = strip_no / (vol->extent_no - 1);
-                size_t relative_si = stripe_no - start_stripe; /* relative stripe index */
-                hr_stripe_t *stripe = &stripes[relative_si];
-                stripe->p_extent = p_extent;
-
-                stripe->strips_touched++;
-
-                phys_block = stripe_no * strip_size + strip_off;
-                cnt = min(left, strip_size - strip_off);
-                len = vol->bsize * cnt;
-                hr_add_data_offset(vol, &phys_block);
-
-                stripe->extent_span[extent].range.start = phys_block;
-                stripe->extent_span[extent].range.end = phys_block + cnt - 1;
-                stripe->extent_span[extent].cnt = cnt;
-                stripe->extent_span[extent].data_read = data_read;
-                stripe->extent_span[extent].strip_off = strip_off;
-
-                data_read += len;
-                left -= cnt;
-                strip_off = 0;
-                strip_no++;
         }
 
@@ -452 +452 @@
         }
 
+        uint64_t phys_block, len;
+        size_t left;
+
+        hr_layout_t layout = vol->layout;
+        hr_level_t level = vol->level;
+
+        /* parity extent */
+        size_t p_extent = hr_raid5_parity_extent(level, layout,
+            vol->extent_no, strip_no);
+
+        uint64_t strip_off = ba % strip_size;
+
+        left = cnt;
+
+        while (left != 0) {
+                if (level == HR_LVL_5) {
+                        p_extent = hr_raid5_parity_extent(level, layout,
+                            vol->extent_no, strip_no);
+                }
+
+                size_t extent = hr_raid5_data_extent(level, layout,
+                    vol->extent_no, strip_no, p_extent);
+
+                uint64_t stripe_no = strip_no / (vol->extent_no - 1);
+                size_t relative_si = stripe_no - start_stripe; /* relative stripe index */
+                hr_stripe_t *stripe = &stripes[relative_si];
+                stripe->p_extent = p_extent;
+
+                phys_block = stripe_no * strip_size + strip_off;
+                cnt = min(left, strip_size - strip_off);
+                len = vol->bsize * cnt;
+                hr_add_data_offset(vol, &phys_block);
+
+                stripe->extent_span[extent].range.start = phys_block;
+                stripe->extent_span[extent].range.end = phys_block + cnt - 1;
+                stripe->extent_span[extent].cnt = cnt;
+                stripe->extent_span[extent].data_write = data_write;
+                stripe->extent_span[extent].strip_off = strip_off;
+
+                data_write += len;
+                left -= cnt;
+                strip_off = 0;
+                strip_no++;
+        }
+
         hr_range_lock_t **rlps = hr_malloc_waitok(stripes_cnt * sizeof(*rlps));
 
@@ -463 +508 @@
                 uint64_t relative = s - start_stripe;
                 rlps[relative] = hr_range_lock_acquire(vol, s, 1);
-        }
-
-        uint64_t phys_block, len;
-        size_t left;
-
-        hr_layout_t layout = vol->layout;
-        hr_level_t level = vol->level;
-
-        /* parity extent */
-        size_t p_extent = hr_raid5_parity_extent(level, layout,
-            vol->extent_no, strip_no);
-
-        uint64_t strip_off = ba % strip_size;
-
-        left = cnt;
-
-        while (left != 0) {
-                if (level == HR_LVL_5) {
-                        p_extent = hr_raid5_parity_extent(level, layout,
-                            vol->extent_no, strip_no);
-                }
-
-                size_t extent = hr_raid5_data_extent(level, layout,
-                    vol->extent_no, strip_no, p_extent);
-
-                uint64_t stripe_no = strip_no / (vol->extent_no - 1);
-                size_t relative_si = stripe_no - start_stripe; /* relative stripe index */
-                hr_stripe_t *stripe = &stripes[relative_si];
-                stripe->p_extent = p_extent;
-
-                phys_block = stripe_no * strip_size + strip_off;
-                cnt = min(left, strip_size - strip_off);
-                len = vol->bsize * cnt;
-                hr_add_data_offset(vol, &phys_block);
-
-                stripe->extent_span[extent].range.start = phys_block;
-                stripe->extent_span[extent].range.end = phys_block + cnt - 1;
-                stripe->extent_span[extent].cnt = cnt;
-                stripe->extent_span[extent].data_write = data_write;
-                stripe->extent_span[extent].strip_off = strip_off;
-
-                data_write += len;
-                left -= cnt;
-                strip_off = 0;
-                strip_no++;
         }