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=-16.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_MED,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL 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 B905AC4321A for ; Mon, 10 Jun 2019 23:52:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 823B3206C3 for ; Mon, 10 Jun 2019 23:52:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rQaual/D" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390874AbfFJXwL (ORCPT ); Mon, 10 Jun 2019 19:52:11 -0400 Received: from mail-qt1-f202.google.com ([209.85.160.202]:53009 "EHLO mail-qt1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390682AbfFJXwK (ORCPT ); Mon, 10 Jun 2019 19:52:10 -0400 Received: by mail-qt1-f202.google.com with SMTP id c48so10362450qta.19 for ; Mon, 10 Jun 2019 16:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=mlxJDYZKh9wYq/WtDU7yH8cffd94xLXLnzUxx7frAqI=; b=rQaual/DBiHZHp7DF8/Thr626kZ6P76nw2hD0Qm0ARQj1OU230xKPZK/zrQPw3iF/D 1bFE4j3ANW8glHQXKut7i+XxXmc6m1+FnKeycgykblAfjN0pF98kCZruBZRD7v4wAyJK WxXT7EFz4Q24oMf+tuM1XRS4IuZTqz6toAcZyTq/IT9zFnMWkkLVnnQpvIesrPdxK8xe faO4x9hpF/ZOoLuwAG+riS5RAA5p/nqfzTqP4iDcxD9o2xxe31N4qKqc33s7WM/m4omS jJJq+N6EyyP/agi856I2pxB7aNv/WPTQYyH/tFoxVJGcgXp5R9E3MwWVjbJo9I2GSoy+ s/lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=mlxJDYZKh9wYq/WtDU7yH8cffd94xLXLnzUxx7frAqI=; b=DWvOhPeh+Fnegk0ZBVcRSD7z96/kJ41ByD28M0DqmJRP1m2Uw3unLNbv8CTyCCDgTU xMRRxu64dznIPocuZK0v880pOEq5vlMEfQUBP0M64bmHpNjlbMiipFkCa6+tLEHJD0fZ w5NON4gzA/b9BkF0RGAkWg4vNGqpsTA2iMPV68WVQbNb8/bpyHzzb06RHlbNEBWxqf4e AmiFcIJC9iPPMJ2oNf0mb/2L4pBdAE9jzgmk1501VTC5sOAbKV0jDLF60oV57cek1Cru 52QQX9AkTK+9PafC2cjtkwvUed5befdf8z4V6PPl1KMQNclszf7OumPloZGgZqDKBnn7 3bMA== X-Gm-Message-State: APjAAAURa8EocK3mgUxFR7yNrAhib4xlwtGdZKjH2pOd1anFbZ+MXcgy wAjeAu+jQ3Cu32GfkjGxokVQMOctwdxbqbBU7yU2fM1eeyCn0z9vIVLw2iPDp/sFqI2/MuSJaNB FgxbTugDWnLhNfp19Hbca1lRzLvFDz2ZD6RvlYSi9V1CbdmgVLEny1MeNVYbgmhfHA60= X-Google-Smtp-Source: APXvYqya2j1UvRFWBx9kQIW/1TpCoTAj4gQTPHahMs8WLCgjSh12s3FCppHWR7MYPd2wk4l8FUWyAM7tgQ== X-Received: by 2002:a0c:89a5:: with SMTP id 34mr38263565qvr.110.1560210728734; Mon, 10 Jun 2019 16:52:08 -0700 (PDT) Date: Mon, 10 Jun 2019 16:52:00 -0700 In-Reply-To: <20190610235201.145457-1-fengc@google.com> Message-Id: <20190610235201.145457-3-fengc@google.com> Mime-Version: 1.0 References: <20190610235201.145457-1-fengc@google.com> X-Mailer: git-send-email 2.22.0.rc2.383.gf4fbbf30c2-goog Subject: [RESEND PATCH v3 2/3] dma-buf: add DMA_BUF_{GET,SET}_NAME ioctls From: Chenbo Feng To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, --validate@google.com Cc: Sumit Semwal , Daniel Vetter , kernel-team@android.com Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Hackmann This patch adds complimentary DMA_BUF_SET_NAME and DMA_BUF_GET_NAME ioctls, which lets userspace processes attach a free-form name to each buffer. This information can be extremely helpful for tracking and accounting shared buffers. For example, on Android, we know what each buffer will be used for at allocation time: GL, multimedia, camera, etc. The userspace allocator can use DMA_BUF_SET_NAME to associate that information with the buffer, so we can later give developers a breakdown of how much memory they're allocating for graphics, camera, etc. Signed-off-by: Greg Hackmann Signed-off-by: Chenbo Feng --- drivers/dma-buf/dma-buf.c | 49 +++++++++++++++++++++++++++++++++--- include/linux/dma-buf.h | 5 +++- include/uapi/linux/dma-buf.h | 3 +++ 3 files changed, 53 insertions(+), 4 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index ffd5a2ad7d6f..c1da5f9ce44d 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -48,8 +48,24 @@ struct dma_buf_list { static struct dma_buf_list db_list; +static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen) +{ + struct dma_buf *dmabuf; + char name[DMA_BUF_NAME_LEN]; + size_t ret = 0; + + dmabuf = dentry->d_fsdata; + mutex_lock(&dmabuf->lock); + if (dmabuf->name) + ret = strlcpy(name, dmabuf->name, DMA_BUF_NAME_LEN); + mutex_unlock(&dmabuf->lock); + + return dynamic_dname(dentry, buffer, buflen, "/%s:%s", + dentry->d_name.name, ret > 0 ? name : ""); +} + static const struct dentry_operations dma_buf_dentry_ops = { - .d_dname = simple_dname, + .d_dname = dmabuffs_dname, }; static struct vfsmount *dma_buf_mnt; @@ -297,6 +313,27 @@ static __poll_t dma_buf_poll(struct file *file, poll_table *poll) return events; } +static long dma_buf_set_name(struct dma_buf *dmabuf, const char __user *buf) +{ + char *name = strndup_user(buf, DMA_BUF_NAME_LEN); + long ret = 0; + + if (IS_ERR(name)) + return PTR_ERR(name); + + mutex_lock(&dmabuf->lock); + if (!list_empty(&dmabuf->attachments)) { + ret = -EBUSY; + goto out_unlock; + } + kfree(dmabuf->name); + dmabuf->name = name; + +out_unlock: + mutex_unlock(&dmabuf->lock); + return ret; +} + static long dma_buf_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -335,6 +372,10 @@ static long dma_buf_ioctl(struct file *file, ret = dma_buf_begin_cpu_access(dmabuf, direction); return ret; + + case DMA_BUF_SET_NAME: + return dma_buf_set_name(dmabuf, (const char __user *)arg); + default: return -ENOTTY; } @@ -376,6 +417,7 @@ static struct file *dma_buf_getfile(struct dma_buf *dmabuf, int flags) goto err_alloc_file; file->f_flags = flags & (O_ACCMODE | O_NONBLOCK); file->private_data = dmabuf; + file->f_path.dentry->d_fsdata = dmabuf; return file; @@ -1082,12 +1124,13 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused) continue; } - seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\t%08lu\n", + seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\t%08lu\t%s\n", buf_obj->size, buf_obj->file->f_flags, buf_obj->file->f_mode, file_count(buf_obj->file), buf_obj->exp_name, - file_inode(buf_obj->file)->i_ino); + file_inode(buf_obj->file)->i_ino, + buf_obj->name ?: ""); robj = buf_obj->resv; while (true) { diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 58725f890b5b..582998e19df6 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -255,10 +255,12 @@ struct dma_buf_ops { * @file: file pointer used for sharing buffers across, and for refcounting. * @attachments: list of dma_buf_attachment that denotes all devices attached. * @ops: dma_buf_ops associated with this buffer object. - * @lock: used internally to serialize list manipulation, attach/detach and vmap/unmap + * @lock: used internally to serialize list manipulation, attach/detach and + * vmap/unmap, and accesses to name * @vmapping_counter: used internally to refcnt the vmaps * @vmap_ptr: the current vmap ptr if vmapping_counter > 0 * @exp_name: name of the exporter; useful for debugging. + * @name: userspace-provided name; useful for accounting and debugging. * @owner: pointer to exporter module; used for refcounting when exporter is a * kernel module. * @list_node: node for dma_buf accounting and debugging. @@ -286,6 +288,7 @@ struct dma_buf { unsigned vmapping_counter; void *vmap_ptr; const char *exp_name; + const char *name; struct module *owner; struct list_head list_node; void *priv; diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h index d75df5210a4a..dbc7092e04b5 100644 --- a/include/uapi/linux/dma-buf.h +++ b/include/uapi/linux/dma-buf.h @@ -35,7 +35,10 @@ struct dma_buf_sync { #define DMA_BUF_SYNC_VALID_FLAGS_MASK \ (DMA_BUF_SYNC_RW | DMA_BUF_SYNC_END) +#define DMA_BUF_NAME_LEN 32 + #define DMA_BUF_BASE 'b' #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) +#define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *) #endif -- 2.22.0.rc2.383.gf4fbbf30c2-goog