From: David Weinehall Subject: [PATCH i-g-t 2/3] Unify handling of slow/combinatorial tests Date: Wed, 28 Oct 2015 13:29:51 +0200 Message-ID: <1446031792-22881-3-git-send-email-david.weinehall@linux.intel.com> References: <1445600556-14884-1-git-send-email-david.weinehall@linux.intel.com> <1446031792-22881-1-git-send-email-david.weinehall@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A6596E40E for ; Wed, 28 Oct 2015 04:30:40 -0700 (PDT) In-Reply-To: <1446031792-22881-1-git-send-email-david.weinehall@linux.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 U29tZSB0ZXN0cyBzaG91bGQgbm90IGJlIHJ1biBieSBkZWZhdWx0LCBkdWUgdG8gdGhlaXIgc2xv dywKYW5kIHNvbWV0aW1lcyBzdXBlcmZsdW91cywgbmF0dXJlLgoKV2Ugc3RpbGwgd2FudCB0byBi ZSBhYmxlIHRvIHJ1biB0aGVzZSB0ZXN0cyBpbiBzb21lIGNhc2VzLgpVbnRpbCBub3cgdGhlcmUn cyBiZWVuIG5vIHVuaWZpZWQgd2F5IG9mIGhhbmRsaW5nIHRoaXMuIFJlbWVkeQp0aGlzIGJ5IGlu dHJvZHVjaW5nIHRoZSAtLWFsbCBvcHRpb24gdG8gaWd0X2NvcmUsCmFuZCB1c2UgaXQgaW4gZ2Vt X2NvbmN1cnJlbnRfYmxpdCAmIGttc19mcm9udGJ1ZmZlcl90cmFja2luZy4KClNpZ25lZC1vZmYt Ynk6IERhdmlkIFdlaW5laGFsbCA8ZGF2aWQud2VpbmVoYWxsQGxpbnV4LmludGVsLmNvbT4KLS0t CiBsaWIvaWd0X2NvcmUuYyAgICAgICAgICAgICAgICAgICB8ICAyNCArKysrKwogbGliL2lndF9j b3JlLmggICAgICAgICAgICAgICAgICAgfCAgIDcgKysKIHRlc3RzL2dlbV9jb25jdXJyZW50X2Js aXQuYyAgICAgIHwgIDQ0ICsrKystLS0tLQogdGVzdHMva21zX2Zyb250YnVmZmVyX3RyYWNraW5n LmMgfCAyMDggKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVz IGNoYW5nZWQsIDE2NSBpbnNlcnRpb25zKCspLCAxMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvbGliL2lndF9jb3JlLmMgYi9saWIvaWd0X2NvcmUuYwppbmRleCA1OTEyN2NhZmU2MDYuLjY1 NzViOWQ2YmYwZCAxMDA2NDQKLS0tIGEvbGliL2lndF9jb3JlLmMKKysrIGIvbGliL2lndF9jb3Jl LmMKQEAgLTIxNiw2ICsyMTYsNyBAQCBjb25zdCBjaGFyICppZ3RfaW50ZXJhY3RpdmVfZGVidWc7 CiAKIC8qIHN1YnRlc3RzIGhlbHBlcnMgKi8KIHN0YXRpYyBib29sIGxpc3Rfc3VidGVzdHMgPSBm YWxzZTsKK3N0YXRpYyBib29sIHdpdGhfc2xvd19jb21iaW5hdG9yaWFsID0gZmFsc2U7CiBzdGF0 aWMgY2hhciAqcnVuX3NpbmdsZV9zdWJ0ZXN0ID0gTlVMTDsKIHN0YXRpYyBib29sIHJ1bl9zaW5n bGVfc3VidGVzdF9mb3VuZCA9IGZhbHNlOwogc3RhdGljIGNvbnN0IGNoYXIgKmluX3N1YnRlc3Qg PSBOVUxMOwpAQCAtMjM1LDYgKzIzNiw3IEBAIGJvb2wgdGVzdF9jaGlsZDsKIAogZW51bSB7CiAg T1BUX0xJU1RfU1VCVEVTVFMsCisgT1BUX1dJVEhfU0xPV19DT01CSU5BVE9SSUFMLAogIE9QVF9S VU5fU1VCVEVTVCwKICBPUFRfREVTQ1JJUFRJT04sCiAgT1BUX0RFQlVHLApAQCAtNDc4LDYgKzQ4 MCw3IEBAIHN0YXRpYyB2b2lkIHByaW50X3VzYWdlKGNvbnN0IGNoYXIgKmhlbHBfc3RyLCBib29s IG91dHB1dF9vbl9zdGRlcnIpCiAKIAlmcHJpbnRmKGYsICJVc2FnZTogJXMgW09QVElPTlNdXG4i LCBjb21tYW5kX3N0cik7CiAJZnByaW50ZihmLCAiICAtLWxpc3Qtc3VidGVzdHNcbiIKKwkJICAg IiAgLS1hbGxcbiIKIAkJICAgIiAgLS1ydW4tc3VidGVzdCA8cGF0dGVybj5cbiIKIAkJICAgIiAg LS1kZWJ1Z1s9bG9nLWRvbWFpbl1cbiIKIAkJICAgIiAgLS1pbnRlcmFjdGl2ZS1kZWJ1Z1s9ZG9t YWluXVxuIgpAQCAtNTEwLDYgKzUxMyw3IEBAIHN0YXRpYyBpbnQgY29tbW9uX2luaXQoaW50ICph cmdjLCBjaGFyICoqYXJndiwKIAlpbnQgYywgb3B0aW9uX2luZGV4ID0gMCwgaSwgeDsKIAlzdGF0 aWMgc3RydWN0IG9wdGlvbiBsb25nX29wdGlvbnNbXSA9IHsKIAkJeyJsaXN0LXN1YnRlc3RzIiwg MCwgMCwgT1BUX0xJU1RfU1VCVEVTVFN9LAorCQl7ImFsbCIsIDAsIDAsIE9QVF9XSVRIX1NMT1df Q09NQklOQVRPUklBTH0sCiAJCXsicnVuLXN1YnRlc3QiLCAxLCAwLCBPUFRfUlVOX1NVQlRFU1R9 LAogCQl7ImhlbHAtZGVzY3JpcHRpb24iLCAwLCAwLCBPUFRfREVTQ1JJUFRJT059LAogCQl7ImRl YnVnIiwgb3B0aW9uYWxfYXJndW1lbnQsIDAsIE9QVF9ERUJVR30sCkBAIC02MTcsNiArNjIxLDEw IEBAIHN0YXRpYyBpbnQgY29tbW9uX2luaXQoaW50ICphcmdjLCBjaGFyICoqYXJndiwKIAkJCWlm ICghcnVuX3NpbmdsZV9zdWJ0ZXN0KQogCQkJCWxpc3Rfc3VidGVzdHMgPSB0cnVlOwogCQkJYnJl YWs7CisJCWNhc2UgT1BUX1dJVEhfU0xPV19DT01CSU5BVE9SSUFMOgorCQkJaWYgKCFydW5fc2lu Z2xlX3N1YnRlc3QpCisJCQkJd2l0aF9zbG93X2NvbWJpbmF0b3JpYWwgPSB0cnVlOworCQkJYnJl YWs7CiAJCWNhc2UgT1BUX1JVTl9TVUJURVNUOgogCQkJaWYgKCFsaXN0X3N1YnRlc3RzKQogCQkJ CXJ1bl9zaW5nbGVfc3VidGVzdCA9IHN0cmR1cChvcHRhcmcpOwpAQCAtMTYyOSw2ICsxNjM3LDIy IEBAIHZvaWQgaWd0X3NraXBfb25fc2ltdWxhdGlvbih2b2lkKQogCQlpZ3RfcmVxdWlyZSghaWd0 X3J1bl9pbl9zaW11bGF0aW9uKCkpOwogfQogCisvKioKKyAqIF9faWd0X3Nsb3dfY29tYmluYXRv cmlhbDoKKyAqCisgKiBUaGlzIGlzIHVzZWQgdG8gc2tpcCBzdWJ0ZXN0cyB0aGF0IHNob3VsZCBv bmx5IGJlIGluY2x1ZGVkCisgKiB3aGVuIHRoZSAiLS1hbGwiIGNvbW1hbmQgbGluZSBvcHRpb24g aGFzIGJlZW4gc3BlY2lmaWVkLiAgVGhpcyB2ZXJzaW9uCisgKiBpcyBpbnRlbmRlZCBhcyBhIHRl c3QuCisgKgorICogQHNsb3dfdGVzdDogdHJ1ZSBpZiB0aGUgc3VidGVzdCBpcyBwYXJ0IG9mIHRo ZSBzbG93L2NvbWJpbmF0b3JpYWwgc2V0CisgKgorICogUmV0dXJuczogdHJ1ZSBpZiB0aGUgdGVz dCBzaG91bGQgYmUgcnVuLCBmYWxzZSBpZiB0aGUgdGVzdCBzaG91bGQgYmUgc2tpcHBlZAorICov Citib29sIF9faWd0X3Nsb3dfY29tYmluYXRvcmlhbChib29sIHNsb3dfdGVzdCkKK3sKKwlyZXR1 cm4gIXNsb3dfdGVzdCB8fCB3aXRoX3Nsb3dfY29tYmluYXRvcmlhbDsKK30KKwogLyogc3RydWN0 dXJlZCBsb2dnaW5nICovCiAKIC8qKgpkaWZmIC0tZ2l0IGEvbGliL2lndF9jb3JlLmggYi9saWIv aWd0X2NvcmUuaAppbmRleCA1YWUwOTY1M2ZkNTUuLjdiNTkyMjc4YmY2YyAxMDA2NDQKLS0tIGEv bGliL2lndF9jb3JlLmgKKysrIGIvbGliL2lndF9jb3JlLmgKQEAgLTE5MSw2ICsxOTEsMTIgQEAg Ym9vbCBfX2lndF9ydW5fc3VidGVzdChjb25zdCBjaGFyICpzdWJ0ZXN0X25hbWUpOwogI2RlZmlu ZSBpZ3Rfc3VidGVzdF9mKGYuLi4pIFwKIAlfX2lndF9zdWJ0ZXN0X2YoaWd0X3Rva2VuY2F0KF9f dG1wY2hhciwgX19MSU5FX18pLCBmKQogCitib29sIF9faWd0X3Nsb3dfY29tYmluYXRvcmlhbChi b29sIHNsb3dfdGVzdCk7CisKKyNkZWZpbmUgaWd0X3N1YnRlc3Rfc2xvd19mKF9fc2xvdywgZi4u LikgXAorCWlmIChfX2lndF9zbG93X2NvbWJpbmF0b3JpYWwoX19zbG93KSkgXAorCV9faWd0X3N1 YnRlc3RfZihpZ3RfdG9rZW5jYXQoX190bXBjaGFyLCBfX0xJTkVfXyksIGYpCisKIGNvbnN0IGNo YXIgKmlndF9zdWJ0ZXN0X25hbWUodm9pZCk7CiBib29sIGlndF9vbmx5X2xpc3Rfc3VidGVzdHMo dm9pZCk7CiAKQEAgLTY2OSw2ICs2NzUsNyBAQCB2b2lkIGlndF9kaXNhYmxlX2V4aXRfaGFuZGxl cih2b2lkKTsKIAogLyogaGVscGVycyB0byBhdXRvbWF0aWNhbGx5IHJlZHVjZSB0ZXN0IHJ1bnRp bWUgaW4gc2ltdWxhdGlvbiAqLwogYm9vbCBpZ3RfcnVuX2luX3NpbXVsYXRpb24odm9pZCk7CisK IC8qKgogICogU0xPV19RVUlDSzoKICAqIEBzbG93OiB2YWx1ZSBpbiBzaW11bGF0aW9uIG1vZGUK ZGlmZiAtLWdpdCBhL3Rlc3RzL2dlbV9jb25jdXJyZW50X2JsaXQuYyBiL3Rlc3RzL2dlbV9jb25j dXJyZW50X2JsaXQuYwppbmRleCAxZDJkNzg3MjAyZGYuLmZlMzdjYzcwNzU4MyAxMDA2NDQKLS0t IGEvdGVzdHMvZ2VtX2NvbmN1cnJlbnRfYmxpdC5jCisrKyBiL3Rlc3RzL2dlbV9jb25jdXJyZW50 X2JsaXQuYwpAQCAtNTUsNyArNTUsNiBAQCBJR1RfVEVTVF9ERVNDUklQVElPTigiVGVzdCBvZiBw cmVhZC9wd3JpdGUvbW1hcCBiZWhhdmlvciB3aGVuIHdyaXRpbmcgdG8gYWN0aXZlIgogCiBpbnQg ZmQsIGRldmlkLCBnZW47CiBzdHJ1Y3QgaW50ZWxfYmF0Y2hidWZmZXIgKmJhdGNoOwotaW50IGFs bDsKIAogc3RhdGljIHZvaWQKIG5vcF9yZWxlYXNlX2JvKGRybV9pbnRlbF9ibyAqYm8pCkBAIC05 MzEsMTYgKzkzMCwxNCBAQCBydW5fYmFzaWNfbW9kZXMoY29uc3Qgc3RydWN0IGFjY2Vzc19tb2Rl ICptb2RlLAogCXN0cnVjdCBidWZmZXJzIGJ1ZmZlcnM7CiAKIAlmb3IgKGggPSBoYW5nczsgaC0+ c3VmZml4OyBoKyspIHsKLQkJaWYgKCFhbGwgJiYgKmgtPnN1ZmZpeCkKLQkJCWNvbnRpbnVlOwot Ci0JCWZvciAocCA9IGFsbCA/IHBpcGVsaW5lcyA6IHBza2lwOyBwLT5wcmVmaXg7IHArKykgewor CQlmb3IgKHAgPSBfX2lndF9zbG93X2NvbWJpbmF0b3JpYWwodHJ1ZSkgPyBwaXBlbGluZXMgOiBw c2tpcDsKKwkJICAgICBwLT5wcmVmaXg7IHArKykgewogCQkJaWd0X2ZpeHR1cmUgewogCQkJCWJh dGNoID0gYnVmZmVyc19pbml0KCZidWZmZXJzLCBtb2RlLCBmZCk7CiAJCQl9CiAKIAkJCS8qIHRy eSB0byBvdmVyd3JpdGUgdGhlIHNvdXJjZSB2YWx1ZXMgKi8KLQkJCWlndF9zdWJ0ZXN0X2YoIiVz LSVzLW92ZXJ3cml0ZS1zb3VyY2Utb25lJXMlcyIsIG1vZGUtPm5hbWUsIHAtPnByZWZpeCwgc3Vm Zml4LCBoLT5zdWZmaXgpIHsKKwkJCWlndF9zdWJ0ZXN0X3Nsb3dfZigqaC0+c3VmZml4LCAiJXMt JXMtb3ZlcndyaXRlLXNvdXJjZS1vbmUlcyVzIiwgbW9kZS0+bmFtZSwgcC0+cHJlZml4LCBzdWZm aXgsIGgtPnN1ZmZpeCkgewogCQkJCWgtPnJlcXVpcmUoKTsKIAkJCQlwLT5yZXF1aXJlKCk7CiAJ CQkJYnVmZmVyc19jcmVhdGUoJmJ1ZmZlcnMsIG51bV9idWZmZXJzKTsKQEAgLTk0OSw3ICs5NDYs NyBAQCBydW5fYmFzaWNfbW9kZXMoY29uc3Qgc3RydWN0IGFjY2Vzc19tb2RlICptb2RlLAogCQkJ CQkgICAgICBwLT5jb3B5LCBoLT5oYW5nKTsKIAkJCX0KIAotCQkJaWd0X3N1YnRlc3RfZigiJXMt JXMtb3ZlcndyaXRlLXNvdXJjZSVzJXMiLCBtb2RlLT5uYW1lLCBwLT5wcmVmaXgsIHN1ZmZpeCwg aC0+c3VmZml4KSB7CisJCQlpZ3Rfc3VidGVzdF9zbG93X2YoKmgtPnN1ZmZpeCwgIiVzLSVzLW92 ZXJ3cml0ZS1zb3VyY2UlcyVzIiwgbW9kZS0+bmFtZSwgcC0+cHJlZml4LCBzdWZmaXgsIGgtPnN1 ZmZpeCkgewogCQkJCWgtPnJlcXVpcmUoKTsKIAkJCQlwLT5yZXF1aXJlKCk7CiAJCQkJYnVmZmVy c19jcmVhdGUoJmJ1ZmZlcnMsIG51bV9idWZmZXJzKTsKQEAgLTk1OCw3ICs5NTUsNyBAQCBydW5f YmFzaWNfbW9kZXMoY29uc3Qgc3RydWN0IGFjY2Vzc19tb2RlICptb2RlLAogCQkJCQkgICAgICBw LT5jb3B5LCBoLT5oYW5nKTsKIAkJCX0KIAotCQkJaWd0X3N1YnRlc3RfZigiJXMtJXMtb3Zlcndy aXRlLXNvdXJjZS1yZWFkLWJjcyVzJXMiLCBtb2RlLT5uYW1lLCBwLT5wcmVmaXgsIHN1ZmZpeCwg aC0+c3VmZml4KSB7CisJCQlpZ3Rfc3VidGVzdF9zbG93X2YoKmgtPnN1ZmZpeCwgIiVzLSVzLW92 ZXJ3cml0ZS1zb3VyY2UtcmVhZC1iY3MlcyVzIiwgbW9kZS0+bmFtZSwgcC0+cHJlZml4LCBzdWZm aXgsIGgtPnN1ZmZpeCkgewogCQkJCWgtPnJlcXVpcmUoKTsKIAkJCQlwLT5yZXF1aXJlKCk7CiAJ CQkJYnVmZmVyc19jcmVhdGUoJmJ1ZmZlcnMsIG51bV9idWZmZXJzKTsKQEAgLTk2Nyw3ICs5NjQs NyBAQCBydW5fYmFzaWNfbW9kZXMoY29uc3Qgc3RydWN0IGFjY2Vzc19tb2RlICptb2RlLAogCQkJ CQkgICAgICBwLT5jb3B5LCBoLT5oYW5nKTsKIAkJCX0KIAotCQkJaWd0X3N1YnRlc3RfZigiJXMt JXMtb3ZlcndyaXRlLXNvdXJjZS1yZWFkLXJjcyVzJXMiLCBtb2RlLT5uYW1lLCBwLT5wcmVmaXgs IHN1ZmZpeCwgaC0+c3VmZml4KSB7CisJCQlpZ3Rfc3VidGVzdF9zbG93X2YoKmgtPnN1ZmZpeCwg IiVzLSVzLW92ZXJ3cml0ZS1zb3VyY2UtcmVhZC1yY3MlcyVzIiwgbW9kZS0+bmFtZSwgcC0+cHJl Zml4LCBzdWZmaXgsIGgtPnN1ZmZpeCkgewogCQkJCWgtPnJlcXVpcmUoKTsKIAkJCQlwLT5yZXF1 aXJlKCk7CiAJCQkJaWd0X3JlcXVpcmUocmVuZGVyY29weSk7CkBAIC05NzcsNyArOTc0LDcgQEAg cnVuX2Jhc2ljX21vZGVzKGNvbnN0IHN0cnVjdCBhY2Nlc3NfbW9kZSAqbW9kZSwKIAkJCQkJICAg ICAgcC0+Y29weSwgaC0+aGFuZyk7CiAJCQl9CiAKLQkJCWlndF9zdWJ0ZXN0X2YoIiVzLSVzLW92 ZXJ3cml0ZS1zb3VyY2UtcmV2JXMlcyIsIG1vZGUtPm5hbWUsIHAtPnByZWZpeCwgc3VmZml4LCBo LT5zdWZmaXgpIHsKKwkJCWlndF9zdWJ0ZXN0X3Nsb3dfZigqaC0+c3VmZml4LCAiJXMtJXMtb3Zl cndyaXRlLXNvdXJjZS1yZXYlcyVzIiwgbW9kZS0+bmFtZSwgcC0+cHJlZml4LCBzdWZmaXgsIGgt PnN1ZmZpeCkgewogCQkJCWgtPnJlcXVpcmUoKTsKIAkJCQlwLT5yZXF1aXJlKCk7CiAJCQkJYnVm ZmVyc19jcmVhdGUoJmJ1ZmZlcnMsIG51bV9idWZmZXJzKTsKQEAgLTk4Nyw3ICs5ODQsNyBAQCBy dW5fYmFzaWNfbW9kZXMoY29uc3Qgc3RydWN0IGFjY2Vzc19tb2RlICptb2RlLAogCQkJfQogCiAJ CQkvKiB0cnkgdG8gaW50ZXJtaXggY29waWVzIHdpdGggR1BVIGNvcGllcyovCi0JCQlpZ3Rfc3Vi dGVzdF9mKCIlcy0lcy1pbnRlcm1peC1yY3MlcyVzIiwgbW9kZS0+bmFtZSwgcC0+cHJlZml4LCBz dWZmaXgsIGgtPnN1ZmZpeCkgeworCQkJaWd0X3N1YnRlc3Rfc2xvd19mKCpoLT5zdWZmaXgsICIl cy0lcy1pbnRlcm1peC1yY3MlcyVzIiwgbW9kZS0+bmFtZSwgcC0+cHJlZml4LCBzdWZmaXgsIGgt PnN1ZmZpeCkgewogCQkJCWgtPnJlcXVpcmUoKTsKIAkJCQlwLT5yZXF1aXJlKCk7CiAJCQkJaWd0 X3JlcXVpcmUocmVuZGVyY29weSk7CkBAIC05OTYsNyArOTkzLDcgQEAgcnVuX2Jhc2ljX21vZGVz KGNvbnN0IHN0cnVjdCBhY2Nlc3NfbW9kZSAqbW9kZSwKIAkJCQkJICAgICAgZG9faW50ZXJtaXhf cmNzLAogCQkJCQkgICAgICBwLT5jb3B5LCBoLT5oYW5nKTsKIAkJCX0KLQkJCWlndF9zdWJ0ZXN0 X2YoIiVzLSVzLWludGVybWl4LWJjcyVzJXMiLCBtb2RlLT5uYW1lLCBwLT5wcmVmaXgsIHN1ZmZp eCwgaC0+c3VmZml4KSB7CisJCQlpZ3Rfc3VidGVzdF9zbG93X2YoKmgtPnN1ZmZpeCwgIiVzLSVz LWludGVybWl4LWJjcyVzJXMiLCBtb2RlLT5uYW1lLCBwLT5wcmVmaXgsIHN1ZmZpeCwgaC0+c3Vm Zml4KSB7CiAJCQkJaC0+cmVxdWlyZSgpOwogCQkJCXAtPnJlcXVpcmUoKTsKIAkJCQlpZ3RfcmVx dWlyZShyZW5kZXJjb3B5KTsKQEAgLTEwMDUsNyArMTAwMiw3IEBAIHJ1bl9iYXNpY19tb2Rlcyhj b25zdCBzdHJ1Y3QgYWNjZXNzX21vZGUgKm1vZGUsCiAJCQkJCSAgICAgIGRvX2ludGVybWl4X2Jj cywKIAkJCQkJICAgICAgcC0+Y29weSwgaC0+aGFuZyk7CiAJCQl9Ci0JCQlpZ3Rfc3VidGVzdF9m KCIlcy0lcy1pbnRlcm1peC1ib3RoJXMlcyIsIG1vZGUtPm5hbWUsIHAtPnByZWZpeCwgc3VmZml4 LCBoLT5zdWZmaXgpIHsKKwkJCWlndF9zdWJ0ZXN0X3Nsb3dfZigqaC0+c3VmZml4LCAiJXMtJXMt aW50ZXJtaXgtYm90aCVzJXMiLCBtb2RlLT5uYW1lLCBwLT5wcmVmaXgsIHN1ZmZpeCwgaC0+c3Vm Zml4KSB7CiAJCQkJaC0+cmVxdWlyZSgpOwogCQkJCXAtPnJlcXVpcmUoKTsKIAkJCQlpZ3RfcmVx dWlyZShyZW5kZXJjb3B5KTsKQEAgLTEwMTYsNyArMTAxMyw3IEBAIHJ1bl9iYXNpY19tb2Rlcyhj b25zdCBzdHJ1Y3QgYWNjZXNzX21vZGUgKm1vZGUsCiAJCQl9CiAKIAkJCS8qIHRyeSB0byByZWFk IHRoZSByZXN1bHRzIGJlZm9yZSB0aGUgY29weSBjb21wbGV0ZXMgKi8KLQkJCWlndF9zdWJ0ZXN0 X2YoIiVzLSVzLWVhcmx5LXJlYWQlcyVzIiwgbW9kZS0+bmFtZSwgcC0+cHJlZml4LCBzdWZmaXgs IGgtPnN1ZmZpeCkgeworCQkJaWd0X3N1YnRlc3Rfc2xvd19mKCpoLT5zdWZmaXgsICIlcy0lcy1l YXJseS1yZWFkJXMlcyIsIG1vZGUtPm5hbWUsIHAtPnByZWZpeCwgc3VmZml4LCBoLT5zdWZmaXgp IHsKIAkJCQloLT5yZXF1aXJlKCk7CiAJCQkJcC0+cmVxdWlyZSgpOwogCQkJCWJ1ZmZlcnNfY3Jl YXRlKCZidWZmZXJzLCBudW1fYnVmZmVycyk7CkBAIC0xMDI2LDcgKzEwMjMsNyBAQCBydW5fYmFz aWNfbW9kZXMoY29uc3Qgc3RydWN0IGFjY2Vzc19tb2RlICptb2RlLAogCQkJfQogCiAJCQkvKiBj b25jdXJyZW50IHJlYWRzICovCi0JCQlpZ3Rfc3VidGVzdF9mKCIlcy0lcy1yZWFkLXJlYWQtYmNz JXMlcyIsIG1vZGUtPm5hbWUsIHAtPnByZWZpeCwgc3VmZml4LCBoLT5zdWZmaXgpIHsKKwkJCWln dF9zdWJ0ZXN0X3Nsb3dfZigqaC0+c3VmZml4LCAiJXMtJXMtcmVhZC1yZWFkLWJjcyVzJXMiLCBt b2RlLT5uYW1lLCBwLT5wcmVmaXgsIHN1ZmZpeCwgaC0+c3VmZml4KSB7CiAJCQkJaC0+cmVxdWly ZSgpOwogCQkJCXAtPnJlcXVpcmUoKTsKIAkJCQlidWZmZXJzX2NyZWF0ZSgmYnVmZmVycywgbnVt X2J1ZmZlcnMpOwpAQCAtMTAzNCw3ICsxMDMxLDcgQEAgcnVuX2Jhc2ljX21vZGVzKGNvbnN0IHN0 cnVjdCBhY2Nlc3NfbW9kZSAqbW9kZSwKIAkJCQkJICAgICAgZG9fcmVhZF9yZWFkX2JjcywKIAkJ CQkJICAgICAgcC0+Y29weSwgaC0+aGFuZyk7CiAJCQl9Ci0JCQlpZ3Rfc3VidGVzdF9mKCIlcy0l cy1yZWFkLXJlYWQtcmNzJXMlcyIsIG1vZGUtPm5hbWUsIHAtPnByZWZpeCwgc3VmZml4LCBoLT5z dWZmaXgpIHsKKwkJCWlndF9zdWJ0ZXN0X3Nsb3dfZigqaC0+c3VmZml4LCAiJXMtJXMtcmVhZC1y ZWFkLXJjcyVzJXMiLCBtb2RlLT5uYW1lLCBwLT5wcmVmaXgsIHN1ZmZpeCwgaC0+c3VmZml4KSB7 CiAJCQkJaC0+cmVxdWlyZSgpOwogCQkJCXAtPnJlcXVpcmUoKTsKIAkJCQlpZ3RfcmVxdWlyZShy ZW5kZXJjb3B5KTsKQEAgLTEwNDUsNyArMTA0Miw3IEBAIHJ1bl9iYXNpY19tb2Rlcyhjb25zdCBz dHJ1Y3QgYWNjZXNzX21vZGUgKm1vZGUsCiAJCQl9CiAKIAkJCS8qIGFuZCBmaW5hbGx5IHRyeSB0 byB0cmljayB0aGUga2VybmVsIGludG8gbG9vc2luZyB0aGUgcGVuZGluZyB3cml0ZSAqLwotCQkJ aWd0X3N1YnRlc3RfZigiJXMtJXMtZ3B1LXJlYWQtYWZ0ZXItd3JpdGUlcyVzIiwgbW9kZS0+bmFt ZSwgcC0+cHJlZml4LCBzdWZmaXgsIGgtPnN1ZmZpeCkgeworCQkJaWd0X3N1YnRlc3Rfc2xvd19m KCpoLT5zdWZmaXgsICIlcy0lcy1ncHUtcmVhZC1hZnRlci13cml0ZSVzJXMiLCBtb2RlLT5uYW1l LCBwLT5wcmVmaXgsIHN1ZmZpeCwgaC0+c3VmZml4KSB7CiAJCQkJaC0+cmVxdWlyZSgpOwogCQkJ CXAtPnJlcXVpcmUoKTsKIAkJCQlidWZmZXJzX2NyZWF0ZSgmYnVmZmVycywgbnVtX2J1ZmZlcnMp OwpAQCAtMTA2NCwxMyArMTA2MSwxMSBAQCBydW5fYmFzaWNfbW9kZXMoY29uc3Qgc3RydWN0IGFj Y2Vzc19tb2RlICptb2RlLAogc3RhdGljIHZvaWQKIHJ1bl9tb2Rlcyhjb25zdCBzdHJ1Y3QgYWNj ZXNzX21vZGUgKm1vZGUpCiB7Ci0JaWYgKGFsbCkgewotCQlydW5fYmFzaWNfbW9kZXMobW9kZSwg IiIsIHJ1bl9zaW5nbGUpOworCXJ1bl9iYXNpY19tb2Rlcyhtb2RlLCAiIiwgcnVuX3NpbmdsZSk7 CiAKLQkJaWd0X2Zvcmtfc2lnbmFsX2hlbHBlcigpOwotCQlydW5fYmFzaWNfbW9kZXMobW9kZSwg Ii1pbnRlcnJ1cHRpYmxlIiwgcnVuX2ludGVycnVwdGlibGUpOwotCQlpZ3Rfc3RvcF9zaWduYWxf aGVscGVyKCk7Ci0JfQorCWlndF9mb3JrX3NpZ25hbF9oZWxwZXIoKTsKKwlydW5fYmFzaWNfbW9k ZXMobW9kZSwgIi1pbnRlcnJ1cHRpYmxlIiwgcnVuX2ludGVycnVwdGlibGUpOworCWlndF9zdG9w X3NpZ25hbF9oZWxwZXIoKTsKIAogCWlndF9mb3JrX3NpZ25hbF9oZWxwZXIoKTsKIAlydW5fYmFz aWNfbW9kZXMobW9kZSwgIi1mb3JrZWQiLCBydW5fZm9ya2VkKTsKQEAgLTEwODMsOSArMTA3OCw2 IEBAIGlndF9tYWluCiAKIAlpZ3Rfc2tpcF9vbl9zaW11bGF0aW9uKCk7CiAKLQlpZiAoc3Ryc3Ry KGlndF90ZXN0X25hbWUoKSwgImFsbCIpKQotCQlhbGwgPSB0cnVlOwotCiAJaWd0X2ZpeHR1cmUg ewogCQlmZCA9IGRybV9vcGVuX2RyaXZlcihEUklWRVJfSU5URUwpOwogCQlkZXZpZCA9IGludGVs X2dldF9kcm1fZGV2aWQoZmQpOwpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX2Zyb250YnVmZmVyX3Ry YWNraW5nLmMgYi90ZXN0cy9rbXNfZnJvbnRidWZmZXJfdHJhY2tpbmcuYwppbmRleCAxNTcwN2I5 YjkwNDAuLjg2ZmQ3Y2EwODY5MiAxMDA2NDQKLS0tIGEvdGVzdHMva21zX2Zyb250YnVmZmVyX3Ry YWNraW5nLmMKKysrIGIvdGVzdHMva21zX2Zyb250YnVmZmVyX3RyYWNraW5nLmMKQEAgLTQ3LDgg KzQ3LDcgQEAgSUdUX1RFU1RfREVTQ1JJUFRJT04oIlRlc3QgdGhlIEtlcm5lbCdzIGZyb250YnVm ZmVyIHRyYWNraW5nIG1lY2hhbmlzbSBhbmQgIgogICogY29tYmluYXRpb25zIHRoYXQgYXJlIHNv bWV3aGF0IHJlZHVuZGFudCBhbmQgZG9uJ3QgYWRkIG11Y2ggdmFsdWUgdG8gdGhlCiAgKiB0ZXN0 LiBGb3IgZXhhbXBsZSwgc2luY2Ugd2UgYWxyZWFkeSBkbyB0aGUgb2Zmc2NyZWVuIHRlc3Rpbmcg d2l0aCBhIHNpbmdsZQogICogcGlwZSBlbmFibGVkLCB0aGVyZSdzIG5vIG11Y2ggdmFsdWUgaW4g ZG9pbmcgaXQgYWdhaW4gd2l0aCBkdWFsIHBpcGVzLiBJZiB5b3UKLSAqIHN0aWxsIHdhbnQgdG8g dHJ5IHRoZXNlIHJlZHVuZGFudCB0ZXN0cywgeW91IG5lZWQgdG8gdXNlIHRoZSAtLXNob3ctaGlk ZGVuCi0gKiBvcHRpb24uCisgKiBzdGlsbCB3YW50IHRvIHRyeSB0aGVzZSByZWR1bmRhbnQgdGVz dHMsIHlvdSBuZWVkIHRvIHVzZSB0aGUgLS1hbGwgb3B0aW9uLgogICoKICAqIFRoZSBtb3N0IGlt cG9ydGFudCBoaWRkZW4gdGhpbmcgaXMgdGhlIEZFQVRVUkVfTk9ORSBzZXQgb2YgdGVzdHMuIFdo ZW5ldmVyCiAgKiB5b3UgZ2V0IGEgZmFpbHVyZSBvbiBhbnkgdGVzdCwgaXQgaXMgaW1wb3J0YW50 IHRvIGNoZWNrIHdoZXRoZXIgdGhlIHNhbWUgdGVzdApAQCAtMTE2LDYgKzExNSwxMCBAQCBzdHJ1 Y3QgdGVzdF9tb2RlIHsKIAl9IGZvcm1hdDsKIAogCWVudW0gaWd0X2RyYXdfbWV0aG9kIG1ldGhv ZDsKKworCS8qIFRoZSB0ZXN0IGlzIHNsb3cgYW5kL29yIGNvbWJpbmF0b3JpYWw7CisJICogc2tp cCB1bmxlc3Mgb3RoZXJ3aXNlIHNwZWNpZmllZCAqLworCWJvb2wgc2xvdzsKIH07CiAKIGVudW0g ZmxpcF90eXBlIHsKQEAgLTIzNyw3ICsyNDAsNiBAQCBzdHJ1Y3QgewogCWJvb2wgZmJjX2NoZWNr X2xhc3RfYWN0aW9uOwogCWJvb2wgbm9fZWRwOwogCWJvb2wgc21hbGxfbW9kZXM7Ci0JYm9vbCBz aG93X2hpZGRlbjsKIAlpbnQgc3RlcDsKIAlpbnQgb25seV9waXBlczsKIAlpbnQgc2hhcmVkX2Zi X3hfb2Zmc2V0OwpAQCAtMjQ5LDcgKzI1MSw2IEBAIHN0cnVjdCB7CiAJLmZiY19jaGVja19sYXN0 X2FjdGlvbiA9IHRydWUsCiAJLm5vX2VkcCA9IGZhbHNlLAogCS5zbWFsbF9tb2RlcyA9IGZhbHNl LAotCS5zaG93X2hpZGRlbj0gZmFsc2UsCiAJLnN0ZXAgPSAwLAogCS5vbmx5X3BpcGVzID0gUElQ RV9DT1VOVCwKIAkuc2hhcmVkX2ZiX3hfb2Zmc2V0ID0gNTAwLApAQCAtMjkzMyw5ICsyOTM0LDYg QEAgc3RhdGljIGludCBvcHRfaGFuZGxlcihpbnQgb3B0aW9uLCBpbnQgb3B0aW9uX2luZGV4LCB2 b2lkICpkYXRhKQogCWNhc2UgJ20nOgogCQlvcHQuc21hbGxfbW9kZXMgPSB0cnVlOwogCQlicmVh azsKLQljYXNlICdpJzoKLQkJb3B0LnNob3dfaGlkZGVuID0gdHJ1ZTsKLQkJYnJlYWs7CiAJY2Fz ZSAndCc6CiAJCW9wdC5zdGVwKys7CiAJCWJyZWFrOwpAQCAtMjk3MSw3ICsyOTY5LDYgQEAgY29u c3QgY2hhciAqaGVscF9zdHIgPQogIiAgLS1uby1mYmMtYWN0aW9uLWNoZWNrICAgICAgIERvbid0 IGNoZWNrIGZvciB0aGUgRkJDIGxhc3QgYWN0aW9uXG4iCiAiICAtLW5vLWVkcCAgICAgICAgICAg ICAgICAgICAgRG9uJ3QgdXNlIGVEUCBtb25pdG9yc1xuIgogIiAgLS11c2Utc21hbGwtbW9kZXMg ICAgICAgICAgIFVzZSBzbWFsbGVyIHJlc29sdXRpb25zIGZvciB0aGUgbW9kZXNcbiIKLSIgIC0t c2hvdy1oaWRkZW4gICAgICAgICAgICAgICBTaG93IGhpZGRlbiBzdWJ0ZXN0c1xuIgogIiAgLS1z dGVwICAgICAgICAgICAgICAgICAgICAgIFN0b3Agb24gZWFjaCBzdGVwIHNvIHlvdSBjYW4gY2hl Y2sgdGhlIHNjcmVlblxuIgogIiAgLS1zaGFyZWQtZmIteCBvZmZzZXQgICAgICAgIFVzZSAnb2Zm c2V0JyBhcyB0aGUgWCBvZmZzZXQgZm9yIHRoZSBzaGFyZWQgRkJcbiIKICIgIC0tc2hhcmVkLWZi LXkgb2Zmc2V0ICAgICAgICBVc2UgJ29mZnNldCcgYXMgdGhlIFkgb2Zmc2V0IGZvciB0aGUgc2hh cmVkIEZCXG4iCkBAIC0zMDY4LDE4ICszMDY1LDE5IEBAIHN0YXRpYyBjb25zdCBjaGFyICpmb3Jt YXRfc3RyKGVudW0gcGl4ZWxfZm9ybWF0IGZvcm1hdCkKIAlmb3IgKHQucGxhbmUgPSAwOyB0LnBs YW5lIDwgUExBTkVfQ09VTlQ7IHQucGxhbmUrKykgewkJICAgXAogCWZvciAodC5mYnMgPSAwOyB0 LmZicyA8IEZCU19DT1VOVDsgdC5mYnMrKykgewkJCSAgIFwKIAlmb3IgKHQubWV0aG9kID0gMDsg dC5tZXRob2QgPCBJR1RfRFJBV19NRVRIT0RfQ09VTlQ7IHQubWV0aG9kKyspIHsgXAorCQl0LnNs b3cgPSBmYWxzZTsJCQkJCQkgICBcCiAJCWlmICh0LnBpcGVzID09IFBJUEVfU0lOR0xFICYmIHQu c2NyZWVuID09IFNDUkVFTl9TQ05EKQkgICBcCiAJCQljb250aW51ZTsJCQkJCSAgIFwKIAkJaWYg KHQuc2NyZWVuID09IFNDUkVFTl9PRkZTQ1JFRU4gJiYgdC5wbGFuZSAhPSBQTEFORV9QUkkpICBc CiAJCQljb250aW51ZTsJCQkJCSAgIFwKLQkJaWYgKCFvcHQuc2hvd19oaWRkZW4gJiYgdC5waXBl cyA9PSBQSVBFX0RVQUwgJiYJCSAgIFwKKwkJaWYgKHQucGlwZXMgPT0gUElQRV9EVUFMICYmCQkJ CSAgIFwKIAkJICAgIHQuc2NyZWVuID09IFNDUkVFTl9PRkZTQ1JFRU4pCQkJICAgXAotCQkJY29u dGludWU7CQkJCQkgICBcCi0JCWlmICghb3B0LnNob3dfaGlkZGVuICYmIHQuZmVhdHVyZSA9PSBG RUFUVVJFX05PTkUpCSAgIFwKLQkJCWNvbnRpbnVlOwkJCQkJICAgXAotCQlpZiAoIW9wdC5zaG93 X2hpZGRlbiAmJiB0LmZicyA9PSBGQlNfU0hBUkVEICYmCQkgICBcCisJCQl0LnNsb3cgPSB0cnVl OwkJCQkJICAgXAorCQlpZiAodC5mZWF0dXJlID09IEZFQVRVUkVfTk9ORSkJCQkJICAgXAorCQkJ dC5zbG93ID0gdHJ1ZTsJCQkJCSAgIFwKKwkJaWYgKHQuZmJzID09IEZCU19TSEFSRUQgJiYJCQkJ ICAgXAogCQkgICAgKHQucGxhbmUgPT0gUExBTkVfQ1VSIHx8IHQucGxhbmUgPT0gUExBTkVfU1BS KSkJICAgXAotCQkJY29udGludWU7CisJCQl0LnNsb3cgPSB0cnVlOwogCiAKICNkZWZpbmUgVEVT VF9NT0RFX0lURVJfRU5EIH0gfSB9IH0gfSB9CkBAIC0zMDk0LDcgKzMwOTIsNiBAQCBpbnQgbWFp bihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQl7ICJuby1mYmMtYWN0aW9uLWNoZWNrIiwgICAg ICAwLCAwLCAnYSd9LAogCQl7ICJuby1lZHAiLCAgICAgICAgICAgICAgICAgICAwLCAwLCAnZSd9 LAogCQl7ICJ1c2Utc21hbGwtbW9kZXMiLCAgICAgICAgICAwLCAwLCAnbSd9LAotCQl7ICJzaG93 LWhpZGRlbiIsICAgICAgICAgICAgICAwLCAwLCAnaSd9LAogCQl7ICJzdGVwIiwgICAgICAgICAg ICAgICAgICAgICAwLCAwLCAndCd9LAogCQl7ICJzaGFyZWQtZmIteCIsICAgICAgICAgICAgICAx LCAwLCAneCd9LAogCQl7ICJzaGFyZWQtZmIteSIsICAgICAgICAgICAgICAxLCAwLCAneSd9LApA QCAtMzExMCw4ICszMTA3LDkgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAkJ c2V0dXBfZW52aXJvbm1lbnQoKTsKIAogCWZvciAodC5mZWF0dXJlID0gMDsgdC5mZWF0dXJlIDwg RkVBVFVSRV9DT1VOVDsgdC5mZWF0dXJlKyspIHsKLQkJaWYgKCFvcHQuc2hvd19oaWRkZW4gJiYg dC5mZWF0dXJlID09IEZFQVRVUkVfTk9ORSkKLQkJCWNvbnRpbnVlOworCQl0LnNsb3cgPSBmYWxz ZTsKKwkJaWYgKHQuZmVhdHVyZSA9PSBGRUFUVVJFX05PTkUpCisJCQl0LnNsb3cgPSB0cnVlOwog CQlmb3IgKHQucGlwZXMgPSAwOyB0LnBpcGVzIDwgUElQRV9DT1VOVDsgdC5waXBlcysrKSB7CiAJ CQl0LnNjcmVlbiA9IFNDUkVFTl9QUklNOwogCQkJdC5wbGFuZSA9IFBMQU5FX1BSSTsKQEAgLTMx MjAsNTIgKzMxMTgsNTggQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAkJCS8q IE1ha2Ugc3VyZSBub3RoaW5nIGlzIHVzaW5nIHRoaXMgdmFsdWUuICovCiAJCQl0Lm1ldGhvZCA9 IC0xOwogCi0JCQlpZ3Rfc3VidGVzdF9mKCIlcy0lcy1ydGUiLAotCQkJCSAgICAgIGZlYXR1cmVf c3RyKHQuZmVhdHVyZSksCi0JCQkJICAgICAgcGlwZXNfc3RyKHQucGlwZXMpKQorCQkJaWd0X3N1 YnRlc3Rfc2xvd19mKHQuc2xvdywKKwkJCQkJICAgIiVzLSVzLXJ0ZSIsCisJCQkJCSAgIGZlYXR1 cmVfc3RyKHQuZmVhdHVyZSksCisJCQkJCSAgIHBpcGVzX3N0cih0LnBpcGVzKSkKIAkJCQlydGVf c3VidGVzdCgmdCk7CiAJCX0KIAl9CiAKIAlURVNUX01PREVfSVRFUl9CRUdJTih0KQotCQlpZ3Rf c3VidGVzdF9mKCIlcy0lcy0lcy0lcy0lcy1kcmF3LSVzIiwKLQkJCSAgICAgIGZlYXR1cmVfc3Ry KHQuZmVhdHVyZSksCi0JCQkgICAgICBwaXBlc19zdHIodC5waXBlcyksCi0JCQkgICAgICBzY3Jl ZW5fc3RyKHQuc2NyZWVuKSwKLQkJCSAgICAgIHBsYW5lX3N0cih0LnBsYW5lKSwKLQkJCSAgICAg IGZic19zdHIodC5mYnMpLAotCQkJICAgICAgaWd0X2RyYXdfZ2V0X21ldGhvZF9uYW1lKHQubWV0 aG9kKSkKKwkJaWd0X3N1YnRlc3Rfc2xvd19mKHQuc2xvdywKKwkJCQkgICAiJXMtJXMtJXMtJXMt JXMtZHJhdy0lcyIsCisJCQkJICAgZmVhdHVyZV9zdHIodC5mZWF0dXJlKSwKKwkJCQkgICBwaXBl c19zdHIodC5waXBlcyksCisJCQkJICAgc2NyZWVuX3N0cih0LnNjcmVlbiksCisJCQkJICAgcGxh bmVfc3RyKHQucGxhbmUpLAorCQkJCSAgIGZic19zdHIodC5mYnMpLAorCQkJCSAgIGlndF9kcmF3 X2dldF9tZXRob2RfbmFtZSh0Lm1ldGhvZCkpCiAJCQlkcmF3X3N1YnRlc3QoJnQpOwogCVRFU1Rf TU9ERV9JVEVSX0VORAogCiAJVEVTVF9NT0RFX0lURVJfQkVHSU4odCkKIAkJaWYgKHQucGxhbmUg IT0gUExBTkVfUFJJIHx8Ci0JCSAgICB0LnNjcmVlbiA9PSBTQ1JFRU5fT0ZGU0NSRUVOIHx8Ci0J CSAgICAoIW9wdC5zaG93X2hpZGRlbiAmJiB0Lm1ldGhvZCAhPSBJR1RfRFJBV19CTFQpKQorCQkg ICAgdC5zY3JlZW4gPT0gU0NSRUVOX09GRlNDUkVFTikKIAkJCWNvbnRpbnVlOwotCi0JCWlndF9z dWJ0ZXN0X2YoIiVzLSVzLSVzLSVzLWZsaXAtJXMiLAotCQkJICAgICAgZmVhdHVyZV9zdHIodC5m ZWF0dXJlKSwKLQkJCSAgICAgIHBpcGVzX3N0cih0LnBpcGVzKSwKLQkJCSAgICAgIHNjcmVlbl9z dHIodC5zY3JlZW4pLAotCQkJICAgICAgZmJzX3N0cih0LmZicyksCi0JCQkgICAgICBpZ3RfZHJh d19nZXRfbWV0aG9kX25hbWUodC5tZXRob2QpKQorCQlpZiAodC5tZXRob2QgIT0gSUdUX0RSQVdf QkxUKQorCQkJdC5zbG93ID0gdHJ1ZTsKKworCQlpZ3Rfc3VidGVzdF9zbG93X2YodC5zbG93LAor CQkJCSAgICIlcy0lcy0lcy0lcy1mbGlwLSVzIiwKKwkJCQkgICBmZWF0dXJlX3N0cih0LmZlYXR1 cmUpLAorCQkJCSAgIHBpcGVzX3N0cih0LnBpcGVzKSwKKwkJCQkgICBzY3JlZW5fc3RyKHQuc2Ny ZWVuKSwKKwkJCQkgICBmYnNfc3RyKHQuZmJzKSwKKwkJCQkgICBpZ3RfZHJhd19nZXRfbWV0aG9k X25hbWUodC5tZXRob2QpKQogCQkJZmxpcF9zdWJ0ZXN0KCZ0LCBGTElQX1BBR0VGTElQKTsKIAot CQlpZ3Rfc3VidGVzdF9mKCIlcy0lcy0lcy0lcy1ldmZsaXAtJXMiLAotCQkJICAgICAgZmVhdHVy ZV9zdHIodC5mZWF0dXJlKSwKLQkJCSAgICAgIHBpcGVzX3N0cih0LnBpcGVzKSwKLQkJCSAgICAg IHNjcmVlbl9zdHIodC5zY3JlZW4pLAotCQkJICAgICAgZmJzX3N0cih0LmZicyksCi0JCQkgICAg ICBpZ3RfZHJhd19nZXRfbWV0aG9kX25hbWUodC5tZXRob2QpKQorCQlpZ3Rfc3VidGVzdF9zbG93 X2YodC5zbG93LAorCQkJCSAgICIlcy0lcy0lcy0lcy1ldmZsaXAtJXMiLAorCQkJCSAgIGZlYXR1 cmVfc3RyKHQuZmVhdHVyZSksCisJCQkJICAgcGlwZXNfc3RyKHQucGlwZXMpLAorCQkJCSAgIHNj cmVlbl9zdHIodC5zY3JlZW4pLAorCQkJCSAgIGZic19zdHIodC5mYnMpLAorCQkJCSAgIGlndF9k cmF3X2dldF9tZXRob2RfbmFtZSh0Lm1ldGhvZCkpCiAJCQlmbGlwX3N1YnRlc3QoJnQsIEZMSVBf UEFHRUZMSVBfRVZFTlQpOwogCi0JCWlndF9zdWJ0ZXN0X2YoIiVzLSVzLSVzLSVzLW1zZmxpcC0l cyIsCi0JCQkgICAgICBmZWF0dXJlX3N0cih0LmZlYXR1cmUpLAotCQkJICAgICAgcGlwZXNfc3Ry KHQucGlwZXMpLAotCQkJICAgICAgc2NyZWVuX3N0cih0LnNjcmVlbiksCi0JCQkgICAgICBmYnNf c3RyKHQuZmJzKSwKLQkJCSAgICAgIGlndF9kcmF3X2dldF9tZXRob2RfbmFtZSh0Lm1ldGhvZCkp CisJCWlndF9zdWJ0ZXN0X3Nsb3dfZih0LnNsb3csCisJCQkJICAgIiVzLSVzLSVzLSVzLW1zZmxp cC0lcyIsCisJCQkJICAgZmVhdHVyZV9zdHIodC5mZWF0dXJlKSwKKwkJCQkgICBwaXBlc19zdHIo dC5waXBlcyksCisJCQkJICAgc2NyZWVuX3N0cih0LnNjcmVlbiksCisJCQkJICAgZmJzX3N0cih0 LmZicyksCisJCQkJICAgaWd0X2RyYXdfZ2V0X21ldGhvZF9uYW1lKHQubWV0aG9kKSkKIAkJCWZs aXBfc3VidGVzdCgmdCwgRkxJUF9NT0RFU0VUKTsKIAogCVRFU1RfTU9ERV9JVEVSX0VORApAQCAt MzE3NywxMCArMzE4MSwxMSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQkg ICAgKHQuZmVhdHVyZSAmIEZFQVRVUkVfRkJDKSA9PSAwKQogCQkJY29udGludWU7CiAKLQkJaWd0 X3N1YnRlc3RfZigiJXMtJXMtJXMtZmxpcHRyYWNrIiwKLQkJCSAgICAgIGZlYXR1cmVfc3RyKHQu ZmVhdHVyZSksCi0JCQkgICAgICBwaXBlc19zdHIodC5waXBlcyksCi0JCQkgICAgICBmYnNfc3Ry KHQuZmJzKSkKKwkJaWd0X3N1YnRlc3Rfc2xvd19mKHQuc2xvdywKKwkJCQkgICAiJXMtJXMtJXMt ZmxpcHRyYWNrIiwKKwkJCQkgICBmZWF0dXJlX3N0cih0LmZlYXR1cmUpLAorCQkJCSAgIHBpcGVz X3N0cih0LnBpcGVzKSwKKwkJCQkgICBmYnNfc3RyKHQuZmJzKSkKIAkJCWZsaXB0cmFja19zdWJ0 ZXN0KCZ0LCBGTElQX1BBR0VGTElQKTsKIAlURVNUX01PREVfSVRFUl9FTkQKIApAQCAtMzE5MCwy MCArMzE5NSwyMiBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQkgICAgdC5w bGFuZSA9PSBQTEFORV9QUkkpCiAJCQljb250aW51ZTsKIAotCQlpZ3Rfc3VidGVzdF9mKCIlcy0l cy0lcy0lcy0lcy1tb3ZlIiwKLQkJCSAgICAgIGZlYXR1cmVfc3RyKHQuZmVhdHVyZSksCi0JCQkg ICAgICBwaXBlc19zdHIodC5waXBlcyksCi0JCQkgICAgICBzY3JlZW5fc3RyKHQuc2NyZWVuKSwK LQkJCSAgICAgIHBsYW5lX3N0cih0LnBsYW5lKSwKLQkJCSAgICAgIGZic19zdHIodC5mYnMpKQor CQlpZ3Rfc3VidGVzdF9zbG93X2YodC5zbG93LAorCQkJCSAgICIlcy0lcy0lcy0lcy0lcy1tb3Zl IiwKKwkJCQkgICBmZWF0dXJlX3N0cih0LmZlYXR1cmUpLAorCQkJCSAgIHBpcGVzX3N0cih0LnBp cGVzKSwKKwkJCQkgICBzY3JlZW5fc3RyKHQuc2NyZWVuKSwKKwkJCQkgICBwbGFuZV9zdHIodC5w bGFuZSksCisJCQkJICAgZmJzX3N0cih0LmZicykpCiAJCQltb3ZlX3N1YnRlc3QoJnQpOwogCi0J CWlndF9zdWJ0ZXN0X2YoIiVzLSVzLSVzLSVzLSVzLW9ub2ZmIiwKLQkJCSAgICAgIGZlYXR1cmVf c3RyKHQuZmVhdHVyZSksCi0JCQkgICAgICBwaXBlc19zdHIodC5waXBlcyksCi0JCQkgICAgICBz Y3JlZW5fc3RyKHQuc2NyZWVuKSwKLQkJCSAgICAgIHBsYW5lX3N0cih0LnBsYW5lKSwKLQkJCSAg ICAgIGZic19zdHIodC5mYnMpKQorCQlpZ3Rfc3VidGVzdF9zbG93X2YodC5zbG93LAorCQkJCSAg ICIlcy0lcy0lcy0lcy0lcy1vbm9mZiIsCisJCQkJICAgZmVhdHVyZV9zdHIodC5mZWF0dXJlKSwK KwkJCQkgICBwaXBlc19zdHIodC5waXBlcyksCisJCQkJICAgc2NyZWVuX3N0cih0LnNjcmVlbiks CisJCQkJICAgcGxhbmVfc3RyKHQucGxhbmUpLAorCQkJCSAgIGZic19zdHIodC5mYnMpKQogCQkJ b25vZmZfc3VidGVzdCgmdCk7CiAJVEVTVF9NT0RFX0lURVJfRU5ECiAKQEAgLTMyMTMsMjcgKzMy MjAsMzAgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAkJICAgIHQucGxhbmUg IT0gUExBTkVfU1BSKQogCQkJY29udGludWU7CiAKLQkJaWd0X3N1YnRlc3RfZigiJXMtJXMtJXMt JXMtJXMtZnVsbHNjcmVlbiIsCi0JCQkgICAgICBmZWF0dXJlX3N0cih0LmZlYXR1cmUpLAotCQkJ ICAgICAgcGlwZXNfc3RyKHQucGlwZXMpLAotCQkJICAgICAgc2NyZWVuX3N0cih0LnNjcmVlbiks Ci0JCQkgICAgICBwbGFuZV9zdHIodC5wbGFuZSksCi0JCQkgICAgICBmYnNfc3RyKHQuZmJzKSkK KwkJaWd0X3N1YnRlc3Rfc2xvd19mKHQuc2xvdywKKwkJCQkgICAiJXMtJXMtJXMtJXMtJXMtZnVs bHNjcmVlbiIsCisJCQkJICAgZmVhdHVyZV9zdHIodC5mZWF0dXJlKSwKKwkJCQkgICBwaXBlc19z dHIodC5waXBlcyksCisJCQkJICAgc2NyZWVuX3N0cih0LnNjcmVlbiksCisJCQkJICAgcGxhbmVf c3RyKHQucGxhbmUpLAorCQkJCSAgIGZic19zdHIodC5mYnMpKQogCQkJZnVsbHNjcmVlbl9wbGFu ZV9zdWJ0ZXN0KCZ0KTsKIAlURVNUX01PREVfSVRFUl9FTkQKIAogCVRFU1RfTU9ERV9JVEVSX0JF R0lOKHQpCiAJCWlmICh0LnNjcmVlbiAhPSBTQ1JFRU5fUFJJTSB8fAotCQkgICAgdC5tZXRob2Qg IT0gSUdUX0RSQVdfQkxUIHx8Ci0JCSAgICAoIW9wdC5zaG93X2hpZGRlbiAmJiB0LnBsYW5lICE9 IFBMQU5FX1BSSSkgfHwKLQkJICAgICghb3B0LnNob3dfaGlkZGVuICYmIHQuZmJzICE9IEZCU19J TkRJVklEVUFMKSkKKwkJICAgIHQubWV0aG9kICE9IElHVF9EUkFXX0JMVCkKIAkJCWNvbnRpbnVl OwotCi0JCWlndF9zdWJ0ZXN0X2YoIiVzLSVzLSVzLSVzLW11bHRpZHJhdyIsCi0JCQkgICAgICBm ZWF0dXJlX3N0cih0LmZlYXR1cmUpLAotCQkJICAgICAgcGlwZXNfc3RyKHQucGlwZXMpLAotCQkJ ICAgICAgcGxhbmVfc3RyKHQucGxhbmUpLAotCQkJICAgICAgZmJzX3N0cih0LmZicykpCisJCWlm ICh0LnBsYW5lICE9IFBMQU5FX1BSSSB8fAorCQkgICAgdC5mYnMgIT0gRkJTX0lORElWSURVQUwp CisJCQl0LnNsb3cgPSB0cnVlOworCisJCWlndF9zdWJ0ZXN0X3Nsb3dfZih0LnNsb3csCisJCQkJ ICAgIiVzLSVzLSVzLSVzLW11bHRpZHJhdyIsCisJCQkJICAgZmVhdHVyZV9zdHIodC5mZWF0dXJl KSwKKwkJCQkgICBwaXBlc19zdHIodC5waXBlcyksCisJCQkJICAgcGxhbmVfc3RyKHQucGxhbmUp LAorCQkJCSAgIGZic19zdHIodC5mYnMpKQogCQkJbXVsdGlkcmF3X3N1YnRlc3QoJnQpOwogCVRF U1RfTU9ERV9JVEVSX0VORAogCkBAIC0zMjQ1LDcgKzMyNTUsOSBAQCBpbnQgbWFpbihpbnQgYXJn YywgY2hhciAqYXJndltdKQogCQkgICAgdC5tZXRob2QgIT0gSUdUX0RSQVdfTU1BUF9HVFQpCiAJ CQljb250aW51ZTsKIAotCQlpZ3Rfc3VidGVzdF9mKCIlcy1mYXJmcm9tZmVuY2UiLCBmZWF0dXJl X3N0cih0LmZlYXR1cmUpKQorCQlpZ3Rfc3VidGVzdF9zbG93X2YodC5zbG93LAorCQkJCSAgICIl cy1mYXJmcm9tZmVuY2UiLAorCQkJCSAgIGZlYXR1cmVfc3RyKHQuZmVhdHVyZSkpCiAJCQlmYXJm cm9tZmVuY2Vfc3VidGVzdCgmdCk7CiAJVEVTVF9NT0RFX0lURVJfRU5ECiAKQEAgLTMyNjEsMTAg KzMyNzMsMTEgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAkJCWlmICh0LmZv cm1hdCA9PSBGT1JNQVRfREVGQVVMVCkKIAkJCQljb250aW51ZTsKIAotCQkJaWd0X3N1YnRlc3Rf ZigiJXMtJXMtZHJhdy0lcyIsCi0JCQkJICAgICAgZmVhdHVyZV9zdHIodC5mZWF0dXJlKSwKLQkJ CQkgICAgICBmb3JtYXRfc3RyKHQuZm9ybWF0KSwKLQkJCQkgICAgICBpZ3RfZHJhd19nZXRfbWV0 aG9kX25hbWUodC5tZXRob2QpKQorCQkJaWd0X3N1YnRlc3Rfc2xvd19mKHQuc2xvdywKKwkJCQkJ ICAgIiVzLSVzLWRyYXctJXMiLAorCQkJCQkgICBmZWF0dXJlX3N0cih0LmZlYXR1cmUpLAorCQkJ CQkgICBmb3JtYXRfc3RyKHQuZm9ybWF0KSwKKwkJCQkJICAgaWd0X2RyYXdfZ2V0X21ldGhvZF9u YW1lKHQubWV0aG9kKSkKIAkJCQlmb3JtYXRfZHJhd19zdWJ0ZXN0KCZ0KTsKIAkJfQogCVRFU1Rf TU9ERV9JVEVSX0VORApAQCAtMzI3NSw5ICszMjg4LDEwIEBAIGludCBtYWluKGludCBhcmdjLCBj aGFyICphcmd2W10pCiAJCSAgICB0LnBsYW5lICE9IFBMQU5FX1BSSSB8fAogCQkgICAgdC5tZXRo b2QgIT0gSUdUX0RSQVdfTU1BUF9DUFUpCiAJCQljb250aW51ZTsKLQkJaWd0X3N1YnRlc3RfZigi JXMtJXMtc2NhbGVkcHJpbWFyeSIsCi0JCQkgICAgICBmZWF0dXJlX3N0cih0LmZlYXR1cmUpLAot CQkJICAgICAgZmJzX3N0cih0LmZicykpCisJCWlndF9zdWJ0ZXN0X3Nsb3dfZih0LnNsb3csCisJ CQkJICAgIiVzLSVzLXNjYWxlZHByaW1hcnkiLAorCQkJCSAgIGZlYXR1cmVfc3RyKHQuZmVhdHVy ZSksCisJCQkJICAgZmJzX3N0cih0LmZicykpCiAJCQlzY2FsZWRwcmltYXJ5X3N1YnRlc3QoJnQp OwogCVRFU1RfTU9ERV9JVEVSX0VORAogCkBAIC0zMjg5LDIyICszMzAzLDMyIEBAIGludCBtYWlu KGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJCSAgICB0Lm1ldGhvZCAhPSBJR1RfRFJBV19NTUFQ X0NQVSkKIAkJCWNvbnRpbnVlOwogCi0JCWlndF9zdWJ0ZXN0X2YoIiVzLW1vZGVzZXRmcm9tYnVz eSIsIGZlYXR1cmVfc3RyKHQuZmVhdHVyZSkpCisJCWlndF9zdWJ0ZXN0X3Nsb3dfZih0LnNsb3cs CisJCQkJICAgIiVzLW1vZGVzZXRmcm9tYnVzeSIsCisJCQkJICAgZmVhdHVyZV9zdHIodC5mZWF0 dXJlKSkKIAkJCW1vZGVzZXRmcm9tYnVzeV9zdWJ0ZXN0KCZ0KTsKIAogCQlpZiAodC5mZWF0dXJl ICYgRkVBVFVSRV9GQkMpIHsKLQkJCWlndF9zdWJ0ZXN0X2YoIiVzLWJhZHN0cmlkZSIsIGZlYXR1 cmVfc3RyKHQuZmVhdHVyZSkpCisJCQlpZ3Rfc3VidGVzdF9zbG93X2YodC5zbG93LAorCQkJCQkg ICAiJXMtYmFkc3RyaWRlIiwKKwkJCQkJICAgZmVhdHVyZV9zdHIodC5mZWF0dXJlKSkKIAkJCQli YWRzdHJpZGVfc3VidGVzdCgmdCk7CiAKLQkJCWlndF9zdWJ0ZXN0X2YoIiVzLXN0cmlkZWNoYW5n ZSIsIGZlYXR1cmVfc3RyKHQuZmVhdHVyZSkpCisJCQlpZ3Rfc3VidGVzdF9zbG93X2YodC5zbG93 LAorCQkJCQkgICAiJXMtc3RyaWRlY2hhbmdlIiwKKwkJCQkJICAgZmVhdHVyZV9zdHIodC5mZWF0 dXJlKSkKIAkJCQlzdHJpZGVjaGFuZ2Vfc3VidGVzdCgmdCk7CiAJCX0KIAogCQlpZiAodC5mZWF0 dXJlICYgRkVBVFVSRV9QU1IpCi0JCQlpZ3Rfc3VidGVzdF9mKCIlcy1zbG93ZHJhdyIsIGZlYXR1 cmVfc3RyKHQuZmVhdHVyZSkpCisJCQlpZ3Rfc3VidGVzdF9zbG93X2YodC5zbG93LAorCQkJCQkg ICAiJXMtc2xvd2RyYXciLAorCQkJCQkgICBmZWF0dXJlX3N0cih0LmZlYXR1cmUpKQogCQkJCXNs b3dfZHJhd19zdWJ0ZXN0KCZ0KTsKIAotCQlpZ3Rfc3VidGVzdF9mKCIlcy1zdXNwZW5kIiwgZmVh dHVyZV9zdHIodC5mZWF0dXJlKSkKKwkJaWd0X3N1YnRlc3Rfc2xvd19mKHQuc2xvdywKKwkJCQkg ICAiJXMtc3VzcGVuZCIsCisJCQkJICAgZmVhdHVyZV9zdHIodC5mZWF0dXJlKSkKIAkJCXN1c3Bl bmRfc3VidGVzdCgmdCk7CiAJVEVTVF9NT0RFX0lURVJfRU5ECiAKLS0gCjIuNi4yCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=