Illumos #3603, #3604: bobj improvements

3603 panic from bpobj_enqueue_subobj()
3604 zdb should print bpobjs more verbosely
3871 GCC 4.5.3 does not like issue 3604 patch
Reviewed by: Henrik Mattson <henrik.mattson@delphix.com>
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@nexenta.com>

References:
  https://www.illumos.org/issues/3603
  https://www.illumos.org/issues/3604
  https://www.illumos.org/issues/3871
  illumos/illumos-gate@d04756377ddd1cf28ebcf652541094e17b03c889

Ported-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1775

Note that the patch from Illumos issue 3871 is not accepted into Illumos
at the time of this writing. It is something that I wrote when porting
this. Documentation is in the Illumos issue.

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index b119a16e2f036f414f2da07d34a0362bd667ee36..2bee9fab6a4dc238028c02883344316fcfb9f1f8 100644 (file)
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -1233,41 +1233,67 @@ dump_bpobj_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
 }
 
 static void
-dump_bpobj(bpobj_t *bpo, char *name)
+dump_bpobj(bpobj_t *bpo, char *name, int indent)
 {
        char bytes[32];
        char comp[32];
        char uncomp[32];
+       uint64_t i;
 
        if (dump_opt['d'] < 3)
                return;
 
        zdb_nicenum(bpo->bpo_phys->bpo_bytes, bytes);
-       if (bpo->bpo_havesubobj) {
+       if (bpo->bpo_havesubobj && bpo->bpo_phys->bpo_subobjs != 0) {
                zdb_nicenum(bpo->bpo_phys->bpo_comp, comp);
                zdb_nicenum(bpo->bpo_phys->bpo_uncomp, uncomp);
-               (void) printf("\n    %s: %llu local blkptrs, %llu subobjs, "
-                   "%s (%s/%s comp)\n",
-                   name, (u_longlong_t)bpo->bpo_phys->bpo_num_blkptrs,
+               (void) printf("    %*s: object %llu, %llu local blkptrs, "
+                   "%llu subobjs, %s (%s/%s comp)\n",
+                   indent * 8, name,
+                   (u_longlong_t)bpo->bpo_object,
+                   (u_longlong_t)bpo->bpo_phys->bpo_num_blkptrs,
                    (u_longlong_t)bpo->bpo_phys->bpo_num_subobjs,
                    bytes, comp, uncomp);
+
+               for (i = 0; i < bpo->bpo_phys->bpo_num_subobjs; i++) {
+                       uint64_t subobj;
+                       bpobj_t subbpo;
+                       int error;
+                       VERIFY0(dmu_read(bpo->bpo_os,
+                           bpo->bpo_phys->bpo_subobjs,
+                           i * sizeof (subobj), sizeof (subobj), &subobj, 0));
+                       error = bpobj_open(&subbpo, bpo->bpo_os, subobj);
+                       if (error != 0) {
+                               (void) printf("ERROR %u while trying to open "
+                                   "subobj id %llu\n",
+                                   error, (u_longlong_t)subobj);
+                               continue;
+                       }
+                       dump_bpobj(&subbpo, "subobj", indent + 1);
+               }
        } else {
-               (void) printf("\n    %s: %llu blkptrs, %s\n",
-                   name, (u_longlong_t)bpo->bpo_phys->bpo_num_blkptrs, bytes);
+               (void) printf("    %*s: object %llu, %llu blkptrs, %s\n",
+                   indent * 8, name,
+                   (u_longlong_t)bpo->bpo_object,
+                   (u_longlong_t)bpo->bpo_phys->bpo_num_blkptrs,
+                   bytes);
        }
 
        if (dump_opt['d'] < 5)
                return;
 
-       (void) printf("\n");
 
-       (void) bpobj_iterate_nofree(bpo, dump_bpobj_cb, NULL, NULL);
+       if (indent == 0) {
+               (void) bpobj_iterate_nofree(bpo, dump_bpobj_cb, NULL, NULL);
+               (void) printf("\n");
+       }
 }
 
 static void
 dump_deadlist(dsl_deadlist_t *dl)
 {
        dsl_deadlist_entry_t *dle;
+       uint64_t unused;
        char bytes[32];
        char comp[32];
        char uncomp[32];
@@ -1286,14 +1312,24 @@ dump_deadlist(dsl_deadlist_t *dl)
 
        (void) printf("\n");
 
+       /* force the tree to be loaded */
+       dsl_deadlist_space_range(dl, 0, UINT64_MAX, &unused, &unused, &unused);
+
        for (dle = avl_first(&dl->dl_tree); dle;
            dle = AVL_NEXT(&dl->dl_tree, dle)) {
-               (void) printf("      mintxg %llu -> obj %llu\n",
-                   (longlong_t)dle->dle_mintxg,
-                   (longlong_t)dle->dle_bpobj.bpo_object);
+               if (dump_opt['d'] >= 5) {
+                       char buf[128];
+                       (void) snprintf(buf, sizeof (buf), "mintxg %llu -> obj %llu",
+                           (longlong_t)dle->dle_mintxg,
+                           (longlong_t)dle->dle_bpobj.bpo_object);
 
-               if (dump_opt['d'] >= 5)
-                       dump_bpobj(&dle->dle_bpobj, "");
+                       dump_bpobj(&dle->dle_bpobj, buf, 0);
+               } else {
+                       (void) printf("mintxg %llu -> obj %llu\n",
+                           (longlong_t)dle->dle_mintxg,
+                           (longlong_t)dle->dle_bpobj.bpo_object);
+
+               }
        }
 }
 
@@ -1316,7 +1352,7 @@ fuid_table_destroy(void)
  * print uid or gid information.
  * For normal POSIX id just the id is printed in decimal format.
  * For CIFS files with FUID the fuid is printed in hex followed by
- * the doman-rid string.
+ * the domain-rid string.
  */
 static void
 print_idstr(uint64_t id, const char *id_type)
@@ -2669,10 +2705,11 @@ dump_zpool(spa_t *spa)
        if (dump_opt['d'] || dump_opt['i']) {
                dump_dir(dp->dp_meta_objset);
                if (dump_opt['d'] >= 3) {
-                       dump_bpobj(&spa->spa_deferred_bpobj, "Deferred frees");
+                       dump_bpobj(&spa->spa_deferred_bpobj,
+                           "Deferred frees", 0);
                        if (spa_version(spa) >= SPA_VERSION_DEADLISTS) {
                                dump_bpobj(&spa->spa_dsl_pool->dp_free_bpobj,
-                                   "Pool snapshot frees");
+                                   "Pool snapshot frees", 0);
                        }
 
                        if (spa_feature_is_active(spa,

diff --git a/module/zfs/bpobj.c b/module/zfs/bpobj.c
index 4ba9f8002e2d6671df7518e0cec300423cbc82cc..5787a6fb4663c8aab914a009e61d2574ff6bcaec 100644 (file)
--- a/module/zfs/bpobj.c
+++ b/module/zfs/bpobj.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #include <sys/bpobj.h>
@@ -418,6 +418,12 @@ bpobj_enqueue_subobj(bpobj_t *bpo, uint64_t subobj, dmu_tx_t *tx)
 
                        VERIFY3U(0, ==, dmu_buf_hold(bpo->bpo_os, subsubobjs,
                            0, FTAG, &subdb, 0));
+                       /*
+                        * Make sure that we are not asking dmu_write()
+                        * to write more data than we have in our buffer.
+                        */
+                       VERIFY3U(subdb->db_size, >=,
+                           numsubsub * sizeof (subobj));
                        dmu_write(bpo->bpo_os, bpo->bpo_phys->bpo_subobjs,
                            bpo->bpo_phys->bpo_num_subobjs * sizeof (subobj),
                            numsubsub * sizeof (subobj), subdb->db_data, tx);

diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
index 8ef74514abe9e489f90275039da6821efd55541c..afa8719b1b9c9271a5ee739ba03a35f9795cef2f 100644 (file)
--- a/module/zfs/dmu.c
+++ b/module/zfs/dmu.c
@@ -1829,7 +1829,7 @@ __dmu_object_info_from_dnode(dnode_t *dn, dmu_object_info_t *doi)
        doi->doi_checksum = dn->dn_checksum;
        doi->doi_compress = dn->dn_compress;
        doi->doi_physical_blocks_512 = (DN_USED_BYTES(dnp) + 256) >> 9;
-       doi->doi_max_offset = (dnp->dn_maxblkid + 1) * dn->dn_datablksz;
+       doi->doi_max_offset = (dn->dn_maxblkid + 1) * dn->dn_datablksz;
        doi->doi_fill_count = 0;
        for (i = 0; i < dnp->dn_nblkptr; i++)
                doi->doi_fill_count += dnp->dn_blkptr[i].blk_fill;