Imported Upstream version 0.6.2

[mirror_spl-debian.git] / module / splat / splat-kmem.c

diff --git a/module/splat/splat-kmem.c b/module/splat/splat-kmem.c
index 0eab14217dc07f2a9df3e0bf01d7ad159329852a..c7f36caac0be9beca53c0f395f8bd7417a104e94 100644 (file)
--- a/module/splat/splat-kmem.c
+++ b/module/splat/splat-kmem.c
@@ -745,6 +745,7 @@ splat_kmem_test5(struct file *file, void *arg)
        char *name = SPLAT_KMEM_TEST5_NAME;
        int rc;
 
+       /* On slab (default + kmem + vmem) */
        rc = splat_kmem_cache_test(file, arg, name, 128, 0, 0);
        if (rc)
                return rc;
@@ -753,7 +754,24 @@ splat_kmem_test5(struct file *file, void *arg)
        if (rc)
                return rc;
 
-       return splat_kmem_cache_test(file, arg, name, 128, 0, KMC_VMEM);
+       rc = splat_kmem_cache_test(file, arg, name, 128, 0, KMC_VMEM);
+       if (rc)
+               return rc;
+
+       /* Off slab (default + kmem + vmem) */
+       rc = splat_kmem_cache_test(file, arg, name, 128, 0, KMC_OFFSLAB);
+       if (rc)
+               return rc;
+
+       rc = splat_kmem_cache_test(file, arg, name, 128, 0,
+           KMC_KMEM | KMC_OFFSLAB);
+       if (rc)
+               return rc;
+
+       rc = splat_kmem_cache_test(file, arg, name, 128, 0,
+           KMC_VMEM | KMC_OFFSLAB);
+
+       return rc;
 }
 
 /*
@@ -765,6 +783,7 @@ splat_kmem_test6(struct file *file, void *arg)
        char *name = SPLAT_KMEM_TEST6_NAME;
        int rc;
 
+       /* On slab (default + kmem + vmem) */
        rc = splat_kmem_cache_test(file, arg, name, 256*1024, 0, 0);
        if (rc)
                return rc;
@@ -773,7 +792,24 @@ splat_kmem_test6(struct file *file, void *arg)
        if (rc)
                return rc;
 
-       return splat_kmem_cache_test(file, arg, name, 1024*1024, 0, KMC_VMEM);
+       rc = splat_kmem_cache_test(file, arg, name, 1024*1024, 0, KMC_VMEM);
+       if (rc)
+               return rc;
+
+       /* Off slab (default + kmem + vmem) */
+       rc = splat_kmem_cache_test(file, arg, name, 256*1024, 0, KMC_OFFSLAB);
+       if (rc)
+               return rc;
+
+       rc = splat_kmem_cache_test(file, arg, name, 64*1024, 0,
+           KMC_KMEM | KMC_OFFSLAB);
+       if (rc)
+               return rc;
+
+       rc = splat_kmem_cache_test(file, arg, name, 1024*1024, 0,
+           KMC_VMEM | KMC_OFFSLAB);
+
+       return rc;
 }
 
 /*
@@ -789,6 +825,11 @@ splat_kmem_test7(struct file *file, void *arg)
                rc = splat_kmem_cache_test(file, arg, name, 157, i, 0);
                if (rc)
                        return rc;
+
+               rc = splat_kmem_cache_test(file, arg, name, 157, i,
+                   KMC_OFFSLAB);
+               if (rc)
+                       return rc;
        }
 
        return rc;