From: Peter Enderborg <peter.enderborg@sony.com>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Christian König" <christian.koenig@amd.com>,
"Alexey Dobriyan" <adobriyan@gmail.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Muchun Song" <songmuchun@bytedance.com>,
"Roman Gushchin" <guro@fb.com>,
"Shakeel Butt" <shakeelb@google.com>,
"Michal Hocko" <mhocko@suse.com>, NeilBrown <neilb@suse.de>,
"Sami Tolvanen" <samitolvanen@google.com>,
"Mike Rapoport" <rppt@kernel.org>,
linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
linaro-mm-sig@lists.linaro.org,
"Matthew Wilcox" <willy@infradead.org>
Cc: Peter Enderborg <peter.enderborg@sony.com>
Subject: [PATCH v5] dma-buf: Add DmaBufTotal counter in meminfo
Date: Sat, 17 Apr 2021 18:38:35 +0200 [thread overview]
Message-ID: <20210417163835.25064-1-peter.enderborg@sony.com> (raw)
This adds a total used dma-buf memory. Details
can be found in debugfs, however it is not for everyone
and not always available. dma-buf are indirect allocated by
userspace. So with this value we can monitor and detect
userspace applications that have problems.
Signed-off-by: Peter Enderborg <peter.enderborg@sony.com>
---
drivers/dma-buf/dma-buf.c | 12 ++++++++++++
fs/proc/meminfo.c | 5 ++++-
include/linux/dma-buf.h | 1 +
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index f264b70c383e..4dc37cd4293b 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -37,6 +37,7 @@ struct dma_buf_list {
};
static struct dma_buf_list db_list;
+static atomic_long_t dma_buf_global_allocated;
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_global_allocated);
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_global_allocated);
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_allocated_pages - Return the used nr of pages
+ * allocated for dma-buf
+ */
+long dma_buf_allocated_pages(void)
+{
+ return atomic_long_read(&dma_buf_global_allocated) >> PAGE_SHIFT;
+}
+
#ifdef CONFIG_DEBUG_FS
static int dma_buf_debug_show(struct seq_file *s, void *unused)
{
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index 6fa761c9cc78..ccc7c40c8db7 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -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,7 +146,9 @@ 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
-
+#ifdef CONFIG_DMA_SHARED_BUFFER
+ show_val_kb(m, "DmaBufTotal: ", dma_buf_allocated_pages());
+#endif
hugetlb_report_meminfo(m);
arch_report_meminfo(m);
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index efdc56b9d95f..5b05816bd2cd 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -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_allocated_pages(void);
#endif /* __DMA_BUF_H__ */
--
2.17.1
next reply other threads:[~2021-04-17 16:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-17 16:38 Peter Enderborg [this message]
2021-04-20 8:58 ` [PATCH v5] dma-buf: Add DmaBufTotal counter in meminfo Daniel Vetter
2021-04-20 9:26 ` Peter.Enderborg
2021-04-20 9:41 ` Mike Rapoport
2021-04-20 10:45 ` Peter.Enderborg
2021-04-20 11:52 ` Mike Rapoport
2021-04-20 12:03 ` Peter.Enderborg
2021-04-20 11:14 ` Daniel Vetter
2021-04-20 11:37 ` Peter.Enderborg
2021-04-21 9:15 ` Daniel Vetter
2021-04-21 10:37 ` Peter.Enderborg
2021-04-21 10:57 ` Michal Hocko
2021-04-21 13:05 ` Pekka Paalanen
2021-04-21 15:31 ` Mike Rapoport
2021-04-21 17:35 ` Peter.Enderborg
2021-04-22 8:06 ` Mike Rapoport
2021-04-22 14:08 ` Peter.Enderborg
2021-04-25 7:33 ` Mike Rapoport
2021-04-25 8:40 ` Peter.Enderborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210417163835.25064-1-peter.enderborg@sony.com \
--to=peter.enderborg@sony.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=guro@fb.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mhocko@suse.com \
--cc=neilb@suse.de \
--cc=rppt@kernel.org \
--cc=samitolvanen@google.com \
--cc=shakeelb@google.com \
--cc=songmuchun@bytedance.com \
--cc=sumit.semwal@linaro.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).