From mboxrd@z Thu Jan 1 00:00:00 1970 From: laurent.pinchart@ideasonboard.com (Laurent Pinchart) Date: Fri, 03 Mar 2017 18:37:47 +0200 Subject: [RFC PATCH 04/12] staging: android: ion: Call dma_map_sg for syncing and mapping In-Reply-To: <1488491084-17252-5-git-send-email-labbott@redhat.com> References: <1488491084-17252-1-git-send-email-labbott@redhat.com> <1488491084-17252-5-git-send-email-labbott@redhat.com> Message-ID: <1842876.9VofhAIJSQ@avalon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Laura, Thank you for the patch. On Thursday 02 Mar 2017 13:44:36 Laura Abbott wrote: > Technically, calling dma_buf_map_attachment should return a buffer > properly dma_mapped. Add calls to dma_map_sg to begin_cpu_access to > ensure this happens. As a side effect, this lets Ion buffers take > advantage of the dma_buf sync ioctls. > > Signed-off-by: Laura Abbott > --- > drivers/staging/android/ion/ion.c | 101 +++++++++++++++++------------------ > 1 file changed, 50 insertions(+), 51 deletions(-) > > diff --git a/drivers/staging/android/ion/ion.c > b/drivers/staging/android/ion/ion.c index ce4adac..a931b30 100644 > --- a/drivers/staging/android/ion/ion.c > +++ b/drivers/staging/android/ion/ion.c > @@ -795,10 +795,6 @@ void ion_client_destroy(struct ion_client *client) > } > EXPORT_SYMBOL(ion_client_destroy); > > -static void ion_buffer_sync_for_device(struct ion_buffer *buffer, > - struct device *dev, > - enum dma_data_direction direction); > - > static struct sg_table *dup_sg_table(struct sg_table *table) > { > struct sg_table *new_table; > @@ -825,22 +821,43 @@ static struct sg_table *dup_sg_table(struct sg_table > *table) return new_table; > } > > +static void free_duped_table(struct sg_table *table) > +{ > + sg_free_table(table); > + kfree(table); > +} > + > static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment > *attachment, enum dma_data_direction direction) > { > struct dma_buf *dmabuf = attachment->dmabuf; > struct ion_buffer *buffer = dmabuf->priv; > + struct sg_table *table; > + int ret; > + > + /* > + * TODO: Need to sync wrt CPU or device completely owning? > + */ > + > + table = dup_sg_table(buffer->sg_table); > > - ion_buffer_sync_for_device(buffer, attachment->dev, direction); > - return dup_sg_table(buffer->sg_table); > + if (!dma_map_sg(attachment->dev, table->sgl, table->nents, > + direction)){ > + ret = -ENOMEM; > + goto err; > + } > + > +err: > + free_duped_table(table); > + return ERR_PTR(ret); > } > > static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, > struct sg_table *table, > enum dma_data_direction direction) > { > - sg_free_table(table); > - kfree(table); > + dma_unmap_sg(attachment->dev, table->sgl, table->nents, direction); > + free_duped_table(table); > } > > void ion_pages_sync_for_device(struct device *dev, struct page *page, > @@ -864,38 +881,6 @@ struct ion_vma_list { > struct vm_area_struct *vma; > }; > > -static void ion_buffer_sync_for_device(struct ion_buffer *buffer, > - struct device *dev, > - enum dma_data_direction dir) > -{ > - struct ion_vma_list *vma_list; > - int pages = PAGE_ALIGN(buffer->size) / PAGE_SIZE; > - int i; > - > - pr_debug("%s: syncing for device %s\n", __func__, > - dev ? dev_name(dev) : "null"); > - > - if (!ion_buffer_fault_user_mappings(buffer)) > - return; > - > - mutex_lock(&buffer->lock); > - for (i = 0; i < pages; i++) { > - struct page *page = buffer->pages[i]; > - > - if (ion_buffer_page_is_dirty(page)) > - ion_pages_sync_for_device(dev, ion_buffer_page(page), > - PAGE_SIZE, dir); > - > - ion_buffer_page_clean(buffer->pages + i); > - } > - list_for_each_entry(vma_list, &buffer->vmas, list) { > - struct vm_area_struct *vma = vma_list->vma; > - > - zap_page_range(vma, vma->vm_start, vma->vm_end - vma- >vm_start); > - } > - mutex_unlock(&buffer->lock); > -} > - > static int ion_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) > { > struct ion_buffer *buffer = vma->vm_private_data; > @@ -1014,16 +999,24 @@ static int ion_dma_buf_begin_cpu_access(struct > dma_buf *dmabuf, struct ion_buffer *buffer = dmabuf->priv; > void *vaddr; > > - if (!buffer->heap->ops->map_kernel) { > - pr_err("%s: map kernel is not implemented by this heap.\n", > - __func__); > - return -ENODEV; > + /* > + * TODO: Move this elsewhere because we don't always need a vaddr > + */ > + if (buffer->heap->ops->map_kernel) { > + mutex_lock(&buffer->lock); > + vaddr = ion_buffer_kmap_get(buffer); > + mutex_unlock(&buffer->lock); > } > > - mutex_lock(&buffer->lock); > - vaddr = ion_buffer_kmap_get(buffer); > - mutex_unlock(&buffer->lock); > - return PTR_ERR_OR_ZERO(vaddr); > + /* > + * Close enough right now? Flag to skip sync? > + */ > + if (!dma_map_sg(buffer->dev->dev.this_device, buffer->sg_table->sgl, > + buffer->sg_table->nents, > + DMA_BIDIRECTIONAL)) Aren't the dma_(un)map_* calls supposed to take a real, physical device as their first argument ? Beside, this doesn't seem to be the right place to create the mapping, as you mentioned in the commit message the buffer should be mapped in the dma_buf map handler. This is something that needs to be fixed, especially in the light of the comment in ion_buffer_create(): /* * this will set up dma addresses for the sglist -- it is not * technically correct as per the dma api -- a specific * device isn't really taking ownership here. However, in practice on * our systems the only dma_address space is physical addresses. * Additionally, we can't afford the overhead of invalidating every * allocation via dma_map_sg. The implicit contract here is that * memory coming from the heaps is ready for dma, ie if it has a * cached mapping that mapping has been invalidated */ That's a showstopper in my opinion, the DMA address space can't be restricted to physical addresses, IOMMU have to be supported. > + return -ENOMEM; > + > + return 0; > } > > static int ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf, > @@ -1031,9 +1024,15 @@ static int ion_dma_buf_end_cpu_access(struct dma_buf > *dmabuf, { > struct ion_buffer *buffer = dmabuf->priv; > > - mutex_lock(&buffer->lock); > - ion_buffer_kmap_put(buffer); > - mutex_unlock(&buffer->lock); > + if (buffer->heap->ops->map_kernel) { > + mutex_lock(&buffer->lock); > + ion_buffer_kmap_put(buffer); > + mutex_unlock(&buffer->lock); > + } > + > + dma_unmap_sg(buffer->dev->dev.this_device, buffer->sg_table->sgl, > + buffer->sg_table->nents, > + DMA_BIDIRECTIONAL); > > return 0; > } -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [RFC PATCH 04/12] staging: android: ion: Call dma_map_sg for syncing and mapping Date: Fri, 03 Mar 2017 18:37:47 +0200 Message-ID: <1842876.9VofhAIJSQ@avalon> References: <1488491084-17252-1-git-send-email-labbott@redhat.com> <1488491084-17252-5-git-send-email-labbott@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [IPv6:2001:4b98:dc2:45:216:3eff:febb:480d]) by gabe.freedesktop.org (Postfix) with ESMTPS id B30DB6ED84 for ; Fri, 3 Mar 2017 16:37:14 +0000 (UTC) In-Reply-To: <1488491084-17252-5-git-send-email-labbott@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: devel@driverdev.osuosl.org, romlem@google.com, Greg Kroah-Hartman , Riley Andrews , linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, arve@android.com, Mark Brown , Daniel Vetter , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org SGkgTGF1cmEsCgpUaGFuayB5b3UgZm9yIHRoZSBwYXRjaC4KCk9uIFRodXJzZGF5IDAyIE1hciAy MDE3IDEzOjQ0OjM2IExhdXJhIEFiYm90dCB3cm90ZToKPiBUZWNobmljYWxseSwgY2FsbGluZyBk bWFfYnVmX21hcF9hdHRhY2htZW50IHNob3VsZCByZXR1cm4gYSBidWZmZXIKPiBwcm9wZXJseSBk bWFfbWFwcGVkLiBBZGQgY2FsbHMgdG8gZG1hX21hcF9zZyB0byBiZWdpbl9jcHVfYWNjZXNzIHRv Cj4gZW5zdXJlIHRoaXMgaGFwcGVucy4gQXMgYSBzaWRlIGVmZmVjdCwgdGhpcyBsZXRzIElvbiBi dWZmZXJzIHRha2UKPiBhZHZhbnRhZ2Ugb2YgdGhlIGRtYV9idWYgc3luYyBpb2N0bHMuCj4gCj4g U2lnbmVkLW9mZi1ieTogTGF1cmEgQWJib3R0IDxsYWJib3R0QHJlZGhhdC5jb20+Cj4gLS0tCj4g IGRyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL2lvbi9pb24uYyB8IDEwMSArKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwg NTEgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lk L2lvbi9pb24uYwo+IGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbi5jIGluZGV4IGNl NGFkYWMuLmE5MzFiMzAgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9u L2lvbi5jCj4gKysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbi5jCj4gQEAgLTc5 NSwxMCArNzk1LDYgQEAgdm9pZCBpb25fY2xpZW50X2Rlc3Ryb3koc3RydWN0IGlvbl9jbGllbnQg KmNsaWVudCkKPiAgfQo+ICBFWFBPUlRfU1lNQk9MKGlvbl9jbGllbnRfZGVzdHJveSk7Cj4gCj4g LXN0YXRpYyB2b2lkIGlvbl9idWZmZXJfc3luY19mb3JfZGV2aWNlKHN0cnVjdCBpb25fYnVmZmVy ICpidWZmZXIsCj4gLQkJCQkgICAgICAgc3RydWN0IGRldmljZSAqZGV2LAo+IC0JCQkJICAgICAg IGVudW0gZG1hX2RhdGFfZGlyZWN0aW9uIGRpcmVjdGlvbik7Cj4gLQo+ICBzdGF0aWMgc3RydWN0 IHNnX3RhYmxlICpkdXBfc2dfdGFibGUoc3RydWN0IHNnX3RhYmxlICp0YWJsZSkKPiAgewo+ICAJ c3RydWN0IHNnX3RhYmxlICpuZXdfdGFibGU7Cj4gQEAgLTgyNSwyMiArODIxLDQzIEBAIHN0YXRp YyBzdHJ1Y3Qgc2dfdGFibGUgKmR1cF9zZ190YWJsZShzdHJ1Y3Qgc2dfdGFibGUKPiAqdGFibGUp IHJldHVybiBuZXdfdGFibGU7Cj4gIH0KPiAKPiArc3RhdGljIHZvaWQgZnJlZV9kdXBlZF90YWJs ZShzdHJ1Y3Qgc2dfdGFibGUgKnRhYmxlKQo+ICt7Cj4gKwlzZ19mcmVlX3RhYmxlKHRhYmxlKTsK PiArCWtmcmVlKHRhYmxlKTsKPiArfQo+ICsKPiAgc3RhdGljIHN0cnVjdCBzZ190YWJsZSAqaW9u X21hcF9kbWFfYnVmKHN0cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQKPiAqYXR0YWNobWVudCwgZW51 bSBkbWFfZGF0YV9kaXJlY3Rpb24gZGlyZWN0aW9uKQo+ICB7Cj4gIAlzdHJ1Y3QgZG1hX2J1ZiAq ZG1hYnVmID0gYXR0YWNobWVudC0+ZG1hYnVmOwo+ICAJc3RydWN0IGlvbl9idWZmZXIgKmJ1ZmZl ciA9IGRtYWJ1Zi0+cHJpdjsKPiArCXN0cnVjdCBzZ190YWJsZSAqdGFibGU7Cj4gKwlpbnQgcmV0 Owo+ICsKPiArCS8qCj4gKwkgKiBUT0RPOiBOZWVkIHRvIHN5bmMgd3J0IENQVSBvciBkZXZpY2Ug Y29tcGxldGVseSBvd25pbmc/Cj4gKwkgKi8KPiArCj4gKwl0YWJsZSA9IGR1cF9zZ190YWJsZShi dWZmZXItPnNnX3RhYmxlKTsKPiAKPiAtCWlvbl9idWZmZXJfc3luY19mb3JfZGV2aWNlKGJ1ZmZl ciwgYXR0YWNobWVudC0+ZGV2LCBkaXJlY3Rpb24pOwo+IC0JcmV0dXJuIGR1cF9zZ190YWJsZShi dWZmZXItPnNnX3RhYmxlKTsKPiArCWlmICghZG1hX21hcF9zZyhhdHRhY2htZW50LT5kZXYsIHRh YmxlLT5zZ2wsIHRhYmxlLT5uZW50cywKPiArCQkJZGlyZWN0aW9uKSl7Cj4gKwkJcmV0ID0gLUVO T01FTTsKPiArCQlnb3RvIGVycjsKPiArCX0KPiArCj4gK2VycjoKPiArCWZyZWVfZHVwZWRfdGFi bGUodGFibGUpOwo+ICsJcmV0dXJuIEVSUl9QVFIocmV0KTsKPiAgfQo+IAo+ICBzdGF0aWMgdm9p ZCBpb25fdW5tYXBfZG1hX2J1ZihzdHJ1Y3QgZG1hX2J1Zl9hdHRhY2htZW50ICphdHRhY2htZW50 LAo+ICAJCQkgICAgICBzdHJ1Y3Qgc2dfdGFibGUgKnRhYmxlLAo+ICAJCQkgICAgICBlbnVtIGRt YV9kYXRhX2RpcmVjdGlvbiBkaXJlY3Rpb24pCj4gIHsKPiAtCXNnX2ZyZWVfdGFibGUodGFibGUp Owo+IC0Ja2ZyZWUodGFibGUpOwo+ICsJZG1hX3VubWFwX3NnKGF0dGFjaG1lbnQtPmRldiwgdGFi bGUtPnNnbCwgdGFibGUtPm5lbnRzLCBkaXJlY3Rpb24pOwo+ICsJZnJlZV9kdXBlZF90YWJsZSh0 YWJsZSk7Cj4gIH0KPiAKPiAgdm9pZCBpb25fcGFnZXNfc3luY19mb3JfZGV2aWNlKHN0cnVjdCBk ZXZpY2UgKmRldiwgc3RydWN0IHBhZ2UgKnBhZ2UsCj4gQEAgLTg2NCwzOCArODgxLDYgQEAgc3Ry dWN0IGlvbl92bWFfbGlzdCB7Cj4gIAlzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYTsKPiAgfTsK PiAKPiAtc3RhdGljIHZvaWQgaW9uX2J1ZmZlcl9zeW5jX2Zvcl9kZXZpY2Uoc3RydWN0IGlvbl9i dWZmZXIgKmJ1ZmZlciwKPiAtCQkJCSAgICAgICBzdHJ1Y3QgZGV2aWNlICpkZXYsCj4gLQkJCQkg ICAgICAgZW51bSBkbWFfZGF0YV9kaXJlY3Rpb24gZGlyKQo+IC17Cj4gLQlzdHJ1Y3QgaW9uX3Zt YV9saXN0ICp2bWFfbGlzdDsKPiAtCWludCBwYWdlcyA9IFBBR0VfQUxJR04oYnVmZmVyLT5zaXpl KSAvIFBBR0VfU0laRTsKPiAtCWludCBpOwo+IC0KPiAtCXByX2RlYnVnKCIlczogc3luY2luZyBm b3IgZGV2aWNlICVzXG4iLCBfX2Z1bmNfXywKPiAtCQkgZGV2ID8gZGV2X25hbWUoZGV2KSA6ICJu dWxsIik7Cj4gLQo+IC0JaWYgKCFpb25fYnVmZmVyX2ZhdWx0X3VzZXJfbWFwcGluZ3MoYnVmZmVy KSkKPiAtCQlyZXR1cm47Cj4gLQo+IC0JbXV0ZXhfbG9jaygmYnVmZmVyLT5sb2NrKTsKPiAtCWZv ciAoaSA9IDA7IGkgPCBwYWdlczsgaSsrKSB7Cj4gLQkJc3RydWN0IHBhZ2UgKnBhZ2UgPSBidWZm ZXItPnBhZ2VzW2ldOwo+IC0KPiAtCQlpZiAoaW9uX2J1ZmZlcl9wYWdlX2lzX2RpcnR5KHBhZ2Up KQo+IC0JCQlpb25fcGFnZXNfc3luY19mb3JfZGV2aWNlKGRldiwgaW9uX2J1ZmZlcl9wYWdlKHBh Z2UpLAo+IC0JCQkJCQkgIFBBR0VfU0laRSwgZGlyKTsKPiAtCj4gLQkJaW9uX2J1ZmZlcl9wYWdl X2NsZWFuKGJ1ZmZlci0+cGFnZXMgKyBpKTsKPiAtCX0KPiAtCWxpc3RfZm9yX2VhY2hfZW50cnko dm1hX2xpc3QsICZidWZmZXItPnZtYXMsIGxpc3QpIHsKPiAtCQlzdHJ1Y3Qgdm1fYXJlYV9zdHJ1 Y3QgKnZtYSA9IHZtYV9saXN0LT52bWE7Cj4gLQo+IC0JCXphcF9wYWdlX3JhbmdlKHZtYSwgdm1h LT52bV9zdGFydCwgdm1hLT52bV9lbmQgLSB2bWEtCj52bV9zdGFydCk7Cj4gLQl9Cj4gLQltdXRl eF91bmxvY2soJmJ1ZmZlci0+bG9jayk7Cj4gLX0KPiAtCj4gIHN0YXRpYyBpbnQgaW9uX3ZtX2Zh dWx0KHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLCBzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKPiAg ewo+ICAJc3RydWN0IGlvbl9idWZmZXIgKmJ1ZmZlciA9IHZtYS0+dm1fcHJpdmF0ZV9kYXRhOwo+ IEBAIC0xMDE0LDE2ICs5OTksMjQgQEAgc3RhdGljIGludCBpb25fZG1hX2J1Zl9iZWdpbl9jcHVf YWNjZXNzKHN0cnVjdAo+IGRtYV9idWYgKmRtYWJ1Ziwgc3RydWN0IGlvbl9idWZmZXIgKmJ1ZmZl ciA9IGRtYWJ1Zi0+cHJpdjsKPiAgCXZvaWQgKnZhZGRyOwo+IAo+IC0JaWYgKCFidWZmZXItPmhl YXAtPm9wcy0+bWFwX2tlcm5lbCkgewo+IC0JCXByX2VycigiJXM6IG1hcCBrZXJuZWwgaXMgbm90 IGltcGxlbWVudGVkIGJ5IHRoaXMgaGVhcC5cbiIsCj4gLQkJICAgICAgIF9fZnVuY19fKTsKPiAt CQlyZXR1cm4gLUVOT0RFVjsKPiArCS8qCj4gKwkgKiBUT0RPOiBNb3ZlIHRoaXMgZWxzZXdoZXJl IGJlY2F1c2Ugd2UgZG9uJ3QgYWx3YXlzIG5lZWQgYSB2YWRkcgo+ICsJICovCj4gKwlpZiAoYnVm ZmVyLT5oZWFwLT5vcHMtPm1hcF9rZXJuZWwpIHsKPiArCQltdXRleF9sb2NrKCZidWZmZXItPmxv Y2spOwo+ICsJCXZhZGRyID0gaW9uX2J1ZmZlcl9rbWFwX2dldChidWZmZXIpOwo+ICsJCW11dGV4 X3VubG9jaygmYnVmZmVyLT5sb2NrKTsKPiAgCX0KPiAKPiAtCW11dGV4X2xvY2soJmJ1ZmZlci0+ bG9jayk7Cj4gLQl2YWRkciA9IGlvbl9idWZmZXJfa21hcF9nZXQoYnVmZmVyKTsKPiAtCW11dGV4 X3VubG9jaygmYnVmZmVyLT5sb2NrKTsKPiAtCXJldHVybiBQVFJfRVJSX09SX1pFUk8odmFkZHIp Owo+ICsJLyoKPiArCSAqIENsb3NlIGVub3VnaCByaWdodCBub3c/IEZsYWcgdG8gc2tpcCBzeW5j Pwo+ICsJICovCj4gKwlpZiAoIWRtYV9tYXBfc2coYnVmZmVyLT5kZXYtPmRldi50aGlzX2Rldmlj ZSwgYnVmZmVyLT5zZ190YWJsZS0+c2dsLAo+ICsJCQlidWZmZXItPnNnX3RhYmxlLT5uZW50cywK PiArICAgICAgICAgICAgICAgICAgICAgICAgRE1BX0JJRElSRUNUSU9OQUwpKQoKQXJlbid0IHRo ZSBkbWFfKHVuKW1hcF8qIGNhbGxzIHN1cHBvc2VkIHRvIHRha2UgYSByZWFsLCBwaHlzaWNhbCBk ZXZpY2UgYXMgCnRoZWlyIGZpcnN0IGFyZ3VtZW50ID8gQmVzaWRlLCB0aGlzIGRvZXNuJ3Qgc2Vl bSB0byBiZSB0aGUgcmlnaHQgcGxhY2UgdG8gCmNyZWF0ZSB0aGUgbWFwcGluZywgYXMgeW91IG1l bnRpb25lZCBpbiB0aGUgY29tbWl0IG1lc3NhZ2UgdGhlIGJ1ZmZlciBzaG91bGQgCmJlIG1hcHBl ZCBpbiB0aGUgZG1hX2J1ZiBtYXAgaGFuZGxlci4gVGhpcyBpcyBzb21ldGhpbmcgdGhhdCBuZWVk cyB0byBiZSAKZml4ZWQsIGVzcGVjaWFsbHkgaW4gdGhlIGxpZ2h0IG9mIHRoZSBjb21tZW50IGlu IGlvbl9idWZmZXJfY3JlYXRlKCk6CgogICAgICAgIC8qCiAgICAgICAgICogdGhpcyB3aWxsIHNl dCB1cCBkbWEgYWRkcmVzc2VzIGZvciB0aGUgc2dsaXN0IC0tIGl0IGlzIG5vdAogICAgICAgICAq IHRlY2huaWNhbGx5IGNvcnJlY3QgYXMgcGVyIHRoZSBkbWEgYXBpIC0tIGEgc3BlY2lmaWMKICAg ICAgICAgKiBkZXZpY2UgaXNuJ3QgcmVhbGx5IHRha2luZyBvd25lcnNoaXAgaGVyZS4gIEhvd2V2 ZXIsIGluIHByYWN0aWNlIG9uCiAgICAgICAgICogb3VyIHN5c3RlbXMgdGhlIG9ubHkgZG1hX2Fk ZHJlc3Mgc3BhY2UgaXMgcGh5c2ljYWwgYWRkcmVzc2VzLgogICAgICAgICAqIEFkZGl0aW9uYWxs eSwgd2UgY2FuJ3QgYWZmb3JkIHRoZSBvdmVyaGVhZCBvZiBpbnZhbGlkYXRpbmcgZXZlcnkKICAg ICAgICAgKiBhbGxvY2F0aW9uIHZpYSBkbWFfbWFwX3NnLiBUaGUgaW1wbGljaXQgY29udHJhY3Qg aGVyZSBpcyB0aGF0CiAgICAgICAgICogbWVtb3J5IGNvbWluZyBmcm9tIHRoZSBoZWFwcyBpcyBy ZWFkeSBmb3IgZG1hLCBpZSBpZiBpdCBoYXMgYQogICAgICAgICAqIGNhY2hlZCBtYXBwaW5nIHRo YXQgbWFwcGluZyBoYXMgYmVlbiBpbnZhbGlkYXRlZAogICAgICAgICAqLwoKVGhhdCdzIGEgc2hv d3N0b3BwZXIgaW4gbXkgb3BpbmlvbiwgdGhlIERNQSBhZGRyZXNzIHNwYWNlIGNhbid0IGJlIHJl c3RyaWN0ZWQgCnRvIHBoeXNpY2FsIGFkZHJlc3NlcywgSU9NTVUgaGF2ZSB0byBiZSBzdXBwb3J0 ZWQuCgo+ICsJCXJldHVybiAtRU5PTUVNOwo+ICsKPiArCXJldHVybiAwOwo+ICB9Cj4gCj4gIHN0 YXRpYyBpbnQgaW9uX2RtYV9idWZfZW5kX2NwdV9hY2Nlc3Moc3RydWN0IGRtYV9idWYgKmRtYWJ1 ZiwKPiBAQCAtMTAzMSw5ICsxMDI0LDE1IEBAIHN0YXRpYyBpbnQgaW9uX2RtYV9idWZfZW5kX2Nw dV9hY2Nlc3Moc3RydWN0IGRtYV9idWYKPiAqZG1hYnVmLCB7Cj4gIAlzdHJ1Y3QgaW9uX2J1ZmZl ciAqYnVmZmVyID0gZG1hYnVmLT5wcml2Owo+IAo+IC0JbXV0ZXhfbG9jaygmYnVmZmVyLT5sb2Nr KTsKPiAtCWlvbl9idWZmZXJfa21hcF9wdXQoYnVmZmVyKTsKPiAtCW11dGV4X3VubG9jaygmYnVm ZmVyLT5sb2NrKTsKPiArCWlmIChidWZmZXItPmhlYXAtPm9wcy0+bWFwX2tlcm5lbCkgewo+ICsJ CW11dGV4X2xvY2soJmJ1ZmZlci0+bG9jayk7Cj4gKwkJaW9uX2J1ZmZlcl9rbWFwX3B1dChidWZm ZXIpOwo+ICsJCW11dGV4X3VubG9jaygmYnVmZmVyLT5sb2NrKTsKPiArCX0KPiArCj4gKwlkbWFf dW5tYXBfc2coYnVmZmVyLT5kZXYtPmRldi50aGlzX2RldmljZSwgYnVmZmVyLT5zZ190YWJsZS0+ c2dsLAo+ICsJCQlidWZmZXItPnNnX3RhYmxlLT5uZW50cywKPiArCQkJRE1BX0JJRElSRUNUSU9O QUwpOwo+IAo+ICAJcmV0dXJuIDA7Cj4gIH0KCi0tIApSZWdhcmRzLAoKTGF1cmVudCBQaW5jaGFy dAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from galahad.ideasonboard.com ([185.26.127.97]:40402 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751571AbdCCQht (ORCPT ); Fri, 3 Mar 2017 11:37:49 -0500 From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Cc: Laura Abbott , Sumit Semwal , Riley Andrews , arve@android.com, devel@driverdev.osuosl.org, romlem@google.com, Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, Mark Brown , Daniel Vetter , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Subject: Re: [RFC PATCH 04/12] staging: android: ion: Call dma_map_sg for syncing and mapping Date: Fri, 03 Mar 2017 18:37:47 +0200 Message-ID: <1842876.9VofhAIJSQ@avalon> In-Reply-To: <1488491084-17252-5-git-send-email-labbott@redhat.com> References: <1488491084-17252-1-git-send-email-labbott@redhat.com> <1488491084-17252-5-git-send-email-labbott@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-media-owner@vger.kernel.org List-ID: Hi Laura, Thank you for the patch. On Thursday 02 Mar 2017 13:44:36 Laura Abbott wrote: > Technically, calling dma_buf_map_attachment should return a buffer > properly dma_mapped. Add calls to dma_map_sg to begin_cpu_access to > ensure this happens. As a side effect, this lets Ion buffers take > advantage of the dma_buf sync ioctls. > > Signed-off-by: Laura Abbott > --- > drivers/staging/android/ion/ion.c | 101 +++++++++++++++++------------------ > 1 file changed, 50 insertions(+), 51 deletions(-) > > diff --git a/drivers/staging/android/ion/ion.c > b/drivers/staging/android/ion/ion.c index ce4adac..a931b30 100644 > --- a/drivers/staging/android/ion/ion.c > +++ b/drivers/staging/android/ion/ion.c > @@ -795,10 +795,6 @@ void ion_client_destroy(struct ion_client *client) > } > EXPORT_SYMBOL(ion_client_destroy); > > -static void ion_buffer_sync_for_device(struct ion_buffer *buffer, > - struct device *dev, > - enum dma_data_direction direction); > - > static struct sg_table *dup_sg_table(struct sg_table *table) > { > struct sg_table *new_table; > @@ -825,22 +821,43 @@ static struct sg_table *dup_sg_table(struct sg_table > *table) return new_table; > } > > +static void free_duped_table(struct sg_table *table) > +{ > + sg_free_table(table); > + kfree(table); > +} > + > static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment > *attachment, enum dma_data_direction direction) > { > struct dma_buf *dmabuf = attachment->dmabuf; > struct ion_buffer *buffer = dmabuf->priv; > + struct sg_table *table; > + int ret; > + > + /* > + * TODO: Need to sync wrt CPU or device completely owning? > + */ > + > + table = dup_sg_table(buffer->sg_table); > > - ion_buffer_sync_for_device(buffer, attachment->dev, direction); > - return dup_sg_table(buffer->sg_table); > + if (!dma_map_sg(attachment->dev, table->sgl, table->nents, > + direction)){ > + ret = -ENOMEM; > + goto err; > + } > + > +err: > + free_duped_table(table); > + return ERR_PTR(ret); > } > > static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, > struct sg_table *table, > enum dma_data_direction direction) > { > - sg_free_table(table); > - kfree(table); > + dma_unmap_sg(attachment->dev, table->sgl, table->nents, direction); > + free_duped_table(table); > } > > void ion_pages_sync_for_device(struct device *dev, struct page *page, > @@ -864,38 +881,6 @@ struct ion_vma_list { > struct vm_area_struct *vma; > }; > > -static void ion_buffer_sync_for_device(struct ion_buffer *buffer, > - struct device *dev, > - enum dma_data_direction dir) > -{ > - struct ion_vma_list *vma_list; > - int pages = PAGE_ALIGN(buffer->size) / PAGE_SIZE; > - int i; > - > - pr_debug("%s: syncing for device %s\n", __func__, > - dev ? dev_name(dev) : "null"); > - > - if (!ion_buffer_fault_user_mappings(buffer)) > - return; > - > - mutex_lock(&buffer->lock); > - for (i = 0; i < pages; i++) { > - struct page *page = buffer->pages[i]; > - > - if (ion_buffer_page_is_dirty(page)) > - ion_pages_sync_for_device(dev, ion_buffer_page(page), > - PAGE_SIZE, dir); > - > - ion_buffer_page_clean(buffer->pages + i); > - } > - list_for_each_entry(vma_list, &buffer->vmas, list) { > - struct vm_area_struct *vma = vma_list->vma; > - > - zap_page_range(vma, vma->vm_start, vma->vm_end - vma- >vm_start); > - } > - mutex_unlock(&buffer->lock); > -} > - > static int ion_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) > { > struct ion_buffer *buffer = vma->vm_private_data; > @@ -1014,16 +999,24 @@ static int ion_dma_buf_begin_cpu_access(struct > dma_buf *dmabuf, struct ion_buffer *buffer = dmabuf->priv; > void *vaddr; > > - if (!buffer->heap->ops->map_kernel) { > - pr_err("%s: map kernel is not implemented by this heap.\n", > - __func__); > - return -ENODEV; > + /* > + * TODO: Move this elsewhere because we don't always need a vaddr > + */ > + if (buffer->heap->ops->map_kernel) { > + mutex_lock(&buffer->lock); > + vaddr = ion_buffer_kmap_get(buffer); > + mutex_unlock(&buffer->lock); > } > > - mutex_lock(&buffer->lock); > - vaddr = ion_buffer_kmap_get(buffer); > - mutex_unlock(&buffer->lock); > - return PTR_ERR_OR_ZERO(vaddr); > + /* > + * Close enough right now? Flag to skip sync? > + */ > + if (!dma_map_sg(buffer->dev->dev.this_device, buffer->sg_table->sgl, > + buffer->sg_table->nents, > + DMA_BIDIRECTIONAL)) Aren't the dma_(un)map_* calls supposed to take a real, physical device as their first argument ? Beside, this doesn't seem to be the right place to create the mapping, as you mentioned in the commit message the buffer should be mapped in the dma_buf map handler. This is something that needs to be fixed, especially in the light of the comment in ion_buffer_create(): /* * this will set up dma addresses for the sglist -- it is not * technically correct as per the dma api -- a specific * device isn't really taking ownership here. However, in practice on * our systems the only dma_address space is physical addresses. * Additionally, we can't afford the overhead of invalidating every * allocation via dma_map_sg. The implicit contract here is that * memory coming from the heaps is ready for dma, ie if it has a * cached mapping that mapping has been invalidated */ That's a showstopper in my opinion, the DMA address space can't be restricted to physical addresses, IOMMU have to be supported. > + return -ENOMEM; > + > + return 0; > } > > static int ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf, > @@ -1031,9 +1024,15 @@ static int ion_dma_buf_end_cpu_access(struct dma_buf > *dmabuf, { > struct ion_buffer *buffer = dmabuf->priv; > > - mutex_lock(&buffer->lock); > - ion_buffer_kmap_put(buffer); > - mutex_unlock(&buffer->lock); > + if (buffer->heap->ops->map_kernel) { > + mutex_lock(&buffer->lock); > + ion_buffer_kmap_put(buffer); > + mutex_unlock(&buffer->lock); > + } > + > + dma_unmap_sg(buffer->dev->dev.this_device, buffer->sg_table->sgl, > + buffer->sg_table->nents, > + DMA_BIDIRECTIONAL); > > return 0; > } -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f198.google.com (mail-wr0-f198.google.com [209.85.128.198]) by kanga.kvack.org (Postfix) with ESMTP id 4A8186B0038 for ; Fri, 3 Mar 2017 11:37:15 -0500 (EST) Received: by mail-wr0-f198.google.com with SMTP id u108so28432756wrb.3 for ; Fri, 03 Mar 2017 08:37:15 -0800 (PST) Received: from galahad.ideasonboard.com (galahad.ideasonboard.com. [2001:4b98:dc2:45:216:3eff:febb:480d]) by mx.google.com with ESMTPS id 6si13947wmj.135.2017.03.03.08.37.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 08:37:13 -0800 (PST) From: Laurent Pinchart Subject: Re: [RFC PATCH 04/12] staging: android: ion: Call dma_map_sg for syncing and mapping Date: Fri, 03 Mar 2017 18:37:47 +0200 Message-ID: <1842876.9VofhAIJSQ@avalon> In-Reply-To: <1488491084-17252-5-git-send-email-labbott@redhat.com> References: <1488491084-17252-1-git-send-email-labbott@redhat.com> <1488491084-17252-5-git-send-email-labbott@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: owner-linux-mm@kvack.org List-ID: To: dri-devel@lists.freedesktop.org Cc: Laura Abbott , Sumit Semwal , Riley Andrews , arve@android.com, devel@driverdev.osuosl.org, romlem@google.com, Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, linux-mm@kvack.org, Mark Brown , Daniel Vetter , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Hi Laura, Thank you for the patch. On Thursday 02 Mar 2017 13:44:36 Laura Abbott wrote: > Technically, calling dma_buf_map_attachment should return a buffer > properly dma_mapped. Add calls to dma_map_sg to begin_cpu_access to > ensure this happens. As a side effect, this lets Ion buffers take > advantage of the dma_buf sync ioctls. > > Signed-off-by: Laura Abbott > --- > drivers/staging/android/ion/ion.c | 101 +++++++++++++++++------------------ > 1 file changed, 50 insertions(+), 51 deletions(-) > > diff --git a/drivers/staging/android/ion/ion.c > b/drivers/staging/android/ion/ion.c index ce4adac..a931b30 100644 > --- a/drivers/staging/android/ion/ion.c > +++ b/drivers/staging/android/ion/ion.c > @@ -795,10 +795,6 @@ void ion_client_destroy(struct ion_client *client) > } > EXPORT_SYMBOL(ion_client_destroy); > > -static void ion_buffer_sync_for_device(struct ion_buffer *buffer, > - struct device *dev, > - enum dma_data_direction direction); > - > static struct sg_table *dup_sg_table(struct sg_table *table) > { > struct sg_table *new_table; > @@ -825,22 +821,43 @@ static struct sg_table *dup_sg_table(struct sg_table > *table) return new_table; > } > > +static void free_duped_table(struct sg_table *table) > +{ > + sg_free_table(table); > + kfree(table); > +} > + > static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment > *attachment, enum dma_data_direction direction) > { > struct dma_buf *dmabuf = attachment->dmabuf; > struct ion_buffer *buffer = dmabuf->priv; > + struct sg_table *table; > + int ret; > + > + /* > + * TODO: Need to sync wrt CPU or device completely owning? > + */ > + > + table = dup_sg_table(buffer->sg_table); > > - ion_buffer_sync_for_device(buffer, attachment->dev, direction); > - return dup_sg_table(buffer->sg_table); > + if (!dma_map_sg(attachment->dev, table->sgl, table->nents, > + direction)){ > + ret = -ENOMEM; > + goto err; > + } > + > +err: > + free_duped_table(table); > + return ERR_PTR(ret); > } > > static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, > struct sg_table *table, > enum dma_data_direction direction) > { > - sg_free_table(table); > - kfree(table); > + dma_unmap_sg(attachment->dev, table->sgl, table->nents, direction); > + free_duped_table(table); > } > > void ion_pages_sync_for_device(struct device *dev, struct page *page, > @@ -864,38 +881,6 @@ struct ion_vma_list { > struct vm_area_struct *vma; > }; > > -static void ion_buffer_sync_for_device(struct ion_buffer *buffer, > - struct device *dev, > - enum dma_data_direction dir) > -{ > - struct ion_vma_list *vma_list; > - int pages = PAGE_ALIGN(buffer->size) / PAGE_SIZE; > - int i; > - > - pr_debug("%s: syncing for device %s\n", __func__, > - dev ? dev_name(dev) : "null"); > - > - if (!ion_buffer_fault_user_mappings(buffer)) > - return; > - > - mutex_lock(&buffer->lock); > - for (i = 0; i < pages; i++) { > - struct page *page = buffer->pages[i]; > - > - if (ion_buffer_page_is_dirty(page)) > - ion_pages_sync_for_device(dev, ion_buffer_page(page), > - PAGE_SIZE, dir); > - > - ion_buffer_page_clean(buffer->pages + i); > - } > - list_for_each_entry(vma_list, &buffer->vmas, list) { > - struct vm_area_struct *vma = vma_list->vma; > - > - zap_page_range(vma, vma->vm_start, vma->vm_end - vma- >vm_start); > - } > - mutex_unlock(&buffer->lock); > -} > - > static int ion_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) > { > struct ion_buffer *buffer = vma->vm_private_data; > @@ -1014,16 +999,24 @@ static int ion_dma_buf_begin_cpu_access(struct > dma_buf *dmabuf, struct ion_buffer *buffer = dmabuf->priv; > void *vaddr; > > - if (!buffer->heap->ops->map_kernel) { > - pr_err("%s: map kernel is not implemented by this heap.\n", > - __func__); > - return -ENODEV; > + /* > + * TODO: Move this elsewhere because we don't always need a vaddr > + */ > + if (buffer->heap->ops->map_kernel) { > + mutex_lock(&buffer->lock); > + vaddr = ion_buffer_kmap_get(buffer); > + mutex_unlock(&buffer->lock); > } > > - mutex_lock(&buffer->lock); > - vaddr = ion_buffer_kmap_get(buffer); > - mutex_unlock(&buffer->lock); > - return PTR_ERR_OR_ZERO(vaddr); > + /* > + * Close enough right now? Flag to skip sync? > + */ > + if (!dma_map_sg(buffer->dev->dev.this_device, buffer->sg_table->sgl, > + buffer->sg_table->nents, > + DMA_BIDIRECTIONAL)) Aren't the dma_(un)map_* calls supposed to take a real, physical device as their first argument ? Beside, this doesn't seem to be the right place to create the mapping, as you mentioned in the commit message the buffer should be mapped in the dma_buf map handler. This is something that needs to be fixed, especially in the light of the comment in ion_buffer_create(): /* * this will set up dma addresses for the sglist -- it is not * technically correct as per the dma api -- a specific * device isn't really taking ownership here. However, in practice on * our systems the only dma_address space is physical addresses. * Additionally, we can't afford the overhead of invalidating every * allocation via dma_map_sg. The implicit contract here is that * memory coming from the heaps is ready for dma, ie if it has a * cached mapping that mapping has been invalidated */ That's a showstopper in my opinion, the DMA address space can't be restricted to physical addresses, IOMMU have to be supported. > + return -ENOMEM; > + > + return 0; > } > > static int ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf, > @@ -1031,9 +1024,15 @@ static int ion_dma_buf_end_cpu_access(struct dma_buf > *dmabuf, { > struct ion_buffer *buffer = dmabuf->priv; > > - mutex_lock(&buffer->lock); > - ion_buffer_kmap_put(buffer); > - mutex_unlock(&buffer->lock); > + if (buffer->heap->ops->map_kernel) { > + mutex_lock(&buffer->lock); > + ion_buffer_kmap_put(buffer); > + mutex_unlock(&buffer->lock); > + } > + > + dma_unmap_sg(buffer->dev->dev.this_device, buffer->sg_table->sgl, > + buffer->sg_table->nents, > + DMA_BIDIRECTIONAL); > > return 0; > } -- Regards, Laurent Pinchart -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org