[RFCv2 PATCH 7/9] v4l: vb2-dma-contig: change map/unmap behaviour

[Laurent Pinchart]

Hi Tomasz,

Thanks for the patch.

On Tuesday 13 March 2012 11:17:05 Tomasz Stanislawski wrote:
> The DMABUF documentation says that the map_dma_buf callback should return
> scatterlist that is mapped into a caller's address space. In practice,
> almost none of existing implementations of DMABUF exporter does it.  This
> patch breaks the DMABUF specification in order to allow exchange DMABUF
> buffers between other APIs like DRM.

Then it's time to fix the spec, and squash 6/9 and 7/9 together (I started 
reviewing 6/9 and the implementation puzzled me until I saw the "fixes" in 
7/9).

We need to agree on a behaviour for the mapping API. I've thought from the 
beginning that mapping the buffer to the importer's device address space 
should be the responsibility of the importer, not the exporter. If we move to 
that approach, we should probably rename the map and unmap functions as they 
won't deal with mappings anymore. I recall that pin/unpin were proposed at 
some point (possible during a meeting at the ELC).

One possible issue with handling mappings in the importer is that the exporter 
won't be able to implement any mapping/unmapping hack that might be needed. As 
the DMA SG API doesn't seem to support VM_PFNMAP memory (see the explanation 
in my reply to 2/9), we will be left without a solution if an exporter uses 
memory not backed with struct page.

> Signed-off-by: Tomasz Stanislawski <t.stanislaws at samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
> ---
>  drivers/media/video/videobuf2-dma-contig.c |   64
> ++++++++++++---------------- 1 files changed, 27 insertions(+), 37
> deletions(-)
> 
> diff --git a/drivers/media/video/videobuf2-dma-contig.c
> b/drivers/media/video/videobuf2-dma-contig.c index d95b23a..32bb16b 100644
> --- a/drivers/media/video/videobuf2-dma-contig.c
> +++ b/drivers/media/video/videobuf2-dma-contig.c
> @@ -315,11 +315,6 @@ static int vb2_dc_mmap(void *buf_priv, struct
> vm_area_struct *vma) /*         DMABUF ops for exporters          */
>  /*********************************************/
> 
> -struct vb2_dc_attachment {
> -	struct sg_table sgt;
> -	enum dma_data_direction dir;
> -};
> -
>  static int vb2_dc_dmabuf_ops_attach(struct dma_buf *dbuf, struct device
> *dev, struct dma_buf_attachment *dbuf_attach)
>  {
> @@ -330,17 +325,13 @@ static int vb2_dc_dmabuf_ops_attach(struct dma_buf
> *dbuf, struct device *dev, static void vb2_dc_dmabuf_ops_detach(struct
> dma_buf *dbuf,
>  	struct dma_buf_attachment *db_attach)
>  {
> -	struct vb2_dc_attachment *attach = db_attach->priv;
> -	struct sg_table *sgt;
> +	struct sg_table *sgt = db_attach->priv;
> 
> -	if (!attach)
> +	if (!sgt)
>  		return;
> 
> -	sgt = &attach->sgt;
> -
> -	dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->nents, attach->dir);
>  	sg_free_table(sgt);
> -	kfree(attach);
> +	kfree(sgt);
>  	db_attach->priv = NULL;
>  }
> 
> @@ -349,26 +340,22 @@ static struct sg_table *vb2_dc_dmabuf_ops_map(
>  {
>  	struct dma_buf *dbuf = db_attach->dmabuf;
>  	struct vb2_dc_buf *buf = dbuf->priv;
> -	struct vb2_dc_attachment *attach = db_attach->priv;
> -	struct sg_table *sgt;
> +	struct sg_table *sgt = db_attach->priv;
>  	struct scatterlist *rd, *wr;
>  	int i, ret;
> 
>  	/* return previously mapped sg table */
> -	if (attach)
> -		return &attach->sgt;
> +	if (sgt)
> +		return sgt;
> 
> -	attach = kzalloc(sizeof *attach, GFP_KERNEL);
> -	if (!attach)
> +	sgt = kzalloc(sizeof *sgt, GFP_KERNEL);
> +	if (!sgt)
>  		return ERR_PTR(-ENOMEM);
> 
> -	sgt = &attach->sgt;
> -	attach->dir = dir;
> -
>  	/* copying the buf->base_sgt to attachment */
>  	ret = sg_alloc_table(sgt, buf->sgt_base->orig_nents, GFP_KERNEL);
>  	if (ret) {
> -		kfree(attach);
> +		kfree(sgt);
>  		return ERR_PTR(-ENOMEM);
>  	}
> 
> @@ -380,16 +367,7 @@ static struct sg_table *vb2_dc_dmabuf_ops_map(
>  		wr = sg_next(wr);
>  	}
> 
> -	/* mapping new sglist to the client */
> -	ret = dma_map_sg(db_attach->dev, sgt->sgl, sgt->orig_nents, dir);
> -	if (ret <= 0) {
> -		printk(KERN_ERR "failed to map scatterlist\n");
> -		sg_free_table(sgt);
> -		kfree(attach);
> -		return ERR_PTR(-EIO);
> -	}
> -
> -	db_attach->priv = attach;
> +	db_attach->priv = sgt;
> 
>  	return sgt;
>  }
> @@ -623,7 +601,7 @@ static int vb2_dc_map_dmabuf(void *mem_priv)
>  	struct vb2_dc_buf *buf = mem_priv;
>  	struct sg_table *sgt;
>  	unsigned long contig_size;
> -	int ret = 0;
> +	int ret = -EFAULT;
> 
>  	if (WARN_ON(!buf->db_attach)) {
>  		printk(KERN_ERR "trying to pin a non attached buffer\n");
> @@ -642,12 +620,20 @@ static int vb2_dc_map_dmabuf(void *mem_priv)
>  		return -EINVAL;
>  	}
> 
> +	/* mapping new sglist to the client */
> +	sgt->nents = dma_map_sg(buf->dev, sgt->sgl, sgt->orig_nents,
> +		buf->dma_dir);
> +	if (sgt->nents <= 0) {
> +		printk(KERN_ERR "failed to map scatterlist\n");
> +		goto fail_map_attachment;
> +	}
> +
>  	/* checking if dmabuf is big enough to store contiguous chunk */
>  	contig_size = vb2_dc_get_contiguous_size(sgt);
>  	if (contig_size < buf->size) {
> -		printk(KERN_ERR "contiguous chunk of dmabuf is too small\n");
> -		ret = -EFAULT;
> -		goto fail_map;
> +		printk(KERN_ERR "contiguous chunk of dmabuf is too small "
> +			"%lu/%lu bytes\n", contig_size, buf->size);
> +		goto fail_map_sg;
>  	}
> 
>  	buf->dma_addr = sg_dma_address(sgt->sgl);
> @@ -655,7 +641,10 @@ static int vb2_dc_map_dmabuf(void *mem_priv)
> 
>  	return 0;
> 
> -fail_map:
> +fail_map_sg:
> +	dma_unmap_sg(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
> +
> +fail_map_attachment:
>  	dma_buf_unmap_attachment(buf->db_attach, sgt);
> 
>  	return ret;
> @@ -676,6 +665,7 @@ static void vb2_dc_unmap_dmabuf(void *mem_priv)
>  		return;
>  	}
> 
> +	dma_unmap_sg(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
>  	dma_buf_unmap_attachment(buf->db_attach, sgt);
> 
>  	buf->dma_addr = 0;

-- 
Regards,

Laurent Pinchart