Changeset 978130a in mainline for uspace/srv/bd/hr/raid0.c

Timestamp:

2024-10-28T16:03:24Z (7 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

4dd650a

Parents:

76cd345

Message:

hr: optimize RAID 0, 4, 5 to write whole strip

File:

• uspace/srv/bd/hr/raid0.c (modified) (3 diffs)

uspace/srv/bd/hr/raid0.c

@@ -74 +74 @@
 };
 
-static void raid0_geometry(uint64_t x, hr_volume_t *vol, size_t *extent,
-    uint64_t *phys_block)
-{
-        uint64_t N = vol->dev_no; /* extents */
-        uint64_t L = vol->strip_size / vol->bsize; /* size of strip in blocks */
-
-        uint64_t i = (x / L) % N; /* extent */
-        uint64_t j = (x / L) / N; /* stripe */
-        uint64_t k = x % L; /* strip offset */
-
-        *extent = i;
-        *phys_block = j * L + k;
-}
-
 static errno_t hr_raid0_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
@@ -106 +92 @@
         errno_t rc;
         uint64_t phys_block;
-        size_t extent, left;
+        size_t left;
 
         if (type == HR_BD_READ || type == HR_BD_WRITE)
@@ -116 +102 @@
                 return rc;
 
+        uint64_t strip_size = vol->strip_size / vol->bsize; /* in blocks */
+        uint64_t stripe = ba / strip_size; /* stripe number */
+        uint64_t extent = stripe % vol->dev_no;
+        uint64_t ext_stripe = stripe / vol->dev_no; /* stripe level */
+        uint64_t strip_off = ba % strip_size; /* strip offset */
+
         fibril_mutex_lock(&vol->lock);
 
         left = cnt;
         while (left != 0) {
-                raid0_geometry(ba, vol, &extent, &phys_block);
+                phys_block = ext_stripe * strip_size + strip_off;
+                cnt = min(left, strip_size - strip_off);
                 hr_add_ba_offset(vol, &phys_block);
                 switch (type) {
                 case HR_BD_SYNC:
                         rc = block_sync_cache(vol->extents[extent].svc_id,
-                            phys_block, 1);
+                            phys_block, cnt);
                         break;
                 case HR_BD_READ:
                         rc = block_read_direct(vol->extents[extent].svc_id,
-                            phys_block, 1, data_read);
-                        data_read = data_read + vol->bsize;
+                            phys_block, cnt, data_read);
+                        data_read = (void *) ((uintptr_t) data_read +
+                            (vol->bsize * cnt));
                         break;
                 case HR_BD_WRITE:
                         rc = block_write_direct(vol->extents[extent].svc_id,
-                            phys_block, 1, data_write);
-                        data_write = data_write + vol->bsize;
+                            phys_block, cnt, data_write);
+                        data_write = (void *) ((uintptr_t) data_write +
+                            (vol->bsize * cnt));
                         break;
                 default:
                         rc = EINVAL;
                 }
-
                 if (rc != EOK)
                         goto error;
 
-                left--;
-                ba++;
+                left -= cnt;
+                strip_off = 0;
+                extent++;
+                if (extent >= vol->dev_no) {
+                        ext_stripe++;
+                        extent = 0;
+                }
         }