From patchwork Mon Dec 17 23:58:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 13633 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1E00723E1F for ; Tue, 18 Dec 2012 00:08:23 +0000 (UTC) Received: from mail-ie0-f181.google.com (mail-ie0-f181.google.com [209.85.223.181]) by fiordland.canonical.com (Postfix) with ESMTP id 9BF48A1814B for ; Tue, 18 Dec 2012 00:08:22 +0000 (UTC) Received: by mail-ie0-f181.google.com with SMTP id 16so926iea.26 for ; Mon, 17 Dec 2012 16:08:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:dkim-signature:x-received:from:to:date:message-id :x-mailer:in-reply-to:references:cc:subject:x-beenthere :x-mailman-version:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-gm-message-state; bh=a/GbeM4/W46RDwDIZDDgSYMrgpbLRQQIR4x7KeI6vEE=; b=Qvj58r0HOlJ81SmCzKVYnRSxQy3UHgUkV2d9nl3ZkHNR7OmvR9RbMU2WuHCPWA5ASE UJOxakU9V+/+ofxNeqYGJr9X//Xb5GYkFuqdxG0TlFxI+9L1cyc6IisYb4e/wNEIlZE9 XrT7DoLUniciCvFpMFX8STv5ve4dWgASa0Y+K+i76JMnTuj3tURH6qNkHvtJsucrqiPB nLQEkodx7kqw2U5honoCKA/gDmD8V8/YPiWKw2HwQgwOVdVmPCK67s4mn9RLkC3FTbk6 dMzLPjK9SYV2O6Kp9QFY2ui/7Yr/zYA21w+MZBt6+x9Cp5hlWBBJKCmISgPSDB6qP43I eotQ== X-Received: by 10.50.36.164 with SMTP id r4mr81732igj.57.1355789302042; Mon, 17 Dec 2012 16:08:22 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp107238igt; Mon, 17 Dec 2012 16:08:21 -0800 (PST) X-Received: by 10.14.194.199 with SMTP id m47mr490329een.11.1355789300531; Mon, 17 Dec 2012 16:08:20 -0800 (PST) Received: from mombin.canonical.com (mombin.canonical.com. [91.189.95.16]) by mx.google.com with ESMTP id s8si38927547eeo.139.2012.12.17.16.08.17; Mon, 17 Dec 2012 16:08:20 -0800 (PST) Received-SPF: neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) client-ip=91.189.95.16; Authentication-Results: mx.google.com; spf=neutral (google.com: 91.189.95.16 is neither permitted nor denied by best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org) smtp.mail=linaro-mm-sig-bounces@lists.linaro.org Received: from localhost ([127.0.0.1] helo=mombin.canonical.com) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TkkjI-0000dE-Jp; Tue, 18 Dec 2012 00:08:16 +0000 Received: from mail-ee0-f41.google.com ([74.125.83.41]) by mombin.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TkkjH-0000d9-Di for linaro-mm-sig@lists.linaro.org; Tue, 18 Dec 2012 00:08:15 +0000 Received: by mail-ee0-f41.google.com with SMTP id d41so1350eek.14 for ; Mon, 17 Dec 2012 16:08:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Rnvx5AwqwfxUiKExD7GUquSTf3iBIRI2+lk/NYT5TQ4=; b=dGmGFc9Hw43CdX4EgiMmLb0gXZg+MWbbhYPKIQe0ylwiVNz3ZWFVLhHb+2pwdWuY3Y MClMjI+Fv5wx0b9XZukTTbfJP6b2CmFmEIA1Sn6v7N4AJZXaRO27J1ZVWrJXXyYBwqHM IFgzM8Qz6BYrRzaRp+OGsQ6QvDK83VG54YYQo= X-Received: by 10.14.173.65 with SMTP id u41mr475520eel.13.1355789295028; Mon, 17 Dec 2012 16:08:15 -0800 (PST) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id r1sm14377eeo.2.2012.12.17.16.08.13 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 16:08:14 -0800 (PST) From: Daniel Vetter To: DRI Development , linaro-mm-sig@lists.linaro.org, linux-media@vger.kernel.org Date: Tue, 18 Dec 2012 00:58:35 +0100 Message-Id: <1355788715-22177-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1355787110-19968-1-git-send-email-daniel.vetter@ffwll.ch> References: <1355787110-19968-1-git-send-email-daniel.vetter@ffwll.ch> Cc: LKML Subject: [Linaro-mm-sig] [PATCH] [RFC] dma-buf: implement vmap refcounting in the interface logic X-BeenThere: linaro-mm-sig@lists.linaro.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Unified memory management interest group." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linaro-mm-sig-bounces@lists.linaro.org Errors-To: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQkbx64OKVGAdF9KXzp9pwbm+ED4TSrPT8j63ygaKgES08FwxBho6K49eqxejb8mFAhb1qGt All drivers which implement this need to have some sort of refcount to allow concurrent vmap usage. Hence implement this in the dma-buf core. To protect against concurrent calls we need a lock, which potentially causes new funny locking inversions. But this shouldn't be a problem for exporters with statically allocated backing storage, and more dynamic drivers have decent issues already anyway. Inspired by some refactoring patches from Aaron Plattner, who implemented the same idea, but only for drm/prime drivers. v2: Check in dma_buf_release that no dangling vmaps are left. Suggested by Aaron Plattner. We might want to do similar checks for attachments, but that's for another patch. Also fix up ERR_PTR return for vmap. v3: Check whether the passed-in vmap address matches with the cached one for vunmap. Eventually we might want to remove that parameter - compared to the kmap functions there's no need for the vaddr for unmapping. Suggested by Chris Wilson. Cc: Aaron Plattner Signed-off-by: Daniel Vetter --- Compile-tested only - Aaron has been bugging me too a bit too often about this on irc. Cheers, Daniel --- Documentation/dma-buf-sharing.txt | 6 +++++- drivers/base/dma-buf.c | 43 ++++++++++++++++++++++++++++++++++----- include/linux/dma-buf.h | 4 +++- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/Documentation/dma-buf-sharing.txt b/Documentation/dma-buf-sharing.txt index 0188903..4966b1b 100644 --- a/Documentation/dma-buf-sharing.txt +++ b/Documentation/dma-buf-sharing.txt @@ -302,7 +302,11 @@ Access to a dma_buf from the kernel context involves three steps: void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr) The vmap call can fail if there is no vmap support in the exporter, or if it - runs out of vmalloc space. Fallback to kmap should be implemented. + runs out of vmalloc space. Fallback to kmap should be implemented. Note that + the dma-buf layer keeps a reference count for all vmap access and calls down + into the exporter's vmap function only when no vmapping exists, and only + unmaps it once. Protection against concurrent vmap/vunmap calls is provided + by taking the dma_buf->lock mutex. 3. Finish access diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index a3f79c4..67d3cd5 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -39,6 +39,8 @@ static int dma_buf_release(struct inode *inode, struct file *file) dmabuf = file->private_data; + BUG_ON(dmabuf->vmapping_counter); + dmabuf->ops->release(dmabuf); kfree(dmabuf); return 0; @@ -482,12 +484,34 @@ EXPORT_SYMBOL_GPL(dma_buf_mmap); */ void *dma_buf_vmap(struct dma_buf *dmabuf) { + void *ptr; + if (WARN_ON(!dmabuf)) return NULL; - if (dmabuf->ops->vmap) - return dmabuf->ops->vmap(dmabuf); - return NULL; + if (!dmabuf->ops->vmap) + return NULL; + + mutex_lock(&dmabuf->lock); + if (dmabuf->vmapping_counter) { + dmabuf->vmapping_counter++; + BUG_ON(!dmabuf->vmap_ptr); + ptr = dmabuf->vmap_ptr; + goto out_unlock; + } + + BUG_ON(dmabuf->vmap_ptr); + + ptr = dmabuf->ops->vmap(dmabuf); + if (IS_ERR_OR_NULL(ptr)) + goto out_unlock; + + dmabuf->vmap_ptr = ptr; + dmabuf->vmapping_counter = 1; + +out_unlock: + mutex_unlock(&dmabuf->lock); + return ptr; } EXPORT_SYMBOL_GPL(dma_buf_vmap); @@ -501,7 +525,16 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr) if (WARN_ON(!dmabuf)) return; - if (dmabuf->ops->vunmap) - dmabuf->ops->vunmap(dmabuf, vaddr); + BUG_ON(!dmabuf->vmap_ptr); + BUG_ON(dmabuf->vmapping_counter > 0); + BUG_ON(dmabuf->vmap_ptr != vaddr); + + mutex_lock(&dmabuf->lock); + if (--dmabuf->vmapping_counter == 0) { + if (dmabuf->ops->vunmap) + dmabuf->ops->vunmap(dmabuf, vaddr); + dmabuf->vmap_ptr = NULL; + } + mutex_unlock(&dmabuf->lock); } EXPORT_SYMBOL_GPL(dma_buf_vunmap); diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index bd2e52c..e3bf2f6 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -119,8 +119,10 @@ struct dma_buf { struct file *file; struct list_head attachments; const struct dma_buf_ops *ops; - /* mutex to serialize list manipulation and attach/detach */ + /* mutex to serialize list manipulation, attach/detach and vmap/unmap */ struct mutex lock; + unsigned vmapping_counter; + void *vmap_ptr; void *priv; };