From: John.C.Harrison@Intel.com Subject: [PATCH v6 26/34] drm/i915: Add early exit to execbuff_final() if insufficient ring space Date: Wed, 20 Apr 2016 18:13:44 +0100 Message-ID: <1461172435-4256-27-git-send-email-John.C.Harrison@Intel.com> References: <1461172435-4256-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id B008F6EA9D for ; Wed, 20 Apr 2016 17:14:27 +0000 (UTC) In-Reply-To: <1461172435-4256-1-git-send-email-John.C.Harrison@Intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel-GFX@Lists.FreeDesktop.Org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk9uZSBvZiB0 aGUgbWFqb3IgcHVycG9zZXMgb2YgdGhlIEdQVSBzY2hlZHVsZXIgaXMgdG8gYXZvaWQgc3RhbGxp bmcKdGhlIENQVSB3aGVuIHRoZSBHUFUgaXMgYnVzeSBhbmQgdW5hYmxlIHRvIGFjY2VwdCBtb3Jl IHdvcmsuIFRoaXMKY2hhbmdlIGFkZHMgc3VwcG9ydCB0byB0aGUgcmluZyBzdWJtaXNzaW9uIGNv ZGUgdG8gYWxsb3cgYSByaW5nIHNwYWNlCmNoZWNrIHRvIGJlIHBlcmZvcm1lZCBiZWZvcmUgYXR0 ZW1wdGluZyB0byBzdWJtaXQgYSBiYXRjaCBidWZmZXIgdG8KdGhlIGhhcmR3YXJlLiBJZiBpbnN1 ZmZpY2llbnQgc3BhY2UgaXMgYXZhaWxhYmxlIHRoZW4gdGhlIHNjaGVkdWxlcgpjYW4gZ28gYXdh eSBhbmQgY29tZSBiYWNrIGxhdGVyLCBsZXR0aW5nIHRoZSBDUFUgZ2V0IG9uIHdpdGggb3RoZXIK d29yaywgcmF0aGVyIHRoYW4gc3RhbGxpbmcgYW5kIHdhaXRpbmcgZm9yIHRoZSBoYXJkd2FyZSB0 byBjYXRjaCB1cC4KCnYzOiBVcGRhdGVkIHRvIHVzZSBsb2NhbGx5IGNhY2hlZCByZXF1ZXN0IHBv aW50ZXIuCgp2NDogTGluZSB3cmFwcGVkIHNvbWUgY29tbWVudHMgZGlmZmVyZW50bHkgdG8ga2Vl cCB0aGUgc3R5bGUgY2hlY2tlcgpoYXBweS4gRG93bmdyYWRlZCBhIEJVR19PTiB0byBhIFdBUk5f T04gYXMgdGhlIGxhdHRlciBpcyBwcmVmZXJyZWQuCgpSZW1vdmVkIHNvbWUgb2Jzb2xldGUsIGNv bW1lbnRlZCBvdXQgY29kZS4KCnY2OiBVcGRhdGVkIHRvIG5ld2VyIG5pZ2h0bHkgKGxvdHMgb2Yg cmluZyAtPiBlbmdpbmUgcmVuYW1pbmcpLgoKVXBkYXRlZCB0byB1c2UgJ3RvX2k5MTUoKScgaW5z dGVhZCBvZiBkZXZfcHJpdmF0ZS4gW3JldmlldyBmZWVkYmFjawpmcm9tIEpvb25hcyBMYWh0aW5l bl0KCkZvcjogVklaLTE1ODcKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhh cnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVj YnVmZmVyLmMgfCA0MSArKysrKysrKysrKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMgICAgICAgICAgIHwgNTQgKysrKysrKysrKysrKysrKysrKysrKysrKysr LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgfCAyNiArKysr KysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oICAgIHwg IDEgKwogNCBmaWxlcyBjaGFuZ2VkLCAxMDcgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDFmODQ4 NmUuLmJhY2VlNWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4 ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVy LmMKQEAgLTExNDgsMjUgKzExNDgsMTkgQEAgaTkxNV9yZXNldF9nZW43X3NvbF9vZmZzZXRzKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l ID0gcmVxLT5lbmdpbmU7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKLQlpbnQgcmV0LCBpOworCWludCBpOwogCiAJaWYgKCFJU19HRU43KGRl dikgfHwgZW5naW5lICE9ICZkZXZfcHJpdi0+ZW5naW5lW1JDU10pIHsKIAkJRFJNX0RFQlVHKCJz b2wgcmVzZXQgaXMgZ2VuNy9yY3Mgb25seVxuIik7CiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAot CXJldCA9IGludGVsX3JpbmdfYmVnaW4ocmVxLCA0ICogMyk7Ci0JaWYgKHJldCkKLQkJcmV0dXJu IHJldDsKLQogCWZvciAoaSA9IDA7IGkgPCA0OyBpKyspIHsKIAkJaW50ZWxfcmluZ19lbWl0KGVu Z2luZSwgTUlfTE9BRF9SRUdJU1RFUl9JTU0oMSkpOwogCQlpbnRlbF9yaW5nX2VtaXRfcmVnKGVu Z2luZSwgR0VON19TT19XUklURV9PRkZTRVQoaSkpOwogCQlpbnRlbF9yaW5nX2VtaXQoZW5naW5l LCAwKTsKIAl9CiAKLQlpbnRlbF9yaW5nX2FkdmFuY2UoZW5naW5lKTsKLQogCXJldHVybiAwOwog fQogCkBAIC0xMjk0LDYgKzEyODgsNyBAQCBpbnQgaTkxNV9nZW1fcmluZ2J1ZmZlcl9zdWJtaXNz aW9uX2ZpbmFsKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMpCiAJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAgKmVuZ2luZSA9IHBhcmFtcy0+ZW5naW5lOwogCXU2NCBleGVjX3N0 YXJ0LCBleGVjX2xlbjsKIAlpbnQgcmV0OworCXVpbnQzMl90IG1pbl9zcGFjZTsKIAogCS8qIFRo ZSBtdXRleCBtdXN0IGJlIGFjcXVpcmVkIGJlZm9yZSBjYWxsaW5nIHRoaXMgZnVuY3Rpb24gKi8K IAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJnBhcmFtcy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsK QEAgLTEzMTcsNiArMTMxMiwzNCBAQCBpbnQgaTkxNV9nZW1fcmluZ2J1ZmZlcl9zdWJtaXNzaW9u X2ZpbmFsKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMpCiAJCWdvdG8gZXJy b3I7CiAKIAkvKgorCSAqIEl0IHdvdWxkIGJlIGEgYmFkIGlkZWEgdG8gcnVuIG91dCBvZiBzcGFj ZSB3aGlsZSB3cml0aW5nIGNvbW1hbmRzCisJICogdG8gdGhlIHJpbmcuIE9uZSBvZiB0aGUgbWFq b3IgYWltcyBvZiB0aGUgc2NoZWR1bGVyIGlzIHRvIG5vdAorCSAqIHN0YWxsIGF0IGFueSBwb2lu dCBmb3IgYW55IHJlYXNvbi4gSG93ZXZlciwgZG9pbmcgYW4gZWFybHkgZXhpdAorCSAqIGhhbGYg d2F5IHRocm91Z2ggc3VibWlzc2lvbiBjb3VsZCByZXN1bHQgaW4gYSBwYXJ0aWFsIHNlcXVlbmNl CisJICogYmVpbmcgd3JpdHRlbiB3aGljaCB3b3VsZCBsZWF2ZSB0aGUgZW5naW5lIGluIGFuIHVu a25vd24gc3RhdGUuCisJICogVGhlcmVmb3JlLCBjaGVjayBpbiBhZHZhbmNlIHRoYXQgdGhlcmUg d2lsbCBiZSBlbm91Z2ggc3BhY2UgZm9yCisJICogdGhlIGVudGlyZSBzdWJtaXNzaW9uIHdoZXRo ZXIgZW1pdHRlZCBieSB0aGUgY29kZSBiZWxvdyBPUiBieSBhbnkKKwkgKiBvdGhlciBmdW5jdGlv bnMgdGhhdCBtYXkgYmUgZXhlY3V0ZWQgYmVmb3JlIHRoZSBlbmQgb2YgZmluYWwoKS4KKwkgKgor CSAqIE5COiBUaGlzIHRlc3QgZGVsaWJlcmF0ZWx5IG92ZXJlc3RpbWF0ZXMsIGJlY2F1c2UgdGhh dCdzIGVhc2llcgorCSAqIHRoYW4gdHJhY2luZyBldmVyeSBwb3RlbnRpYWwgcGF0aCB0aGF0IGNv dWxkIGJlIHRha2VuIQorCSAqCisJICogQ3VycmVudCBtZWFzdXJlbWVudHMgc3VnZ2VzdCB0aGF0 IHdlIG1heSBuZWVkIHRvIGVtaXQgdXAgdG8gMTg2CisJICogZHdvcmRzLCBzbyB0aGlzIGlzIHJv dW5kZWQgdXAgdG8gMjU2IGhlcmUuIFRoZW4gZG91YmxlIHRoYXQgdG8gZ2V0CisJICogdGhlIGZy ZWUgc3BhY2UgcmVxdWlyZW1lbnQsIGJlY2F1c2UgdGhlIGJsb2NrIGlzIG5vdCBhbGxvd2VkIHRv CisJICogc3BhbiB0aGUgdHJhbnNpdGlvbiBmcm9tIHRoZSBlbmQgdG8gdGhlIGJlZ2lubmluZyBv ZiB0aGUgcmluZy4KKwkgKi8KKyNkZWZpbmUgSTkxNV9CQVRDSF9FWEVDX01BWF9MRU4gICAgICAg ICAyNTYJLyogbWF4IGR3b3JkcyBlbWl0dGVkIGhlcmUgKi8KKwltaW5fc3BhY2UgPSBJOTE1X0JB VENIX0VYRUNfTUFYX0xFTiAqIDIgKiBzaXplb2YodWludDMyX3QpOworCXJldCA9IGludGVsX3Jp bmdfdGVzdF9zcGFjZShyZXEtPnJpbmdidWYsIG1pbl9zcGFjZSk7CisJaWYgKHJldCkKKwkJZ290 byBlcnJvcjsKKworCXJldCA9IGludGVsX3JpbmdfYmVnaW4ocmVxLCBJOTE1X0JBVENIX0VYRUNf TUFYX0xFTik7CisJaWYgKHJldCkKKwkJZ290byBlcnJvcjsKKworCS8qCiAJICogVW5jb25kaXRp b25hbGx5IGludmFsaWRhdGUgZ3B1IGNhY2hlcyBhbmQgZW5zdXJlIHRoYXQgd2UgZG8gZmx1c2gK IAkgKiBhbnkgcmVzaWR1YWwgd3JpdGVzIGZyb20gdGhlIHByZXZpb3VzIGJhdGNoLgogCSAqLwpA QCAtMTMzNCwxMCArMTM1Nyw2IEBAIGludCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb25f ZmluYWwoc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcykKIAogCWlmIChlbmdp bmUgPT0gJmRldl9wcml2LT5lbmdpbmVbUkNTXSAmJgogCSAgICBwYXJhbXMtPmluc3RwX21vZGUg IT0gZGV2X3ByaXYtPnJlbGF0aXZlX2NvbnN0YW50c19tb2RlKSB7Ci0JCXJldCA9IGludGVsX3Jp bmdfYmVnaW4ocmVxLCA0KTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gZXJyb3I7Ci0KIAkJaW50ZWxf cmluZ19lbWl0KGVuZ2luZSwgTUlfTk9PUCk7CiAJCWludGVsX3JpbmdfZW1pdChlbmdpbmUsIE1J X0xPQURfUkVHSVNURVJfSU1NKDEpKTsKIAkJaW50ZWxfcmluZ19lbWl0X3JlZyhlbmdpbmUsIElO U1RQTSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDI1MmZjMjQuLmI5MjU4ZWUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0yMzEsNiArMjMxLDI3IEBAIGVudW0gewogc3Rh dGljIGludCBpbnRlbF9scl9jb250ZXh0X3BpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAog CQkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKKy8qCisgKiBUZXN0IHRvIHNl ZSBpZiB0aGUgcmluZyBoYXMgc3VmZmljaWVudCBzcGFjZSB0byBzdWJtaXQgYSBnaXZlbiBwaWVj ZQorICogb2Ygd29yayB3aXRob3V0IGNhdXNpbmcgYSBzdGFsbAorICovCitzdGF0aWMgaW50IGxv Z2ljYWxfcmluZ190ZXN0X3NwYWNlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAor CQkJCSAgIGludCBtaW5fc3BhY2UpCit7CisJaWYgKHJpbmdidWYtPnNwYWNlIDwgbWluX3NwYWNl KSB7CisJCS8qIE5lZWQgdG8gdXBkYXRlIHRoZSBhY3R1YWwgcmluZyBzcGFjZS4gT3RoZXJ3aXNl LCB0aGUgc3lzdGVtCisJCSAqIGhhbmdzIGZvcmV2ZXIgdGVzdGluZyBhIHNvZnR3YXJlIGNvcHkg b2YgdGhlIHNwYWNlIHZhbHVlIHRoYXQKKwkJICogbmV2ZXIgY2hhbmdlcyEKKwkJICovCisJCWlu dGVsX3JpbmdfdXBkYXRlX3NwYWNlKHJpbmdidWYpOworCisJCWlmIChyaW5nYnVmLT5zcGFjZSA8 IG1pbl9zcGFjZSkKKwkJCXJldHVybiAtRUFHQUlOOworCX0KKworCXJldHVybiAwOworfQorCiAv KioKICAqIGludGVsX3Nhbml0aXplX2VuYWJsZV9leGVjbGlzdHMoKSAtIHNhbml0aXplIGk5MTUu ZW5hYmxlX2V4ZWNsaXN0cwogICogQGRldjogRFJNIGRldmljZS4KQEAgLTEwMDgsNiArMTAyOSw3 IEBAIGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVj YnVmZmVyX3BhcmFtcyAqcGFyYW1zKQogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9 IHBhcmFtcy0+ZW5naW5lOwogCXU2NCBleGVjX3N0YXJ0OwogCWludCByZXQ7CisJdWludDMyX3Qg bWluX3NwYWNlOwogCiAJLyogVGhlIG11dGV4IG11c3QgYmUgYWNxdWlyZWQgYmVmb3JlIGNhbGxp bmcgdGhpcyBmdW5jdGlvbiAqLwogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmcGFyYW1zLT5k ZXYtPnN0cnVjdF9tdXRleCkpOwpAQCAtMTAzMSw2ICsxMDUzLDM0IEBAIGludCBpbnRlbF9leGVj bGlzdHNfc3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFy YW1zKQogCQlnb3RvIGVycjsKIAogCS8qCisJICogSXQgd291bGQgYmUgYSBiYWQgaWRlYSB0byBy dW4gb3V0IG9mIHNwYWNlIHdoaWxlIHdyaXRpbmcgY29tbWFuZHMKKwkgKiB0byB0aGUgcmluZy4g T25lIG9mIHRoZSBtYWpvciBhaW1zIG9mIHRoZSBzY2hlZHVsZXIgaXMgdG8gbm90CisJICogc3Rh bGwgYXQgYW55IHBvaW50IGZvciBhbnkgcmVhc29uLiBIb3dldmVyLCBkb2luZyBhbiBlYXJseSBl eGl0CisJICogaGFsZiB3YXkgdGhyb3VnaCBzdWJtaXNzaW9uIGNvdWxkIHJlc3VsdCBpbiBhIHBh cnRpYWwgc2VxdWVuY2UKKwkgKiBiZWluZyB3cml0dGVuIHdoaWNoIHdvdWxkIGxlYXZlIHRoZSBl bmdpbmUgaW4gYW4gdW5rbm93biBzdGF0ZS4KKwkgKiBUaGVyZWZvcmUsIGNoZWNrIGluIGFkdmFu Y2UgdGhhdCB0aGVyZSB3aWxsIGJlIGVub3VnaCBzcGFjZSBmb3IKKwkgKiB0aGUgZW50aXJlIHN1 Ym1pc3Npb24gd2hldGhlciBlbWl0dGVkIGJ5IHRoZSBjb2RlIGJlbG93IE9SIGJ5IGFueQorCSAq IG90aGVyIGZ1bmN0aW9ucyB0aGF0IG1heSBiZSBleGVjdXRlZCBiZWZvcmUgdGhlIGVuZCBvZiBm aW5hbCgpLgorCSAqCisJICogTkI6IFRoaXMgdGVzdCBkZWxpYmVyYXRlbHkgb3ZlcmVzdGltYXRl cywgYmVjYXVzZSB0aGF0J3MgZWFzaWVyCisJICogdGhhbiB0cmFjaW5nIGV2ZXJ5IHBvdGVudGlh bCBwYXRoIHRoYXQgY291bGQgYmUgdGFrZW4hCisJICoKKwkgKiBDdXJyZW50IG1lYXN1cmVtZW50 cyBzdWdnZXN0IHRoYXQgd2UgbWF5IG5lZWQgdG8gZW1pdCB1cCB0byAxODYKKwkgKiBkd29yZHMs IHNvIHRoaXMgaXMgcm91bmRlZCB1cCB0byAyNTYgaGVyZS4gVGhlbiBkb3VibGUgdGhhdCB0byBn ZXQKKwkgKiB0aGUgZnJlZSBzcGFjZSByZXF1aXJlbWVudCwgYmVjYXVzZSB0aGUgYmxvY2sgaXMg bm90IGFsbG93ZWQgdG8KKwkgKiBzcGFuIHRoZSB0cmFuc2l0aW9uIGZyb20gdGhlIGVuZCB0byB0 aGUgYmVnaW5uaW5nIG9mIHRoZSByaW5nLgorCSAqLworI2RlZmluZSBJOTE1X0JBVENIX0VYRUNf TUFYX0xFTiAgICAgICAgIDI1NgkvKiBtYXggZHdvcmRzIGVtaXR0ZWQgaGVyZSAqLworCW1pbl9z cGFjZSA9IEk5MTVfQkFUQ0hfRVhFQ19NQVhfTEVOICogMiAqIHNpemVvZih1aW50MzJfdCk7CisJ cmV0ID0gbG9naWNhbF9yaW5nX3Rlc3Rfc3BhY2UocmluZ2J1ZiwgbWluX3NwYWNlKTsKKwlpZiAo cmV0KQorCQlnb3RvIGVycjsKKworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyZXEs IEk5MTVfQkFUQ0hfRVhFQ19NQVhfTEVOKTsKKwlpZiAocmV0KQorCQlnb3RvIGVycjsKKworCS8q CiAJICogVW5jb25kaXRpb25hbGx5IGludmFsaWRhdGUgZ3B1IGNhY2hlcyBhbmQgZW5zdXJlIHRo YXQgd2UgZG8gZmx1c2gKIAkgKiBhbnkgcmVzaWR1YWwgd3JpdGVzIGZyb20gdGhlIHByZXZpb3Vz IGJhdGNoLgogCSAqLwpAQCAtMTA0MCwxMCArMTA5MCw2IEBAIGludCBpbnRlbF9leGVjbGlzdHNf c3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zKQog CiAJaWYgKGVuZ2luZSA9PSAmZGV2X3ByaXYtPmVuZ2luZVtSQ1NdICYmCiAJICAgIHBhcmFtcy0+ aW5zdHBfbW9kZSAhPSBkZXZfcHJpdi0+cmVsYXRpdmVfY29uc3RhbnRzX21vZGUpIHsKLQkJcmV0 ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJlcSwgNCk7Ci0JCWlmIChyZXQpCi0JCQlyZXR1 cm4gcmV0OwotCiAJCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdidWYsIE1JX05PT1ApOwog CQlpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCBNSV9MT0FEX1JFR0lTVEVSX0lNTSgx KSk7CiAJCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0X3JlZyhyaW5nYnVmLCBJTlNUUE0pOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGY1YmNkMjQuLjZlYTI3YzYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTI1NzEsNiArMjU3 MSwzMiBAQCBpbnQgaW50ZWxfcmluZ19jYWNoZWxpbmVfYWxpZ24oc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEpCiAJcmV0dXJuIDA7CiB9CiAKKy8qCisgKiBUZXN0IHRvIHNlZSBpZiB0 aGUgcmluZyBoYXMgc3VmZmljaWVudCBzcGFjZSB0byBzdWJtaXQgYSBnaXZlbiBwaWVjZQorICog b2Ygd29yayB3aXRob3V0IGNhdXNpbmcgYSBzdGFsbAorICovCitpbnQgaW50ZWxfcmluZ190ZXN0 X3NwYWNlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLCBpbnQgbWluX3NwYWNlKQor eworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocmluZ2J1Zi0+ ZW5naW5lLT5kZXYpOworCisJLyogVGhlcmUgaXMgYSBzZXBhcmF0ZSBMUkMgdmVyc2lvbiBvZiB0 aGlzIGNvZGUuICovCisJV0FSTl9PTihpOTE1LmVuYWJsZV9leGVjbGlzdHMpOworCisJaWYgKHJp bmdidWYtPnNwYWNlIDwgbWluX3NwYWNlKSB7CisJCS8qIE5lZWQgdG8gdXBkYXRlIHRoZSBhY3R1 YWwgcmluZyBzcGFjZS4gT3RoZXJ3aXNlLCB0aGUgc3lzdGVtCisJCSAqIGhhbmdzIGZvcmV2ZXIg dGVzdGluZyBhIHNvZnR3YXJlIGNvcHkgb2YgdGhlIHNwYWNlIHZhbHVlIHRoYXQKKwkJICogbmV2 ZXIgY2hhbmdlcyEKKwkJICovCisJCXJpbmdidWYtPmhlYWQgID0gSTkxNV9SRUFEX0hFQUQocmlu Z2J1Zi0+ZW5naW5lKTsKKwkJcmluZ2J1Zi0+c3BhY2UgPSBpbnRlbF9yaW5nX3NwYWNlKHJpbmdi dWYpOworCisJCWlmIChyaW5nYnVmLT5zcGFjZSA8IG1pbl9zcGFjZSkKKwkJCXJldHVybiAtRUFH QUlOOworCX0KKworCXJldHVybiAwOworfQorCiB2b2lkIGludGVsX3JpbmdfaW5pdF9zZXFubyhz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIHUzMiBzZXFubykKIHsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuZ2luZS0+ZGV2KTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCAyZTdkYWVmLi4wNjdkNjM1IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC00NTAsNiArNDUwLDcgQEAg dm9pZCBpbnRlbF9jbGVhbnVwX2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp OwogCiBpbnQgaW50ZWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcXVlc3QpOwogCitpbnQgaW50ZWxfcmluZ190ZXN0X3NwYWNlKHN0cnVj dCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLCBpbnQgbWluX3NwYWNlKTsKIGludCBfX211c3Rf Y2hlY2sgaW50ZWxfcmluZ19iZWdpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwg aW50IG4pOwogaW50IF9fbXVzdF9jaGVjayBpbnRlbF9yaW5nX2NhY2hlbGluZV9hbGlnbihzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiBzdGF0aWMgaW5saW5lIHZvaWQgaW50ZWxf cmluZ19lbWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKLS0gCjEuOS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK