Changeset d7768d11 in mainline for uspace/srv/bd/hr/raid5.c

Timestamp:

2024-12-06T19:46:43Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

241c3f6

Parents:

586b39d

Message:

hr: add different RAID4,5 layouts

Also prepare the metadata for metada versioning
and sync counter.

File:

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

uspace/srv/bd/hr/raid5.c

@@ -95 +95 @@
         errno_t rc;
 
-        assert(new_volume->level == HR_LVL_5);
+        assert(new_volume->level == HR_LVL_5 || new_volume->level == HR_LVL_4);
 
         if (new_volume->extent_no < 3) {
@@ -121 +121 @@
         uint64_t total_blkno;
 
-        assert(vol->level == HR_LVL_5);
+        assert(vol->level == HR_LVL_5 || vol->level == HR_LVL_4);
 
         rc = hr_check_devs(vol, &total_blkno, &bsize);
@@ -531 +531 @@
                 return rc;
 
+        uint8_t RLQ = vol->RLQ;
+        hr_level_t level = vol->level;
+
         uint64_t strip_size = vol->strip_size / vol->bsize; /* in blocks */
         uint64_t stripe = (ba / strip_size); /* stripe number */
-        uint64_t p_extent = (stripe / (vol->extent_no - 1)) % vol->extent_no; /* parity extent */
+
+        /* parity extent */
+        uint64_t p_extent;
+        if (level == HR_LVL_4 && RLQ == HR_RLQ_RAID4_0) {
+                p_extent = 0;
+        } else if (level == HR_LVL_4 && RLQ == HR_RLQ_RAID4_N) {
+                p_extent = vol->extent_no - 1;
+        } else if (level == HR_LVL_5 && RLQ == HR_RLQ_RAID5_0R) {
+                p_extent = (stripe / (vol->extent_no - 1)) % vol->extent_no;
+        } else if (level == HR_LVL_5 &&
+            (RLQ == HR_RLQ_RAID5_NR || RLQ == HR_RLQ_RAID5_NC)) {
+                p_extent = (vol->extent_no - 1) -
+                    (stripe / (vol->extent_no - 1)) % vol->extent_no;
+        } else {
+                return EINVAL;
+        }
+
         uint64_t extent;
-        if ((stripe % (vol->extent_no - 1)) < p_extent)
-                extent = (stripe % (vol->extent_no - 1));
-        else
-                extent = ((stripe % (vol->extent_no - 1)) + 1);
+        if (level == HR_LVL_4 && RLQ == HR_RLQ_RAID4_0) {
+                extent = (stripe % (vol->extent_no - 1)) + 1;
+        } else if (level == HR_LVL_4 && RLQ == HR_RLQ_RAID4_N) {
+                extent = stripe % (vol->extent_no - 1);
+        } else if (level == HR_LVL_5 &&
+            (RLQ == HR_RLQ_RAID5_0R || RLQ == HR_RLQ_RAID5_NR)) {
+                if ((stripe % (vol->extent_no - 1)) < p_extent)
+                        extent = stripe % (vol->extent_no - 1);
+                else
+                        extent = (stripe % (vol->extent_no - 1)) + 1;
+        } else if (level == HR_LVL_5 && RLQ == HR_RLQ_RAID5_NC) {
+                extent = ((stripe % (vol->extent_no - 1)) + p_extent + 1) % vol->extent_no;
+        } else {
+                return EINVAL;
+        }
+
         uint64_t ext_stripe = stripe / (vol->extent_no - 1); /* stripe level */
         uint64_t strip_off = ba % strip_size; /* strip offset */
@@ -617 +648 @@
                 left -= cnt;
                 strip_off = 0;
-                if (extent + 1 >= vol->extent_no ||
-                    (extent + 1 == p_extent && p_extent + 1 >= vol->extent_no))
-                        ext_stripe++;
                 stripe++;
-                p_extent = (stripe / (vol->extent_no - 1)) % vol->extent_no; /* parity extent */
-                if ((stripe % (vol->extent_no - 1)) < p_extent)
-                        extent = (stripe % (vol->extent_no - 1));
-                else
-                        extent = ((stripe % (vol->extent_no - 1)) + 1);
+
+                ext_stripe = stripe / (vol->extent_no - 1); /* stripe level */
+
+                if (level == HR_LVL_5 && RLQ == HR_RLQ_RAID5_0R) {
+                        p_extent = (stripe / (vol->extent_no - 1)) % vol->extent_no;
+                } else if (level == HR_LVL_5 &&
+                    (RLQ == HR_RLQ_RAID5_NR || RLQ == HR_RLQ_RAID5_NC)) {
+                        p_extent = (vol->extent_no - 1) -
+                            (stripe / (vol->extent_no - 1)) % vol->extent_no;
+                }
+
+                if (level == HR_LVL_4 && RLQ == HR_RLQ_RAID4_0) {
+                        extent = (stripe % (vol->extent_no - 1)) + 1;
+                } else if (level == HR_LVL_4 && RLQ == HR_RLQ_RAID4_N) {
+                        extent = stripe % (vol->extent_no - 1);
+                } else if (level == HR_LVL_5 &&
+                    (RLQ == HR_RLQ_RAID5_0R || RLQ == HR_RLQ_RAID5_NR)) {
+                        if ((stripe % (vol->extent_no - 1)) < p_extent)
+                                extent = stripe % (vol->extent_no - 1);
+                        else
+                                extent = (stripe % (vol->extent_no - 1)) + 1;
+                } else if (level == HR_LVL_5 && RLQ == HR_RLQ_RAID5_NC) {
+                        extent = ((stripe % (vol->extent_no - 1)) + p_extent + 1) % vol->extent_no;
+                }
         }