Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E5FE725C3 for ; Mon, 26 Jul 2021 20:00:55 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Mon, 26 Jul 2021 21:59:40 +0200 Message-Id: <20210726200026.4815-7-zbigniew.kempczynski@intel.com> In-Reply-To: <20210726200026.4815-1-zbigniew.kempczynski@intel.com> References: <20210726200026.4815-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v3 06/52] lib/intel_batchbuffer: Add allocator support in blitter src copy List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Petri Latvala , Chris Wilson List-ID: QWRqdXN0IGlndF9mYiBsaWJyYXJ5ICsgcHJpbWVfdmdlbSB0ZXN0IGFzIHRoZXkgYXJlIGJsaXR0 ZXIgc3JjIGNvcHkKdXNlcnMuCgpTaWduZWQtb2ZmLWJ5OiBaYmlnbmlldyBLZW1wY3p5xYRza2kg PHpiaWduaWV3LmtlbXBjenluc2tpQGludGVsLmNvbT4KQ2M6IFBldHJpIExhdHZhbGEgPHBldHJp LmxhdHZhbGFAaW50ZWwuY29tPgpDYzogQXNodXRvc2ggRGl4aXQgPGFzaHV0b3NoLmRpeGl0QGlu dGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0K IGxpYi9pZ3RfZmIuYyAgICAgICAgICAgIHwgICA1ICstCiBsaWIvaW50ZWxfYmF0Y2hidWZmZXIu YyB8ICA1MyArKysrKysrKysrKysrLS0tLS0KIGxpYi9pbnRlbF9iYXRjaGJ1ZmZlci5oIHwgICA2 ICstCiB0ZXN0cy9wcmltZV92Z2VtLmMgICAgICB8IDEyMCArKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDEzOCBpbnNlcnRpb25zKCspLCA0 NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWIvaWd0X2ZiLmMgYi9saWIvaWd0X2ZiLmMK aW5kZXggMWJiMzJjZDhhLi5jN2RjYWRjZjYgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfZmIuYworKysg Yi9saWIvaWd0X2ZiLmMKQEAgLTI0NjEsMTEgKzI0NjEsMTMgQEAgc3RhdGljIHZvaWQgYmxpdGNv cHkoY29uc3Qgc3RydWN0IGlndF9mYiAqZHN0X2ZiLAogCQkJCQkJICAgZHN0X2ZiLT5zaXplKTsK IAkJfSBlbHNlIHsKIAkJCWlndF9ibGl0dGVyX3NyY19jb3B5KGRzdF9mYi0+ZmQsCisJCQkJCSAg ICAgYWhuZCwgY3R4LAogCQkJCQkgICAgIHNyY19mYi0+Z2VtX2hhbmRsZSwKIAkJCQkJICAgICBz cmNfZmItPm9mZnNldHNbaV0sCiAJCQkJCSAgICAgc3JjX2ZiLT5zdHJpZGVzW2ldLAogCQkJCQkg ICAgIHNyY190aWxpbmcsCiAJCQkJCSAgICAgMCwgMCwgLyogc3JjX3gsIHNyY195ICovCisJCQkJ CSAgICAgc3JjX2ZiLT5zaXplLAogCQkJCQkgICAgIGRzdF9mYi0+cGxhbmVfd2lkdGhbaV0sCiAJ CQkJCSAgICAgZHN0X2ZiLT5wbGFuZV9oZWlnaHRbaV0sCiAJCQkJCSAgICAgZHN0X2ZiLT5wbGFu ZV9icHBbaV0sCkBAIC0yNDczLDcgKzI0NzUsOCBAQCBzdGF0aWMgdm9pZCBibGl0Y29weShjb25z dCBzdHJ1Y3QgaWd0X2ZiICpkc3RfZmIsCiAJCQkJCSAgICAgZHN0X2ZiLT5vZmZzZXRzW2ldLAog CQkJCQkgICAgIGRzdF9mYi0+c3RyaWRlc1tpXSwKIAkJCQkJICAgICBkc3RfdGlsaW5nLAotCQkJ CQkgICAgIDAsIDAgLyogZHN0X3gsIGRzdF95ICovKTsKKwkJCQkJICAgICAwLCAwIC8qIGRzdF94 LCBkc3RfeSAqLywKKwkJCQkJICAgICBkc3RfZmItPnNpemUpOwogCQl9CiAJfQogCmRpZmYgLS1n aXQgYS9saWIvaW50ZWxfYmF0Y2hidWZmZXIuYyBiL2xpYi9pbnRlbF9iYXRjaGJ1ZmZlci5jCmlu ZGV4IGQ5Y2M0ZDg5Yy4uZDRhNTllNTA4IDEwMDY0NAotLS0gYS9saWIvaW50ZWxfYmF0Y2hidWZm ZXIuYworKysgYi9saWIvaW50ZWxfYmF0Y2hidWZmZXIuYwpAQCAtNzYyLDEyICs3NjIsMTUgQEAg c3RhdGljIHVpbnQzMl90IHNyY19jb3B5X2R3b3JkMSh1aW50MzJfdCBkc3RfcGl0Y2gsIHVpbnQz Ml90IGJwcCkKIC8qKgogICogaWd0X2JsaXR0ZXJfc3JjX2NvcHk6CiAgKiBAZmQ6IGZpbGUgZGVz Y3JpcHRvciBvZiB0aGUgaTkxNSBkcml2ZXIKKyAqIEBhaG5kOiBoYW5kbGUgdG8gYW4gYWxsb2Nh dG9yCisgKiBAY3R4OiBjb250ZXh0IHdpdGhpbiB3aGljaCBleGVjdXRlIGNvcHkgYmxpdAogICog QHNyY19oYW5kbGU6IEdFTSBoYW5kbGUgb2YgdGhlIHNvdXJjZSBidWZmZXIKICAqIEBzcmNfZGVs dGE6IG9mZnNldCBpbnRvIHRoZSBzb3VyY2UgR0VNIGJvLCBpbiBieXRlcwogICogQHNyY19zdHJp ZGU6IFN0cmlkZSAoaW4gYnl0ZXMpIG9mIHRoZSBzb3VyY2UgYnVmZmVyCiAgKiBAc3JjX3RpbGlu ZzogVGlsaW5nIG1vZGUgb2YgdGhlIHNvdXJjZSBidWZmZXIKICAqIEBzcmNfeDogWCBjb29yZGlu YXRlIG9mIHRoZSBzb3VyY2UgcmVnaW9uIHRvIGNvcHkKICAqIEBzcmNfeTogWSBjb29yZGluYXRl IG9mIHRoZSBzb3VyY2UgcmVnaW9uIHRvIGNvcHkKKyAqIEBzcmNfc2l6ZTogc2l6ZSBvZiB0aGUg c3JjIGJvIHJlcXVpcmVkIGZvciBhbGxvY2F0b3IgYW5kIHNvZnRwaW4KICAqIEB3aWR0aDogV2lk dGggb2YgdGhlIHJlZ2lvbiB0byBjb3B5CiAgKiBAaGVpZ2h0OiBIZWlnaHQgb2YgdGhlIHJlZ2lv biB0byBjb3B5CiAgKiBAYnBwOiBzb3VyY2UgYW5kIGRlc3RpbmF0aW9uIGJpdHMgcGVyIHBpeGVs CkBAIC03NzcsMTYgKzc4MCwyMCBAQCBzdGF0aWMgdWludDMyX3Qgc3JjX2NvcHlfZHdvcmQxKHVp bnQzMl90IGRzdF9waXRjaCwgdWludDMyX3QgYnBwKQogICogQGRzdF90aWxpbmc6IFRpbGluZyBt b2RlIG9mIHRoZSBkZXN0aW5hdGlvbiBidWZmZXIKICAqIEBkc3RfeDogWCBjb29yZGluYXRlIG9m IGRlc3RpbmF0aW9uCiAgKiBAZHN0X3k6IFkgY29vcmRpbmF0ZSBvZiBkZXN0aW5hdGlvbgorICog QGRzdF9zaXplOiBzaXplIG9mIHRoZSBkc3QgYm8gcmVxdWlyZWQgZm9yIGFsbG9jYXRvciBhbmQg c29mdHBpbgogICoKICAqIENvcHkgQHNyYyBpbnRvIEBkc3QgdXNpbmcgdGhlIFhZX1NSQyBibGl0 IGNvbW1hbmQuCiAgKi8KIHZvaWQgaWd0X2JsaXR0ZXJfc3JjX2NvcHkoaW50IGZkLAorCQkJICB1 aW50NjRfdCBhaG5kLAorCQkJICB1aW50MzJfdCBjdHgsCiAJCQkgIC8qIHNyYyAqLwogCQkJICB1 aW50MzJfdCBzcmNfaGFuZGxlLAogCQkJICB1aW50MzJfdCBzcmNfZGVsdGEsCiAJCQkgIHVpbnQz Ml90IHNyY19zdHJpZGUsCiAJCQkgIHVpbnQzMl90IHNyY190aWxpbmcsCiAJCQkgIHVpbnQzMl90 IHNyY194LCB1aW50MzJfdCBzcmNfeSwKKwkJCSAgdWludDY0X3Qgc3JjX3NpemUsCiAKIAkJCSAg Lyogc2l6ZSAqLwogCQkJICB1aW50MzJfdCB3aWR0aCwgdWludDMyX3QgaGVpZ2h0LApAQCAtNzk5 LDcgKzgwNiw4IEBAIHZvaWQgaWd0X2JsaXR0ZXJfc3JjX2NvcHkoaW50IGZkLAogCQkJICB1aW50 MzJfdCBkc3RfZGVsdGEsCiAJCQkgIHVpbnQzMl90IGRzdF9zdHJpZGUsCiAJCQkgIHVpbnQzMl90 IGRzdF90aWxpbmcsCi0JCQkgIHVpbnQzMl90IGRzdF94LCB1aW50MzJfdCBkc3RfeSkKKwkJCSAg dWludDMyX3QgZHN0X3gsIHVpbnQzMl90IGRzdF95LAorCQkJICB1aW50NjRfdCBkc3Rfc2l6ZSkK IHsKIAl1aW50MzJfdCBiYXRjaFszMl07CiAJc3RydWN0IGRybV9pOTE1X2dlbV9leGVjX29iamVj dDIgb2Jqc1szXTsKQEAgLTgwOCw5ICs4MTYsMjEgQEAgdm9pZCBpZ3RfYmxpdHRlcl9zcmNfY29w eShpbnQgZmQsCiAJdWludDMyX3Qgc3JjX3BpdGNoLCBkc3RfcGl0Y2g7CiAJdWludDMyX3QgZHN0 X3JlbG9jX29mZnNldCwgc3JjX3JlbG9jX29mZnNldDsKIAl1aW50MzJfdCBnZW4gPSBpbnRlbF9n ZW4oaW50ZWxfZ2V0X2RybV9kZXZpZChmZCkpOworCXVpbnQ2NF90IGJhdGNoX29mZnNldCwgc3Jj X29mZnNldCwgZHN0X29mZnNldDsKIAljb25zdCBib29sIGhhc182NGJfcmVsb2MgPSBnZW4gPj0g ODsKIAlpbnQgaSA9IDA7CiAKKwliYXRjaF9oYW5kbGUgPSBnZW1fY3JlYXRlKGZkLCA0MDk2KTsK KwlpZiAoYWhuZCkgeworCQlzcmNfb2Zmc2V0ID0gZ2V0X29mZnNldChhaG5kLCBzcmNfaGFuZGxl LCBzcmNfc2l6ZSwgMCk7CisJCWRzdF9vZmZzZXQgPSBnZXRfb2Zmc2V0KGFobmQsIGRzdF9oYW5k bGUsIGRzdF9zaXplLCAwKTsKKwkJYmF0Y2hfb2Zmc2V0ID0gZ2V0X29mZnNldChhaG5kLCBiYXRj aF9oYW5kbGUsIDQwOTYsIDApOworCX0gZWxzZSB7CisJCXNyY19vZmZzZXQgPSAxNiA8PCAyMDsK KwkJZHN0X29mZnNldCA9IEFMSUdOKHNyY19vZmZzZXQgKyBzcmNfc2l6ZSwgMSA8PCAyMCk7CisJ CWJhdGNoX29mZnNldCA9IEFMSUdOKGRzdF9vZmZzZXQgKyBkc3Rfc2l6ZSwgMSA8PCAyMCk7CisJ fQorCiAJbWVtc2V0KGJhdGNoLCAwLCBzaXplb2YoYmF0Y2gpKTsKIAogCWlndF9hc3NlcnQoKHNy Y190aWxpbmcgPT0gSTkxNV9USUxJTkdfTk9ORSkgfHwKQEAgLTg1NSwxNSArODc1LDE1IEBAIHZv aWQgaWd0X2JsaXR0ZXJfc3JjX2NvcHkoaW50IGZkLAogCWJhdGNoW2krK10gPSAoZHN0X3kgPDwg MTYpIHwgZHN0X3g7IC8qIGRzdCB4MSx5MSAqLwogCWJhdGNoW2krK10gPSAoKGRzdF95ICsgaGVp Z2h0KSA8PCAxNikgfCAoZHN0X3ggKyB3aWR0aCk7IC8qIGRzdCB4Mix5MiAqLwogCWRzdF9yZWxv Y19vZmZzZXQgPSBpOwotCWJhdGNoW2krK10gPSBkc3RfZGVsdGE7IC8qIGRzdCBhZGRyZXNzIGxv d2VyIGJpdHMgKi8KKwliYXRjaFtpKytdID0gZHN0X29mZnNldCArIGRzdF9kZWx0YTsgLyogZHN0 IGFkZHJlc3MgbG93ZXIgYml0cyAqLwogCWlmIChoYXNfNjRiX3JlbG9jKQotCQliYXRjaFtpKytd ID0gMDsJLyogZHN0IGFkZHJlc3MgdXBwZXIgYml0cyAqLworCQliYXRjaFtpKytdID0gKGRzdF9v ZmZzZXQgKyBkc3RfZGVsdGEpID4+IDMyOyAvKiBkc3QgYWRkcmVzcyB1cHBlciBiaXRzICovCiAJ YmF0Y2hbaSsrXSA9IChzcmNfeSA8PCAxNikgfCBzcmNfeDsgLyogc3JjIHgxLHkxICovCiAJYmF0 Y2hbaSsrXSA9IHNyY19waXRjaDsKIAlzcmNfcmVsb2Nfb2Zmc2V0ID0gaTsKLQliYXRjaFtpKytd ID0gc3JjX2RlbHRhOyAvKiBzcmMgYWRkcmVzcyBsb3dlciBiaXRzICovCisJYmF0Y2hbaSsrXSA9 IHNyY19vZmZzZXQgKyBzcmNfZGVsdGE7IC8qIHNyYyBhZGRyZXNzIGxvd2VyIGJpdHMgKi8KIAlp ZiAoaGFzXzY0Yl9yZWxvYykKLQkJYmF0Y2hbaSsrXSA9IDA7CS8qIHNyYyBhZGRyZXNzIHVwcGVy IGJpdHMgKi8KKwkJYmF0Y2hbaSsrXSA9IChzcmNfb2Zmc2V0ICsgc3JjX2RlbHRhKSA+PiAzMjsg Lyogc3JjIGFkZHJlc3MgdXBwZXIgYml0cyAqLwogCiAJaWYgKChzcmNfdGlsaW5nIHwgZHN0X3Rp bGluZykgPj0gSTkxNV9USUxJTkdfWSkgewogCQlpZ3RfYXNzZXJ0KGdlbiA+PSA2KTsKQEAgLTg4 MiwyMiArOTAyLDI5IEBAIHZvaWQgaWd0X2JsaXR0ZXJfc3JjX2NvcHkoaW50IGZkLAogCiAJaWd0 X2Fzc2VydChpIDw9IEFSUkFZX1NJWkUoYmF0Y2gpKTsKIAotCWJhdGNoX2hhbmRsZSA9IGdlbV9j cmVhdGUoZmQsIDQwOTYpOwogCWdlbV93cml0ZShmZCwgYmF0Y2hfaGFuZGxlLCAwLCBiYXRjaCwg c2l6ZW9mKGJhdGNoKSk7CiAKLQlmaWxsX3JlbG9jYXRpb24oJnJlbG9jc1swXSwgZHN0X2hhbmRs ZSwgLTEsIGRzdF9kZWx0YSwgZHN0X3JlbG9jX29mZnNldCwKKwlmaWxsX3JlbG9jYXRpb24oJnJl bG9jc1swXSwgZHN0X2hhbmRsZSwgZHN0X29mZnNldCwKKwkJCWRzdF9kZWx0YSwgZHN0X3JlbG9j X29mZnNldCwKIAkJCUk5MTVfR0VNX0RPTUFJTl9SRU5ERVIsIEk5MTVfR0VNX0RPTUFJTl9SRU5E RVIpOwotCWZpbGxfcmVsb2NhdGlvbigmcmVsb2NzWzFdLCBzcmNfaGFuZGxlLCAtMSwgc3JjX2Rl bHRhLCBzcmNfcmVsb2Nfb2Zmc2V0LAorCWZpbGxfcmVsb2NhdGlvbigmcmVsb2NzWzFdLCBzcmNf aGFuZGxlLCBzcmNfb2Zmc2V0LAorCQkJc3JjX2RlbHRhLCBzcmNfcmVsb2Nfb2Zmc2V0LAogCQkJ STkxNV9HRU1fRE9NQUlOX1JFTkRFUiwgMCk7CiAKLQlmaWxsX29iamVjdCgmb2Jqc1swXSwgZHN0 X2hhbmRsZSwgMCwgTlVMTCwgMCk7Ci0JZmlsbF9vYmplY3QoJm9ianNbMV0sIHNyY19oYW5kbGUs IDAsIE5VTEwsIDApOwotCWZpbGxfb2JqZWN0KCZvYmpzWzJdLCBiYXRjaF9oYW5kbGUsIDAsIHJl bG9jcywgMik7CisJZmlsbF9vYmplY3QoJm9ianNbMF0sIGRzdF9oYW5kbGUsIGRzdF9vZmZzZXQs IE5VTEwsIDApOworCWZpbGxfb2JqZWN0KCZvYmpzWzFdLCBzcmNfaGFuZGxlLCBzcmNfb2Zmc2V0 LCBOVUxMLCAwKTsKKwlmaWxsX29iamVjdCgmb2Jqc1syXSwgYmF0Y2hfaGFuZGxlLCBiYXRjaF9v ZmZzZXQsIHJlbG9jcywgMik7CiAKLQlvYmpzWzBdLmZsYWdzIHw9IEVYRUNfT0JKRUNUX05FRURT X0ZFTkNFOworCW9ianNbMF0uZmxhZ3MgfD0gRVhFQ19PQkpFQ1RfTkVFRFNfRkVOQ0UgfCBFWEVD X09CSkVDVF9XUklURTsKIAlvYmpzWzFdLmZsYWdzIHw9IEVYRUNfT0JKRUNUX05FRURTX0ZFTkNF OwogCi0JZXhlY19ibGl0KGZkLCBvYmpzLCAzLCBnZW4sIDApOworCWlmIChhaG5kKSB7CisJCW9i anNbMF0uZmxhZ3MgfD0gRVhFQ19PQkpFQ1RfUElOTkVEIHwgRVhFQ19PQkpFQ1RfU1VQUE9SVFNf NDhCX0FERFJFU1M7CisJCW9ianNbMV0uZmxhZ3MgfD0gRVhFQ19PQkpFQ1RfUElOTkVEIHwgRVhF Q19PQkpFQ1RfU1VQUE9SVFNfNDhCX0FERFJFU1M7CisJCW9ianNbMl0uZmxhZ3MgfD0gRVhFQ19P QkpFQ1RfUElOTkVEIHwgRVhFQ19PQkpFQ1RfU1VQUE9SVFNfNDhCX0FERFJFU1M7CisJfQorCisJ ZXhlY19ibGl0KGZkLCBvYmpzLCAzLCBnZW4sIGN0eCk7CiAKIAlnZW1fY2xvc2UoZmQsIGJhdGNo X2hhbmRsZSk7CiB9CmRpZmYgLS1naXQgYS9saWIvaW50ZWxfYmF0Y2hidWZmZXIuaCBiL2xpYi9p bnRlbF9iYXRjaGJ1ZmZlci5oCmluZGV4IDc0YzIxYzQwZS4uYzE5NzRmZTczIDEwMDY0NAotLS0g YS9saWIvaW50ZWxfYmF0Y2hidWZmZXIuaAorKysgYi9saWIvaW50ZWxfYmF0Y2hidWZmZXIuaApA QCAtMjcxLDEyICsyNzEsMTUgQEAgdW5zaWduZWQgaW50IGlndF9idWZfaW50ZWxfY2NzX2hlaWdo dCh1bnNpZ25lZCBpbnQgZ2VuLAogCQkJCSAgICAgIGNvbnN0IHN0cnVjdCBpZ3RfYnVmICpidWYp OwogCiB2b2lkIGlndF9ibGl0dGVyX3NyY19jb3B5KGludCBmZCwKKwkJCSAgdWludDY0X3QgYWhu ZCwKKwkJCSAgdWludDMyX3QgY3R4LAogCQkJICAvKiBzcmMgKi8KIAkJCSAgdWludDMyX3Qgc3Jj X2hhbmRsZSwKIAkJCSAgdWludDMyX3Qgc3JjX2RlbHRhLAogCQkJICB1aW50MzJfdCBzcmNfc3Ry aWRlLAogCQkJICB1aW50MzJfdCBzcmNfdGlsaW5nLAogCQkJICB1aW50MzJfdCBzcmNfeCwgdWlu dDMyX3Qgc3JjX3ksCisJCQkgIHVpbnQ2NF90IHNyY19zaXplLAogCiAJCQkgIC8qIHNpemUgKi8K IAkJCSAgdWludDMyX3Qgd2lkdGgsIHVpbnQzMl90IGhlaWdodCwKQEAgLTI4OSw3ICsyOTIsOCBA QCB2b2lkIGlndF9ibGl0dGVyX3NyY19jb3B5KGludCBmZCwKIAkJCSAgdWludDMyX3QgZHN0X2Rl bHRhLAogCQkJICB1aW50MzJfdCBkc3Rfc3RyaWRlLAogCQkJICB1aW50MzJfdCBkc3RfdGlsaW5n LAotCQkJICB1aW50MzJfdCBkc3RfeCwgdWludDMyX3QgZHN0X3kpOworCQkJICB1aW50MzJfdCBk c3RfeCwgdWludDMyX3QgZHN0X3ksCisJCQkgIHVpbnQ2NF90IGRzdF9zaXplKTsKIAogdm9pZCBp Z3RfYmxpdHRlcl9mYXN0X2NvcHkoc3RydWN0IGludGVsX2JhdGNoYnVmZmVyICpiYXRjaCwKIAkJ CSAgIGNvbnN0IHN0cnVjdCBpZ3RfYnVmICpzcmMsIHVuc2lnbmVkIHNyY19kZWx0YSwKZGlmZiAt LWdpdCBhL3Rlc3RzL3ByaW1lX3ZnZW0uYyBiL3Rlc3RzL3ByaW1lX3ZnZW0uYwppbmRleCAyNWM1 ZjQyZjUuLmI4MzdmMmJmYSAxMDA2NDQKLS0tIGEvdGVzdHMvcHJpbWVfdmdlbS5jCisrKyBiL3Rl c3RzL3ByaW1lX3ZnZW0uYwpAQCAtMjA3LDEwICsyMDcsMTQgQEAgc3RhdGljIHZvaWQgdGVzdF9m ZW5jZV9ibHQoaW50IGk5MTUsIGludCB2Z2VtKQogCiAJaWd0X2ZvcmsoY2hpbGQsIDEpIHsKIAkJ dWludDMyX3QgbmF0aXZlOworCQl1aW50NjRfdCBhaG5kOwogCiAJCWNsb3NlKG1hc3RlclswXSk7 CiAJCWNsb3NlKHNsYXZlWzFdKTsKIAorCQlpbnRlbF9hbGxvY2F0b3JfaW5pdCgpOworCQlhaG5k ID0gZ2V0X3JlbG9jX2FobmQoaTkxNSwgMCk7CisKIAkJbmF0aXZlID0gZ2VtX2NyZWF0ZShpOTE1 LCBzY3JhdGNoLnNpemUpOwogCiAJCXB0ciA9IGdlbV9tbWFwX193YyhpOTE1LCBuYXRpdmUsIDAs IHNjcmF0Y2guc2l6ZSwgUFJPVF9SRUFEKTsKQEAgLTIyMSwxMCArMjI1LDExIEBAIHN0YXRpYyB2 b2lkIHRlc3RfZmVuY2VfYmx0KGludCBpOTE1LCBpbnQgdmdlbSkKIAkJd3JpdGUobWFzdGVyWzFd LCAmY2hpbGQsIHNpemVvZihjaGlsZCkpOwogCQlyZWFkKHNsYXZlWzBdLCAmY2hpbGQsIHNpemVv ZihjaGlsZCkpOwogCi0JCWlndF9ibGl0dGVyX3NyY19jb3B5KGk5MTUsIHByaW1lLCAwLCBzY3Jh dGNoLnBpdGNoLAotCQkJCSAgICAgSTkxNV9USUxJTkdfTk9ORSwgMCwgMCwgc2NyYXRjaC53aWR0 aCwKLQkJCQkgICAgIHNjcmF0Y2guaGVpZ2h0LCBzY3JhdGNoLmJwcCwgbmF0aXZlLCAwLAotCQkJ CSAgICAgc2NyYXRjaC5waXRjaCwgSTkxNV9USUxJTkdfTk9ORSwgMCwgMCk7CisJCWlndF9ibGl0 dGVyX3NyY19jb3B5KGk5MTUsIGFobmQsIDAsIHByaW1lLCAwLCBzY3JhdGNoLnBpdGNoLAorCQkJ CSAgICAgSTkxNV9USUxJTkdfTk9ORSwgMCwgMCwgc2NyYXRjaC5zaXplLAorCQkJCSAgICAgc2Ny YXRjaC53aWR0aCwgc2NyYXRjaC5oZWlnaHQsIHNjcmF0Y2guYnBwLAorCQkJCSAgICAgbmF0aXZl LCAwLCBzY3JhdGNoLnBpdGNoLAorCQkJCSAgICAgSTkxNV9USUxJTkdfTk9ORSwgMCwgMCwgc2Ny YXRjaC5zaXplKTsKIAkJZ2VtX3N5bmMoaTkxNSwgbmF0aXZlKTsKIAogCQlmb3IgKGkgPSAwOyBp IDwgc2NyYXRjaC5oZWlnaHQ7IGkrKykKQEAgLTIzNCw2ICsyMzksNyBAQCBzdGF0aWMgdm9pZCB0 ZXN0X2ZlbmNlX2JsdChpbnQgaTkxNSwgaW50IHZnZW0pCiAJCW11bm1hcChwdHIsIHNjcmF0Y2gu c2l6ZSk7CiAJCWdlbV9jbG9zZShpOTE1LCBuYXRpdmUpOwogCQlnZW1fY2xvc2UoaTkxNSwgcHJp bWUpOworCQlwdXRfYWhuZChhaG5kKTsKIAl9CiAKIAljbG9zZShtYXN0ZXJbMV0pOwpAQCAtMzc1 LDYgKzM4MSw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfYmx0KGludCB2Z2VtLCBpbnQgaTkxNSkKIAl1 aW50MzJfdCBwcmltZSwgbmF0aXZlOwogCXVpbnQzMl90ICpwdHI7CiAJaW50IGRtYWJ1ZiwgaTsK Kwl1aW50NjRfdCBhaG5kID0gZ2V0X3JlbG9jX2FobmQoaTkxNSwgMCk7CiAKIAlzY3JhdGNoLndp ZHRoID0gMTAyNDsKIAlzY3JhdGNoLmhlaWdodCA9IDEwMjQ7CkBAIC0zOTEsOSArMzk4LDExIEBA IHN0YXRpYyB2b2lkIHRlc3RfYmx0KGludCB2Z2VtLCBpbnQgaTkxNSkKIAkJcHRyW3NjcmF0Y2gu cGl0Y2ggKiBpIC8gc2l6ZW9mKCpwdHIpXSA9IGk7CiAJbXVubWFwKHB0ciwgc2NyYXRjaC5zaXpl KTsKIAotCWlndF9ibGl0dGVyX3NyY19jb3B5KGk5MTUsIG5hdGl2ZSwgMCwgc2NyYXRjaC5waXRj aCwgSTkxNV9USUxJTkdfTk9ORSwKLQkJCSAgICAgMCwgMCwgc2NyYXRjaC53aWR0aCwgc2NyYXRj aC5oZWlnaHQsIHNjcmF0Y2guYnBwLAotCQkJICAgICBwcmltZSwgMCwgc2NyYXRjaC5waXRjaCwg STkxNV9USUxJTkdfTk9ORSwgMCwgMCk7CisJaWd0X2JsaXR0ZXJfc3JjX2NvcHkoaTkxNSwgYWhu ZCwgMCwgbmF0aXZlLCAwLCBzY3JhdGNoLnBpdGNoLAorCQkJICAgICBJOTE1X1RJTElOR19OT05F LCAwLCAwLCBzY3JhdGNoLnNpemUsCisJCQkgICAgIHNjcmF0Y2gud2lkdGgsIHNjcmF0Y2guaGVp Z2h0LCBzY3JhdGNoLmJwcCwKKwkJCSAgICAgcHJpbWUsIDAsIHNjcmF0Y2gucGl0Y2gsIEk5MTVf VElMSU5HX05PTkUsIDAsIDAsCisJCQkgICAgIHNjcmF0Y2guc2l6ZSk7CiAJcHJpbWVfc3luY19z dGFydChkbWFidWYsIHRydWUpOwogCXByaW1lX3N5bmNfZW5kKGRtYWJ1ZiwgdHJ1ZSk7CiAJY2xv c2UoZG1hYnVmKTsKQEAgLTQwNSw5ICs0MTQsMTEgQEAgc3RhdGljIHZvaWQgdGVzdF9ibHQoaW50 IHZnZW0sIGludCBpOTE1KQogCX0KIAltdW5tYXAocHRyLCBzY3JhdGNoLnNpemUpOwogCi0JaWd0 X2JsaXR0ZXJfc3JjX2NvcHkoaTkxNSwgcHJpbWUsIDAsIHNjcmF0Y2gucGl0Y2gsIEk5MTVfVElM SU5HX05PTkUsCi0JCQkgICAgIDAsIDAsIHNjcmF0Y2gud2lkdGgsIHNjcmF0Y2guaGVpZ2h0LCBz Y3JhdGNoLmJwcCwKLQkJCSAgICAgbmF0aXZlLCAwLCBzY3JhdGNoLnBpdGNoLCBJOTE1X1RJTElO R19OT05FLCAwLCAwKTsKKwlpZ3RfYmxpdHRlcl9zcmNfY29weShpOTE1LCBhaG5kLCAwLCBwcmlt ZSwgMCwgc2NyYXRjaC5waXRjaCwKKwkJCSAgICAgSTkxNV9USUxJTkdfTk9ORSwgMCwgMCwgc2Ny YXRjaC5zaXplLAorCQkJICAgICBzY3JhdGNoLndpZHRoLCBzY3JhdGNoLmhlaWdodCwgc2NyYXRj aC5icHAsCisJCQkgICAgIG5hdGl2ZSwgMCwgc2NyYXRjaC5waXRjaCwgSTkxNV9USUxJTkdfTk9O RSwgMCwgMCwKKwkJCSAgICAgc2NyYXRjaC5zaXplKTsKIAlnZW1fc3luYyhpOTE1LCBuYXRpdmUp OwogCiAJcHRyID0gZ2VtX21tYXBfX3djKGk5MTUsIG5hdGl2ZSwgMCwgc2NyYXRjaC5zaXplLCBQ Uk9UX1JFQUQpOwpAQCAtNDE4LDYgKzQyOSw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfYmx0KGludCB2 Z2VtLCBpbnQgaTkxNSkKIAlnZW1fY2xvc2UoaTkxNSwgbmF0aXZlKTsKIAlnZW1fY2xvc2UoaTkx NSwgcHJpbWUpOwogCWdlbV9jbG9zZSh2Z2VtLCBzY3JhdGNoLmhhbmRsZSk7CisJcHV0X2FobmQo YWhuZCk7CiB9CiAKIHN0YXRpYyB2b2lkIHRlc3Rfc2hyaW5rKGludCB2Z2VtLCBpbnQgaTkxNSkK QEAgLTUwOSw2ICs1MjEsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0X2JsdF9pbnRlcmxlYXZlZChpbnQg dmdlbSwgaW50IGk5MTUpCiAJdWludDMyX3QgcHJpbWUsIG5hdGl2ZTsKIAl1aW50MzJfdCAqZm9y ZWlnbiwgKmxvY2FsOwogCWludCBkbWFidWYsIGk7CisJdWludDY0X3QgYWhuZCA9IGdldF9yZWxv Y19haG5kKGk5MTUsIDApOwogCiAJc2NyYXRjaC53aWR0aCA9IDEwMjQ7CiAJc2NyYXRjaC5oZWln aHQgPSAxMDI0OwpAQCAtNTI1LDIwICs1MzgsMjIgQEAgc3RhdGljIHZvaWQgdGVzdF9ibHRfaW50 ZXJsZWF2ZWQoaW50IHZnZW0sIGludCBpOTE1KQogCiAJZm9yIChpID0gMDsgaSA8IHNjcmF0Y2gu aGVpZ2h0OyBpKyspIHsKIAkJbG9jYWxbc2NyYXRjaC5waXRjaCAqIGkgLyBzaXplb2YoKmxvY2Fs KV0gPSBpOwotCQlpZ3RfYmxpdHRlcl9zcmNfY29weShpOTE1LCBuYXRpdmUsIDAsIHNjcmF0Y2gu cGl0Y2gsCi0JCQkJICAgICBJOTE1X1RJTElOR19OT05FLCAwLCBpLCBzY3JhdGNoLndpZHRoLCAx LAorCQlpZ3RfYmxpdHRlcl9zcmNfY29weShpOTE1LCBhaG5kLCAwLCBuYXRpdmUsIDAsIHNjcmF0 Y2gucGl0Y2gsCisJCQkJICAgICBJOTE1X1RJTElOR19OT05FLCAwLCBpLCBzY3JhdGNoLnNpemUs CisJCQkJICAgICBzY3JhdGNoLndpZHRoLCAxLAogCQkJCSAgICAgc2NyYXRjaC5icHAsIHByaW1l LCAwLCBzY3JhdGNoLnBpdGNoLAotCQkJCSAgICAgSTkxNV9USUxJTkdfTk9ORSwgMCwgaSk7CisJ CQkJICAgICBJOTE1X1RJTElOR19OT05FLCAwLCBpLCBzY3JhdGNoLnNpemUpOwogCQlwcmltZV9z eW5jX3N0YXJ0KGRtYWJ1ZiwgdHJ1ZSk7CiAJCWlndF9hc3NlcnRfZXFfdTMyKGZvcmVpZ25bc2Ny YXRjaC5waXRjaCAqIGkgLyBzaXplb2YoKmZvcmVpZ24pXSwKIAkJCQkgIGkpOwogCQlwcmltZV9z eW5jX2VuZChkbWFidWYsIHRydWUpOwogCiAJCWZvcmVpZ25bc2NyYXRjaC5waXRjaCAqIGkgLyBz aXplb2YoKmZvcmVpZ24pXSA9IH5pOwotCQlpZ3RfYmxpdHRlcl9zcmNfY29weShpOTE1LCBwcmlt ZSwgMCwgc2NyYXRjaC5waXRjaCwKLQkJCQkgICAgIEk5MTVfVElMSU5HX05PTkUsIDAsIGksIHNj cmF0Y2gud2lkdGgsIDEsCisJCWlndF9ibGl0dGVyX3NyY19jb3B5KGk5MTUsIGFobmQsIDAsIHBy aW1lLCAwLCBzY3JhdGNoLnBpdGNoLAorCQkJCSAgICAgSTkxNV9USUxJTkdfTk9ORSwgMCwgaSwg c2NyYXRjaC5zaXplLAorCQkJCSAgICAgc2NyYXRjaC53aWR0aCwgMSwKIAkJCQkgICAgIHNjcmF0 Y2guYnBwLCBuYXRpdmUsIDAsIHNjcmF0Y2gucGl0Y2gsCi0JCQkJICAgICBJOTE1X1RJTElOR19O T05FLCAwLCBpKTsKKwkJCQkgICAgIEk5MTVfVElMSU5HX05PTkUsIDAsIGksIHNjcmF0Y2guc2l6 ZSk7CiAJCWdlbV9zeW5jKGk5MTUsIG5hdGl2ZSk7CiAJCWlndF9hc3NlcnRfZXFfdTMyKGxvY2Fs W3NjcmF0Y2gucGl0Y2ggKiBpIC8gc2l6ZW9mKCpsb2NhbCldLAogCQkJCSAgfmkpOwpAQCAtNTUx LDYgKzU2Niw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfYmx0X2ludGVybGVhdmVkKGludCB2Z2VtLCBp bnQgaTkxNSkKIAlnZW1fY2xvc2UoaTkxNSwgbmF0aXZlKTsKIAlnZW1fY2xvc2UoaTkxNSwgcHJp bWUpOwogCWdlbV9jbG9zZSh2Z2VtLCBzY3JhdGNoLmhhbmRsZSk7CisJcHV0X2FobmQoYWhuZCk7 CiB9CiAKIHN0YXRpYyBib29sIHByaW1lX2J1c3koaW50IGZkLCBib29sIGV4Y2wpCkBAIC01NTks NyArNTc1LDggQEAgc3RhdGljIGJvb2wgcHJpbWVfYnVzeShpbnQgZmQsIGJvb2wgZXhjbCkKIAly ZXR1cm4gcG9sbCgmcGZkLCAxLCAwKSA9PSAwOwogfQogCi1zdGF0aWMgdm9pZCB3b3JrKGludCBp OTE1LCBpbnQgZG1hYnVmLCBjb25zdCBpbnRlbF9jdHhfdCAqY3R4LCB1bnNpZ25lZCByaW5nKQor c3RhdGljIHZvaWQgd29yayhpbnQgaTkxNSwgdWludDY0X3QgYWhuZCwgdWludDY0X3Qgc2NyYXRj aF9vZmZzZXQsIGludCBkbWFidWYsCisJCSBjb25zdCBpbnRlbF9jdHhfdCAqY3R4LCB1bnNpZ25l ZCByaW5nKQogewogCWNvbnN0IGludCBTQ1JBVENIID0gMDsKIAljb25zdCBpbnQgQkFUQ0ggPSAx OwpAQCAtNTg0LDEwICs2MDEsMTcgQEAgc3RhdGljIHZvaWQgd29yayhpbnQgaTkxNSwgaW50IGRt YWJ1ZiwgY29uc3QgaW50ZWxfY3R4X3QgKmN0eCwgdW5zaWduZWQgcmluZykKIAlvYmpbU0NSQVRD SF0uaGFuZGxlID0gcHJpbWVfZmRfdG9faGFuZGxlKGk5MTUsIGRtYWJ1Zik7CiAKIAlvYmpbQkFU Q0hdLmhhbmRsZSA9IGdlbV9jcmVhdGUoaTkxNSwgc2l6ZSk7CisJb2JqW0JBVENIXS5vZmZzZXQg PSBnZXRfb2Zmc2V0KGFobmQsIG9ialtCQVRDSF0uaGFuZGxlLCBzaXplLCAwKTsKIAlvYmpbQkFU Q0hdLnJlbG9jc19wdHIgPSAodWludHB0cl90KXN0b3JlOwotCW9ialtCQVRDSF0ucmVsb2NhdGlv bl9jb3VudCA9IEFSUkFZX1NJWkUoc3RvcmUpOworCW9ialtCQVRDSF0ucmVsb2NhdGlvbl9jb3Vu dCA9ICFhaG5kID8gQVJSQVlfU0laRShzdG9yZSkgOiAwOwogCW1lbXNldChzdG9yZSwgMCwgc2l6 ZW9mKHN0b3JlKSk7CiAKKwlpZiAoYWhuZCkgeworCQlvYmpbU0NSQVRDSF0uZmxhZ3MgPSBFWEVD X09CSkVDVF9QSU5ORUQgfCBFWEVDX09CSkVDVF9XUklURTsKKwkJb2JqW1NDUkFUQ0hdLm9mZnNl dCA9IHNjcmF0Y2hfb2Zmc2V0OworCQlvYmpbQkFUQ0hdLmZsYWdzID0gRVhFQ19PQkpFQ1RfUElO TkVEOworCX0KKwogCWJhdGNoID0gZ2VtX21tYXBfX3djKGk5MTUsIG9ialtCQVRDSF0uaGFuZGxl LCAwLCBzaXplLCBQUk9UX1dSSVRFKTsKIAlnZW1fc2V0X2RvbWFpbihpOTE1LCBvYmpbQkFUQ0hd LmhhbmRsZSwKIAkJICAgICAgIEk5MTVfR0VNX0RPTUFJTl9HVFQsIEk5MTVfR0VNX0RPTUFJTl9H VFQpOwpAQCAtNjAyLDggKzYyNiw4IEBAIHN0YXRpYyB2b2lkIHdvcmsoaW50IGk5MTUsIGludCBk bWFidWYsIGNvbnN0IGludGVsX2N0eF90ICpjdHgsIHVuc2lnbmVkIHJpbmcpCiAJCXN0b3JlW2Nv dW50XS53cml0ZV9kb21haW4gPSBJOTE1X0dFTV9ET01BSU5fSU5TVFJVQ1RJT047CiAJCWJhdGNo W2ldID0gTUlfU1RPUkVfRFdPUkRfSU1NIHwgKGdlbiA8IDYgPyAxIDw8IDIyIDogMCk7CiAJCWlm IChnZW4gPj0gOCkgewotCQkJYmF0Y2hbKytpXSA9IDA7Ci0JCQliYXRjaFsrK2ldID0gMDsKKwkJ CWJhdGNoWysraV0gPSBzY3JhdGNoX29mZnNldCArIHN0b3JlW2NvdW50XS5kZWx0YTsKKwkJCWJh dGNoWysraV0gPSAoc2NyYXRjaF9vZmZzZXQgKyBzdG9yZVtjb3VudF0uZGVsdGEpID4+IDMyOwog CQl9IGVsc2UgaWYgKGdlbiA+PSA0KSB7CiAJCQliYXRjaFsrK2ldID0gMDsKIAkJCWJhdGNoWysr aV0gPSAwOwpAQCAtNjI2LDggKzY1MCw4IEBAIHN0YXRpYyB2b2lkIHdvcmsoaW50IGk5MTUsIGlu dCBkbWFidWYsIGNvbnN0IGludGVsX2N0eF90ICpjdHgsIHVuc2lnbmVkIHJpbmcpCiAJYmF0Y2hb aV0gPSBNSV9CQVRDSF9CVUZGRVJfU1RBUlQ7CiAJaWYgKGdlbiA+PSA4KSB7CiAJCWJhdGNoW2ld IHw9IDEgPDwgOCB8IDE7Ci0JCWJhdGNoWysraV0gPSAwOwotCQliYXRjaFsrK2ldID0gMDsKKwkJ YmF0Y2hbKytpXSA9IG9ialtCQVRDSF0ub2Zmc2V0OworCQliYXRjaFsrK2ldID0gb2JqW0JBVENI XS5vZmZzZXQgPj4gMzI7CiAJfSBlbHNlIGlmIChnZW4gPj0gNikgewogCQliYXRjaFtpXSB8PSAx IDw8IDg7CiAJCWJhdGNoWysraV0gPSAwOwpAQCAtNjYyLDE0ICs2ODYsMTggQEAgc3RhdGljIHZv aWQgdGVzdF9idXN5KGludCBpOTE1LCBpbnQgdmdlbSwgY29uc3QgaW50ZWxfY3R4X3QgKmN0eCwg dW5zaWduZWQgcmluZykKIAl1aW50MzJfdCAqcHRyOwogCWludCBkbWFidWY7CiAJaW50IGk7CisJ dWludDY0X3QgYWhuZCA9IGdldF9yZWxvY19haG5kKGk5MTUsIGN0eC0+aWQpLCBzY3JhdGNoX29m ZnNldDsKIAogCXNjcmF0Y2gud2lkdGggPSAxMDI0OwogCXNjcmF0Y2guaGVpZ2h0ID0gMTsKIAlz Y3JhdGNoLmJwcCA9IDMyOwogCXZnZW1fY3JlYXRlKHZnZW0sICZzY3JhdGNoKTsKKwlzY3JhdGNo X29mZnNldCA9IGdldF9vZmZzZXQoYWhuZCwgc2NyYXRjaC5oYW5kbGUsIHNjcmF0Y2guc2l6ZSwg MCk7CiAJZG1hYnVmID0gcHJpbWVfaGFuZGxlX3RvX2ZkKHZnZW0sIHNjcmF0Y2guaGFuZGxlKTsK IAotCXdvcmsoaTkxNSwgZG1hYnVmLCBjdHgsIHJpbmcpOworCXdvcmsoaTkxNSwgYWhuZCwgc2Ny YXRjaF9vZmZzZXQsIGRtYWJ1ZiwgY3R4LCByaW5nKTsKKworCXB1dF9haG5kKGFobmQpOwogCiAJ LyogQ2FsbGluZyBidXN5IGluIGEgbG9vcCBzaG91bGQgYmUgZW5vdWdoIHRvIGZsdXNoIHRoZSBy ZW5kZXJpbmcgKi8KIAltZW1zZXQoJnR2LCAwLCBzaXplb2YodHYpKTsKQEAgLTY5MSwxNCArNzE5 LDE4IEBAIHN0YXRpYyB2b2lkIHRlc3Rfd2FpdChpbnQgaTkxNSwgaW50IHZnZW0sIGNvbnN0IGlu dGVsX2N0eF90ICpjdHgsIHVuc2lnbmVkIHJpbmcpCiAJc3RydWN0IHBvbGxmZCBwZmQ7CiAJdWlu dDMyX3QgKnB0cjsKIAlpbnQgaTsKKwl1aW50NjRfdCBhaG5kID0gZ2V0X3JlbG9jX2FobmQoaTkx NSwgY3R4LT5pZCksIHNjcmF0Y2hfb2Zmc2V0OwogCiAJc2NyYXRjaC53aWR0aCA9IDEwMjQ7CiAJ c2NyYXRjaC5oZWlnaHQgPSAxOwogCXNjcmF0Y2guYnBwID0gMzI7CiAJdmdlbV9jcmVhdGUodmdl bSwgJnNjcmF0Y2gpOworCXNjcmF0Y2hfb2Zmc2V0ID0gZ2V0X29mZnNldChhaG5kLCBzY3JhdGNo LmhhbmRsZSwgc2NyYXRjaC5zaXplLCAwKTsKIAlwZmQuZmQgPSBwcmltZV9oYW5kbGVfdG9fZmQo dmdlbSwgc2NyYXRjaC5oYW5kbGUpOwogCi0Jd29yayhpOTE1LCBwZmQuZmQsIGN0eCwgcmluZyk7 CisJd29yayhpOTE1LCBhaG5kLCBzY3JhdGNoX29mZnNldCwgcGZkLmZkLCBjdHgsIHJpbmcpOwor CisJcHV0X2FobmQoYWhuZCk7CiAKIAlwZmQuZXZlbnRzID0gUE9MTElOOwogCWlndF9hc3NlcnRf ZXEocG9sbCgmcGZkLCAxLCAxMDAwMCksIDEpOwpAQCAtNzE4LDE4ICs3NTAsMjIgQEAgc3RhdGlj IHZvaWQgdGVzdF9zeW5jKGludCBpOTE1LCBpbnQgdmdlbSwgY29uc3QgaW50ZWxfY3R4X3QgKmN0 eCwgdW5zaWduZWQgcmluZykKIAl1aW50MzJfdCAqcHRyOwogCWludCBkbWFidWY7CiAJaW50IGk7 CisJdWludDY0X3QgYWhuZCA9IGdldF9yZWxvY19haG5kKGk5MTUsIGN0eC0+aWQpLCBzY3JhdGNo X29mZnNldDsKIAogCXNjcmF0Y2gud2lkdGggPSAxMDI0OwogCXNjcmF0Y2guaGVpZ2h0ID0gMTsK IAlzY3JhdGNoLmJwcCA9IDMyOwogCXZnZW1fY3JlYXRlKHZnZW0sICZzY3JhdGNoKTsKKwlzY3Jh dGNoX29mZnNldCA9IGdldF9vZmZzZXQoYWhuZCwgc2NyYXRjaC5oYW5kbGUsIHNjcmF0Y2guc2l6 ZSwgMCk7CiAJZG1hYnVmID0gcHJpbWVfaGFuZGxlX3RvX2ZkKHZnZW0sIHNjcmF0Y2guaGFuZGxl KTsKIAogCXB0ciA9IG1tYXAoTlVMTCwgc2NyYXRjaC5zaXplLCBQUk9UX1JFQUQsIE1BUF9TSEFS RUQsIGRtYWJ1ZiwgMCk7CiAJaWd0X2Fzc2VydChwdHIgIT0gTUFQX0ZBSUxFRCk7CiAJZ2VtX2Ns b3NlKHZnZW0sIHNjcmF0Y2guaGFuZGxlKTsKIAotCXdvcmsoaTkxNSwgZG1hYnVmLCBjdHgsIHJp bmcpOworCXdvcmsoaTkxNSwgYWhuZCwgc2NyYXRjaF9vZmZzZXQsIGRtYWJ1ZiwgY3R4LCByaW5n KTsKKworCXB1dF9haG5kKGFobmQpOwogCiAJcHJpbWVfc3luY19zdGFydChkbWFidWYsIGZhbHNl KTsKIAlmb3IgKGkgPSAwOyBpIDwgMTAyNDsgaSsrKQpAQCAtNzQ2LDEyICs3ODIsMTMgQEAgc3Rh dGljIHZvaWQgdGVzdF9mZW5jZV93YWl0KGludCBpOTE1LCBpbnQgdmdlbSwgY29uc3QgaW50ZWxf Y3R4X3QgKmN0eCwgdW5zaWduZWQKIAl1aW50MzJfdCBmZW5jZTsKIAl1aW50MzJfdCAqcHRyOwog CWludCBkbWFidWY7CisJdWludDY0X3QgYWhuZCA9IGdldF9yZWxvY19haG5kKGk5MTUsIGN0eC0+ aWQpLCBzY3JhdGNoX29mZnNldDsKIAogCXNjcmF0Y2gud2lkdGggPSAxMDI0OwogCXNjcmF0Y2gu aGVpZ2h0ID0gMTsKIAlzY3JhdGNoLmJwcCA9IDMyOwogCXZnZW1fY3JlYXRlKHZnZW0sICZzY3Jh dGNoKTsKLQorCXNjcmF0Y2hfb2Zmc2V0ID0gZ2V0X29mZnNldChhaG5kLCBzY3JhdGNoLmhhbmRs ZSwgc2NyYXRjaC5zaXplLCAwKTsKIAlkbWFidWYgPSBwcmltZV9oYW5kbGVfdG9fZmQodmdlbSwg c2NyYXRjaC5oYW5kbGUpOwogCWZlbmNlID0gdmdlbV9mZW5jZV9hdHRhY2godmdlbSwgJnNjcmF0 Y2gsIFZHRU1fRkVOQ0VfV1JJVEUpOwogCWlndF9hc3NlcnQocHJpbWVfYnVzeShkbWFidWYsIGZh bHNlKSk7CkBAIC03NjAsMTAgKzc5NywxNCBAQCBzdGF0aWMgdm9pZCB0ZXN0X2ZlbmNlX3dhaXQo aW50IGk5MTUsIGludCB2Z2VtLCBjb25zdCBpbnRlbF9jdHhfdCAqY3R4LCB1bnNpZ25lZAogCXB0 ciA9IG1tYXAoTlVMTCwgc2NyYXRjaC5zaXplLCBQUk9UX1JFQUQsIE1BUF9TSEFSRUQsIGRtYWJ1 ZiwgMCk7CiAJaWd0X2Fzc2VydChwdHIgIT0gTUFQX0ZBSUxFRCk7CiAKLQlpZ3RfZm9yayhjaGls ZCwgMSkKLQkJd29yayhpOTE1LCBkbWFidWYsIGN0eCwgcmluZyk7CisJaWd0X2ZvcmsoY2hpbGQs IDEpIHsKKwkJYWhuZCA9IGdldF9yZWxvY19haG5kKGk5MTUsIGN0eC0+aWQpOworCQl3b3JrKGk5 MTUsIGFobmQsIHNjcmF0Y2hfb2Zmc2V0LCBkbWFidWYsIGN0eCwgcmluZyk7CisJCXB1dF9haG5k KGFobmQpOworCX0KIAogCXNsZWVwKDEpOworCXB1dF9haG5kKGFobmQpOwogCiAJLyogQ2hlY2sg Zm9yIGludmFsaWRseSBjb21wbGV0aW5nIHRoZSB0YXNrIGVhcmx5ICovCiAJZm9yIChpbnQgaSA9 IDA7IGkgPCAxMDI0OyBpKyspCkBAIC03ODksMTEgKzgzMCwxMyBAQCBzdGF0aWMgdm9pZCB0ZXN0 X2ZlbmNlX2hhbmcoaW50IGk5MTUsIGludCB2Z2VtLCB1bnNpZ25lZCBmbGFncykKIAl1aW50MzJf dCAqcHRyOwogCWludCBkbWFidWY7CiAJaW50IGk7CisJdWludDY0X3QgYWhuZCA9IGdldF9yZWxv Y19haG5kKGk5MTUsIDApLCBzY3JhdGNoX29mZnNldDsKIAogCXNjcmF0Y2gud2lkdGggPSAxMDI0 OwogCXNjcmF0Y2guaGVpZ2h0ID0gMTsKIAlzY3JhdGNoLmJwcCA9IDMyOwogCXZnZW1fY3JlYXRl KHZnZW0sICZzY3JhdGNoKTsKKwlzY3JhdGNoX29mZnNldCA9IGdldF9vZmZzZXQoYWhuZCwgc2Ny YXRjaC5oYW5kbGUsIHNjcmF0Y2guc2l6ZSwgMCk7CiAJZG1hYnVmID0gcHJpbWVfaGFuZGxlX3Rv X2ZkKHZnZW0sIHNjcmF0Y2guaGFuZGxlKTsKIAl2Z2VtX2ZlbmNlX2F0dGFjaCh2Z2VtLCAmc2Ny YXRjaCwgZmxhZ3MgfCBXSVBfVkdFTV9GRU5DRV9OT1RJTUVPVVQpOwogCkBAIC04MDEsNyArODQ0 LDkgQEAgc3RhdGljIHZvaWQgdGVzdF9mZW5jZV9oYW5nKGludCBpOTE1LCBpbnQgdmdlbSwgdW5z aWduZWQgZmxhZ3MpCiAJaWd0X2Fzc2VydChwdHIgIT0gTUFQX0ZBSUxFRCk7CiAJZ2VtX2Nsb3Nl KHZnZW0sIHNjcmF0Y2guaGFuZGxlKTsKIAotCXdvcmsoaTkxNSwgZG1hYnVmLCBpbnRlbF9jdHhf MChpOTE1KSwgMCk7CisJd29yayhpOTE1LCBhaG5kLCBzY3JhdGNoX29mZnNldCwgZG1hYnVmLCBp bnRlbF9jdHhfMChpOTE1KSwgMCk7CisKKwlwdXRfYWhuZChhaG5kKTsKIAogCS8qIFRoZSB3b3Jr IHNob3VsZCBoYXZlIGJlZW4gY2FuY2VsbGVkICovCiAKQEAgLTExNDYsOCArMTE5MSw2IEBAIGln dF9tYWluCiAJCWlndF9zdWJ0ZXN0KCJiYXNpYy1mZW5jZS1ibHQiKQogCQkJdGVzdF9mZW5jZV9i bHQoaTkxNSwgdmdlbSk7CiAKLQkJdGVzdF9lYWNoX2VuZ2luZSgiZmVuY2Utd2FpdCIsIHZnZW0s IGk5MTUsIHRlc3RfZmVuY2Vfd2FpdCk7Ci0KIAkJaWd0X3N1YnRlc3QoImJhc2ljLWZlbmNlLWZs aXAiKQogCQkJdGVzdF9mbGlwKGk5MTUsIHZnZW0sIDApOwogCkBAIC0xMTY2LDYgKzEyMDksMjEg QEAgaWd0X21haW4KIAkJfQogCX0KIAorCS8qIEZlbmNlIHRlc3RpbmcsIHJlcXVpcmVzIG11bHRp cHJvY2VzcyBhbGxvY2F0b3IgKi8KKwlpZ3Rfc3VidGVzdF9ncm91cCB7CisJCWlndF9maXh0dXJl IHsKKwkJCWlndF9yZXF1aXJlKHZnZW1faGFzX2ZlbmNlcyh2Z2VtKSk7CisJCQlpbnRlbF9hbGxv Y2F0b3JfbXVsdGlwcm9jZXNzX3N0YXJ0KCk7CisJCX0KKworCQl0ZXN0X2VhY2hfZW5naW5lKCJm ZW5jZS13YWl0IiwgdmdlbSwgaTkxNSwgdGVzdF9mZW5jZV93YWl0KTsKKworCQlpZ3RfZml4dHVy ZSB7CisJCQlpbnRlbF9hbGxvY2F0b3JfbXVsdGlwcm9jZXNzX3N0b3AoKTsKKwkJfQorCX0KKwor CiAJaWd0X2ZpeHR1cmUgewogCQljbG9zZShpOTE1KTsKIAkJY2xvc2UodmdlbSk7Ci0tIAoyLjI2 LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1k ZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldgo=