From: Maarten Lankhorst Subject: [PATCH 2/2] drm/i915: Track pinned vma in intel_plane_state Date: Tue, 31 Jan 2017 10:21:31 +0100 Message-ID: <1485854491-27389-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1485854491-27389-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1485854491-27389-1-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Linus Torvalds List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpXaXRoIGF0b21p YyBwbGFuZSBzdGF0ZXMgd2UgYXJlIGFibGUgdG8gdHJhY2sgYW4gYWxsb2NhdGlvbiByaWdodCBm cm9tCnByZXBhcmF0aW9uLCBkdXJpbmcgdXNlIGFuZCB0aHJvdWdoIHRvIHRoZSBmaW5hbCBmcmVl IGFmdGVyIGJlaW5nCnN3YXBwZWQgb3V0IGZvciBhIG5ldyBwbGFuZS4gV2UgY2FuIGNvdXBsZSB0 aGUgVk1BIHdlIHBpbiBmb3IgdGhlCmZyYW1lYnVmZmVyIChhbmQgaXRzIHJvdGF0aW9uKSB0byB0 aGlzIGxpZmV0aW1lIGFuZCBhdm9pZCBhbGwgdGhlIGNsdW1zeQpsb29rdXBzIGluIGJldHdlZW4u Cgp2MjogUmVtb3ZlIHJlc2lkdWFsIHZtYSBvbiBwbGFuZSBjbGVhbnVwIChDaHJpcykKdjM6IEFk ZCBhIGRlc2NyaXB0aW9uIGZvciB0aGUgdm1hIGRlc3RydWN0aW9uIGluCiAgICBpbnRlbF9wbGFu ZV9kZXN0cm95X3N0YXRlIChNYWFydGVuKQoKUmVmZXJlbmNlczogaHR0cHM6Ly9idWdzLmZyZWVk ZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg4MjkKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFu a2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ckxpbms6IGh0dHA6Ly9w YXRjaHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzIwMTcwMTE2MTUyMTMxLjE4MDg5 LTEtY2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrCkFja2VkLWJ5OiBKb29uYXMgTGFodGluZW4gPGpv b25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CihjaGVycnkgcGlja2VkIGZyb20gY29tbWl0 IGJlMWUzNDE1MTNjYTIzYjA2NjhiN2IwZjI2ZmE2ZTJmZmM0NmJhMjApCi0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgfCAgMTYgKy0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgfCAgMjAgKysrKysKIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgIHwgMTI1ICsrKysrKysrKystLS0tLS0tLS0tLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgICAgICAgfCAgIDkg KystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYyAgICAgICAgICB8ICA1MiArKysr Ky0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jICAgICAgICB8ICAg NCArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgICAgICAgfCAgIDggKy0K IDcgZmlsZXMgY2hhbmdlZCwgOTkgaW5zZXJ0aW9ucygrKSwgMTM1IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDY5YmMzYjBjNDM5MC4uODQ5M2UxOWI1NjNhIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTEwMTIsNiArMTAxMiw4IEBAIHN0cnVjdCBpbnRlbF9m YmMgewogCXN0cnVjdCB3b3JrX3N0cnVjdCB1bmRlcnJ1bl93b3JrOwogCiAJc3RydWN0IGludGVs X2ZiY19zdGF0ZV9jYWNoZSB7CisJCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOworCiAJCXN0cnVjdCB7 CiAJCQl1bnNpZ25lZCBpbnQgbW9kZV9mbGFnczsKIAkJCXVpbnQzMl90IGhzd19iZHdfcGl4ZWxf cmF0ZTsKQEAgLTEwMjUsMTUgKzEwMjcsMTQgQEAgc3RydWN0IGludGVsX2ZiYyB7CiAJCX0gcGxh bmU7CiAKIAkJc3RydWN0IHsKLQkJCXU2NCBpbGtfZ2d0dF9vZmZzZXQ7CiAJCQl1aW50MzJfdCBw aXhlbF9mb3JtYXQ7CiAJCQl1bnNpZ25lZCBpbnQgc3RyaWRlOwotCQkJaW50IGZlbmNlX3JlZzsK LQkJCXVuc2lnbmVkIGludCB0aWxpbmdfbW9kZTsKIAkJfSBmYjsKIAl9IHN0YXRlX2NhY2hlOwog CiAJc3RydWN0IGludGVsX2ZiY19yZWdfcGFyYW1zIHsKKwkJc3RydWN0IGk5MTVfdm1hICp2bWE7 CisKIAkJc3RydWN0IHsKIAkJCWVudW0gcGlwZSBwaXBlOwogCQkJZW51bSBwbGFuZSBwbGFuZTsK QEAgLTEwNDEsMTAgKzEwNDIsOCBAQCBzdHJ1Y3QgaW50ZWxfZmJjIHsKIAkJfSBjcnRjOwogCiAJ CXN0cnVjdCB7Ci0JCQl1NjQgZ2d0dF9vZmZzZXQ7CiAJCQl1aW50MzJfdCBwaXhlbF9mb3JtYXQ7 CiAJCQl1bnNpZ25lZCBpbnQgc3RyaWRlOwotCQkJaW50IGZlbmNlX3JlZzsKIAkJfSBmYjsKIAog CQlpbnQgY2ZiX3NpemU7CkBAIC0zMTY4LDEzICszMTY3LDYgQEAgaTkxNV9nZW1fb2JqZWN0X3Rv X2dndHQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAlyZXR1cm4gaTkxNV9nZW1f b2JqX3RvX3ZtYShvYmosICZ0b19pOTE1KG9iai0+YmFzZS5kZXYpLT5nZ3R0LmJhc2UsIHZpZXcp OwogfQogCi1zdGF0aWMgaW5saW5lIHVuc2lnbmVkIGxvbmcKLWk5MTVfZ2VtX29iamVjdF9nZ3R0 X29mZnNldChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqbywKLQkJCSAgICBjb25zdCBzdHJ1 Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpCi17Ci0JcmV0dXJuIGk5MTVfZ2d0dF9vZmZzZXQoaTkx NV9nZW1fb2JqZWN0X3RvX2dndHQobywgdmlldykpOwotfQotCiAvKiBpOTE1X2dlbV9mZW5jZV9y ZWcuYyAqLwogaW50IF9fbXVzdF9jaGVjayBpOTE1X3ZtYV9nZXRfZmVuY2Uoc3RydWN0IGk5MTVf dm1hICp2bWEpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X3ZtYV9wdXRfZmVuY2Uoc3RydWN0IGk5 MTVfdm1hICp2bWEpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRv bWljX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwpp bmRleCBkYmU5ZmI0MWFlNTMuLjhkM2U1MTVmMjdiYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfYXRvbWljX3BsYW5lLmMKQEAgLTg1LDYgKzg1LDggQEAgaW50ZWxfcGxhbmVfZHVwbGlj YXRlX3N0YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQogCiAJX19kcm1fYXRvbWljX2hlbHBl cl9wbGFuZV9kdXBsaWNhdGVfc3RhdGUocGxhbmUsIHN0YXRlKTsKIAorCWludGVsX3N0YXRlLT52 bWEgPSBOVUxMOworCiAJcmV0dXJuIHN0YXRlOwogfQogCkBAIC0xMDAsNiArMTAyLDI0IEBAIHZv aWQKIGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ CQkgIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlKQogeworCXN0cnVjdCBpOTE1X3ZtYSAq dm1hOworCisJdm1hID0gZmV0Y2hfYW5kX3plcm8oJnRvX2ludGVsX3BsYW5lX3N0YXRlKHN0YXRl KS0+dm1hKTsKKworCS8qCisJICogRklYTUU6IE5vcm1hbGx5IGludGVsX2NsZWFudXBfcGxhbmVf ZmIgaGFuZGxlcyBkZXN0cnVjdGlvbiBvZiB2bWEuCisJICogV2UgY3VycmVudGx5IGRvbid0IGNs ZWFyIGFsbCBwbGFuZXMgZHVyaW5nIGRyaXZlciB1bmxvYWQsIHNvIHdlIGhhdmUKKwkgKiB0byBi ZSBhYmxlIHRvIHVucGluIHZtYSBoZXJlIGZvciBub3cuCisJICoKKwkgKiBOb3JtYWxseSB0aGlz IGNhbiBvbmx5IGhhcHBlbiBkdXJpbmcgdW5sb2FkIHdoZW4ga21zY29uIGlzIGRpc2FibGVkCisJ ICogYW5kIHVzZXJzcGFjZSBkb2Vzbid0IGF0dGVtcHQgdG8gc2V0IGEgZnJhbWVidWZmZXIgYXQg YWxsLgorCSAqLworCWlmICh2bWEpIHsKKwkJbXV0ZXhfbG9jaygmcGxhbmUtPmRldi0+c3RydWN0 X211dGV4KTsKKwkJaW50ZWxfdW5waW5fZmJfdm1hKHZtYSk7CisJCW11dGV4X3VubG9jaygmcGxh bmUtPmRldi0+c3RydWN0X211dGV4KTsKKwl9CisKIAlkcm1fYXRvbWljX2hlbHBlcl9wbGFuZV9k ZXN0cm95X3N0YXRlKHBsYW5lLCBzdGF0ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwppbmRleCBmMGI5YWE3YTA0ODMuLmYxZTRhMjFkNDY2NCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjIzNSwyNyArMjIzNSwyMiBAQCBpbnRlbF9waW5fYW5k X2ZlbmNlX2ZiX29iaihzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwgdW5zaWduZWQgaW50IHJv dGF0aW9uKQogCQkJaTkxNV92bWFfcGluX2ZlbmNlKHZtYSk7CiAJfQogCisJaTkxNV92bWFfZ2V0 KHZtYSk7CiBlcnI6CiAJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOwogCXJldHVybiB2 bWE7CiB9CiAKLXZvaWQgaW50ZWxfdW5waW5fZmJfb2JqKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIg KmZiLCB1bnNpZ25lZCBpbnQgcm90YXRpb24pCit2b2lkIGludGVsX3VucGluX2ZiX3ZtYShzdHJ1 Y3QgaTkxNV92bWEgKnZtYSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0g aW50ZWxfZmJfb2JqKGZiKTsKLQlzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgdmlldzsKLQlzdHJ1Y3Qg aTkxNV92bWEgKnZtYTsKLQotCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmb2JqLT5iYXNlLmRl di0+c3RydWN0X211dGV4KSk7Ci0KLQlpbnRlbF9maWxsX2ZiX2dndHRfdmlldygmdmlldywgZmIs IHJvdGF0aW9uKTsKLQl2bWEgPSBpOTE1X2dlbV9vYmplY3RfdG9fZ2d0dChvYmosICZ2aWV3KTsK Kwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZ2bWEtPnZtLT5kZXYtPnN0cnVjdF9tdXRleCk7CiAKIAlp ZiAoV0FSTl9PTl9PTkNFKCF2bWEpKQogCQlyZXR1cm47CiAKIAlpOTE1X3ZtYV91bnBpbl9mZW5j ZSh2bWEpOwogCWk5MTVfZ2VtX29iamVjdF91bnBpbl9mcm9tX2Rpc3BsYXlfcGxhbmUodm1hKTsK KwlpOTE1X3ZtYV9wdXQodm1hKTsKIH0KIAogc3RhdGljIGludCBpbnRlbF9mYl9waXRjaChjb25z dCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwgaW50IHBsYW5lLApAQCAtMjc1MCw3ICsyNzQ1 LDYgQEAgaW50ZWxfZmluZF9pbml0aWFsX3BsYW5lX29iaihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YywKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfY3J0Yy0+YmFzZS5kZXY7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0 cnVjdCBkcm1fY3J0YyAqYzsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaTsKIAlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqOwogCXN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnkgPSBpbnRlbF9j cnRjLT5iYXNlLnByaW1hcnk7CiAJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUg PSBwcmltYXJ5LT5zdGF0ZTsKQEAgLTI3NzUsMjAgKzI3NjksMjAgQEAgaW50ZWxfZmluZF9pbml0 aWFsX3BsYW5lX29iaihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkgKiBhbiBmYiB3 aXRoIGFub3RoZXIgQ1JUQyBpbnN0ZWFkCiAJICovCiAJZm9yX2VhY2hfY3J0YyhkZXYsIGMpIHsK LQkJaSA9IHRvX2ludGVsX2NydGMoYyk7CisJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3Rh dGU7CiAKIAkJaWYgKGMgPT0gJmludGVsX2NydGMtPmJhc2UpCiAJCQljb250aW51ZTsKIAotCQlp ZiAoIWktPmFjdGl2ZSkKKwkJaWYgKCF0b19pbnRlbF9jcnRjKGMpLT5hY3RpdmUpCiAJCQljb250 aW51ZTsKIAotCQlmYiA9IGMtPnByaW1hcnktPmZiOwotCQlpZiAoIWZiKQorCQlzdGF0ZSA9IHRv X2ludGVsX3BsYW5lX3N0YXRlKGMtPnByaW1hcnktPnN0YXRlKTsKKwkJaWYgKCFzdGF0ZS0+dm1h KQogCQkJY29udGludWU7CiAKLQkJb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKLQkJaWYgKGk5MTVf Z2VtX29iamVjdF9nZ3R0X29mZnNldChvYmosIE5VTEwpID09IHBsYW5lX2NvbmZpZy0+YmFzZSkg eworCQlpZiAoaW50ZWxfcGxhbmVfZ2d0dF9vZmZzZXQoc3RhdGUpID09IHBsYW5lX2NvbmZpZy0+ YmFzZSkgeworCQkJZmIgPSBjLT5wcmltYXJ5LT5mYjsKIAkJCWRybV9mcmFtZWJ1ZmZlcl9yZWZl cmVuY2UoZmIpOwogCQkJZ290byB2YWxpZF9mYjsKIAkJfQpAQCAtMjgwOSw2ICsyODAzLDE5IEBA IGludGVsX2ZpbmRfaW5pdGlhbF9wbGFuZV9vYmooc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMsCiAJcmV0dXJuOwogCiB2YWxpZF9mYjoKKwltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CisJaW50ZWxfc3RhdGUtPnZtYSA9CisJCWludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGZi LCBwcmltYXJ5LT5zdGF0ZS0+cm90YXRpb24pOworCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOworCWlmIChJU19FUlIoaW50ZWxfc3RhdGUtPnZtYSkpIHsKKwkJRFJNX0VSUk9SKCJm YWlsZWQgdG8gcGluIGJvb3QgZmIgb24gcGlwZSAlZDogJWxpXG4iLAorCQkJICBpbnRlbF9jcnRj LT5waXBlLCBQVFJfRVJSKGludGVsX3N0YXRlLT52bWEpKTsKKworCQlpbnRlbF9zdGF0ZS0+dm1h ID0gTlVMTDsKKwkJZHJtX2ZyYW1lYnVmZmVyX3VucmVmZXJlbmNlKGZiKTsKKwkJcmV0dXJuOwor CX0KKwogCXBsYW5lX3N0YXRlLT5zcmNfeCA9IDA7CiAJcGxhbmVfc3RhdGUtPnNyY195ID0gMDsK IAlwbGFuZV9zdGF0ZS0+c3JjX3cgPSBmYi0+d2lkdGggPDwgMTY7CkBAIC0zMTA0LDEzICszMTEx LDEzIEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9w bGFuZSAqcHJpbWFyeSwKIAlJOTE1X1dSSVRFKERTUFNUUklERShwbGFuZSksIGZiLT5waXRjaGVz WzBdKTsKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA0KSB7CiAJCUk5MTVfV1JJVEUoRFNQ U1VSRihwbGFuZSksCi0JCQkgICBpbnRlbF9mYl9ndHRfb2Zmc2V0KGZiLCByb3RhdGlvbikgKwor CQkJICAgaW50ZWxfcGxhbmVfZ2d0dF9vZmZzZXQocGxhbmVfc3RhdGUpICsKIAkJCSAgIGludGVs X2NydGMtPmRzcGFkZHJfb2Zmc2V0KTsKIAkJSTkxNV9XUklURShEU1BUSUxFT0ZGKHBsYW5lKSwg KHkgPDwgMTYpIHwgeCk7CiAJCUk5MTVfV1JJVEUoRFNQTElOT0ZGKHBsYW5lKSwgbGluZWFyX29m ZnNldCk7CiAJfSBlbHNlIHsKIAkJSTkxNV9XUklURShEU1BBRERSKHBsYW5lKSwKLQkJCSAgIGlu dGVsX2ZiX2d0dF9vZmZzZXQoZmIsIHJvdGF0aW9uKSArCisJCQkgICBpbnRlbF9wbGFuZV9nZ3R0 X29mZnNldChwbGFuZV9zdGF0ZSkgKwogCQkJICAgaW50ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZzZXQp OwogCX0KIAlQT1NUSU5HX1JFQUQocmVnKTsKQEAgLTMyMDcsNyArMzIxNCw3IEBAIHN0YXRpYyB2 b2lkIGlyb25sYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1h cnksCiAKIAlJOTE1X1dSSVRFKERTUFNUUklERShwbGFuZSksIGZiLT5waXRjaGVzWzBdKTsKIAlJ OTE1X1dSSVRFKERTUFNVUkYocGxhbmUpLAotCQkgICBpbnRlbF9mYl9ndHRfb2Zmc2V0KGZiLCBy b3RhdGlvbikgKworCQkgICBpbnRlbF9wbGFuZV9nZ3R0X29mZnNldChwbGFuZV9zdGF0ZSkgKwog CQkgICBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldCk7CiAJaWYgKElTX0hBU1dFTEwoZGV2X3By aXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKIAkJSTkxNV9XUklURShEU1BPRkZTRVQo cGxhbmUpLCAoeSA8PCAxNikgfCB4KTsKQEAgLTMyMzAsMjMgKzMyMzcsNiBAQCB1MzIgaW50ZWxf ZmJfc3RyaWRlX2FsaWdubWVudChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAJfQogfQogCi11MzIgaW50ZWxfZmJfZ3R0X29mZnNldChzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpmYiwKLQkJCXVuc2lnbmVkIGludCByb3RhdGlvbikKLXsKLQlzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKLQlzdHJ1Y3QgaTkxNV9nZ3R0X3Zp ZXcgdmlldzsKLQlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKLQotCWludGVsX2ZpbGxfZmJfZ2d0dF92 aWV3KCZ2aWV3LCBmYiwgcm90YXRpb24pOwotCi0Jdm1hID0gaTkxNV9nZW1fb2JqZWN0X3RvX2dn dHQob2JqLCAmdmlldyk7Ci0JaWYgKFdBUk4oIXZtYSwgImdndHQgdm1hIGZvciBkaXNwbGF5IG9i amVjdCBub3QgZm91bmQhICh2aWV3PSV1KVxuIiwKLQkJIHZpZXcudHlwZSkpCi0JCXJldHVybiAt MTsKLQotCXJldHVybiBpOTE1X2dndHRfb2Zmc2V0KHZtYSk7Ci19Ci0KIHN0YXRpYyB2b2lkIHNr bF9kZXRhY2hfc2NhbGVyKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLCBpbnQgaWQpCiB7 CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2NydGMtPmJhc2UuZGV2OwpAQCAtMzQ0 MSw3ICszNDMxLDcgQEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAl9CiAKIAlJOTE1X1dSSVRFKFBMQU5FX1NVUkYocGlw ZSwgMCksCi0JCSAgIGludGVsX2ZiX2d0dF9vZmZzZXQoZmIsIHJvdGF0aW9uKSArIHN1cmZfYWRk cik7CisJCSAgIGludGVsX3BsYW5lX2dndHRfb2Zmc2V0KHBsYW5lX3N0YXRlKSArIHN1cmZfYWRk cik7CiAKIAlQT1NUSU5HX1JFQUQoUExBTkVfU1VSRihwaXBlLCAwKSk7CiB9CkBAIC0xMTUzNiw3 ICsxMTUyNiw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3VucGluX3dvcmtfZm4oc3RydWN0IHdvcmtf c3RydWN0ICpfX3dvcmspCiAJCWZsdXNoX3dvcmsoJndvcmstPm1taW9fd29yayk7CiAKIAltdXRl eF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaW50ZWxfdW5waW5fZmJfb2JqKHdvcmstPm9s ZF9mYiwgcHJpbWFyeS0+c3RhdGUtPnJvdGF0aW9uKTsKKwlpbnRlbF91bnBpbl9mYl92bWEod29y ay0+b2xkX3ZtYSk7CiAJaTkxNV9nZW1fb2JqZWN0X3B1dCh3b3JrLT5wZW5kaW5nX2ZsaXBfb2Jq KTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIApAQCAtMTIyNDYsOCArMTIy MzYsMTAgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiAJCWdvdG8gY2xlYW51cF9wZW5kaW5nOwogCX0KIAotCXdvcmstPmd0dF9vZmZzZXQg PSBpbnRlbF9mYl9ndHRfb2Zmc2V0KGZiLCBwcmltYXJ5LT5zdGF0ZS0+cm90YXRpb24pOwotCXdv cmstPmd0dF9vZmZzZXQgKz0gaW50ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZzZXQ7CisJd29yay0+b2xk X3ZtYSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKS0+dm1hOworCXRvX2lu dGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKS0+dm1hID0gdm1hOworCisJd29yay0+Z3R0 X29mZnNldCA9IGk5MTVfZ2d0dF9vZmZzZXQodm1hKSArIGludGVsX2NydGMtPmRzcGFkZHJfb2Zm c2V0OwogCXdvcmstPnJvdGF0aW9uID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPnJvdGF0aW9uOwog CiAJLyoKQEAgLTEyMzAxLDcgKzEyMjkzLDggQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2Vf ZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiBjbGVhbnVwX3JlcXVlc3Q6CiAJaTkxNV9hZGRf cmVxdWVzdF9ub19mbHVzaChyZXF1ZXN0KTsKIGNsZWFudXBfdW5waW46Ci0JaW50ZWxfdW5waW5f ZmJfb2JqKGZiLCBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+cm90YXRpb24pOworCXRvX2ludGVsX3Bs YW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKS0+dm1hID0gd29yay0+b2xkX3ZtYTsKKwlpbnRlbF91 bnBpbl9mYl92bWEodm1hKTsKIGNsZWFudXBfcGVuZGluZzoKIAlhdG9taWNfZGVjKCZpbnRlbF9j cnRjLT51bnBpbl93b3JrX2NvdW50KTsKIHVubG9jazoKQEAgLTE0Nzk0LDYgKzE0Nzg3LDggQEAg aW50ZWxfcHJlcGFyZV9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCURSTV9E RUJVR19LTVMoImZhaWxlZCB0byBwaW4gb2JqZWN0XG4iKTsKIAkJCXJldHVybiBQVFJfRVJSKHZt YSk7CiAJCX0KKworCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShuZXdfc3RhdGUpLT52bWEgPSB2bWE7 CiAJfQogCiAJcmV0dXJuIDA7CkBAIC0xNDgxMiwxOSArMTQ4MDcsMTIgQEAgdm9pZAogaW50ZWxf Y2xlYW51cF9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJICAgICAgIHN0cnVj dCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHBsYW5lLT5kZXYpOwotCXN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqb2xkX2ludGVsX3N0YXRlOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvbGRf b2JqID0gaW50ZWxfZmJfb2JqKG9sZF9zdGF0ZS0+ZmIpOwotCXN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmoocGxhbmUtPnN0YXRlLT5mYik7Ci0KLQlvbGRfaW50 ZWxfc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShvbGRfc3RhdGUpOwotCi0JaWYgKCFvYmog JiYgIW9sZF9vYmopCi0JCXJldHVybjsKKwlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAotCWlmIChv bGRfb2JqICYmIChwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgfHwKLQkgICAg IUlOVEVMX0lORk8oZGV2X3ByaXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpKQotCQlpbnRlbF91 bnBpbl9mYl9vYmoob2xkX3N0YXRlLT5mYiwgb2xkX3N0YXRlLT5yb3RhdGlvbik7CisJLyogU2hv dWxkIG9ubHkgYmUgY2FsbGVkIGFmdGVyIGEgc3VjY2Vzc2Z1bCBpbnRlbF9wcmVwYXJlX3BsYW5l X2ZiKCkhICovCisJdm1hID0gZmV0Y2hfYW5kX3plcm8oJnRvX2ludGVsX3BsYW5lX3N0YXRlKG9s ZF9zdGF0ZSktPnZtYSk7CisJaWYgKHZtYSkKKwkJaW50ZWxfdW5waW5fZmJfdm1hKHZtYSk7CiB9 CiAKIGludApAQCAtMTUxNjYsNyArMTUxNTQsNyBAQCBpbnRlbF91cGRhdGVfY3Vyc29yX3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlmICghb2JqKQogCQlhZGRyID0gMDsKIAllbHNl IGlmICghSU5URUxfSU5GTyhkZXZfcHJpdiktPmN1cnNvcl9uZWVkc19waHlzaWNhbCkKLQkJYWRk ciA9IGk5MTVfZ2VtX29iamVjdF9nZ3R0X29mZnNldChvYmosIE5VTEwpOworCQlhZGRyID0gaW50 ZWxfcGxhbmVfZ2d0dF9vZmZzZXQoc3RhdGUpOwogCWVsc2UKIAkJYWRkciA9IG9iai0+cGh5c19o YW5kbGUtPmJ1c2FkZHI7CiAKQEAgLTE3MDY2LDQxICsxNzA1NCwxMiBAQCB2b2lkIGludGVsX2Rp c3BsYXlfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB2b2lkIGludGVsX21vZGVzZXRf Z2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGRybV9jcnRjICpjOwotCXN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAKIAlpbnRlbF9pbml0X2d0X3Bvd2Vyc2F2 ZShkZXZfcHJpdik7CiAKIAlpbnRlbF9tb2Rlc2V0X2luaXRfaHcoZGV2KTsKIAogCWludGVsX3Nl dHVwX292ZXJsYXkoZGV2X3ByaXYpOwotCi0JLyoKLQkgKiBNYWtlIHN1cmUgYW55IGZicyB3ZSBh bGxvY2F0ZWQgYXQgc3RhcnR1cCBhcmUgcHJvcGVybHkKLQkgKiBwaW5uZWQgJiBmZW5jZWQuICBX aGVuIHdlIGRvIHRoZSBhbGxvY2F0aW9uIGl0J3MgdG9vIGVhcmx5Ci0JICogZm9yIHRoaXMuCi0J ICovCi0JZm9yX2VhY2hfY3J0YyhkZXYsIGMpIHsKLQkJc3RydWN0IGk5MTVfdm1hICp2bWE7Ci0K LQkJb2JqID0gaW50ZWxfZmJfb2JqKGMtPnByaW1hcnktPmZiKTsKLQkJaWYgKG9iaiA9PSBOVUxM KQotCQkJY29udGludWU7Ci0KLQkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCQl2 bWEgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihjLT5wcmltYXJ5LT5mYiwKLQkJCQkJCSBj LT5wcmltYXJ5LT5zdGF0ZS0+cm90YXRpb24pOwotCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0 X211dGV4KTsKLQkJaWYgKElTX0VSUih2bWEpKSB7Ci0JCQlEUk1fRVJST1IoImZhaWxlZCB0byBw aW4gYm9vdCBmYiBvbiBwaXBlICVkXG4iLAotCQkJCSAgdG9faW50ZWxfY3J0YyhjKS0+cGlwZSk7 Ci0JCQlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2UoYy0+cHJpbWFyeS0+ZmIpOwotCQkJYy0+ cHJpbWFyeS0+ZmIgPSBOVUxMOwotCQkJYy0+cHJpbWFyeS0+Y3J0YyA9IGMtPnByaW1hcnktPnN0 YXRlLT5jcnRjID0gTlVMTDsKLQkJCXVwZGF0ZV9zdGF0ZV9mYihjLT5wcmltYXJ5KTsKLQkJCWMt PnN0YXRlLT5wbGFuZV9tYXNrICY9IH4oMSA8PCBkcm1fcGxhbmVfaW5kZXgoYy0+cHJpbWFyeSkp OwotCQl9Ci0JfQogfQogCiBpbnQgaW50ZWxfY29ubmVjdG9yX3JlZ2lzdGVyKHN0cnVjdCBkcm1f Y29ubmVjdG9yICpjb25uZWN0b3IpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGNkNzJh ZTE3MWVlYi4uMDNhMjExMjAwNGY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMzc3 LDYgKzM3Nyw3IEBAIHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgewogc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlIHsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlIGJhc2U7CiAJc3RydWN0IGRybV9y ZWN0IGNsaXA7CisJc3RydWN0IGk5MTVfdm1hICp2bWE7CiAKIAlzdHJ1Y3QgewogCQl1MzIgb2Zm c2V0OwpAQCAtMTA0Niw2ICsxMDQ3LDcgQEAgc3RydWN0IGludGVsX2ZsaXBfd29yayB7CiAJc3Ry dWN0IHdvcmtfc3RydWN0IG1taW9fd29yazsKIAogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKKwlz dHJ1Y3QgaTkxNV92bWEgKm9sZF92bWE7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqb2xkX2Zi OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpwZW5kaW5nX2ZsaXBfb2JqOwogCXN0cnVj dCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmV2ZW50OwpAQCAtMTI3Myw3ICsxMjc1LDcgQEAg dm9pZCBpbnRlbF9yZWxlYXNlX2xvYWRfZGV0ZWN0X3BpcGUoc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvciwKIAkJCQkgICAgc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4ICpjdHgp Owogc3RydWN0IGk5MTVfdm1hICoKIGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHN0cnVjdCBk cm1fZnJhbWVidWZmZXIgKmZiLCB1bnNpZ25lZCBpbnQgcm90YXRpb24pOwotdm9pZCBpbnRlbF91 bnBpbl9mYl9vYmooc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsIHVuc2lnbmVkIGludCByb3Rh dGlvbik7Cit2b2lkIGludGVsX3VucGluX2ZiX3ZtYShzdHJ1Y3QgaTkxNV92bWEgKnZtYSk7CiBz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICoKIF9faW50ZWxfZnJhbWVidWZmZXJfY3JlYXRlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgICBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAqbW9kZV9j bWQsCkBAIC0xMzYyLDcgKzEzNjQsMTAgQEAgdm9pZCBpbnRlbF9tb2RlX2Zyb21fcGlwZV9jb25m aWcoc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUsCiBpbnQgc2tsX3VwZGF0ZV9zY2FsZXJf Y3J0YyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiBpbnQgc2tsX21heF9z Y2FsZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yywgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUpOwogCi11MzIgaW50ZWxfZmJfZ3R0X29mZnNldChzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpmYiwgdW5zaWduZWQgaW50IHJvdGF0aW9uKTsKK3N0YXRpYyBpbmxpbmUgdTMyIGludGVs X3BsYW5lX2dndHRfb2Zmc2V0KGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUp Cit7CisJcmV0dXJuIGk5MTVfZ2d0dF9vZmZzZXQoc3RhdGUtPnZtYSk7Cit9CiAKIHUzMiBza2xf cGxhbmVfY3RsX2Zvcm1hdCh1aW50MzJfdCBwaXhlbF9mb3JtYXQpOwogdTMyIHNrbF9wbGFuZV9j dGxfdGlsaW5nKHVpbnQ2NF90IGZiX21vZGlmaWVyKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2ZiYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMK aW5kZXggNjJmMjE1YjEyZWI1Li5mM2ExZDZhNWNhYmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2ZiYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Zi Yy5jCkBAIC0xNzMsNyArMTczLDcgQEAgc3RhdGljIHZvaWQgaTh4eF9mYmNfYWN0aXZhdGUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlmIChJU19JOTQ1R00oZGV2X3ByaXYp KQogCQlmYmNfY3RsIHw9IEZCQ19DVExfQzNfSURMRTsgLyogOTQ1IG5lZWRzIHNwZWNpYWwgU1Ig aGFuZGxpbmcgKi8KIAlmYmNfY3RsIHw9IChjZmJfcGl0Y2ggJiAweGZmKSA8PCBGQkNfQ1RMX1NU UklERV9TSElGVDsKLQlmYmNfY3RsIHw9IHBhcmFtcy0+ZmIuZmVuY2VfcmVnOworCWZiY19jdGwg fD0gcGFyYW1zLT52bWEtPmZlbmNlLT5pZDsKIAlJOTE1X1dSSVRFKEZCQ19DT05UUk9MLCBmYmNf Y3RsKTsKIH0KIApAQCAtMTkzLDggKzE5Myw4IEBAIHN0YXRpYyB2b2lkIGc0eF9mYmNfYWN0aXZh dGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWVsc2UKIAkJZHBmY19jdGwg fD0gRFBGQ19DVExfTElNSVRfMVg7CiAKLQlpZiAocGFyYW1zLT5mYi5mZW5jZV9yZWcgIT0gSTkx NV9GRU5DRV9SRUdfTk9ORSkgewotCQlkcGZjX2N0bCB8PSBEUEZDX0NUTF9GRU5DRV9FTiB8IHBh cmFtcy0+ZmIuZmVuY2VfcmVnOworCWlmIChwYXJhbXMtPnZtYS0+ZmVuY2UpIHsKKwkJZHBmY19j dGwgfD0gRFBGQ19DVExfRkVOQ0VfRU4gfCBwYXJhbXMtPnZtYS0+ZmVuY2UtPmlkOwogCQlJOTE1 X1dSSVRFKERQRkNfRkVOQ0VfWU9GRiwgcGFyYW1zLT5jcnRjLmZlbmNlX3lfb2Zmc2V0KTsKIAl9 IGVsc2UgewogCQlJOTE1X1dSSVRFKERQRkNfRkVOQ0VfWU9GRiwgMCk7CkBAIC0yNTEsMTMgKzI1 MSwxNCBAQCBzdGF0aWMgdm9pZCBpbGtfZmJjX2FjdGl2YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAkJYnJlYWs7CiAJfQogCi0JaWYgKHBhcmFtcy0+ZmIuZmVuY2VfcmVn ICE9IEk5MTVfRkVOQ0VfUkVHX05PTkUpIHsKKwlpZiAocGFyYW1zLT52bWEtPmZlbmNlKSB7CiAJ CWRwZmNfY3RsIHw9IERQRkNfQ1RMX0ZFTkNFX0VOOwogCQlpZiAoSVNfR0VONShkZXZfcHJpdikp Ci0JCQlkcGZjX2N0bCB8PSBwYXJhbXMtPmZiLmZlbmNlX3JlZzsKKwkJCWRwZmNfY3RsIHw9IHBh cmFtcy0+dm1hLT5mZW5jZS0+aWQ7CiAJCWlmIChJU19HRU42KGRldl9wcml2KSkgewogCQkJSTkx NV9XUklURShTTkJfRFBGQ19DVExfU0EsCi0JCQkJICAgU05CX0NQVV9GRU5DRV9FTkFCTEUgfCBw YXJhbXMtPmZiLmZlbmNlX3JlZyk7CisJCQkJICAgU05CX0NQVV9GRU5DRV9FTkFCTEUgfAorCQkJ CSAgIHBhcmFtcy0+dm1hLT5mZW5jZS0+aWQpOwogCQkJSTkxNV9XUklURShEUEZDX0NQVV9GRU5D RV9PRkZTRVQsCiAJCQkJICAgcGFyYW1zLT5jcnRjLmZlbmNlX3lfb2Zmc2V0KTsKIAkJfQpAQCAt MjY5LDcgKzI3MCw4IEBAIHN0YXRpYyB2b2lkIGlsa19mYmNfYWN0aXZhdGUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCX0KIAogCUk5MTVfV1JJVEUoSUxLX0RQRkNfRkVOQ0Vf WU9GRiwgcGFyYW1zLT5jcnRjLmZlbmNlX3lfb2Zmc2V0KTsKLQlJOTE1X1dSSVRFKElMS19GQkNf UlRfQkFTRSwgcGFyYW1zLT5mYi5nZ3R0X29mZnNldCB8IElMS19GQkNfUlRfVkFMSUQpOworCUk5 MTVfV1JJVEUoSUxLX0ZCQ19SVF9CQVNFLAorCQkgICBpOTE1X2dndHRfb2Zmc2V0KHBhcmFtcy0+ dm1hKSB8IElMS19GQkNfUlRfVkFMSUQpOwogCS8qIGVuYWJsZSBpdC4uLiAqLwogCUk5MTVfV1JJ VEUoSUxLX0RQRkNfQ09OVFJPTCwgZHBmY19jdGwgfCBEUEZDX0NUTF9FTik7CiAKQEAgLTMxOSwx MCArMzIxLDExIEBAIHN0YXRpYyB2b2lkIGdlbjdfZmJjX2FjdGl2YXRlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkJYnJlYWs7CiAJfQogCi0JaWYgKHBhcmFtcy0+ZmIuZmVu Y2VfcmVnICE9IEk5MTVfRkVOQ0VfUkVHX05PTkUpIHsKKwlpZiAocGFyYW1zLT52bWEtPmZlbmNl KSB7CiAJCWRwZmNfY3RsIHw9IElWQl9EUEZDX0NUTF9GRU5DRV9FTjsKIAkJSTkxNV9XUklURShT TkJfRFBGQ19DVExfU0EsCi0JCQkgICBTTkJfQ1BVX0ZFTkNFX0VOQUJMRSB8IHBhcmFtcy0+ZmIu ZmVuY2VfcmVnKTsKKwkJCSAgIFNOQl9DUFVfRkVOQ0VfRU5BQkxFIHwKKwkJCSAgIHBhcmFtcy0+ dm1hLT5mZW5jZS0+aWQpOwogCQlJOTE1X1dSSVRFKERQRkNfQ1BVX0ZFTkNFX09GRlNFVCwgcGFy YW1zLT5jcnRjLmZlbmNlX3lfb2Zmc2V0KTsKIAl9IGVsc2UgewogCQlJOTE1X1dSSVRFKFNOQl9E UEZDX0NUTF9TQSwwKTsKQEAgLTcyNywxNCArNzMwLDYgQEAgc3RhdGljIGJvb2wgaW50ZWxfZmJj X2h3X3RyYWNraW5nX2NvdmVyc19zY3JlZW4oc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJcmV0 dXJuIGVmZmVjdGl2ZV93IDw9IG1heF93ICYmIGVmZmVjdGl2ZV9oIDw9IG1heF9oOwogfQogCi0v KiBYWFggcmVwbGFjZSBtZSB3aGVuIHdlIGhhdmUgVk1BIHRyYWNraW5nIGZvciBpbnRlbF9wbGFu ZV9zdGF0ZSAqLwotc3RhdGljIGludCBnZXRfZmVuY2VfaWQoc3RydWN0IGRybV9mcmFtZWJ1ZmZl ciAqZmIpCi17Ci0Jc3RydWN0IGk5MTVfdm1hICp2bWEgPSBpOTE1X2dlbV9vYmplY3RfdG9fZ2d0 dChpbnRlbF9mYl9vYmooZmIpLCBOVUxMKTsKLQotCXJldHVybiB2bWEgJiYgdm1hLT5mZW5jZSA/ IHZtYS0+ZmVuY2UtPmlkIDogSTkxNV9GRU5DRV9SRUdfTk9ORTsKLX0KLQogc3RhdGljIHZvaWQg aW50ZWxfZmJjX3VwZGF0ZV9zdGF0ZV9jYWNoZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJ CQkJIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJCQkgc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKQEAgLTc0Myw3ICs3MzgsOCBAQCBzdGF0aWMg dm9pZCBpbnRlbF9mYmNfdXBkYXRlX3N0YXRlX2NhY2hlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj LAogCXN0cnVjdCBpbnRlbF9mYmMgKmZiYyA9ICZkZXZfcHJpdi0+ZmJjOwogCXN0cnVjdCBpbnRl bF9mYmNfc3RhdGVfY2FjaGUgKmNhY2hlID0gJmZiYy0+c3RhdGVfY2FjaGU7CiAJc3RydWN0IGRy bV9mcmFtZWJ1ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKLQlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqOworCisJY2FjaGUtPnZtYSA9IE5VTEw7CiAKIAljYWNoZS0+Y3J0 Yy5tb2RlX2ZsYWdzID0gY3J0Y19zdGF0ZS0+YmFzZS5hZGp1c3RlZF9tb2RlLmZsYWdzOwogCWlm IChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQpAQCAtNzU4 LDE2ICs3NTQsMTAgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmJjX3VwZGF0ZV9zdGF0ZV9jYWNoZShz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlpZiAoIWNhY2hlLT5wbGFuZS52aXNpYmxlKQogCQly ZXR1cm47CiAKLQlvYmogPSBpbnRlbF9mYl9vYmooZmIpOwotCi0JLyogRklYTUU6IFdlIGxhY2sg dGhlIHByb3BlciBsb2NraW5nIGhlcmUsIHNvIG9ubHkgcnVuIHRoaXMgb24gdGhlCi0JICogcGxh dGZvcm1zIHRoYXQgbmVlZC4gKi8KLQlpZiAoSVNfR0VOKGRldl9wcml2LCA1LCA2KSkKLQkJY2Fj aGUtPmZiLmlsa19nZ3R0X29mZnNldCA9IGk5MTVfZ2VtX29iamVjdF9nZ3R0X29mZnNldChvYmos IE5VTEwpOwogCWNhY2hlLT5mYi5waXhlbF9mb3JtYXQgPSBmYi0+cGl4ZWxfZm9ybWF0OwogCWNh Y2hlLT5mYi5zdHJpZGUgPSBmYi0+cGl0Y2hlc1swXTsKLQljYWNoZS0+ZmIuZmVuY2VfcmVnID0g Z2V0X2ZlbmNlX2lkKGZiKTsKLQljYWNoZS0+ZmIudGlsaW5nX21vZGUgPSBpOTE1X2dlbV9vYmpl Y3RfZ2V0X3RpbGluZyhvYmopOworCisJY2FjaGUtPnZtYSA9IHBsYW5lX3N0YXRlLT52bWE7CiB9 CiAKIHN0YXRpYyBib29sIGludGVsX2ZiY19jYW5fYWN0aXZhdGUoc3RydWN0IGludGVsX2NydGMg KmNydGMpCkBAIC03ODQsNyArNzc0LDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfZmJjX2Nhbl9hY3Rp dmF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJcmV0dXJuIGZhbHNlOwogCX0KIAotCWlm ICghY2FjaGUtPnBsYW5lLnZpc2libGUpIHsKKwlpZiAoIWNhY2hlLT52bWEpIHsKIAkJZmJjLT5u b19mYmNfcmVhc29uID0gInByaW1hcnkgcGxhbmUgbm90IHZpc2libGUiOwogCQlyZXR1cm4gZmFs c2U7CiAJfQpAQCAtODA3LDggKzc5Nyw3IEBAIHN0YXRpYyBib29sIGludGVsX2ZiY19jYW5fYWN0 aXZhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJICogc28gaGF2ZSBubyBmZW5jZSBhc3Nv Y2lhdGVkIHdpdGggaXQpIGR1ZSB0byBhcGVydHVyZSBjb25zdGFpbnRzCiAJICogYXQgdGhlIHRp bWUgb2YgcGlubmluZy4KIAkgKi8KLQlpZiAoY2FjaGUtPmZiLnRpbGluZ19tb2RlICE9IEk5MTVf VElMSU5HX1ggfHwKLQkgICAgY2FjaGUtPmZiLmZlbmNlX3JlZyA9PSBJOTE1X0ZFTkNFX1JFR19O T05FKSB7CisJaWYgKCFjYWNoZS0+dm1hLT5mZW5jZSkgewogCQlmYmMtPm5vX2ZiY19yZWFzb24g PSAiZnJhbWVidWZmZXIgbm90IHRpbGVkIG9yIGZlbmNlZCI7CiAJCXJldHVybiBmYWxzZTsKIAl9 CkBAIC04ODgsMTcgKzg3NywxNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mYmNfZ2V0X3JlZ19wYXJh bXMoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJICogemVyby4gKi8KIAltZW1zZXQocGFyYW1z LCAwLCBzaXplb2YoKnBhcmFtcykpOwogCisJcGFyYW1zLT52bWEgPSBjYWNoZS0+dm1hOworCiAJ cGFyYW1zLT5jcnRjLnBpcGUgPSBjcnRjLT5waXBlOwogCXBhcmFtcy0+Y3J0Yy5wbGFuZSA9IGNy dGMtPnBsYW5lOwogCXBhcmFtcy0+Y3J0Yy5mZW5jZV95X29mZnNldCA9IGdldF9jcnRjX2ZlbmNl X3lfb2Zmc2V0KGNydGMpOwogCiAJcGFyYW1zLT5mYi5waXhlbF9mb3JtYXQgPSBjYWNoZS0+ZmIu cGl4ZWxfZm9ybWF0OwogCXBhcmFtcy0+ZmIuc3RyaWRlID0gY2FjaGUtPmZiLnN0cmlkZTsKLQlw YXJhbXMtPmZiLmZlbmNlX3JlZyA9IGNhY2hlLT5mYi5mZW5jZV9yZWc7CiAKIAlwYXJhbXMtPmNm Yl9zaXplID0gaW50ZWxfZmJjX2NhbGN1bGF0ZV9jZmJfc2l6ZShkZXZfcHJpdiwgY2FjaGUpOwot Ci0JcGFyYW1zLT5mYi5nZ3R0X29mZnNldCA9IGNhY2hlLT5mYi5pbGtfZ2d0dF9vZmZzZXQ7CiB9 CiAKIHN0YXRpYyBib29sIGludGVsX2ZiY19yZWdfcGFyYW1zX2VxdWFsKHN0cnVjdCBpbnRlbF9m YmNfcmVnX3BhcmFtcyAqcGFyYW1zMSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCmluZGV4 IDhjZjJkODBmMjI1NC4uZjRhOGM0ZmM1N2M0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9mYmRldi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2 LmMKQEAgLTI4NCw3ICsyODQsNyBAQCBzdGF0aWMgaW50IGludGVsZmJfY3JlYXRlKHN0cnVjdCBk cm1fZmJfaGVscGVyICpoZWxwZXIsCiBvdXRfZGVzdHJveV9mYmk6CiAJZHJtX2ZiX2hlbHBlcl9y ZWxlYXNlX2ZiaShoZWxwZXIpOwogb3V0X3VucGluOgotCWludGVsX3VucGluX2ZiX29iaigmaWZi ZGV2LT5mYi0+YmFzZSwgRFJNX1JPVEFURV8wKTsKKwlpbnRlbF91bnBpbl9mYl92bWEodm1hKTsK IG91dF91bmxvY2s6CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJcmV0dXJu IHJldDsKQEAgLTU0OSw3ICs1NDksNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mYmRldl9kZXN0cm95 KHN0cnVjdCBpbnRlbF9mYmRldiAqaWZiZGV2KQogCiAJaWYgKGlmYmRldi0+ZmIpIHsKIAkJbXV0 ZXhfbG9jaygmaWZiZGV2LT5oZWxwZXIuZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCQlpbnRlbF91bnBp bl9mYl9vYmooJmlmYmRldi0+ZmItPmJhc2UsIERSTV9ST1RBVEVfMCk7CisJCWludGVsX3VucGlu X2ZiX3ZtYShpZmJkZXYtPnZtYSk7CiAJCW11dGV4X3VubG9jaygmaWZiZGV2LT5oZWxwZXIuZGV2 LT5zdHJ1Y3RfbXV0ZXgpOwogCiAJCWRybV9mcmFtZWJ1ZmZlcl9yZW1vdmUoJmlmYmRldi0+ZmIt PmJhc2UpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCA4ZjEzMWEwOGQ0NDAu LjI0MmE3M2U2NmQ4MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3By aXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTI3Myw3 ICsyNzMsNyBAQCBza2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwK IAogCUk5MTVfV1JJVEUoUExBTkVfQ1RMKHBpcGUsIHBsYW5lKSwgcGxhbmVfY3RsKTsKIAlJOTE1 X1dSSVRFKFBMQU5FX1NVUkYocGlwZSwgcGxhbmUpLAotCQkgICBpbnRlbF9mYl9ndHRfb2Zmc2V0 KGZiLCByb3RhdGlvbikgKyBzdXJmX2FkZHIpOworCQkgICBpbnRlbF9wbGFuZV9nZ3R0X29mZnNl dChwbGFuZV9zdGF0ZSkgKyBzdXJmX2FkZHIpOwogCVBPU1RJTkdfUkVBRChQTEFORV9TVVJGKHBp cGUsIHBsYW5lKSk7CiB9CiAKQEAgLTQ1OCw3ICs0NTgsNyBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwKIAlJOTE1X1dSSVRFKFNQU0laRShwaXBlLCBwbGFuZSks IChjcnRjX2ggPDwgMTYpIHwgY3J0Y193KTsKIAlJOTE1X1dSSVRFKFNQQ05UUihwaXBlLCBwbGFu ZSksIHNwcmN0bCk7CiAJSTkxNV9XUklURShTUFNVUkYocGlwZSwgcGxhbmUpLAotCQkgICBpbnRl bF9mYl9ndHRfb2Zmc2V0KGZiLCByb3RhdGlvbikgKyBzcHJzdXJmX29mZnNldCk7CisJCSAgIGlu dGVsX3BsYW5lX2dndHRfb2Zmc2V0KHBsYW5lX3N0YXRlKSArIHNwcnN1cmZfb2Zmc2V0KTsKIAlQ T1NUSU5HX1JFQUQoU1BTVVJGKHBpcGUsIHBsYW5lKSk7CiB9CiAKQEAgLTU5NCw3ICs1OTQsNyBA QCBpdmJfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlJOTE1X1dSSVRF KFNQUlNDQUxFKHBpcGUpLCBzcHJzY2FsZSk7CiAJSTkxNV9XUklURShTUFJDVEwocGlwZSksIHNw cmN0bCk7CiAJSTkxNV9XUklURShTUFJTVVJGKHBpcGUpLAotCQkgICBpbnRlbF9mYl9ndHRfb2Zm c2V0KGZiLCByb3RhdGlvbikgKyBzcHJzdXJmX29mZnNldCk7CisJCSAgIGludGVsX3BsYW5lX2dn dHRfb2Zmc2V0KHBsYW5lX3N0YXRlKSArIHNwcnN1cmZfb2Zmc2V0KTsKIAlQT1NUSU5HX1JFQUQo U1BSU1VSRihwaXBlKSk7CiB9CiAKQEAgLTcyMSw3ICs3MjEsNyBAQCBpbGtfdXBkYXRlX3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCUk5MTVfV1JJVEUoRFZTU0NBTEUocGlwZSksIGR2 c3NjYWxlKTsKIAlJOTE1X1dSSVRFKERWU0NOVFIocGlwZSksIGR2c2NudHIpOwogCUk5MTVfV1JJ VEUoRFZTU1VSRihwaXBlKSwKLQkJICAgaW50ZWxfZmJfZ3R0X29mZnNldChmYiwgcm90YXRpb24p ICsgZHZzc3VyZl9vZmZzZXQpOworCQkgICBpbnRlbF9wbGFuZV9nZ3R0X29mZnNldChwbGFuZV9z dGF0ZSkgKyBkdnNzdXJmX29mZnNldCk7CiAJUE9TVElOR19SRUFEKERWU1NVUkYocGlwZSkpOwog fQogCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg==