From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935440AbbCPQJZ (ORCPT ); Mon, 16 Mar 2015 12:09:25 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:21781 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933115AbbCPQJT (ORCPT ); Mon, 16 Mar 2015 12:09:19 -0400 X-AuditID: cbfec7f5-b7fc86d0000066b7-cb-5506ff977603 From: Stefan Strogin To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Dmitry Safonov , Stefan Strogin , Joonsoo Kim , Andrew Morton , Marek Szyprowski , Michal Nazarewicz , aneesh.kumar@linux.vnet.ibm.com, Laurent Pinchart , Pintu Kumar , Weijie Yang , Laura Abbott , SeongJae Park , Hui Zhu , Minchan Kim , Dyasly Sergey , Vyacheslav Tyrtov , Aleksei Mateosian , gregory.0xf0@gmail.com, sasha.levin@oracle.com, gioh.kim@lge.com, pavel@ucw.cz, stefan.strogin@gmail.com Subject: [PATCH v4 5/5] mm: cma: add functions to get region pages counters Date: Mon, 16 Mar 2015 19:09:11 +0300 Message-id: X-Mailer: git-send-email 2.1.0 In-reply-to: References: X-Brightmail-Tracker: H4sIAAAAAAAAAyWRW0jTYQDF/f53R3/6t3R8aGjMegny2sOHhWgEfVgPvhglaS2dc+CmbU40 ehBXpPOSWqblErssUmeumZdUBOfdChaLHhR1lfqgXVCbi2mtzb39OIdzzsPhSLGHDOOU6iK5 Ri3LlzIi6t2/KcfxJi+THrsxnoC+tDawyNhtZtC39VYKbbavMGi1/DdAD5osNGqv0jOov7KZ RZX1z1nkGDQyaNHspVHX+AKL2qZu0eiF6xeLFmYnGFTrHmPRvZYwtD1jJNGz8XkSfR64SyDH dy+LGpv/sGjG8oFGFr0oGWJHbQ2B3z5aYHFLxUMaWzsqGWzdbGCx4ccnAk8371DYaeuh8Kvd NQJvrMxRePTnMIFr33QA/LLTzeItawQ2vPbQafszRKdy5PnKYrkmJumqKG/zq5MprAsvud29 SpWBCYkBBHNQOAFHHI10gCXQvtjNGICIEwsmANf6nMBviIUaAn40hvuZ8QUm7U17eoiPh/SP gT9ACr0MHH05QfiNg8I5WO1dZ/1MCUdh+323jzmOF+TwyR1lYCwCWoa8ez3BQgocma2gAlvJ sG3RBeoA3waCOkCoXJddqL2mUMVHa2UqrU6tiM4uUFlB4C/XADBNJtqAwAHpPv5iJJMupmXF 2lKVDUCOlIbws2s+ic+Rld6QawquaHT5cq0NEFxwWBmIGiO77EGKudhWvRN7Dpder56XjMJl xCcFHajTnZ7M2krUZ17ISq0yF3R67Vmp9ZduTkuLdkNzByUpBk9CHN9jInsVni62WpnRv510 0lUUn8cNP3VFioSz5tya5dWd9+7skZi/84cio/rSShJ61EveM51HEpeWTJnny7nLUkqbJ4s7 Rmq0sv9gSoVBjQIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Safonov Here are two functions that provide interface to compute/get used size and size of biggest free chunk in cma region. Add that information to debugfs. Signed-off-by: Dmitry Safonov Signed-off-by: Stefan Strogin Acked-by: Michal Nazarewicz --- include/linux/cma.h | 2 ++ mm/cma.c | 30 ++++++++++++++++++++++++++++++ mm/cma_debug.c | 24 ++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/include/linux/cma.h b/include/linux/cma.h index f7ef093..1231f50 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -18,6 +18,8 @@ struct cma; extern unsigned long totalcma_pages; extern phys_addr_t cma_get_base(const struct cma *cma); extern unsigned long cma_get_size(const struct cma *cma); +extern unsigned long cma_get_used(struct cma *cma); +extern unsigned long cma_get_maxchunk(struct cma *cma); extern int __init cma_declare_contiguous(phys_addr_t base, phys_addr_t size, phys_addr_t limit, diff --git a/mm/cma.c b/mm/cma.c index faf8eac..78b262a 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -53,6 +53,36 @@ unsigned long cma_get_size(const struct cma *cma) return cma->count << PAGE_SHIFT; } +unsigned long cma_get_used(struct cma *cma) +{ + unsigned long ret = 0; + + mutex_lock(&cma->lock); + /* pages counter is smaller than sizeof(int) */ + ret = bitmap_weight(cma->bitmap, (int)cma->count); + mutex_unlock(&cma->lock); + + return ret << cma->order_per_bit; +} + +unsigned long cma_get_maxchunk(struct cma *cma) +{ + 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); + + return maxchunk << cma->order_per_bit; +} + static unsigned long cma_bitmap_aligned_mask(const struct cma *cma, int align_order) { diff --git a/mm/cma_debug.c b/mm/cma_debug.c index 20bad2d..e1ba160 100644 --- a/mm/cma_debug.c +++ b/mm/cma_debug.c @@ -146,6 +146,28 @@ static int cma_debugfs_get(void *data, u64 *val) 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; + + *val = cma_get_used(cma); + + 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; + + *val = cma_get_maxchunk(cma); + + 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); @@ -349,6 +371,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); #ifdef CONFIG_CMA_BUFFER_LIST debugfs_create_file("buffers", S_IRUGO, tmp, cma, &cma_buffers_fops); -- 2.1.0