From patchwork Wed Jan 21 04:16:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 43430 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 770F32034D for ; Wed, 21 Jan 2015 04:17:42 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id e49sf16182667eek.3 for ; Tue, 20 Jan 2015 20:17:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:subject:date :message-id:in-reply-to:references:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=KTHh/Xe9x881ypri+6QYwbXfP/A+1piuIMyUxNs2ofc=; b=CW+gkEcQqn0QlmsMEYRMdMMKWtlBz4Gm3XdNI9KiEP8ppiBd/OvsDW3V/SVYXJyEdl N/8YSLxBRwgpg0ZDcJ5+5h6dmKBN9yVat5KPSv3v5hUuWlXG49RGNd7jkggCfQD8n5hW Rbb0O3kIiv2sI69hL/96lpx9lklKoewPm9tbxLYIPUjqvr7qvfY0vx4rLvC/DBXOTu05 KkKMQ4OvPBBBTmJEZag28ZasZWveqQ1+JfYeZt4knaSrd/l+Vh1l16+k1A+CpYD4Ebbb BjdKBSAtOZE68Gd03j0mDcGXicP5XZB9yvZkL7hVDg5LaDRiWNq1gJ4bRv9udfdfbs0k ++mw== X-Gm-Message-State: ALoCoQlZLXvBWtNRFF7rB6ZGNUmLXlNZPZ0S5wAjoEChGXrWygQ4ORQ0NCp6uH3ptR8nNhTJURzr X-Received: by 10.180.79.133 with SMTP id j5mr2472968wix.0.1421813861729; Tue, 20 Jan 2015 20:17:41 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.10.197 with SMTP id k5ls544141lab.77.gmail; Tue, 20 Jan 2015 20:17:41 -0800 (PST) X-Received: by 10.112.54.167 with SMTP id k7mr16650762lbp.72.1421813861502; Tue, 20 Jan 2015 20:17:41 -0800 (PST) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id ai4si16954798lbc.10.2015.01.20.20.17.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 Jan 2015 20:17:41 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by mail-la0-f42.google.com with SMTP id ms9so15850962lab.1 for ; Tue, 20 Jan 2015 20:17:41 -0800 (PST) X-Received: by 10.112.84.225 with SMTP id c1mr41651815lbz.22.1421813861393; Tue, 20 Jan 2015 20:17:41 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp1644036lbb; Tue, 20 Jan 2015 20:17:40 -0800 (PST) X-Received: by 10.68.68.235 with SMTP id z11mr14769160pbt.60.1421813859225; Tue, 20 Jan 2015 20:17:39 -0800 (PST) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id fc3si7367415pad.15.2015.01.20.20.17.38; Tue, 20 Jan 2015 20:17:39 -0800 (PST) Received-SPF: none (google.com: dri-devel-bounces@lists.freedesktop.org does not designate permitted sender hosts) client-ip=131.252.210.177; Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88AD36E6FA; Tue, 20 Jan 2015 20:17:37 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f52.google.com (mail-pa0-f52.google.com [209.85.220.52]) by gabe.freedesktop.org (Postfix) with ESMTP id EB3846E6FA for ; Tue, 20 Jan 2015 20:17:36 -0800 (PST) Received: by mail-pa0-f52.google.com with SMTP id kx10so19575907pab.11 for ; Tue, 20 Jan 2015 20:17:36 -0800 (PST) X-Received: by 10.68.193.135 with SMTP id ho7mr59196430pbc.103.1421813856790; Tue, 20 Jan 2015 20:17:36 -0800 (PST) Received: from ss-ubuntu.lan ([106.51.225.38]) by mx.google.com with ESMTPSA id hx9sm4684773pad.38.2015.01.20.20.17.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jan 2015 20:17:35 -0800 (PST) From: Sumit Semwal To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org Subject: [RFCv2 2/2] dma-buf: add helpers for sharing attacher constraints with dma-parms Date: Wed, 21 Jan 2015 09:46:47 +0530 Message-Id: <1421813807-9178-3-git-send-email-sumit.semwal@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421813807-9178-1-git-send-email-sumit.semwal@linaro.org> References: <1421813807-9178-1-git-send-email-sumit.semwal@linaro.org> Cc: t.stanislaws@samsung.com, linaro-kernel@lists.linaro.org, m.szyprowski@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sumit.semwal@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Add some helpers to share the constraints of devices while attaching to the dmabuf buffer. At each attach, the constraints are calculated based on the following: - dma_mask, coherent_dma_mask from struct device, - max_segment_size, max_segment_count, segment_boundary_mask from device_dma_parameters. In case the attaching device's constraints don't match up, attach() fails. At detach, the constraints are recalculated based on the remaining attached devices. Two helpers are added: - dma_buf_get_constraints - which gives the current constraints as calculated during each attach on the buffer till the time, - dma_buf_recalc_constraints - which recalculates the constraints for all currently attached devices for the 'paranoid' ones amongst us. The idea of this patch is largely taken from Rob Clark's RFC at https://lkml.org/lkml/2012/7/19/285, and the comments received on it. Cc: Rob Clark Signed-off-by: Sumit Semwal --- drivers/dma-buf/dma-buf.c | 132 +++++++++++++++++++++++++++++++++++++++++++++- include/linux/dma-buf.h | 22 ++++++++ 2 files changed, 153 insertions(+), 1 deletion(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 5be225c..3781f43 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -264,6 +264,77 @@ static inline int is_dma_buf_file(struct file *file) return file->f_op == &dma_buf_fops; } +static inline void init_constraints(struct dma_buf_constraints *cons) +{ + cons->coherent_dma_mask = (u64)-1; + cons->dma_mask = (u64)-1; + cons->dma_parms.max_segment_count = (unsigned int)-1; + cons->dma_parms.max_segment_size = (unsigned int)-1; + cons->dma_parms.segment_boundary_mask = (unsigned int)-1; +} + +/* + * calc_constraints - calculates if the new attaching device's constraints + * match, with the constraints of already attached devices; if yes, returns + * the constraints; else return ERR_PTR(-EINVAL) + */ +static int calc_constraints(struct device *dev, + struct dma_buf_constraints *calc_cons) +{ + struct dma_buf_constraints cons = *calc_cons; + + cons.dma_mask &= dma_get_mask(dev); + /* TODO: Check if this is the right way for coherent_mask ? */ + cons.coherent_dma_mask &= dev->coherent_dma_mask; + + cons.dma_parms.max_segment_count = + min(cons.dma_parms.max_segment_count, + dma_get_max_seg_count(dev)); + cons.dma_parms.max_segment_size = + min(cons.dma_parms.max_segment_size, + dma_get_max_seg_size(dev)); + cons.dma_parms.segment_boundary_mask &= + dma_get_seg_boundary(dev); + + if (!cons.dma_parms.max_segment_count || + !cons.dma_parms.max_segment_size || + !cons.dma_parms.segment_boundary_mask || + !cons.dma_mask || + !cons.coherent_dma_mask) { + pr_err("Dev: %s's constraints don't match\n", dev_name(dev)); + return -EINVAL; + } + + *calc_cons = cons; + + return 0; +} + +/* + * recalc_constraints - recalculates constraints for all attached devices; + * useful for detach() recalculation, and for dma_buf_recalc_constraints() + * helper. + * Returns recalculated constraints in recalc_cons, or error in the unlikely + * case when constraints of attached devices might have changed. + */ +static int recalc_constraints(struct dma_buf *dmabuf, + struct dma_buf_constraints *recalc_cons) +{ + struct dma_buf_constraints calc_cons; + struct dma_buf_attachment *attach; + int ret = 0; + + init_constraints(&calc_cons); + + list_for_each_entry(attach, &dmabuf->attachments, node) { + ret = calc_constraints(attach->dev, &calc_cons); + if (ret) + return ret; + } + *recalc_cons = calc_cons; + return 0; +} + /** * dma_buf_export_named - Creates a new dma_buf, and associates an anon file * with this buffer, so it can be exported. @@ -313,6 +384,9 @@ struct dma_buf *dma_buf_export_named(void *priv, const struct dma_buf_ops *ops, dmabuf->ops = ops; dmabuf->size = size; dmabuf->exp_name = exp_name; + + init_constraints(&dmabuf->constraints); + init_waitqueue_head(&dmabuf->poll); dmabuf->cb_excl.poll = dmabuf->cb_shared.poll = &dmabuf->poll; dmabuf->cb_excl.active = dmabuf->cb_shared.active = 0; @@ -422,7 +496,7 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf, struct device *dev) { struct dma_buf_attachment *attach; - int ret; + int ret = 0; if (WARN_ON(!dmabuf || !dev)) return ERR_PTR(-EINVAL); @@ -436,6 +510,9 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf, mutex_lock(&dmabuf->lock); + if (calc_constraints(dev, &dmabuf->constraints)) + goto err_constraints; + if (dmabuf->ops->attach) { ret = dmabuf->ops->attach(dmabuf, dev, attach); if (ret) @@ -448,6 +525,7 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf, err_attach: kfree(attach); +err_constraints: mutex_unlock(&dmabuf->lock); return ERR_PTR(ret); } @@ -470,6 +548,8 @@ void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *attach) if (dmabuf->ops->detach) dmabuf->ops->detach(dmabuf, attach); + recalc_constraints(dmabuf, &dmabuf->constraints); + mutex_unlock(&dmabuf->lock); kfree(attach); } @@ -770,6 +850,56 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr) } EXPORT_SYMBOL_GPL(dma_buf_vunmap); +/** + * dma_buf_get_constraints - get the *current* constraints of the dmabuf, + * as calculated during each attach(); returns error on invalid inputs + * + * @dmabuf: [in] buffer to get constraints of + * @constraints: [out] current constraints are returned in this + */ +int dma_buf_get_constraints(struct dma_buf *dmabuf, + struct dma_buf_constraints *constraints) +{ + if (WARN_ON(!dmabuf || !constraints)) + return -EINVAL; + + mutex_lock(&dmabuf->lock); + *constraints = dmabuf->constraints; + mutex_unlock(&dmabuf->lock); + return 0; +} +EXPORT_SYMBOL_GPL(dma_buf_get_constraints); + +/** + * dma_buf_recalc_constraints - *recalculate* the constraints for the buffer + * afresh, from the list of currently attached devices; this could be useful + * cross-check the current constraints, for exporters that might want to be + * 'paranoid' about the device constraints. + * + * returns error on invalid inputs + * + * @dmabuf: [in] buffer to get constraints of + * @constraints: [out] recalculated constraints are returned in this + */ +int dma_buf_recalc_constraints(struct dma_buf *dmabuf, + struct dma_buf_constraints *constraints) +{ + struct dma_buf_constraints calc_cons; + int ret = 0; + + if (WARN_ON(!dmabuf || !constraints)) + return -EINVAL; + + mutex_lock(&dmabuf->lock); + ret = recalc_constraints(dmabuf, &calc_cons); + if (!ret) + *constraints = calc_cons; + + mutex_unlock(&dmabuf->lock); + return ret; +} +EXPORT_SYMBOL_GPL(dma_buf_recalc_constraints); + #ifdef CONFIG_DEBUG_FS static int dma_buf_describe(struct seq_file *s) { diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 694e1fe..e1f7cbe 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -34,10 +34,28 @@ #include struct device; +struct device_dma_parameters; struct dma_buf; struct dma_buf_attachment; /** + * struct dma_buf_constraints - holds constraints for the dma-buf + * @dma_mask: dma_mask if the device is dma'able + * @coherent_dma_mask: like dma_mask, but for alloc_coherent mappings + * @dma_parms: collated dma_parms from all devices. + * + * This structure holds the constraints of the dma_buf, dependent on the + * currently attached devices. Semantics for each of the members are the same + * as defined in device.h + */ +struct dma_buf_constraints { + u64 dma_mask; + u64 coherent_dma_mask; + struct device_dma_parameters dma_parms; +}; + + +/** * struct dma_buf_ops - operations possible on struct dma_buf * @attach: [optional] allows different devices to 'attach' themselves to the * given buffer. It might return -EBUSY to signal that backing storage @@ -130,6 +148,7 @@ struct dma_buf { void *vmap_ptr; const char *exp_name; struct list_head list_node; + struct dma_buf_constraints constraints; void *priv; struct reservation_object *resv; @@ -211,4 +230,7 @@ void *dma_buf_vmap(struct dma_buf *); void dma_buf_vunmap(struct dma_buf *, void *vaddr); int dma_buf_debugfs_create_file(const char *name, int (*write)(struct seq_file *)); + +int dma_buf_get_constraints(struct dma_buf *, struct dma_buf_constraints *); +int dma_buf_recalc_constraints(struct dma_buf *, struct dma_buf_constraints *); #endif /* __DMA_BUF_H__ */