From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965035AbeE3Grw (ORCPT ); Wed, 30 May 2018 02:47:52 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:44211 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935905AbeE3Gru (ORCPT ); Wed, 30 May 2018 02:47:50 -0400 X-Google-Smtp-Source: ADUXVKJFwoYNbQJidEAL0X6Mpo7iHSbSafD0yKFP0f1beLtmKDCCs3W6ogij9H4pCV/wmNcwAexIIA== Subject: Re: [PATCH 4/8] xen/gntdev: Allow mappings for DMA buffers To: Boris Ostrovsky , xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, jgross@suse.com, konrad.wilk@oracle.com Cc: daniel.vetter@intel.com, dongwon.kim@intel.com, matthew.d.roper@intel.com, Oleksandr Andrushchenko References: <20180525153331.31188-1-andr2000@gmail.com> <20180525153331.31188-5-andr2000@gmail.com> <9f2999a8-7786-5811-bdf0-ff7f30301cf2@oracle.com> From: Oleksandr Andrushchenko Message-ID: Date: Wed, 30 May 2018 09:47:46 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <9f2999a8-7786-5811-bdf0-ff7f30301cf2@oracle.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/30/2018 12:52 AM, Boris Ostrovsky wrote: > On 05/25/2018 11:33 AM, Oleksandr Andrushchenko wrote: >> >> struct unmap_notify { >> @@ -96,10 +104,28 @@ struct grant_map { >> struct gnttab_unmap_grant_ref *kunmap_ops; >> struct page **pages; >> unsigned long pages_vm_start; >> + >> +#ifdef CONFIG_XEN_GRANT_DMA_ALLOC >> + /* >> + * If dmabuf_vaddr is not NULL then this mapping is backed by DMA >> + * capable memory. >> + */ >> + >> + /* Device for which DMA memory is allocated. */ >> + struct device *dma_dev; >> + /* Flags used to create this DMA buffer: GNTDEV_DMABUF_FLAG_XXX. */ >> + bool dma_flags; > Again, I think most of the comments here can be dropped. Except possibly > for the flags. will drop most of those >> + /* Virtual/CPU address of the DMA buffer. */ >> + void *dma_vaddr; >> + /* Bus address of the DMA buffer. */ >> + dma_addr_t dma_bus_addr; >> +#endif >> }; >> >> static int unmap_grant_pages(struct grant_map *map, int offset, int pages); >> >> +static struct miscdevice gntdev_miscdev; >> + >> /* ------------------------------------------------------------------ */ >> >> static void gntdev_print_maps(struct gntdev_priv *priv, >> @@ -121,8 +147,26 @@ static void gntdev_free_map(struct grant_map *map) >> if (map == NULL) >> return; >> >> +#ifdef CONFIG_XEN_GRANT_DMA_ALLOC >> + if (map->dma_vaddr) { >> + struct gnttab_dma_alloc_args args; >> + >> + args.dev = map->dma_dev; >> + args.coherent = map->dma_flags & GNTDEV_DMA_FLAG_COHERENT; >> + args.nr_pages = map->count; >> + args.pages = map->pages; >> + args.vaddr = map->dma_vaddr; >> + args.dev_bus_addr = map->dma_bus_addr; >> + >> + gnttab_dma_free_pages(&args); >> + } else if (map->pages) { >> + gnttab_free_pages(map->count, map->pages); >> + } >> +#else >> if (map->pages) >> gnttab_free_pages(map->count, map->pages); >> +#endif >> + > } else > #endif >     if (map->pages) >         gnttab_free_pages(map->count, map->pages); > > > (and elsewhere) ok, just wasn't sure if it is ok to violate kernel coding style here ;) >> kfree(map->pages); >> kfree(map->grants); >> kfree(map->map_ops); > > >> >> diff --git a/include/uapi/xen/gntdev.h b/include/uapi/xen/gntdev.h >> index 6d1163456c03..2d5a4672f07c 100644 >> --- a/include/uapi/xen/gntdev.h >> +++ b/include/uapi/xen/gntdev.h >> @@ -200,4 +200,19 @@ struct ioctl_gntdev_grant_copy { >> /* Send an interrupt on the indicated event channel */ >> #define UNMAP_NOTIFY_SEND_EVENT 0x2 >> >> +/* >> + * Flags to be used while requesting memory mapping's backing storage >> + * to be allocated with DMA API. >> + */ >> + >> +/* >> + * The buffer is backed with memory allocated with dma_alloc_wc. >> + */ >> +#define GNTDEV_DMA_FLAG_WC (1 << 1) > > Is there a reason you are not using bit 0? No reason for that, will start from 0 > > -boris Thank you, Oleksandr >> + >> +/* >> + * The buffer is backed with memory allocated with dma_alloc_coherent. >> + */ >> +#define GNTDEV_DMA_FLAG_COHERENT (1 << 2) >> + >> #endif /* __LINUX_PUBLIC_GNTDEV_H__ */ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleksandr Andrushchenko Subject: Re: [PATCH 4/8] xen/gntdev: Allow mappings for DMA buffers Date: Wed, 30 May 2018 09:47:46 +0300 Message-ID: References: <20180525153331.31188-1-andr2000@gmail.com> <20180525153331.31188-5-andr2000@gmail.com> <9f2999a8-7786-5811-bdf0-ff7f30301cf2@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3E3EF6F186 for ; Wed, 30 May 2018 06:47:50 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id u4-v6so2520886lff.3 for ; Tue, 29 May 2018 23:47:50 -0700 (PDT) In-Reply-To: <9f2999a8-7786-5811-bdf0-ff7f30301cf2@oracle.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Boris Ostrovsky , xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, jgross@suse.com, konrad.wilk@oracle.com Cc: daniel.vetter@intel.com, dongwon.kim@intel.com, Oleksandr Andrushchenko List-Id: dri-devel@lists.freedesktop.org T24gMDUvMzAvMjAxOCAxMjo1MiBBTSwgQm9yaXMgT3N0cm92c2t5IHdyb3RlOgo+IE9uIDA1LzI1 LzIwMTggMTE6MzMgQU0sIE9sZWtzYW5kciBBbmRydXNoY2hlbmtvIHdyb3RlOgo+PiAgIAo+PiAg IHN0cnVjdCB1bm1hcF9ub3RpZnkgewo+PiBAQCAtOTYsMTAgKzEwNCwyOCBAQCBzdHJ1Y3QgZ3Jh bnRfbWFwIHsKPj4gICAJc3RydWN0IGdudHRhYl91bm1hcF9ncmFudF9yZWYgKmt1bm1hcF9vcHM7 Cj4+ICAgCXN0cnVjdCBwYWdlICoqcGFnZXM7Cj4+ICAgCXVuc2lnbmVkIGxvbmcgcGFnZXNfdm1f c3RhcnQ7Cj4+ICsKPj4gKyNpZmRlZiBDT05GSUdfWEVOX0dSQU5UX0RNQV9BTExPQwo+PiArCS8q Cj4+ICsJICogSWYgZG1hYnVmX3ZhZGRyIGlzIG5vdCBOVUxMIHRoZW4gdGhpcyBtYXBwaW5nIGlz IGJhY2tlZCBieSBETUEKPj4gKwkgKiBjYXBhYmxlIG1lbW9yeS4KPj4gKwkgKi8KPj4gKwo+PiAr CS8qIERldmljZSBmb3Igd2hpY2ggRE1BIG1lbW9yeSBpcyBhbGxvY2F0ZWQuICovCj4+ICsJc3Ry dWN0IGRldmljZSAqZG1hX2RldjsKPj4gKwkvKiBGbGFncyB1c2VkIHRvIGNyZWF0ZSB0aGlzIERN QSBidWZmZXI6IEdOVERFVl9ETUFCVUZfRkxBR19YWFguICovCj4+ICsJYm9vbCBkbWFfZmxhZ3M7 Cj4gQWdhaW4sIEkgdGhpbmsgbW9zdCBvZiB0aGUgY29tbWVudHMgaGVyZSBjYW4gYmUgZHJvcHBl ZC4gRXhjZXB0IHBvc3NpYmx5Cj4gZm9yIHRoZSBmbGFncy4Kd2lsbCBkcm9wIG1vc3Qgb2YgdGhv c2UKPj4gKwkvKiBWaXJ0dWFsL0NQVSBhZGRyZXNzIG9mIHRoZSBETUEgYnVmZmVyLiAqLwo+PiAr CXZvaWQgKmRtYV92YWRkcjsKPj4gKwkvKiBCdXMgYWRkcmVzcyBvZiB0aGUgRE1BIGJ1ZmZlci4g Ki8KPj4gKwlkbWFfYWRkcl90IGRtYV9idXNfYWRkcjsKPj4gKyNlbmRpZgo+PiAgIH07Cj4+ICAg Cj4+ICAgc3RhdGljIGludCB1bm1hcF9ncmFudF9wYWdlcyhzdHJ1Y3QgZ3JhbnRfbWFwICptYXAs IGludCBvZmZzZXQsIGludCBwYWdlcyk7Cj4+ICAgCj4+ICtzdGF0aWMgc3RydWN0IG1pc2NkZXZp Y2UgZ250ZGV2X21pc2NkZXY7Cj4+ICsKPj4gICAvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKi8KPj4gICAKPj4gICBz dGF0aWMgdm9pZCBnbnRkZXZfcHJpbnRfbWFwcyhzdHJ1Y3QgZ250ZGV2X3ByaXYgKnByaXYsCj4+ IEBAIC0xMjEsOCArMTQ3LDI2IEBAIHN0YXRpYyB2b2lkIGdudGRldl9mcmVlX21hcChzdHJ1Y3Qg Z3JhbnRfbWFwICptYXApCj4+ICAgCWlmIChtYXAgPT0gTlVMTCkKPj4gICAJCXJldHVybjsKPj4g ICAKPj4gKyNpZmRlZiBDT05GSUdfWEVOX0dSQU5UX0RNQV9BTExPQwo+PiArCWlmIChtYXAtPmRt YV92YWRkcikgewo+PiArCQlzdHJ1Y3QgZ250dGFiX2RtYV9hbGxvY19hcmdzIGFyZ3M7Cj4+ICsK Pj4gKwkJYXJncy5kZXYgPSBtYXAtPmRtYV9kZXY7Cj4+ICsJCWFyZ3MuY29oZXJlbnQgPSBtYXAt PmRtYV9mbGFncyAmIEdOVERFVl9ETUFfRkxBR19DT0hFUkVOVDsKPj4gKwkJYXJncy5ucl9wYWdl cyA9IG1hcC0+Y291bnQ7Cj4+ICsJCWFyZ3MucGFnZXMgPSBtYXAtPnBhZ2VzOwo+PiArCQlhcmdz LnZhZGRyID0gbWFwLT5kbWFfdmFkZHI7Cj4+ICsJCWFyZ3MuZGV2X2J1c19hZGRyID0gbWFwLT5k bWFfYnVzX2FkZHI7Cj4+ICsKPj4gKwkJZ250dGFiX2RtYV9mcmVlX3BhZ2VzKCZhcmdzKTsKPj4g Kwl9IGVsc2UgaWYgKG1hcC0+cGFnZXMpIHsKPj4gKwkJZ250dGFiX2ZyZWVfcGFnZXMobWFwLT5j b3VudCwgbWFwLT5wYWdlcyk7Cj4+ICsJfQo+PiArI2Vsc2UKPj4gICAJaWYgKG1hcC0+cGFnZXMp Cj4+ICAgCQlnbnR0YWJfZnJlZV9wYWdlcyhtYXAtPmNvdW50LCBtYXAtPnBhZ2VzKTsKPj4gKyNl bmRpZgo+PiArCj4gfSBlbHNlCj4gI2VuZGlmCj4gIMKgwqDCoCBpZiAobWFwLT5wYWdlcykKPiAg wqDCoMKgIMKgwqDCoCBnbnR0YWJfZnJlZV9wYWdlcyhtYXAtPmNvdW50LCBtYXAtPnBhZ2VzKTsK Pgo+Cj4gKGFuZCBlbHNld2hlcmUpCm9rLCBqdXN0IHdhc24ndCBzdXJlIGlmIGl0IGlzIG9rIHRv IHZpb2xhdGUga2VybmVsIGNvZGluZyBzdHlsZSBoZXJlIDspCj4+ICAgCWtmcmVlKG1hcC0+cGFn ZXMpOwo+PiAgIAlrZnJlZShtYXAtPmdyYW50cyk7Cj4+ICAgCWtmcmVlKG1hcC0+bWFwX29wcyk7 Cj4KPgo+PiAgIAo+PiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL3hlbi9nbnRkZXYuaCBiL2lu Y2x1ZGUvdWFwaS94ZW4vZ250ZGV2LmgKPj4gaW5kZXggNmQxMTYzNDU2YzAzLi4yZDVhNDY3MmYw N2MgMTAwNjQ0Cj4+IC0tLSBhL2luY2x1ZGUvdWFwaS94ZW4vZ250ZGV2LmgKPj4gKysrIGIvaW5j bHVkZS91YXBpL3hlbi9nbnRkZXYuaAo+PiBAQCAtMjAwLDQgKzIwMCwxOSBAQCBzdHJ1Y3QgaW9j dGxfZ250ZGV2X2dyYW50X2NvcHkgewo+PiAgIC8qIFNlbmQgYW4gaW50ZXJydXB0IG9uIHRoZSBp bmRpY2F0ZWQgZXZlbnQgY2hhbm5lbCAqLwo+PiAgICNkZWZpbmUgVU5NQVBfTk9USUZZX1NFTkRf RVZFTlQgMHgyCj4+ICAgCj4+ICsvKgo+PiArICogRmxhZ3MgdG8gYmUgdXNlZCB3aGlsZSByZXF1 ZXN0aW5nIG1lbW9yeSBtYXBwaW5nJ3MgYmFja2luZyBzdG9yYWdlCj4+ICsgKiB0byBiZSBhbGxv Y2F0ZWQgd2l0aCBETUEgQVBJLgo+PiArICovCj4+ICsKPj4gKy8qCj4+ICsgKiBUaGUgYnVmZmVy IGlzIGJhY2tlZCB3aXRoIG1lbW9yeSBhbGxvY2F0ZWQgd2l0aCBkbWFfYWxsb2Nfd2MuCj4+ICsg Ki8KPj4gKyNkZWZpbmUgR05UREVWX0RNQV9GTEFHX1dDCQkoMSA8PCAxKQo+Cj4gSXMgdGhlcmUg YSByZWFzb24geW91IGFyZSBub3QgdXNpbmcgYml0IDA/Ck5vIHJlYXNvbiBmb3IgdGhhdCwgd2ls bCBzdGFydCBmcm9tIDAKPgo+IC1ib3JpcwpUaGFuayB5b3UsCk9sZWtzYW5kcgo+PiArCj4+ICsv Kgo+PiArICogVGhlIGJ1ZmZlciBpcyBiYWNrZWQgd2l0aCBtZW1vcnkgYWxsb2NhdGVkIHdpdGgg ZG1hX2FsbG9jX2NvaGVyZW50Lgo+PiArICovCj4+ICsjZGVmaW5lIEdOVERFVl9ETUFfRkxBR19D T0hFUkVOVAkoMSA8PCAyKQo+PiArCj4+ICAgI2VuZGlmIC8qIF9fTElOVVhfUFVCTElDX0dOVERF Vl9IX18gKi8KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=