dma-buf: Add DmaBufTotal counter in meminfo
Subsystems (6)
PATCH 1/1 dma-buf: Add DmaBufTotal counter in meminfo
This adds a total used dma-buf memory. Details can be found in debugfs, however it is not for everyone and not always available.
--- drivers/dma-buf/dma-buf.c | 12 ++++++++++++ fs/proc/meminfo.c | 2 ++ include/linux/dma-buf.h | 1 + 3 files changed, 15 insertions(+)
drivers/dma-buf/dma-buf.c +12 -0
@@ -37,6 +37,7 @@ struct dma_buf_list { };static struct dma_buf_list db_list; +static atomic_long_t dma_buf_size;static char *dmabuffs_dname (struct dentry *dentry,char *buffer,int buflen) {
@@ -79,6 +80,7 @@ static void dma_buf_release(struct dentry *dentry)if (dmabuf->resv == (struct dma_resv *)&dmabuf[1 ])dma_resv_fini (dmabuf->resv); +atomic_long_sub (dmabuf->size, &dma_buf_size);module_put (dmabuf->owner);kfree (dmabuf->name);kfree (dmabuf);
@@ -586,6 +588,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)mutex_lock (&db_list.lock);list_add (&dmabuf->list_node, &db_list.head);mutex_unlock (&db_list.lock); +atomic_long_add (dmabuf->size, &dma_buf_size);return dmabuf;
@@ -1346,6 +1349,15 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map) }EXPORT_SYMBOL_GPL (dma_buf_vunmap); +/** +* dma_buf_get_size - Return the used nr pages by dma-buf +*/ +long dma_buf_get_size (void ) +{ +return atomic_long_read (&dma_buf_size) >>PAGE_SHIFT ; +} +EXPORT_SYMBOL_GPL (dma_buf_get_size); +#ifdef CONFIG_DEBUG_FS static int dma_buf_debug_show (struct seq_file *s,void *unused) {
fs/proc/meminfo.c +2 -0
@@ -16,6 +16,7 @@#ifdef CONFIG_CMA #include <linux/cma.h> #endif +#include <linux/dma-buf.h> #include <asm/page.h> #include "internal.h"
@@ -145,6 +146,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)show_val_kb (m,"CmaFree: " ,global_zone_page_state (NR_FREE_CMA_PAGES ));#endif +show_val_kb (m,"DmaBufTotal: " ,dma_buf_get_size ());hugetlb_report_meminfo (m);
include/linux/dma-buf.h +1 -0
@@ -507,4 +507,5 @@ int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *, unsigned long);int dma_buf_vmap (struct dma_buf *dmabuf,struct dma_buf_map *map);void dma_buf_vunmap (struct dma_buf *dmabuf,struct dma_buf_map *map); +long dma_buf_get_size (void );#endif /* __DMA_BUF_H__ */
Signature · 1 line
2.17.1
Quoted 13 lines · Peter Enderborg
fs/proc/meminfo.c +1
-0@@ -16,6 +16,7 @@#ifdef CONFIG_CMA #include <linux/cma.h> #endif +#include <linux/dma-buf.h> #include <asm/page.h> #include "internal.h"
fs/proc/meminfo.c static int meminfo_proc_show(struct seq_file *m, void *v) · line 152
Quoted 7 lines
fs/proc/meminfo.c +1
-0@@ -145,6 +146,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)show_val_kb (m,"CmaFree: " ,global_zone_page_state (NR_FREE_CMA_PAGES ));#endif +show_val_kb (m,"DmaBufTotal: " ,dma_buf_get_size ());hugetlb_report_meminfo (m);
... and if CONFIG_DMA_SHARED_BUFFER is not set ...?
Christian König
maintainerAm 16.04.21 um 11:37 schrieb Peter Enderborg:
Quoted 3 lines
This adds a total used dma-buf memory. Details can be found in debugfs, however it is not for everyone and not always available.
Well you are kind of missing the intention here.
I mean knowing this is certainly useful in some case, but you need to describe which cases that are.
Christian.
Quoted 77 lines
Signed-off-by Peter Enderborg <[email protected]>--- drivers/dma-buf/dma-buf.c | 12 ++++++++++++ fs/proc/meminfo.c | 2 ++ include/linux/dma-buf.h | 1 + 3 files changed, 15 insertions(+)drivers/dma-buf/dma-buf.c +12
-0@@ -37,6 +37,7 @@ struct dma_buf_list { };static struct dma_buf_list db_list; +static atomic_long_t dma_buf_size;static char *dmabuffs_dname (struct dentry *dentry,char *buffer,int buflen) {@@ -79,6 +80,7 @@ static void dma_buf_release(struct dentry *dentry)if (dmabuf->resv == (struct dma_resv *)&dmabuf[1 ])dma_resv_fini (dmabuf->resv); +atomic_long_sub (dmabuf->size, &dma_buf_size);module_put (dmabuf->owner);kfree (dmabuf->name);kfree (dmabuf);@@ -586,6 +588,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)mutex_lock (&db_list.lock);list_add (&dmabuf->list_node, &db_list.head);mutex_unlock (&db_list.lock); +atomic_long_add (dmabuf->size, &dma_buf_size);return dmabuf;@@ -1346,6 +1349,15 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map) }EXPORT_SYMBOL_GPL (dma_buf_vunmap); +/** +* dma_buf_get_size - Return the used nr pages by dma-buf +*/ +long dma_buf_get_size (void ) +{ +return atomic_long_read (&dma_buf_size) >>PAGE_SHIFT ; +} +EXPORT_SYMBOL_GPL (dma_buf_get_size); +#ifdef CONFIG_DEBUG_FS static int dma_buf_debug_show (struct seq_file *s,void *unused) {fs/proc/meminfo.c +2
-0@@ -16,6 +16,7 @@#ifdef CONFIG_CMA #include <linux/cma.h> #endif +#include <linux/dma-buf.h> #include <asm/page.h> #include "internal.h" @@ -145,6 +146,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)show_val_kb (m,"CmaFree: " ,global_zone_page_state (NR_FREE_CMA_PAGES ));#endif +show_val_kb (m,"DmaBufTotal: " ,dma_buf_get_size ());hugetlb_report_meminfo (m);include/linux/dma-buf.h +0
-0
include/linux/dma-buf.h int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *, · line 511
Quoted 5 lines
include/linux/dma-buf.h +1
-0@@ -507,4 +507,5 @@ int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *, unsigned long);int dma_buf_vmap (struct dma_buf *dmabuf,struct dma_buf_map *map);void dma_buf_vunmap (struct dma_buf *dmabuf,struct dma_buf_map *map); +long dma_buf_get_size (void );#endif /* __DMA_BUF_H__ */
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Peter,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linux/master]
[also build test ERROR on linus/master v5.12-rc7 next-20210415] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Peter-Enderborg/dma-buf-Add-DmaBufTotal-counter-in-meminfo/20210416-174133 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 5e46d1b78a03d52306f21f77a4e4a144b6d31486 config: nios2-defconfig (attached as .config) compiler: nios2-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/0549b4e26c5fc079bdec725b55fc031a5db388c5
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Peter-Enderborg/dma-buf-Add-DmaBufTotal-counter-in-meminfo/20210416-174133 git checkout 0549b4e26c5fc079bdec725b55fc031a5db388c5
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross W=1 ARCH=nios2
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
nios2-linux-ld: fs/proc/meminfo.o: in function `meminfo_proc_show':
>> meminfo.c:(.text+0x3d0): undefined reference to `dma_buf_get_size'
meminfo.c:(.text+0x3d0): relocation truncated to fit: R_NIOS2_CALL26 against `dma_buf_get_size'
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Peter,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linux/master]
[also build test ERROR on linus/master v5.12-rc7 next-20210415] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Peter-Enderborg/dma-buf-Add-DmaBufTotal-counter-in-meminfo/20210416-174133 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 5e46d1b78a03d52306f21f77a4e4a144b6d31486 config: arc-alldefconfig (attached as .config) compiler: arc-elf-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/0549b4e26c5fc079bdec725b55fc031a5db388c5
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Peter-Enderborg/dma-buf-Add-DmaBufTotal-counter-in-meminfo/20210416-174133 git checkout 0549b4e26c5fc079bdec725b55fc031a5db388c5
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross W=1 ARCH=arc
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
arc-elf-ld: fs/proc/meminfo.o: in function `meminfo_proc_show':
meminfo.c:(.text+0x2b2): undefined reference to `dma_buf_get_size'
>> arc-elf-ld: meminfo.c:(.text+0x2b2): undefined reference to `dma_buf_get_size'
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org