Return-Path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF81E6EE2B for ; Thu, 1 Feb 2018 15:39:21 +0000 (UTC) From: Maarten Lankhorst Date: Thu, 1 Feb 2018 16:39:14 +0100 Message-Id: <20180201153914.74639-10-maarten.lankhorst@linux.intel.com> In-Reply-To: <20180201153914.74639-1-maarten.lankhorst@linux.intel.com> References: <20180201153914.74639-1-maarten.lankhorst@linux.intel.com> Subject: [igt-dev] [PATCH i-g-t 9/9] tests/kms_rotation_crc: Perform lazy cleanup and require atomic. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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 List-ID: VGhpcyB3b24ndCBjbGVhbiB1cCByZXNvdXJjZXMgYmV0d2VlbiBzdWJ0ZXN0cywgc28gaWYgc3Vi dGVzdHMgZmFpbAp0aGUgbmV4dCBzdWJ0ZXN0IHdpbGwgY2xlYW4gdXAgZXZlcnl0aGluZy4gVGhp cyBhbGxvd3MgYWxsIHN1YnRlc3RzCmV2ZW4gaWYgb25lIGZhaWxzLgoKU2lnbmVkLW9mZi1ieTog TWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0t CiB0ZXN0cy9rbXNfcm90YXRpb25fY3JjLmMgfCAyMTMgKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCsp LCAxNDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX3JvdGF0aW9uX2NyYy5j IGIvdGVzdHMva21zX3JvdGF0aW9uX2NyYy5jCmluZGV4IDUyYTg1ZmI2MmY5Zi4uYTBmYjczNGQw MmY2IDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfcm90YXRpb25fY3JjLmMKKysrIGIvdGVzdHMva21z X3JvdGF0aW9uX2NyYy5jCkBAIC0zMyw3ICszMyw2IEBAIHR5cGVkZWYgc3RydWN0IHsKIAlzdHJ1 Y3QgaWd0X2ZiIGZiOwogCXN0cnVjdCBpZ3RfZmIgZmJfcmVmZXJlbmNlOwogCXN0cnVjdCBpZ3Rf ZmIgZmJfdW5yb3RhdGVkOwotCXN0cnVjdCBpZ3RfZmIgZmJfbW9kZXNldDsKIAlzdHJ1Y3QgaWd0 X2ZiIGZiX2ZsaXA7CiAJaWd0X2NyY190IHJlZl9jcmM7CiAJaWd0X2NyY190IGZsaXBfY3JjOwpA QCAtMTIyLDY4ICsxMjEsNTAgQEAgcGFpbnRfc3F1YXJlcyhkYXRhX3QgKmRhdGEsIGlndF9yb3Rh dGlvbl90IHJvdGF0aW9uLAogCWlndF9wdXRfY2Fpcm9fY3R4KGRhdGEtPmdmeF9mZCwgZmIsIGNy KTsKIH0KIAotc3RhdGljIHZvaWQgcHJlcGFyZV9jcnRjKGRhdGFfdCAqZGF0YSwgaWd0X291dHB1 dF90ICpvdXRwdXQsIGVudW0gcGlwZSBwaXBlLAotCQkJIGlndF9wbGFuZV90ICpwbGFuZSwgZW51 bSBpZ3RfY29tbWl0X3N0eWxlIGNvbW1pdCkKK3N0YXRpYyB2b2lkIHJlbW92ZV9mYnMoZGF0YV90 ICpkYXRhKQogewotCWRybU1vZGVNb2RlSW5mbyAqbW9kZTsKLQl1bnNpZ25lZCBpbnQgdywgaDsK LQl1aW50NjRfdCB0aWxpbmcgPSBkYXRhLT5vdmVycmlkZV90aWxpbmcgPzogTE9DQUxfRFJNX0ZP Uk1BVF9NT0RfTk9ORTsKLQl1aW50MzJfdCBwaXhlbF9mb3JtYXQgPSBkYXRhLT5vdmVycmlkZV9m bXQgPzogRFJNX0ZPUk1BVF9YUkdCODg4ODsKLQlpZ3RfZGlzcGxheV90ICpkaXNwbGF5ID0gJmRh dGEtPmRpc3BsYXk7Ci0JaWd0X3BsYW5lX3QgKnByaW1hcnkgPSBpZ3Rfb3V0cHV0X2dldF9wbGFu ZV90eXBlKG91dHB1dCwgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSk7CisJaWYgKGRhdGEtPmZiLmZi X2lkKQorCQlpZ3RfcmVtb3ZlX2ZiKGRhdGEtPmdmeF9mZCwgJmRhdGEtPmZiKTsKIAotCWlndF9v dXRwdXRfc2V0X3BpcGUob3V0cHV0LCBwaXBlKTsKLQlpZ3RfcGxhbmVfc2V0X3JvdGF0aW9uKHBs YW5lLCBJR1RfUk9UQVRJT05fMCk7CisJaWYgKGRhdGEtPmZiX3JlZmVyZW5jZS5mYl9pZCkKKwkJ aWd0X3JlbW92ZV9mYihkYXRhLT5nZnhfZmQsICZkYXRhLT5mYl9yZWZlcmVuY2UpOwogCi0JLyog Y3JlYXRlIHRoZSBwaXBlX2NyYyBvYmplY3QgZm9yIHRoaXMgcGlwZSAqLwotCWlndF9waXBlX2Ny Y19mcmVlKGRhdGEtPnBpcGVfY3JjKTsKLQlkYXRhLT5waXBlX2NyYyA9IGlndF9waXBlX2NyY19u ZXcoZGF0YS0+Z2Z4X2ZkLCBwaXBlLCBJTlRFTF9QSVBFX0NSQ19TT1VSQ0VfQVVUTyk7Ci0KLQlt b2RlID0gaWd0X291dHB1dF9nZXRfbW9kZShvdXRwdXQpOworCWlmIChkYXRhLT5mYl91bnJvdGF0 ZWQuZmJfaWQpCisJCWlndF9yZW1vdmVfZmIoZGF0YS0+Z2Z4X2ZkLCAmZGF0YS0+ZmJfdW5yb3Rh dGVkKTsKIAotCXcgPSBtb2RlLT5oZGlzcGxheTsKLQloID0gbW9kZS0+dmRpc3BsYXk7Ci0KLQlp Z3RfY3JlYXRlX2ZiKGRhdGEtPmdmeF9mZCwgdywgaCwgcGl4ZWxfZm9ybWF0LCB0aWxpbmcsICZk YXRhLT5mYl9tb2Rlc2V0KTsKKwlpZiAoZGF0YS0+ZmJfZmxpcC5mYl9pZCkKKwkJaWd0X3JlbW92 ZV9mYihkYXRhLT5nZnhfZmQsICZkYXRhLT5mYl9mbGlwKTsKIAotCS8qCi0JICogV2l0aCBpZ3Rf ZGlzcGxheV9jb21taXQyIGFuZCBDT01NSVRfVU5JVkVSU0FMLCB3ZSBjYWxsIGp1c3QgdGhlCi0J ICogc2V0cGxhbmUgd2l0aG91dCBhIG1vZGVzZXQuIFNvLCB0byBiZSBhYmxlIHRvIGNhbGwKLQkg KiBpZ3RfZGlzcGxheV9jb21taXQgYW5kIHVsdGltYXRlbHkgc2V0Y3J0YyB0byBkbyB0aGUgZmly c3QgbW9kZXNldCwKLQkgKiB3ZSBjcmVhdGUgYW4gZmIgY292ZXJpbmcgdGhlIGNydGMgYW5kIGNh bGwgY29tbWl0Ci0JICoKLQkgKiBJdCdzIGFsc28gYSBnb29kIGlkZWEgdG8gc2V0IGEgcHJpbWFy eSBmYiBvbiB0aGUgcHJpbWFyeSBwbGFuZQotCSAqIHJlZ2FyZGxlc3MsIHRvIGZvcmNlIGEgdW5k ZXJydW4gd2hlbiB3YXRlcm1hcmtzIGFyZSBhbGxvY2F0ZWQKLQkgKiBpbmNvcnJlY3RseSBmb3Ig b3RoZXIgcGxhbmVzLgotCSAqLwotCWlndF9wbGFuZV9zZXRfZmIocHJpbWFyeSwgJmRhdGEtPmZi X21vZGVzZXQpOworCWRhdGEtPmZiX2ZsaXAuZmJfaWQgPSBkYXRhLT5mYl9yZWZlcmVuY2UuZmJf aWQgPSBkYXRhLT5mYl91bnJvdGF0ZWQuZmJfaWQgPSBkYXRhLT5mYi5mYl9pZCA9IDA7Cit9CiAK LQlpZiAoY29tbWl0IDwgQ09NTUlUX0FUT01JQykgewotCQlpZ3RfcGxhbmVfY2xlYXJfcHJvcF9j aGFuZ2VkKHByaW1hcnksIElHVF9QTEFORV9ST1RBVElPTik7Ci0JCWlndF9kaXNwbGF5X2NvbW1p dChkaXNwbGF5KTsKK3N0YXRpYyB2b2lkIGNsZWFudXBfY3J0YyhkYXRhX3QgKmRhdGEpCit7CisJ aWd0X2Rpc3BsYXlfdCAqZGlzcGxheSA9ICZkYXRhLT5kaXNwbGF5OwogCi0JCWlmIChwbGFuZS0+ dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZKQotCQkJaWd0X3BsYW5lX3NldF9wcm9wX2No YW5nZWQocHJpbWFyeSwgSUdUX1BMQU5FX1JPVEFUSU9OKTsKLQl9CisJaWd0X3BpcGVfY3JjX2Zy ZWUoZGF0YS0+cGlwZV9jcmMpOworCWRhdGEtPnBpcGVfY3JjID0gTlVMTDsKIAotCWlndF9wbGFu ZV9zZXRfZmIocGxhbmUsIE5VTEwpOworCXJlbW92ZV9mYnMoZGF0YSk7CiAKLQlpZ3RfZGlzcGxh eV9jb21taXQyKGRpc3BsYXksIGNvbW1pdCk7CisJaWd0X2Rpc3BsYXlfcmVzZXQoZGlzcGxheSk7 CiB9CiAKLXN0YXRpYyB2b2lkIHJlbW92ZV9mYnMoZGF0YV90ICpkYXRhKQorc3RhdGljIHZvaWQg cHJlcGFyZV9jcnRjKGRhdGFfdCAqZGF0YSwgaWd0X291dHB1dF90ICpvdXRwdXQsIGVudW0gcGlw ZSBwaXBlLAorCQkJIGlndF9wbGFuZV90ICpwbGFuZSkKIHsKLQlpZiAoIWRhdGEtPmZiLmZiX2lk KQotCQlyZXR1cm47CisJaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSA9ICZkYXRhLT5kaXNwbGF5Owog Ci0JaWd0X3JlbW92ZV9mYihkYXRhLT5nZnhfZmQsICZkYXRhLT5mYik7Ci0JaWd0X3JlbW92ZV9m YihkYXRhLT5nZnhfZmQsICZkYXRhLT5mYl9yZWZlcmVuY2UpOwotCWlndF9yZW1vdmVfZmIoZGF0 YS0+Z2Z4X2ZkLCAmZGF0YS0+ZmJfdW5yb3RhdGVkKTsKKwljbGVhbnVwX2NydGMoZGF0YSk7CiAK LQlpZiAoZGF0YS0+ZmJfZmxpcC5mYl9pZCkKLQkJaWd0X3JlbW92ZV9mYihkYXRhLT5nZnhfZmQs ICZkYXRhLT5mYl9mbGlwKTsKKwlpZ3Rfb3V0cHV0X3NldF9waXBlKG91dHB1dCwgcGlwZSk7CisJ aWd0X3BsYW5lX3NldF9yb3RhdGlvbihwbGFuZSwgSUdUX1JPVEFUSU9OXzApOworCisJLyogY3Jl YXRlIHRoZSBwaXBlX2NyYyBvYmplY3QgZm9yIHRoaXMgcGlwZSAqLworCWlndF9waXBlX2NyY19m cmVlKGRhdGEtPnBpcGVfY3JjKTsKKwlkYXRhLT5waXBlX2NyYyA9IGlndF9waXBlX2NyY19uZXco ZGF0YS0+Z2Z4X2ZkLCBwaXBlLCBJTlRFTF9QSVBFX0NSQ19TT1VSQ0VfQVVUTyk7CiAKLQlkYXRh LT5mYl9mbGlwLmZiX2lkID0gZGF0YS0+ZmIuZmJfaWQgPSAwOworCWlndF9kaXNwbGF5X2NvbW1p dDIoZGlzcGxheSwgQ09NTUlUX0FUT01JQyk7CiB9CiAKIGVudW0gcmVjdGFuZ2xlX3R5cGUgewpA QCAtMjA2LDcgKzE4Nyw3IEBAIHN0YXRpYyB2b2lkIHByZXBhcmVfZmJzKGRhdGFfdCAqZGF0YSwg aWd0X291dHB1dF90ICpvdXRwdXQsCiAKIAlpZiAoZGF0YS0+ZmIuZmJfaWQpIHsKIAkJaWd0X3Bs YW5lX3NldF9mYihwbGFuZSwgTlVMTCk7Ci0JCWlndF9kaXNwbGF5X2NvbW1pdDIoZGlzcGxheSwg ZGlzcGxheS0+aXNfYXRvbWljID8gQ09NTUlUX0FUT01JQyA6IENPTU1JVF9VTklWRVJTQUwpOwor CQlpZ3RfZGlzcGxheV9jb21taXQyKGRpc3BsYXksIENPTU1JVF9BVE9NSUMpOwogCiAJCXJlbW92 ZV9mYnMoZGF0YSk7CiAJfQpAQCAtMjU5LDI4ICsyNDAsMjQgQEAgc3RhdGljIHZvaWQgcHJlcGFy ZV9mYnMoZGF0YV90ICpkYXRhLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dCwKIAkvKgogCSAqIENyZWF0 ZSBhIHJlZmVyZW5jZSBzb2Z0d2FyZSByb3RhdGVkIGZsaXAgZnJhbWVidWZmZXIuCiAJICovCi0J aWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkgfHwgZGlzcGxheS0+aXNf YXRvbWljKSB7Ci0JCWlndF9jcmVhdGVfZmIoZGF0YS0+Z2Z4X2ZkLCByZWZfdywgcmVmX2gsIHBp eGVsX2Zvcm1hdCwgdGlsaW5nLAotCQkJICAgICAgJmRhdGEtPmZiX2ZsaXApOwotCQlwYWludF9z cXVhcmVzKGRhdGEsIGRhdGEtPnJvdGF0aW9uLCAmZGF0YS0+ZmJfZmxpcCwKLQkJCSAgICAgIGZs aXBfb3BhY2l0eSk7Ci0JCWlndF9wbGFuZV9zZXRfZmIocGxhbmUsICZkYXRhLT5mYl9mbGlwKTsK LQkJaWYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikKLQkJCWlndF9wbGFu ZV9zZXRfcG9zaXRpb24ocGxhbmUsIGRhdGEtPnBvc194LCBkYXRhLT5wb3NfeSk7Ci0JCWlndF9k aXNwbGF5X2NvbW1pdDIoZGlzcGxheSwKLQkJCQkgICAgZGlzcGxheS0+aXNfYXRvbWljID8KLQkJ CQkgICAgQ09NTUlUX0FUT01JQyA6IENPTU1JVF9VTklWRVJTQUwpOwotCQlpZ3RfcGlwZV9jcmNf Y29sbGVjdF9jcmMoZGF0YS0+cGlwZV9jcmMsICZkYXRhLT5mbGlwX2NyYyk7Ci0KLQkJLyoKLQkJ ICogUHJlcGFyZSB0aGUgbm9uLXJvdGF0ZWQgZmxpcCBmYi4KLQkJICovCi0JCWlndF9yZW1vdmVf ZmIoZGF0YS0+Z2Z4X2ZkLCAmZGF0YS0+ZmJfZmxpcCk7Ci0JCWlndF9jcmVhdGVfZmIoZGF0YS0+ Z2Z4X2ZkLCB3LCBoLCBwaXhlbF9mb3JtYXQsIHRpbGluZywKLQkJCSAgICAgICZkYXRhLT5mYl9m bGlwKTsKLQkJcGFpbnRfc3F1YXJlcyhkYXRhLCBJR1RfUk9UQVRJT05fMCwgJmRhdGEtPmZiX2Zs aXAsCi0JCQkgICAgICBmbGlwX29wYWNpdHkpOwotCX0KKwlpZ3RfY3JlYXRlX2ZiKGRhdGEtPmdm eF9mZCwgcmVmX3csIHJlZl9oLCBwaXhlbF9mb3JtYXQsIHRpbGluZywKKwkJICAgICAgJmRhdGEt PmZiX2ZsaXApOworCXBhaW50X3NxdWFyZXMoZGF0YSwgZGF0YS0+cm90YXRpb24sICZkYXRhLT5m Yl9mbGlwLAorCQkgICAgICBmbGlwX29wYWNpdHkpOworCWlndF9wbGFuZV9zZXRfZmIocGxhbmUs ICZkYXRhLT5mYl9mbGlwKTsKKwlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVfQ1VS U09SKQorCQlpZ3RfcGxhbmVfc2V0X3Bvc2l0aW9uKHBsYW5lLCBkYXRhLT5wb3NfeCwgZGF0YS0+ cG9zX3kpOworCWlndF9kaXNwbGF5X2NvbW1pdDIoZGlzcGxheSwgQ09NTUlUX0FUT01JQyk7CisJ aWd0X3BpcGVfY3JjX2NvbGxlY3RfY3JjKGRhdGEtPnBpcGVfY3JjLCAmZGF0YS0+ZmxpcF9jcmMp OworCisJLyoKKwkgICogUHJlcGFyZSB0aGUgbm9uLXJvdGF0ZWQgZmxpcCBmYi4KKwkgICovCisJ aWd0X3JlbW92ZV9mYihkYXRhLT5nZnhfZmQsICZkYXRhLT5mYl9mbGlwKTsKKwlpZ3RfY3JlYXRl X2ZiKGRhdGEtPmdmeF9mZCwgdywgaCwgcGl4ZWxfZm9ybWF0LCB0aWxpbmcsCisJCSAgICAgICZk YXRhLT5mYl9mbGlwKTsKKwlwYWludF9zcXVhcmVzKGRhdGEsIElHVF9ST1RBVElPTl8wLCAmZGF0 YS0+ZmJfZmxpcCwKKwkJICAgICAgZmxpcF9vcGFjaXR5KTsKIAogCS8qCiAJICogQ3JlYXRlIGEg cmVmZXJlbmNlIENSQyBmb3IgYSBzb2Z0d2FyZS1yb3RhdGVkIGZiLgpAQCAtMjkyLDcgKzI2OSw3 IEBAIHN0YXRpYyB2b2lkIHByZXBhcmVfZmJzKGRhdGFfdCAqZGF0YSwgaWd0X291dHB1dF90ICpv dXRwdXQsCiAJaWd0X3BsYW5lX3NldF9mYihwbGFuZSwgJmRhdGEtPmZiX3JlZmVyZW5jZSk7CiAJ aWYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikKIAkJaWd0X3BsYW5lX3Nl dF9wb3NpdGlvbihwbGFuZSwgZGF0YS0+cG9zX3gsIGRhdGEtPnBvc195KTsKLQlpZ3RfZGlzcGxh eV9jb21taXQyKGRpc3BsYXksIGRpc3BsYXktPmlzX2F0b21pYyA/IENPTU1JVF9BVE9NSUMgOiBD T01NSVRfVU5JVkVSU0FMKTsKKwlpZ3RfZGlzcGxheV9jb21taXQyKGRpc3BsYXksIENPTU1JVF9B VE9NSUMpOwogCiAJaWd0X3BpcGVfY3JjX2NvbGxlY3RfY3JjKGRhdGEtPnBpcGVfY3JjLCAmZGF0 YS0+cmVmX2NyYyk7CiAKQEAgLTMwNSw3ICsyODIsNyBAQCBzdGF0aWMgdm9pZCBwcmVwYXJlX2Zi cyhkYXRhX3QgKmRhdGEsIGlndF9vdXRwdXRfdCAqb3V0cHV0LAogCWlndF9wbGFuZV9zZXRfcm90 YXRpb24ocGxhbmUsIElHVF9ST1RBVElPTl8wKTsKIAlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BM QU5FX1RZUEVfQ1VSU09SKQogCQlpZ3RfcGxhbmVfc2V0X3Bvc2l0aW9uKHBsYW5lLCBkYXRhLT5w b3NfeCwgZGF0YS0+cG9zX3kpOwotCWlndF9kaXNwbGF5X2NvbW1pdDIoZGlzcGxheSwgZGlzcGxh eS0+aXNfYXRvbWljID8gQ09NTUlUX0FUT01JQyA6IENPTU1JVF9VTklWRVJTQUwpOworCWlndF9k aXNwbGF5X2NvbW1pdDIoZGlzcGxheSwgQ09NTUlUX0FUT01JQyk7CiAKIAkvKgogCSAqIFByZXBh cmUgdGhlIHBsYW5lIHdpdGggYW4gbm9uLXJvdGF0ZWQgZmIgbGV0IHRoZSBodyByb3RhdGUgaXQu CkBAIC0zMTgsMzUgKzI5NSw2IEBAIHN0YXRpYyB2b2lkIHByZXBhcmVfZmJzKGRhdGFfdCAqZGF0 YSwgaWd0X291dHB1dF90ICpvdXRwdXQsCiAJCWlndF9wbGFuZV9zZXRfcG9zaXRpb24ocGxhbmUs IGRhdGEtPnBvc194LCBkYXRhLT5wb3NfeSk7CiB9CiAKLXN0YXRpYyB2b2lkIGNsZWFudXBfY3J0 YyhkYXRhX3QgKmRhdGEsIGlndF9vdXRwdXRfdCAqb3V0cHV0LCBpZ3RfcGxhbmVfdCAqcGxhbmUp Ci17Ci0JaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSA9ICZkYXRhLT5kaXNwbGF5OwotCi0JaWd0X3Bp cGVfY3JjX2ZyZWUoZGF0YS0+cGlwZV9jcmMpOwotCWRhdGEtPnBpcGVfY3JjID0gTlVMTDsKLQot CXJlbW92ZV9mYnMoZGF0YSk7Ci0KLQlpZ3RfcmVtb3ZlX2ZiKGRhdGEtPmdmeF9mZCwgJmRhdGEt PmZiX21vZGVzZXQpOwotCi0JLyogWFhYOiBzZWUgdGhlIG5vdGUgaW4gcHJlcGFyZV9jcnRjKCkg Ki8KLQlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkgewotCQlpZ3Rf cGxhbmVfdCAqcHJpbWFyeTsKLQotCQlwcmltYXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlw ZShvdXRwdXQsIERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOwotCQlpZ3RfcGxhbmVfc2V0X2ZiKHBy aW1hcnksIE5VTEwpOwotCX0KLQotCWlndF9wbGFuZV9zZXRfZmIocGxhbmUsIE5VTEwpOwotCWln dF9wbGFuZV9zZXRfcm90YXRpb24ocGxhbmUsIElHVF9ST1RBVElPTl8wKTsKLQotCWlndF9kaXNw bGF5X2NvbW1pdDIoZGlzcGxheSwgQ09NTUlUX1VOSVZFUlNBTCk7Ci0KLQlpZ3Rfb3V0cHV0X3Nl dF9waXBlKG91dHB1dCwgUElQRV9BTlkpOwotCi0JaWd0X2Rpc3BsYXlfY29tbWl0KGRpc3BsYXkp OwotfQotCiBzdGF0aWMgdm9pZCB3YWl0X2Zvcl9wYWdlZmxpcChpbnQgZmQpCiB7CiAJZHJtRXZl bnRDb250ZXh0IGV2Y3R4ID0geyAudmVyc2lvbiA9IDIgfTsKQEAgLTM3MSwxOCArMzE5LDExIEBA IHN0YXRpYyB2b2lkIHRlc3RfcGxhbmVfcm90YXRpb24oZGF0YV90ICpkYXRhLCBpbnQgcGxhbmVf dHlwZSwgYm9vbCB0ZXN0X2JhZF9mb3JtCiAJZW51bSBwaXBlIHBpcGU7CiAJaW50IHZhbGlkX3Rl c3RzID0gMDsKIAlpZ3RfY3JjX3QgY3JjX291dHB1dDsKLQllbnVtIGlndF9jb21taXRfc3R5bGUg Y29tbWl0ID0gQ09NTUlUX0xFR0FDWTsKIAlpbnQgcmV0OwogCi0JaWYgKHBsYW5lX3R5cGUgPT0g RFJNX1BMQU5FX1RZUEVfUFJJTUFSWSB8fCBwbGFuZV90eXBlID09IERSTV9QTEFORV9UWVBFX0NV UlNPUikKLQkJY29tbWl0ID0gQ09NTUlUX1VOSVZFUlNBTDsKLQogCWlmIChwbGFuZV90eXBlID09 IERSTV9QTEFORV9UWVBFX0NVUlNPUikKIAkJaWd0X3JlcXVpcmUoZGlzcGxheS0+aGFzX2N1cnNv cl9wbGFuZSk7CiAKLQlpZiAoZGF0YS0+ZGlzcGxheS5pc19hdG9taWMpCi0JCWNvbW1pdCA9IENP TU1JVF9BVE9NSUM7Ci0KIAlmb3JfZWFjaF9waXBlX3dpdGhfdmFsaWRfb3V0cHV0KGRpc3BsYXks IHBpcGUsIG91dHB1dCkgewogCQlpZ3RfcGxhbmVfdCAqcGxhbmU7CiAJCWludCBpOwpAQCAtMzk1 LDcgKzMzNiw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfcGxhbmVfcm90YXRpb24oZGF0YV90ICpkYXRh LCBpbnQgcGxhbmVfdHlwZSwgYm9vbCB0ZXN0X2JhZF9mb3JtCiAJCXBsYW5lID0gaWd0X291dHB1 dF9nZXRfcGxhbmVfdHlwZShvdXRwdXQsIHBsYW5lX3R5cGUpOwogCQlpZ3RfcmVxdWlyZShpZ3Rf cGxhbmVfaGFzX3Byb3AocGxhbmUsIElHVF9QTEFORV9ST1RBVElPTikpOwogCi0JCXByZXBhcmVf Y3J0YyhkYXRhLCBvdXRwdXQsIHBpcGUsIHBsYW5lLCBjb21taXQpOworCQlwcmVwYXJlX2NydGMo ZGF0YSwgb3V0cHV0LCBwaXBlLCBwbGFuZSk7CiAKIAkJZm9yIChpID0gMDsgaSA8IG51bV9yZWN0 YW5nbGVfdHlwZXM7IGkrKykgewogCQkJLyogVW5zdXBwb3J0ZWQgb24gaTkxNSAqLwpAQCAtNDE1 LDcgKzM1Niw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfcGxhbmVfcm90YXRpb24oZGF0YV90ICpkYXRh LCBpbnQgcGxhbmVfdHlwZSwgYm9vbCB0ZXN0X2JhZF9mb3JtCiAJCQlpZiAoZGF0YS0+cm90YXRp b24gJiAoSUdUX1JPVEFUSU9OXzkwIHwgSUdUX1JPVEFUSU9OXzI3MCkpCiAJCQkJaWd0X3BsYW5l X3NldF9zaXplKHBsYW5lLCBkYXRhLT5mYi5oZWlnaHQsIGRhdGEtPmZiLndpZHRoKTsKIAotCQkJ cmV0ID0gaWd0X2Rpc3BsYXlfdHJ5X2NvbW1pdDIoZGlzcGxheSwgY29tbWl0KTsKKwkJCXJldCA9 IGlndF9kaXNwbGF5X3RyeV9jb21taXQyKGRpc3BsYXksIENPTU1JVF9BVE9NSUMpOwogCQkJaWYg KHRlc3RfYmFkX2Zvcm1hdCkgewogCQkJCWlndF9hc3NlcnRfZXEocmV0LCAtRUlOVkFMKTsKIAkJ CQljb250aW51ZTsKQEAgLTQ1Niw0MSArMzk3LDI4IEBAIHN0YXRpYyB2b2lkIHRlc3RfcGxhbmVf cm90YXRpb24oZGF0YV90ICpkYXRhLCBpbnQgcGxhbmVfdHlwZSwgYm9vbCB0ZXN0X2JhZF9mb3Jt CiAJCX0KIAogCQl2YWxpZF90ZXN0cysrOwotCQljbGVhbnVwX2NydGMoZGF0YSwgb3V0cHV0LCBw bGFuZSk7CiAJfQogCWlndF9yZXF1aXJlX2YodmFsaWRfdGVzdHMsICJubyB2YWxpZCBjcnRjL2Nv bm5lY3RvciBjb21iaW5hdGlvbnMgZm91bmRcbiIpOwogfQogCiBzdGF0aWMgdm9pZCB0ZXN0X3Bs YW5lX3JvdGF0aW9uX2V4aGF1c3RfZmVuY2VzKGRhdGFfdCAqZGF0YSwKIAkJCQkJICAgICAgIGln dF9vdXRwdXRfdCAqb3V0cHV0LAotCQkJCQkgICAgICAgaW50IHBsYW5lX3R5cGUpCisJCQkJCSAg ICAgICBpZ3RfcGxhbmVfdCAqcGxhbmUpCiB7CiAJaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSA9ICZk YXRhLT5kaXNwbGF5OwogCXVpbnQ2NF90IHRpbGluZyA9IExPQ0FMX0k5MTVfRk9STUFUX01PRF9Z X1RJTEVEOwogCXVpbnQzMl90IGZvcm1hdCA9IERSTV9GT1JNQVRfWFJHQjg4ODg7CiAJaW50IGJw cCA9IGlndF9kcm1fZm9ybWF0X3RvX2JwcChmb3JtYXQpOwotCWVudW0gaWd0X2NvbW1pdF9zdHls ZSBjb21taXQgPSBDT01NSVRfTEVHQUNZOwogCWludCBmZCA9IGRhdGEtPmdmeF9mZDsKLQlpZ3Rf cGxhbmVfdCAqcGxhbmU7CiAJZHJtTW9kZU1vZGVJbmZvICptb2RlOwotCWRhdGFfdCBkYXRhMltN QVhfRkVOQ0VTKzFdID0ge307CisJc3RydWN0IGlndF9mYiBmYltNQVhfRkVOQ0VTKzFdID0ge307 CiAJdW5zaWduZWQgaW50IHN0cmlkZSwgc2l6ZSwgdywgaDsKIAl1aW50MzJfdCBnZW1faGFuZGxl OwogCXVpbnQ2NF90IHRvdGFsX2FwZXJ0dXJlX3NpemUsIHRvdGFsX2Zic19zaXplOwogCWludCBp LCByZXQ7CiAKLQlwbGFuZSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lX3R5cGUob3V0cHV0LCBwbGFu ZV90eXBlKTsKIAlpZ3RfcmVxdWlyZShpZ3RfcGxhbmVfaGFzX3Byb3AocGxhbmUsIElHVF9QTEFO RV9ST1RBVElPTikpOwogCi0JaWYgKHBsYW5lX3R5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFS WSB8fCBwbGFuZV90eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUikKLQkJY29tbWl0ID0gQ09N TUlUX1VOSVZFUlNBTDsKLQotCWlmIChwbGFuZV90eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNP UikKLQkJaWd0X3JlcXVpcmUoZGlzcGxheS0+aGFzX2N1cnNvcl9wbGFuZSk7Ci0KLQlpZiAoZGF0 YS0+ZGlzcGxheS5pc19hdG9taWMpCi0JCWNvbW1pdCA9IENPTU1JVF9BVE9NSUM7Ci0KIAltb2Rl ID0gaWd0X291dHB1dF9nZXRfbW9kZShvdXRwdXQpOwogCXcgPSBtb2RlLT5oZGlzcGxheTsKIAlo ID0gbW9kZS0+dmRpc3BsYXk7CkBAIC01MDksNyArNDM3LDcgQEAgc3RhdGljIHZvaWQgdGVzdF9w bGFuZV9yb3RhdGlvbl9leGhhdXN0X2ZlbmNlcyhkYXRhX3QgKmRhdGEsCiAJaWd0X3JlcXVpcmUo dG90YWxfZmJzX3NpemUgPCB0b3RhbF9hcGVydHVyZV9zaXplICogMC45KTsKIAogCWlndF9wbGFu ZV9zZXRfZmIocGxhbmUsIE5VTEwpOwotCWlndF9kaXNwbGF5X2NvbW1pdChkaXNwbGF5KTsKKwlp Z3RfZGlzcGxheV9jb21taXQyKGRpc3BsYXksIENPTU1JVF9BVE9NSUMpOwogCiAJZm9yIChpID0g MDsgaSA8IE1BWF9GRU5DRVMgKyAxOyBpKyspIHsKIAkJZ2VtX2hhbmRsZSA9IGdlbV9jcmVhdGUo ZmQsIHNpemUpOwpAQCAtNTIyLDIwICs0NTAsMjAgQEAgc3RhdGljIHZvaWQgdGVzdF9wbGFuZV9y b3RhdGlvbl9leGhhdXN0X2ZlbmNlcyhkYXRhX3QgKmRhdGEsCiAJCXJldCA9IChfX2ttc19hZGRm YihmZCwgZ2VtX2hhbmRsZSwgdywgaCwgc3RyaWRlLAogCQkgICAgICAgZm9ybWF0LCB0aWxpbmcs IE5VTEwsCiAJCSAgICAgICBMT0NBTF9EUk1fTU9ERV9GQl9NT0RJRklFUlMsCi0JCSAgICAgICAm ZGF0YTJbaV0uZmIuZmJfaWQpKTsKKwkJICAgICAgICZmYltpXS5mYl9pZCkpOwogCQlpZiAocmV0 KSB7CiAJCQlpZ3Rfd2FybigiZmFpbGVkIHRvIGNyZWF0ZSBmcmFtZWJ1ZmZlclxuIik7CiAJCQln b3RvIGVycl9hbGxvYzsKIAkJfQogCi0JCWRhdGEyW2ldLmZiLndpZHRoID0gdzsKLQkJZGF0YTJb aV0uZmIuaGVpZ2h0ID0gaDsKLQkJZGF0YTJbaV0uZmIuZ2VtX2hhbmRsZSA9IGdlbV9oYW5kbGU7 CisJCWZiW2ldLndpZHRoID0gdzsKKwkJZmJbaV0uaGVpZ2h0ID0gaDsKKwkJZmJbaV0uZ2VtX2hh bmRsZSA9IGdlbV9oYW5kbGU7CiAKLQkJaWd0X3BsYW5lX3NldF9mYihwbGFuZSwgJmRhdGEyW2ld LmZiKTsKKwkJaWd0X3BsYW5lX3NldF9mYihwbGFuZSwgJmZiW2ldKTsKIAkJaWd0X3BsYW5lX3Nl dF9yb3RhdGlvbihwbGFuZSwgSUdUX1JPVEFUSU9OXzApOwogCi0JCXJldCA9IGlndF9kaXNwbGF5 X3RyeV9jb21taXQyKGRpc3BsYXksIGNvbW1pdCk7CisJCWlndF9kaXNwbGF5X2NvbW1pdDIoZGlz cGxheSwgQ09NTUlUX0FUT01JQyk7CiAJCWlmIChyZXQpIHsKIAkJCWlndF93YXJuKCJmYWlsZWQg dG8gY29tbWl0IHVucm90YXRlZCBmYlxuIik7CiAJCQlnb3RvIGVycl9jb21taXQ7CkBAIC01NDQs NyArNDcyLDcgQEAgc3RhdGljIHZvaWQgdGVzdF9wbGFuZV9yb3RhdGlvbl9leGhhdXN0X2ZlbmNl cyhkYXRhX3QgKmRhdGEsCiAJCWlndF9wbGFuZV9zZXRfcm90YXRpb24ocGxhbmUsIElHVF9ST1RB VElPTl85MCk7CiAJCWlndF9wbGFuZV9zZXRfc2l6ZShwbGFuZSwgaCwgdyk7CiAKLQkJaWd0X2Rp c3BsYXlfY29tbWl0MihkaXNwbGF5LCBjb21taXQpOworCQlpZ3RfZGlzcGxheV9jb21taXQyKGRp c3BsYXksIENPTU1JVF9BVE9NSUMpOwogCQlpZiAocmV0KSB7CiAJCQlpZ3Rfd2FybigiZmFpbGVk IHRvIGNvbW1pdCBoYXJkd2FyZSByb3RhdGVkIGZiOiAlaVxuIiwgcmV0KTsKIAkJCWdvdG8gZXJy X2NvbW1pdDsKQEAgLTU1NywxOSArNDg1LDkgQEAgZXJyX2FsbG9jOgogCiAJaS0tOwogZXJyX2Nv bW1pdDoKLQlpZ3RfcGxhbmVfc2V0X2ZiKHBsYW5lLCBOVUxMKTsKLQlpZ3RfcGxhbmVfc2V0X3Jv dGF0aW9uKHBsYW5lLCBJR1RfUk9UQVRJT05fMCk7Ci0KLQlpZiAoY29tbWl0IDwgQ09NTUlUX0FU T01JQykKLQkJaWd0X2Rpc3BsYXlfY29tbWl0MihkaXNwbGF5LCBjb21taXQpOwotCi0JaWd0X291 dHB1dF9zZXRfcGlwZShvdXRwdXQsIFBJUEVfTk9ORSk7Ci0JaWd0X2Rpc3BsYXlfY29tbWl0Mihk aXNwbGF5LCBkaXNwbGF5LT5pc19hdG9taWMgPyBDT01NSVRfQVRPTUlDIDogQ09NTUlUX0xFR0FD WSk7Ci0KIAlmb3IgKDsgaSA+PSAwOyBpLS0pCi0JCWlndF9yZW1vdmVfZmIoZmQsICZkYXRhMltp XS5mYik7CisJCWlndF9yZW1vdmVfZmIoZmQsICZmYltpXSk7CiAKLQlrbXN0ZXN0X3Jlc3RvcmVf dnRfbW9kZSgpOwogCWlndF9hc3NlcnRfZXEocmV0LCAwKTsKIH0KIApAQCAtNzI2LDkgKzY0NCwx MCBAQCBpZ3RfbWFpbgogCQlpZ3RfcmVxdWlyZShnZW4gPj0gOSk7CiAKIAkJZm9yX2VhY2hfcGlw ZV93aXRoX3ZhbGlkX291dHB1dCgmZGF0YS5kaXNwbGF5LCBwaXBlLCBvdXRwdXQpIHsKLQkJCWln dF9vdXRwdXRfc2V0X3BpcGUob3V0cHV0LCBwaXBlKTsKKwkJCWlndF9wbGFuZV90ICpwcmltYXJ5 ID0gJmRhdGEuZGlzcGxheS5waXBlc1twaXBlXS5wbGFuZXNbMF07CisJCQlwcmVwYXJlX2NydGMo JmRhdGEsIG91dHB1dCwgcGlwZSwgcHJpbWFyeSk7CiAKLQkJCXRlc3RfcGxhbmVfcm90YXRpb25f ZXhoYXVzdF9mZW5jZXMoJmRhdGEsIG91dHB1dCwgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSk7CisJ CQl0ZXN0X3BsYW5lX3JvdGF0aW9uX2V4aGF1c3RfZmVuY2VzKCZkYXRhLCBvdXRwdXQsIHByaW1h cnkpOwogCiAJCQl2YWxpZF90ZXN0cysrOwogCQkJYnJlYWs7Ci0tIAoyLjE1LjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBs aXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldgo=