From patchwork Thu Apr 4 06:28:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 2390631 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 50286DF25A for ; Thu, 4 Apr 2013 06:29:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763410Ab3DDG3L (ORCPT ); Thu, 4 Apr 2013 02:29:11 -0400 Received: from mail-da0-f50.google.com ([209.85.210.50]:46902 "EHLO mail-da0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763408Ab3DDG3K (ORCPT ); Thu, 4 Apr 2013 02:29:10 -0400 Received: by mail-da0-f50.google.com with SMTP id t1so1000685dae.37 for ; Wed, 03 Apr 2013 23:29:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=OpRuc978ZnaHs5Az3mIU1x0j73jqgnyIXxu45wg9yVc=; b=hCp30TSbuV7aUdrmDu6Cjx4zVd2FSC+YcX4Vv3ajhuTafP59Ewd1aKf2BsPTU7c4+O RHCADLVLkGYbpWfvzHnywIZEC7xaTeROTSqE1GisNENRf/boOEvIIh4qyHWLiBhnmi2L xl57HdpNxllWyQYVxmAIDPJOii2V/9ekhShhFIDGj4UAlZw0TVcRzJztrL7RPbvowAMp JVil1mMIHry/x1WYwqViOoxN/b9kiz1+UOh05DQJFV13F0dlHj7+t6BDelt41MSnMC3X rbC2mXz0mV0amp2KLf20Ps9DQXk89CqqxI8xA2N184ss7nd0ttjXU1slOiHsnTT+JOak jFoA== X-Received: by 10.68.252.136 with SMTP id zs8mr2231484pbc.36.1365056949972; Wed, 03 Apr 2013 23:29:09 -0700 (PDT) Received: from localhost.localdomain ([122.172.176.105]) by mx.google.com with ESMTPS id pl10sm5353036pbc.1.2013.04.03.23.29.06 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Apr 2013 23:29:09 -0700 (PDT) From: Sumit Semwal To: linaro-mm-sig@lists.linaro.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: patches@linaro.org, linaro-kernel@lists.linaro.org, Sumit Semwal , Daniel Vetter Subject: [PATCH v3 1/2] dma-buf: replace dma_buf_export() with dma_buf_export_named() Date: Thu, 4 Apr 2013 11:58:32 +0530 Message-Id: <1365056913-25772-2-git-send-email-sumit.semwal@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1365056913-25772-1-git-send-email-sumit.semwal@linaro.org> References: <1365056913-25772-1-git-send-email-sumit.semwal@linaro.org> X-Gm-Message-State: ALoCoQmX7kH5eKzxBgfQERU7DmeHVN5UXT0l6GjQjuF9f6Ju2g5axaCMiaXIDxF3f6Vtmi4aeFYJ Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org For debugging purposes, it is useful to have a name-string added while exporting buffers. Hence, dma_buf_export() is replaced with dma_buf_export_named(), which additionally takes 'exp_name' as a parameter. For backward compatibility, and for lazy exporters who don't wish to name themselves, a #define dma_buf_export() is also made available, which adds a __FILE__ instead of 'exp_name'. Cc: Daniel Vetter [Thanks for the idea!] Reviewed-by: Daniel Vetter Signed-off-by: Sumit Semwal --- Documentation/dma-buf-sharing.txt | 13 +++++++++++-- drivers/base/dma-buf.c | 11 +++++++---- include/linux/dma-buf.h | 11 +++++++++-- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/Documentation/dma-buf-sharing.txt b/Documentation/dma-buf-sharing.txt index 4966b1b..0b23261 100644 --- a/Documentation/dma-buf-sharing.txt +++ b/Documentation/dma-buf-sharing.txt @@ -52,14 +52,23 @@ The dma_buf buffer sharing API usage contains the following steps: associated with this buffer. Interface: - struct dma_buf *dma_buf_export(void *priv, struct dma_buf_ops *ops, - size_t size, int flags) + struct dma_buf *dma_buf_export_named(void *priv, struct dma_buf_ops *ops, + size_t size, int flags, + const char *exp_name) If this succeeds, dma_buf_export allocates a dma_buf structure, and returns a pointer to the same. It also associates an anonymous file with this buffer, so it can be exported. On failure to allocate the dma_buf object, it returns NULL. + 'exp_name' is the name of exporter - to facilitate information while + debugging. + + Exporting modules which do not wish to provide any specific name may use the + helper define 'dma_buf_export()', with the same arguments as above, but + without the last argument; a __FILE__ pre-processor directive will be + inserted in place of 'exp_name' instead. + 2. Userspace gets a handle to pass around to potential buffer-users Userspace entity requests for a file-descriptor (fd) which is a handle to the diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index 2a7cb0d..d89102a 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -77,22 +77,24 @@ static inline int is_dma_buf_file(struct file *file) } /** - * dma_buf_export - Creates a new dma_buf, and associates an anon file + * dma_buf_export_named - Creates a new dma_buf, and associates an anon file * with this buffer, so it can be exported. * Also connect the allocator specific data and ops to the buffer. + * Additionally, provide a name string for exporter; useful in debugging. * * @priv: [in] Attach private data of allocator to this buffer * @ops: [in] Attach allocator-defined dma buf ops to the new buffer. * @size: [in] Size of the buffer * @flags: [in] mode flags for the file. + * @exp_name: [in] name of the exporting module - useful for debugging. * * Returns, on success, a newly created dma_buf object, which wraps the * supplied private data and operations for dma_buf_ops. On either missing * ops, or error in allocating struct dma_buf, will return negative error. * */ -struct dma_buf *dma_buf_export(void *priv, const struct dma_buf_ops *ops, - size_t size, int flags) +struct dma_buf *dma_buf_export_named(void *priv, const struct dma_buf_ops *ops, + size_t size, int flags, const char *exp_name) { struct dma_buf *dmabuf; struct file *file; @@ -114,6 +116,7 @@ struct dma_buf *dma_buf_export(void *priv, const struct dma_buf_ops *ops, dmabuf->priv = priv; dmabuf->ops = ops; dmabuf->size = size; + dmabuf->exp_name = exp_name; file = anon_inode_getfile("dmabuf", &dma_buf_fops, dmabuf, flags); @@ -124,7 +127,7 @@ struct dma_buf *dma_buf_export(void *priv, const struct dma_buf_ops *ops, return dmabuf; } -EXPORT_SYMBOL_GPL(dma_buf_export); +EXPORT_SYMBOL_GPL(dma_buf_export_named); /** diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 9978b61..6f55c04 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -112,6 +112,7 @@ 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. + * @exp_name: name of the exporter; useful for debugging. * @priv: exporter specific private data for this buffer object. */ struct dma_buf { @@ -123,6 +124,7 @@ struct dma_buf { struct mutex lock; unsigned vmapping_counter; void *vmap_ptr; + const char *exp_name; void *priv; }; @@ -162,8 +164,13 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf, struct device *dev); void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *dmabuf_attach); -struct dma_buf *dma_buf_export(void *priv, const struct dma_buf_ops *ops, - size_t size, int flags); + +struct dma_buf *dma_buf_export_named(void *priv, const struct dma_buf_ops *ops, + size_t size, int flags, const char *); + +#define dma_buf_export(priv, ops, size, flags) \ + dma_buf_export_named(priv, ops, size, flags, __FILE__) + int dma_buf_fd(struct dma_buf *dmabuf, int flags); struct dma_buf *dma_buf_get(int fd); void dma_buf_put(struct dma_buf *dmabuf);