Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3784488ybi; Mon, 10 Jun 2019 17:04:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqxXYrQ7ZKs1ZMboiI+GfUfhy0efmWc5Mo+pHz88lGVu6EZNFpuu5m8fAS+i/jvBEW76BS8G X-Received: by 2002:a63:1516:: with SMTP id v22mr18297964pgl.204.1560211447782; Mon, 10 Jun 2019 17:04:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560211447; cv=none; d=google.com; s=arc-20160816; b=Lo0nnojXr60GAwiuXioAkpTXXo5BTaAg5Wct1czcbuyU8MlVBV4HdK90KtOTMpmPsk biVFcFWdMPHjmpyx2rUMyJo7IMSQ5+diHv3nR/g8aTXJGzdPFbe8ASyOjmd1HZSAjQWq HL2zg2rpLNr6HaQUOhQeJL8QXcp79lBru+YpOmaZWzOx6QQENm6ZmwuFv3Ox5NXgVKVz 2lmIYaT4tsoCXJ6FST4H+ZpNWZDTsWG3z7w/Mnn1LX7vRCDf9wmkTiXa72ECBXiyWAx6 aGrcCYCGqs8cFHieAsV2efF8jyI0kPuC5YIrwtFMRdVOlPXyVL559CZbCw2hagEtNk8q 1RSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=x5JY2SGL+SYSEHfOtRFLuisOxAVpr293xNU/5K/Orhw=; b=KjO4+0oaPZUxVMNY765xoigr1fWPKvPl0Jy1HOUA+qs1bT3iyOfLj+iGCXyok1QQRd Sjdc//eBBoJYC6F2nlH6ajKRlauPdA02s/Sv4GTsUNwv4PXkNA9FDRaA1RbbHSh3nEHH 8BPhbD380yl1VIbMj7kMCUdgd6mem4B+CL6kA0GDMBW8DN23iO4vpvK7QZE7Xo2KQrfQ w9dQcMYn1YrkMq2rtHcV6uPZ5c29auOyDBZuQlkEOLJmwstUImq2QJ4pwxTA2dueP33R eYAYmeqgB3wFGyHgYjtYhpbIWk+964Uu03lKCdDcsKwk6QVXsKWFOHHxrC596DYI6VRG S6pA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=A4hBSjDw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s62si777287pjc.75.2019.06.10.17.03.51; Mon, 10 Jun 2019 17:04:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=A4hBSjDw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390893AbfFKACh (ORCPT + 99 others); Mon, 10 Jun 2019 20:02:37 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:35655 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390557AbfFKACg (ORCPT ); Mon, 10 Jun 2019 20:02:36 -0400 Received: by mail-pf1-f202.google.com with SMTP id r142so7013635pfc.2 for ; Mon, 10 Jun 2019 17:02:35 -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=x5JY2SGL+SYSEHfOtRFLuisOxAVpr293xNU/5K/Orhw=; b=A4hBSjDwHmXVMdr/PsezQOCTfxVPW03U4wWmS/4zvmQiXTwZ5DmwbAYbypdpBIvY8f fFAcbAGHi628YZ3GdMYVpfkB/3bq8nLtUO1eCXXvCeG7jqsTD+ppBha7PIeDuBvXfDGO s7Y1lEciosfi1Cm5qdXMIbBXsukGCXwwQ8RqLHieJ2ve91fr0+iy3xfwSGvtFU4ji0t6 /zOYVuGE7q1ocp5G9naffW9EuCNSW/EDVKsxONwk4zLkLHMtDgRb1eucf4efsDifAiNF cjakvR3zEDtCe2LUfV1NhK8VC2QgeMvdfFfOc+h4PkPIonMW75oxwYUDLoy9tHQYDTRB +B3g== 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=x5JY2SGL+SYSEHfOtRFLuisOxAVpr293xNU/5K/Orhw=; b=qpdrKs4JyegMujBgBM0BsU3TuaLklNZEMqRdXLXgGMMkhmT4cH5YS0aohqyfxBK7zu lvxjh1Aiv+k/wmT+dQg/ZtIWhhT2/oaW377Tm7vU2OOnp0dSP4kQ8s1wsF/h1qS6OwVh SK1AOD+YSr1jahCKgu5EPRwsNMmtip96EI9j5qsMegM0n959Bz3HfamIPzPEB3sByEqa 0bIsRbU99ruZNtiQS8QjKmvhaEMt2Of1S9OAf4Qc6fmgYNA6qI01HN33ea2YkpAR0Umm gxZJ1ipIAJlTApX72IUqNNpQ4YiXAJdReGThoe5TqiTJ0mQfnHMMReF9vhfG32eH9RCA bueA== X-Gm-Message-State: APjAAAX6wv6679Ot+J3tSLWbARUS9qD07KaMzsjwzZbAmiOQBnR+X36g GIJ9/O1DMW9nDQIJmuIbfviSFhEvxAU28pSXCPz1jNe+2nOkzX1jP/oW/gYTaoFXCvrLZDx230U 7LHAsMkaP61pRQ+78SzZLVKAy9R3peauH+0nte0lq+E7qfv3L6zXPoh7MxakUKQKZsYo= X-Received: by 2002:a65:4c4c:: with SMTP id l12mr16535085pgr.404.1560211354907; Mon, 10 Jun 2019 17:02:34 -0700 (PDT) Date: Mon, 10 Jun 2019 17:02:28 -0700 In-Reply-To: <20190611000230.152670-1-fengc@google.com> Message-Id: <20190611000230.152670-2-fengc@google.com> Mime-Version: 1.0 References: <20190611000230.152670-1-fengc@google.com> X-Mailer: git-send-email 2.22.0.rc2.383.gf4fbbf30c2-goog Subject: [RESEND PATCH v3 1/3] dma-buf: give each buffer a full-fledged inode From: Chenbo Feng To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Sumit Semwal , 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 By traversing /proc/*/fd and /proc/*/map_files, processes with CAP_ADMIN can get a lot of fine-grained data about how shmem buffers are shared among processes. stat(2) on each entry gives the caller a unique ID (st_ino), the buffer's size (st_size), and even the number of pages currently charged to the buffer (st_blocks / 512). In contrast, all dma-bufs share the same anonymous inode. So while we can count how many dma-buf fds or mappings a process has, we can't get the size of the backing buffers or tell if two entries point to the same dma-buf. On systems with debugfs, we can get a per-buffer breakdown of size and reference count, but can't tell which processes are actually holding the references to each buffer. Replace the singleton inode with full-fledged inodes allocated by alloc_anon_inode(). This involves creating and mounting a mini-pseudo-filesystem for dma-buf, following the example in fs/aio.c. Signed-off-by: Greg Hackmann Signed-off-by: Chenbo Feng --- drivers/dma-buf/dma-buf.c | 63 ++++++++++++++++++++++++++++++++++---- include/uapi/linux/magic.h | 1 + 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 7c858020d14b..ffd5a2ad7d6f 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -34,8 +34,10 @@ #include #include #include +#include #include +#include static inline int is_dma_buf_file(struct file *); @@ -46,6 +48,25 @@ struct dma_buf_list { static struct dma_buf_list db_list; +static const struct dentry_operations dma_buf_dentry_ops = { + .d_dname = simple_dname, +}; + +static struct vfsmount *dma_buf_mnt; + +static struct dentry *dma_buf_fs_mount(struct file_system_type *fs_type, + int flags, const char *name, void *data) +{ + return mount_pseudo(fs_type, "dmabuf:", NULL, &dma_buf_dentry_ops, + DMA_BUF_MAGIC); +} + +static struct file_system_type dma_buf_fs_type = { + .name = "dmabuf", + .mount = dma_buf_fs_mount, + .kill_sb = kill_anon_super, +}; + static int dma_buf_release(struct inode *inode, struct file *file) { struct dma_buf *dmabuf; @@ -338,6 +359,31 @@ static inline int is_dma_buf_file(struct file *file) return file->f_op == &dma_buf_fops; } +static struct file *dma_buf_getfile(struct dma_buf *dmabuf, int flags) +{ + struct file *file; + struct inode *inode = alloc_anon_inode(dma_buf_mnt->mnt_sb); + + if (IS_ERR(inode)) + return ERR_CAST(inode); + + inode->i_size = dmabuf->size; + inode_set_bytes(inode, dmabuf->size); + + file = alloc_file_pseudo(inode, dma_buf_mnt, "dmabuf", + flags, &dma_buf_fops); + if (IS_ERR(file)) + goto err_alloc_file; + file->f_flags = flags & (O_ACCMODE | O_NONBLOCK); + file->private_data = dmabuf; + + return file; + +err_alloc_file: + iput(inode); + return file; +} + /** * DOC: dma buf device access * @@ -433,8 +479,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) } dmabuf->resv = resv; - file = anon_inode_getfile("dmabuf", &dma_buf_fops, dmabuf, - exp_info->flags); + file = dma_buf_getfile(dmabuf, exp_info->flags); if (IS_ERR(file)) { ret = PTR_ERR(file); goto err_dmabuf; @@ -1025,8 +1070,8 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused) return ret; seq_puts(s, "\nDma-buf Objects:\n"); - seq_printf(s, "%-8s\t%-8s\t%-8s\t%-8s\texp_name\n", - "size", "flags", "mode", "count"); + seq_printf(s, "%-8s\t%-8s\t%-8s\t%-8s\texp_name\t%-8s\n", + "size", "flags", "mode", "count", "ino"); list_for_each_entry(buf_obj, &db_list.head, list_node) { ret = mutex_lock_interruptible(&buf_obj->lock); @@ -1037,11 +1082,12 @@ 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\n", + seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\t%08lu\n", buf_obj->size, buf_obj->file->f_flags, buf_obj->file->f_mode, file_count(buf_obj->file), - buf_obj->exp_name); + buf_obj->exp_name, + file_inode(buf_obj->file)->i_ino); robj = buf_obj->resv; while (true) { @@ -1136,6 +1182,10 @@ static inline void dma_buf_uninit_debugfs(void) static int __init dma_buf_init(void) { + dma_buf_mnt = kern_mount(&dma_buf_fs_type); + if (IS_ERR(dma_buf_mnt)) + return PTR_ERR(dma_buf_mnt); + mutex_init(&db_list.lock); INIT_LIST_HEAD(&db_list.head); dma_buf_init_debugfs(); @@ -1146,5 +1196,6 @@ subsys_initcall(dma_buf_init); static void __exit dma_buf_deinit(void) { dma_buf_uninit_debugfs(); + kern_unmount(dma_buf_mnt); } __exitcall(dma_buf_deinit); diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index f8c00045d537..665e18627f78 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -91,5 +91,6 @@ #define UDF_SUPER_MAGIC 0x15013346 #define BALLOON_KVM_MAGIC 0x13661366 #define ZSMALLOC_MAGIC 0x58295829 +#define DMA_BUF_MAGIC 0x444d4142 /* "DMAB" */ #endif /* __LINUX_MAGIC_H__ */ -- 2.22.0.rc2.383.gf4fbbf30c2-goog