From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967018AbeEYPfb (ORCPT ); Fri, 25 May 2018 11:35:31 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:44658 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965440AbeEYPdp (ORCPT ); Fri, 25 May 2018 11:33:45 -0400 X-Google-Smtp-Source: ADUXVKJkzcr9DVF+ZtR81ebdf+idWk38h2S8frl4XjH0ooCGRY/ru757chaGgR1fuCB3Rha2J882tw== 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 1/8] xen/grant-table: Make set/clear page private code shared Date: Fri, 25 May 2018 18:33:24 +0300 Message-Id: <20180525153331.31188-2-andr2000@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180525153331.31188-1-andr2000@gmail.com> References: <20180525153331.31188-1-andr2000@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 27be107d6480..d7488226e1f2 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(gnttab_alloc_pages); +EXPORT_SYMBOL(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(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(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(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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleksandr Andrushchenko Subject: [PATCH 1/8] xen/grant-table: Make set/clear page private code shared Date: Fri, 25 May 2018 18:33:24 +0300 Message-ID: <20180525153331.31188-2-andr2000@gmail.com> References: <20180525153331.31188-1-andr2000@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F0FE6E94D for ; Fri, 25 May 2018 15:33:45 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id a15-v6so9958521wrm.0 for ; Fri, 25 May 2018 08:33:45 -0700 (PDT) In-Reply-To: <20180525153331.31188-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 L2dyYW50LXRhYmxlLmMgYi9kcml2ZXJzL3hlbi9ncmFudC10YWJsZS5jCmluZGV4IDI3YmUxMDdk NjQ4MC4uZDc0ODgyMjZlMWYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi9ncmFudC10YWJsZS5j CisrKyBiL2RyaXZlcnMveGVuL2dyYW50LXRhYmxlLmMKQEAgLTc2OSwyOSArNzY5LDE4IEBAIHZv aWQgZ250dGFiX2ZyZWVfYXV0b194bGF0X2ZyYW1lcyh2b2lkKQogfQogRVhQT1JUX1NZTUJPTF9H UEwoZ250dGFiX2ZyZWVfYXV0b194bGF0X2ZyYW1lcyk7CiAKLS8qKgotICogZ250dGFiX2FsbG9j X3BhZ2VzIC0gYWxsb2MgcGFnZXMgc3VpdGFibGUgZm9yIGdyYW50IG1hcHBpbmcgaW50bwotICog QG5yX3BhZ2VzOiBudW1iZXIgb2YgcGFnZXMgdG8gYWxsb2MKLSAqIEBwYWdlczogcmV0dXJucyB0 aGUgcGFnZXMKLSAqLwotaW50IGdudHRhYl9hbGxvY19wYWdlcyhpbnQgbnJfcGFnZXMsIHN0cnVj dCBwYWdlICoqcGFnZXMpCitpbnQgZ250dGFiX3BhZ2VzX3NldF9wcml2YXRlKGludCBucl9wYWdl cywgc3RydWN0IHBhZ2UgKipwYWdlcykKIHsKIAlpbnQgaTsKLQlpbnQgcmV0OwotCi0JcmV0ID0g YWxsb2NfeGVuYmFsbG9vbmVkX3BhZ2VzKG5yX3BhZ2VzLCBwYWdlcyk7Ci0JaWYgKHJldCA8IDAp Ci0JCXJldHVybiByZXQ7CiAKIAlmb3IgKGkgPSAwOyBpIDwgbnJfcGFnZXM7IGkrKykgewogI2lm IEJJVFNfUEVSX0xPTkcgPCA2NAogCQlzdHJ1Y3QgeGVuX3BhZ2VfZm9yZWlnbiAqZm9yZWlnbjsK IAogCQlmb3JlaWduID0ga3phbGxvYyhzaXplb2YoKmZvcmVpZ24pLCBHRlBfS0VSTkVMKTsKLQkJ aWYgKCFmb3JlaWduKSB7Ci0JCQlnbnR0YWJfZnJlZV9wYWdlcyhucl9wYWdlcywgcGFnZXMpOwor CQlpZiAoIWZvcmVpZ24pCiAJCQlyZXR1cm4gLUVOT01FTTsKLQkJfQorCiAJCXNldF9wYWdlX3By aXZhdGUocGFnZXNbaV0sICh1bnNpZ25lZCBsb25nKWZvcmVpZ24pOwogI2VuZGlmCiAJCVNldFBh Z2VQcml2YXRlKHBhZ2VzW2ldKTsKQEAgLTc5OSwxNCArNzg4LDMwIEBAIGludCBnbnR0YWJfYWxs b2NfcGFnZXMoaW50IG5yX3BhZ2VzLCBzdHJ1Y3QgcGFnZSAqKnBhZ2VzKQogCiAJcmV0dXJuIDA7 CiB9Ci1FWFBPUlRfU1lNQk9MKGdudHRhYl9hbGxvY19wYWdlcyk7CitFWFBPUlRfU1lNQk9MKGdu dHRhYl9wYWdlc19zZXRfcHJpdmF0ZSk7CiAKIC8qKgotICogZ250dGFiX2ZyZWVfcGFnZXMgLSBm cmVlIHBhZ2VzIGFsbG9jYXRlZCBieSBnbnR0YWJfYWxsb2NfcGFnZXMoKQotICogQG5yX3BhZ2Vz OyBudW1iZXIgb2YgcGFnZXMgdG8gZnJlZQotICogQHBhZ2VzOiB0aGUgcGFnZXMKKyAqIGdudHRh Yl9hbGxvY19wYWdlcyAtIGFsbG9jIHBhZ2VzIHN1aXRhYmxlIGZvciBncmFudCBtYXBwaW5nIGlu dG8KKyAqIEBucl9wYWdlczogbnVtYmVyIG9mIHBhZ2VzIHRvIGFsbG9jCisgKiBAcGFnZXM6IHJl dHVybnMgdGhlIHBhZ2VzCiAgKi8KLXZvaWQgZ250dGFiX2ZyZWVfcGFnZXMoaW50IG5yX3BhZ2Vz LCBzdHJ1Y3QgcGFnZSAqKnBhZ2VzKQoraW50IGdudHRhYl9hbGxvY19wYWdlcyhpbnQgbnJfcGFn ZXMsIHN0cnVjdCBwYWdlICoqcGFnZXMpCit7CisJaW50IHJldDsKKworCXJldCA9IGFsbG9jX3hl bmJhbGxvb25lZF9wYWdlcyhucl9wYWdlcywgcGFnZXMpOworCWlmIChyZXQgPCAwKQorCQlyZXR1 cm4gcmV0OworCisJcmV0ID0gZ250dGFiX3BhZ2VzX3NldF9wcml2YXRlKG5yX3BhZ2VzLCBwYWdl cyk7CisJaWYgKHJldCA8IDApCisJCWdudHRhYl9mcmVlX3BhZ2VzKG5yX3BhZ2VzLCBwYWdlcyk7 CisKKwlyZXR1cm4gcmV0OworfQorRVhQT1JUX1NZTUJPTChnbnR0YWJfYWxsb2NfcGFnZXMpOwor Cit2b2lkIGdudHRhYl9wYWdlc19jbGVhcl9wcml2YXRlKGludCBucl9wYWdlcywgc3RydWN0IHBh Z2UgKipwYWdlcykKIHsKIAlpbnQgaTsKIApAQCAtODE4LDYgKzgyMywxNyBAQCB2b2lkIGdudHRh Yl9mcmVlX3BhZ2VzKGludCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdlcykKIAkJCUNsZWFy UGFnZVByaXZhdGUocGFnZXNbaV0pOwogCQl9CiAJfQorfQorRVhQT1JUX1NZTUJPTChnbnR0YWJf cGFnZXNfY2xlYXJfcHJpdmF0ZSk7CisKKy8qKgorICogZ250dGFiX2ZyZWVfcGFnZXMgLSBmcmVl IHBhZ2VzIGFsbG9jYXRlZCBieSBnbnR0YWJfYWxsb2NfcGFnZXMoKQorICogQG5yX3BhZ2VzOyBu dW1iZXIgb2YgcGFnZXMgdG8gZnJlZQorICogQHBhZ2VzOiB0aGUgcGFnZXMKKyAqLwordm9pZCBn bnR0YWJfZnJlZV9wYWdlcyhpbnQgbnJfcGFnZXMsIHN0cnVjdCBwYWdlICoqcGFnZXMpCit7CisJ Z250dGFiX3BhZ2VzX2NsZWFyX3ByaXZhdGUobnJfcGFnZXMsIHBhZ2VzKTsKIAlmcmVlX3hlbmJh bGxvb25lZF9wYWdlcyhucl9wYWdlcywgcGFnZXMpOwogfQogRVhQT1JUX1NZTUJPTChnbnR0YWJf ZnJlZV9wYWdlcyk7CmRpZmYgLS1naXQgYS9pbmNsdWRlL3hlbi9ncmFudF90YWJsZS5oIGIvaW5j bHVkZS94ZW4vZ3JhbnRfdGFibGUuaAppbmRleCAyZTM3NzQxZjZiOGQuLmRlMDNmMjU0MmJiNyAx MDA2NDQKLS0tIGEvaW5jbHVkZS94ZW4vZ3JhbnRfdGFibGUuaAorKysgYi9pbmNsdWRlL3hlbi9n cmFudF90YWJsZS5oCkBAIC0xOTgsNiArMTk4LDkgQEAgdm9pZCBnbnR0YWJfZnJlZV9hdXRvX3hs YXRfZnJhbWVzKHZvaWQpOwogaW50IGdudHRhYl9hbGxvY19wYWdlcyhpbnQgbnJfcGFnZXMsIHN0 cnVjdCBwYWdlICoqcGFnZXMpOwogdm9pZCBnbnR0YWJfZnJlZV9wYWdlcyhpbnQgbnJfcGFnZXMs IHN0cnVjdCBwYWdlICoqcGFnZXMpOwogCitpbnQgZ250dGFiX3BhZ2VzX3NldF9wcml2YXRlKGlu dCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdlcyk7Cit2b2lkIGdudHRhYl9wYWdlc19jbGVh cl9wcml2YXRlKGludCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdlcyk7CisKIGludCBnbnR0 YWJfbWFwX3JlZnMoc3RydWN0IGdudHRhYl9tYXBfZ3JhbnRfcmVmICptYXBfb3BzLAogCQkgICAg c3RydWN0IGdudHRhYl9tYXBfZ3JhbnRfcmVmICprbWFwX29wcywKIAkJICAgIHN0cnVjdCBwYWdl ICoqcGFnZXMsIHVuc2lnbmVkIGludCBjb3VudCk7Ci0tIAoyLjE3LjAKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=