Switch KM_SLEEP to KM_PUSHPAGE

[zfs.git] / module / zfs / ddt.c

diff --git a/module/zfs/ddt.c b/module/zfs/ddt.c
index c7db3d7..895422b 100644 (file)
--- a/module/zfs/ddt.c
+++ b/module/zfs/ddt.c
@@ -120,7 +120,9 @@ ddt_object_load(ddt_t *ddt, enum ddt_type type, enum ddt_class class)
        /*
         * Seed the cached statistics.
         */
-       VERIFY(ddt_object_info(ddt, type, class, &doi) == 0);
+       error = ddt_object_info(ddt, type, class, &doi);
+       if (error)
+               return (error);
 
        ddo->ddo_count = ddt_object_count(ddt, type, class);
        ddo->ddo_dspace = doi.doi_physical_blocks_512 << 9;
@@ -502,7 +504,7 @@ ddt_get_dedup_stats(spa_t *spa, ddt_stat_t *dds_total)
        ddt_histogram_t *ddh_total;
 
        /* XXX: Move to a slab */
-       ddh_total = kmem_zalloc(sizeof (ddt_histogram_t), KM_SLEEP);
+       ddh_total = kmem_zalloc(sizeof (ddt_histogram_t), KM_PUSHPAGE);
        ddt_get_dedup_histogram(spa, ddh_total);
        ddt_histogram_stat(dds_total, ddh_total);
        kmem_free(ddh_total, sizeof (ddt_histogram_t));
@@ -651,7 +653,7 @@ ddt_alloc(const ddt_key_t *ddk)
        ddt_entry_t *dde;
 
        /* XXX: Move to a slab */
-       dde = kmem_zalloc(sizeof (ddt_entry_t), KM_SLEEP);
+       dde = kmem_zalloc(sizeof (ddt_entry_t), KM_PUSHPAGE);
        cv_init(&dde->dde_cv, NULL, CV_DEFAULT, NULL);
 
        dde->dde_key = *ddk;
@@ -800,7 +802,7 @@ ddt_table_alloc(spa_t *spa, enum zio_checksum c)
        ddt_t *ddt;
 
        /* XXX: Move to a slab */
-       ddt = kmem_zalloc(sizeof (*ddt), KM_SLEEP | KM_NODEBUG);
+       ddt = kmem_zalloc(sizeof (*ddt), KM_PUSHPAGE | KM_NODEBUG);
 
        mutex_init(&ddt->ddt_lock, NULL, MUTEX_DEFAULT, NULL);
        avl_create(&ddt->ddt_tree, ddt_entry_compare,
@@ -891,7 +893,7 @@ boolean_t
 ddt_class_contains(spa_t *spa, enum ddt_class max_class, const blkptr_t *bp)
 {
        ddt_t *ddt;
-       ddt_entry_t dde;
+       ddt_entry_t *dde;
        enum ddt_type type;
        enum ddt_class class;
 
@@ -902,14 +904,20 @@ ddt_class_contains(spa_t *spa, enum ddt_class max_class, const blkptr_t *bp)
                return (B_TRUE);
 
        ddt = spa->spa_ddt[BP_GET_CHECKSUM(bp)];
+       dde = kmem_alloc(sizeof(ddt_entry_t), KM_PUSHPAGE);
 
-       ddt_key_fill(&dde.dde_key, bp);
+       ddt_key_fill(&(dde->dde_key), bp);
 
-       for (type = 0; type < DDT_TYPES; type++)
-               for (class = 0; class <= max_class; class++)
-                       if (ddt_object_lookup(ddt, type, class, &dde) == 0)
+       for (type = 0; type < DDT_TYPES; type++) {
+               for (class = 0; class <= max_class; class++) {
+                       if (ddt_object_lookup(ddt, type, class, dde) == 0) {
+                               kmem_free(dde, sizeof(ddt_entry_t));
                                return (B_TRUE);
+                       }
+               }
+       }
 
+       kmem_free(dde, sizeof(ddt_entry_t));
        return (B_FALSE);
 }
 
@@ -1187,3 +1195,8 @@ ddt_walk(spa_t *spa, ddt_bookmark_t *ddb, ddt_entry_t *dde)
 
        return (ENOENT);
 }
+
+#if defined(_KERNEL) && defined(HAVE_SPL)
+module_param(zfs_dedup_prefetch, int, 0644);
+MODULE_PARM_DESC(zfs_dedup_prefetch,"Enable prefetching dedup-ed blks");
+#endif