From patchwork Wed Aug 21 10:33:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inki Dae X-Patchwork-Id: 19849 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VC5jk-0001Rn-9P; Wed, 21 Aug 2013 12:34:00 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp id 1VC5ji-0002oY-3h; Wed, 21 Aug 2013 12:34:00 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751718Ab3HUKdp (ORCPT + 1 other); Wed, 21 Aug 2013 06:33:45 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:48319 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751641Ab3HUKdl (ORCPT ); Wed, 21 Aug 2013 06:33:41 -0400 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MRV00IOHMO1V400@mailout4.samsung.com>; Wed, 21 Aug 2013 19:33:37 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.115]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 2F.A3.08825.18794125; Wed, 21 Aug 2013 19:33:37 +0900 (KST) X-AuditID: cbfee68e-b7f276d000002279-88-521497819945 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 1E.E8.32250.08794125; Wed, 21 Aug 2013 19:33:37 +0900 (KST) Received: from daeinki-desktop.10.32.193.11 ([10.252.75.62]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MRV00G9RMNZVM30@mmp2.samsung.com>; Wed, 21 Aug 2013 19:33:36 +0900 (KST) From: Inki Dae To: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linaro-kernel@lists.linaro.org Cc: maarten.lankhorst@canonical.com, sumit.semwal@linaro.org, kyungmin.park@samsung.com, myungjoo.ham@samsung.com, Inki Dae Subject: [PATCH v2 2/2] dma-buf: Add user interfaces for dmabuf sync support Date: Wed, 21 Aug 2013 19:33:35 +0900 Message-id: <1377081215-5948-3-git-send-email-inki.dae@samsung.com> X-Mailer: git-send-email 1.7.5.4 In-reply-to: <1377081215-5948-1-git-send-email-inki.dae@samsung.com> References: <1377081215-5948-1-git-send-email-inki.dae@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42JZI2JSrNs4XSTIYO5pbosrX9+zWUy6P4HF 4mzTG3aL94eeMVtsenyN1eJE3wdWi54NW1ktnj69wGZxu3EFm8Wpu5/ZHbg8ZjX0snncubaH zeN+93Emj81L6j1u/3vM7NG3ZRWjx+dNcgHsUVw2Kak5mWWpRfp2CVwZfzvmMRU8lKk42LqC tYHxg1gXIweHhICJROsz7y5GTiBTTOLCvfVsXYxcHEICSxklpv6dxgKRMJFYvnUrVGI6o8TL 29eYIJxuJol5P+eygVSxCahKTFxxH6xKRGA5o8TH02/ZQRxmgWmMEm+bNoDNEhbwkTj57Ccr iM0C1PGzZT87yB28As4Sy785Q6xTkPh1ZBVYCaeAi8SFlXOYQWwhoJJpyz+ygsyUENjHLjFh 6TYmiDkCEt8mH2KB+EdWYtMBZog5khIHV9xgmcAovICRYRWjaGpBckFxUnqRkV5xYm5xaV66 XnJ+7iZGYGSc/vesbwfjzQPWhxiTgcZNZJYSTc4HRlZeSbyhsZmRhamJqbGRuaUZacJK4rxq LdaBQgLpiSWp2ampBalF8UWlOanFhxiZODilGhib+82zLPS05LViS95ZTuXc2XvJOj/iwcHO /anOiUm/7padZ2DxMNjTvPnLidDsrJxMlin7z0ep3OQTV7BbdlfZpkt+2r2ozA8nn2t42lZs rH95x8rw9+TZF2SYipYEXFa2fNCmM7fXceIknuPHTK69r+h3D+dIuW52/oz8nuzTl5hdMi/p 7FZiKc5INNRiLipOBABDUkOdogIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLIsWRmVeSWpSXmKPExsVy+t9jQd3G6SJBBruXMVlc+fqezWLS/Qks Fmeb3rBbvD/0jNli0+NrrBYn+j6wWvRs2Mpq8fTpBTaL240r2CxO3f3M7sDlMauhl83jzrU9 bB73u48zeWxeUu9x+99jZo++LasYPT5vkgtgj2pgtMlITUxJLVJIzUvOT8nMS7dV8g6Od443 NTMw1DW0tDBXUshLzE21VXLxCdB1y8wBuk9JoSwxpxQoFJBYXKykb4dpQmiIm64FTGOErm9I EFyPkQEaSFjDmPG3Yx5TwUOZioOtK1gbGD+IdTFyckgImEgs37qVDcIWk7hwbz2QzcUhJDCd UeLl7WtMEE43k8S8n3PBqtgEVCUmrrgPViUisJxR4uPpt+wgDrPANEaJt00bWECqhAV8JE4+ +8kKYrMAdfxs2Q9UxMHBK+AssfybM8Q6BYlfR1aBlXAKuEhcWDmHGcQWAiqZtvwj6wRG3gWM DKsYRVMLkguKk9JzDfWKE3OLS/PS9ZLzczcxgiPvmdQOxpUNFocYBTgYlXh4LyiLBAmxJpYV V+YeYpTgYFYS4V1UDRTiTUmsrEotyo8vKs1JLT7EmAx01ERmKdHkfGBSyCuJNzQ2MTOyNDI3 tDAyNidNWEmc90CrdaCQQHpiSWp2ampBahHMFiYOTqkGRjVXwRSN/glPNE/oXj1zPVDgWY/D DMsu6yK+cOMCzf3lDcqJXPOlH8/9F7umJkzRwkIqy6cwP11H2PHLmvcVtewOD1W3N73xX9XN YGygXbPiUVvMxV9O+x/H9KX/eh6zJvjoW0elq2kmsSdT2cvtzzPcWthgGLA+Iu+21GShD8u1 21zurP6txFKckWioxVxUnAgAF3usrAADAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.8.21.102418 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' This patch adds lock and poll callbacks to dma buf file operations, and these callbacks will be called by fcntl and select system calls. fcntl and select system calls can be used to wait for the completion of DMA or CPU access to a shared dmabuf. The difference of them is fcntl system call takes a lock after the completion but select system call doesn't. So in case of fcntl system call, it's useful when a task wants to access a shared dmabuf without any broken. On the other hand, it's useful when a task wants to just wait for the completion. Changelog v2: - Add select system call support. . The purpose of this feature is to wait for the completion of DMA or CPU access to a dmabuf without that caller locks the dmabuf again after the completion. That is useful when caller wants to be aware of the completion of DMA access to the dmabuf, and the caller doesn't use intefaces for the DMA device driver. Signed-off-by: Inki Dae Signed-off-by: Kyungmin Park --- drivers/base/dma-buf.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index 4aca57a..f16a396 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -29,6 +29,7 @@ #include #include #include +#include #include static inline int is_dma_buf_file(struct file *); @@ -80,9 +81,89 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma) return dmabuf->ops->mmap(dmabuf, vma); } +static unsigned int dma_buf_poll(struct file *filp, + struct poll_table_struct *poll) +{ + struct dma_buf *dmabuf; + struct dmabuf_sync_reservation *robj; + int ret = 0; + + if (!is_dma_buf_file(filp)) + return POLLERR; + + dmabuf = filp->private_data; + if (!dmabuf || !dmabuf->sync) + return POLLERR; + + robj = dmabuf->sync; + + mutex_lock(&robj->lock); + + robj->polled = true; + + /* + * CPU or DMA access to this buffer has been completed, and + * the blocked task has been waked up. Return poll event + * so that the task can get out of select(). + */ + if (robj->poll_event) { + robj->poll_event = false; + mutex_unlock(&robj->lock); + return POLLIN | POLLOUT; + } + + /* + * There is no anyone accessing this buffer so just return. + */ + if (!robj->locked) { + mutex_unlock(&robj->lock); + return POLLIN | POLLOUT; + } + + poll_wait(filp, &robj->poll_wait, poll); + + mutex_unlock(&robj->lock); + + return ret; +} + +static int dma_buf_lock(struct file *file, int cmd, struct file_lock *fl) +{ + struct dma_buf *dmabuf; + unsigned int type; + bool wait = false; + + if (!is_dma_buf_file(file)) + return -EINVAL; + + dmabuf = file->private_data; + + if ((fl->fl_type & F_UNLCK) == F_UNLCK) { + dmabuf_sync_single_unlock(dmabuf); + return 0; + } + + /* convert flock type to dmabuf sync type. */ + if ((fl->fl_type & F_WRLCK) == F_WRLCK) + type = DMA_BUF_ACCESS_W; + else if ((fl->fl_type & F_RDLCK) == F_RDLCK) + type = DMA_BUF_ACCESS_R; + else + return -EINVAL; + + if (fl->fl_flags & FL_SLEEP) + wait = true; + + /* TODO. the locking to certain region should also be considered. */ + + return dmabuf_sync_single_lock(dmabuf, type, wait); +} + static const struct file_operations dma_buf_fops = { .release = dma_buf_release, .mmap = dma_buf_mmap_internal, + .poll = dma_buf_poll, + .lock = dma_buf_lock, }; /*