Changeset dbd91da in mainline

Timestamp:

2024-10-05T10:32:59Z (9 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

6b8e89b0

Parents:

34abe6c5

git-author:

Miroslav Cimerman <mc@…> (2024-10-05 10:23:08)

git-committer:

Miroslav Cimerman <mc@…> (2024-10-05 10:32:59)

Message:

hr: remake structures to include extent status

Also rename .devs → .extents in hr_volume_t and when printing status,
display each extent status, and parity disk when array is of type RAID4.

Location:

uspace

Files:

• lib/device/include/hr.h (modified) (1 diff)
• lib/device/src/hr.c (modified) (2 diffs)
• srv/bd/hr/hr.c (modified) (5 diffs)
• srv/bd/hr/raid0.c (modified) (3 diffs)
• srv/bd/hr/raid1.c (modified) (3 diffs)
• srv/bd/hr/raid4.c (modified) (6 diffs)
• srv/bd/hr/superblock.c (modified) (2 diffs)
• srv/bd/hr/util.c (modified) (4 diffs)
• srv/bd/hr/var.h (modified) (1 diff)

uspace/lib/device/include/hr.h

@@ -64 +64 @@
 } hr_config_t;
 
+typedef struct hr_extent {
+        service_id_t svc_id;
+        int status;
+} hr_extent_t;
+
 typedef struct hr_vol_info {
-        service_id_t extents[HR_MAXDEVS];
+        hr_extent_t extents[HR_MAXDEVS];
         size_t extent_no;
         service_id_t svc_id;

uspace/lib/device/src/hr.c

@@ -146 +146 @@
         size_t i;
         char *devname;
+        hr_extent_t *ext;
 
         printf("--- vol %zu ---\n", index);
@@ -170 +171 @@
         printf("block size: %zu\n", vol_info->bsize);
 
-        printf("extents: [index] [devname]\n");
+        if (vol_info->level == hr_l_4)
+                printf("extents: [P] [status] [index] [devname]\n");
+        else
+                printf("extents: [status] [index] [devname]\n");
         for (i = 0; i < vol_info->extent_no; i++) {
-                rc = loc_service_get_name(vol_info->extents[i], &devname);
+                ext = &vol_info->extents[i];
+                rc = loc_service_get_name(ext->svc_id, &devname);
                 if (rc != EOK)
                         return rc;
-                printf("          %zu       %s\n", i, devname);
+                if (i == 0 && vol_info->level == hr_l_4)
+                        printf("          P   %d        %zu       %s\n", ext->status, i, devname);
+                else if (vol_info->level == hr_l_4)
+                        printf("              %d        %zu       %s\n", ext->status, i, devname);
+                else
+                        printf("          %d        %zu       %s\n", ext->status, i, devname);
         }
         return EOK;

uspace/srv/bd/hr/hr.c

@@ -103 +103 @@
 
         errno_t rc;
-        size_t size;
+        size_t i, size;
         hr_config_t *cfg;
         hr_volume_t *new_volume;
@@ -142 +142 @@
 
         str_cpy(new_volume->devname, 32, cfg->devname);
-        memcpy(new_volume->devs, cfg->devs, sizeof(service_id_t) * HR_MAXDEVS);
+        for (i = 0; i < cfg->dev_no; i++)
+                new_volume->extents[i].svc_id = cfg->devs[i];
         new_volume->level = cfg->level;
         new_volume->dev_no = cfg->dev_no;
@@ -206 +207 @@
 
         errno_t rc;
-        size_t size;
+        size_t i, size;
         hr_config_t *cfg;
         hr_volume_t *new_volume;
@@ -245 +246 @@
 
         str_cpy(new_volume->devname, 32, cfg->devname);
-        memcpy(new_volume->devs, cfg->devs, sizeof(service_id_t) * HR_MAXDEVS);
+        for (i = 0; i < cfg->dev_no; i++)
+                new_volume->extents[i].svc_id = cfg->devs[i];
         new_volume->dev_no = cfg->dev_no;
 
@@ -362 +364 @@
 
         list_foreach(hr_volumes, lvolumes, hr_volume_t, volume) {
-                memcpy(info.extents, volume->devs,
-                    sizeof(service_id_t) * HR_MAXDEVS);
+                memcpy(info.extents, volume->extents,
+                    sizeof(hr_extent_t) * HR_MAXDEVS);
                 info.svc_id = volume->svc_id;
                 info.extent_no = volume->dev_no;

uspace/srv/bd/hr/raid0.c

@@ -117 +117 @@
                 raid0_geometry(ba, vol, &extent, &phys_block);
                 hr_add_ba_offset(vol, &phys_block);
-                rc = block_sync_cache(vol->devs[extent], phys_block, 1);
+                rc = block_sync_cache(vol->extents[extent].svc_id, phys_block, 1);
                 if (rc != EOK)
                         break;
@@ -149 +149 @@
                 raid0_geometry(ba, vol, &extent, &phys_block);
                 hr_add_ba_offset(vol, &phys_block);
-                rc = block_read_direct(vol->devs[extent], phys_block, 1, buf);
+                rc = block_read_direct(vol->extents[extent].svc_id, phys_block, 1, buf);
                 buf = buf + vol->bsize;
                 if (rc != EOK)
@@ -182 +182 @@
                 raid0_geometry(ba, vol, &extent, &phys_block);
                 hr_add_ba_offset(vol, &phys_block);
-                rc = block_write_direct(vol->devs[extent], phys_block, 1, data);
+                rc = block_write_direct(vol->extents[extent].svc_id, phys_block, 1, data);
                 data = data + vol->bsize;
                 if (rc != EOK)

uspace/srv/bd/hr/raid1.c

@@ -101 +101 @@
 
         for (i = 0; i < vol->dev_no; i++) {
-                rc = block_sync_cache(vol->devs[i], ba, cnt);
+                rc = block_sync_cache(vol->extents[i].svc_id, ba, cnt);
                 if (rc != EOK)
                         break;
@@ -127 +127 @@
 
         for (i = 0; i < vol->dev_no; i++) {
-                rc = block_read_direct(vol->devs[i], ba, cnt, buf);
+                rc = block_read_direct(vol->extents[i].svc_id, ba, cnt, buf);
                 if (rc != EOK)
                         break;
@@ -153 +153 @@
 
         for (i = 0; i < vol->dev_no; i++) {
-                rc = block_write_direct(vol->devs[i], ba, cnt, data);
+                rc = block_write_direct(vol->extents[i].svc_id, ba, cnt, data);
                 if (rc != EOK)
                         break;

uspace/srv/bd/hr/raid4.c

@@ -104 +104 @@
                         xor(xorbuf, data, vol->bsize);
                 } else {
-                        rc = block_read_direct(vol->devs[i], block, 1, buf);
+                        rc = block_read_direct(vol->extents[i].svc_id, block, 1, buf);
                         if (rc != EOK)
                                 goto end;
@@ -111 +111 @@
         }
 
-        rc = block_write_direct(vol->devs[0], block, 1, xorbuf);
+        rc = block_write_direct(vol->extents[0].svc_id, block, 1, xorbuf);
 
 end:
@@ -162 +162 @@
                 raid4_geometry(ba, vol, &extent, &phys_block);
                 hr_add_ba_offset(vol, &phys_block);
-                rc = block_sync_cache(vol->devs[extent], phys_block, 1);
+                rc = block_sync_cache(vol->extents[extent].svc_id, phys_block, 1);
                 if (rc != EOK)
                         break;
@@ -194 +194 @@
                 raid4_geometry(ba, vol, &extent, &phys_block);
                 hr_add_ba_offset(vol, &phys_block);
-                rc = block_read_direct(vol->devs[extent], phys_block, 1, buf);
+                rc = block_read_direct(vol->extents[extent].svc_id, phys_block, 1, buf);
                 buf = buf + vol->bsize;
                 if (rc != EOK)
@@ -205 +205 @@
         return rc;
 }
-
 
 static errno_t hr_raid4_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
@@ -228 +227 @@
                 raid4_geometry(ba, vol, &extent, &phys_block);
                 hr_add_ba_offset(vol, &phys_block);
-                rc = block_write_direct(vol->devs[extent], phys_block, 1, data);
+                rc = block_write_direct(vol->extents[extent].svc_id, phys_block, 1, data);
                 if (rc != EOK)
                         break;

uspace/srv/bd/hr/superblock.c

@@ -103 +103 @@
                 str_cpy(metadata->devname, 32, vol->devname);
 
-                rc = block_write_direct(vol->devs[i], HR_META_OFF, HR_META_SIZE,
+                rc = block_write_direct(vol->extents[i].svc_id, HR_META_OFF, HR_META_SIZE,
                     metadata);
                 if (rc != EOK)
@@ -134 +134 @@
                 goto end;
 
-        /* TODO: sort new_volume->devs according to metadata extent index */
+        /* TODO: sort new_volume->extents according to metadata extent index */
 
         if (uint64_t_le2host(metadata->magic) != HR_MAGIC) {

uspace/srv/bd/hr/util.c

@@ -56 +56 @@
 
         for (i = 0; i < vol->dev_no; i++) {
-                rc = block_init(vol->devs[i]);
+                rc = block_init(vol->extents[i].svc_id);
                 log_msg(LOG_DEFAULT, LVL_DEBUG,
-                    "hr_init_devs(): initing (%" PRIun ")", vol->devs[i]);
+                    "hr_init_devs(): initing (%" PRIun ")", vol->extents[i].svc_id);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR,
                             "hr_init_devs(): initing (%" PRIun ") failed, aborting",
-                            vol->devs[i]);
+                            vol->extents[i].svc_id);
                         break;
                 }
@@ -77 +77 @@
 
         for (i = 0; i < vol->dev_no; i++)
-                block_fini(vol->devs[i]);
+                block_fini(vol->extents[i].svc_id);
 }
 
@@ -132 +132 @@
 
         for (i = 0; i < vol->dev_no; i++) {
-                rc = block_get_nblocks(vol->devs[i], &nblocks);
+                rc = block_get_nblocks(vol->extents[i].svc_id, &nblocks);
                 if (rc != EOK)
                         goto error;
@@ -146 +146 @@
 
         for (i = 0; i < vol->dev_no; i++) {
-                rc = block_get_bsize(vol->devs[i], &bsize);
+                rc = block_get_bsize(vol->extents[i].svc_id, &bsize);
                 if (rc != EOK)
                         goto error;

uspace/srv/bd/hr/var.h

@@ -56 +56 @@
         link_t lvolumes;
         char devname[32];
-        service_id_t devs[HR_MAXDEVS];
+        hr_extent_t extents[HR_MAXDEVS];
         uint64_t nblocks;
         uint64_t data_blkno;