From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleksandr Andrushchenko Subject: [PATCH v2 5/8] drm/xen-front: Implement handling of shared display buffers Date: Tue, 13 Mar 2018 15:31:04 +0200 Message-ID: <1520947867-32514-6-git-send-email-andr2000@gmail.com> References: <1520947867-32514-1-git-send-email-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 6D1E16E4F2 for ; Tue, 13 Mar 2018 13:31:26 +0000 (UTC) Received: by mail-lf0-x242.google.com with SMTP id w16-v6so7703705lfc.13 for ; Tue, 13 Mar 2018 06:31:26 -0700 (PDT) In-Reply-To: <1520947867-32514-1-git-send-email-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, airlied@linux.ie, daniel.vetter@intel.com, seanpaul@chromium.org, gustavo@padovan.org, jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Cc: andr2000@gmail.com, Oleksandr Andrushchenko List-Id: dri-devel@lists.freedesktop.org RnJvbTogT2xla3NhbmRyIEFuZHJ1c2hjaGVua28gPG9sZWtzYW5kcl9hbmRydXNoY2hlbmtvQGVw YW0uY29tPgoKSW1wbGVtZW50IHNoYXJlZCBidWZmZXIgaGFuZGxpbmcgYWNjb3JkaW5nIHRvIHRo ZQpwYXJhLXZpcnR1YWxpemVkIGRpc3BsYXkgZGV2aWNlIHByb3RvY29sIGF0IHhlbi9pbnRlcmZh Y2UvaW8vZGlzcGxpZi5oOgogIC0gaGFuZGxlIHBhZ2UgZGlyZWN0b3JpZXMgYWNjb3JkaW5nIHRv IGRpc3BsaWYgcHJvdG9jb2w6CiAgICAtIGFsbG9jYXRlIGFuZCBzaGFyZSBwYWdlIGRpcmVjdG9y aWVzCiAgICAtIGdyYW50IHJlZmVyZW5jZXMgdG8gdGhlIHJlcXVpcmVkIHNldCBvZiBwYWdlcyBm b3IgdGhlCiAgICAgIHBhZ2UgZGlyZWN0b3J5CiAgLSBhbGxvY2F0ZSB4ZW4gYmFsbGxvb25lZCBw YWdlcyB2aWEgWGVuIGJhbGxvb24gZHJpdmVyCiAgICB3aXRoIGFsbG9jX3hlbmJhbGxvb25lZF9w YWdlcy9mcmVlX3hlbmJhbGxvb25lZF9wYWdlcwogIC0gZ3JhbnQgcmVmZXJlbmNlcyB0byB0aGUg cmVxdWlyZWQgc2V0IG9mIHBhZ2VzIGZvciB0aGUKICAgIHNoYXJlZCBidWZmZXIgaXRzZWxmCiAg LSBpbXBsZW1lbnQgcGFnZXMgbWFwL3VubWFwIGZvciB0aGUgYnVmZmVycyBhbGxvY2F0ZWQgYnkg dGhlCiAgICBiYWNrZW5kIChnbnR0YWJfbWFwX3JlZnMvZ250dGFiX3VubWFwX3JlZnMpCgpTaWdu ZWQtb2ZmLWJ5OiBPbGVrc2FuZHIgQW5kcnVzaGNoZW5rbyA8b2xla3NhbmRyX2FuZHJ1c2hjaGVu a29AZXBhbS5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3hlbi9NYWtlZmlsZSAgICAgICAgICAg ICAgfCAgIDEgKwogZHJpdmVycy9ncHUvZHJtL3hlbi94ZW5fZHJtX2Zyb250LmMgICAgICAgfCAg IDggKwogZHJpdmVycy9ncHUvZHJtL3hlbi94ZW5fZHJtX2Zyb250X3NoYnVmLmMgfCA0MzIgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0veGVuL3hlbl9kcm1f ZnJvbnRfc2hidWYuaCB8ICA3MiArKysrKwogNCBmaWxlcyBjaGFuZ2VkLCA1MTMgaW5zZXJ0aW9u cygrKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMvZ3B1L2RybS94ZW4veGVuX2RybV9mcm9u dF9zaGJ1Zi5jCiBjcmVhdGUgbW9kZSAxMDA2NDQgZHJpdmVycy9ncHUvZHJtL3hlbi94ZW5fZHJt X2Zyb250X3NoYnVmLmgKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0veGVuL01ha2VmaWxl IGIvZHJpdmVycy9ncHUvZHJtL3hlbi9NYWtlZmlsZQppbmRleCA4NDE3MzMyZjNiNTguLjZjOGM3 NTFmMTJlZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3hlbi9NYWtlZmlsZQorKysgYi9k cml2ZXJzL2dwdS9kcm0veGVuL01ha2VmaWxlCkBAIC0yLDYgKzIsNyBAQAogCiBkcm1feGVuX2Zy b250LW9ianMgOj0geGVuX2RybV9mcm9udC5vIFwKIAkJICAgICAgeGVuX2RybV9mcm9udF9ldnRj aG5sLm8gXAorCQkgICAgICB4ZW5fZHJtX2Zyb250X3NoYnVmLm8gXAogCQkgICAgICB4ZW5fZHJt X2Zyb250X2NmZy5vCiAKIG9iai0kKENPTkZJR19EUk1fWEVOX0ZST05URU5EKSArPSBkcm1feGVu X2Zyb250Lm8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS94ZW4veGVuX2RybV9mcm9udC5j IGIvZHJpdmVycy9ncHUvZHJtL3hlbi94ZW5fZHJtX2Zyb250LmMKaW5kZXggODMxMmRhYjg2MmUy Li5mYWU2MzEwNjdjMzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS94ZW4veGVuX2RybV9m cm9udC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS94ZW4veGVuX2RybV9mcm9udC5jCkBAIC0xOCw2 ICsxOCw3IEBACiAKICNpbmNsdWRlICJ4ZW5fZHJtX2Zyb250LmgiCiAjaW5jbHVkZSAieGVuX2Ry bV9mcm9udF9ldnRjaG5sLmgiCisjaW5jbHVkZSAieGVuX2RybV9mcm9udF9zaGJ1Zi5oIgogCiBz dGF0aWMgdm9pZCB4ZW5fZHJ2X3JlbW92ZV9pbnRlcm5hbChzdHJ1Y3QgeGVuX2RybV9mcm9udF9p bmZvICpmcm9udF9pbmZvKQogewpAQCAtMTg3LDYgKzE4OCwxMyBAQCBzdGF0aWMgc3RydWN0IHhl bmJ1c19kcml2ZXIgeGVuX2RyaXZlciA9IHsKIAogc3RhdGljIGludCBfX2luaXQgeGVuX2Rydl9p bml0KHZvaWQpCiB7CisJLyogQXQgdGhlIG1vbWVudCB3ZSBvbmx5IHN1cHBvcnQgY2FzZSB3aXRo IFhFTl9QQUdFX1NJWkUgPT0gUEFHRV9TSVpFICovCisJaWYgKFhFTl9QQUdFX1NJWkUgIT0gUEFH RV9TSVpFKSB7CisJCURSTV9FUlJPUihYRU5ESVNQTF9EUklWRVJfTkFNRSAiOiBkaWZmZXJlbnQg a2VybmVsIGFuZCBYZW4gcGFnZSBzaXplcyBhcmUgbm90IHN1cHBvcnRlZDogWEVOX1BBR0VfU0la RSAoJWx1KSAhPSBQQUdFX1NJWkUgKCVsdSlcbiIsCisJCQkJWEVOX1BBR0VfU0laRSwgUEFHRV9T SVpFKTsKKwkJcmV0dXJuIC1FTk9ERVY7CisJfQorCiAJaWYgKCF4ZW5fZG9tYWluKCkpCiAJCXJl dHVybiAtRU5PREVWOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0veGVuL3hlbl9kcm1f ZnJvbnRfc2hidWYuYyBiL2RyaXZlcnMvZ3B1L2RybS94ZW4veGVuX2RybV9mcm9udF9zaGJ1Zi5j Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uMGZkZTJkOGY3NzA2Ci0t LSAvZGV2L251bGwKKysrIGIvZHJpdmVycy9ncHUvZHJtL3hlbi94ZW5fZHJtX2Zyb250X3NoYnVm LmMKQEAgLTAsMCArMSw0MzIgQEAKKy8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBHUEwtMi4w IE9SIE1JVAorCisvKgorICogIFhlbiBwYXJhLXZpcnR1YWwgRFJNIGRldmljZQorICoKKyAqIENv cHlyaWdodCAoQykgMjAxNi0yMDE4IEVQQU0gU3lzdGVtcyBJbmMuCisgKgorICogQXV0aG9yOiBP bGVrc2FuZHIgQW5kcnVzaGNoZW5rbyA8b2xla3NhbmRyX2FuZHJ1c2hjaGVua29AZXBhbS5jb20+ CisgKi8KKworI2luY2x1ZGUgPGRybS9kcm1QLmg+CisKKyNpZiBkZWZpbmVkKENPTkZJR19YODYp CisjaW5jbHVkZSA8ZHJtL2RybV9jYWNoZS5oPgorI2VuZGlmCisjaW5jbHVkZSA8bGludXgvZXJy bm8uaD4KKyNpbmNsdWRlIDxsaW51eC9tbS5oPgorCisjaW5jbHVkZSA8YXNtL3hlbi9oeXBlcnZp c29yLmg+CisjaW5jbHVkZSA8eGVuL2JhbGxvb24uaD4KKyNpbmNsdWRlIDx4ZW4veGVuLmg+Cisj aW5jbHVkZSA8eGVuL3hlbmJ1cy5oPgorI2luY2x1ZGUgPHhlbi9pbnRlcmZhY2UvaW8vcmluZy5o PgorI2luY2x1ZGUgPHhlbi9pbnRlcmZhY2UvaW8vZGlzcGxpZi5oPgorCisjaW5jbHVkZSAieGVu X2RybV9mcm9udC5oIgorI2luY2x1ZGUgInhlbl9kcm1fZnJvbnRfc2hidWYuaCIKKworc3RydWN0 IHhlbl9kcm1fZnJvbnRfc2hidWZfb3BzIHsKKwkvKgorCSAqIENhbGN1bGF0ZSBudW1iZXIgb2Yg Z3JlZnMgcmVxdWlyZWQgdG8gaGFuZGxlIHRoaXMgYnVmZmVyLAorCSAqIGUuZy4gaWYgZ3JlZnMg YXJlIHJlcXVpcmVkIGZvciBwYWdlIGRpcmVjdG9yeSBvbmx5IG9yIHRoZSBidWZmZXIKKwkgKiBw YWdlcyBhcyB3ZWxsLgorCSAqLworCXZvaWQgKCpjYWxjX251bV9ncmVmcykoc3RydWN0IHhlbl9k cm1fZnJvbnRfc2hidWYgKmJ1Zik7CisJLyogRmlsbCBwYWdlIGRpcmVjdG9yeSBhY2NvcmRpbmcg dG8gcGFyYS12aXJ0dWFsIGRpc3BsYXkgcHJvdG9jb2wuICovCisJdm9pZCAoKmZpbGxfcGFnZV9k aXIpKHN0cnVjdCB4ZW5fZHJtX2Zyb250X3NoYnVmICpidWYpOworCS8qIENsYWltIGdyYW50IHJl ZmVyZW5jZXMgZm9yIHRoZSBwYWdlcyBvZiB0aGUgYnVmZmVyLiAqLworCWludCAoKmdyYW50X3Jl ZnNfZm9yX2J1ZmZlcikoc3RydWN0IHhlbl9kcm1fZnJvbnRfc2hidWYgKmJ1ZiwKKwkJCWdyYW50 X3JlZl90ICpwcml2X2dyZWZfaGVhZCwgaW50IGdyZWZfaWR4KTsKKwkvKiBNYXAgZ3JhbnQgcmVm ZXJlbmNlcyBvZiB0aGUgYnVmZmVyLiAqLworCWludCAoKm1hcCkoc3RydWN0IHhlbl9kcm1fZnJv bnRfc2hidWYgKmJ1Zik7CisJLyogVW5tYXAgZ3JhbnQgcmVmZXJlbmNlcyBvZiB0aGUgYnVmZmVy LiAqLworCWludCAoKnVubWFwKShzdHJ1Y3QgeGVuX2RybV9mcm9udF9zaGJ1ZiAqYnVmKTsKK307 CisKK2dyYW50X3JlZl90IHhlbl9kcm1fZnJvbnRfc2hidWZfZ2V0X2Rpcl9zdGFydChzdHJ1Y3Qg eGVuX2RybV9mcm9udF9zaGJ1ZiAqYnVmKQoreworCWlmICghYnVmLT5ncmVmcykKKwkJcmV0dXJu IEdSQU5UX0lOVkFMSURfUkVGOworCisJcmV0dXJuIGJ1Zi0+Z3JlZnNbMF07Cit9CisKK2ludCB4 ZW5fZHJtX2Zyb250X3NoYnVmX21hcChzdHJ1Y3QgeGVuX2RybV9mcm9udF9zaGJ1ZiAqYnVmKQor eworCWlmIChidWYtPm9wcy0+bWFwKQorCQlyZXR1cm4gYnVmLT5vcHMtPm1hcChidWYpOworCisJ Lyogbm8gbmVlZCB0byBtYXAgb3duIGdyYW50IHJlZmVyZW5jZXMgKi8KKwlyZXR1cm4gMDsKK30K KworaW50IHhlbl9kcm1fZnJvbnRfc2hidWZfdW5tYXAoc3RydWN0IHhlbl9kcm1fZnJvbnRfc2hi dWYgKmJ1ZikKK3sKKwlpZiAoYnVmLT5vcHMtPnVubWFwKQorCQlyZXR1cm4gYnVmLT5vcHMtPnVu bWFwKGJ1Zik7CisKKwkvKiBubyBuZWVkIHRvIHVubWFwIG93biBncmFudCByZWZlcmVuY2VzICov CisJcmV0dXJuIDA7Cit9CisKK3ZvaWQgeGVuX2RybV9mcm9udF9zaGJ1Zl9mbHVzaChzdHJ1Y3Qg eGVuX2RybV9mcm9udF9zaGJ1ZiAqYnVmKQoreworI2lmIGRlZmluZWQoQ09ORklHX1g4NikKKwlk cm1fY2xmbHVzaF9wYWdlcyhidWYtPnBhZ2VzLCBidWYtPm51bV9wYWdlcyk7CisjZW5kaWYKK30K Kwordm9pZCB4ZW5fZHJtX2Zyb250X3NoYnVmX2ZyZWUoc3RydWN0IHhlbl9kcm1fZnJvbnRfc2hi dWYgKmJ1ZikKK3sKKwlpZiAoYnVmLT5ncmVmcykgeworCQlpbnQgaTsKKworCQlmb3IgKGkgPSAw OyBpIDwgYnVmLT5udW1fZ3JlZnM7IGkrKykKKwkJCWlmIChidWYtPmdyZWZzW2ldICE9IEdSQU5U X0lOVkFMSURfUkVGKQorCQkJCWdudHRhYl9lbmRfZm9yZWlnbl9hY2Nlc3MoYnVmLT5ncmVmc1tp XSwKKwkJCQkJMCwgMFVMKTsKKwl9CisJa2ZyZWUoYnVmLT5ncmVmcyk7CisJa2ZyZWUoYnVmLT5k aXJlY3RvcnkpOworCWlmIChidWYtPnNndCkgeworCQlzZ19mcmVlX3RhYmxlKGJ1Zi0+c2d0KTsK KwkJa3ZmcmVlKGJ1Zi0+cGFnZXMpOworCX0KKwlrZnJlZShidWYpOworfQorCisvKgorICogbnVt YmVyIG9mIGdyZWZzIGEgcGFnZSBjYW4gaG9sZCB3aXRoIHJlc3BlY3QgdG8gdGhlCisgKiBzdHJ1 Y3QgeGVuZGlzcGxfcGFnZV9kaXJlY3RvcnkgaGVhZGVyCisgKi8KKyNkZWZpbmUgWEVOX0RSTV9O VU1fR1JFRlNfUEVSX1BBR0UgKChQQUdFX1NJWkUgLSBcCisJb2Zmc2V0b2Yoc3RydWN0IHhlbmRp c3BsX3BhZ2VfZGlyZWN0b3J5LCBncmVmKSkgLyBcCisJc2l6ZW9mKGdyYW50X3JlZl90KSkKKwor c3RhdGljIGludCBnZXRfbnVtX3BhZ2VzX2RpcihzdHJ1Y3QgeGVuX2RybV9mcm9udF9zaGJ1ZiAq YnVmKQoreworCS8qIG51bWJlciBvZiBwYWdlcyB0aGUgcGFnZSBkaXJlY3RvcnkgY29uc3VtZXMg aXRzZWxmICovCisJcmV0dXJuIERJVl9ST1VORF9VUChidWYtPm51bV9wYWdlcywgWEVOX0RSTV9O VU1fR1JFRlNfUEVSX1BBR0UpOworfQorCitzdGF0aWMgdm9pZCBiYWNrZW5kX2NhbGNfbnVtX2dy ZWZzKHN0cnVjdCB4ZW5fZHJtX2Zyb250X3NoYnVmICpidWYpCit7CisJLyogb25seSBmb3IgcGFn ZXMgdGhlIHBhZ2UgZGlyZWN0b3J5IGNvbnN1bWVzIGl0c2VsZiAqLworCWJ1Zi0+bnVtX2dyZWZz ID0gZ2V0X251bV9wYWdlc19kaXIoYnVmKTsKK30KKworc3RhdGljIHZvaWQgZ3Vlc3RfY2FsY19u dW1fZ3JlZnMoc3RydWN0IHhlbl9kcm1fZnJvbnRfc2hidWYgKmJ1ZikKK3sKKwkvKgorCSAqIG51 bWJlciBvZiBwYWdlcyB0aGUgcGFnZSBkaXJlY3RvcnkgY29uc3VtZXMgaXRzZWxmCisJICogcGx1 cyBncmVmcyBmb3IgdGhlIGJ1ZmZlciBwYWdlcworCSAqLworCWJ1Zi0+bnVtX2dyZWZzID0gZ2V0 X251bV9wYWdlc19kaXIoYnVmKSArIGJ1Zi0+bnVtX3BhZ2VzOworfQorCisjZGVmaW5lIHhlbl9w YWdlX3RvX3ZhZGRyKHBhZ2UpIFwKKwkJKChwaHlzX2FkZHJfdClwZm5fdG9fa2FkZHIocGFnZV90 b194ZW5fcGZuKHBhZ2UpKSkKKworc3RhdGljIGludCBiYWNrZW5kX3VubWFwKHN0cnVjdCB4ZW5f ZHJtX2Zyb250X3NoYnVmICpidWYpCit7CisJc3RydWN0IGdudHRhYl91bm1hcF9ncmFudF9yZWYg KnVubWFwX29wczsKKwlpbnQgaSwgcmV0OworCisJaWYgKCFidWYtPnBhZ2VzIHx8ICFidWYtPmJh Y2tlbmRfbWFwX2hhbmRsZXMgfHwgIWJ1Zi0+Z3JlZnMpCisJCXJldHVybiAwOworCisJdW5tYXBf b3BzID0ga2NhbGxvYyhidWYtPm51bV9wYWdlcywgc2l6ZW9mKCp1bm1hcF9vcHMpLAorCQlHRlBf S0VSTkVMKTsKKwlpZiAoIXVubWFwX29wcykgeworCQlEUk1fRVJST1IoIkZhaWxlZCB0byBnZXQg bWVtb3J5IHdoaWxlIHVubWFwcGluZ1xuIik7CisJCXJldHVybiAtRU5PTUVNOworCX0KKworCWZv ciAoaSA9IDA7IGkgPCBidWYtPm51bV9wYWdlczsgaSsrKSB7CisJCXBoeXNfYWRkcl90IGFkZHI7 CisKKwkJYWRkciA9IHhlbl9wYWdlX3RvX3ZhZGRyKGJ1Zi0+cGFnZXNbaV0pOworCQlnbnR0YWJf c2V0X3VubWFwX29wKCZ1bm1hcF9vcHNbaV0sIGFkZHIsIEdOVE1BUF9ob3N0X21hcCwKKwkJCQli dWYtPmJhY2tlbmRfbWFwX2hhbmRsZXNbaV0pOworCX0KKworCXJldCA9IGdudHRhYl91bm1hcF9y ZWZzKHVubWFwX29wcywgTlVMTCwgYnVmLT5wYWdlcywKKwkJCWJ1Zi0+bnVtX3BhZ2VzKTsKKwor CWZvciAoaSA9IDA7IGkgPCBidWYtPm51bV9wYWdlczsgaSsrKSB7CisJCWlmICh1bmxpa2VseSh1 bm1hcF9vcHNbaV0uc3RhdHVzICE9IEdOVFNUX29rYXkpKQorCQkJRFJNX0VSUk9SKCJGYWlsZWQg dG8gdW5tYXAgcGFnZSAlZDogJWRcbiIsCisJCQkJCWksIHVubWFwX29wc1tpXS5zdGF0dXMpOwor CX0KKworCWlmIChyZXQpCisJCURSTV9FUlJPUigiRmFpbGVkIHRvIHVubWFwIGdyYW50IHJlZmVy ZW5jZXMsIHJldCAlZCIsIHJldCk7CisKKwlrZnJlZSh1bm1hcF9vcHMpOworCWtmcmVlKGJ1Zi0+ YmFja2VuZF9tYXBfaGFuZGxlcyk7CisJYnVmLT5iYWNrZW5kX21hcF9oYW5kbGVzID0gTlVMTDsK KwlyZXR1cm4gcmV0OworfQorCitzdGF0aWMgaW50IGJhY2tlbmRfbWFwKHN0cnVjdCB4ZW5fZHJt X2Zyb250X3NoYnVmICpidWYpCit7CisJc3RydWN0IGdudHRhYl9tYXBfZ3JhbnRfcmVmICptYXBf b3BzID0gTlVMTDsKKwl1bnNpZ25lZCBjaGFyICpwdHI7CisJaW50IHJldCwgY3VyX2dyZWYsIGN1 cl9kaXJfcGFnZSwgY3VyX3BhZ2UsIGdyZWZzX2xlZnQ7CisKKwltYXBfb3BzID0ga2NhbGxvYyhi dWYtPm51bV9wYWdlcywgc2l6ZW9mKCptYXBfb3BzKSwgR0ZQX0tFUk5FTCk7CisJaWYgKCFtYXBf b3BzKQorCQlyZXR1cm4gLUVOT01FTTsKKworCWJ1Zi0+YmFja2VuZF9tYXBfaGFuZGxlcyA9IGtj YWxsb2MoYnVmLT5udW1fcGFnZXMsCisJCQlzaXplb2YoKmJ1Zi0+YmFja2VuZF9tYXBfaGFuZGxl cyksIEdGUF9LRVJORUwpOworCWlmICghYnVmLT5iYWNrZW5kX21hcF9oYW5kbGVzKSB7CisJCWtm cmVlKG1hcF9vcHMpOworCQlyZXR1cm4gLUVOT01FTTsKKwl9CisKKwkvKgorCSAqIHJlYWQgcGFn ZSBkaXJlY3RvcnkgdG8gZ2V0IGdyZWZzIGZyb20gdGhlIGJhY2tlbmQ6IGZvciBleHRlcm5hbAor CSAqIGJ1ZmZlciB3ZSBvbmx5IGFsbG9jYXRlIGJ1Zi0+Z3JlZnMgZm9yIHRoZSBwYWdlIGRpcmVj dG9yeSwKKwkgKiBzbyBidWYtPm51bV9ncmVmcyBoYXMgbnVtYmVyIG9mIHBhZ2VzIGluIHRoZSBw YWdlIGRpcmVjdG9yeSBpdHNlbGYKKwkgKi8KKwlwdHIgPSBidWYtPmRpcmVjdG9yeTsKKwlncmVm c19sZWZ0ID0gYnVmLT5udW1fcGFnZXM7CisJY3VyX3BhZ2UgPSAwOworCWZvciAoY3VyX2Rpcl9w YWdlID0gMDsgY3VyX2Rpcl9wYWdlIDwgYnVmLT5udW1fZ3JlZnM7IGN1cl9kaXJfcGFnZSsrKSB7 CisJCXN0cnVjdCB4ZW5kaXNwbF9wYWdlX2RpcmVjdG9yeSAqcGFnZV9kaXIgPQorCQkJCShzdHJ1 Y3QgeGVuZGlzcGxfcGFnZV9kaXJlY3RvcnkgKilwdHI7CisJCWludCB0b19jb3B5ID0gWEVOX0RS TV9OVU1fR1JFRlNfUEVSX1BBR0U7CisKKwkJaWYgKHRvX2NvcHkgPiBncmVmc19sZWZ0KQorCQkJ dG9fY29weSA9IGdyZWZzX2xlZnQ7CisKKwkJZm9yIChjdXJfZ3JlZiA9IDA7IGN1cl9ncmVmIDwg dG9fY29weTsgY3VyX2dyZWYrKykgeworCQkJcGh5c19hZGRyX3QgYWRkcjsKKworCQkJYWRkciA9 IHhlbl9wYWdlX3RvX3ZhZGRyKGJ1Zi0+cGFnZXNbY3VyX3BhZ2VdKTsKKwkJCWdudHRhYl9zZXRf bWFwX29wKCZtYXBfb3BzW2N1cl9wYWdlXSwgYWRkciwKKwkJCQkJR05UTUFQX2hvc3RfbWFwLAor CQkJCQlwYWdlX2Rpci0+Z3JlZltjdXJfZ3JlZl0sCisJCQkJCWJ1Zi0+eGJfZGV2LT5vdGhlcmVu ZF9pZCk7CisJCQljdXJfcGFnZSsrOworCQl9CisKKwkJZ3JlZnNfbGVmdCAtPSB0b19jb3B5Owor CQlwdHIgKz0gUEFHRV9TSVpFOworCX0KKwlyZXQgPSBnbnR0YWJfbWFwX3JlZnMobWFwX29wcywg TlVMTCwgYnVmLT5wYWdlcywgYnVmLT5udW1fcGFnZXMpOworCisJLyogc2F2ZSBoYW5kbGVzIGV2 ZW4gaWYgZXJyb3IsIHNvIHdlIGNhbiB1bm1hcCAqLworCWZvciAoY3VyX3BhZ2UgPSAwOyBjdXJf cGFnZSA8IGJ1Zi0+bnVtX3BhZ2VzOyBjdXJfcGFnZSsrKSB7CisJCWJ1Zi0+YmFja2VuZF9tYXBf aGFuZGxlc1tjdXJfcGFnZV0gPSBtYXBfb3BzW2N1cl9wYWdlXS5oYW5kbGU7CisJCWlmICh1bmxp a2VseShtYXBfb3BzW2N1cl9wYWdlXS5zdGF0dXMgIT0gR05UU1Rfb2theSkpCisJCQlEUk1fRVJS T1IoIkZhaWxlZCB0byBtYXAgcGFnZSAlZDogJWRcbiIsCisJCQkJCWN1cl9wYWdlLCBtYXBfb3Bz W2N1cl9wYWdlXS5zdGF0dXMpOworCX0KKworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9SKCJGYWls ZWQgdG8gbWFwIGdyYW50IHJlZmVyZW5jZXMsIHJldCAlZCIsIHJldCk7CisJCWJhY2tlbmRfdW5t YXAoYnVmKTsKKwl9CisKKwlrZnJlZShtYXBfb3BzKTsKKwlyZXR1cm4gcmV0OworfQorCitzdGF0 aWMgdm9pZCBiYWNrZW5kX2ZpbGxfcGFnZV9kaXIoc3RydWN0IHhlbl9kcm1fZnJvbnRfc2hidWYg KmJ1ZikKK3sKKwlzdHJ1Y3QgeGVuZGlzcGxfcGFnZV9kaXJlY3RvcnkgKnBhZ2VfZGlyOworCXVu c2lnbmVkIGNoYXIgKnB0cjsKKwlpbnQgaSwgbnVtX3BhZ2VzX2RpcjsKKworCXB0ciA9IGJ1Zi0+ ZGlyZWN0b3J5OworCW51bV9wYWdlc19kaXIgPSBnZXRfbnVtX3BhZ2VzX2RpcihidWYpOworCisJ LyogZmlsbCBvbmx5IGdyZWZzIGZvciB0aGUgcGFnZSBkaXJlY3RvcnkgaXRzZWxmICovCisJZm9y IChpID0gMDsgaSA8IG51bV9wYWdlc19kaXIgLSAxOyBpKyspIHsKKwkJcGFnZV9kaXIgPSAoc3Ry dWN0IHhlbmRpc3BsX3BhZ2VfZGlyZWN0b3J5ICopcHRyOworCisJCXBhZ2VfZGlyLT5ncmVmX2Rp cl9uZXh0X3BhZ2UgPSBidWYtPmdyZWZzW2kgKyAxXTsKKwkJcHRyICs9IFBBR0VfU0laRTsKKwl9 CisJLyogbGFzdCBwYWdlIG11c3Qgc2F5IHRoZXJlIGlzIG5vIG1vcmUgcGFnZXMgKi8KKwlwYWdl X2RpciA9IChzdHJ1Y3QgeGVuZGlzcGxfcGFnZV9kaXJlY3RvcnkgKilwdHI7CisJcGFnZV9kaXIt PmdyZWZfZGlyX25leHRfcGFnZSA9IEdSQU5UX0lOVkFMSURfUkVGOworfQorCitzdGF0aWMgdm9p ZCBndWVzdF9maWxsX3BhZ2VfZGlyKHN0cnVjdCB4ZW5fZHJtX2Zyb250X3NoYnVmICpidWYpCit7 CisJdW5zaWduZWQgY2hhciAqcHRyOworCWludCBjdXJfZ3JlZiwgZ3JlZnNfbGVmdCwgdG9fY29w eSwgaSwgbnVtX3BhZ2VzX2RpcjsKKworCXB0ciA9IGJ1Zi0+ZGlyZWN0b3J5OworCW51bV9wYWdl c19kaXIgPSBnZXRfbnVtX3BhZ2VzX2RpcihidWYpOworCisJLyoKKwkgKiB3aGlsZSBjb3B5aW5n LCBza2lwIGdyZWZzIGF0IHN0YXJ0LCB0aGV5IGFyZSBmb3IgcGFnZXMKKwkgKiBncmFudGVkIGZv ciB0aGUgcGFnZSBkaXJlY3RvcnkgaXRzZWxmCisJICovCisJY3VyX2dyZWYgPSBudW1fcGFnZXNf ZGlyOworCWdyZWZzX2xlZnQgPSBidWYtPm51bV9wYWdlczsKKwlmb3IgKGkgPSAwOyBpIDwgbnVt X3BhZ2VzX2RpcjsgaSsrKSB7CisJCXN0cnVjdCB4ZW5kaXNwbF9wYWdlX2RpcmVjdG9yeSAqcGFn ZV9kaXIgPQorCQkJCShzdHJ1Y3QgeGVuZGlzcGxfcGFnZV9kaXJlY3RvcnkgKilwdHI7CisKKwkJ aWYgKGdyZWZzX2xlZnQgPD0gWEVOX0RSTV9OVU1fR1JFRlNfUEVSX1BBR0UpIHsKKwkJCXRvX2Nv cHkgPSBncmVmc19sZWZ0OworCQkJcGFnZV9kaXItPmdyZWZfZGlyX25leHRfcGFnZSA9IEdSQU5U X0lOVkFMSURfUkVGOworCQl9IGVsc2UgeworCQkJdG9fY29weSA9IFhFTl9EUk1fTlVNX0dSRUZT X1BFUl9QQUdFOworCQkJcGFnZV9kaXItPmdyZWZfZGlyX25leHRfcGFnZSA9IGJ1Zi0+Z3JlZnNb aSArIDFdOworCQl9CisJCW1lbWNweSgmcGFnZV9kaXItPmdyZWYsICZidWYtPmdyZWZzW2N1cl9n cmVmXSwKKwkJCQl0b19jb3B5ICogc2l6ZW9mKGdyYW50X3JlZl90KSk7CisJCXB0ciArPSBQQUdF X1NJWkU7CisJCWdyZWZzX2xlZnQgLT0gdG9fY29weTsKKwkJY3VyX2dyZWYgKz0gdG9fY29weTsK Kwl9Cit9CisKK3N0YXRpYyBpbnQgZ3Vlc3RfZ3JhbnRfcmVmc19mb3JfYnVmZmVyKHN0cnVjdCB4 ZW5fZHJtX2Zyb250X3NoYnVmICpidWYsCisJCWdyYW50X3JlZl90ICpwcml2X2dyZWZfaGVhZCwg aW50IGdyZWZfaWR4KQoreworCWludCBpLCBjdXJfcmVmLCBvdGhlcmVuZF9pZDsKKworCW90aGVy ZW5kX2lkID0gYnVmLT54Yl9kZXYtPm90aGVyZW5kX2lkOworCWZvciAoaSA9IDA7IGkgPCBidWYt Pm51bV9wYWdlczsgaSsrKSB7CisJCWN1cl9yZWYgPSBnbnR0YWJfY2xhaW1fZ3JhbnRfcmVmZXJl bmNlKHByaXZfZ3JlZl9oZWFkKTsKKwkJaWYgKGN1cl9yZWYgPCAwKQorCQkJcmV0dXJuIGN1cl9y ZWY7CisJCWdudHRhYl9ncmFudF9mb3JlaWduX2FjY2Vzc19yZWYoY3VyX3JlZiwgb3RoZXJlbmRf aWQsCisJCQkJeGVuX3BhZ2VfdG9fZ2ZuKGJ1Zi0+cGFnZXNbaV0pLCAwKTsKKwkJYnVmLT5ncmVm c1tncmVmX2lkeCsrXSA9IGN1cl9yZWY7CisJfQorCXJldHVybiAwOworfQorCitzdGF0aWMgaW50 IGdyYW50X3JlZmVyZW5jZXMoc3RydWN0IHhlbl9kcm1fZnJvbnRfc2hidWYgKmJ1ZikKK3sKKwln cmFudF9yZWZfdCBwcml2X2dyZWZfaGVhZDsKKwlpbnQgcmV0LCBpLCBqLCBjdXJfcmVmOworCWlu dCBvdGhlcmVuZF9pZCwgbnVtX3BhZ2VzX2RpcjsKKworCXJldCA9IGdudHRhYl9hbGxvY19ncmFu dF9yZWZlcmVuY2VzKGJ1Zi0+bnVtX2dyZWZzLCAmcHJpdl9ncmVmX2hlYWQpOworCWlmIChyZXQg PCAwKSB7CisJCURSTV9FUlJPUigiQ2Fubm90IGFsbG9jYXRlIGdyYW50IHJlZmVyZW5jZXNcbiIp OworCQlyZXR1cm4gcmV0OworCX0KKwlvdGhlcmVuZF9pZCA9IGJ1Zi0+eGJfZGV2LT5vdGhlcmVu ZF9pZDsKKwlqID0gMDsKKwludW1fcGFnZXNfZGlyID0gZ2V0X251bV9wYWdlc19kaXIoYnVmKTsK Kwlmb3IgKGkgPSAwOyBpIDwgbnVtX3BhZ2VzX2RpcjsgaSsrKSB7CisJCXVuc2lnbmVkIGxvbmcg ZnJhbWU7CisKKwkJY3VyX3JlZiA9IGdudHRhYl9jbGFpbV9ncmFudF9yZWZlcmVuY2UoJnByaXZf Z3JlZl9oZWFkKTsKKwkJaWYgKGN1cl9yZWYgPCAwKQorCQkJcmV0dXJuIGN1cl9yZWY7CisKKwkJ ZnJhbWUgPSB4ZW5fcGFnZV90b19nZm4odmlydF90b19wYWdlKGJ1Zi0+ZGlyZWN0b3J5ICsKKwkJ CQlQQUdFX1NJWkUgKiBpKSk7CisJCWdudHRhYl9ncmFudF9mb3JlaWduX2FjY2Vzc19yZWYoY3Vy X3JlZiwgb3RoZXJlbmRfaWQsCisJCQkJZnJhbWUsIDApOworCQlidWYtPmdyZWZzW2orK10gPSBj dXJfcmVmOworCX0KKworCWlmIChidWYtPm9wcy0+Z3JhbnRfcmVmc19mb3JfYnVmZmVyKSB7CisJ CXJldCA9IGJ1Zi0+b3BzLT5ncmFudF9yZWZzX2Zvcl9idWZmZXIoYnVmLCAmcHJpdl9ncmVmX2hl YWQsIGopOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwl9CisKKwlnbnR0YWJfZnJlZV9n cmFudF9yZWZlcmVuY2VzKHByaXZfZ3JlZl9oZWFkKTsKKwlyZXR1cm4gMDsKK30KKworc3RhdGlj IGludCBhbGxvY19zdG9yYWdlKHN0cnVjdCB4ZW5fZHJtX2Zyb250X3NoYnVmICpidWYpCit7CisJ aWYgKGJ1Zi0+c2d0KSB7CisJCWJ1Zi0+cGFnZXMgPSBrdm1hbGxvY19hcnJheShidWYtPm51bV9w YWdlcywKKwkJCQlzaXplb2Yoc3RydWN0IHBhZ2UgKiksIEdGUF9LRVJORUwpOworCQlpZiAoIWJ1 Zi0+cGFnZXMpCisJCQlyZXR1cm4gLUVOT01FTTsKKworCQlpZiAoZHJtX3ByaW1lX3NnX3RvX3Bh Z2VfYWRkcl9hcnJheXMoYnVmLT5zZ3QsIGJ1Zi0+cGFnZXMsCisJCQkJTlVMTCwgYnVmLT5udW1f cGFnZXMpIDwgMCkKKwkJCXJldHVybiAtRUlOVkFMOworCX0KKworCWJ1Zi0+Z3JlZnMgPSBrY2Fs bG9jKGJ1Zi0+bnVtX2dyZWZzLCBzaXplb2YoKmJ1Zi0+Z3JlZnMpLCBHRlBfS0VSTkVMKTsKKwlp ZiAoIWJ1Zi0+Z3JlZnMpCisJCXJldHVybiAtRU5PTUVNOworCisJYnVmLT5kaXJlY3RvcnkgPSBr Y2FsbG9jKGdldF9udW1fcGFnZXNfZGlyKGJ1ZiksIFBBR0VfU0laRSwgR0ZQX0tFUk5FTCk7CisJ aWYgKCFidWYtPmRpcmVjdG9yeSkKKwkJcmV0dXJuIC1FTk9NRU07CisKKwlyZXR1cm4gMDsKK30K KworLyoKKyAqIEZvciBiZSBhbGxvY2F0ZWQgYnVmZmVycyB3ZSBkb24ndCBuZWVkIGdyYW50X3Jl ZnNfZm9yX2J1ZmZlciBhcyB0aG9zZQorICogZ3JhbnQgcmVmZXJlbmNlcyBhcmUgYWxsb2NhdGVk IGF0IGJhY2tlbmQgc2lkZQorICovCitzdGF0aWMgY29uc3Qgc3RydWN0IHhlbl9kcm1fZnJvbnRf c2hidWZfb3BzIGJhY2tlbmRfb3BzID0geworCS5jYWxjX251bV9ncmVmcyA9IGJhY2tlbmRfY2Fs Y19udW1fZ3JlZnMsCisJLmZpbGxfcGFnZV9kaXIgPSBiYWNrZW5kX2ZpbGxfcGFnZV9kaXIsCisJ Lm1hcCA9IGJhY2tlbmRfbWFwLAorCS51bm1hcCA9IGJhY2tlbmRfdW5tYXAKK307CisKKy8qIEZv ciBsb2NhbGx5IGdyYW50ZWQgcmVmZXJlbmNlcyB3ZSBkbyBub3QgbmVlZCB0byBtYXAvdW5tYXAg dGhlIHJlZmVyZW5jZXMgKi8KK3N0YXRpYyBjb25zdCBzdHJ1Y3QgeGVuX2RybV9mcm9udF9zaGJ1 Zl9vcHMgbG9jYWxfb3BzID0geworCS5jYWxjX251bV9ncmVmcyA9IGd1ZXN0X2NhbGNfbnVtX2dy ZWZzLAorCS5maWxsX3BhZ2VfZGlyID0gZ3Vlc3RfZmlsbF9wYWdlX2RpciwKKwkuZ3JhbnRfcmVm c19mb3JfYnVmZmVyID0gZ3Vlc3RfZ3JhbnRfcmVmc19mb3JfYnVmZmVyLAorfTsKKworc3RydWN0 IHhlbl9kcm1fZnJvbnRfc2hidWYgKnhlbl9kcm1fZnJvbnRfc2hidWZfYWxsb2MoCisJCXN0cnVj dCB4ZW5fZHJtX2Zyb250X3NoYnVmX2NmZyAqY2ZnKQoreworCXN0cnVjdCB4ZW5fZHJtX2Zyb250 X3NoYnVmICpidWY7CisJaW50IHJldDsKKworCS8qIGVpdGhlciBwYWdlcyBvciBzZ3QsIG5vdCBi b3RoICovCisJaWYgKHVubGlrZWx5KGNmZy0+cGFnZXMgJiYgY2ZnLT5zZ3QpKSB7CisJCURSTV9F UlJPUigiQ2Fubm90IGhhbmRsZSBidWZmZXIgYWxsb2NhdGlvbiB3aXRoIGJvdGggcGFnZXMgYW5k IHNnIHRhYmxlIHByb3ZpZGVkXG4iKTsKKwkJcmV0dXJuIE5VTEw7CisJfQorCisJYnVmID0ga3ph bGxvYyhzaXplb2YoKmJ1ZiksIEdGUF9LRVJORUwpOworCWlmICghYnVmKQorCQlyZXR1cm4gTlVM TDsKKworCWlmIChjZmctPmJlX2FsbG9jKQorCQlidWYtPm9wcyA9ICZiYWNrZW5kX29wczsKKwll bHNlCisJCWJ1Zi0+b3BzID0gJmxvY2FsX29wczsKKworCWJ1Zi0+eGJfZGV2ID0gY2ZnLT54Yl9k ZXY7CisJYnVmLT5udW1fcGFnZXMgPSBESVZfUk9VTkRfVVAoY2ZnLT5zaXplLCBQQUdFX1NJWkUp OworCWJ1Zi0+c2d0ID0gY2ZnLT5zZ3Q7CisJYnVmLT5wYWdlcyA9IGNmZy0+cGFnZXM7CisKKwli dWYtPm9wcy0+Y2FsY19udW1fZ3JlZnMoYnVmKTsKKworCXJldCA9IGFsbG9jX3N0b3JhZ2UoYnVm KTsKKwlpZiAocmV0KQorCQlnb3RvIGZhaWw7CisKKwlyZXQgPSBncmFudF9yZWZlcmVuY2VzKGJ1 Zik7CisJaWYgKHJldCkKKwkJZ290byBmYWlsOworCisJYnVmLT5vcHMtPmZpbGxfcGFnZV9kaXIo YnVmKTsKKworCXJldHVybiBidWY7CisKK2ZhaWw6CisJeGVuX2RybV9mcm9udF9zaGJ1Zl9mcmVl KGJ1Zik7CisJcmV0dXJuIEVSUl9QVFIocmV0KTsKK30KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS94ZW4veGVuX2RybV9mcm9udF9zaGJ1Zi5oIGIvZHJpdmVycy9ncHUvZHJtL3hlbi94ZW5f ZHJtX2Zyb250X3NoYnVmLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw Li42YzRmYmM2OGYzMjgKLS0tIC9kZXYvbnVsbAorKysgYi9kcml2ZXJzL2dwdS9kcm0veGVuL3hl bl9kcm1fZnJvbnRfc2hidWYuaApAQCAtMCwwICsxLDcyIEBACisvKiBTUERYLUxpY2Vuc2UtSWRl bnRpZmllcjogR1BMLTIuMCBPUiBNSVQgKi8KKworLyoKKyAqICBYZW4gcGFyYS12aXJ0dWFsIERS TSBkZXZpY2UKKyAqCisgKiBDb3B5cmlnaHQgKEMpIDIwMTYtMjAxOCBFUEFNIFN5c3RlbXMgSW5j LgorICoKKyAqIEF1dGhvcjogT2xla3NhbmRyIEFuZHJ1c2hjaGVua28gPG9sZWtzYW5kcl9hbmRy dXNoY2hlbmtvQGVwYW0uY29tPgorICovCisKKyNpZm5kZWYgX19YRU5fRFJNX0ZST05UX1NIQlVG X0hfCisjZGVmaW5lIF9fWEVOX0RSTV9GUk9OVF9TSEJVRl9IXworCisjaW5jbHVkZSA8bGludXgv a2VybmVsLmg+CisjaW5jbHVkZSA8bGludXgvc2NhdHRlcmxpc3QuaD4KKworI2luY2x1ZGUgPHhl bi9ncmFudF90YWJsZS5oPgorCitzdHJ1Y3QgeGVuX2RybV9mcm9udF9zaGJ1ZiB7CisJLyoKKwkg KiBudW1iZXIgb2YgcmVmZXJlbmNlcyBncmFudGVkIGZvciB0aGUgYmFja2VuZCB1c2U6CisJICog IC0gZm9yIGFsbG9jYXRlZC9pbXBvcnRlZCBkbWEtYnVmJ3MgdGhpcyBob2xkcyBudW1iZXIgb2Yg Z3JhbnQKKwkgKiAgICByZWZlcmVuY2VzIGZvciB0aGUgcGFnZSBkaXJlY3RvcnkgYW5kIHBhZ2Vz IG9mIHRoZSBidWZmZXIKKwkgKiAgLSBmb3IgdGhlIGJ1ZmZlciBwcm92aWRlZCBieSB0aGUgYmFj a2VuZCB0aGlzIGhvbGRzIG51bWJlciBvZgorCSAqICAgIGdyYW50IHJlZmVyZW5jZXMgZm9yIHRo ZSBwYWdlIGRpcmVjdG9yeSBhcyBncmFudCByZWZlcmVuY2VzIGZvcgorCSAqICAgIHRoZSBidWZm ZXIgd2lsbCBiZSBwcm92aWRlZCBieSB0aGUgYmFja2VuZAorCSAqLworCWludCBudW1fZ3JlZnM7 CisJZ3JhbnRfcmVmX3QgKmdyZWZzOworCXVuc2lnbmVkIGNoYXIgKmRpcmVjdG9yeTsKKworCS8q CisJICogdGhlcmUgYXJlIDIgd2F5cyB0byBwcm92aWRlIGJhY2tpbmcgc3RvcmFnZSBmb3IgdGhp cyBzaGFyZWQgYnVmZmVyOgorCSAqIGVpdGhlciBwYWdlcyBvciBzZ3QuIGlmIGJ1ZmZlciBjcmVh dGVkIGZyb20gc2d0IHRoZW4gd2Ugb3duCisJICogdGhlIHBhZ2VzIGFuZCBtdXN0IGZyZWUgdGhv c2Ugb3Vyc2VsdmVzIG9uIGNsb3N1cmUKKwkgKi8KKwlpbnQgbnVtX3BhZ2VzOworCXN0cnVjdCBw YWdlICoqcGFnZXM7CisKKwlzdHJ1Y3Qgc2dfdGFibGUgKnNndDsKKworCXN0cnVjdCB4ZW5idXNf ZGV2aWNlICp4Yl9kZXY7CisKKwkvKiB0aGVzZSBhcmUgdGhlIG9wcyB1c2VkIGludGVybmFsbHkg ZGVwZW5kaW5nIG9uIGJlX2FsbG9jIG1vZGUgKi8KKwljb25zdCBzdHJ1Y3QgeGVuX2RybV9mcm9u dF9zaGJ1Zl9vcHMgKm9wczsKKworCS8qIFhlbiBtYXAgaGFuZGxlcyBmb3IgdGhlIGJ1ZmZlciBh bGxvY2F0ZWQgYnkgdGhlIGJhY2tlbmQgKi8KKwlncmFudF9oYW5kbGVfdCAqYmFja2VuZF9tYXBf aGFuZGxlczsKK307CisKK3N0cnVjdCB4ZW5fZHJtX2Zyb250X3NoYnVmX2NmZyB7CisJc3RydWN0 IHhlbmJ1c19kZXZpY2UgKnhiX2RldjsKKwlzaXplX3Qgc2l6ZTsKKwlzdHJ1Y3QgcGFnZSAqKnBh Z2VzOworCXN0cnVjdCBzZ190YWJsZSAqc2d0OworCWJvb2wgYmVfYWxsb2M7Cit9OworCitzdHJ1 Y3QgeGVuX2RybV9mcm9udF9zaGJ1ZiAqeGVuX2RybV9mcm9udF9zaGJ1Zl9hbGxvYygKKwkJc3Ry dWN0IHhlbl9kcm1fZnJvbnRfc2hidWZfY2ZnICpjZmcpOworCitncmFudF9yZWZfdCB4ZW5fZHJt X2Zyb250X3NoYnVmX2dldF9kaXJfc3RhcnQoc3RydWN0IHhlbl9kcm1fZnJvbnRfc2hidWYgKmJ1 Zik7CisKK2ludCB4ZW5fZHJtX2Zyb250X3NoYnVmX21hcChzdHJ1Y3QgeGVuX2RybV9mcm9udF9z aGJ1ZiAqYnVmKTsKKworaW50IHhlbl9kcm1fZnJvbnRfc2hidWZfdW5tYXAoc3RydWN0IHhlbl9k cm1fZnJvbnRfc2hidWYgKmJ1Zik7CisKK3ZvaWQgeGVuX2RybV9mcm9udF9zaGJ1Zl9mbHVzaChz dHJ1Y3QgeGVuX2RybV9mcm9udF9zaGJ1ZiAqYnVmKTsKKwordm9pZCB4ZW5fZHJtX2Zyb250X3No YnVmX2ZyZWUoc3RydWN0IHhlbl9kcm1fZnJvbnRfc2hidWYgKmJ1Zik7CisKKyNlbmRpZiAvKiBf X1hFTl9EUk1fRlJPTlRfU0hCVUZfSF8gKi8KLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752845AbeCMNcO (ORCPT ); Tue, 13 Mar 2018 09:32:14 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:35630 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932907AbeCMNb0 (ORCPT ); Tue, 13 Mar 2018 09:31:26 -0400 X-Google-Smtp-Source: AG47ELu5Dy4YoOmeR5niRF9VD0WoNGgIs9goYe2nhb6AQSaYyex5XAj7kgFdxw1kNQfdbL47aN7T4A== From: Oleksandr Andrushchenko To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, airlied@linux.ie, daniel.vetter@intel.com, seanpaul@chromium.org, gustavo@padovan.org, jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Cc: andr2000@gmail.com, Oleksandr Andrushchenko Subject: [PATCH v2 5/8] drm/xen-front: Implement handling of shared display buffers Date: Tue, 13 Mar 2018 15:31:04 +0200 Message-Id: <1520947867-32514-6-git-send-email-andr2000@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520947867-32514-1-git-send-email-andr2000@gmail.com> References: <1520947867-32514-1-git-send-email-andr2000@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oleksandr Andrushchenko Implement shared buffer handling according to the para-virtualized display device protocol at xen/interface/io/displif.h: - handle page directories according to displif protocol: - allocate and share page directories - grant references to the required set of pages for the page directory - allocate xen balllooned pages via Xen balloon driver with alloc_xenballooned_pages/free_xenballooned_pages - grant references to the required set of pages for the shared buffer itself - implement pages map/unmap for the buffers allocated by the backend (gnttab_map_refs/gnttab_unmap_refs) Signed-off-by: Oleksandr Andrushchenko --- drivers/gpu/drm/xen/Makefile | 1 + drivers/gpu/drm/xen/xen_drm_front.c | 8 + drivers/gpu/drm/xen/xen_drm_front_shbuf.c | 432 ++++++++++++++++++++++++++++++ drivers/gpu/drm/xen/xen_drm_front_shbuf.h | 72 +++++ 4 files changed, 513 insertions(+) create mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.c create mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.h diff --git a/drivers/gpu/drm/xen/Makefile b/drivers/gpu/drm/xen/Makefile index 8417332f3b58..6c8c751f12ed 100644 --- a/drivers/gpu/drm/xen/Makefile +++ b/drivers/gpu/drm/xen/Makefile @@ -2,6 +2,7 @@ drm_xen_front-objs := xen_drm_front.o \ xen_drm_front_evtchnl.o \ + xen_drm_front_shbuf.o \ xen_drm_front_cfg.o obj-$(CONFIG_DRM_XEN_FRONTEND) += drm_xen_front.o diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 8312dab862e2..fae631067c31 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -18,6 +18,7 @@ #include "xen_drm_front.h" #include "xen_drm_front_evtchnl.h" +#include "xen_drm_front_shbuf.h" static void xen_drv_remove_internal(struct xen_drm_front_info *front_info) { @@ -187,6 +188,13 @@ static struct xenbus_driver xen_driver = { static int __init xen_drv_init(void) { + /* At the moment we only support case with XEN_PAGE_SIZE == PAGE_SIZE */ + if (XEN_PAGE_SIZE != PAGE_SIZE) { + DRM_ERROR(XENDISPL_DRIVER_NAME ": different kernel and Xen page sizes are not supported: XEN_PAGE_SIZE (%lu) != PAGE_SIZE (%lu)\n", + XEN_PAGE_SIZE, PAGE_SIZE); + return -ENODEV; + } + if (!xen_domain()) return -ENODEV; diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c b/drivers/gpu/drm/xen/xen_drm_front_shbuf.c new file mode 100644 index 000000000000..0fde2d8f7706 --- /dev/null +++ b/drivers/gpu/drm/xen/xen_drm_front_shbuf.c @@ -0,0 +1,432 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT + +/* + * Xen para-virtual DRM device + * + * Copyright (C) 2016-2018 EPAM Systems Inc. + * + * Author: Oleksandr Andrushchenko + */ + +#include + +#if defined(CONFIG_X86) +#include +#endif +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "xen_drm_front.h" +#include "xen_drm_front_shbuf.h" + +struct xen_drm_front_shbuf_ops { + /* + * Calculate number of grefs required to handle this buffer, + * e.g. if grefs are required for page directory only or the buffer + * pages as well. + */ + void (*calc_num_grefs)(struct xen_drm_front_shbuf *buf); + /* Fill page directory according to para-virtual display protocol. */ + void (*fill_page_dir)(struct xen_drm_front_shbuf *buf); + /* Claim grant references for the pages of the buffer. */ + int (*grant_refs_for_buffer)(struct xen_drm_front_shbuf *buf, + grant_ref_t *priv_gref_head, int gref_idx); + /* Map grant references of the buffer. */ + int (*map)(struct xen_drm_front_shbuf *buf); + /* Unmap grant references of the buffer. */ + int (*unmap)(struct xen_drm_front_shbuf *buf); +}; + +grant_ref_t xen_drm_front_shbuf_get_dir_start(struct xen_drm_front_shbuf *buf) +{ + if (!buf->grefs) + return GRANT_INVALID_REF; + + return buf->grefs[0]; +} + +int xen_drm_front_shbuf_map(struct xen_drm_front_shbuf *buf) +{ + if (buf->ops->map) + return buf->ops->map(buf); + + /* no need to map own grant references */ + return 0; +} + +int xen_drm_front_shbuf_unmap(struct xen_drm_front_shbuf *buf) +{ + if (buf->ops->unmap) + return buf->ops->unmap(buf); + + /* no need to unmap own grant references */ + return 0; +} + +void xen_drm_front_shbuf_flush(struct xen_drm_front_shbuf *buf) +{ +#if defined(CONFIG_X86) + drm_clflush_pages(buf->pages, buf->num_pages); +#endif +} + +void xen_drm_front_shbuf_free(struct xen_drm_front_shbuf *buf) +{ + if (buf->grefs) { + int i; + + for (i = 0; i < buf->num_grefs; i++) + if (buf->grefs[i] != GRANT_INVALID_REF) + gnttab_end_foreign_access(buf->grefs[i], + 0, 0UL); + } + kfree(buf->grefs); + kfree(buf->directory); + if (buf->sgt) { + sg_free_table(buf->sgt); + kvfree(buf->pages); + } + kfree(buf); +} + +/* + * number of grefs a page can hold with respect to the + * struct xendispl_page_directory header + */ +#define XEN_DRM_NUM_GREFS_PER_PAGE ((PAGE_SIZE - \ + offsetof(struct xendispl_page_directory, gref)) / \ + sizeof(grant_ref_t)) + +static int get_num_pages_dir(struct xen_drm_front_shbuf *buf) +{ + /* number of pages the page directory consumes itself */ + return DIV_ROUND_UP(buf->num_pages, XEN_DRM_NUM_GREFS_PER_PAGE); +} + +static void backend_calc_num_grefs(struct xen_drm_front_shbuf *buf) +{ + /* only for pages the page directory consumes itself */ + buf->num_grefs = get_num_pages_dir(buf); +} + +static void guest_calc_num_grefs(struct xen_drm_front_shbuf *buf) +{ + /* + * number of pages the page directory consumes itself + * plus grefs for the buffer pages + */ + buf->num_grefs = get_num_pages_dir(buf) + buf->num_pages; +} + +#define xen_page_to_vaddr(page) \ + ((phys_addr_t)pfn_to_kaddr(page_to_xen_pfn(page))) + +static int backend_unmap(struct xen_drm_front_shbuf *buf) +{ + struct gnttab_unmap_grant_ref *unmap_ops; + int i, ret; + + if (!buf->pages || !buf->backend_map_handles || !buf->grefs) + return 0; + + unmap_ops = kcalloc(buf->num_pages, sizeof(*unmap_ops), + GFP_KERNEL); + if (!unmap_ops) { + DRM_ERROR("Failed to get memory while unmapping\n"); + return -ENOMEM; + } + + for (i = 0; i < buf->num_pages; i++) { + phys_addr_t addr; + + addr = xen_page_to_vaddr(buf->pages[i]); + gnttab_set_unmap_op(&unmap_ops[i], addr, GNTMAP_host_map, + buf->backend_map_handles[i]); + } + + ret = gnttab_unmap_refs(unmap_ops, NULL, buf->pages, + buf->num_pages); + + for (i = 0; i < buf->num_pages; i++) { + if (unlikely(unmap_ops[i].status != GNTST_okay)) + DRM_ERROR("Failed to unmap page %d: %d\n", + i, unmap_ops[i].status); + } + + if (ret) + DRM_ERROR("Failed to unmap grant references, ret %d", ret); + + kfree(unmap_ops); + kfree(buf->backend_map_handles); + buf->backend_map_handles = NULL; + return ret; +} + +static int backend_map(struct xen_drm_front_shbuf *buf) +{ + struct gnttab_map_grant_ref *map_ops = NULL; + unsigned char *ptr; + int ret, cur_gref, cur_dir_page, cur_page, grefs_left; + + map_ops = kcalloc(buf->num_pages, sizeof(*map_ops), GFP_KERNEL); + if (!map_ops) + return -ENOMEM; + + buf->backend_map_handles = kcalloc(buf->num_pages, + sizeof(*buf->backend_map_handles), GFP_KERNEL); + if (!buf->backend_map_handles) { + kfree(map_ops); + return -ENOMEM; + } + + /* + * read page directory to get grefs from the backend: for external + * buffer we only allocate buf->grefs for the page directory, + * so buf->num_grefs has number of pages in the page directory itself + */ + ptr = buf->directory; + grefs_left = buf->num_pages; + cur_page = 0; + for (cur_dir_page = 0; cur_dir_page < buf->num_grefs; cur_dir_page++) { + struct xendispl_page_directory *page_dir = + (struct xendispl_page_directory *)ptr; + int to_copy = XEN_DRM_NUM_GREFS_PER_PAGE; + + if (to_copy > grefs_left) + to_copy = grefs_left; + + for (cur_gref = 0; cur_gref < to_copy; cur_gref++) { + phys_addr_t addr; + + addr = xen_page_to_vaddr(buf->pages[cur_page]); + gnttab_set_map_op(&map_ops[cur_page], addr, + GNTMAP_host_map, + page_dir->gref[cur_gref], + buf->xb_dev->otherend_id); + cur_page++; + } + + grefs_left -= to_copy; + ptr += PAGE_SIZE; + } + ret = gnttab_map_refs(map_ops, NULL, buf->pages, buf->num_pages); + + /* save handles even if error, so we can unmap */ + for (cur_page = 0; cur_page < buf->num_pages; cur_page++) { + buf->backend_map_handles[cur_page] = map_ops[cur_page].handle; + if (unlikely(map_ops[cur_page].status != GNTST_okay)) + DRM_ERROR("Failed to map page %d: %d\n", + cur_page, map_ops[cur_page].status); + } + + if (ret) { + DRM_ERROR("Failed to map grant references, ret %d", ret); + backend_unmap(buf); + } + + kfree(map_ops); + return ret; +} + +static void backend_fill_page_dir(struct xen_drm_front_shbuf *buf) +{ + struct xendispl_page_directory *page_dir; + unsigned char *ptr; + int i, num_pages_dir; + + ptr = buf->directory; + num_pages_dir = get_num_pages_dir(buf); + + /* fill only grefs for the page directory itself */ + for (i = 0; i < num_pages_dir - 1; i++) { + page_dir = (struct xendispl_page_directory *)ptr; + + page_dir->gref_dir_next_page = buf->grefs[i + 1]; + ptr += PAGE_SIZE; + } + /* last page must say there is no more pages */ + page_dir = (struct xendispl_page_directory *)ptr; + page_dir->gref_dir_next_page = GRANT_INVALID_REF; +} + +static void guest_fill_page_dir(struct xen_drm_front_shbuf *buf) +{ + unsigned char *ptr; + int cur_gref, grefs_left, to_copy, i, num_pages_dir; + + ptr = buf->directory; + num_pages_dir = get_num_pages_dir(buf); + + /* + * while copying, skip grefs at start, they are for pages + * granted for the page directory itself + */ + cur_gref = num_pages_dir; + grefs_left = buf->num_pages; + for (i = 0; i < num_pages_dir; i++) { + struct xendispl_page_directory *page_dir = + (struct xendispl_page_directory *)ptr; + + if (grefs_left <= XEN_DRM_NUM_GREFS_PER_PAGE) { + to_copy = grefs_left; + page_dir->gref_dir_next_page = GRANT_INVALID_REF; + } else { + to_copy = XEN_DRM_NUM_GREFS_PER_PAGE; + page_dir->gref_dir_next_page = buf->grefs[i + 1]; + } + memcpy(&page_dir->gref, &buf->grefs[cur_gref], + to_copy * sizeof(grant_ref_t)); + ptr += PAGE_SIZE; + grefs_left -= to_copy; + cur_gref += to_copy; + } +} + +static int guest_grant_refs_for_buffer(struct xen_drm_front_shbuf *buf, + grant_ref_t *priv_gref_head, int gref_idx) +{ + int i, cur_ref, otherend_id; + + otherend_id = buf->xb_dev->otherend_id; + for (i = 0; i < buf->num_pages; i++) { + cur_ref = gnttab_claim_grant_reference(priv_gref_head); + if (cur_ref < 0) + return cur_ref; + gnttab_grant_foreign_access_ref(cur_ref, otherend_id, + xen_page_to_gfn(buf->pages[i]), 0); + buf->grefs[gref_idx++] = cur_ref; + } + return 0; +} + +static int grant_references(struct xen_drm_front_shbuf *buf) +{ + grant_ref_t priv_gref_head; + int ret, i, j, cur_ref; + int otherend_id, num_pages_dir; + + ret = gnttab_alloc_grant_references(buf->num_grefs, &priv_gref_head); + if (ret < 0) { + DRM_ERROR("Cannot allocate grant references\n"); + return ret; + } + otherend_id = buf->xb_dev->otherend_id; + j = 0; + num_pages_dir = get_num_pages_dir(buf); + for (i = 0; i < num_pages_dir; i++) { + unsigned long frame; + + cur_ref = gnttab_claim_grant_reference(&priv_gref_head); + if (cur_ref < 0) + return cur_ref; + + frame = xen_page_to_gfn(virt_to_page(buf->directory + + PAGE_SIZE * i)); + gnttab_grant_foreign_access_ref(cur_ref, otherend_id, + frame, 0); + buf->grefs[j++] = cur_ref; + } + + if (buf->ops->grant_refs_for_buffer) { + ret = buf->ops->grant_refs_for_buffer(buf, &priv_gref_head, j); + if (ret) + return ret; + } + + gnttab_free_grant_references(priv_gref_head); + return 0; +} + +static int alloc_storage(struct xen_drm_front_shbuf *buf) +{ + if (buf->sgt) { + buf->pages = kvmalloc_array(buf->num_pages, + sizeof(struct page *), GFP_KERNEL); + if (!buf->pages) + return -ENOMEM; + + if (drm_prime_sg_to_page_addr_arrays(buf->sgt, buf->pages, + NULL, buf->num_pages) < 0) + return -EINVAL; + } + + buf->grefs = kcalloc(buf->num_grefs, sizeof(*buf->grefs), GFP_KERNEL); + if (!buf->grefs) + return -ENOMEM; + + buf->directory = kcalloc(get_num_pages_dir(buf), PAGE_SIZE, GFP_KERNEL); + if (!buf->directory) + return -ENOMEM; + + return 0; +} + +/* + * For be allocated buffers we don't need grant_refs_for_buffer as those + * grant references are allocated at backend side + */ +static const struct xen_drm_front_shbuf_ops backend_ops = { + .calc_num_grefs = backend_calc_num_grefs, + .fill_page_dir = backend_fill_page_dir, + .map = backend_map, + .unmap = backend_unmap +}; + +/* For locally granted references we do not need to map/unmap the references */ +static const struct xen_drm_front_shbuf_ops local_ops = { + .calc_num_grefs = guest_calc_num_grefs, + .fill_page_dir = guest_fill_page_dir, + .grant_refs_for_buffer = guest_grant_refs_for_buffer, +}; + +struct xen_drm_front_shbuf *xen_drm_front_shbuf_alloc( + struct xen_drm_front_shbuf_cfg *cfg) +{ + struct xen_drm_front_shbuf *buf; + int ret; + + /* either pages or sgt, not both */ + if (unlikely(cfg->pages && cfg->sgt)) { + DRM_ERROR("Cannot handle buffer allocation with both pages and sg table provided\n"); + return NULL; + } + + buf = kzalloc(sizeof(*buf), GFP_KERNEL); + if (!buf) + return NULL; + + if (cfg->be_alloc) + buf->ops = &backend_ops; + else + buf->ops = &local_ops; + + buf->xb_dev = cfg->xb_dev; + buf->num_pages = DIV_ROUND_UP(cfg->size, PAGE_SIZE); + buf->sgt = cfg->sgt; + buf->pages = cfg->pages; + + buf->ops->calc_num_grefs(buf); + + ret = alloc_storage(buf); + if (ret) + goto fail; + + ret = grant_references(buf); + if (ret) + goto fail; + + buf->ops->fill_page_dir(buf); + + return buf; + +fail: + xen_drm_front_shbuf_free(buf); + return ERR_PTR(ret); +} diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.h b/drivers/gpu/drm/xen/xen_drm_front_shbuf.h new file mode 100644 index 000000000000..6c4fbc68f328 --- /dev/null +++ b/drivers/gpu/drm/xen/xen_drm_front_shbuf.h @@ -0,0 +1,72 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ + +/* + * Xen para-virtual DRM device + * + * Copyright (C) 2016-2018 EPAM Systems Inc. + * + * Author: Oleksandr Andrushchenko + */ + +#ifndef __XEN_DRM_FRONT_SHBUF_H_ +#define __XEN_DRM_FRONT_SHBUF_H_ + +#include +#include + +#include + +struct xen_drm_front_shbuf { + /* + * number of references granted for the backend use: + * - for allocated/imported dma-buf's this holds number of grant + * references for the page directory and pages of the buffer + * - for the buffer provided by the backend this holds number of + * grant references for the page directory as grant references for + * the buffer will be provided by the backend + */ + int num_grefs; + grant_ref_t *grefs; + unsigned char *directory; + + /* + * there are 2 ways to provide backing storage for this shared buffer: + * either pages or sgt. if buffer created from sgt then we own + * the pages and must free those ourselves on closure + */ + int num_pages; + struct page **pages; + + struct sg_table *sgt; + + struct xenbus_device *xb_dev; + + /* these are the ops used internally depending on be_alloc mode */ + const struct xen_drm_front_shbuf_ops *ops; + + /* Xen map handles for the buffer allocated by the backend */ + grant_handle_t *backend_map_handles; +}; + +struct xen_drm_front_shbuf_cfg { + struct xenbus_device *xb_dev; + size_t size; + struct page **pages; + struct sg_table *sgt; + bool be_alloc; +}; + +struct xen_drm_front_shbuf *xen_drm_front_shbuf_alloc( + struct xen_drm_front_shbuf_cfg *cfg); + +grant_ref_t xen_drm_front_shbuf_get_dir_start(struct xen_drm_front_shbuf *buf); + +int xen_drm_front_shbuf_map(struct xen_drm_front_shbuf *buf); + +int xen_drm_front_shbuf_unmap(struct xen_drm_front_shbuf *buf); + +void xen_drm_front_shbuf_flush(struct xen_drm_front_shbuf *buf); + +void xen_drm_front_shbuf_free(struct xen_drm_front_shbuf *buf); + +#endif /* __XEN_DRM_FRONT_SHBUF_H_ */ -- 2.7.4