Changeset 150adbd2 in mainline

Timestamp:

2025-06-29T10:08:40Z (7 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

40ab4901

Parents:

93ea452

Message:

hr: add NOOP metadata type

Location:

uspace

Files:

• app/hrctl/hrctl.c (modified) (9 diffs)
• lib/device/include/hr.h (modified) (2 diffs)
• lib/device/src/hr.c (modified) (1 diff)
• srv/bd/hr/hr.c (modified) (1 diff)
• srv/bd/hr/meson.build (modified) (1 diff)
• srv/bd/hr/metadata/noop.c (added)
• srv/bd/hr/superblock.c (modified) (3 diffs)

uspace/app/hrctl/hrctl.c

@@ -52 +52 @@
 static errno_t fill_config_devs(int, char **, hr_config_t *);
 static errno_t get_vol_configs_from_sif(const char *, hr_config_t **, size_t *);
-static int create_from_config(hr_t *, const char *);
-static int create_from_argv(hr_t *, int, char **);
+static int create_from_config(hr_t *, const char *, uint8_t);
+static int create_from_argv(hr_t *, int, char **, uint8_t);
 static int handle_create(hr_t *, int, char **);
 static int assemble_from_config(hr_t *, const char *);
@@ -70 +70 @@
     "  -h, --help                                Display this message and exit.\n"
     "\n"
-    "  -c, --create                              Create a volume, options:\n"
+    "  -c, --create [--no_meta]                  Create a volume, options:\n"
     "      name {-l , --level level} device...   manual device specification, or\n"
     "      -f configuration.sif                  create from configuration file.\n"
@@ -108 +108 @@
     "\n"
     "Notes:\n"
+    "  Add --no_meta after --create to disable storing on-disk metadata.\n"
     "  Simulating an extent failure with -m volume -f index is dangerous. It marks\n"
     "  metadata as dirty in other healthy extents, and zeroes out the superblock\n"
@@ -341 +342 @@
 }
 
-static int create_from_config(hr_t *hr, const char *config_path)
+static int create_from_config(hr_t *hr, const char *config_path,
+    uint8_t vol_flags)
 {
         hr_config_t *vol_configs = NULL;
@@ -351 +353 @@
                 return EXIT_FAILURE;
         }
+
+        for (size_t i = 0; i < vol_count; i++)
+                vol_configs[i].vol_flags |= vol_flags;
 
         for (size_t i = 0; i < vol_count; i++) {
@@ -368 +373 @@
 }
 
-static int create_from_argv(hr_t *hr, int argc, char **argv)
+static int create_from_argv(hr_t *hr, int argc, char **argv, uint8_t vol_flags)
 {
         /* we need name + --level + arg + at least one extent */
@@ -381 +386 @@
                 return EXIT_FAILURE;
         }
+
+        vol_config->vol_flags |= vol_flags;
 
         const char *name = argv[optind++];
@@ -441 +448 @@
 {
         int rc;
+        uint8_t vol_flags = 0;
 
         if (optind >= argc) {
                 printf(NAME ": no arguments to --create\n");
                 return EXIT_FAILURE;
+        }
+
+        if (str_cmp(argv[optind], "--no_meta") == 0) {
+                vol_flags |= HR_VOL_FLAG_NOOP_META;
+                optind++;
         }
 
@@ -461 +474 @@
                 }
 
-                rc = create_from_config(hr, config_path);
+                rc = create_from_config(hr, config_path, vol_flags);
         } else {
-                rc = create_from_argv(hr, argc, argv);
+                rc = create_from_argv(hr, argc, argv, vol_flags);
         }
 

uspace/lib/device/include/hr.h

@@ -88 +88 @@
         HR_METADATA_SOFTRAID,
         HR_METADATA_MD,
-        HR_METADATA_LAST_DUMMY
+        HR_METADATA_NOOP,
+        HR_METADATA_LAST_PLACEHOLDER
 } hr_metadata_type_t;
+
+typedef enum hr_vol_flag {
+        HR_VOL_FLAG_NOOP_META = 0x01
+} hr_vol_flag_t;
 
 typedef struct hr {
@@ -100 +105 @@
         size_t dev_no;
         hr_level_t level;
+        uint8_t vol_flags;
 } hr_config_t;
 

uspace/lib/device/src/hr.c

@@ -554 +554 @@
         case HR_METADATA_MD:
                 return "Linux Multiple Device";
+        case HR_METADATA_NOOP:
+                return "NOOP Metadata";
         default:
                 return "Invalid metadata type value";

uspace/srv/bd/hr/hr.c

@@ -131 +131 @@
         }
 
-        rc = hr_create_vol_struct(&vol, cfg->level, cfg->devname,
-            HR_METADATA_NATIVE);
+        hr_metadata_type_t meta_type;
+        if (cfg->vol_flags & HR_VOL_FLAG_NOOP_META)
+                meta_type = HR_METADATA_NOOP;
+        else
+                meta_type = HR_METADATA_NATIVE;
+
+        printf("creating with type %d\n", meta_type);
+        rc = hr_create_vol_struct(&vol, cfg->level, cfg->devname, meta_type);
         if (rc != EOK) {
                 free(cfg);

uspace/srv/bd/hr/meson.build

@@ -38 +38 @@
             'metadata/foreign/softraid/softraid.c',
             'metadata/native.c',
+            'metadata/noop.c',
             'parity_stripe.c',
             'raid0.c',

uspace/srv/bd/hr/superblock.c

@@ -61 +61 @@
 extern hr_superblock_ops_t metadata_softraid_ops;
 extern hr_superblock_ops_t metadata_md_ops;
+extern hr_superblock_ops_t noop_ops;
 
 static hr_superblock_ops_t *hr_superblock_ops_all[] = {
@@ -67 +68 @@
         [HR_METADATA_GEOM_STRIPE] = &metadata_gstripe_ops,
         [HR_METADATA_SOFTRAID] = &metadata_softraid_ops,
-        [HR_METADATA_MD] = &metadata_md_ops
+        [HR_METADATA_MD] = &metadata_md_ops,
+        [HR_METADATA_NOOP] = &noop_ops
 };
 
 hr_superblock_ops_t *hr_get_meta_type_ops(hr_metadata_type_t type)
 {
-        assert(type >= HR_METADATA_NATIVE && type < HR_METADATA_LAST_DUMMY);
+        assert(type >= HR_METADATA_NATIVE &&
+            type < HR_METADATA_LAST_PLACEHOLDER);
 
         return hr_superblock_ops_all[type];
@@ -92 +95 @@
 
         volatile hr_metadata_type_t type = HR_METADATA_NATIVE;
-        for (; type < HR_METADATA_LAST_DUMMY; type++) {
+        for (; type < HR_METADATA_LAST_PLACEHOLDER; type++) {
                 meta_ops = hr_superblock_ops_all[type];