]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - cmd_fs.c
Fix bch2_super_write() alignment
[bcachefs-tools-debian] / cmd_fs.c
index 759c9894c373f044b85afa1420193c0c8e279fc2..67c38af6eafe73f9d9ae8d622d7ab350007513ca 100644 (file)
--- a/cmd_fs.c
+++ b/cmd_fs.c
-
+#include <getopt.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
 
 #include <uuid/uuid.h>
 
-#include "ccan/darray/darray.h"
-
 #include "linux/sort.h"
 
 #include "libbcachefs/bcachefs_ioctl.h"
+#include "libbcachefs/darray.h"
 #include "libbcachefs/opts.h"
+#include "libbcachefs/super-io.h"
 
 #include "cmds.h"
 #include "libbcachefs.h"
 
+static void __dev_usage_type_to_text(struct printbuf *out,
+                                    const char *type,
+                                    unsigned bucket_size,
+                                    u64 buckets, u64 sectors, u64 frag)
+{
+       prt_printf(out, "%s:", type);
+       prt_tab(out);
+
+       prt_units_u64(out, sectors << 9);
+       prt_tab_rjust(out);
+
+       prt_printf(out, "%llu", buckets);
+       prt_tab_rjust(out);
+
+       if (frag) {
+               prt_units_u64(out, frag << 9);
+               prt_tab_rjust(out);
+       }
+       prt_newline(out);
+}
+
 static void dev_usage_type_to_text(struct printbuf *out,
-                                  const char *type,
-                                  unsigned bucket_size,
-                                  u64 buckets, u64 sectors)
+                                  struct bch_ioctl_dev_usage_v2 *u,
+                                  enum bch_data_type type)
 {
-       u64 frag = max((s64) buckets * bucket_size - (s64) sectors, 0LL);
-
-       pr_buf(out, "%s:", type);
-       pr_tab(out);
-       pr_sectors(out, sectors);
-       pr_tab_rjust(out);
-       pr_buf(out, "%llu", buckets);
-       pr_tab_rjust(out);
-       pr_sectors(out, frag);
-       pr_tab_rjust(out);
-       pr_newline(out);
+       u64 sectors = 0;
+       switch (type) {
+       case BCH_DATA_free:
+       case BCH_DATA_need_discard:
+       case BCH_DATA_need_gc_gens:
+               /* sectors are 0 for these types so calculate sectors for them */
+               sectors = u->d[type].buckets * u->bucket_size;
+               break;
+       default:
+               sectors = u->d[type].sectors;
+       }
+
+       __dev_usage_type_to_text(out, bch2_data_types[type],
+                       u->bucket_size,
+                       u->d[type].buckets,
+                       sectors,
+                       u->d[type].fragmented);
 }
 
 static void dev_usage_to_text(struct printbuf *out,
                              struct bchfs_handle fs,
                              struct dev_name *d)
 {
-       struct bch_ioctl_dev_usage u = bchu_dev_usage(fs, d->idx);
-       unsigned i;
-
-       pr_newline(out);
-       pr_buf(out, "%s (device %u):", d->label ?: "(no label)", d->idx);
-       pr_tab(out);
-       pr_buf(out, "%s", d->dev ?: "(device not found)");
-       pr_tab_rjust(out);
+       struct bch_ioctl_dev_usage_v2 *u = bchu_dev_usage(fs, d->idx);
 
-       pr_buf(out, "%s", bch2_member_states[u.state]);
-       pr_tab_rjust(out);
+       prt_newline(out);
+       prt_printf(out, "%s (device %u):", d->label ?: "(no label)", d->idx);
+       prt_tab(out);
+       prt_str(out, d->dev ?: "(device not found)");
+       prt_tab_rjust(out);
 
-       pr_newline(out);
+       prt_str(out, bch2_member_states[u->state]);
+       prt_tab_rjust(out);
 
-       pr_indent_push(out, 2);
-       pr_tab(out);
+       prt_newline(out);
 
-       pr_buf(out, "data");
-       pr_tab_rjust(out);
+       printbuf_indent_add(out, 2);
+       prt_tab(out);
 
-       pr_buf(out, "buckets");
-       pr_tab_rjust(out);
+       prt_str(out, "data");
+       prt_tab_rjust(out);
 
-       pr_buf(out, "fragmented");
-       pr_tab_rjust(out);
+       prt_str(out, "buckets");
+       prt_tab_rjust(out);
 
-       pr_newline(out);
+       prt_str(out, "fragmented");
+       prt_tab_rjust(out);
 
-       for (i = BCH_DATA_sb; i < BCH_DATA_NR; i++)
-               dev_usage_type_to_text(out,
-                                      bch2_data_types[i],
-                                      u.bucket_size,
-                                      u.buckets[i],
-                                      u.sectors[i]);
+       prt_newline(out);
 
-       dev_usage_type_to_text(out,
-                              "erasure coded",
-                              u.bucket_size,
-                              u.ec_buckets,
-                              u.ec_sectors);
+       for (unsigned i = 0; i < u->nr_data_types; i++)
+               dev_usage_type_to_text(out, u, i);
 
-       pr_buf(out, "available:");
-       pr_tab(out);
+       prt_str(out, "capacity:");
+       prt_tab(out);
 
-       pr_sectors(out, u.available_buckets * u.bucket_size);
-       pr_tab_rjust(out);
+       prt_units_u64(out, (u->nr_buckets * u->bucket_size) << 9);
+       prt_tab_rjust(out);
+       prt_printf(out, "%llu", u->nr_buckets);
+       prt_tab_rjust(out);
 
-       pr_buf(out, "%llu", u.available_buckets);
-       pr_tab_rjust(out);
-       pr_newline(out);
+       printbuf_indent_sub(out, 2);
 
-       pr_buf(out, "capacity:");
-       pr_tab(out);
-
-       pr_sectors(out, u.nr_buckets * u.bucket_size);
-       pr_tab_rjust(out);
-       pr_buf(out, "%llu", u.nr_buckets);
-       pr_tab_rjust(out);
-
-       pr_indent_pop(out, 2);
-
-       pr_newline(out);
+       prt_newline(out);
+       free(u);
 }
 
 static int dev_by_label_cmp(const void *_l, const void *_r)
