Backfill metadnode more intelligently

Only attempt to backfill lower metadnode object numbers if at least
4096 objects have been freed since the last rescan, and at most once
per transaction group. This avoids a pathology in dmu_object_alloc()
that caused O(N^2) behavior for create-heavy workloads and
substantially improves object creation rates.  As summarized by
@mahrens in #4636:

"Normally, the object allocator simply checks to see if the next
object is available. The slow calls happened when dmu_object_alloc()
checks to see if it can backfill lower object numbers. This happens
every time we move on to a new L1 indirect block (i.e. every 32 *
128 = 4096 objects).  When re-checking lower object numbers, we use
the on-disk fill count (blkptr_t:blk_fill) to quickly skip over
indirect blocks that don’t have enough free dnodes (defined as an L2
with at least 393,216 of 524,288 dnodes free). Therefore, we may
find that a block of dnodes has a low (or zero) fill count, and yet
we can’t allocate any of its dnodes, because they've been allocated
in memory but not yet written to disk. In this case we have to hold
each of the dnodes and then notice that it has been allocated in
memory.

The end result is that allocating N objects in the same TXG can
require CPU usage proportional to N^2."

Add a tunable dmu_rescan_dnode_threshold to define the number of
objects that must be freed before a rescan is performed. Don't bother
to export this as a module option because testing doesn't show a
compelling reason to change it. The vast majority of the performance
gain comes from limit the rescan to at most once per TXG.

Signed-off-by: Ned Bass <bass6@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/include/sys/dmu_objset.h b/include/sys/dmu_objset.h
index 837a0d5107b7f1aa636445a0ec1ebb281bd6167a..0f03699f133f9fc5dfbbdea6329eadb7f8195685 100644 (file)
--- a/include/sys/dmu_objset.h
+++ b/include/sys/dmu_objset.h
@@ -106,6 +106,8 @@ struct objset {
        zil_header_t os_zil_header;
        list_t os_synced_dnodes;
        uint64_t os_flags;
+       uint64_t os_freed_dnodes;
+       boolean_t os_rescan_dnodes;
 
        /* Protected by os_obj_lock */
        kmutex_t os_obj_lock;

diff --git a/module/zfs/dmu_object.c b/module/zfs/dmu_object.c
index 5faecafc7d86223ea1cb67ac244f0998dec10235..a5a53418bec5f62bc02a632634845195ec290ef2 100644 (file)
--- a/module/zfs/dmu_object.c
+++ b/module/zfs/dmu_object.c
@@ -36,20 +36,22 @@ dmu_object_alloc(objset_t *os, dmu_object_type_t ot, int blocksize,
     dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx)
 {
        uint64_t object;
-       uint64_t L2_dnode_count = DNODES_PER_BLOCK <<
+       uint64_t L1_dnode_count = DNODES_PER_BLOCK <<
            (DMU_META_DNODE(os)->dn_indblkshift - SPA_BLKPTRSHIFT);
        dnode_t *dn = NULL;
-       int restarted = B_FALSE;
 
        mutex_enter(&os->os_obj_lock);
        for (;;) {
                object = os->os_obj_next;
                /*
-                * Each time we polish off an L2 bp worth of dnodes
-                * (2^13 objects), move to another L2 bp that's still
-                * reasonably sparse (at most 1/4 full).  Look from the
-                * beginning once, but after that keep looking from here.
-                * If we can't find one, just keep going from here.
+                * Each time we polish off a L1 bp worth of dnodes (2^12
+                * objects), move to another L1 bp that's still reasonably
+                * sparse (at most 1/4 full). Look from the beginning at most
+                * once per txg, but after that keep looking from here.
+                * os_scan_dnodes is set during txg sync if enough objects
+                * have been freed since the previous rescan to justify
+                * backfilling again. If we can't find a suitable block, just
+                * keep going from here.
                 *
                 * Note that dmu_traverse depends on the behavior that we use
                 * multiple blocks of the dnode object before going back to
@@ -57,12 +59,19 @@ dmu_object_alloc(objset_t *os, dmu_object_type_t ot, int blocksize,
                 * that property or find another solution to the issues
                 * described in traverse_visitbp.
                 */
-               if (P2PHASE(object, L2_dnode_count) == 0) {
-                       uint64_t offset = restarted ? object << DNODE_SHIFT : 0;
-                       int error = dnode_next_offset(DMU_META_DNODE(os),
+
+               if (P2PHASE(object, L1_dnode_count) == 0) {
+                       uint64_t offset;
+                       int error;
+                       if (os->os_rescan_dnodes) {
+                               offset = 0;
+                               os->os_rescan_dnodes = B_FALSE;
+                       } else {
+                               offset = object << DNODE_SHIFT;
+                       }
+                       error = dnode_next_offset(DMU_META_DNODE(os),
                            DNODE_FIND_HOLE,
                            &offset, 2, DNODES_PER_BLOCK >> 2, 0);
-                       restarted = B_TRUE;
                        if (error == 0)
                                object = offset >> DNODE_SHIFT;
                }

diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
index 9f7cf5f4b843b009b22e44caca0d940705785a44..03b30dd3b36f62092afe6c144e8b30fbdb835cae 100644 (file)
--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@ -68,6 +68,13 @@ krwlock_t os_lock;
  */
 int dmu_find_threads = 0;
 
+/*
+ * Backfill lower metadnode objects after this many have been freed.
+ * Backfilling negatively impacts object creation rates, so only do it
+ * if there are enough holes to fill.
+ */
+int dmu_rescan_dnode_threshold = 1 << DN_MAX_INDBLKSHIFT;
+
 static void dmu_objset_find_dp_cb(void *arg);
 
 void
@@ -1152,6 +1159,13 @@ dmu_objset_sync(objset_t *os, zio_t *pio, dmu_tx_t *tx)
                if (dr->dr_zio)
                        zio_nowait(dr->dr_zio);
        }
+
+       /* Enable dnode backfill if enough objects have been freed. */
+       if (os->os_freed_dnodes >= dmu_rescan_dnode_threshold) {
+               os->os_rescan_dnodes = B_TRUE;
+               os->os_freed_dnodes = 0;
+       }
+
        /*
         * Free intent log blocks up to this tx.
         */

diff --git a/module/zfs/dnode_sync.c b/module/zfs/dnode_sync.c
index 66b0eef2a9f20ab43e51ef45432636264f22533f..bea7be18603fae9947bfc37a94ddb1089d22968a 100644 (file)
--- a/module/zfs/dnode_sync.c
+++ b/module/zfs/dnode_sync.c
@@ -682,6 +682,7 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx)
        }
 
        if (freeing_dnode) {
+               dn->dn_objset->os_freed_dnodes++;
                dnode_sync_free(dn, tx);
                return;
        }