From: Tom St Denis Subject: [PATCH umr] Improve and fix VM decoding Date: Fri, 28 Jul 2017 13:47:00 -0400 Message-ID: <20170728174700.28731-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Tom St Denis V2Ugbm93IGZpbHRlciB0aGUgb3V0cHV0IG5pY2VseSB0byBub3QgcmVwZWF0IFBERSBlbnRyaWVz CnVubmNlc3NhcmlseS4gIFRoZSBWQSBtYXNrIHdhcyBhbHNvIGZpeGVkIGZvciBBSSBwbGF0Zm9y bXMuCgpTaWduZWQtb2ZmLWJ5OiBUb20gU3QgRGVuaXMgPHRvbS5zdGRlbmlzQGFtZC5jb20+Ci0t LQogc3JjL2FwcC9tYWluLmMgICAgICB8ICAgNiArLS0KIHNyYy9saWIvcmVhZF92cmFtLmMgfCAx MjggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQog MiBmaWxlcyBjaGFuZ2VkLCA3NyBpbnNlcnRpb25zKCspLCA1NyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9zcmMvYXBwL21haW4uYyBiL3NyYy9hcHAvbWFpbi5jCmluZGV4IDAwNjcyN2JhNzk4 MS4uOTIwZjY4MTVlMjIwIDEwMDY0NAotLS0gYS9zcmMvYXBwL21haW4uYworKysgYi9zcmMvYXBw L21haW4uYwpAQCAtMzc0LDExICszNzQsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFy Z3YpCiAJCQkJaWYgKG9wdGlvbnMuaHViX25hbWVbMF0pCiAJCQkJCXZtaWQgfD0gVU1SX1VTRVJf SFVCOwogCi0JCQkJd2hpbGUgKHNpemUtLSkgewotCQkJCQlpZiAodW1yX3JlYWRfdnJhbShhc2lj LCB2bWlkLCBhZGRyZXNzLCAwLCBOVUxMKSkKLQkJCQkJCWJyZWFrOwotCQkJCQlhZGRyZXNzICs9 IDB4MTAwMDsKLQkJCQl9CisJCQkJdW1yX3JlYWRfdnJhbShhc2ljLCB2bWlkLCBhZGRyZXNzLCAw eDEwMDBVTCAqIHNpemUsIE5VTEwpOwogCQkJCWkgKz0gMjsKIAogCQkJCWFzaWMtPm9wdGlvbnMu dmVyYm9zZSA9IG92ZXJib3NlOwpkaWZmIC0tZ2l0IGEvc3JjL2xpYi9yZWFkX3ZyYW0uYyBiL3Ny Yy9saWIvcmVhZF92cmFtLmMKaW5kZXggOTFkNGU3NjU5NzA0Li42ODU2MTc0MjRlNTMgMTAwNjQ0 Ci0tLSBhL3NyYy9saWIvcmVhZF92cmFtLmMKKysrIGIvc3JjL2xpYi9yZWFkX3ZyYW0uYwpAQCAt OTEsNyArOTEsNyBAQCBzdGF0aWMgaW50IHVtcl9yZWFkX3ZyYW1fdmkoc3RydWN0IHVtcl9hc2lj ICphc2ljLCB1aW50MzJfdCB2bWlkLCB1aW50NjRfdCBhZGRyZQogCQkJZnJhZ19zaXplLAogCQkJ cHRlX2Jhc2VfYWRkciwKIAkJCXZhbGlkOwotCX0gcGRlX2ZpZWxkczsKKwl9IHBkZV9maWVsZHMs IHBkZV9jb3B5OwogCXN0cnVjdCB7CiAJCXVpbnQ2NF90CiAJCQlwYWdlX2Jhc2VfYWRkciwKQEAg LTExMCw2ICsxMTAsNyBAQCBzdGF0aWMgaW50IHVtcl9yZWFkX3ZyYW1fdmkoc3RydWN0IHVtcl9h c2ljICphc2ljLCB1aW50MzJfdCB2bWlkLCB1aW50NjRfdCBhZGRyZQogCXVuc2lnbmVkIGNoYXIg KnBkc3QgPSBkc3Q7CiAKIAltZW1zZXQoJnJlZ2lzdGVycywgMCwgc2l6ZW9mIHJlZ2lzdGVycyk7 CisJbWVtc2V0KCZwZGVfY29weSwgMCwgc2l6ZW9mIHBkZV9jb3B5KTsKIAogCS8qCiAJICogUFRF IGZvcm1hdCBvbiBWSToKQEAgLTE4NiwxMiArMTg3LDEzIEBAIHN0YXRpYyBpbnQgdW1yX3JlYWRf dnJhbV92aShzdHJ1Y3QgdW1yX2FzaWMgKmFzaWMsIHVpbnQzMl90IHZtaWQsIHVpbnQ2NF90IGFk ZHJlCiAJCQlwZGVfZmllbGRzLmZyYWdfc2l6ZSAgICAgPSAocGRlX2VudHJ5ID4+IDU5KSAmIDB4 MUY7CiAJCQlwZGVfZmllbGRzLnB0ZV9iYXNlX2FkZHIgPSBwZGVfZW50cnkgJiAweEZGRkZGRkYw MDBVTEw7CiAJCQlwZGVfZmllbGRzLnZhbGlkICAgICAgICAgPSBwZGVfZW50cnkgJiAxOwotCQkJ aWYgKGFzaWMtPm9wdGlvbnMudmVyYm9zZSkKKwkJCWlmIChtZW1jbXAoJnBkZV9jb3B5LCAmcGRl X2ZpZWxkcywgc2l6ZW9mIHBkZV9maWVsZHMpICYmIGFzaWMtPm9wdGlvbnMudmVyYm9zZSkKIAkJ CQlmcHJpbnRmKHN0ZGVyciwgIltWRVJCT1NFXTogUERFPTB4JTAxNmxseCwgVkE9MHglMDEwbGx4 LCBQQkE9PTB4JTAxMGxseCwgVj0lZFxuIiwKIAkJCQkJCSh1bnNpZ25lZCBsb25nIGxvbmcpcGRl X2VudHJ5LAogCQkJCQkJKHVuc2lnbmVkIGxvbmcgbG9uZylhZGRyZXNzICYgcGRlX21hc2ssCiAJ CQkJCQkodW5zaWduZWQgbG9uZyBsb25nKXBkZV9maWVsZHMucHRlX2Jhc2VfYWRkciwKIAkJCQkJ CShpbnQpcGRlX2ZpZWxkcy52YWxpZCk7CisJCQltZW1jcHkoJnBkZV9jb3B5LCAmcGRlX2ZpZWxk cywgc2l6ZW9mIHBkZV9maWVsZHMpOwogCiAJCQlpZiAoIXBkZV9maWVsZHMudmFsaWQpCiAJCQkJ cmV0dXJuIC0xOwpAQCAtMjA2LDcgKzIwOCw3IEBAIHN0YXRpYyBpbnQgdW1yX3JlYWRfdnJhbV92 aShzdHJ1Y3QgdW1yX2FzaWMgKmFzaWMsIHVpbnQzMl90IHZtaWQsIHVpbnQ2NF90IGFkZHJlCiAJ CQlwdGVfZmllbGRzLnN5c3RlbSAgICAgICAgID0gKHB0ZV9lbnRyeSA+PiAxKSAmIDE7CiAJCQlw dGVfZmllbGRzLnZhbGlkICAgICAgICAgID0gcHRlX2VudHJ5ICYgMTsKIAkJCWlmIChhc2ljLT5v cHRpb25zLnZlcmJvc2UpCi0JCQkJZnByaW50ZihzdGRlcnIsICJbVkVSQk9TRV06IFBURT0weCUw MTZsbHgsIFZBPTB4JTAxMGxseCwgUEJBPT0weCUwMTBsbHgsIFY9JWQsIFM9JWRcbiIsCisJCQkJ ZnByaW50ZihzdGRlcnIsICJbVkVSQk9TRV06IFxcLT4gUFRFPTB4JTAxNmxseCwgVkE9MHglMDEw bGx4LCBQQkE9PTB4JTAxMGxseCwgVj0lZCwgUz0lZFxuIiwKIAkJCQkJKHVuc2lnbmVkIGxvbmcg bG9uZylwdGVfZW50cnksCiAJCQkJCSh1bnNpZ25lZCBsb25nIGxvbmcpYWRkcmVzcyAmIHB0ZV9t YXNrLAogCQkJCQkodW5zaWduZWQgbG9uZyBsb25nKXB0ZV9maWVsZHMucGFnZV9iYXNlX2FkZHIs CkBAIC0yNTIsMTkgKzI1NCwyMyBAQCBzdGF0aWMgaW50IHVtcl9yZWFkX3ZyYW1fdmkoc3RydWN0 IHVtcl9hc2ljICphc2ljLCB1aW50MzJfdCB2bWlkLCB1aW50NjRfdCBhZGRyZQogCQkJY2h1bmtf c2l6ZSA9IHNpemU7CiAJCX0KIAkJREVCVUcoIkNvbXB1dGVkIGFkZHJlc3Mgd2Ugd2lsbCByZWFk IGZyb206ICVzOiVsbHggKHJlYWRpbmc6ICVsdSBieXRlcylcbiIsIHB0ZV9maWVsZHMuc3lzdGVt ID8gInN5cyIgOiAidnJhbSIsICh1bnNpZ25lZCBsb25nIGxvbmcpc3RhcnRfYWRkciwgKHVuc2ln bmVkIGxvbmcpY2h1bmtfc2l6ZSk7Ci0JCWlmIChwdGVfZmllbGRzLnN5c3RlbSkgewotCQkJaWYg KHVtcl9yZWFkX3NyYW0oc3RhcnRfYWRkciwgY2h1bmtfc2l6ZSwgcGRzdCkgPCAwKSB7Ci0JCQkJ ZnByaW50ZihzdGRlcnIsICJbRVJST1JdOiBDYW5ub3QgcmVhZCBzeXN0ZW0gcmFtLCBwZXJoYXBz IENPTkZJR19TVFJJQ1RfREVWTUVNIGlzIHNldCBpbiB5b3VyIGtlcm5lbCBjb25maWc/XG4iKTsK LQkJCQlmcHJpbnRmKHN0ZGVyciwgIltFUlJPUl06IEFsdGVybmF0aXZlbHkgZG93bmxvYWQgYW5k IGluc3RhbGwgL2Rldi9mbWVtXG4iKTsKLQkJCQlyZXR1cm4gLTE7Ci0JCQl9Ci0JCX0gZWxzZSB7 Ci0JCQlpZiAodW1yX3JlYWRfdnJhbShhc2ljLCBVTVJfTElORUFSX0hVQiwgc3RhcnRfYWRkciwg Y2h1bmtfc2l6ZSwgcGRzdCkgPCAwKSB7Ci0JCQkJZnByaW50ZihzdGRlcnIsICJbRVJST1JdOiBD YW5ub3QgcmVhZCBmcm9tIFZSQU1cbiIpOwotCQkJCXJldHVybiAtMTsKKworCQkvLyBhbGxvdyBk ZXN0aW5hdGlvbiB0byBiZSBOVUxMIHRvIHNpbXBseSB1c2UgZGVjb2RlcgorCQlpZiAocGRzdCkg eworCQkJaWYgKHB0ZV9maWVsZHMuc3lzdGVtKSB7CisJCQkJaWYgKHVtcl9yZWFkX3NyYW0oc3Rh cnRfYWRkciwgY2h1bmtfc2l6ZSwgcGRzdCkgPCAwKSB7CisJCQkJCWZwcmludGYoc3RkZXJyLCAi W0VSUk9SXTogQ2Fubm90IHJlYWQgc3lzdGVtIHJhbSwgcGVyaGFwcyBDT05GSUdfU1RSSUNUX0RF Vk1FTSBpcyBzZXQgaW4geW91ciBrZXJuZWwgY29uZmlnP1xuIik7CisJCQkJCWZwcmludGYoc3Rk ZXJyLCAiW0VSUk9SXTogQWx0ZXJuYXRpdmVseSBkb3dubG9hZCBhbmQgaW5zdGFsbCAvZGV2L2Zt ZW1cbiIpOworCQkJCQlyZXR1cm4gLTE7CisJCQkJfQorCQkJfSBlbHNlIHsKKwkJCQlpZiAodW1y X3JlYWRfdnJhbShhc2ljLCBVTVJfTElORUFSX0hVQiwgc3RhcnRfYWRkciwgY2h1bmtfc2l6ZSwg cGRzdCkgPCAwKSB7CisJCQkJCWZwcmludGYoc3RkZXJyLCAiW0VSUk9SXTogQ2Fubm90IHJlYWQg ZnJvbSBWUkFNXG4iKTsKKwkJCQkJcmV0dXJuIC0xOworCQkJCX0KIAkJCX0KKwkJCXBkc3QgKz0g Y2h1bmtfc2l6ZTsKIAkJfQotCQlwZHN0ICs9IGNodW5rX3NpemU7CiAJCXNpemUgLT0gY2h1bmtf c2l6ZTsKIAkJYWRkcmVzcyArPSBjaHVua19zaXplOwogCX0gd2hpbGUgKHNpemUpOwpAQCAtMjc4 LDcgKzI4NCw3IEBAIHN0YXRpYyBpbnQgdW1yX3JlYWRfdnJhbV9haShzdHJ1Y3QgdW1yX2FzaWMg KmFzaWMsIHVpbnQzMl90IHZtaWQsIHVpbnQ2NF90IGFkZHJlCiAJCSBwZGVfYWRkcmVzcywgdmdh X2Jhc2VfYWRkcmVzcywgdm1fZmJfb2Zmc2V0LCB2bV9mYl9iYXNlLAogCQkgdmFfbWFzazsKIAl1 aW50MzJfdCBjaHVua19zaXplLCB0bXA7Ci0JaW50IHBhZ2VfdGFibGVfZGVwdGgsIGZpcnN0LCBk ZXB0aCwgaW5kZW50OworCWludCBwZGVfY250LCBjdXJyZW50X2RlcHRoLCBwYWdlX3RhYmxlX2Rl cHRoLCBmaXJzdDsKIAlzdHJ1Y3QgewogCQl1aW50MzJfdAogCQkJbW1WTV9DT05URVhUeF9QQUdF X1RBQkxFX1NUQVJUX0FERFJfTE8zMiwKQEAgLTI5OCw3ICszMDQsNyBAQCBzdGF0aWMgaW50IHVt cl9yZWFkX3ZyYW1fYWkoc3RydWN0IHVtcl9hc2ljICphc2ljLCB1aW50MzJfdCB2bWlkLCB1aW50 NjRfdCBhZGRyZQogCQkJc3lzdGVtLAogCQkJY2FjaGUsCiAJCQlwdGU7Ci0JfSBwZGVfZmllbGRz OworCX0gcGRlX2ZpZWxkcywgcGRlX2FycmF5WzhdOwogCXN0cnVjdCB7CiAJCXVpbnQ2NF90CiAJ CQlwYWdlX2Jhc2VfYWRkciwKQEAgLTMxMCw4ICszMTYsMTAgQEAgc3RhdGljIGludCB1bXJfcmVh ZF92cmFtX2FpKHN0cnVjdCB1bXJfYXNpYyAqYXNpYywgdWludDMyX3Qgdm1pZCwgdWludDY0X3Qg YWRkcmUKIAl1bnNpZ25lZCBjaGFyICpwZHN0ID0gZHN0OwogCWNoYXIgKmh1YjsKIAl1bnNpZ25l ZCBodWJpZDsKKwlzdGF0aWMgY29uc3QgY2hhciAqaW5kZW50YXRpb24gPSAiICAgICAgICAgICAg XFwtPiI7CiAKIAltZW1zZXQoJnJlZ2lzdGVycywgMCwgc2l6ZW9mIHJlZ2lzdGVycyk7CisJbWVt c2V0KCZwZGVfYXJyYXksIDAsIHNpemVvZiBwZGVfYXJyYXkpOwogCiAJLyoKIAkgKiBQVEUgZm9y bWF0IG9uIEFJOgpAQCAtNDEzLDExICs0MjEsMTIgQEAgc3RhdGljIGludCB1bXJfcmVhZF92cmFt X2FpKHN0cnVjdCB1bXJfYXNpYyAqYXNpYywgdWludDMyX3Qgdm1pZCwgdWludDY0X3QgYWRkcmUK IAlERUJVRygiXG4iKTsKIAogCS8vIHRyYW5zZm9ybSBwYWdlX3RhYmxlX2Jhc2UKLQlwZGVfZW50 cnkgPSBwYWdlX3RhYmxlX2Jhc2VfYWRkcjsKIAlwYWdlX3RhYmxlX2Jhc2VfYWRkciAtPSB2bV9m Yl9vZmZzZXQ7CiAJYWRkcmVzcyAtPSBwYWdlX3RhYmxlX3N0YXJ0X2FkZHI7CiAKIAlkbyB7CisJ CXBkZV9lbnRyeSA9IHBhZ2VfdGFibGVfYmFzZV9hZGRyOworCiAJCWZpcnN0ID0gMTsKIAkJaWYg KHBhZ2VfdGFibGVfZGVwdGggPj0gMSkgewogCQkJLy8gZGVjb2RlIFBERSB2YWx1ZXMKQEAgLTQy OCwyMCArNDM3LDE4IEBAIHN0YXRpYyBpbnQgdW1yX3JlYWRfdnJhbV9haShzdHJ1Y3QgdW1yX2Fz aWMgKmFzaWMsIHVpbnQzMl90IHZtaWQsIHVpbnQ2NF90IGFkZHJlCiAJCQlwZGVfZmllbGRzLmNh Y2hlICAgICAgICAgPSAocGRlX2VudHJ5ID4+IDIpICYgMTsKIAkJCXBkZV9maWVsZHMucHRlICAg ICAgICAgICA9IChwZGVfZW50cnkgPj4gNTQpICYgMTsKIAotCQkJLy8gbWFzayBvZmYgdmFsaWQg Yml0Ci0JCQlwYWdlX3RhYmxlX2Jhc2VfYWRkciAmPSB+MVVMTDsKLQogCQkJLy8gcmVhZCBQVEUg c2VsZWN0b3IKIAkJCXB0ZV9pZHggPSAoYWRkcmVzcyA+PiAxMikgJiAoKDFVTEwgPDwgKDkgKyBw YWdlX3RhYmxlX3NpemUpKSAtIDEpOwogCiAJCQkvLyBBSSsgc3VwcG9ydHMgbW9yZSB0aGFuIDEg bGV2ZWwgb2YgUERFcyBzbyB3ZSBpdGVyYXRlIGZvciBhbGwgb2YgdGhlIGRlcHRocwotCQkJcGRl X2FkZHJlc3MgPSBwYWdlX3RhYmxlX2Jhc2VfYWRkcjsKKwkJCXBkZV9hZGRyZXNzID0gcGFnZV90 YWJsZV9iYXNlX2FkZHIgJiB+MVVMTDsKIAkJCXBkZV9maWVsZHMuc3lzdGVtID0gMDsKLQkJCWRl cHRoID0gMDsKIAkJCXZhX21hc2sgPSAoKHVuc2lnbmVkIGxvbmcgbG9uZyk1MTEgPDwgKChwYWdl X3RhYmxlX2RlcHRoKSo5ICsgKDEyICsgOSArIHBhZ2VfdGFibGVfc2l6ZSkpKTsKLQkJCWlmIChh c2ljLT5vcHRpb25zLnZlcmJvc2UpCisJCQlwZGVfY250ID0gMDsKKworCQkJaWYgKG1lbWNtcCgm cGRlX2ZpZWxkcywgJnBkZV9hcnJheVtwZGVfY250XSwgc2l6ZW9mIHBkZV9maWVsZHMpICYmIGFz aWMtPm9wdGlvbnMudmVyYm9zZSkKIAkJCQlmcHJpbnRmKHN0ZGVyciwgIltWRVJCT1NFXTogUERF JWQ9MHglMDE2bGx4LCBWQT0weCUwMTJsbHgsIFBCQT09MHglMDEybGx4LCBWPSVkLCBTPSVkLCBD PSVkLCBQPSVkXG4iLAotCQkJCQkJZGVwdGgrKywKKwkJCQkJCXBkZV9jbnQsCiAJCQkJCQkodW5z aWduZWQgbG9uZyBsb25nKXBkZV9lbnRyeSwKIAkJCQkJCSh1bnNpZ25lZCBsb25nIGxvbmcpYWRk cmVzcyAmIHZhX21hc2ssCiAJCQkJCQkodW5zaWduZWQgbG9uZyBsb25nKXBkZV9maWVsZHMucHRl X2Jhc2VfYWRkciwKQEAgLTQ0OSwxMiArNDU2LDE0IEBAIHN0YXRpYyBpbnQgdW1yX3JlYWRfdnJh bV9haShzdHJ1Y3QgdW1yX2FzaWMgKmFzaWMsIHVpbnQzMl90IHZtaWQsIHVpbnQ2NF90IGFkZHJl CiAJCQkJCQkoaW50KXBkZV9maWVsZHMuc3lzdGVtLAogCQkJCQkJKGludClwZGVfZmllbGRzLmNh Y2hlLAogCQkJCQkJKGludClwZGVfZmllbGRzLnB0ZSk7Ci0JCQlpbmRlbnQgPSBwYWdlX3RhYmxl X2RlcHRoICogMzsKLQkJCXdoaWxlIChwYWdlX3RhYmxlX2RlcHRoKSB7Ci0JCQkJREVCVUcoIkRl Y29kaW5nIGRlcHRoICV1Li4uKDB4JWxseClcbiIsICh1bnNpZ25lZClwYWdlX3RhYmxlX2RlcHRo LCAodW5zaWduZWQgbG9uZyBsb25nKWFkZHJlc3MpOworCQkJbWVtY3B5KCZwZGVfYXJyYXlbcGRl X2NudCsrXSwgJnBkZV9maWVsZHMsIHNpemVvZiBwZGVfZmllbGRzKTsKKworCQkJY3VycmVudF9k ZXB0aCA9IHBhZ2VfdGFibGVfZGVwdGg7CisJCQl3aGlsZSAoY3VycmVudF9kZXB0aCkgeworCQkJ CURFQlVHKCJEZWNvZGluZyBkZXB0aCAldS4uLigweCVsbHgpXG4iLCAodW5zaWduZWQpY3VycmVu dF9kZXB0aCwgKHVuc2lnbmVkIGxvbmcgbG9uZylhZGRyZXNzKTsKIAkJCQkvLyBkZWNvZGUgYWRk ciBpbnRvIHB0ZSBhbmQgcGRlIHNlbGVjdG9ycy4uLgogCQkJCS8vICAgICAgICAgICAgICAgICAg ICAgICAgIH5+fiBQREUgc2VsZWN0b3Igfn5+ICAgICAgfn5+IFBURSBzZWxlY3RvciB+fn4KLQkJ CQlwZGVfaWR4ID0gKGFkZHJlc3MgPj4gKChwYWdlX3RhYmxlX2RlcHRoLTEpKjkgKyAoMTIgKyA5 ICsgcGFnZV90YWJsZV9zaXplKSkpOworCQkJCXBkZV9pZHggPSAoYWRkcmVzcyA+PiAoKGN1cnJl bnRfZGVwdGgtMSkqOSArICgxMiArIDkgKyBwYWdlX3RhYmxlX3NpemUpKSk7CiAKIAkJCQkvLyBk b24ndCBtYXNrIHRoZSBmaXJzdCBQREUgaWR4CiAJCQkJaWYgKCFmaXJzdCkKQEAgLTQ2Miw3ICs0 NzEsNyBAQCBzdGF0aWMgaW50IHVtcl9yZWFkX3ZyYW1fYWkoc3RydWN0IHVtcl9hc2ljICphc2lj LCB1aW50MzJfdCB2bWlkLCB1aW50NjRfdCBhZGRyZQogCQkJCWZpcnN0ID0gMDsKIAogCQkJCURF QlVHKCJwZGVfaWR4ID09ICVsbHhcbiIsICh1bnNpZ25lZCBsb25nIGxvbmcpcGRlX2lkeCk7Ci0J CQkJdmFfbWFzayA9ICgodW5zaWduZWQgbG9uZyBsb25nKTUxMSA8PCAoKHBhZ2VfdGFibGVfZGVw dGgtMikqOSArICgxMiArIDkgKyBwYWdlX3RhYmxlX3NpemUpKSk7CisJCQkJdmFfbWFzayA9ICgo dW5zaWduZWQgbG9uZyBsb25nKTUxMSA8PCAoKHBhZ2VfdGFibGVfZGVwdGggLSBwZGVfY250KSo5 ICsgKDEyICsgOSArIHBhZ2VfdGFibGVfc2l6ZSkpKTsKIAkJCQlERUJVRygic2VsZWN0b3IgbWFz ayA9PSAlbGx4XG4iLCB2YV9tYXNrKTsKIAogCQkJCS8vIHJlYWQgUERFIGVudHJ5CkBAIC00NzYs OSArNDg1LDEwIEBAIHN0YXRpYyBpbnQgdW1yX3JlYWRfdnJhbV9haShzdHJ1Y3QgdW1yX2FzaWMg KmFzaWMsIHVpbnQzMl90IHZtaWQsIHVpbnQ2NF90IGFkZHJlCiAJCQkJcGRlX2ZpZWxkcy5zeXN0 ZW0gICAgICAgID0gKHBkZV9lbnRyeSA+PiAxKSAmIDE7CiAJCQkJcGRlX2ZpZWxkcy5jYWNoZSAg ICAgICAgID0gKHBkZV9lbnRyeSA+PiAyKSAmIDE7CiAJCQkJcGRlX2ZpZWxkcy5wdGUgICAgICAg ICAgID0gKHBkZV9lbnRyeSA+PiA1NCkgJiAxOwotCQkJCWlmIChhc2ljLT5vcHRpb25zLnZlcmJv c2UpCi0JCQkJCWZwcmludGYoc3RkZXJyLCAiW1ZFUkJPU0VdOiBQREUlZD0weCUwMTZsbHgsIFZB PTB4JTAxMmxseCwgUEJBPT0weCUwMTJsbHgsIFY9JWQsIFM9JWQsIEM9JWQsIFA9JWRcbiIsCi0J CQkJCQkJZGVwdGgsCisJCQkJaWYgKG1lbWNtcCgmcGRlX2ZpZWxkcywgJnBkZV9hcnJheVtwZGVf Y250XSwgc2l6ZW9mIHBkZV9maWVsZHMpICYmIGFzaWMtPm9wdGlvbnMudmVyYm9zZSkKKwkJCQkJ ZnByaW50ZihzdGRlcnIsICJbVkVSQk9TRV06ICVzIFBERSVkPTB4JTAxNmxseCwgVkE9MHglMDEy bGx4LCBQQkE9PTB4JTAxMmxseCwgVj0lZCwgUz0lZCwgQz0lZCwgUD0lZFxuIiwKKwkJCQkJCQkm aW5kZW50YXRpb25bMTItcGRlX2NudCozXSwKKwkJCQkJCQlwZGVfY250LAogCQkJCQkJCSh1bnNp Z25lZCBsb25nIGxvbmcpcGRlX2VudHJ5LAogCQkJCQkJCSh1bnNpZ25lZCBsb25nIGxvbmcpYWRk cmVzcyAmIHZhX21hc2ssCiAJCQkJCQkJKHVuc2lnbmVkIGxvbmcgbG9uZylwZGVfZmllbGRzLnB0 ZV9iYXNlX2FkZHIsCkBAIC00ODYsNiArNDk2LDcgQEAgc3RhdGljIGludCB1bXJfcmVhZF92cmFt X2FpKHN0cnVjdCB1bXJfYXNpYyAqYXNpYywgdWludDMyX3Qgdm1pZCwgdWludDY0X3QgYWRkcmUK IAkJCQkJCQkoaW50KXBkZV9maWVsZHMuc3lzdGVtLAogCQkJCQkJCShpbnQpcGRlX2ZpZWxkcy5j YWNoZSwKIAkJCQkJCQkoaW50KXBkZV9maWVsZHMucHRlKTsKKwkJCQltZW1jcHkoJnBkZV9hcnJh eVtwZGVfY250KytdLCAmcGRlX2ZpZWxkcywgc2l6ZW9mIHBkZV9maWVsZHMpOwogCiAJCQkJaWYg KCFwZGVfZmllbGRzLnN5c3RlbSkKIAkJCQkJcGRlX2ZpZWxkcy5wdGVfYmFzZV9hZGRyIC09IHZt X2ZiX29mZnNldDsKQEAgLTQ5NCw5ICs1MDUsNyBAQCBzdGF0aWMgaW50IHVtcl9yZWFkX3ZyYW1f YWkoc3RydWN0IHVtcl9hc2ljICphc2ljLCB1aW50MzJfdCB2bWlkLCB1aW50NjRfdCBhZGRyZQog CQkJCQlyZXR1cm4gLTE7CiAKIAkJCQkvLyBmb3IgdGhlIG5leHQgcm91bmQgdGhlIGFkZHJlc3Mg d2UncmUgZGVjb2RpbmcgaXMgdGhlIHBoeXMgYWRkcmVzcyBpbiB0aGUgY3VycmVudGx5IGRlY29k ZWQgUERFCi0JCQkJLS1wYWdlX3RhYmxlX2RlcHRoOwotCQkJCSsrZGVwdGg7Ci0JCQkJaW5kZW50 IC09IDM7CisJCQkJLS1jdXJyZW50X2RlcHRoOwogCQkJCXBkZV9hZGRyZXNzID0gcGRlX2ZpZWxk cy5wdGVfYmFzZV9hZGRyOwogCQkJCURFQlVHKCIuLi5kb25lXG5cbiIpOwogCQkJfQpAQCAtNTEx LDkgKzUyMCwxMCBAQCBzdGF0aWMgaW50IHVtcl9yZWFkX3ZyYW1fYWkoc3RydWN0IHVtcl9hc2lj ICphc2ljLCB1aW50MzJfdCB2bWlkLCB1aW50NjRfdCBhZGRyZQogCQkJcHRlX2ZpZWxkcy5zeXN0 ZW0gICAgICAgICA9IChwdGVfZW50cnkgPj4gMSkgJiAxOwogCQkJcHRlX2ZpZWxkcy52YWxpZCAg ICAgICAgICA9IHB0ZV9lbnRyeSAmIDE7CiAJCQlpZiAoYXNpYy0+b3B0aW9ucy52ZXJib3NlKQot CQkJCWZwcmludGYoc3RkZXJyLCAiW1ZFUkJPU0VdOiBQVEU9PTB4JTAxNmxseCwgVkE9MHglMDEy bGx4LCBQQkE9PTB4JTAxMmxseCwgVj0lZCwgUz0lZFxuIiwKKwkJCQlmcHJpbnRmKHN0ZGVyciwg IltWRVJCT1NFXTogJXMgUFRFPT0weCUwMTZsbHgsIFZBPTB4JTAxMmxseCwgUEJBPT0weCUwMTJs bHgsIFY9JWQsIFM9JWRcbiIsCisJCQkJCSZpbmRlbnRhdGlvblsxMi1wZGVfY250KjNdLAogCQkJ CQkodW5zaWduZWQgbG9uZyBsb25nKXB0ZV9lbnRyeSwKLQkJCQkJKHVuc2lnbmVkIGxvbmcgbG9u ZylhZGRyZXNzICYgKCgxVUxMIDw8ICg5ICsgcGFnZV90YWJsZV9zaXplKSkgLSAxKSwKKwkJCQkJ KHVuc2lnbmVkIGxvbmcgbG9uZylhZGRyZXNzICYgKCgoMVVMTCA8PCAoOSArIHBhZ2VfdGFibGVf c2l6ZSkpIC0gMSkgPDwgMTIpLAogCQkJCQkodW5zaWduZWQgbG9uZyBsb25nKXB0ZV9maWVsZHMu cGFnZV9iYXNlX2FkZHIsCiAJCQkJCShpbnQpcHRlX2ZpZWxkcy52YWxpZCwKIAkJCQkJKGludClw dGVfZmllbGRzLnN5c3RlbSk7CkBAIC01MzYsMTIgKzU0NiwxOCBAQCBzdGF0aWMgaW50IHVtcl9y ZWFkX3ZyYW1fYWkoc3RydWN0IHVtcl9hc2ljICphc2ljLCB1aW50MzJfdCB2bWlkLCB1aW50NjRf dCBhZGRyZQogCQkJcGRlX2ZpZWxkcy5wdGVfYmFzZV9hZGRyID0gcGFnZV90YWJsZV9iYXNlX2Fk ZHIgJiAweEZGRkZGRkZGRkYwMDBVTEw7CiAJCQlwZGVfZmllbGRzLnN5c3RlbSAgICAgICAgPSAo cGFnZV90YWJsZV9iYXNlX2FkZHIgPj4gMSkgJiAxOwogCQkJcGRlX2ZpZWxkcy52YWxpZCAgICAg ICAgID0gcGFnZV90YWJsZV9iYXNlX2FkZHIgJiAxOwotCQkJaWYgKGFzaWMtPm9wdGlvbnMudmVy Ym9zZSkKLQkJCQlmcHJpbnRmKHN0ZGVyciwgIltWRVJCT1NFXTogUERFPTB4JTAxNmxseCwgUEJB PT0weCUwMTJsbHgsIFY9JWQsIFM9JWRcbiIsCisKKwkJCWlmIChtZW1jbXAoJnBkZV9hcnJheVsw XSwgJnBkZV9maWVsZHMsIHNpemVvZiBwZGVfZmllbGRzKSAmJiBhc2ljLT5vcHRpb25zLnZlcmJv c2UpCisJCQkJZnByaW50ZihzdGRlcnIsICJbVkVSQk9TRV06IFBERT0weCUwMTZsbHgsIFBCQT09 MHglMDEybGx4LCBWPSVkLCBTPSVkLCBGUz0ldVxuIiwKIAkJCQkJCSh1bnNpZ25lZCBsb25nIGxv bmcpcGFnZV90YWJsZV9iYXNlX2FkZHIsCiAJCQkJCQkodW5zaWduZWQgbG9uZyBsb25nKXBkZV9m aWVsZHMucHRlX2Jhc2VfYWRkciwKIAkJCQkJCShpbnQpcGRlX2ZpZWxkcy52YWxpZCwKLQkJCQkJ CShpbnQpcGRlX2ZpZWxkcy5zeXN0ZW0pOworCQkJCQkJKGludClwZGVfZmllbGRzLnN5c3RlbSwK KwkJCQkJCSh1bnNpZ25lZClwZGVfZmllbGRzLmZyYWdfc2l6ZSk7CisJCQltZW1jcHkoJnBkZV9h cnJheVswXSwgJnBkZV9maWVsZHMsIHNpemVvZiBwZGVfZmllbGRzKTsKKworCQkJaWYgKCFwZGVf ZmllbGRzLnZhbGlkKQorCQkJCXJldHVybiAtMTsKIAogCQkJLy8gUFRFIGFkZHIgPSBiYXNlYWRk cls0Nzo2XSArIChsb2dpY2FsIC0gc3RhcnQpID4+IGZyYWdzaXplKQogCQkJcHRlX2lkeCA9IChh ZGRyZXNzID4+ICgxMiArIHBkZV9maWVsZHMuZnJhZ19zaXplKSk7CkBAIC01NTQsMTQgKzU3MCwx OCBAQCBzdGF0aWMgaW50IHVtcl9yZWFkX3ZyYW1fYWkoc3RydWN0IHVtcl9hc2ljICphc2ljLCB1 aW50MzJfdCB2bWlkLCB1aW50NjRfdCBhZGRyZQogCQkJcHRlX2ZpZWxkcy5mcmFnbWVudCAgICAg ICA9IChwdGVfZW50cnkgPj4gNykgICYgMHgxRjsKIAkJCXB0ZV9maWVsZHMuc3lzdGVtICAgICAg ICAgPSAocHRlX2VudHJ5ID4+IDEpICYgMTsKIAkJCXB0ZV9maWVsZHMudmFsaWQgICAgICAgICAg PSBwdGVfZW50cnkgJiAxOworCiAJCQlpZiAoYXNpYy0+b3B0aW9ucy52ZXJib3NlKQotCQkJCWZw cmludGYoc3RkZXJyLCAiW1ZFUkJPU0VdOiBQVEU9MHglMDE2bGx4LCBQQkE9PTB4JTAxMmxseCwg Rj0ldSwgVj0lZCwgUz0lZFxuIiwKKwkJCQlmcHJpbnRmKHN0ZGVyciwgIltWRVJCT1NFXTogXFwt PiBQVEU9MHglMDE2bGx4LCBWQT0weCUwMTZsbHgsIFBCQT09MHglMDEybGx4LCBGPSV1LCBWPSVk LCBTPSVkXG4iLAogCQkJCQkodW5zaWduZWQgbG9uZyBsb25nKXB0ZV9lbnRyeSwKKwkJCQkJKHVu c2lnbmVkIGxvbmcgbG9uZylhZGRyZXNzICYgfjB4RkZGVUwsCiAJCQkJCSh1bnNpZ25lZCBsb25n IGxvbmcpcHRlX2ZpZWxkcy5wYWdlX2Jhc2VfYWRkciwKIAkJCQkJKHVuc2lnbmVkKXB0ZV9maWVs ZHMuZnJhZ21lbnQsCiAJCQkJCShpbnQpcHRlX2ZpZWxkcy52YWxpZCwKIAkJCQkJKGludClwdGVf ZmllbGRzLnN5c3RlbSk7CiAKKwkJCWlmICghcHRlX2ZpZWxkcy52YWxpZCkKKwkJCQlyZXR1cm4g LTE7CiAKIAkJCS8vIGNvbXB1dGUgc3RhcnRpbmcgYWRkcmVzcwogCQkJc3RhcnRfYWRkciA9IHB0 ZV9maWVsZHMucGFnZV9iYXNlX2FkZHIgKyAoYWRkcmVzcyAmIDB4RkZGKTsKQEAgLTU3NiwxOSAr NTk2LDIzIEBAIHN0YXRpYyBpbnQgdW1yX3JlYWRfdnJhbV9haShzdHJ1Y3QgdW1yX2FzaWMgKmFz aWMsIHVpbnQzMl90IHZtaWQsIHVpbnQ2NF90IGFkZHJlCiAJCX0KIAkJREVCVUcoIkNvbXB1dGVk IGFkZHJlc3Mgd2Ugd2lsbCByZWFkIGZyb206ICVzOiVsbHggKHJlYWRpbmc6ICVsdSBieXRlcylc biIsIHB0ZV9maWVsZHMuc3lzdGVtID8gInN5cyIgOiAidnJhbSIsCiAJCQkodW5zaWduZWQgbG9u ZyBsb25nKXN0YXJ0X2FkZHIsICh1bnNpZ25lZCBsb25nKWNodW5rX3NpemUpOwotCQlpZiAocHRl X2ZpZWxkcy5zeXN0ZW0pIHsKLQkJCWlmICh1bXJfcmVhZF9zcmFtKHN0YXJ0X2FkZHIsIGNodW5r X3NpemUsIHBkc3QpIDwgMCkgewotCQkJCWZwcmludGYoc3RkZXJyLCAiW0VSUk9SXTogQ2Fubm90 IHJlYWQgc3lzdGVtIHJhbSwgcGVyaGFwcyBDT05GSUdfU1RSSUNUX0RFVk1FTSBpcyBzZXQgaW4g eW91ciBrZXJuZWwgY29uZmlnP1xuIik7Ci0JCQkJZnByaW50ZihzdGRlcnIsICJbRVJST1JdOiBB bHRlcm5hdGl2ZWx5IGRvd25sb2FkIGFuZCBpbnN0YWxsIC9kZXYvZm1lbVxuIik7Ci0JCQkJcmV0 dXJuIC0xOwotCQkJfQotCQl9IGVsc2UgewotCQkJaWYgKHVtcl9yZWFkX3ZyYW0oYXNpYywgVU1S X0xJTkVBUl9IVUIsIHN0YXJ0X2FkZHIsIGNodW5rX3NpemUsIHBkc3QpIDwgMCkgewotCQkJCWZw cmludGYoc3RkZXJyLCAiW0VSUk9SXTogQ2Fubm90IHJlYWQgZnJvbSBWUkFNXG4iKTsKLQkJCQly ZXR1cm4gLTE7CisKKwkJLy8gYWxsb3cgZGVzdGluYXRpb24gdG8gYmUgTlVMTCB0byBzaW1wbHkg dXNlIGRlY29kZXIKKwkJaWYgKHBkc3QpIHsKKwkJCWlmIChwdGVfZmllbGRzLnN5c3RlbSkgewor CQkJCWlmICh1bXJfcmVhZF9zcmFtKHN0YXJ0X2FkZHIsIGNodW5rX3NpemUsIHBkc3QpIDwgMCkg eworCQkJCQlmcHJpbnRmKHN0ZGVyciwgIltFUlJPUl06IENhbm5vdCByZWFkIHN5c3RlbSByYW0s IHBlcmhhcHMgQ09ORklHX1NUUklDVF9ERVZNRU0gaXMgc2V0IGluIHlvdXIga2VybmVsIGNvbmZp Zz9cbiIpOworCQkJCQlmcHJpbnRmKHN0ZGVyciwgIltFUlJPUl06IEFsdGVybmF0aXZlbHkgZG93 bmxvYWQgYW5kIGluc3RhbGwgL2Rldi9mbWVtXG4iKTsKKwkJCQkJcmV0dXJuIC0xOworCQkJCX0K KwkJCX0gZWxzZSB7CisJCQkJaWYgKHVtcl9yZWFkX3ZyYW0oYXNpYywgVU1SX0xJTkVBUl9IVUIs IHN0YXJ0X2FkZHIsIGNodW5rX3NpemUsIHBkc3QpIDwgMCkgeworCQkJCQlmcHJpbnRmKHN0ZGVy ciwgIltFUlJPUl06IENhbm5vdCByZWFkIGZyb20gVlJBTVxuIik7CisJCQkJCXJldHVybiAtMTsK KwkJCQl9CiAJCQl9CisJCQlwZHN0ICs9IGNodW5rX3NpemU7CiAJCX0KLQkJcGRzdCArPSBjaHVu a19zaXplOwogCQlzaXplIC09IGNodW5rX3NpemU7CiAJCWFkZHJlc3MgKz0gY2h1bmtfc2l6ZTsK IAl9IHdoaWxlIChzaXplKTsKLS0gCjIuMTIuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9hbWQtZ2Z4Cg==