From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752584AbeEQI0p (ORCPT ); Thu, 17 May 2018 04:26:45 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:33922 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752380AbeEQI0Q (ORCPT ); Thu, 17 May 2018 04:26:16 -0400 X-Google-Smtp-Source: AB8JxZo+Iuea9FcPU2N+thucNgE4w5FUWTF2enbNPbn5XFC7Fo0SAXgPwLixJDM+5lHjq0rr5gTQrw== From: Oleksandr Andrushchenko To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Cc: daniel.vetter@intel.com, andr2000@gmail.com, dongwon.kim@intel.com, matthew.d.roper@intel.com, Oleksandr Andrushchenko Subject: [Xen-devel][RFC 2/3] xen/grant-table: Extend API to work with DMA buffers Date: Thu, 17 May 2018 11:26:03 +0300 Message-Id: <20180517082604.14828-3-andr2000@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180517082604.14828-1-andr2000@gmail.com> References: <20180517082604.14828-1-andr2000@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oleksandr Andrushchenko Signed-off-by: Oleksandr Andrushchenko --- drivers/xen/grant-table.c | 49 +++++++++++++++++++++++++++++++++++++++ include/xen/grant_table.h | 7 ++++++ 2 files changed, 56 insertions(+) diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index bb36b1e1dbcc..c27bcc420575 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -729,6 +729,55 @@ void gnttab_free_pages(int nr_pages, struct page **pages) } EXPORT_SYMBOL(gnttab_free_pages); +int gnttab_dma_alloc_pages(struct device *dev, bool coherent, + int nr_pages, struct page **pages, + void **vaddr, dma_addr_t *dev_bus_addr) +{ + int i; + int ret; + + ret = alloc_dma_xenballooned_pages(dev, coherent, nr_pages, pages, + vaddr, dev_bus_addr); + if (ret < 0) + return ret; + + for (i = 0; i < nr_pages; i++) { +#if BITS_PER_LONG < 64 + struct xen_page_foreign *foreign; + + foreign = kzalloc(sizeof(*foreign), GFP_KERNEL); + if (!foreign) { + gnttab_dma_free_pages(dev, flags, nr_pages, pages, + *vaddr, *dev_bus_addr); + return -ENOMEM; + } + set_page_private(pages[i], (unsigned long)foreign); +#endif + SetPagePrivate(pages[i]); + } + return 0; +} +EXPORT_SYMBOL(gnttab_dma_alloc_pages); + +void gnttab_dma_free_pages(struct device *dev, bool coherent, + int nr_pages, struct page **pages, + void *vaddr, dma_addr_t dev_bus_addr) +{ + int i; + + for (i = 0; i < nr_pages; i++) { + if (PagePrivate(pages[i])) { +#if BITS_PER_LONG < 64 + kfree((void *)page_private(pages[i])); +#endif + ClearPagePrivate(pages[i]); + } + } + free_dma_xenballooned_pages(dev, coherent, nr_pages, pages, + vaddr, dev_bus_addr); +} +EXPORT_SYMBOL(gnttab_dma_free_pages); + /* Handling of paged out grant targets (GNTST_eagain) */ #define MAX_DELAY 256 static inline void diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h index 34b1379f9777..20ee2b5ba965 100644 --- a/include/xen/grant_table.h +++ b/include/xen/grant_table.h @@ -195,6 +195,13 @@ void gnttab_free_auto_xlat_frames(void); int gnttab_alloc_pages(int nr_pages, struct page **pages); void gnttab_free_pages(int nr_pages, struct page **pages); +int gnttab_dma_alloc_pages(struct device *dev, bool coherent, + int nr_pages, struct page **pages, + void **vaddr, dma_addr_t *dev_bus_addr); +void gnttab_dma_free_pages(struct device *dev, bool coherent, + int nr_pages, struct page **pages, + void *vaddr, dma_addr_t dev_bus_addr); + int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, struct gnttab_map_grant_ref *kmap_ops, struct page **pages, unsigned int count); -- 2.17.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleksandr Andrushchenko Subject: [Xen-devel][RFC 2/3] xen/grant-table: Extend API to work with DMA buffers Date: Thu, 17 May 2018 11:26:03 +0300 Message-ID: <20180517082604.14828-3-andr2000@gmail.com> References: <20180517082604.14828-1-andr2000@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 CEAC26E6D2 for ; Thu, 17 May 2018 08:26:16 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id r2-v6so7470536lff.4 for ; Thu, 17 May 2018 01:26:16 -0700 (PDT) In-Reply-To: <20180517082604.14828-1-andr2000@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Cc: andr2000@gmail.com, daniel.vetter@intel.com, dongwon.kim@intel.com, Oleksandr Andrushchenko List-Id: dri-devel@lists.freedesktop.org RnJvbTogT2xla3NhbmRyIEFuZHJ1c2hjaGVua28gPG9sZWtzYW5kcl9hbmRydXNoY2hlbmtvQGVw YW0uY29tPgoKU2lnbmVkLW9mZi1ieTogT2xla3NhbmRyIEFuZHJ1c2hjaGVua28gPG9sZWtzYW5k cl9hbmRydXNoY2hlbmtvQGVwYW0uY29tPgotLS0KIGRyaXZlcnMveGVuL2dyYW50LXRhYmxlLmMg fCA0OSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGluY2x1ZGUveGVu L2dyYW50X3RhYmxlLmggfCAgNyArKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNTYgaW5zZXJ0aW9u cygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMveGVuL2dyYW50LXRhYmxlLmMgYi9kcml2ZXJzL3hl bi9ncmFudC10YWJsZS5jCmluZGV4IGJiMzZiMWUxZGJjYy4uYzI3YmNjNDIwNTc1IDEwMDY0NAot LS0gYS9kcml2ZXJzL3hlbi9ncmFudC10YWJsZS5jCisrKyBiL2RyaXZlcnMveGVuL2dyYW50LXRh YmxlLmMKQEAgLTcyOSw2ICs3MjksNTUgQEAgdm9pZCBnbnR0YWJfZnJlZV9wYWdlcyhpbnQgbnJf cGFnZXMsIHN0cnVjdCBwYWdlICoqcGFnZXMpCiB9CiBFWFBPUlRfU1lNQk9MKGdudHRhYl9mcmVl X3BhZ2VzKTsKIAoraW50IGdudHRhYl9kbWFfYWxsb2NfcGFnZXMoc3RydWN0IGRldmljZSAqZGV2 LCBib29sIGNvaGVyZW50LAorCQkJICAgaW50IG5yX3BhZ2VzLCBzdHJ1Y3QgcGFnZSAqKnBhZ2Vz LAorCQkJICAgdm9pZCAqKnZhZGRyLCBkbWFfYWRkcl90ICpkZXZfYnVzX2FkZHIpCit7CisJaW50 IGk7CisJaW50IHJldDsKKworCXJldCA9IGFsbG9jX2RtYV94ZW5iYWxsb29uZWRfcGFnZXMoZGV2 LCBjb2hlcmVudCwgbnJfcGFnZXMsIHBhZ2VzLAorCQkJCQkgICB2YWRkciwgZGV2X2J1c19hZGRy KTsKKwlpZiAocmV0IDwgMCkKKwkJcmV0dXJuIHJldDsKKworCWZvciAoaSA9IDA7IGkgPCBucl9w YWdlczsgaSsrKSB7CisjaWYgQklUU19QRVJfTE9ORyA8IDY0CisJCXN0cnVjdCB4ZW5fcGFnZV9m b3JlaWduICpmb3JlaWduOworCisJCWZvcmVpZ24gPSBremFsbG9jKHNpemVvZigqZm9yZWlnbiks IEdGUF9LRVJORUwpOworCQlpZiAoIWZvcmVpZ24pIHsKKwkJCWdudHRhYl9kbWFfZnJlZV9wYWdl cyhkZXYsIGZsYWdzLCBucl9wYWdlcywgcGFnZXMsCisJCQkJCSAgICAgICp2YWRkciwgKmRldl9i dXNfYWRkcik7CisJCQlyZXR1cm4gLUVOT01FTTsKKwkJfQorCQlzZXRfcGFnZV9wcml2YXRlKHBh Z2VzW2ldLCAodW5zaWduZWQgbG9uZylmb3JlaWduKTsKKyNlbmRpZgorCQlTZXRQYWdlUHJpdmF0 ZShwYWdlc1tpXSk7CisJfQorCXJldHVybiAwOworfQorRVhQT1JUX1NZTUJPTChnbnR0YWJfZG1h X2FsbG9jX3BhZ2VzKTsKKwordm9pZCBnbnR0YWJfZG1hX2ZyZWVfcGFnZXMoc3RydWN0IGRldmlj ZSAqZGV2LCBib29sIGNvaGVyZW50LAorCQkJICAgaW50IG5yX3BhZ2VzLCBzdHJ1Y3QgcGFnZSAq KnBhZ2VzLAorCQkJICAgdm9pZCAqdmFkZHIsIGRtYV9hZGRyX3QgZGV2X2J1c19hZGRyKQorewor CWludCBpOworCisJZm9yIChpID0gMDsgaSA8IG5yX3BhZ2VzOyBpKyspIHsKKwkJaWYgKFBhZ2VQ cml2YXRlKHBhZ2VzW2ldKSkgeworI2lmIEJJVFNfUEVSX0xPTkcgPCA2NAorCQkJa2ZyZWUoKHZv aWQgKilwYWdlX3ByaXZhdGUocGFnZXNbaV0pKTsKKyNlbmRpZgorCQkJQ2xlYXJQYWdlUHJpdmF0 ZShwYWdlc1tpXSk7CisJCX0KKwl9CisJZnJlZV9kbWFfeGVuYmFsbG9vbmVkX3BhZ2VzKGRldiwg Y29oZXJlbnQsIG5yX3BhZ2VzLCBwYWdlcywKKwkJCQkgICAgdmFkZHIsIGRldl9idXNfYWRkcik7 Cit9CitFWFBPUlRfU1lNQk9MKGdudHRhYl9kbWFfZnJlZV9wYWdlcyk7CisKIC8qIEhhbmRsaW5n IG9mIHBhZ2VkIG91dCBncmFudCB0YXJnZXRzIChHTlRTVF9lYWdhaW4pICovCiAjZGVmaW5lIE1B WF9ERUxBWSAyNTYKIHN0YXRpYyBpbmxpbmUgdm9pZApkaWZmIC0tZ2l0IGEvaW5jbHVkZS94ZW4v Z3JhbnRfdGFibGUuaCBiL2luY2x1ZGUveGVuL2dyYW50X3RhYmxlLmgKaW5kZXggMzRiMTM3OWY5 Nzc3Li4yMGVlMmI1YmE5NjUgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUveGVuL2dyYW50X3RhYmxlLmgK KysrIGIvaW5jbHVkZS94ZW4vZ3JhbnRfdGFibGUuaApAQCAtMTk1LDYgKzE5NSwxMyBAQCB2b2lk IGdudHRhYl9mcmVlX2F1dG9feGxhdF9mcmFtZXModm9pZCk7CiBpbnQgZ250dGFiX2FsbG9jX3Bh Z2VzKGludCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdlcyk7CiB2b2lkIGdudHRhYl9mcmVl X3BhZ2VzKGludCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdlcyk7CiAKK2ludCBnbnR0YWJf ZG1hX2FsbG9jX3BhZ2VzKHN0cnVjdCBkZXZpY2UgKmRldiwgYm9vbCBjb2hlcmVudCwKKwkJCSAg IGludCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdlcywKKwkJCSAgIHZvaWQgKip2YWRkciwg ZG1hX2FkZHJfdCAqZGV2X2J1c19hZGRyKTsKK3ZvaWQgZ250dGFiX2RtYV9mcmVlX3BhZ2VzKHN0 cnVjdCBkZXZpY2UgKmRldiwgYm9vbCBjb2hlcmVudCwKKwkJCSAgIGludCBucl9wYWdlcywgc3Ry dWN0IHBhZ2UgKipwYWdlcywKKwkJCSAgIHZvaWQgKnZhZGRyLCBkbWFfYWRkcl90IGRldl9idXNf YWRkcik7CisKIGludCBnbnR0YWJfbWFwX3JlZnMoc3RydWN0IGdudHRhYl9tYXBfZ3JhbnRfcmVm ICptYXBfb3BzLAogCQkgICAgc3RydWN0IGdudHRhYl9tYXBfZ3JhbnRfcmVmICprbWFwX29wcywK IAkJICAgIHN0cnVjdCBwYWdlICoqcGFnZXMsIHVuc2lnbmVkIGludCBjb3VudCk7Ci0tIAoyLjE3 LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=