Commit d56e84b4 authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Linus Torvalds

mm/cma_debug: correct size input to bitmap function

In CMA, 1 bit in bitmap means 1 << order_per_bits pages so size of
bitmap is cma->count >> order_per_bits rather than just cma->count.
This patch fixes it.
Signed-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Stefan Strogin <stefan.strogin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2292c0b1
...@@ -39,7 +39,7 @@ static int cma_used_get(void *data, u64 *val) ...@@ -39,7 +39,7 @@ static int cma_used_get(void *data, u64 *val)
mutex_lock(&cma->lock); mutex_lock(&cma->lock);
/* pages counter is smaller than sizeof(int) */ /* pages counter is smaller than sizeof(int) */
used = bitmap_weight(cma->bitmap, (int)cma->count); used = bitmap_weight(cma->bitmap, (int)cma_bitmap_maxno(cma));
mutex_unlock(&cma->lock); mutex_unlock(&cma->lock);
*val = (u64)used << cma->order_per_bit; *val = (u64)used << cma->order_per_bit;
...@@ -52,13 +52,14 @@ static int cma_maxchunk_get(void *data, u64 *val) ...@@ -52,13 +52,14 @@ static int cma_maxchunk_get(void *data, u64 *val)
struct cma *cma = data; struct cma *cma = data;
unsigned long maxchunk = 0; unsigned long maxchunk = 0;
unsigned long start, end = 0; unsigned long start, end = 0;
unsigned long bitmap_maxno = cma_bitmap_maxno(cma);
mutex_lock(&cma->lock); mutex_lock(&cma->lock);
for (;;) { for (;;) {
start = find_next_zero_bit(cma->bitmap, cma->count, end); start = find_next_zero_bit(cma->bitmap, bitmap_maxno, end);
if (start >= cma->count) if (start >= cma->count)
break; break;
end = find_next_bit(cma->bitmap, cma->count, start); end = find_next_bit(cma->bitmap, bitmap_maxno, start);
maxchunk = max(end - start, maxchunk); maxchunk = max(end - start, maxchunk);
} }
mutex_unlock(&cma->lock); mutex_unlock(&cma->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment