From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16574C433ED for ; Sat, 17 Apr 2021 13:10:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E66C0610A6 for ; Sat, 17 Apr 2021 13:10:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235087AbhDQNKv (ORCPT ); Sat, 17 Apr 2021 09:10:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236265AbhDQNI4 (ORCPT ); Sat, 17 Apr 2021 09:08:56 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82191C061574 for ; Sat, 17 Apr 2021 06:08:29 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id r13so11663289pjf.2 for ; Sat, 17 Apr 2021 06:08:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Ycx1hdJpKp75Jqh1zODIx7B8QWF+7Q+i8IS+TiHaRno=; b=gU9m+YXrGMu9goxT7Cn1aTspyvZfC9PsROZJ53n9eByTMU43+WMHzchlCIa75FACI9 Xl4MEdj1JqzCHq+e6tW7gZ+gzdWYOkTFRx6c5oisSWrQDsufkNHPfOoeyo/TVCnQnXiU v96ISYixeTGBgIF/2nJSY7IKG38oBFD3pKGpDyvHwilo5/rU7bYRI6vJOBHJwjAk8W3n jEWc9OeLwSOJmjiKn667JCq3Ere0TA26p9OQZye2Xztd/HuYgmNILGukxr3i9+7q5xsl 9Va/4YgpvYNLFF/szz5LlbnjgzOTf5PV0N3cZlZJvhTcTgQy59nESk1lJe7rpTKEMr5W YKEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Ycx1hdJpKp75Jqh1zODIx7B8QWF+7Q+i8IS+TiHaRno=; b=Q4uFbyhrSTP6pqS5lnEx5X78bKKBNye8LSquM4ngNPML2+pvQj17VmzL24gGamaIeM /uyhGlE9VRiQQoElxLmoEYfEvU4eFzIBJb1RDWvjBI/ynxALeoz5XrBi8YrAHIqjvPXR Hi26AK/ntVNZ7Gtf8Sz5iGoUglqvDSk3OeTyiWMLphF9nZYQXplAWv8i0TQYe6OFCPbj W/ipF9Rx1aVCPyr3UU4HvWAdMObkA1CQPlMoYXu3oQFfhruGj0dssl/b+EhGWVNYpuHX BFhsXomBCyZgDBuIwhrFiAnhjEacK176DxAdm4TMNPKw2mHQrTSn6d1onMhj1SzXQAIU dLOw== X-Gm-Message-State: AOAM530Ic/p+RBFligxqox6kkybpuavN+5p9GLEH0rGOHNWUqOKwVYEq 4ijc62w8ELf9jh9ER9797CBbcUlg9PxAFBvDREinAg== X-Google-Smtp-Source: ABdhPJwzbhZfJuUQqx9lyTf7c3oWGtxEow4Szero3dyusNLccQFzd4Kkx/KIrD6BXzqq2jQP6WQqJb4QiRWm6Y8NSSw= X-Received: by 2002:a17:902:d482:b029:ec:9091:d099 with SMTP id c2-20020a170902d482b02900ec9091d099mr1847117plg.34.1618664908762; Sat, 17 Apr 2021 06:08:28 -0700 (PDT) MIME-Version: 1.0 References: <20210417104032.5521-1-peter.enderborg@sony.com> In-Reply-To: <20210417104032.5521-1-peter.enderborg@sony.com> From: Muchun Song Date: Sat, 17 Apr 2021 21:07:52 +0800 Message-ID: Subject: Re: [External] [PATCH v4] dma-buf: Add DmaBufTotal counter in meminfo To: Peter Enderborg Cc: LKML , linux-fsdevel , Sumit Semwal , =?UTF-8?Q?Christian_K=C3=B6nig?= , Alexey Dobriyan , Andrew Morton , Roman Gushchin , Shakeel Butt , Michal Hocko , NeilBrown , Sami Tolvanen , Mike Rapoport , linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, Matthew Wilcox Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Sat, Apr 17, 2021 at 6:41 PM Peter Enderborg wrote: > > 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 > --- > drivers/dma-buf/dma-buf.c | 13 +++++++++++++ > fs/proc/meminfo.c | 5 ++++- > include/linux/dma-buf.h | 1 + > 3 files changed, 18 insertions(+), 1 deletion(-) > > diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c > index f264b70c383e..197e5c45dd26 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,16 @@ 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; > +} > +EXPORT_SYMBOL_GPL(dma_buf_allocated_pages); dma_buf_allocated_pages is only called from fs/proc/meminfo.c. I am confused why it should be exported. If it won't be called from the driver module, we should not export it. Thanks. > + > #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 > #endif > +#include > #include > #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 >