From: Chris Wilson Subject: [PATCH igt 06/24] igt/gem_exec_schedule: Basic tests for preemption Date: Mon, 14 Aug 2017 21:18:30 +0100 Message-ID: <20170814201848.28216-6-chris@chris-wilson.co.uk> References: <20170814201848.28216-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id F110D89DBD for ; Mon, 14 Aug 2017 20:19:07 +0000 (UTC) In-Reply-To: <20170814201848.28216-1-chris@chris-wilson.co.uk> 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 V2UgcXVldWUgTiBsb3cgcHJpb3JpdHkgaGFuZ2luZyBiYXRjaGVzIGFjcm9zcyB0aGUgZW5naW5l cwphbmQgY2hlY2sgdGhhdCBvdXQgaGlnaCBwcmlvcml0eSB3cml0ZSBvdmVyIHRha2VzIHRoZW0u CgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K LS0tCiBsaWIvaWd0X2R1bW15bG9hZC5jICAgICAgIHwgIDIwICsrKystLQogbGliL2lndF9kdW1t eWxvYWQuaCAgICAgICB8ICAxMCArKy0KIHRlc3RzL2dlbV9idXN5LmMgICAgICAgICAgfCAgIDQg Ky0KIHRlc3RzL2dlbV9leGVjX2ZlbmNlLmMgICAgfCAgIDIgKy0KIHRlc3RzL2dlbV9leGVjX3Jl bG9jLmMgICAgfCAgIDYgKy0KIHRlc3RzL2dlbV9leGVjX3NjaGVkdWxlLmMgfCAxNTYgKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogdGVzdHMvZ2VtX3Nocmlu ay5jICAgICAgICB8ICAgNCArLQogdGVzdHMvZ2VtX3NwaW5fYmF0Y2guYyAgICB8ICAgNCArLQog dGVzdHMvZ2VtX3dhaXQuYyAgICAgICAgICB8ICAgMiArLQogdGVzdHMva21zX2J1c3kuYyAgICAg ICAgICB8ICAgOCArKy0KIHRlc3RzL2ttc19mbGlwLmMgICAgICAgICAgfCAgIDQgKy0KIHRlc3Rz L3BtX3Jwcy5jICAgICAgICAgICAgfCAgIDIgKy0KIDEyIGZpbGVzIGNoYW5nZWQsIDE5NyBpbnNl cnRpb25zKCspLCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWIvaWd0X2R1bW15bG9h ZC5jIGIvbGliL2lndF9kdW1teWxvYWQuYwppbmRleCAwMGM2YTAzMC4uNWFkMzg2YTUgMTAwNjQ0 Ci0tLSBhL2xpYi9pZ3RfZHVtbXlsb2FkLmMKKysrIGIvbGliL2lndF9kdW1teWxvYWQuYwpAQCAt NDYsNiArNDYsOCBAQAogCiAjZGVmaW5lIEVOR0lORV9NQVNLICAoSTkxNV9FWEVDX1JJTkdfTUFT SyB8IExPQ0FMX0k5MTVfRVhFQ19CU0RfTUFTSykKIAorI2RlZmluZSBNSV9BUkJfQ0hLICgweDUg PDwgMjMpCisKIHN0YXRpYyBjb25zdCBpbnQgQkFUQ0hfU0laRSA9IDQwOTY7CiBzdGF0aWMgSUdU X0xJU1Qoc3Bpbl9saXN0KTsKIApAQCAtNjEsNyArNjMsOCBAQCBmaWxsX3JlbG9jKHN0cnVjdCBk cm1faTkxNV9nZW1fcmVsb2NhdGlvbl9lbnRyeSAqcmVsb2MsCiB9CiAKIHN0YXRpYyB2b2lkIGVt aXRfcmVjdXJzaXZlX2JhdGNoKGlndF9zcGluX3QgKnNwaW4sCi0JCQkJIGludCBmZCwgaW50IGVu Z2luZSwgdW5zaWduZWQgaW50IGRlcCkKKwkJCQkgaW50IGZkLCB1aW50MzJfdCBjdHgsIHVuc2ln bmVkIGVuZ2luZSwKKwkJCQkgdWludDMyX3QgZGVwKQogewogI2RlZmluZSBTQ1JBVENIIDAKICNk ZWZpbmUgQkFUQ0ggMQpAQCAtMTEyLDkgKzExNSwxMyBAQCBzdGF0aWMgdm9pZCBlbWl0X3JlY3Vy c2l2ZV9iYXRjaChpZ3Rfc3Bpbl90ICpzcGluLAogCXNwaW4tPmJhdGNoID0gYmF0Y2g7CiAJc3Bp bi0+aGFuZGxlID0gb2JqW0JBVENIXS5oYW5kbGU7CiAKKwkvKiBBbGxvdyBvdXJzZWx2ZXMgdG8g YmUgcHJlZW1wdGVkICovCisJKmJhdGNoKysgPSBNSV9BUkJfQ0hLOworCiAJLyogcmVjdXJzZSAq LwogCWZpbGxfcmVsb2MoJnJlbG9jc1tvYmpbQkFUQ0hdLnJlbG9jYXRpb25fY291bnRdLAotCQkg ICBvYmpbQkFUQ0hdLmhhbmRsZSwgMSwgSTkxNV9HRU1fRE9NQUlOX0NPTU1BTkQsIDApOworCQkg ICBvYmpbQkFUQ0hdLmhhbmRsZSwgKGJhdGNoIC0gc3Bpbi0+YmF0Y2gpICsgMSwKKwkJICAgSTkx NV9HRU1fRE9NQUlOX0NPTU1BTkQsIDApOwogCWlmIChnZW4gPj0gOCkgewogCQkqYmF0Y2grKyA9 IE1JX0JBVENIX0JVRkZFUl9TVEFSVCB8IDEgPDwgOCB8IDE7CiAJCSpiYXRjaCsrID0gMDsKQEAg LTEzNSw2ICsxNDIsNyBAQCBzdGF0aWMgdm9pZCBlbWl0X3JlY3Vyc2l2ZV9iYXRjaChpZ3Rfc3Bp bl90ICpzcGluLAogCW9ialtCQVRDSF0ucmVsb2NzX3B0ciA9IHRvX3VzZXJfcG9pbnRlcihyZWxv Y3MpOwogCiAJZXhlY2J1Zi5idWZmZXJzX3B0ciA9IHRvX3VzZXJfcG9pbnRlcihvYmogKyAoMiAt IGV4ZWNidWYuYnVmZmVyX2NvdW50KSk7CisJZXhlY2J1Zi5yc3ZkMSA9IGN0eDsKIAogCWZvciAo aSA9IDA7IGkgPCBuZW5naW5lOyBpKyspIHsKIAkJZXhlY2J1Zi5mbGFncyAmPSB+RU5HSU5FX01B U0s7CkBAIC0xNDQsMTQgKzE1MiwxNCBAQCBzdGF0aWMgdm9pZCBlbWl0X3JlY3Vyc2l2ZV9iYXRj aChpZ3Rfc3Bpbl90ICpzcGluLAogfQogCiBpZ3Rfc3Bpbl90ICoKLV9faWd0X3NwaW5fYmF0Y2hf bmV3KGludCBmZCwgaW50IGVuZ2luZSwgdW5zaWduZWQgaW50IGRlcCkKK19faWd0X3NwaW5fYmF0 Y2hfbmV3KGludCBmZCwgdWludDMyX3QgY3R4LCB1bnNpZ25lZCBlbmdpbmUsIHVpbnQzMl90IGRl cCkKIHsKIAlpZ3Rfc3Bpbl90ICpzcGluOwogCiAJc3BpbiA9IGNhbGxvYygxLCBzaXplb2Yoc3Ry dWN0IGlndF9zcGluKSk7CiAJaWd0X2Fzc2VydChzcGluKTsKIAotCWVtaXRfcmVjdXJzaXZlX2Jh dGNoKHNwaW4sIGZkLCBlbmdpbmUsIGRlcCk7CisJZW1pdF9yZWN1cnNpdmVfYmF0Y2goc3Bpbiwg ZmQsIGN0eCwgZW5naW5lLCBkZXApOwogCWlndF9hc3NlcnQoZ2VtX2JvX2J1c3koZmQsIHNwaW4t PmhhbmRsZSkpOwogCiAJaWd0X2xpc3RfYWRkKCZzcGluLT5saW5rLCAmc3Bpbl9saXN0KTsKQEAg LTE3NSwxMSArMTgzLDExIEBAIF9faWd0X3NwaW5fYmF0Y2hfbmV3KGludCBmZCwgaW50IGVuZ2lu ZSwgdW5zaWduZWQgaW50IGRlcCkKICAqIFN0cnVjdHVyZSB3aXRoIGhlbHBlciBpbnRlcm5hbCBz dGF0ZSBmb3IgaWd0X3NwaW5fYmF0Y2hfZnJlZSgpLgogICovCiBpZ3Rfc3Bpbl90ICoKLWlndF9z cGluX2JhdGNoX25ldyhpbnQgZmQsIGludCBlbmdpbmUsIHVuc2lnbmVkIGludCBkZXApCitpZ3Rf c3Bpbl9iYXRjaF9uZXcoaW50IGZkLCB1aW50MzJfdCBjdHgsIHVuc2lnbmVkIGVuZ2luZSwgdWlu dDMyX3QgZGVwKQogewogCWlndF9yZXF1aXJlX2dlbShmZCk7CiAKLQlyZXR1cm4gX19pZ3Rfc3Bp bl9iYXRjaF9uZXcoZmQsIGVuZ2luZSwgZGVwKTsKKwlyZXR1cm4gX19pZ3Rfc3Bpbl9iYXRjaF9u ZXcoZmQsIGN0eCwgZW5naW5lLCBkZXApOwogfQogCiBzdGF0aWMgdm9pZCBub3RpZnkodW5pb24g c2lndmFsIGFyZykKZGlmZiAtLWdpdCBhL2xpYi9pZ3RfZHVtbXlsb2FkLmggYi9saWIvaWd0X2R1 bW15bG9hZC5oCmluZGV4IDM0MGNhZGEwLi4yMTU0MjVmNyAxMDA2NDQKLS0tIGEvbGliL2lndF9k dW1teWxvYWQuaAorKysgYi9saWIvaWd0X2R1bW15bG9hZC5oCkBAIC0zNyw4ICszNywxNCBAQCB0 eXBlZGVmIHN0cnVjdCBpZ3Rfc3BpbiB7CiAJdWludDMyX3QgKmJhdGNoOwogfSBpZ3Rfc3Bpbl90 OwogCi1pZ3Rfc3Bpbl90ICpfX2lndF9zcGluX2JhdGNoX25ldyhpbnQgZmQsIGludCBlbmdpbmUs IHVuc2lnbmVkIGludCBkZXApOwotaWd0X3NwaW5fdCAqaWd0X3NwaW5fYmF0Y2hfbmV3KGludCBm ZCwgaW50IGVuZ2luZSwgdW5zaWduZWQgaW50IGRlcCk7CitpZ3Rfc3Bpbl90ICpfX2lndF9zcGlu X2JhdGNoX25ldyhpbnQgZmQsCisJCQkJIHVpbnQzMl90IGN0eCwKKwkJCQkgdW5zaWduZWQgZW5n aW5lLAorCQkJCSB1aW50MzJfdCAgZGVwKTsKK2lndF9zcGluX3QgKmlndF9zcGluX2JhdGNoX25l dyhpbnQgZmQsCisJCQkgICAgICAgdWludDMyX3QgY3R4LAorCQkJICAgICAgIHVuc2lnbmVkIGVu Z2luZSwKKwkJCSAgICAgICB1aW50MzJfdCAgZGVwKTsKIHZvaWQgaWd0X3NwaW5fYmF0Y2hfc2V0 X3RpbWVvdXQoaWd0X3NwaW5fdCAqc3BpbiwgaW50NjRfdCBucyk7CiB2b2lkIGlndF9zcGluX2Jh dGNoX2VuZChpZ3Rfc3Bpbl90ICpzcGluKTsKIHZvaWQgaWd0X3NwaW5fYmF0Y2hfZnJlZShpbnQg ZmQsIGlndF9zcGluX3QgKnNwaW4pOwpkaWZmIC0tZ2l0IGEvdGVzdHMvZ2VtX2J1c3kuYyBiL3Rl c3RzL2dlbV9idXN5LmMKaW5kZXggODcwMmRkN2UuLjU4YWE1ZWU1IDEwMDY0NAotLS0gYS90ZXN0 cy9nZW1fYnVzeS5jCisrKyBiL3Rlc3RzL2dlbV9idXN5LmMKQEAgLTQ2MCw3ICs0NjAsNyBAQCBz dGF0aWMgYm9vbCBoYXNfc2VtYXBob3JlcyhpbnQgZmQpCiAKIHN0YXRpYyBib29sIGhhc19leHRl bmRlZF9idXN5X2lvY3RsKGludCBmZCkKIHsKLQlpZ3Rfc3Bpbl90ICpzcGluID0gaWd0X3NwaW5f YmF0Y2hfbmV3KGZkLCBJOTE1X0VYRUNfUkVOREVSLCAwKTsKKwlpZ3Rfc3Bpbl90ICpzcGluID0g aWd0X3NwaW5fYmF0Y2hfbmV3KGZkLCAwLCBJOTE1X0VYRUNfUkVOREVSLCAwKTsKIAl1aW50MzJf dCByZWFkLCB3cml0ZTsKIAogCV9fZ2VtX2J1c3koZmQsIHNwaW4tPmhhbmRsZSwgJnJlYWQsICZ3 cml0ZSk7CkBAIC00NzEsNyArNDcxLDcgQEAgc3RhdGljIGJvb2wgaGFzX2V4dGVuZGVkX2J1c3lf aW9jdGwoaW50IGZkKQogCiBzdGF0aWMgdm9pZCBiYXNpYyhpbnQgZmQsIHVuc2lnbmVkIHJpbmcs IHVuc2lnbmVkIGZsYWdzKQogewotCWlndF9zcGluX3QgKnNwaW4gPSBpZ3Rfc3Bpbl9iYXRjaF9u ZXcoZmQsIHJpbmcsIDApOworCWlndF9zcGluX3QgKnNwaW4gPSBpZ3Rfc3Bpbl9iYXRjaF9uZXco ZmQsIDAsIHJpbmcsIDApOwogCXN0cnVjdCB0aW1lc3BlYyB0djsKIAlpbnQgdGltZW91dDsKIAli b29sIGJ1c3k7CmRpZmYgLS1naXQgYS90ZXN0cy9nZW1fZXhlY19mZW5jZS5jIGIvdGVzdHMvZ2Vt X2V4ZWNfZmVuY2UuYwppbmRleCA3NmQ5YTdlYS4uN2E4NmMzNzkgMTAwNjQ0Ci0tLSBhL3Rlc3Rz L2dlbV9leGVjX2ZlbmNlLmMKKysrIGIvdGVzdHMvZ2VtX2V4ZWNfZmVuY2UuYwpAQCAtNDM4LDcg KzQzOCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RfcGFyYWxsZWwoaW50IGZkLCB1bnNpZ25lZCBpbnQg bWFzdGVyKQogCS8qIEZpbGwgdGhlIHF1ZXVlIHdpdGggbWFueSByZXF1ZXN0cyBzbyB0aGF0IHRo ZSBuZXh0IG9uZSBoYXMgdG8KIAkgKiB3YWl0IGJlZm9yZSBpdCBjYW4gYmUgZXhlY3V0ZWQgYnkg dGhlIGhhcmR3YXJlLgogCSAqLwotCXNwaW4gPSBpZ3Rfc3Bpbl9iYXRjaF9uZXcoZmQsIG1hc3Rl ciwgYy5oYW5kbGUpOworCXNwaW4gPSBpZ3Rfc3Bpbl9iYXRjaF9uZXcoZmQsIDAsIG1hc3Rlciwg Yy5oYW5kbGUpOwogCXJlc3VibWl0KGZkLCBzcGluLT5oYW5kbGUsIG1hc3RlciwgMTYpOwogCiAJ LyogTm93IHF1ZXVlIHRoZSBtYXN0ZXIgcmVxdWVzdCBhbmQgaXRzIHNlY29uZGFyaWVzICovCmRp ZmYgLS1naXQgYS90ZXN0cy9nZW1fZXhlY19yZWxvYy5jIGIvdGVzdHMvZ2VtX2V4ZWNfcmVsb2Mu YwppbmRleCBlZGJjMGYxMy4uNDMyYTQyYTkgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2dlbV9leGVjX3Jl bG9jLmMKKysrIGIvdGVzdHMvZ2VtX2V4ZWNfcmVsb2MuYwpAQCAtMzg4LDcgKzM4OCw3IEBAIHN0 YXRpYyB2b2lkIGJhc2ljX3JlbG9jKGludCBmZCwgdW5zaWduZWQgYmVmb3JlLCB1bnNpZ25lZCBh ZnRlciwgdW5zaWduZWQgZmxhZ3MpCiAJCX0KIAogCQlpZiAoZmxhZ3MgJiBBQ1RJVkUpIHsKLQkJ CXNwaW4gPSBpZ3Rfc3Bpbl9iYXRjaF9uZXcoZmQsIEk5MTVfRVhFQ19ERUZBVUxULCBvYmouaGFu ZGxlKTsKKwkJCXNwaW4gPSBpZ3Rfc3Bpbl9iYXRjaF9uZXcoZmQsIDAsIEk5MTVfRVhFQ19ERUZB VUxULCBvYmouaGFuZGxlKTsKIAkJCWlmICghKGZsYWdzICYgSEFORykpCiAJCQkJaWd0X3NwaW5f YmF0Y2hfc2V0X3RpbWVvdXQoc3BpbiwgTlNFQ19QRVJfU0VDLzEwMCk7CiAJCQlpZ3RfYXNzZXJ0 KGdlbV9ib19idXN5KGZkLCBvYmouaGFuZGxlKSk7CkBAIC00NTQsNyArNDU0LDcgQEAgc3RhdGlj IHZvaWQgYmFzaWNfcmVsb2MoaW50IGZkLCB1bnNpZ25lZCBiZWZvcmUsIHVuc2lnbmVkIGFmdGVy LCB1bnNpZ25lZCBmbGFncykKIAkJfQogCiAJCWlmIChmbGFncyAmIEFDVElWRSkgewotCQkJc3Bp biA9IGlndF9zcGluX2JhdGNoX25ldyhmZCwgSTkxNV9FWEVDX0RFRkFVTFQsIG9iai5oYW5kbGUp OworCQkJc3BpbiA9IGlndF9zcGluX2JhdGNoX25ldyhmZCwgMCwgSTkxNV9FWEVDX0RFRkFVTFQs IG9iai5oYW5kbGUpOwogCQkJaWYgKCEoZmxhZ3MgJiBIQU5HKSkKIAkJCQlpZ3Rfc3Bpbl9iYXRj aF9zZXRfdGltZW91dChzcGluLCBOU0VDX1BFUl9TRUMvMTAwKTsKIAkJCWlndF9hc3NlcnQoZ2Vt X2JvX2J1c3koZmQsIG9iai5oYW5kbGUpKTsKQEAgLTU4MSw3ICs1ODEsNyBAQCBzdGF0aWMgdm9p ZCBiYXNpY19yYW5nZShpbnQgZmQsIHVuc2lnbmVkIGZsYWdzKQogCWV4ZWNidWYuYnVmZmVyX2Nv dW50ID0gbiArIDE7CiAKIAlpZiAoZmxhZ3MgJiBBQ1RJVkUpIHsKLQkJc3BpbiA9IGlndF9zcGlu X2JhdGNoX25ldyhmZCwgMCwgb2JqW25dLmhhbmRsZSk7CisJCXNwaW4gPSBpZ3Rfc3Bpbl9iYXRj aF9uZXcoZmQsIDAsIDAsIG9ialtuXS5oYW5kbGUpOwogCQlpZiAoIShmbGFncyAmIEhBTkcpKQog CQkJaWd0X3NwaW5fYmF0Y2hfc2V0X3RpbWVvdXQoc3BpbiwgTlNFQ19QRVJfU0VDLzEwMCk7CiAJ CWlndF9hc3NlcnQoZ2VtX2JvX2J1c3koZmQsIG9ialtuXS5oYW5kbGUpKTsKZGlmZiAtLWdpdCBh L3Rlc3RzL2dlbV9leGVjX3NjaGVkdWxlLmMgYi90ZXN0cy9nZW1fZXhlY19zY2hlZHVsZS5jCmlu ZGV4IDFmNWVkODJiLi42MzRmOGQxYSAxMDA2NDQKLS0tIGEvdGVzdHMvZ2VtX2V4ZWNfc2NoZWR1 bGUuYworKysgYi90ZXN0cy9nZW1fZXhlY19zY2hlZHVsZS5jCkBAIC0zNzMsNiArMzczLDE1MyBA QCBzdGF0aWMgdm9pZCBwcm9tb3Rpb24oaW50IGZkLCB1bnNpZ25lZCByaW5nKQogCW11bm1hcChw dHIsIDQwOTYpOwogfQogCitzdGF0aWMgdm9pZCBwcmVlbXB0KGludCBmZCwgdW5zaWduZWQgcmlu ZykKK3sKKwl1aW50MzJfdCByZXN1bHQgPSBnZW1fY3JlYXRlKGZkLCA0MDk2KTsKKwl1aW50MzJf dCAqcHRyID0gZ2VtX21tYXBfX2d0dChmZCwgcmVzdWx0LCA0MDk2LCBQUk9UX1JFQUQpOworCWln dF9zcGluX3QgKnNwaW5bMTZdOworCXVpbnQzMl90IGN0eFsyXTsKKworCWN0eFtMT10gPSBnZW1f Y29udGV4dF9jcmVhdGUoZmQpOworCWN0eF9zZXRfcHJpb3JpdHkoZmQsIGN0eFtMT10sIC1NQVhf UFJJTyk7CisKKwljdHhbSEldID0gZ2VtX2NvbnRleHRfY3JlYXRlKGZkKTsKKwljdHhfc2V0X3By aW9yaXR5KGZkLCBjdHhbSEldLCBNQVhfUFJJTyk7CisKKwlmb3IgKGludCBuID0gMDsgbiA8IDE2 OyBuKyspIHsKKwkJc3BpbltuXSA9IGlndF9zcGluX2JhdGNoX25ldyhmZCwgY3R4W0xPXSwgcmlu ZywgMCk7CisJCWlndF9kZWJ1Zygic3BpblslZF0uaGFuZGxlPSVkXG4iLCBuLCBzcGluW25dLT5o YW5kbGUpOworCisJCXN0b3JlX2R3b3JkKGZkLCBjdHhbSEldLCByaW5nLCByZXN1bHQsIDAsIG4g KyAxLCAwLCBJOTE1X0dFTV9ET01BSU5fUkVOREVSKTsKKworCQlnZW1fc2V0X2RvbWFpbihmZCwg cmVzdWx0LCBJOTE1X0dFTV9ET01BSU5fR1RULCAwKTsKKwkJaWd0X2Fzc2VydF9lcV91MzIocHRy WzBdLCBuICsgMSk7CisJCWlndF9hc3NlcnQoZ2VtX2JvX2J1c3koZmQsIHNwaW5bMF0tPmhhbmRs ZSkpOworCX0KKworCWZvciAoaW50IG4gPSAwOyBuIDwgMTY7IG4rKykKKwkJaWd0X3NwaW5fYmF0 Y2hfZnJlZShmZCwgc3BpbltuXSk7CisKKwlnZW1fY29udGV4dF9kZXN0cm95KGZkLCBjdHhbTE9d KTsKKwlnZW1fY29udGV4dF9kZXN0cm95KGZkLCBjdHhbSEldKTsKKworCW11bm1hcChwdHIsIDQw OTYpOworCWdlbV9jbG9zZShmZCwgcmVzdWx0KTsKK30KKworc3RhdGljIHZvaWQgcHJlZW1wdF9v dGhlcihpbnQgZmQsIHVuc2lnbmVkIHJpbmcpCit7CisJdWludDMyX3QgcmVzdWx0ID0gZ2VtX2Ny ZWF0ZShmZCwgNDA5Nik7CisJdWludDMyX3QgKnB0ciA9IGdlbV9tbWFwX19ndHQoZmQsIHJlc3Vs dCwgNDA5NiwgUFJPVF9SRUFEKTsKKwlpZ3Rfc3Bpbl90ICpzcGluWzE2XTsKKwl1bnNpZ25lZCBp bnQgb3RoZXI7CisJdW5zaWduZWQgaW50IG4sIGk7CisJdWludDMyX3QgY3R4WzNdOworCisJLyog T24gZWFjaCBlbmdpbmUsIGluc2VydAorCSAqIFtOT0lTRV0gc3Bpbm5lciwKKwkgKiBbTE9XXSB3 cml0ZQorCSAqCisJICogVGhlbiBvbiBvdXIgdGFyZ2V0IGVuZ2luZSBkbyBhIFtISUdIXSB3cml0 ZSB3aGljaCBzaG91bGQgdGhlbgorCSAqIHByb21wdCBpdHMgZGVwZW5kZW50IExPVyB3cml0ZXMg aW4gZnJvbnQgb2YgdGhlIHNwaW5uZXIgb24KKwkgKiBlYWNoIGVuZ2luZS4gVGhlIHB1cnBvc2Ug b2YgdGhpcyB0ZXN0IGlzIHRvIGNoZWNrIHRoYXQgcHJlZW1wdGlvbgorCSAqIGNhbiBjcm9zcyBl bmdpbmVzLgorCSAqLworCisJY3R4W0xPXSA9IGdlbV9jb250ZXh0X2NyZWF0ZShmZCk7CisJY3R4 X3NldF9wcmlvcml0eShmZCwgY3R4W0xPXSwgLU1BWF9QUklPKTsKKworCWN0eFtOT0lTRV0gPSBn ZW1fY29udGV4dF9jcmVhdGUoZmQpOworCisJY3R4W0hJXSA9IGdlbV9jb250ZXh0X2NyZWF0ZShm ZCk7CisJY3R4X3NldF9wcmlvcml0eShmZCwgY3R4W0hJXSwgTUFYX1BSSU8pOworCisJbiA9IDA7 CisJZm9yX2VhY2hfZW5naW5lKGZkLCBvdGhlcikgeworCQlzcGluW25dID0gaWd0X3NwaW5fYmF0 Y2hfbmV3KGZkLCBjdHhbTk9JU0VdLCBvdGhlciwgMCk7CisJCXN0b3JlX2R3b3JkKGZkLCBjdHhb TE9dLCBvdGhlciwKKwkJCSAgICByZXN1bHQsIChuICsgMSkqc2l6ZW9mKHVpbnQzMl90KSwgbiAr IDEsCisJCQkgICAgMCwgSTkxNV9HRU1fRE9NQUlOX1JFTkRFUik7CisJCW4rKzsKKwl9CisJc3Rv cmVfZHdvcmQoZmQsIGN0eFtISV0sIHJpbmcsCisJCSAgICByZXN1bHQsIChuICsgMSkqc2l6ZW9m KHVpbnQzMl90KSwgbiArIDEsCisJCSAgICAwLCBJOTE1X0dFTV9ET01BSU5fUkVOREVSKTsKKwor CWdlbV9zZXRfZG9tYWluKGZkLCByZXN1bHQsIEk5MTVfR0VNX0RPTUFJTl9HVFQsIDApOworCisJ Zm9yIChpID0gMDsgaSA8IG47IGkrKykgeworCQlpZ3RfYXNzZXJ0KGdlbV9ib19idXN5KGZkLCBz cGluW2ldLT5oYW5kbGUpKTsKKwkJaWd0X3NwaW5fYmF0Y2hfZnJlZShmZCwgc3BpbltpXSk7CisJ fQorCisJbisrOworCWZvciAoaSA9IDA7IGkgPD0gbjsgaSsrKQorCQlpZ3RfYXNzZXJ0X2VxX3Uz MihwdHJbaV0sIGkpOworCisJZ2VtX2NvbnRleHRfZGVzdHJveShmZCwgY3R4W0xPXSk7CisJZ2Vt X2NvbnRleHRfZGVzdHJveShmZCwgY3R4W05PSVNFXSk7CisJZ2VtX2NvbnRleHRfZGVzdHJveShm ZCwgY3R4W0hJXSk7CisKKwltdW5tYXAocHRyLCA0MDk2KTsKKwlnZW1fY2xvc2UoZmQsIHJlc3Vs dCk7Cit9CisKK3N0YXRpYyB2b2lkIHByZWVtcHRfc2VsZihpbnQgZmQsIHVuc2lnbmVkIHJpbmcp Cit7CisJdWludDMyX3QgcmVzdWx0ID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7CisJdWludDMyX3Qg KnB0ciA9IGdlbV9tbWFwX19ndHQoZmQsIHJlc3VsdCwgNDA5NiwgUFJPVF9SRUFEKTsKKwlpZ3Rf c3Bpbl90ICpzcGluWzE2XTsKKwl1bnNpZ25lZCBpbnQgb3RoZXI7CisJdW5zaWduZWQgaW50IG4s IGk7CisJdWludDMyX3QgY3R4WzNdOworCisJLyogT24gZWFjaCBlbmdpbmUsIGluc2VydAorCSAq IFtOT0lTRV0gc3Bpbm5lciwKKwkgKiBbc2VsZi9MT1ddIHdyaXRlCisJICoKKwkgKiBUaGVuIG9u IG91ciB0YXJnZXQgZW5naW5lIGRvIGEgW3NlbGYvSElHSF0gd3JpdGUgd2hpY2ggc2hvdWxkIHRo ZW4KKwkgKiBwcm9tcHQgaXRzIGRlcGVuZGVudCBzZWxmL0xPVyB3cml0ZXMgaW4gZnJvbnQgb2Yg dGhlIHNwaW5uZXIgb24KKwkgKiBlYWNoIGVuZ2luZS4gVGhlIHB1cnBvc2Ugb2YgdGhpcyB0ZXN0 IGlzIHRvIGNoZWNrIHRoYXQgcHJlZW1wdGlvbgorCSAqIGNhbiBjcm9zcyBlbmdpbmVzLgorCSAq LworCisJY3R4W05PSVNFXSA9IGdlbV9jb250ZXh0X2NyZWF0ZShmZCk7CisKKwljdHhbSEldID0g Z2VtX2NvbnRleHRfY3JlYXRlKGZkKTsKKworCW4gPSAwOworCWN0eF9zZXRfcHJpb3JpdHkoZmQs IGN0eFtISV0sIC1NQVhfUFJJTyk7CisJZm9yX2VhY2hfZW5naW5lKGZkLCBvdGhlcikgeworCQlz cGluW25dID0gaWd0X3NwaW5fYmF0Y2hfbmV3KGZkLCBjdHhbTk9JU0VdLCBvdGhlciwgMCk7CisJ CXN0b3JlX2R3b3JkKGZkLCBjdHhbSEldLCBvdGhlciwKKwkJCSAgICByZXN1bHQsIChuICsgMSkq c2l6ZW9mKHVpbnQzMl90KSwgbiArIDEsCisJCQkgICAgMCwgSTkxNV9HRU1fRE9NQUlOX1JFTkRF Uik7CisJCW4rKzsKKwl9CisJY3R4X3NldF9wcmlvcml0eShmZCwgY3R4W0hJXSwgTUFYX1BSSU8p OworCXN0b3JlX2R3b3JkKGZkLCBjdHhbSEldLCByaW5nLAorCQkgICAgcmVzdWx0LCAobiArIDEp KnNpemVvZih1aW50MzJfdCksIG4gKyAxLAorCQkgICAgMCwgSTkxNV9HRU1fRE9NQUlOX1JFTkRF Uik7CisKKwlnZW1fc2V0X2RvbWFpbihmZCwgcmVzdWx0LCBJOTE1X0dFTV9ET01BSU5fR1RULCAw KTsKKworCWZvciAoaSA9IDA7IGkgPCBuOyBpKyspIHsKKwkJaWd0X2Fzc2VydChnZW1fYm9fYnVz eShmZCwgc3BpbltpXS0+aGFuZGxlKSk7CisJCWlndF9zcGluX2JhdGNoX2ZyZWUoZmQsIHNwaW5b aV0pOworCX0KKworCW4rKzsKKwlmb3IgKGkgPSAwOyBpIDw9IG47IGkrKykKKwkJaWd0X2Fzc2Vy dF9lcV91MzIocHRyW2ldLCBpKTsKKworCWdlbV9jb250ZXh0X2Rlc3Ryb3koZmQsIGN0eFtOT0lT RV0pOworCWdlbV9jb250ZXh0X2Rlc3Ryb3koZmQsIGN0eFtISV0pOworCisJbXVubWFwKHB0ciwg NDA5Nik7CisJZ2VtX2Nsb3NlKGZkLCByZXN1bHQpOworfQorCiBzdGF0aWMgdm9pZCBkZWVwKGlu dCBmZCwgdW5zaWduZWQgcmluZykKIHsKICNkZWZpbmUgWFMgOApAQCAtNzI2LDYgKzg3MywxNSBA QCBpZ3RfbWFpbgogCQkJCWlndF9zdWJ0ZXN0X2YoInByb21vdGlvbi0lcyIsIGUtPm5hbWUpCiAJ CQkJCXByb21vdGlvbihmZCwgZS0+ZXhlY19pZCB8IGUtPmZsYWdzKTsKIAorCQkJCWlndF9zdWJ0 ZXN0X2YoInByZWVtcHQtJXMiLCBlLT5uYW1lKQorCQkJCQlwcmVlbXB0KGZkLCBlLT5leGVjX2lk IHwgZS0+ZmxhZ3MpOworCisJCQkJaWd0X3N1YnRlc3RfZigicHJlZW1wdC1vdGhlci0lcyIsIGUt Pm5hbWUpCisJCQkJCXByZWVtcHRfb3RoZXIoZmQsIGUtPmV4ZWNfaWQgfCBlLT5mbGFncyk7CisK KwkJCQlpZ3Rfc3VidGVzdF9mKCJwcmVlbXB0LXNlbGYtJXMiLCBlLT5uYW1lKQorCQkJCQlwcmVl bXB0X3NlbGYoZmQsIGUtPmV4ZWNfaWQgfCBlLT5mbGFncyk7CisKIAkJCQlpZ3Rfc3VidGVzdF9m KCJkZWVwLSVzIiwgZS0+bmFtZSkKIAkJCQkJZGVlcChmZCwgZS0+ZXhlY19pZCB8IGUtPmZsYWdz KTsKIApkaWZmIC0tZ2l0IGEvdGVzdHMvZ2VtX3Nocmluay5jIGIvdGVzdHMvZ2VtX3Nocmluay5j CmluZGV4IDhiMDlmYzgwLi4wNmY3YTMwMSAxMDA2NDQKLS0tIGEvdGVzdHMvZ2VtX3Nocmluay5j CisrKyBiL3Rlc3RzL2dlbV9zaHJpbmsuYwpAQCAtMzExLDkgKzMxMSw5IEBAIHN0YXRpYyB2b2lk IHJlY2xhaW0odW5zaWduZWQgZW5naW5lLCBpbnQgdGltZW91dCkKIAkJfSB3aGlsZSAoISpzaGFy ZWQpOwogCX0KIAotCXNwaW4gPSBpZ3Rfc3Bpbl9iYXRjaF9uZXcoZmQsIGVuZ2luZSwgMCk7CisJ c3BpbiA9IGlndF9zcGluX2JhdGNoX25ldyhmZCwgMCwgZW5naW5lLCAwKTsKIAlpZ3RfdW50aWxf dGltZW91dCh0aW1lb3V0KSB7Ci0JCWlndF9zcGluX3QgKm5leHQgPSBfX2lndF9zcGluX2JhdGNo X25ldyhmZCwgZW5naW5lLCAwKTsKKwkJaWd0X3NwaW5fdCAqbmV4dCA9IF9faWd0X3NwaW5fYmF0 Y2hfbmV3KGZkLCAwLCBlbmdpbmUsIDApOwogCiAJCWlndF9zcGluX2JhdGNoX3NldF90aW1lb3V0 KHNwaW4sIHRpbWVvdXRfMTAwbXMpOwogCQlnZW1fc3luYyhmZCwgc3Bpbi0+aGFuZGxlKTsKZGlm ZiAtLWdpdCBhL3Rlc3RzL2dlbV9zcGluX2JhdGNoLmMgYi90ZXN0cy9nZW1fc3Bpbl9iYXRjaC5j CmluZGV4IDk0MWFhMTM5Li4yNGM1ZDliNyAxMDA2NDQKLS0tIGEvdGVzdHMvZ2VtX3NwaW5fYmF0 Y2guYworKysgYi90ZXN0cy9nZW1fc3Bpbl9iYXRjaC5jCkBAIC00MSw5ICs0MSw5IEBAIHN0YXRp YyB2b2lkIHNwaW4oaW50IGZkLCB1bnNpZ25lZCBpbnQgZW5naW5lLCB1bnNpZ25lZCBpbnQgdGlt ZW91dF9zZWMpCiAJc3RydWN0IHRpbWVzcGVjIGl0diA9IHsgfTsKIAl1aW50NjRfdCBlbGFwc2Vk OwogCi0Jc3BpbiA9IGlndF9zcGluX2JhdGNoX25ldyhmZCwgZW5naW5lLCAwKTsKKwlzcGluID0g aWd0X3NwaW5fYmF0Y2hfbmV3KGZkLCAwLCBlbmdpbmUsIDApOwogCXdoaWxlICgoZWxhcHNlZCA9 IGlndF9uc2VjX2VsYXBzZWQoJnR2KSkgPj4gMzAgPCB0aW1lb3V0X3NlYykgewotCQlpZ3Rfc3Bp bl90ICpuZXh0ID0gX19pZ3Rfc3Bpbl9iYXRjaF9uZXcoZmQsIGVuZ2luZSwgMCk7CisJCWlndF9z cGluX3QgKm5leHQgPSBfX2lndF9zcGluX2JhdGNoX25ldyhmZCwgMCwgZW5naW5lLCAwKTsKIAog CQlpZ3Rfc3Bpbl9iYXRjaF9zZXRfdGltZW91dChzcGluLAogCQkJCQkgICB0aW1lb3V0XzEwMG1z IC0gaWd0X25zZWNfZWxhcHNlZCgmaXR2KSk7CmRpZmYgLS1naXQgYS90ZXN0cy9nZW1fd2FpdC5j IGIvdGVzdHMvZ2VtX3dhaXQuYwppbmRleCA1OTE2OTBhZC4uY2Y4YzgxNTQgMTAwNjQ0Ci0tLSBh L3Rlc3RzL2dlbV93YWl0LmMKKysrIGIvdGVzdHMvZ2VtX3dhaXQuYwpAQCAtMTEwLDcgKzExMCw3 IEBAIHN0YXRpYyB2b2lkIHVucGx1ZyhzdHJ1Y3QgY29yayAqYykKIHN0YXRpYyB2b2lkIGJhc2lj KGludCBmZCwgdW5zaWduZWQgZW5naW5lLCB1bnNpZ25lZCBmbGFncykKIHsKIAlzdHJ1Y3QgY29y ayBjb3JrID0gcGx1ZyhmZCwgZmxhZ3MpOwotCWlndF9zcGluX3QgKnNwaW4gPSBpZ3Rfc3Bpbl9i YXRjaF9uZXcoZmQsIGVuZ2luZSwgY29yay5oYW5kbGUpOworCWlndF9zcGluX3QgKnNwaW4gPSBp Z3Rfc3Bpbl9iYXRjaF9uZXcoZmQsIDAsIGVuZ2luZSwgY29yay5oYW5kbGUpOwogCXN0cnVjdCBk cm1faTkxNV9nZW1fd2FpdCB3YWl0ID0gewogCSAgICAgICAJZmxhZ3MgJiBXUklURSA/IGNvcmsu aGFuZGxlIDogc3Bpbi0+aGFuZGxlCiAgICAgICAgCX07CmRpZmYgLS1naXQgYS90ZXN0cy9rbXNf YnVzeS5jIGIvdGVzdHMva21zX2J1c3kuYwppbmRleCBlY2YwYjJlYi4uN2UzMWMyYzggMTAwNjQ0 Ci0tLSBhL3Rlc3RzL2ttc19idXN5LmMKKysrIGIvdGVzdHMva21zX2J1c3kuYwpAQCAtOTEsNyAr OTEsOCBAQCBzdGF0aWMgdm9pZCBmbGlwX3RvX2ZiKGlndF9kaXNwbGF5X3QgKmRweSwgaW50IHBp cGUsCiAJc3RydWN0IHRpbWVzcGVjIHR2ID0geyAxLCAwIH07CiAJc3RydWN0IGRybV9ldmVudF92 YmxhbmsgZXY7CiAKLQlpZ3Rfc3Bpbl90ICp0ID0gaWd0X3NwaW5fYmF0Y2hfbmV3KGRweS0+ZHJt X2ZkLCByaW5nLCBmYi0+Z2VtX2hhbmRsZSk7CisJaWd0X3NwaW5fdCAqdCA9IGlndF9zcGluX2Jh dGNoX25ldyhkcHktPmRybV9mZCwKKwkJCQkJICAgMCwgcmluZywgZmItPmdlbV9oYW5kbGUpOwog CiAJaWYgKG1vZGVzZXQpIHsKIAkJLyoKQEAgLTIwMyw3ICsyMDQsOCBAQCBzdGF0aWMgdm9pZCB0 ZXN0X2ZsaXAoaWd0X2Rpc3BsYXlfdCAqZHB5LCB1bnNpZ25lZCByaW5nLCBpbnQgcGlwZSwgYm9v bCBtb2Rlc2V0KQogc3RhdGljIHZvaWQgdGVzdF9hdG9taWNfY29tbWl0X2hhbmcoaWd0X2Rpc3Bs YXlfdCAqZHB5LCBpZ3RfcGxhbmVfdCAqcHJpbWFyeSwKIAkJCQkgICAgc3RydWN0IGlndF9mYiAq YnVzeV9mYiwgdW5zaWduZWQgcmluZykKIHsKLQlpZ3Rfc3Bpbl90ICp0ID0gaWd0X3NwaW5fYmF0 Y2hfbmV3KGRweS0+ZHJtX2ZkLCByaW5nLCBidXN5X2ZiLT5nZW1faGFuZGxlKTsKKwlpZ3Rfc3Bp bl90ICp0ID0gaWd0X3NwaW5fYmF0Y2hfbmV3KGRweS0+ZHJtX2ZkLAorCQkJCQkgICAwLCByaW5n LCBidXN5X2ZiLT5nZW1faGFuZGxlKTsKIAlzdHJ1Y3QgcG9sbGZkIHBmZCA9IHsgLmZkID0gZHB5 LT5kcm1fZmQsIC5ldmVudHMgPSBQT0xMSU4gfTsKIAl1bnNpZ25lZCBmbGFncyA9IDA7CiAJc3Ry dWN0IGRybV9ldmVudF92YmxhbmsgZXY7CkBAIC0yOTAsNyArMjkyLDcgQEAgc3RhdGljIHZvaWQg dGVzdF9wYWdlZmxpcF9tb2Rlc2V0X2hhbmcoaWd0X2Rpc3BsYXlfdCAqZHB5LAogCiAJaWd0X2Rp c3BsYXlfY29tbWl0MihkcHksIGRweS0+aXNfYXRvbWljID8gQ09NTUlUX0FUT01JQyA6IENPTU1J VF9MRUdBQ1kpOwogCi0JdCA9IGlndF9zcGluX2JhdGNoX25ldyhkcHktPmRybV9mZCwgcmluZywg ZmIuZ2VtX2hhbmRsZSk7CisJdCA9IGlndF9zcGluX2JhdGNoX25ldyhkcHktPmRybV9mZCwgMCwg cmluZywgZmIuZ2VtX2hhbmRsZSk7CiAKIAlkb19vcl9kaWUoZHJtTW9kZVBhZ2VGbGlwKGRweS0+ ZHJtX2ZkLCBkcHktPnBpcGVzW3BpcGVdLmNydGNfaWQsIGZiLmZiX2lkLCBEUk1fTU9ERV9QQUdF X0ZMSVBfRVZFTlQsICZmYikpOwogCmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfZmxpcC5jIGIvdGVz dHMva21zX2ZsaXAuYwppbmRleCBlYTg2MGUxOS4uZDcwMTg4NmUgMTAwNjQ0Ci0tLSBhL3Rlc3Rz L2ttc19mbGlwLmMKKysrIGIvdGVzdHMva21zX2ZsaXAuYwpAQCAtNjk0LDExICs2OTQsMTEgQEAg c3RhdGljIHVuc2lnbmVkIGludCBydW5fdGVzdF9zdGVwKHN0cnVjdCB0ZXN0X291dHB1dCAqbykK IAkJby0+Y3VycmVudF9mYl9pZCA9ICFvLT5jdXJyZW50X2ZiX2lkOwogCiAJaWYgKG8tPmZsYWdz ICYgVEVTVF9XSVRIX0RVTU1ZX0JDUykKLQkJc3Bpbl9iY3MgPSBpZ3Rfc3Bpbl9iYXRjaF9uZXco ZHJtX2ZkLCBJOTE1X0VYRUNfQkxULAorCQlzcGluX2JjcyA9IGlndF9zcGluX2JhdGNoX25ldyhk cm1fZmQsIDAsIEk5MTVfRVhFQ19CTFQsCiAJCQkJCSAgICAgIG8tPmZiX2luZm9bby0+Y3VycmVu dF9mYl9pZF0uZ2VtX2hhbmRsZSk7CiAKIAlpZiAoby0+ZmxhZ3MgJiBURVNUX1dJVEhfRFVNTVlf UkNTKQotCQlzcGluX3JjcyA9IGlndF9zcGluX2JhdGNoX25ldyhkcm1fZmQsIEk5MTVfRVhFQ19S RU5ERVIsCisJCXNwaW5fcmNzID0gaWd0X3NwaW5fYmF0Y2hfbmV3KGRybV9mZCwgMCwgSTkxNV9F WEVDX1JFTkRFUiwKIAkJCQkJICAgICAgby0+ZmJfaW5mb1tvLT5jdXJyZW50X2ZiX2lkXS5nZW1f aGFuZGxlKTsKIAogCWlmIChvLT5mbGFncyAmIFRFU1RfRkJfUkVDUkVBVEUpCmRpZmYgLS1naXQg YS90ZXN0cy9wbV9ycHMuYyBiL3Rlc3RzL3BtX3Jwcy5jCmluZGV4IGYwNDU1ZTc4Li5jZTAxYzQ2 NiAxMDA2NDQKLS0tIGEvdGVzdHMvcG1fcnBzLmMKKysrIGIvdGVzdHMvcG1fcnBzLmMKQEAgLTU2 Niw3ICs1NjYsNyBAQCBzdGF0aWMgdm9pZCBib29zdF9mcmVxKGludCBmZCwgaW50ICpib29zdF9m cmVxcykKIAlpbnQgcmluZyA9IC0xOwogCWlndF9zcGluX3QgKmxvYWQ7CiAKLQlsb2FkID0gaWd0 X3NwaW5fYmF0Y2hfbmV3KGZkLCByaW5nLCAwKTsKKwlsb2FkID0gaWd0X3NwaW5fYmF0Y2hfbmV3 KGZkLCAwLCByaW5nLCAwKTsKIAogCS8qIFdhaXRpbmcgd2lsbCBncmFudCB1cyBhIGJvb3N0IHRv IG1heGltdW0gKi8KIAlnZW1fd2FpdChmZCwgbG9hZC0+aGFuZGxlLCAmdGltZW91dCk7Ci0tIAoy LjEzLjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=