From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleksandr Andrushchenko Subject: [PATCH v2 2/9] xen/grant-table: Make set/clear page private code shared Date: Fri, 1 Jun 2018 14:41:25 +0300 Message-ID: <20180601114132.22596-3-andr2000@gmail.com> References: <20180601114132.22596-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-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B19D6E651 for ; Fri, 1 Jun 2018 11:41:44 +0000 (UTC) Received: by mail-lf0-x242.google.com with SMTP id d24-v6so14381757lfa.8 for ; Fri, 01 Jun 2018 04:41:44 -0700 (PDT) In-Reply-To: <20180601114132.22596-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 YW0uY29tPgoKTWFrZSBzZXQvY2xlYXIgcGFnZSBwcml2YXRlIGNvZGUgc2hhcmVkIGFuZCBhY2Nl c3NpYmxlIHRvCm90aGVyIGtlcm5lbCBtb2R1bGVzIHdoaWNoIGNhbiByZS11c2UgdGhlc2UgaW5z dGVhZCBvZiBvcGVuLWNvZGluZy4KClNpZ25lZC1vZmYtYnk6IE9sZWtzYW5kciBBbmRydXNoY2hl bmtvIDxvbGVrc2FuZHJfYW5kcnVzaGNoZW5rb0BlcGFtLmNvbT4KLS0tCiBkcml2ZXJzL3hlbi9n cmFudC10YWJsZS5jIHwgNTQgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t CiBpbmNsdWRlL3hlbi9ncmFudF90YWJsZS5oIHwgIDMgKysrCiAyIGZpbGVzIGNoYW5nZWQsIDM4 IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMveGVu L2dyYW50LXRhYmxlLmMgYi9kcml2ZXJzL3hlbi9ncmFudC10YWJsZS5jCmluZGV4IGJhMzZmZjNl NDkwMy4uZGJiNDhhODllOTg3IDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi9ncmFudC10YWJsZS5j CisrKyBiL2RyaXZlcnMveGVuL2dyYW50LXRhYmxlLmMKQEAgLTc2OSwyOSArNzY5LDE4IEBAIHZv aWQgZ250dGFiX2ZyZWVfYXV0b194bGF0X2ZyYW1lcyh2b2lkKQogfQogRVhQT1JUX1NZTUJPTF9H UEwoZ250dGFiX2ZyZWVfYXV0b194bGF0X2ZyYW1lcyk7CiAKLS8qKgotICogZ250dGFiX2FsbG9j X3BhZ2VzIC0gYWxsb2MgcGFnZXMgc3VpdGFibGUgZm9yIGdyYW50IG1hcHBpbmcgaW50bwotICog QG5yX3BhZ2VzOiBudW1iZXIgb2YgcGFnZXMgdG8gYWxsb2MKLSAqIEBwYWdlczogcmV0dXJucyB0 aGUgcGFnZXMKLSAqLwotaW50IGdudHRhYl9hbGxvY19wYWdlcyhpbnQgbnJfcGFnZXMsIHN0cnVj dCBwYWdlICoqcGFnZXMpCitpbnQgZ250dGFiX3BhZ2VzX3NldF9wcml2YXRlKGludCBucl9wYWdl cywgc3RydWN0IHBhZ2UgKipwYWdlcykKIHsKIAlpbnQgaTsKLQlpbnQgcmV0OwotCi0JcmV0ID0g YWxsb2NfeGVuYmFsbG9vbmVkX3BhZ2VzKG5yX3BhZ2VzLCBwYWdlcyk7Ci0JaWYgKHJldCA8IDAp Ci0JCXJldHVybiByZXQ7CiAKIAlmb3IgKGkgPSAwOyBpIDwgbnJfcGFnZXM7IGkrKykgewogI2lm IEJJVFNfUEVSX0xPTkcgPCA2NAogCQlzdHJ1Y3QgeGVuX3BhZ2VfZm9yZWlnbiAqZm9yZWlnbjsK IAogCQlmb3JlaWduID0ga3phbGxvYyhzaXplb2YoKmZvcmVpZ24pLCBHRlBfS0VSTkVMKTsKLQkJ aWYgKCFmb3JlaWduKSB7Ci0JCQlnbnR0YWJfZnJlZV9wYWdlcyhucl9wYWdlcywgcGFnZXMpOwor CQlpZiAoIWZvcmVpZ24pCiAJCQlyZXR1cm4gLUVOT01FTTsKLQkJfQorCiAJCXNldF9wYWdlX3By aXZhdGUocGFnZXNbaV0sICh1bnNpZ25lZCBsb25nKWZvcmVpZ24pOwogI2VuZGlmCiAJCVNldFBh Z2VQcml2YXRlKHBhZ2VzW2ldKTsKQEAgLTc5OSwxNCArNzg4LDMwIEBAIGludCBnbnR0YWJfYWxs b2NfcGFnZXMoaW50IG5yX3BhZ2VzLCBzdHJ1Y3QgcGFnZSAqKnBhZ2VzKQogCiAJcmV0dXJuIDA7 CiB9Ci1FWFBPUlRfU1lNQk9MX0dQTChnbnR0YWJfYWxsb2NfcGFnZXMpOworRVhQT1JUX1NZTUJP TF9HUEwoZ250dGFiX3BhZ2VzX3NldF9wcml2YXRlKTsKIAogLyoqCi0gKiBnbnR0YWJfZnJlZV9w YWdlcyAtIGZyZWUgcGFnZXMgYWxsb2NhdGVkIGJ5IGdudHRhYl9hbGxvY19wYWdlcygpCi0gKiBA bnJfcGFnZXM7IG51bWJlciBvZiBwYWdlcyB0byBmcmVlCi0gKiBAcGFnZXM6IHRoZSBwYWdlcwor ICogZ250dGFiX2FsbG9jX3BhZ2VzIC0gYWxsb2MgcGFnZXMgc3VpdGFibGUgZm9yIGdyYW50IG1h cHBpbmcgaW50bworICogQG5yX3BhZ2VzOiBudW1iZXIgb2YgcGFnZXMgdG8gYWxsb2MKKyAqIEBw YWdlczogcmV0dXJucyB0aGUgcGFnZXMKICAqLwotdm9pZCBnbnR0YWJfZnJlZV9wYWdlcyhpbnQg bnJfcGFnZXMsIHN0cnVjdCBwYWdlICoqcGFnZXMpCitpbnQgZ250dGFiX2FsbG9jX3BhZ2VzKGlu dCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdlcykKK3sKKwlpbnQgcmV0OworCisJcmV0ID0g YWxsb2NfeGVuYmFsbG9vbmVkX3BhZ2VzKG5yX3BhZ2VzLCBwYWdlcyk7CisJaWYgKHJldCA8IDAp CisJCXJldHVybiByZXQ7CisKKwlyZXQgPSBnbnR0YWJfcGFnZXNfc2V0X3ByaXZhdGUobnJfcGFn ZXMsIHBhZ2VzKTsKKwlpZiAocmV0IDwgMCkKKwkJZ250dGFiX2ZyZWVfcGFnZXMobnJfcGFnZXMs IHBhZ2VzKTsKKworCXJldHVybiByZXQ7Cit9CitFWFBPUlRfU1lNQk9MX0dQTChnbnR0YWJfYWxs b2NfcGFnZXMpOworCit2b2lkIGdudHRhYl9wYWdlc19jbGVhcl9wcml2YXRlKGludCBucl9wYWdl cywgc3RydWN0IHBhZ2UgKipwYWdlcykKIHsKIAlpbnQgaTsKIApAQCAtODE4LDYgKzgyMywxNyBA QCB2b2lkIGdudHRhYl9mcmVlX3BhZ2VzKGludCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdl cykKIAkJCUNsZWFyUGFnZVByaXZhdGUocGFnZXNbaV0pOwogCQl9CiAJfQorfQorRVhQT1JUX1NZ TUJPTF9HUEwoZ250dGFiX3BhZ2VzX2NsZWFyX3ByaXZhdGUpOworCisvKioKKyAqIGdudHRhYl9m cmVlX3BhZ2VzIC0gZnJlZSBwYWdlcyBhbGxvY2F0ZWQgYnkgZ250dGFiX2FsbG9jX3BhZ2VzKCkK KyAqIEBucl9wYWdlczsgbnVtYmVyIG9mIHBhZ2VzIHRvIGZyZWUKKyAqIEBwYWdlczogdGhlIHBh Z2VzCisgKi8KK3ZvaWQgZ250dGFiX2ZyZWVfcGFnZXMoaW50IG5yX3BhZ2VzLCBzdHJ1Y3QgcGFn ZSAqKnBhZ2VzKQoreworCWdudHRhYl9wYWdlc19jbGVhcl9wcml2YXRlKG5yX3BhZ2VzLCBwYWdl cyk7CiAJZnJlZV94ZW5iYWxsb29uZWRfcGFnZXMobnJfcGFnZXMsIHBhZ2VzKTsKIH0KIEVYUE9S VF9TWU1CT0xfR1BMKGdudHRhYl9mcmVlX3BhZ2VzKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUveGVu L2dyYW50X3RhYmxlLmggYi9pbmNsdWRlL3hlbi9ncmFudF90YWJsZS5oCmluZGV4IDJlMzc3NDFm NmI4ZC4uZGUwM2YyNTQyYmI3IDEwMDY0NAotLS0gYS9pbmNsdWRlL3hlbi9ncmFudF90YWJsZS5o CisrKyBiL2luY2x1ZGUveGVuL2dyYW50X3RhYmxlLmgKQEAgLTE5OCw2ICsxOTgsOSBAQCB2b2lk IGdudHRhYl9mcmVlX2F1dG9feGxhdF9mcmFtZXModm9pZCk7CiBpbnQgZ250dGFiX2FsbG9jX3Bh Z2VzKGludCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdlcyk7CiB2b2lkIGdudHRhYl9mcmVl X3BhZ2VzKGludCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdlcyk7CiAKK2ludCBnbnR0YWJf cGFnZXNfc2V0X3ByaXZhdGUoaW50IG5yX3BhZ2VzLCBzdHJ1Y3QgcGFnZSAqKnBhZ2VzKTsKK3Zv aWQgZ250dGFiX3BhZ2VzX2NsZWFyX3ByaXZhdGUoaW50IG5yX3BhZ2VzLCBzdHJ1Y3QgcGFnZSAq KnBhZ2VzKTsKKwogaW50IGdudHRhYl9tYXBfcmVmcyhzdHJ1Y3QgZ250dGFiX21hcF9ncmFudF9y ZWYgKm1hcF9vcHMsCiAJCSAgICBzdHJ1Y3QgZ250dGFiX21hcF9ncmFudF9yZWYgKmttYXBfb3Bz LAogCQkgICAgc3RydWN0IHBhZ2UgKipwYWdlcywgdW5zaWduZWQgaW50IGNvdW50KTsKLS0gCjIu MTcuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lf0-f68.google.com ([209.85.215.68]:43549 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751092AbeFALlo (ORCPT ); Fri, 1 Jun 2018 07:41:44 -0400 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: [PATCH v2 2/9] xen/grant-table: Make set/clear page private code shared Date: Fri, 1 Jun 2018 14:41:25 +0300 Message-Id: <20180601114132.22596-3-andr2000@gmail.com> In-Reply-To: <20180601114132.22596-1-andr2000@gmail.com> References: <20180601114132.22596-1-andr2000@gmail.com> Sender: linux-media-owner@vger.kernel.org List-ID: From: Oleksandr Andrushchenko Make set/clear page private code shared and accessible to other kernel modules which can re-use these instead of open-coding. Signed-off-by: Oleksandr Andrushchenko --- drivers/xen/grant-table.c | 54 +++++++++++++++++++++++++-------------- include/xen/grant_table.h | 3 +++ 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index ba36ff3e4903..dbb48a89e987 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -769,29 +769,18 @@ void gnttab_free_auto_xlat_frames(void) } EXPORT_SYMBOL_GPL(gnttab_free_auto_xlat_frames); -/** - * gnttab_alloc_pages - alloc pages suitable for grant mapping into - * @nr_pages: number of pages to alloc - * @pages: returns the pages - */ -int gnttab_alloc_pages(int nr_pages, struct page **pages) +int gnttab_pages_set_private(int nr_pages, struct page **pages) { int i; - int ret; - - ret = alloc_xenballooned_pages(nr_pages, pages); - 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_free_pages(nr_pages, pages); + if (!foreign) return -ENOMEM; - } + set_page_private(pages[i], (unsigned long)foreign); #endif SetPagePrivate(pages[i]); @@ -799,14 +788,30 @@ int gnttab_alloc_pages(int nr_pages, struct page **pages) return 0; } -EXPORT_SYMBOL_GPL(gnttab_alloc_pages); +EXPORT_SYMBOL_GPL(gnttab_pages_set_private); /** - * gnttab_free_pages - free pages allocated by gnttab_alloc_pages() - * @nr_pages; number of pages to free - * @pages: the pages + * gnttab_alloc_pages - alloc pages suitable for grant mapping into + * @nr_pages: number of pages to alloc + * @pages: returns the pages */ -void gnttab_free_pages(int nr_pages, struct page **pages) +int gnttab_alloc_pages(int nr_pages, struct page **pages) +{ + int ret; + + ret = alloc_xenballooned_pages(nr_pages, pages); + if (ret < 0) + return ret; + + ret = gnttab_pages_set_private(nr_pages, pages); + if (ret < 0) + gnttab_free_pages(nr_pages, pages); + + return ret; +} +EXPORT_SYMBOL_GPL(gnttab_alloc_pages); + +void gnttab_pages_clear_private(int nr_pages, struct page **pages) { int i; @@ -818,6 +823,17 @@ void gnttab_free_pages(int nr_pages, struct page **pages) ClearPagePrivate(pages[i]); } } +} +EXPORT_SYMBOL_GPL(gnttab_pages_clear_private); + +/** + * gnttab_free_pages - free pages allocated by gnttab_alloc_pages() + * @nr_pages; number of pages to free + * @pages: the pages + */ +void gnttab_free_pages(int nr_pages, struct page **pages) +{ + gnttab_pages_clear_private(nr_pages, pages); free_xenballooned_pages(nr_pages, pages); } EXPORT_SYMBOL_GPL(gnttab_free_pages); diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h index 2e37741f6b8d..de03f2542bb7 100644 --- a/include/xen/grant_table.h +++ b/include/xen/grant_table.h @@ -198,6 +198,9 @@ 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_pages_set_private(int nr_pages, struct page **pages); +void gnttab_pages_clear_private(int nr_pages, struct page **pages); + 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