Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[linux-2.6-block.git] / mm / cma_debug.c

diff --git a/mm/cma_debug.c b/mm/cma_debug.c
index 0b377536ccde84419222e851b334f8453955232f..7621ee34daa0dea1dd0246238e7eb5bc613cfe4c 100644 (file)
--- a/mm/cma_debug.c
+++ b/mm/cma_debug.c
@@ -30,9 +30,44 @@ static int cma_debugfs_get(void *data, u64 *val)
 
        return 0;
 }
-
 DEFINE_SIMPLE_ATTRIBUTE(cma_debugfs_fops, cma_debugfs_get, NULL, "%llu\n");
 
+static int cma_used_get(void *data, u64 *val)
+{
+       struct cma *cma = data;
+       unsigned long used;
+
+       mutex_lock(&cma->lock);
+       /* pages counter is smaller than sizeof(int) */
+       used = bitmap_weight(cma->bitmap, (int)cma->count);
+       mutex_unlock(&cma->lock);
+       *val = (u64)used << cma->order_per_bit;
+
+       return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(cma_used_fops, cma_used_get, NULL, "%llu\n");
+
+static int cma_maxchunk_get(void *data, u64 *val)
+{
+       struct cma *cma = data;
+       unsigned long maxchunk = 0;
+       unsigned long start, end = 0;
+
+       mutex_lock(&cma->lock);
+       for (;;) {
+               start = find_next_zero_bit(cma->bitmap, cma->count, end);
+               if (start >= cma->count)
+                       break;
+               end = find_next_bit(cma->bitmap, cma->count, start);
+               maxchunk = max(end - start, maxchunk);
+       }
+       mutex_unlock(&cma->lock);
+       *val = (u64)maxchunk << cma->order_per_bit;
+
+       return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(cma_maxchunk_fops, cma_maxchunk_get, NULL, "%llu\n");
+
 static void cma_add_to_cma_mem_list(struct cma *cma, struct cma_mem *mem)
 {
        spin_lock(&cma->mem_head_lock);
@@ -91,7 +126,6 @@ static int cma_free_write(void *data, u64 val)
 
        return cma_free_mem(cma, pages);
 }
-
 DEFINE_SIMPLE_ATTRIBUTE(cma_free_fops, NULL, cma_free_write, "%llu\n");
 
 static int cma_alloc_mem(struct cma *cma, int count)
@@ -124,7 +158,6 @@ static int cma_alloc_write(void *data, u64 val)
 
        return cma_alloc_mem(cma, pages);
 }
-
 DEFINE_SIMPLE_ATTRIBUTE(cma_alloc_fops, NULL, cma_alloc_write, "%llu\n");
 
 static void cma_debugfs_add_one(struct cma *cma, int idx)
@@ -149,6 +182,8 @@ static void cma_debugfs_add_one(struct cma *cma, int idx)
                                &cma->count, &cma_debugfs_fops);
        debugfs_create_file("order_per_bit", S_IRUGO, tmp,
                                &cma->order_per_bit, &cma_debugfs_fops);
+       debugfs_create_file("used", S_IRUGO, tmp, cma, &cma_used_fops);
+       debugfs_create_file("maxchunk", S_IRUGO, tmp, cma, &cma_maxchunk_fops);
 
        u32s = DIV_ROUND_UP(cma_bitmap_maxno(cma), BITS_PER_BYTE * sizeof(u32));
        debugfs_create_u32_array("bitmap", S_IRUGO, tmp, (u32*)cma->bitmap, u32s);