@@ -113,12 +119,9 @@ static int dev_by_label_cmp(const void *_l, const void *_r)
 
 static struct dev_name *dev_idx_to_name(dev_names *dev_names, unsigned idx)
 {
-       struct dev_name *dev;
-
-       darray_foreach(dev, *dev_names)
+       darray_for_each(*dev_names, dev)
                if (dev->idx == idx)
                        return dev;
-
        return NULL;
 }
 
@@ -126,18 +129,20 @@ static void replicas_usage_to_text(struct printbuf *out,
                                   const struct bch_replicas_usage *r,
                                   dev_names *dev_names)
 {
-       unsigned i;
-
        if (!r->sectors)
                return;
 
        char devs[4096], *d = devs;
        *d++ = '[';
 
-       for (i = 0; i < r->r.nr_devs; i++) {
+       unsigned durability = 0;
+
+       for (unsigned i = 0; i < r->r.nr_devs; i++) {
                unsigned dev_idx = r->r.devs[i];
                struct dev_name *dev = dev_idx_to_name(dev_names, dev_idx);
 
+               durability += dev->durability;
+
                if (i)
                        *d++ = ' ';
 
@@ -148,18 +153,21 @@ static void replicas_usage_to_text(struct printbuf *out,
        *d++ = ']';
        *d++ = '\0';
 
-       pr_buf(out, "%s: ", bch2_data_types[r->r.data_type]);
-       pr_tab(out);
+       prt_printf(out, "%s: ", bch2_data_types[r->r.data_type]);
+       prt_tab(out);
 
-       pr_buf(out, "%u/%u ", r->r.nr_required, r->r.nr_devs);
-       pr_tab(out);
+       prt_printf(out, "%u/%u ", r->r.nr_required, r->r.nr_devs);
+       prt_tab(out);
 
-       pr_buf(out, "%s ", devs);
-       pr_tab(out);
+       prt_printf(out, "%u ", durability);
+       prt_tab(out);
 
-       pr_sectors(out, r->sectors);
-       pr_tab_rjust(out);
-       pr_newline(out);
+       prt_printf(out, "%s ", devs);
+       prt_tab(out);
+
+       prt_units_u64(out, r->sectors << 9);
+       prt_tab_rjust(out);
+       prt_newline(out);
 }
 
 #define for_each_usage_replica(_u, _r)                                 \
@@ -174,64 +182,70 @@ static void fs_usage_to_text(struct printbuf *out, const char *path)
 
        struct bchfs_handle fs = bcache_fs_open(path);
 
-       struct dev_name *dev;
        dev_names dev_names = bchu_fs_get_devices(fs);
 
        struct bch_ioctl_fs_usage *u = bchu_fs_usage(fs);
 
-       pr_buf(out, "Filesystem: ");
+       prt_str(out, "Filesystem: ");
        pr_uuid(out, fs.uuid.b);
-       pr_newline(out);
+       prt_newline(out);
+
+       printbuf_tabstops_reset(out);
+       printbuf_tabstop_push(out, 20);
+       printbuf_tabstop_push(out, 16);
+
+       prt_str(out, "Size:");
+       prt_tab(out);
+       prt_units_u64(out, u->capacity << 9);
+       prt_tab_rjust(out);
+       prt_newline(out);
 
-       out->tabstops[0] = 20;
-       out->tabstops[1] = 36;
+       prt_str(out, "Used:");
+       prt_tab(out);
+       prt_units_u64(out, u->used << 9);
+       prt_tab_rjust(out);
+       prt_newline(out);
 
-       pr_buf(out, "Size:");
-       pr_tab(out);
-       pr_sectors(out, u->capacity);
-       pr_tab_rjust(out);
-       pr_newline(out);
+       prt_str(out, "Online reserved:");
+       prt_tab(out);
+       prt_units_u64(out, u->online_reserved << 9);
+       prt_tab_rjust(out);
+       prt_newline(out);
 
-       pr_buf(out, "Used:");
-       pr_tab(out);
-       pr_sectors(out, u->used);
-       pr_tab_rjust(out);
-       pr_newline(out);
+       prt_newline(out);
 
-       pr_buf(out, "Online reserved:");
-       pr_tab(out);
-       pr_sectors(out, u->online_reserved);
-       pr_tab_rjust(out);
-       pr_newline(out);
+       printbuf_tabstops_reset(out);
 
-       pr_newline(out);
+       printbuf_tabstop_push(out, 16);
+       prt_str(out, "Data type");
+       prt_tab(out);
 
-       out->tabstops[0] = 16;
-       out->tabstops[1] = 32;
-       out->tabstops[2] = 50;
-       out->tabstops[3] = 68;
+       printbuf_tabstop_push(out, 16);
+       prt_str(out, "Required/total");
+       prt_tab(out);
 
-       pr_buf(out, "Data type");
-       pr_tab(out);
+       printbuf_tabstop_push(out, 14);
+       prt_str(out, "Durability");
+       prt_tab(out);
 
-       pr_buf(out, "Required/total");
-       pr_tab(out);
+       printbuf_tabstop_push(out, 14);
+       prt_str(out, "Devices");
+       prt_newline(out);
 
-       pr_buf(out, "Devices");
-       pr_newline(out);
+       printbuf_tabstop_push(out, 14);
 
        for (i = 0; i < BCH_REPLICAS_MAX; i++) {
                if (!u->persistent_reserved[i])
                        continue;
 
-               pr_buf(out, "reserved:");
-               pr_tab(out);
-               pr_buf(out, "%u/%u ", 1, i);
-               pr_tab(out);
-               pr_buf(out, "[] ");
-               pr_sectors(out, u->persistent_reserved[i]);
-               pr_tab_rjust(out);
-               pr_newline(out);
+               prt_str(out, "reserved:");
+               prt_tab(out);
+               prt_printf(out, "%u/%u ", 1, i);
+               prt_tab(out);
+               prt_str(out, "[] ");
+               prt_units_u64(out, u->persistent_reserved[i] << 9);
+               prt_tab_rjust(out);
+               prt_newline(out);
        }
 
        struct bch_replicas_usage *r;
@@ -256,69 +270,79 @@ static void fs_usage_to_text(struct printbuf *out, const char *path)
 
        free(u);
 
-       sort(&darray_item(dev_names, 0), darray_size(dev_names),
-            sizeof(darray_item(dev_names, 0)), dev_by_label_cmp, NULL);
+       sort(dev_names.data, dev_names.nr,
+            sizeof(dev_names.data[0]), dev_by_label_cmp, NULL);
 
-       out->tabstops[0] = 16;
-       out->tabstops[1] = 36;
-       out->tabstops[2] = 52;
-       out->tabstops[3] = 68;
+       printbuf_tabstops_reset(out);
+       printbuf_tabstop_push(out, 16);
+       printbuf_tabstop_push(out, 20);
+       printbuf_tabstop_push(out, 16);
+       printbuf_tabstop_push(out, 14);
 
-       darray_foreach(dev, dev_names)
+       darray_for_each(dev_names, dev)
                dev_usage_to_text(out, fs, dev);
 
-       darray_foreach(dev, dev_names) {
+       darray_for_each(dev_names, dev) {
                free(dev->dev);
                free(dev->label);
        }
-       darray_free(dev_names);
+       darray_exit(&dev_names);
 
        bcache_fs_close(fs);
 }
 
-int fs_usage(void)
+static void fs_usage_usage(void)
 {
-       puts("bcachefs fs - manage a running filesystem\n"
-            "Usage: bcachefs fs <CMD> [OPTION]... path\n"
-            "\n"
-            "Commands:\n"
-            "  usage                      show disk usage\n"
-            "\n"
-            "Report bugs to <linux-bcachefs@vger.kernel.org>");
-       return 0;
+       puts("bcachefs fs usage - display detailed filesystem usage\n"
+            "Usage: bcachefs fs usage [OPTION]... <mountpoint>\n"
+            "\n"
+            "Options:\n"
+            "  -h, --human-readable              Human readable units\n"
+            "  -H, --help                        Display this help and exit\n"
+            "Report bugs to <linux-bcachefs@vger.kernel.org>");
 }
 
 int cmd_fs_usage(int argc, char *argv[])
 {
-       enum printbuf_units units = PRINTBUF_UNITS_BYTES;
-       char _buf[1 << 16];
-       struct printbuf buf;
+       static const struct option longopts[] = {
+               { "help",               no_argument,            NULL, 'H' },
+               { "human-readable",     no_argument,            NULL, 'h' },
+               { NULL }
+       };
+       bool human_readable = false;
+       struct printbuf buf = PRINTBUF;
        char *fs;
        int opt;
 
-       while ((opt = getopt(argc, argv, "h")) != -1)
+       while ((opt = getopt_long(argc, argv, "h",
+                                 longopts, NULL)) != -1)
                switch (opt) {
                case 'h':
-                       units = PRINTBUF_UNITS_HUMAN_READABLE;
+                       human_readable = true;
                        break;
+               case 'H':
+                       fs_usage_usage();
+                       exit(EXIT_SUCCESS);
+               default:
+                       fs_usage_usage();
+                       exit(EXIT_FAILURE);
                }
        args_shift(optind);
 
        if (!argc) {
-               buf = PBUF(_buf);
-               buf.units = units;
+               printbuf_reset(&buf);
+               buf.human_readable_units = human_readable;
                fs_usage_to_text(&buf, ".");
-               *buf.pos = 0;
-               printf("%s", _buf);
+               printf("%s", buf.buf);
        } else {
                while ((fs = arg_pop())) {
-                       buf = PBUF(_buf);
-                       buf.units = units;
+                       printbuf_reset(&buf);
+                       buf.human_readable_units = human_readable;
                        fs_usage_to_text(&buf, fs);
-                       *buf.pos = 0;
-                       printf("%s", _buf);
+                       printf("%s", buf.buf);
                }
        }
 
+       printbuf_exit(&buf);
        return 0;
 }