]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/disk_groups.c
Update bcachefs sources to 31c09369cd six locks: Fix an unitialized var
[bcachefs-tools-debian] / libbcachefs / disk_groups.c
index c129a33eb7590cb1909144344099c57501df655c..1a8f8b3750da15ebf6e9731cdab43de35e391b79 100644 (file)
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "bcachefs.h"
 #include "disk_groups.h"
 #include "super-io.h"
@@ -16,24 +17,20 @@ static int group_cmp(const void *_l, const void *_r)
                strncmp(l->label, r->label, sizeof(l->label));
 }
 
-const char *bch2_sb_disk_groups_validate(struct bch_sb *sb,
-                                        struct bch_sb_field *f)
+static int bch2_sb_disk_groups_validate(struct bch_sb *sb,
+                                       struct bch_sb_field *f,
+                                       struct printbuf *err)
 {
        struct bch_sb_field_disk_groups *groups =
                field_to_type(f, disk_groups);
        struct bch_disk_group *g, *sorted = NULL;
-       struct bch_sb_field_members *mi;
-       struct bch_member *m;
-       unsigned i, nr_groups, len;
-       const char *err = NULL;
-
-       mi              = bch2_sb_get_members(sb);
-       groups          = bch2_sb_get_disk_groups(sb);
-       nr_groups       = disk_groups_nr(groups);
+       struct bch_sb_field_members *mi = bch2_sb_get_members(sb);
+       unsigned nr_groups = disk_groups_nr(groups);
+       unsigned i, len;
+       int ret = 0;
 
-       for (m = mi->members;
-            m < mi->members + sb->nr_devices;
-            m++) {
+       for (i = 0; i < sb->nr_devices; i++) {
+               struct bch_member *m = mi->members + i;
                unsigned g;
 
                if (!BCH_MEMBER_GROUP(m))
@@ -41,52 +38,59 @@ const char *bch2_sb_disk_groups_validate(struct bch_sb *sb,
 
                g = BCH_MEMBER_GROUP(m) - 1;
 
-               if (g >= nr_groups ||
-                   BCH_GROUP_DELETED(&groups->entries[g]))
-                       return "disk has invalid group";
+               if (g >= nr_groups) {
+                       prt_printf(err, "disk %u has invalid label %u (have %u)",
+                              i, g, nr_groups);
+                       return -BCH_ERR_invalid_sb_disk_groups;
+               }
+
+               if (BCH_GROUP_DELETED(&groups->entries[g])) {
+                       prt_printf(err, "disk %u has deleted label %u", i, g);
+                       return -BCH_ERR_invalid_sb_disk_groups;
+               }
        }
 
        if (!nr_groups)
-               return NULL;
+               return 0;
+
+       for (i = 0; i < nr_groups; i++) {
+               g = groups->entries + i;
 
-       for (g = groups->entries;
-            g < groups->entries + nr_groups;
-            g++) {
                if (BCH_GROUP_DELETED(g))
                        continue;
 
                len = strnlen(g->label, sizeof(g->label));
                if (!len) {
-                       err = "group with empty label";
-                       goto err;
+                       prt_printf(err, "label %u empty", i);
+                       return -BCH_ERR_invalid_sb_disk_groups;
                }
        }
 
        sorted = kmalloc_array(nr_groups, sizeof(*sorted), GFP_KERNEL);
        if (!sorted)
-               return "cannot allocate memory";
+               return -BCH_ERR_ENOMEM_disk_groups_validate;
 
        memcpy(sorted, groups->entries, nr_groups * sizeof(*sorted));
        sort(sorted, nr_groups, sizeof(*sorted), group_cmp, NULL);
 
-       for (i = 0; i + 1 < nr_groups; i++)
-               if (!BCH_GROUP_DELETED(sorted + i) &&
-                   !group_cmp(sorted + i, sorted + i + 1)) {
-                       err = "duplicate groups";
+       for (g = sorted; g + 1 < sorted + nr_groups; g++)
+               if (!BCH_GROUP_DELETED(g) &&
+                   !group_cmp(&g[0], &g[1])) {
+                       prt_printf(err, "duplicate label %llu.%.*s",
+                              BCH_GROUP_PARENT(g),
+                              (int) sizeof(g->label), g->label);
+                       ret = -BCH_ERR_invalid_sb_disk_groups;
                        goto err;
                }
-
-       err = NULL;
 err:
        kfree(sorted);
-       return err;
+       return ret;
 }
 
-static size_t bch2_sb_disk_groups_to_text(char *buf, size_t size,
+static void bch2_sb_disk_groups_to_text(struct printbuf *out,
                                        struct bch_sb *sb,
                                        struct bch_sb_field *f)
 {
-       char *out = buf, *end = buf + size;
        struct bch_sb_field_disk_groups *groups =
                field_to_type(f, disk_groups);
        struct bch_disk_group *g;
@@ -96,18 +100,14 @@ static size_t bch2_sb_disk_groups_to_text(char *buf, size_t size,
             g < groups->entries + nr_groups;
             g++) {
                if (g != groups->entries)
-                       out += scnprintf(out, end - out, " ");
+                       prt_printf(out, " ");
 
                if (BCH_GROUP_DELETED(g))
-                       out += scnprintf(out, end - out, "[deleted]");
+                       prt_printf(out, "[deleted]");
                else
-                       out += scnprintf(out, end - out,
-                                        "[parent %llu name %s]",
-                                        BCH_GROUP_PARENT(g),
-                                        g->label);
+                       prt_printf(out, "[parent %llu name %s]",
+                              BCH_GROUP_PARENT(g), g->label);
        }
-
-       return out - buf;
 }
 
 const struct bch_sb_field_ops bch_sb_field_ops_disk_groups = {
@@ -134,7 +134,7 @@ int bch2_sb_disk_groups_to_cpu(struct bch_fs *c)
        cpu_g = kzalloc(sizeof(*cpu_g) +
                        sizeof(cpu_g->entries[0]) * nr_groups, GFP_KERNEL);
        if (!cpu_g)
-               return -ENOMEM;
+               return -BCH_ERR_ENOMEM_disk_groups_to_cpu;
 
        cpu_g->nr = nr_groups;
 
@@ -162,7 +162,8 @@ int bch2_sb_disk_groups_to_cpu(struct bch_fs *c)
                }
        }
 
-       old_g = c->disk_groups;
+       old_g = rcu_dereference_protected(c->disk_groups,
+                               lockdep_is_held(&c->sb_lock));
        rcu_assign_pointer(c->disk_groups, cpu_g);
        if (old_g)
                kfree_rcu(old_g, rcu);
@@ -175,6 +176,8 @@ const struct bch_devs_mask *bch2_target_to_mask(struct bch_fs *c, unsigned targe
        struct target t = target_decode(target);
 
        switch (t.type) {
+       case TARGET_NULL:
+               return NULL;
        case TARGET_DEV: {
                struct bch_dev *ca = t.dev < c->sb.nr_devices
                        ? rcu_dereference(c->devs[t.dev])
@@ -184,7 +187,7 @@ const struct bch_devs_mask *bch2_target_to_mask(struct bch_fs *c, unsigned targe
        case TARGET_GROUP: {
                struct bch_disk_groups_cpu *g = rcu_dereference(c->disk_groups);
 
-               return t.group < g->nr && !g->entries[t.group].deleted
+               return g && t.group < g->nr && !g->entries[t.group].deleted
                        ? &g->entries[t.group].devs
                        : NULL;
        }
@@ -193,6 +196,36 @@ const struct bch_devs_mask *bch2_target_to_mask(struct bch_fs *c, unsigned targe
        }
 }
 
+bool bch2_dev_in_target(struct bch_fs *c, unsigned dev, unsigned target)
+{
+       struct target t = target_decode(target);
+
+       switch (t.type) {
+       case TARGET_NULL:
+               return false;
+       case TARGET_DEV:
+               return dev == t.dev;
+       case TARGET_GROUP: {
+               struct bch_disk_groups_cpu *g;
+               const struct bch_devs_mask *m;
+               bool ret;
+
+               rcu_read_lock();
+               g = rcu_dereference(c->disk_groups);
+               m = g && t.group < g->nr && !g->entries[t.group].deleted
+                       ? &g->entries[t.group].devs
+                       : NULL;
+
+               ret = m ? test_bit(dev, m->d) : false;
+               rcu_read_unlock();
+
+               return ret;
+       }
+       default:
+               BUG();
+       }
+}
+
 static int __bch2_disk_group_find(struct bch_sb_field_disk_groups *groups,
                                  unsigned parent,
                                  const char *name, unsigned namelen)
@@ -242,7 +275,7 @@ static int __bch2_disk_group_add(struct bch_sb_handle *sb, unsigned parent,
 
                groups = bch2_sb_resize_disk_groups(sb, u64s);
                if (!groups)
-                       return -ENOSPC;
+                       return -BCH_ERR_ENOSPC_disk_label_add;
 
                nr_groups = disk_groups_nr(groups);
        }
@@ -309,12 +342,10 @@ int bch2_disk_path_find_or_create(struct bch_sb_handle *sb, const char *name)
        return v;
 }
 
-int bch2_disk_path_print(struct bch_sb_handle *sb,
-                        char *buf, size_t len, unsigned v)
+void bch2_disk_path_to_text(struct printbuf *out, struct bch_sb *sb, unsigned v)
 {
-       char *out = buf, *end = out + len;
        struct bch_sb_field_disk_groups *groups =
-               bch2_sb_get_disk_groups(sb->sb);
+               bch2_sb_get_disk_groups(sb);
        struct bch_disk_group *g;
        unsigned nr = 0;
        u16 path[32];
@@ -340,52 +371,49 @@ int bch2_disk_path_print(struct bch_sb_handle *sb,
        }
 
        while (nr) {
-               unsigned b = 0;
-
                v = path[--nr];
                g = groups->entries + v;
 
-               if (end != out)
-                       b = min_t(size_t, end - out,
-                                 strnlen(g->label, sizeof(g->label)));
-               memcpy(out, g->label, b);
-               if (b < end - out)
-                       out[b] = '\0';
-               out += b;
-
+               prt_printf(out, "%.*s", (int) sizeof(g->label), g->label);
                if (nr)
-                       out += scnprintf(out, end - out, ".");
+                       prt_printf(out, ".");
        }
-
-       return out - buf;
+       return;
 inval:
-       return scnprintf(buf, len, "invalid group %u", v);
+       prt_printf(out, "invalid label %u", v);
 }
 
-int bch2_dev_group_set(struct bch_fs *c, struct bch_dev *ca, const char *name)
+int __bch2_dev_group_set(struct bch_fs *c, struct bch_dev *ca, const char *name)
 {
        struct bch_member *mi;
-       int v = -1;
-
-       mutex_lock(&c->sb_lock);
+       int ret, v = -1;
 
        if (!strlen(name) || !strcmp(name, "none"))
-               goto write_sb;
+               return 0;
 
        v = bch2_disk_path_find_or_create(&c->disk_sb, name);
-       if (v < 0) {
-               mutex_unlock(&c->sb_lock);
+       if (v < 0)
                return v;
-       }
 
-write_sb:
+       ret = bch2_sb_disk_groups_to_cpu(c);
+       if (ret)
+               return ret;
+
        mi = &bch2_sb_get_members(c->disk_sb.sb)->members[ca->dev_idx];
        SET_BCH_MEMBER_GROUP(mi, v + 1);
+       return 0;
+}
+
+int bch2_dev_group_set(struct bch_fs *c, struct bch_dev *ca, const char *name)
+{
+       int ret;
 
-       bch2_write_super(c);
+       mutex_lock(&c->sb_lock);
+       ret = __bch2_dev_group_set(c, ca, name) ?:
+               bch2_write_super(c);
        mutex_unlock(&c->sb_lock);
 
-       return 0;
+       return ret;
 }
 
 int bch2_opt_target_parse(struct bch_fs *c, const char *buf, u64 *v)
@@ -418,45 +446,59 @@ int bch2_opt_target_parse(struct bch_fs *c, const char *buf, u64 *v)
        return -EINVAL;
 }
 
-int bch2_opt_target_print(struct bch_fs *c, char *buf, size_t len, u64 v)
+void bch2_opt_target_to_text(struct printbuf *out,
+                            struct bch_fs *c,
+                            struct bch_sb *sb,
+                            u64 v)
 {
        struct target t = target_decode(v);
-       int ret;
 
        switch (t.type) {
        case TARGET_NULL:
-               return scnprintf(buf, len, "none");
-       case TARGET_DEV: {
-               struct bch_dev *ca;
-
-               rcu_read_lock();
-               ca = t.dev < c->sb.nr_devices
-                       ? rcu_dereference(c->devs[t.dev])
-                       : NULL;
-
-               if (ca && percpu_ref_tryget(&ca->io_ref)) {
-                       char b[BDEVNAME_SIZE];
-
-                       ret = scnprintf(buf, len, "/dev/%s",
-                                       bdevname(ca->disk_sb.bdev, b));
-                       percpu_ref_put(&ca->io_ref);
-               } else if (ca) {
-                       ret = scnprintf(buf, len, "offline device %u", t.dev);
+               prt_printf(out, "none");
+               break;
+       case TARGET_DEV:
+               if (c) {
+                       struct bch_dev *ca;
+
+                       rcu_read_lock();
+                       ca = t.dev < c->sb.nr_devices
+                               ? rcu_dereference(c->devs[t.dev])
+                               : NULL;
+
+                       if (ca && percpu_ref_tryget(&ca->io_ref)) {
+                               prt_printf(out, "/dev/%pg", ca->disk_sb.bdev);
+                               percpu_ref_put(&ca->io_ref);
+                       } else if (ca) {
+                               prt_printf(out, "offline device %u", t.dev);
+                       } else {
+                               prt_printf(out, "invalid device %u", t.dev);
+                       }
+
+                       rcu_read_unlock();
                } else {
-                       ret = scnprintf(buf, len, "invalid device %u", t.dev);
+                       struct bch_sb_field_members *mi = bch2_sb_get_members(sb);
+                       struct bch_member *m = mi->members + t.dev;
+
+                       if (bch2_dev_exists(sb, mi, t.dev)) {
+                               prt_printf(out, "Device ");
+                               pr_uuid(out, m->uuid.b);
+                               prt_printf(out, " (%u)", t.dev);
+                       } else {
+                               prt_printf(out, "Bad device %u", t.dev);
+                       }
                }
-
-               rcu_read_unlock();
                break;
-       }
        case TARGET_GROUP:
-               mutex_lock(&c->sb_lock);
-               ret = bch2_disk_path_print(&c->disk_sb, buf, len, t.group);
-               mutex_unlock(&c->sb_lock);
+               if (c) {
+                       mutex_lock(&c->sb_lock);
+                       bch2_disk_path_to_text(out, c->disk_sb.sb, t.group);
+                       mutex_unlock(&c->sb_lock);
+               } else {
+                       bch2_disk_path_to_text(out, sb, t.group);
+               }
                break;
        default:
                BUG();
        }
-
-       return ret;
 }