From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by aws-us-west-2-korg-lkml-1.web.codeaurora.org (Postfix) with ESMTP id 4D208C433EF for ; Tue, 12 Jun 2018 13:44:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3C7A2086D for ; Tue, 12 Jun 2018 13:44:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sjHDAbz9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F3C7A2086D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934106AbeFLNoE (ORCPT ); Tue, 12 Jun 2018 09:44:04 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:43849 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933088AbeFLNmO (ORCPT ); Tue, 12 Jun 2018 09:42:14 -0400 Received: by mail-lf0-f68.google.com with SMTP id n15-v6so36077229lfn.10; Tue, 12 Jun 2018 06:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qn9DhGEWTMaawUxaGfYqOvXnzJRBZPC7KzIu0SJDlM8=; b=sjHDAbz9JtEc+rn5NO7EMFdyMajglohYTaXKZ9yMtAV6OGhYBu9AErOjQOLfZabetd n8BlFXlS3IV6IA5NjnhZ0wyqiLleSKln+gFMqqq/P6SW0LUzfFovfmwC8A2ZL618EARh AccRdJRsMyHcEkiCmxM2uI1w/ZyRYbgAuL0odMn4T0SRF4DyV3HEg1DECFj6hhwuQ3Dz cG+qJAN2kHraySbGJUIPmTuAxsTD6AM4Km8aP1kh31dP+cCNgx1mjbIfj43Ia7x0Tbf1 DHku11p4wLopOurOeoUYLLhg+pg8KA6FzyauQHoFMa7NZNn/dOjkRgdIFR+7gUso+ls5 uo8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qn9DhGEWTMaawUxaGfYqOvXnzJRBZPC7KzIu0SJDlM8=; b=EaT1ZtODoMTiWofKUn91eNhT+rb84YcEFz3tB0tUHeNCfztSlUOLKvVFoeBBo+h0V3 r23Alb6RxPK6x2QS5djcUCspxjGXSAxRAkkWhemZK9gRy6wR0YoPQs9EwEdfj6Q+z2Wg ZoRXs/bmvgdU4YLTqke7CdzbMiQbk1IhWaelbnAtV9LnZH7ahBdR/1EcTFjdSt06AT2m eNCbeTmWJLMbmLG7tCLUxP/hJ1zLUJMomBastkS6otUvoDpfmDVsXWLstMy6A2ogDzU1 E1zg8o4at7/Ge43Heeuip0JY2tTAEd6zPrv5or0jgmX5gHdWJcJWdFtDnTaLqtC+N73J zeGQ== X-Gm-Message-State: APt69E28hk0KsqkgBQnDl24P1PWd2FbXjkUttyiQjjaLbtzPwtpIPepo k6TXAi0iFNfzvez0vGCC3uE= X-Google-Smtp-Source: ADUXVKKM9B5okxfYG0eCDKB6bjrtwW+fuCuq6SPeN0gg/hQ42kxTLPkjRTZd4oNFBnlPCoATvZXG6w== X-Received: by 2002:a2e:458a:: with SMTP id s132-v6mr308287lja.92.1528810932047; Tue, 12 Jun 2018 06:42:12 -0700 (PDT) Received: from a2k-HP-ProDesk-600-G2-SFF.kyiv.epam.com (ll-74.141.223.85.sovam.net.ua. [85.223.141.74]) by smtp.gmail.com with ESMTPSA id x18-v6sm46692ljh.63.2018.06.12.06.42.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Jun 2018 06:42:11 -0700 (PDT) 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 v3 2/9] xen/grant-table: Make set/clear page private code shared Date: Tue, 12 Jun 2018 16:41:53 +0300 Message-Id: <20180612134200.17456-3-andr2000@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612134200.17456-1-andr2000@gmail.com> References: <20180612134200.17456-1-andr2000@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk 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 Reviewed-by: Boris Ostrovsky --- 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.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleksandr Andrushchenko Subject: [PATCH v3 2/9] xen/grant-table: Make set/clear page private code shared Date: Tue, 12 Jun 2018 16:41:53 +0300 Message-ID: <20180612134200.17456-3-andr2000@gmail.com> References: <20180612134200.17456-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 D51B06E4D1 for ; Tue, 12 Jun 2018 13:42:13 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id u4-v6so36115625lff.3 for ; Tue, 12 Jun 2018 06:42:13 -0700 (PDT) In-Reply-To: <20180612134200.17456-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 bmtvIDxvbGVrc2FuZHJfYW5kcnVzaGNoZW5rb0BlcGFtLmNvbT4KUmV2aWV3ZWQtYnk6IEJvcmlz IE9zdHJvdnNreSA8Ym9yaXMub3N0cm92c2t5QG9yYWNsZS5jb20+Ci0tLQogZHJpdmVycy94ZW4v Z3JhbnQtdGFibGUuYyB8IDU0ICsrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LQogaW5jbHVkZS94ZW4vZ3JhbnRfdGFibGUuaCB8ICAzICsrKwogMiBmaWxlcyBjaGFuZ2VkLCAz OCBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3hl bi9ncmFudC10YWJsZS5jIGIvZHJpdmVycy94ZW4vZ3JhbnQtdGFibGUuYwppbmRleCBiYTM2ZmYz ZTQ5MDMuLmRiYjQ4YTg5ZTk4NyAxMDA2NDQKLS0tIGEvZHJpdmVycy94ZW4vZ3JhbnQtdGFibGUu YworKysgYi9kcml2ZXJzL3hlbi9ncmFudC10YWJsZS5jCkBAIC03NjksMjkgKzc2OSwxOCBAQCB2 b2lkIGdudHRhYl9mcmVlX2F1dG9feGxhdF9mcmFtZXModm9pZCkKIH0KIEVYUE9SVF9TWU1CT0xf R1BMKGdudHRhYl9mcmVlX2F1dG9feGxhdF9mcmFtZXMpOwogCi0vKioKLSAqIGdudHRhYl9hbGxv Y19wYWdlcyAtIGFsbG9jIHBhZ2VzIHN1aXRhYmxlIGZvciBncmFudCBtYXBwaW5nIGludG8KLSAq IEBucl9wYWdlczogbnVtYmVyIG9mIHBhZ2VzIHRvIGFsbG9jCi0gKiBAcGFnZXM6IHJldHVybnMg dGhlIHBhZ2VzCi0gKi8KLWludCBnbnR0YWJfYWxsb2NfcGFnZXMoaW50IG5yX3BhZ2VzLCBzdHJ1 Y3QgcGFnZSAqKnBhZ2VzKQoraW50IGdudHRhYl9wYWdlc19zZXRfcHJpdmF0ZShpbnQgbnJfcGFn ZXMsIHN0cnVjdCBwYWdlICoqcGFnZXMpCiB7CiAJaW50IGk7Ci0JaW50IHJldDsKLQotCXJldCA9 IGFsbG9jX3hlbmJhbGxvb25lZF9wYWdlcyhucl9wYWdlcywgcGFnZXMpOwotCWlmIChyZXQgPCAw KQotCQlyZXR1cm4gcmV0OwogCiAJZm9yIChpID0gMDsgaSA8IG5yX3BhZ2VzOyBpKyspIHsKICNp ZiBCSVRTX1BFUl9MT05HIDwgNjQKIAkJc3RydWN0IHhlbl9wYWdlX2ZvcmVpZ24gKmZvcmVpZ247 CiAKIAkJZm9yZWlnbiA9IGt6YWxsb2Moc2l6ZW9mKCpmb3JlaWduKSwgR0ZQX0tFUk5FTCk7Ci0J CWlmICghZm9yZWlnbikgewotCQkJZ250dGFiX2ZyZWVfcGFnZXMobnJfcGFnZXMsIHBhZ2VzKTsK KwkJaWYgKCFmb3JlaWduKQogCQkJcmV0dXJuIC1FTk9NRU07Ci0JCX0KKwogCQlzZXRfcGFnZV9w cml2YXRlKHBhZ2VzW2ldLCAodW5zaWduZWQgbG9uZylmb3JlaWduKTsKICNlbmRpZgogCQlTZXRQ YWdlUHJpdmF0ZShwYWdlc1tpXSk7CkBAIC03OTksMTQgKzc4OCwzMCBAQCBpbnQgZ250dGFiX2Fs bG9jX3BhZ2VzKGludCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdlcykKIAogCXJldHVybiAw OwogfQotRVhQT1JUX1NZTUJPTF9HUEwoZ250dGFiX2FsbG9jX3BhZ2VzKTsKK0VYUE9SVF9TWU1C T0xfR1BMKGdudHRhYl9wYWdlc19zZXRfcHJpdmF0ZSk7CiAKIC8qKgotICogZ250dGFiX2ZyZWVf cGFnZXMgLSBmcmVlIHBhZ2VzIGFsbG9jYXRlZCBieSBnbnR0YWJfYWxsb2NfcGFnZXMoKQotICog QG5yX3BhZ2VzOyBudW1iZXIgb2YgcGFnZXMgdG8gZnJlZQotICogQHBhZ2VzOiB0aGUgcGFnZXMK KyAqIGdudHRhYl9hbGxvY19wYWdlcyAtIGFsbG9jIHBhZ2VzIHN1aXRhYmxlIGZvciBncmFudCBt YXBwaW5nIGludG8KKyAqIEBucl9wYWdlczogbnVtYmVyIG9mIHBhZ2VzIHRvIGFsbG9jCisgKiBA cGFnZXM6IHJldHVybnMgdGhlIHBhZ2VzCiAgKi8KLXZvaWQgZ250dGFiX2ZyZWVfcGFnZXMoaW50 IG5yX3BhZ2VzLCBzdHJ1Y3QgcGFnZSAqKnBhZ2VzKQoraW50IGdudHRhYl9hbGxvY19wYWdlcyhp bnQgbnJfcGFnZXMsIHN0cnVjdCBwYWdlICoqcGFnZXMpCit7CisJaW50IHJldDsKKworCXJldCA9 IGFsbG9jX3hlbmJhbGxvb25lZF9wYWdlcyhucl9wYWdlcywgcGFnZXMpOworCWlmIChyZXQgPCAw KQorCQlyZXR1cm4gcmV0OworCisJcmV0ID0gZ250dGFiX3BhZ2VzX3NldF9wcml2YXRlKG5yX3Bh Z2VzLCBwYWdlcyk7CisJaWYgKHJldCA8IDApCisJCWdudHRhYl9mcmVlX3BhZ2VzKG5yX3BhZ2Vz LCBwYWdlcyk7CisKKwlyZXR1cm4gcmV0OworfQorRVhQT1JUX1NZTUJPTF9HUEwoZ250dGFiX2Fs bG9jX3BhZ2VzKTsKKwordm9pZCBnbnR0YWJfcGFnZXNfY2xlYXJfcHJpdmF0ZShpbnQgbnJfcGFn ZXMsIHN0cnVjdCBwYWdlICoqcGFnZXMpCiB7CiAJaW50IGk7CiAKQEAgLTgxOCw2ICs4MjMsMTcg QEAgdm9pZCBnbnR0YWJfZnJlZV9wYWdlcyhpbnQgbnJfcGFnZXMsIHN0cnVjdCBwYWdlICoqcGFn ZXMpCiAJCQlDbGVhclBhZ2VQcml2YXRlKHBhZ2VzW2ldKTsKIAkJfQogCX0KK30KK0VYUE9SVF9T WU1CT0xfR1BMKGdudHRhYl9wYWdlc19jbGVhcl9wcml2YXRlKTsKKworLyoqCisgKiBnbnR0YWJf ZnJlZV9wYWdlcyAtIGZyZWUgcGFnZXMgYWxsb2NhdGVkIGJ5IGdudHRhYl9hbGxvY19wYWdlcygp CisgKiBAbnJfcGFnZXM7IG51bWJlciBvZiBwYWdlcyB0byBmcmVlCisgKiBAcGFnZXM6IHRoZSBw YWdlcworICovCit2b2lkIGdudHRhYl9mcmVlX3BhZ2VzKGludCBucl9wYWdlcywgc3RydWN0IHBh Z2UgKipwYWdlcykKK3sKKwlnbnR0YWJfcGFnZXNfY2xlYXJfcHJpdmF0ZShucl9wYWdlcywgcGFn ZXMpOwogCWZyZWVfeGVuYmFsbG9vbmVkX3BhZ2VzKG5yX3BhZ2VzLCBwYWdlcyk7CiB9CiBFWFBP UlRfU1lNQk9MX0dQTChnbnR0YWJfZnJlZV9wYWdlcyk7CmRpZmYgLS1naXQgYS9pbmNsdWRlL3hl bi9ncmFudF90YWJsZS5oIGIvaW5jbHVkZS94ZW4vZ3JhbnRfdGFibGUuaAppbmRleCAyZTM3NzQx ZjZiOGQuLmRlMDNmMjU0MmJiNyAxMDA2NDQKLS0tIGEvaW5jbHVkZS94ZW4vZ3JhbnRfdGFibGUu aAorKysgYi9pbmNsdWRlL3hlbi9ncmFudF90YWJsZS5oCkBAIC0xOTgsNiArMTk4LDkgQEAgdm9p ZCBnbnR0YWJfZnJlZV9hdXRvX3hsYXRfZnJhbWVzKHZvaWQpOwogaW50IGdudHRhYl9hbGxvY19w YWdlcyhpbnQgbnJfcGFnZXMsIHN0cnVjdCBwYWdlICoqcGFnZXMpOwogdm9pZCBnbnR0YWJfZnJl ZV9wYWdlcyhpbnQgbnJfcGFnZXMsIHN0cnVjdCBwYWdlICoqcGFnZXMpOwogCitpbnQgZ250dGFi X3BhZ2VzX3NldF9wcml2YXRlKGludCBucl9wYWdlcywgc3RydWN0IHBhZ2UgKipwYWdlcyk7Cit2 b2lkIGdudHRhYl9wYWdlc19jbGVhcl9wcml2YXRlKGludCBucl9wYWdlcywgc3RydWN0IHBhZ2Ug KipwYWdlcyk7CisKIGludCBnbnR0YWJfbWFwX3JlZnMoc3RydWN0IGdudHRhYl9tYXBfZ3JhbnRf cmVmICptYXBfb3BzLAogCQkgICAgc3RydWN0IGdudHRhYl9tYXBfZ3JhbnRfcmVmICprbWFwX29w cywKIAkJICAgIHN0cnVjdCBwYWdlICoqcGFnZXMsIHVuc2lnbmVkIGludCBjb3VudCk7Ci0tIAoy LjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=