Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id D23446E0ED for ; Wed, 7 Jul 2021 11:27:09 +0000 (UTC) From: Andrzej Turko Date: Wed, 7 Jul 2021 13:26:42 +0200 Message-Id: <20210707112644.10956-4-andrzej.turko@linux.intel.com> In-Reply-To: <20210707112644.10956-1-andrzej.turko@linux.intel.com> References: <20210707112644.10956-1-andrzej.turko@linux.intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 3/5] tests/i915/gem_exec_capture: Support gens without relocations 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 List-ID: V2l0aCByZWxvY2F0aW9ucyBkaXNhYmxlZCBvbiBuZXdlciBnZW5lcmF0aW9ucwp0ZXN0cyBtdXN0 IGFzc2lnbiBhZGRyZXNzZXMgdG8gb2JqZWN0cyBieQp0aGVtc2VsdmVzIGluc3RlYWQgb2YgcmVs eWluZyBvbiB0aGUgZHJpdmVyLgoKU2lnbmVkLW9mZi1ieTogQW5kcnplaiBUdXJrbyA8YW5kcnpl ai50dXJrb0BsaW51eC5pbnRlbC5jb20+CkNjOiBaYmlnbmlldyBLZW1wY3p5xYRza2kgPHpiaWdu aWV3LmtlbXBjenluc2tpQGludGVsLmNvbT4KLS0tCiB0ZXN0cy9pOTE1L2dlbV9leGVjX2NhcHR1 cmUuYyB8IDEzMyArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMTAyIGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rl c3RzL2k5MTUvZ2VtX2V4ZWNfY2FwdHVyZS5jIGIvdGVzdHMvaTkxNS9nZW1fZXhlY19jYXB0dXJl LmMKaW5kZXggYTZiM2Q5ODdmLi4xOWY1YTEyN2YgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2k5MTUvZ2Vt X2V4ZWNfY2FwdHVyZS5jCisrKyBiL3Rlc3RzL2k5MTUvZ2VtX2V4ZWNfY2FwdHVyZS5jCkBAIC0z Myw2ICszMyw4IEBACiAKIElHVF9URVNUX0RFU0NSSVBUSU9OKCJDaGVjayB0aGF0IHdlIGNhcHR1 cmUgdGhlIHVzZXIgc3BlY2lmaWVkIG9iamVjdHMgb24gYSBoYW5nIik7CiAKKyNkZWZpbmUgQUxJ R05NRU5UICgxIDw8IDEyKQorCiBzdGF0aWMgdm9pZCBjaGVja19lcnJvcl9zdGF0ZShpbnQgZGly LCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiAqb2JqKQogewogCWNoYXIgKmVycm9y LCAqc3RyOwpAQCAtNTMsNyArNTUsNyBAQCBzdGF0aWMgdm9pZCBjaGVja19lcnJvcl9zdGF0ZShp bnQgZGlyLCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiAqb2JqKQogCQlhZGRyID0g aGk7CiAJCWFkZHIgPDw9IDMyOwogCQlhZGRyIHw9IGxvOwotCQlpZ3RfYXNzZXJ0X2VxX3U2NChh ZGRyLCBvYmotPm9mZnNldCk7CisJCWlndF9hc3NlcnRfZXFfdTY0KGFkZHIsIERFQ0FOT05JQ0FM KG9iai0+b2Zmc2V0KSk7CiAJCWZvdW5kID0gdHJ1ZTsKIAl9CiAKQEAgLTYxLDcgKzYzLDggQEAg c3RhdGljIHZvaWQgY2hlY2tfZXJyb3Jfc3RhdGUoaW50IGRpciwgc3RydWN0IGRybV9pOTE1X2dl bV9leGVjX29iamVjdDIgKm9iaikKIAlpZ3RfYXNzZXJ0KGZvdW5kKTsKIH0KIAotc3RhdGljIHZv aWQgX19jYXB0dXJlMShpbnQgZmQsIGludCBkaXIsIHVuc2lnbmVkIHJpbmcsIHVpbnQzMl90IHRh cmdldCkKK3N0YXRpYyB2b2lkIF9fY2FwdHVyZTEoaW50IGZkLCBpbnQgZGlyLCB1bnNpZ25lZCBy aW5nLCB1aW50NjRfdCBhaG5kLAorCQkgICAgICAgdWludDMyX3QgdGFyZ2V0LCB1aW50NjRfdCB0 YXJnZXRfc2l6ZSkKIHsKIAljb25zdCB1bnNpZ25lZCBpbnQgZ2VuID0gaW50ZWxfZ2VuKGludGVs X2dldF9kcm1fZGV2aWQoZmQpKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiBv YmpbNF07CkBAIC03MywzMiArNzYsNDUgQEAgc3RhdGljIHZvaWQgX19jYXB0dXJlMShpbnQgZmQs IGludCBkaXIsIHVuc2lnbmVkIHJpbmcsIHVpbnQzMl90IHRhcmdldCkKIAlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX2V4ZWNidWZmZXIyIGV4ZWNidWY7CiAJdWludDMyX3QgKmJhdGNoLCAqc2Vxbm87CiAJ aW50IGk7CisJYm9vbCBkb19yZWxvY3MgPSBnZW1faGFzX3JlbG9jYXRpb25zKGZkKTsKIAogCW1l bXNldChvYmosIDAsIHNpemVvZihvYmopKTsKIAlvYmpbU0NSQVRDSF0uaGFuZGxlID0gZ2VtX2Ny ZWF0ZShmZCwgNDA5Nik7CisJb2JqW1NDUkFUQ0hdLmZsYWdzID0gRVhFQ19PQkpFQ1RfV1JJVEU7 CiAJb2JqW0NBUFRVUkVdLmhhbmRsZSA9IHRhcmdldDsKIAlvYmpbQ0FQVFVSRV0uZmxhZ3MgPSBF WEVDX09CSkVDVF9DQVBUVVJFOwogCW9ialtOT0NBUFRVUkVdLmhhbmRsZSA9IGdlbV9jcmVhdGUo ZmQsIDQwOTYpOwotCiAJb2JqW0JBVENIXS5oYW5kbGUgPSBnZW1fY3JlYXRlKGZkLCA0MDk2KTsK LQlvYmpbQkFUQ0hdLnJlbG9jc19wdHIgPSAodWludHB0cl90KXJlbG9jOwotCW9ialtCQVRDSF0u cmVsb2NhdGlvbl9jb3VudCA9IEFSUkFZX1NJWkUocmVsb2MpOworCisJZm9yIChpID0gMDsgaSA8 IDQ7IGkrKykgeworCQlvYmpbaV0ub2Zmc2V0ID0gaW50ZWxfYWxsb2NhdG9yX2FsbG9jKGFobmQs IG9ialtpXS5oYW5kbGUsCisJCQkJCQkgICAgICBpID09IENBUFRVUkUgPyB0YXJnZXRfc2l6ZSA6 IDQwOTYsCisJCQkJCQkgICAgICBBTElHTk1FTlQpOworCQlvYmpbaV0ub2Zmc2V0ID0gQ0FOT05J Q0FMKG9ialtpXS5vZmZzZXQpOworCQlvYmpbaV0uZmxhZ3MgfD0gRVhFQ19PQkpFQ1RfU1VQUE9S VFNfNDhCX0FERFJFU1MgfAorCQkJCShkb19yZWxvY3MgPyAwIDogRVhFQ19PQkpFQ1RfUElOTkVE KTsKKwl9CiAKIAltZW1zZXQocmVsb2MsIDAsIHNpemVvZihyZWxvYykpOwogCXJlbG9jWzBdLnRh cmdldF9oYW5kbGUgPSBvYmpbQkFUQ0hdLmhhbmRsZTsgLyogcmVjdXJzZSAqLwotCXJlbG9jWzBd LnByZXN1bWVkX29mZnNldCA9IDA7CisJcmVsb2NbMF0ucHJlc3VtZWRfb2Zmc2V0ID0gb2JqW0JB VENIXS5vZmZzZXQ7CiAJcmVsb2NbMF0ub2Zmc2V0ID0gNSpzaXplb2YodWludDMyX3QpOwogCXJl bG9jWzBdLmRlbHRhID0gMDsKIAlyZWxvY1swXS5yZWFkX2RvbWFpbnMgPSBJOTE1X0dFTV9ET01B SU5fQ09NTUFORDsKIAlyZWxvY1swXS53cml0ZV9kb21haW4gPSAwOwogCiAJcmVsb2NbMV0udGFy Z2V0X2hhbmRsZSA9IG9ialtTQ1JBVENIXS5oYW5kbGU7IC8qIGJyZWFkY3J1bWIgKi8KLQlyZWxv Y1sxXS5wcmVzdW1lZF9vZmZzZXQgPSAwOworCXJlbG9jWzFdLnByZXN1bWVkX29mZnNldCA9IG9i altTQ1JBVENIXS5vZmZzZXQ7CiAJcmVsb2NbMV0ub2Zmc2V0ID0gc2l6ZW9mKHVpbnQzMl90KTsK IAlyZWxvY1sxXS5kZWx0YSA9IDA7CiAJcmVsb2NbMV0ucmVhZF9kb21haW5zID0gSTkxNV9HRU1f RE9NQUlOX1JFTkRFUjsKIAlyZWxvY1sxXS53cml0ZV9kb21haW4gPSBJOTE1X0dFTV9ET01BSU5f UkVOREVSOwogCisJaWYgKGRvX3JlbG9jcykgeworCQlvYmpbQkFUQ0hdLnJlbG9jc19wdHIgPSAo dWludHB0cl90KXJlbG9jOworCQlvYmpbQkFUQ0hdLnJlbG9jYXRpb25fY291bnQgPSBBUlJBWV9T SVpFKHJlbG9jKTsKKwl9CisKIAlzZXFubyA9IGdlbV9tbWFwX193YyhmZCwgb2JqW1NDUkFUQ0hd LmhhbmRsZSwgMCwgNDA5NiwgUFJPVF9SRUFEKTsKIAlnZW1fc2V0X2RvbWFpbihmZCwgb2JqW1ND UkFUQ0hdLmhhbmRsZSwKIAkJCUk5MTVfR0VNX0RPTUFJTl9HVFQsIEk5MTVfR0VNX0RPTUFJTl9H VFQpOwpAQCAtMTEwLDggKzEyNiw4IEBAIHN0YXRpYyB2b2lkIF9fY2FwdHVyZTEoaW50IGZkLCBp bnQgZGlyLCB1bnNpZ25lZCByaW5nLCB1aW50MzJfdCB0YXJnZXQpCiAJaSA9IDA7CiAJYmF0Y2hb aV0gPSBNSV9TVE9SRV9EV09SRF9JTU0gfCAoZ2VuIDwgNiA/IDEgPDwgMjIgOiAwKTsKIAlpZiAo Z2VuID49IDgpIHsKLQkJYmF0Y2hbKytpXSA9IDA7Ci0JCWJhdGNoWysraV0gPSAwOworCQliYXRj aFsrK2ldID0gb2JqW1NDUkFUQ0hdLm9mZnNldDsKKwkJYmF0Y2hbKytpXSA9IG9ialtTQ1JBVENI XS5vZmZzZXQgPj4gMzI7CiAJfSBlbHNlIGlmIChnZW4gPj0gNCkgewogCQliYXRjaFsrK2ldID0g MDsKIAkJYmF0Y2hbKytpXSA9IDA7CkBAIC0xMjcsOCArMTQzLDggQEAgc3RhdGljIHZvaWQgX19j YXB0dXJlMShpbnQgZmQsIGludCBkaXIsIHVuc2lnbmVkIHJpbmcsIHVpbnQzMl90IHRhcmdldCkK IAliYXRjaFsrK2ldID0gTUlfQkFUQ0hfQlVGRkVSX1NUQVJUOyAvKiBub3QgY3Jhc2hlZD8gdHJ5 IGFnYWluISAqLwogCWlmIChnZW4gPj0gOCkgewogCQliYXRjaFtpXSB8PSAxIDw8IDggfCAxOwot CQliYXRjaFsrK2ldID0gMDsKLQkJYmF0Y2hbKytpXSA9IDA7CisJCWJhdGNoWysraV0gPSBvYmpb QkFUQ0hdLm9mZnNldDsKKwkJYmF0Y2hbKytpXSA9IG9ialtCQVRDSF0ub2Zmc2V0ID4+IDMyOwog CX0gZWxzZSBpZiAoZ2VuID49IDYpIHsKIAkJYmF0Y2hbaV0gfD0gMSA8PCA4OwogCQliYXRjaFsr K2ldID0gMDsKQEAgLTE2Myw2ICsxNzksOSBAQCBzdGF0aWMgdm9pZCBfX2NhcHR1cmUxKGludCBm ZCwgaW50IGRpciwgdW5zaWduZWQgcmluZywgdWludDMyX3QgdGFyZ2V0KQogCiAJZ2VtX3N5bmMo ZmQsIG9ialtCQVRDSF0uaGFuZGxlKTsKIAorCWludGVsX2FsbG9jYXRvcl9mcmVlKGFobmQsIG9i altCQVRDSF0uaGFuZGxlKTsKKwlpbnRlbF9hbGxvY2F0b3JfZnJlZShhaG5kLCBvYmpbTk9DQVBU VVJFXS5oYW5kbGUpOworCWludGVsX2FsbG9jYXRvcl9mcmVlKGFobmQsIG9ialtTQ1JBVENIXS5o YW5kbGUpOwogCWdlbV9jbG9zZShmZCwgb2JqW0JBVENIXS5oYW5kbGUpOwogCWdlbV9jbG9zZShm ZCwgb2JqW05PQ0FQVFVSRV0uaGFuZGxlKTsKIAlnZW1fY2xvc2UoZmQsIG9ialtTQ1JBVENIXS5o YW5kbGUpOwpAQCAtMTcxLDEwICsxOTAsMTYgQEAgc3RhdGljIHZvaWQgX19jYXB0dXJlMShpbnQg ZmQsIGludCBkaXIsIHVuc2lnbmVkIHJpbmcsIHVpbnQzMl90IHRhcmdldCkKIHN0YXRpYyB2b2lk IGNhcHR1cmUoaW50IGZkLCBpbnQgZGlyLCB1bnNpZ25lZCByaW5nKQogewogCXVpbnQzMl90IGhh bmRsZTsKKwl1aW50NjRfdCBhaG5kID0gMDsKIAogCWhhbmRsZSA9IGdlbV9jcmVhdGUoZmQsIDQw OTYpOwotCV9fY2FwdHVyZTEoZmQsIGRpciwgcmluZywgaGFuZGxlKTsKKwlhaG5kID0gaW50ZWxf YWxsb2NhdG9yX29wZW4oZmQsIDAsIElOVEVMX0FMTE9DQVRPUl9TSU1QTEUpOworCisJX19jYXB0 dXJlMShmZCwgZGlyLCByaW5nLCBhaG5kLCBoYW5kbGUsIDQwOTYpOworCiAJZ2VtX2Nsb3NlKGZk LCBoYW5kbGUpOworCWludGVsX2FsbG9jYXRvcl9mcmVlKGFobmQsIGhhbmRsZSk7CisJaW50ZWxf YWxsb2NhdG9yX2Nsb3NlKGFobmQpOwogfQogCiBzdGF0aWMgaW50IGNtcChjb25zdCB2b2lkICpB LCBjb25zdCB2b2lkICpCKQpAQCAtMTk1LDcgKzIyMCw3IEBAIHN0YXRpYyBzdHJ1Y3Qgb2Zmc2V0 IHsKIAl1bnNpZ25lZCBsb25nIGlkeDsKIH0gKl9fY2FwdHVyZU4oaW50IGZkLCBpbnQgZGlyLCB1 bnNpZ25lZCByaW5nLAogCSAgICAgIHVuc2lnbmVkIGludCBzaXplLCBpbnQgY291bnQsCi0JICAg ICAgdW5zaWduZWQgaW50IGZsYWdzKQorCSAgICAgIHVuc2lnbmVkIGludCBmbGFncywgdWludDY0 X3QgYWhuZCkKICNkZWZpbmUgSU5DUkVNRU5UQUwgMHgxCiAjZGVmaW5lIEFTWU5DIDB4MgogewpA QCAtMjA2LDE4ICsyMzEsMzAgQEAgc3RhdGljIHN0cnVjdCBvZmZzZXQgewogCXVpbnQzMl90ICpi YXRjaCwgKnNlcW5vOwogCXN0cnVjdCBvZmZzZXQgKm9mZnNldHM7CiAJaW50IGk7CisJYm9vbCBk b19yZWxvY3MgPSBnZW1faGFzX3JlbG9jYXRpb25zKGZkKTsKIAotCW9mZnNldHMgPSBjYWxsb2Mo Y291bnQgLCBzaXplb2YoKm9mZnNldHMpKTsKKwlvZmZzZXRzID0gY2FsbG9jKGNvdW50LCBzaXpl b2YoKm9mZnNldHMpKTsKIAlpZ3RfYXNzZXJ0KG9mZnNldHMpOwogCiAJb2JqID0gY2FsbG9jKGNv dW50ICsgMiwgc2l6ZW9mKCpvYmopKTsKIAlpZ3RfYXNzZXJ0KG9iaik7CiAKIAlvYmpbMF0uaGFu ZGxlID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7CisJb2JqWzBdLm9mZnNldCA9IGludGVsX2FsbG9j YXRvcl9hbGxvYyhhaG5kLCBvYmpbMF0uaGFuZGxlLAorCQkJCQkgICAgICA0MDk2LCBBTElHTk1F TlQpOworCW9ialswXS5vZmZzZXQgPSBDQU5PTklDQUwob2JqWzBdLm9mZnNldCk7CisJb2JqWzBd LmZsYWdzID0gRVhFQ19PQkpFQ1RfV1JJVEUgfCBFWEVDX09CSkVDVF9TVVBQT1JUU180OEJfQURE UkVTUyB8CisJCSAgICAgICAoZG9fcmVsb2NzID8gMCA6IEVYRUNfT0JKRUNUX1BJTk5FRCk7CisK IAlmb3IgKGkgPSAwOyBpIDwgY291bnQ7IGkrKykgewogCQlvYmpbaSArIDFdLmhhbmRsZSA9IGdl bV9jcmVhdGUoZmQsIHNpemUpOwotCQlvYmpbaSArIDFdLmZsYWdzID0KLQkJCUVYRUNfT0JKRUNU X0NBUFRVUkUgfCBFWEVDX09CSkVDVF9TVVBQT1JUU180OEJfQUREUkVTUzsKKwkJb2JqW2kgKyAx XS5vZmZzZXQgPSBpbnRlbF9hbGxvY2F0b3JfYWxsb2MoYWhuZCwgb2JqW2kgKyAxXS5oYW5kbGUs CisJCQkJCQkJICBzaXplLCBBTElHTk1FTlQpOworCQlvYmpbaSArIDFdLm9mZnNldCA9IENBTk9O SUNBTChvYmpbaSArIDFdLm9mZnNldCk7CisJCW9ialtpICsgMV0uZmxhZ3MgPSBFWEVDX09CSkVD VF9DQVBUVVJFIHwKKwkJCQkgICBFWEVDX09CSkVDVF9TVVBQT1JUU180OEJfQUREUkVTUyB8CisJ CQkJICAgKGRvX3JlbG9jcyA/IDAgOiBFWEVDX09CSkVDVF9QSU5ORUQpOworCiAJCWlmIChmbGFn cyAmIElOQ1JFTUVOVEFMKSB7CiAJCQl1aW50MzJfdCAqcHRyOwogCkBAIC0yMzAsMjMgKzI2Nywz MiBAQCBzdGF0aWMgc3RydWN0IG9mZnNldCB7CiAJfQogCiAJb2JqW2NvdW50ICsgMV0uaGFuZGxl ID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7Ci0Jb2JqW2NvdW50ICsgMV0ucmVsb2NzX3B0ciA9ICh1 aW50cHRyX3QpcmVsb2M7Ci0Jb2JqW2NvdW50ICsgMV0ucmVsb2NhdGlvbl9jb3VudCA9IEFSUkFZ X1NJWkUocmVsb2MpOworCW9ialtjb3VudCArIDFdLm9mZnNldCA9IGludGVsX2FsbG9jYXRvcl9h bGxvYyhhaG5kLCBvYmpbY291bnQgKyAxXS5oYW5kbGUsCisJCQkJCQkgICAgICA0MDk2LCBBTElH Tk1FTlQpOworCW9ialtjb3VudCArIDFdLm9mZnNldCA9IENBTk9OSUNBTChvYmpbY291bnQgKyAx XS5vZmZzZXQpOworCW9ialtjb3VudCArIDFdLmZsYWdzID0gRVhFQ19PQkpFQ1RfU1VQUE9SVFNf NDhCX0FERFJFU1MgfAorCQkJICAgICAgIChkb19yZWxvY3MgPyAwIDogRVhFQ19PQkpFQ1RfUElO TkVEKTsKIAogCW1lbXNldChyZWxvYywgMCwgc2l6ZW9mKHJlbG9jKSk7CiAJcmVsb2NbMF0udGFy Z2V0X2hhbmRsZSA9IG9ialtjb3VudCArIDFdLmhhbmRsZTsgLyogcmVjdXJzZSAqLwotCXJlbG9j WzBdLnByZXN1bWVkX29mZnNldCA9IDA7CisJcmVsb2NbMF0ucHJlc3VtZWRfb2Zmc2V0ID0gb2Jq W2NvdW50ICsgMV0ub2Zmc2V0OwogCXJlbG9jWzBdLm9mZnNldCA9IDUqc2l6ZW9mKHVpbnQzMl90 KTsKIAlyZWxvY1swXS5kZWx0YSA9IDA7CiAJcmVsb2NbMF0ucmVhZF9kb21haW5zID0gSTkxNV9H RU1fRE9NQUlOX0NPTU1BTkQ7CiAJcmVsb2NbMF0ud3JpdGVfZG9tYWluID0gMDsKIAogCXJlbG9j WzFdLnRhcmdldF9oYW5kbGUgPSBvYmpbMF0uaGFuZGxlOyAvKiBicmVhZGNydW1iICovCi0JcmVs b2NbMV0ucHJlc3VtZWRfb2Zmc2V0ID0gMDsKKwlyZWxvY1sxXS5wcmVzdW1lZF9vZmZzZXQgPSBv YmpbMF0ub2Zmc2V0OwogCXJlbG9jWzFdLm9mZnNldCA9IHNpemVvZih1aW50MzJfdCk7CiAJcmVs b2NbMV0uZGVsdGEgPSAwOwogCXJlbG9jWzFdLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VNX0RPTUFJ Tl9SRU5ERVI7CiAJcmVsb2NbMV0ud3JpdGVfZG9tYWluID0gSTkxNV9HRU1fRE9NQUlOX1JFTkRF UjsKKwlpZiAoZG9fcmVsb2NzKSB7CisJCW9ialtjb3VudCArIDFdLnJlbG9jc19wdHIgPSAodWlu dHB0cl90KXJlbG9jOworCQlvYmpbY291bnQgKyAxXS5yZWxvY2F0aW9uX2NvdW50ID0gQVJSQVlf U0laRShyZWxvYyk7CisJfSBlbHNlIHsKKwkJZXhlY2J1Zi5mbGFncyA9IEk5MTVfRVhFQ19OT19S RUxPQzsKKwl9CiAKIAlzZXFubyA9IGdlbV9tbWFwX193YyhmZCwgb2JqWzBdLmhhbmRsZSwgMCwg NDA5NiwgUFJPVF9SRUFEKTsKIAlnZW1fc2V0X2RvbWFpbihmZCwgb2JqWzBdLmhhbmRsZSwKQEAg LTI1OSw4ICszMDUsOCBAQCBzdGF0aWMgc3RydWN0IG9mZnNldCB7CiAJaSA9IDA7CiAJYmF0Y2hb aV0gPSBNSV9TVE9SRV9EV09SRF9JTU0gfCAoZ2VuIDwgNiA/IDEgPDwgMjIgOiAwKTsKIAlpZiAo Z2VuID49IDgpIHsKLQkJYmF0Y2hbKytpXSA9IDA7Ci0JCWJhdGNoWysraV0gPSAwOworCQliYXRj aFsrK2ldID0gb2JqWzBdLm9mZnNldDsKKwkJYmF0Y2hbKytpXSA9IG9ialswXS5vZmZzZXQgPj4g MzI7CiAJfSBlbHNlIGlmIChnZW4gPj0gNCkgewogCQliYXRjaFsrK2ldID0gMDsKIAkJYmF0Y2hb KytpXSA9IDA7CkBAIC0yNzYsOCArMzIyLDggQEAgc3RhdGljIHN0cnVjdCBvZmZzZXQgewogCWJh dGNoWysraV0gPSBNSV9CQVRDSF9CVUZGRVJfU1RBUlQ7IC8qIG5vdCBjcmFzaGVkPyB0cnkgYWdh aW4hICovCiAJaWYgKGdlbiA+PSA4KSB7CiAJCWJhdGNoW2ldIHw9IDEgPDwgOCB8IDE7Ci0JCWJh dGNoWysraV0gPSAwOwotCQliYXRjaFsrK2ldID0gMDsKKwkJYmF0Y2hbKytpXSA9IG9ialtjb3Vu dCArIDFdLm9mZnNldDsKKwkJYmF0Y2hbKytpXSA9IG9ialtjb3VudCArIDFdLm9mZnNldCA+PiAz MjsKIAl9IGVsc2UgaWYgKGdlbiA+PSA2KSB7CiAJCWJhdGNoW2ldIHw9IDEgPDwgODsKIAkJYmF0 Y2hbKytpXSA9IDA7CkBAIC0zMTEsMTMgKzM1NywxNyBAQCBzdGF0aWMgc3RydWN0IG9mZnNldCB7 CiAJCWdlbV9zeW5jKGZkLCBvYmpbY291bnQgKyAxXS5oYW5kbGUpOwogCX0KIAotCWdlbV9jbG9z ZShmZCwgb2JqW2NvdW50ICsgMV0uaGFuZGxlKTsKIAlmb3IgKGkgPSAwOyBpIDwgY291bnQ7IGkr KykgewotCQlvZmZzZXRzW2ldLmFkZHIgPSBvYmpbaSArIDFdLm9mZnNldDsKKwkJb2Zmc2V0c1tp XS5hZGRyID0gREVDQU5PTklDQUwob2JqW2kgKyAxXS5vZmZzZXQpOwogCQlvZmZzZXRzW2ldLmlk eCA9IGk7CiAJCWdlbV9jbG9zZShmZCwgb2JqW2kgKyAxXS5oYW5kbGUpOworCQlpbnRlbF9hbGxv Y2F0b3JfZnJlZShhaG5kLCBvYmpbaSArIDFdLmhhbmRsZSk7CiAJfQorCiAJZ2VtX2Nsb3NlKGZk LCBvYmpbMF0uaGFuZGxlKTsKKwlnZW1fY2xvc2UoZmQsIG9ialtjb3VudCArIDFdLmhhbmRsZSk7 CisJaW50ZWxfYWxsb2NhdG9yX2ZyZWUoYWhuZCwgb2JqWzBdLmhhbmRsZSk7CisJaW50ZWxfYWxs b2NhdG9yX2ZyZWUoYWhuZCwgb2JqW2NvdW50KzFdLmhhbmRsZSk7CiAKIAlxc29ydChvZmZzZXRz LCBjb3VudCwgc2l6ZW9mKCpvZmZzZXRzKSwgY21wKTsKIAlpZ3RfYXNzZXJ0KG9mZnNldHNbMF0u YWRkciA8PSBvZmZzZXRzW2NvdW50LTFdLmFkZHIpOwpAQCAtNDEyLDcgKzQ2Miw3IEBAIGFzY2lp ODVfZGVjb2RlKGNoYXIgKmluLCB1aW50MzJfdCAqKm91dCwgYm9vbCBpbmZsYXRlLCBjaGFyICoq ZW5kKQogCiBzdGF0aWMgdm9pZCBtYW55KGludCBmZCwgaW50IGRpciwgdWludDY0X3Qgc2l6ZSwg dW5zaWduZWQgaW50IGZsYWdzKQogewotCXVpbnQ2NF90IHJhbSwgZ3R0OworCXVpbnQ2NF90IHJh bSwgZ3R0LCBhaG5kOwogCXVuc2lnbmVkIGxvbmcgY291bnQsIGJsb2JzOwogCXN0cnVjdCBvZmZz ZXQgKm9mZnNldHM7CiAJY2hhciAqZXJyb3IsICpzdHI7CkBAIC00MjYsOCArNDc2LDkgQEAgc3Rh dGljIHZvaWQgbWFueShpbnQgZmQsIGludCBkaXIsIHVpbnQ2NF90IHNpemUsIHVuc2lnbmVkIGlu dCBmbGFncykKIAlpZ3RfcmVxdWlyZShjb3VudCA+IDEpOwogCiAJaW50ZWxfcmVxdWlyZV9tZW1v cnkoY291bnQsIHNpemUsIENIRUNLX1JBTSk7CisJYWhuZCA9IGludGVsX2FsbG9jYXRvcl9vcGVu KGZkLCAwLCBJTlRFTF9BTExPQ0FUT1JfU0lNUExFKTsKIAotCW9mZnNldHMgPSBfX2NhcHR1cmVO KGZkLCBkaXIsIDAsIHNpemUsIGNvdW50LCBmbGFncyk7CisJb2Zmc2V0cyA9IF9fY2FwdHVyZU4o ZmQsIGRpciwgMCwgc2l6ZSwgY291bnQsIGZsYWdzLCBhaG5kKTsKIAogCWVycm9yID0gaWd0X3N5 c2ZzX2dldChkaXIsICJlcnJvciIpOwogCWlndF9zeXNmc19zZXQoZGlyLCAiZXJyb3IiLCAiQmVn b25lISIpOwpAQCAtNDk0LDYgKzU0NSw3IEBAIHN0YXRpYyB2b2lkIG1hbnkoaW50IGZkLCBpbnQg ZGlyLCB1aW50NjRfdCBzaXplLCB1bnNpZ25lZCBpbnQgZmxhZ3MpCiAKIAlmcmVlKGVycm9yKTsK IAlmcmVlKG9mZnNldHMpOworCWludGVsX2FsbG9jYXRvcl9jbG9zZShhaG5kKTsKIH0KIAogc3Rh dGljIHZvaWQgcHJpb2ludihpbnQgZmQsIGludCBkaXIsIHVuc2lnbmVkIHJpbmcsIGNvbnN0IGNo YXIgKm5hbWUpCkBAIC01MDgsMTAgKzU2MCwxNiBAQCBzdGF0aWMgdm9pZCBwcmlvaW52KGludCBm ZCwgaW50IGRpciwgdW5zaWduZWQgcmluZywgY29uc3QgY2hhciAqbmFtZSkKIAkJLmZsYWdzID0g cmluZywKIAl9OwogCWludDY0X3QgdGltZW91dCA9IE5TRUNfUEVSX1NFQzsgLyogMXMsIGZlZWxp bmcgZ2VuZXJvdXMsIGJsYW1lIGRlYnVnICovCi0JdWludDY0X3QgcmFtLCBndHQsIHNpemUgPSA0 IDw8IDIwOworCXVpbnQ2NF90IHJhbSwgZ3R0LCBhaG5kLCBzaXplID0gNCA8PCAyMDsKIAl1bnNp Z25lZCBsb25nIGNvdW50OwogCWludCBsaW5rWzJdLCBkdW1teTsKIAorCWludGVsX2FsbG9jYXRv cl9tdWx0aXByb2Nlc3Nfc3RhcnQoKTsKKwlhaG5kID0gaW50ZWxfYWxsb2NhdG9yX29wZW4oZmQs IDAsIElOVEVMX0FMTE9DQVRPUl9TSU1QTEUpOworCW9iai5vZmZzZXQgPSBpbnRlbF9hbGxvY2F0 b3JfYWxsb2MoYWhuZCwgb2JqLmhhbmRsZSwgNDA5NiwgQUxJR05NRU5UKTsKKwlvYmoub2Zmc2V0 ID0gQ0FOT05JQ0FMKG9iai5vZmZzZXQpOworCW9iai5mbGFncyA9IEVYRUNfT0JKRUNUX1NVUFBP UlRTXzQ4Ql9BRERSRVNTOworCiAJaWd0X3JlcXVpcmUoZ2VtX3NjaGVkdWxlcl9lbmFibGVkKGZk KSk7CiAJaWd0X3JlcXVpcmUoaWd0X3BhcmFtc19zZXQoZmQsICJyZXNldCIsICIldSIsIC0xKSk7 IC8qIGVuZ2luZSByZXNldHMhICovCiAJaWd0X3JlcXVpcmUoZ2VtX2dwdV9yZXNldF90eXBlKGZk KSA+IDEpOwpAQCAtNTQwLDcgKzU5OCwxMyBAQCBzdGF0aWMgdm9pZCBwcmlvaW52KGludCBmZCwg aW50IGRpciwgdW5zaWduZWQgcmluZywgY29uc3QgY2hhciAqbmFtZSkKIAkJZmQgPSBnZW1fcmVv cGVuX2RyaXZlcihmZCk7CiAJCWlndF9kZWJ1ZygiU3VibWl0dGluZyBsYXJnZSBjYXB0dXJlIFsl bGQgeCAlZE1pQiBvYmplY3RzXVxuIiwKIAkJCSAgY291bnQsIChpbnQpKHNpemUgPj4gMjApKTsK LQkJZnJlZShfX2NhcHR1cmVOKGZkLCBkaXIsIHJpbmcsIHNpemUsIGNvdW50LCBBU1lOQykpOwor CisJCS8qIFJlb3BlbiB0aGUgYWxsb2NhdG9yIGluIHRoZSBuZXcgcHJvY2Vzcy4gKi8KKwkJYWhu ZCA9IGludGVsX2FsbG9jYXRvcl9vcGVuKGZkLCBjaGlsZCsxLCBJTlRFTF9BTExPQ0FUT1JfU0lN UExFKTsKKworCQlmcmVlKF9fY2FwdHVyZU4oZmQsIGRpciwgcmluZywgc2l6ZSwgY291bnQsIEFT WU5DLCBhaG5kKSk7CisJCWludGVsX2FsbG9jYXRvcl9jbG9zZShhaG5kKTsKKwogCQl3cml0ZShs aW5rWzFdLCAmZmQsIHNpemVvZihmZCkpOyAvKiB3YWtlIHRoZSBwYXJlbnQgdXAgKi8KIAkJaWd0 X2ZvcmNlX2dwdV9yZXNldChmZCk7CiAJCXdyaXRlKGxpbmtbMV0sICZmZCwgc2l6ZW9mKGZkKSk7 IC8qIHdha2UgdGhlIHBhcmVudCB1cCAqLwpAQCAtNTYzLDE5ICs2MjcsMjYgQEAgc3RhdGljIHZv aWQgcHJpb2ludihpbnQgZmQsIGludCBkaXIsIHVuc2lnbmVkIHJpbmcsIGNvbnN0IGNoYXIgKm5h bWUpCiAJY2xvc2UobGlua1sxXSk7CiAKIAlnZW1fcXVpZXNjZW50X2dwdShmZCk7CisJaW50ZWxf YWxsb2NhdG9yX2ZyZWUoYWhuZCwgb2JqLmhhbmRsZSk7CisJaW50ZWxfYWxsb2NhdG9yX2Nsb3Nl KGFobmQpOworCWludGVsX2FsbG9jYXRvcl9tdWx0aXByb2Nlc3Nfc3RvcCgpOwogfQogCiBzdGF0 aWMgdm9pZCB1c2VycHRyKGludCBmZCwgaW50IGRpcikKIHsKIAl1aW50MzJfdCBoYW5kbGU7CisJ dWludDY0X3QgYWhuZDsKIAl2b2lkICpwdHI7CiAKIAlpZ3RfYXNzZXJ0KHBvc2l4X21lbWFsaWdu KCZwdHIsIDQwOTYsIDQwOTYpID09IDApOwogCWlndF9yZXF1aXJlKF9fZ2VtX3VzZXJwdHIoZmQs IHB0ciwgNDA5NiwgMCwgMCwgJmhhbmRsZSkgPT0gMCk7CisJYWhuZCA9IGludGVsX2FsbG9jYXRv cl9vcGVuKGZkLCAwLCBJTlRFTF9BTExPQ0FUT1JfU0lNUExFKTsKIAotCV9fY2FwdHVyZTEoZmQs IGRpciwgMCwgaGFuZGxlKTsKKwlfX2NhcHR1cmUxKGZkLCBkaXIsIDAsIGFobmQsIGhhbmRsZSwg NDA5Nik7CiAKIAlnZW1fY2xvc2UoZmQsIGhhbmRsZSk7CisJaW50ZWxfYWxsb2NhdG9yX2ZyZWUo YWhuZCwgaGFuZGxlKTsKKwlpbnRlbF9hbGxvY2F0b3JfY2xvc2UoYWhuZCk7CiAJZnJlZShwdHIp OwogfQogCi0tIAoyLjI1LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRl dgo=