From: Chunming Zhou Subject: [PATCH 2/2] [RFC]drm: add syncobj timeline support Date: Wed, 22 Aug 2018 16:49:28 +0800 Message-ID: <20180822084928.19353-1-david1.zhou@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: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Chunming Zhou , Daniel Rakos , Christian Konig , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Dave Airlie VktfS0hSX3RpbWVsaW5lX3NlbWFwaG9yZToKVGhpcyBleHRlbnNpb24gaW50cm9kdWNlcyBhIG5l dyB0eXBlIG9mIHNlbWFwaG9yZSB0aGF0IGhhcyBhbiBpbnRlZ2VyIHBheWxvYWQKaWRlbnRpZnlp bmcgYSBwb2ludCBpbiBhIHRpbWVsaW5lLiBTdWNoIHRpbWVsaW5lIHNlbWFwaG9yZXMgc3VwcG9y dCB0aGUKZm9sbG93aW5nIG9wZXJhdGlvbnM6CiAgKiBIb3N0IHF1ZXJ5IC0gQSBob3N0IG9wZXJh dGlvbiB0aGF0IGFsbG93cyBxdWVyeWluZyB0aGUgcGF5bG9hZCBvZiB0aGUKICAgIHRpbWVsaW5l IHNlbWFwaG9yZS4KICAqIEhvc3Qgd2FpdCAtIEEgaG9zdCBvcGVyYXRpb24gdGhhdCBhbGxvd3Mg YSBibG9ja2luZyB3YWl0IGZvciBhCiAgICB0aW1lbGluZSBzZW1hcGhvcmUgdG8gcmVhY2ggYSBz cGVjaWZpZWQgdmFsdWUuCiAgKiBEZXZpY2Ugd2FpdCAtIEEgZGV2aWNlIG9wZXJhdGlvbiB0aGF0 IGFsbG93cyB3YWl0aW5nIGZvciBhCiAgICB0aW1lbGluZSBzZW1hcGhvcmUgdG8gcmVhY2ggYSBz cGVjaWZpZWQgdmFsdWUuCiAgKiBEZXZpY2Ugc2lnbmFsIC0gQSBkZXZpY2Ugb3BlcmF0aW9uIHRo YXQgYWxsb3dzIGFkdmFuY2luZyB0aGUKICAgIHRpbWVsaW5lIHNlbWFwaG9yZSB0byBhIHNwZWNp ZmllZCB2YWx1ZS4KClNpbmNlIGl0J3MgYSB0aW1lbGluZSwgdGhhdCBtZWFucyB0aGUgZnJvbnQg dGltZSBwb2ludChQVCkgYWx3YXlzIGlzIHNpZ25hbGVkIGJlZm9yZSB0aGUgbGF0ZSBQVC4KYS4g c2lnbmFsIFBUIGRlc2lnbjoKU2lnbmFsIFBUIGZlbmNlIE4gZGVwZW5kcyBvbiBQVFtOLTFdIGZl bmNlIGFuZCBzaWduYWwgb3BlcnRpb24gZmVuY2UsIHdoZW4gUFRbTl0gZmVuY2UgaXMgc2lnbmFs ZWQsCnRoZSB0aW1lbGluZSB3aWxsIGluY3JlYXNlIHRvIHZhbHVlIG9mIFBUW05dLgpiLiB3YWl0 IFBUIGRlc2lnbjoKV2FpdCBQVCBmZW5jZSBpcyBzaWduYWxlZCBieSByZWFjaGluZyB0aW1lbGlu ZSBwb2ludCB2YWx1ZSwgd2hlbiB0aW1lbGluZSBpcyBpbmNyZWFzaW5nLCB3aWxsIGNvbXBhcmUK d2FpdCBQVHMgdmFsdWUgd2l0aCBuZXcgdGltZWxpbmUgdmFsdWUsIGlmIFBUIHZhbHVlIGlzIGxv d2VyIHRoYW4gdGltZWxpbmUgdmFsdWUsIHRoZW4gd2FpdCBQVCB3aWxsIGJlCnNpZ25hbGVkLCBv dGhlcndpc2Uga2VlcCBpbiBsaXN0LiBzZW1hcGhvcmUgd2FpdCBvcGVyYXRpb24gY2FuIHdhaXQg b24gYW55IHBvaW50IG9mIHRpbWVsaW5lLApzbyBuZWVkIGEgUkIgdHJlZSB0byBvcmRlciB0aGVt LiBBbmQgd2FpdCBQVCBjb3VsZCBhaGVhZCBvZiBzaWduYWwgUFQsIHdlIG5lZWQgYSBzdW1pc3Np b24gZmVuY2UgdG8KcGVyZm9ybSB0aGF0LgoKVE9ETzoKQ1BVIHF1ZXJ5IGFuZCB3YWl0IG9uIHRp bWVsaW5lIHNlbWFwaG9yZS4KCkNoYW5nZS1JZDogSTlmMDlhYWUyMjVlMjY4NDQyYzMwNDUxYmFk YWM0MDQwNmYyNDI2MmMKU2lnbmVkLW9mZi1ieTogQ2h1bm1pbmcgWmhvdSA8ZGF2aWQxLnpob3VA YW1kLmNvbT4KQ2M6IENocmlzdGlhbiBLb25pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgpD YzogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KQ2M6IERhbmllbCBSYWtvcyA8RGFu aWVsLlJha29zQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2NzLmMgfCAgIDcgKy0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fc3luY29iai5jICAgICAgICAgIHwg Mzg1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL3Yz ZC92M2RfZ2VtLmMgICAgICAgICAgfCAgIDQgKy0KIGRyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2dl bS5jICAgICAgICAgIHwgICAyICstCiBpbmNsdWRlL2RybS9kcm1fc3luY29iai5oICAgICAgICAg ICAgICB8ICA0NSArKystCiBpbmNsdWRlL3VhcGkvZHJtL2RybS5oICAgICAgICAgICAgICAgICB8 ICAgMyArLQogNiBmaWxlcyBjaGFuZ2VkLCA0MzUgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYwppbmRleCBkNDJkMWM4Zjc4 ZjYuLjQ2M2NjODk2MDcyMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMK QEAgLTExMDUsNyArMTEwNSw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3N5bmNvYmpfbG9va3VwX2Fu ZF9hZGRfdG9fc3luYyhzdHJ1Y3QgYW1kZ3B1X2NzX3BhcnNlciAqcCwKIHsKIAlpbnQgcjsKIAlz dHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZTsKLQlyID0gZHJtX3N5bmNvYmpfZmluZF9mZW5jZShwLT5m aWxwLCBoYW5kbGUsICZmZW5jZSk7CisJciA9IGRybV9zeW5jb2JqX2ZpbmRfZmVuY2UocC0+Zmls cCwgaGFuZGxlLCAmZmVuY2UsIDApOwogCWlmIChyKQogCQlyZXR1cm4gcjsKIApAQCAtMTE5Myw4 ICsxMTkzLDkgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2NzX3Bvc3RfZGVwZW5kZW5jaWVzKHN0cnVj dCBhbWRncHVfY3NfcGFyc2VyICpwKQogewogCWludCBpOwogCi0JZm9yIChpID0gMDsgaSA8IHAt Pm51bV9wb3N0X2RlcF9zeW5jb2JqczsgKytpKQotCQlkcm1fc3luY29ial9yZXBsYWNlX2ZlbmNl KHAtPnBvc3RfZGVwX3N5bmNvYmpzW2ldLCBwLT5mZW5jZSk7CisJZm9yIChpID0gMDsgaSA8IHAt Pm51bV9wb3N0X2RlcF9zeW5jb2JqczsgKytpKSB7CisJCWRybV9zeW5jb2JqX3NpZ25hbF9mZW5j ZShwLT5wb3N0X2RlcF9zeW5jb2Jqc1tpXSwgcC0+ZmVuY2UsIDApOworCX0KIH0KIAogc3RhdGlj IGludCBhbWRncHVfY3Nfc3VibWl0KHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwLApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9zeW5jb2JqLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJt X3N5bmNvYmouYwppbmRleCA3MGFmMzJkMGRlZjEuLjM3MDlmMzZjOTAxZSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2RybV9zeW5jb2JqLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9z eW5jb2JqLmMKQEAgLTE4Nyw2ICsxODcsMTkxIEBAIHZvaWQgZHJtX3N5bmNvYmpfcmVwbGFjZV9m ZW5jZShzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCiB9CiBFWFBPUlRfU1lNQk9MKGRybV9z eW5jb2JqX3JlcGxhY2VfZmVuY2UpOwogCitzdGF0aWMgdm9pZCBkcm1fc3luY29ial90aW1lbGlu ZV9zaWduYWxfc3VibWlzc2lvbl9mZW5jZXMoc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqKQor eworCXN0cnVjdCByYl9ub2RlICpub2RlID0gTlVMTDsKKwlzdHJ1Y3QgZHJtX3N5bmNvYmpfd2Fp dF9wdCAqd2FpdF9wdCA9IE5VTEw7CisKKwlzcGluX2xvY2soJnN5bmNvYmotPmxvY2spOworCWZv cihub2RlID0gcmJfZmlyc3QoJnN5bmNvYmotPnN5bmNvYmpfdGltZWxpbmUud2FpdF9wdF90cmVl KTsKKwkgICAgbm9kZSAhPSBOVUxMOyBub2RlID0gcmJfbmV4dChub2RlKSkgeworCSAgICB3YWl0 X3B0ID0gcmJfZW50cnkobm9kZSwgc3RydWN0IGRybV9zeW5jb2JqX3dhaXRfcHQsIG5vZGUpOwor CSAgICBpZiAod2FpdF9wdC0+dmFsdWUgPD0gc3luY29iai0+c3luY29ial90aW1lbGluZS5zaWdu YWxfcG9pbnQpIHsKKwkJICAgIGlmICh3YWl0X3B0LT5zdWJtaXNzaW9uX2ZlbmNlKQorCQkJZG1h X2ZlbmNlX3NpZ25hbCgmd2FpdF9wdC0+c3VibWlzc2lvbl9mZW5jZS0+YmFzZSk7CisJICAgIH0g ZWxzZSB7CisJCSAgICAvKiB0aGUgbG9vcCBpcyBmcm9tIGxlZnQgdG8gcmlnaHQsIHRoZSBsYXRl ciBlbnRyeSB2YWx1ZSBpcworCQkgICAgICogYmlnZ2VyLCBzbyBkb24ndCBuZWVkIHRvIGNoZWNr IGFueSBtb3JlICovCisJCSAgICBicmVhazsKKwkgICAgfQorCX0KKwlzcGluX3VubG9jaygmc3lu Y29iai0+bG9jayk7Cit9CisKK3N0YXRpYyB2b2lkIGRybV9zeW5jb2JqX3RpbWVsaW5lX3NpZ25h bF93YWl0X3B0cyhzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmopCit7CisJc3RydWN0IHJiX25v ZGUgKm5vZGUgPSBOVUxMOworCXN0cnVjdCBkcm1fc3luY29ial93YWl0X3B0ICp3YWl0X3B0ID0g TlVMTDsKKworCXNwaW5fbG9jaygmc3luY29iai0+bG9jayk7CisJZm9yKG5vZGUgPSByYl9maXJz dCgmc3luY29iai0+c3luY29ial90aW1lbGluZS53YWl0X3B0X3RyZWUpOworCSAgICBub2RlICE9 IE5VTEw7ICkgeworCQl3YWl0X3B0ID0gcmJfZW50cnkobm9kZSwgc3RydWN0IGRybV9zeW5jb2Jq X3dhaXRfcHQsIG5vZGUpOworCQlub2RlID0gcmJfbmV4dChub2RlKTsKKwkJaWYgKHdhaXRfcHQt PnZhbHVlIDw9IHN5bmNvYmotPnN5bmNvYmpfdGltZWxpbmUudGltZWxpbmUpIHsKKwkJCWRtYV9m ZW5jZV9zaWduYWwoJndhaXRfcHQtPmJhc2UuYmFzZSk7CisJCQlyYl9lcmFzZSgmd2FpdF9wdC0+ bm9kZSwKKwkJCQkgJnN5bmNvYmotPnN5bmNvYmpfdGltZWxpbmUud2FpdF9wdF90cmVlKTsKKwkJ CVJCX0NMRUFSX05PREUoJndhaXRfcHQtPm5vZGUpOworCQkJaWYgKHdhaXRfcHQtPnN1Ym1pc3Np b25fZmVuY2UpCisJCQkJZG1hX2ZlbmNlX3B1dCgmd2FpdF9wdC0+c3VibWlzc2lvbl9mZW5jZS0+ YmFzZSk7CisJCQkvKiBrZnJlZSh3YWl0X3B0KSBpcyBleGN1dGVkIGJ5IGZlbmNlIHB1dCAqLwor CQkJZG1hX2ZlbmNlX3B1dCgmd2FpdF9wdC0+YmFzZS5iYXNlKTsKKwkJfSBlbHNlIHsKKwkJCS8q IHRoZSBsb29wIGlzIGZyb20gbGVmdCB0byByaWdodCwgdGhlIGxhdGVyIGVudHJ5IHZhbHVlIGlz CisJCQkgKiBiaWdnZXIsIHNvIGRvbid0IG5lZWQgdG8gY2hlY2sgYW55IG1vcmUgKi8KKwkJCWJy ZWFrOworCQl9CisJfQorCXNwaW5fdW5sb2NrKCZzeW5jb2JqLT5sb2NrKTsKK30KKworCitzdGF0 aWMgdm9pZCBwdF9mZW5jZV9jYihzdHJ1Y3QgZHJtX3N5bmNvYmpfc2lnbmFsX3B0ICpzaWduYWxf cHQpCit7CisJc3RydWN0IGRtYV9mZW5jZSAqZmVuY2UgPSBOVUxMOworCXN0cnVjdCBkcm1fc3lu Y29iaiAqc3luY29iajsKKworCWZlbmNlID0gc2lnbmFsX3B0LT5zaWduYWxfZmVuY2U7CisJc2ln bmFsX3B0LT5zaWduYWxfZmVuY2UgPSBOVUxMOworCWRtYV9mZW5jZV9wdXQoZmVuY2UpOworCWZl bmNlID0gc2lnbmFsX3B0LT5wcmVfcHRfYmFzZTsKKwlzaWduYWxfcHQtPnByZV9wdF9iYXNlID0g TlVMTDsKKwlkbWFfZmVuY2VfcHV0KGZlbmNlKTsKKworCXN5bmNvYmogPSBzaWduYWxfcHQtPnN5 bmNvYmo7CisJc3Bpbl9sb2NrKCZzeW5jb2JqLT5sb2NrKTsKKwlsaXN0X2RlbCgmc2lnbmFsX3B0 LT5saXN0KTsKKwlzeW5jb2JqLT5zeW5jb2JqX3RpbWVsaW5lLnRpbWVsaW5lID0gc2lnbmFsX3B0 LT52YWx1ZTsKKwlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7CisJLyoga2ZyZWUoc2lnbmFs X3B0KSB3aWxsIGJlICBleGVjdXRlZCBieSBiZWxvdyBmZW5jZSBwdXQgKi8KKwlkbWFfZmVuY2Vf cHV0KCZzaWduYWxfcHQtPmJhc2UuYmFzZSk7CisJZHJtX3N5bmNvYmpfdGltZWxpbmVfc2lnbmFs X3dhaXRfcHRzKHN5bmNvYmopOworfQorc3RhdGljIHZvaWQgcHRfc2lnbmFsX2ZlbmNlX2Z1bmMo c3RydWN0IGRtYV9mZW5jZSAqZmVuY2UsCisJCQkJIHN0cnVjdCBkbWFfZmVuY2VfY2IgKmNiKQor eworCXN0cnVjdCBkcm1fc3luY29ial9zaWduYWxfcHQgKnNpZ25hbF9wdCA9CisJCWNvbnRhaW5l cl9vZihjYiwgc3RydWN0IGRybV9zeW5jb2JqX3NpZ25hbF9wdCwgc2lnbmFsX2NiKTsKKworCWlm IChzaWduYWxfcHQtPnByZV9wdF9iYXNlICYmCisJICAgICFkbWFfZmVuY2VfaXNfc2lnbmFsZWQo c2lnbmFsX3B0LT5wcmVfcHRfYmFzZSkpCisJCXJldHVybjsKKworCXB0X2ZlbmNlX2NiKHNpZ25h bF9wdCk7Cit9CitzdGF0aWMgdm9pZCBwdF9wcmVfZmVuY2VfZnVuYyhzdHJ1Y3QgZG1hX2ZlbmNl ICpmZW5jZSwKKwkJCQkgc3RydWN0IGRtYV9mZW5jZV9jYiAqY2IpCit7CisJc3RydWN0IGRybV9z eW5jb2JqX3NpZ25hbF9wdCAqc2lnbmFsX3B0ID0KKwkJY29udGFpbmVyX29mKGNiLCBzdHJ1Y3Qg ZHJtX3N5bmNvYmpfc2lnbmFsX3B0LCBwcmVfcHRfY2IpOworCisJaWYgKHNpZ25hbF9wdC0+c2ln bmFsX2ZlbmNlICYmCisJICAgICFkbWFfZmVuY2VfaXNfc2lnbmFsZWQoc2lnbmFsX3B0LT5wcmVf cHRfYmFzZSkpCisJCXJldHVybjsKKworCXB0X2ZlbmNlX2NiKHNpZ25hbF9wdCk7Cit9CisKK3N0 YXRpYyBpbnQgZHJtX3N5bmNvYmpfdGltZWxpbmVfc2lnbmFsX2ZlbmNlKHN0cnVjdCBkcm1fc3lu Y29iaiAqc3luY29iaiwKKwkJCQkJICAgICBzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZSwKKwkJCQkJ ICAgICB1NjQgcG9pbnQpCit7CisJc3RydWN0IGRybV9zeW5jb2JqX3NpZ25hbF9wdCAqc2lnbmFs X3B0ID0KKwkJa3phbGxvYyhzaXplb2Yoc3RydWN0IGRybV9zeW5jb2JqX3NpZ25hbF9wdCksIEdG UF9LRVJORUwpOworCXN0cnVjdCBkcm1fc3luY29ial9zaWduYWxfcHQgKnRhaWxfcHQ7CisJc3Ry dWN0IGRtYV9mZW5jZSAqdGFpbF9wdF9mZW5jZSA9IE5VTEw7CisJaW50IHJldCA9IDA7CisKKwlp ZiAoIXNpZ25hbF9wdCkKKwkJcmV0dXJuIC1FTk9NRU07CisJaWYgKHN5bmNvYmotPnN5bmNvYmpf dGltZWxpbmUuc2lnbmFsX3BvaW50ID49IHBvaW50KSB7CisJCURSTV9XQVJOKCJBIGxhdGVyIHNp Z25hbCBpcyByZWFkeSEiKTsKKwkJZ290byBvdXQ7CisJfQorCWlmIChmZW5jZSkKKwkJZG1hX2Zl bmNlX2dldChmZW5jZSk7CisJc3Bpbl9sb2NrKCZzeW5jb2JqLT5sb2NrKTsKKwlzcGluX2xvY2tf aW5pdCgmc2lnbmFsX3B0LT5iYXNlLmxvY2spOworCWRtYV9mZW5jZV9pbml0KCZzaWduYWxfcHQt PmJhc2UuYmFzZSwKKwkJICAgICAgICZkcm1fc3luY29ial9zdHViX2ZlbmNlX29wcywKKwkJICAg ICAgICZzaWduYWxfcHQtPmJhc2UubG9jaywKKwkJICAgICAgIHN5bmNvYmotPnN5bmNvYmpfdGlt ZWxpbmUudGltZWxpbmVfY29udGV4dCwgcG9pbnQpOworCXNpZ25hbF9wdC0+c2lnbmFsX2ZlbmNl ID0KKwkJcmN1X2RlcmVmZXJlbmNlX3Byb3RlY3RlZChmZW5jZSwKKwkJCQkJICBsb2NrZGVwX2lz X2hlbGQoJmZlbmNlLT5sb2NrKSk7CisJaWYgKCFsaXN0X2VtcHR5KCZzeW5jb2JqLT5zeW5jb2Jq X3RpbWVsaW5lLnNpZ25hbF9wdF9saXN0KSkgeworCQl0YWlsX3B0ID0gbGlzdF9sYXN0X2VudHJ5 KCZzeW5jb2JqLT5zeW5jb2JqX3RpbWVsaW5lLnNpZ25hbF9wdF9saXN0LAorCQkJCQkgIHN0cnVj dCBkcm1fc3luY29ial9zaWduYWxfcHQsIGxpc3QpOworCQl0YWlsX3B0X2ZlbmNlID0gJnRhaWxf cHQtPmJhc2UuYmFzZTsKKwkJaWYgKGRtYV9mZW5jZV9pc19zaWduYWxlZCh0YWlsX3B0X2ZlbmNl KSkKKwkJCXRhaWxfcHRfZmVuY2UgPSBOVUxMOworCX0KKwlpZiAodGFpbF9wdF9mZW5jZSkKKwkJ c2lnbmFsX3B0LT5wcmVfcHRfYmFzZSA9CisJCQlkbWFfZmVuY2VfZ2V0KHJjdV9kZXJlZmVyZW5j ZV9wcm90ZWN0ZWQodGFpbF9wdF9mZW5jZSwKKwkJCQkJCQkJbG9ja2RlcF9pc19oZWxkKCZ0YWls X3B0X2ZlbmNlLT5sb2NrKSkpOworCisJc2lnbmFsX3B0LT52YWx1ZSA9IHBvaW50OworCXN5bmNv YmotPnN5bmNvYmpfdGltZWxpbmUuc2lnbmFsX3BvaW50ID0gcG9pbnQ7CisJc2lnbmFsX3B0LT5z eW5jb2JqID0gc3luY29iajsKKwlJTklUX0xJU1RfSEVBRCgmc2lnbmFsX3B0LT5saXN0KTsKKwls aXN0X2FkZF90YWlsKCZzaWduYWxfcHQtPmxpc3QsICZzeW5jb2JqLT5zeW5jb2JqX3RpbWVsaW5l LnNpZ25hbF9wdF9saXN0KTsKKwlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7CisJZHJtX3N5 bmNvYmpfdGltZWxpbmVfc2lnbmFsX3N1Ym1pc3Npb25fZmVuY2VzKHN5bmNvYmopOworCS8qKgor CSAqIEV2ZXJ5IHB0IGlzIGRlcGVuZGluZyBvbiBzaWduYWwgZmVuY2UgYW5kIHByZXZpb3VzIHB0 IGZlbmNlLCBhZGQKKwkgKiBjYWxsYmFja3MgdG8gdGhlbQorCSAqLworCWlmICghZG1hX2ZlbmNl X2lzX3NpZ25hbGVkKHNpZ25hbF9wdC0+c2lnbmFsX2ZlbmNlKSkKKwkJZG1hX2ZlbmNlX2FkZF9j YWxsYmFjayhzaWduYWxfcHQtPnNpZ25hbF9mZW5jZSwKKwkJCQkgICAgICAgJnNpZ25hbF9wdC0+ c2lnbmFsX2NiLAorCQkJCSAgICAgICBwdF9zaWduYWxfZmVuY2VfZnVuYyk7CisJZWxzZQorCQlw dF9zaWduYWxfZmVuY2VfZnVuYyhzaWduYWxfcHQtPnNpZ25hbF9mZW5jZSwKKwkJCQkgICAgICZz aWduYWxfcHQtPnNpZ25hbF9jYik7CisJaWYgKHNpZ25hbF9wdC0+cHJlX3B0X2Jhc2UgJiYgIWRt YV9mZW5jZV9pc19zaWduYWxlZChzaWduYWxfcHQtPnByZV9wdF9iYXNlKSkKKwkJZG1hX2ZlbmNl X2FkZF9jYWxsYmFjayhzaWduYWxfcHQtPnByZV9wdF9iYXNlLAorCQkJCSAgICAgICAmc2lnbmFs X3B0LT5wcmVfcHRfY2IsCisJCQkJICAgICAgIHB0X3ByZV9mZW5jZV9mdW5jKTsKKwllbHNlCisJ CXB0X3ByZV9mZW5jZV9mdW5jKHNpZ25hbF9wdC0+cHJlX3B0X2Jhc2UsICZzaWduYWxfcHQtPnBy ZV9wdF9jYik7CisKKworCXJldHVybiAwOworb3V0OgorCWtmcmVlKHNpZ25hbF9wdCk7CisJcmV0 dXJuIHJldDsKK30KKworLyoqCisgKiBkcm1fc3luY29ial9zaWduYWxfZmVuY2UgLSBwbGFjZSBm ZW5jZSBpbnRvIGEgc3luYyBvYmplY3QuCisgKiBAc3luY29iajogU3luYyBvYmplY3QgdG8gcmVw bGFjZSBmZW5jZSBpbgorICogQGZlbmNlOiBmZW5jZSB0byBpbnN0YWxsIGluIHN5bmMgZmlsZS4K KyAqCisgKiBUaGlzIHBsYWNlcyB0aGUgZmVuY2UgaW50byBub3JtYWwgb3IgdGltZWxpbmUgc3lu YyBvYmplY3QKKyAqLwordm9pZCBkcm1fc3luY29ial9zaWduYWxfZmVuY2Uoc3RydWN0IGRybV9z eW5jb2JqICpzeW5jb2JqLAorCQkJICAgICAgc3RydWN0IGRtYV9mZW5jZSAqZmVuY2UsCisJCQkg ICAgICB1NjQgcG9pbnQpCit7CisJaWYgKHN5bmNvYmotPnR5cGUgPT0gRFJNX1NZTkNPQkpfVFlQ RV9OT1JNQUwpCisJCWRybV9zeW5jb2JqX3JlcGxhY2VfZmVuY2Uoc3luY29iaiwgZmVuY2UpOwor CWVsc2UgaWYgKHN5bmNvYmotPnR5cGUgPT0gRFJNX1NZTkNPQkpfVFlQRV9USU1FTElORSkKKwkJ ZHJtX3N5bmNvYmpfdGltZWxpbmVfc2lnbmFsX2ZlbmNlKHN5bmNvYmosIGZlbmNlLCBwb2ludCk7 Cit9CitFWFBPUlRfU1lNQk9MKGRybV9zeW5jb2JqX3NpZ25hbF9mZW5jZSk7CisKIHN0YXRpYyBp bnQgZHJtX3N5bmNvYmpfYXNzaWduX251bGxfaGFuZGxlKHN0cnVjdCBkcm1fc3luY29iaiAqc3lu Y29iaikKIHsKIAlzdHJ1Y3QgZHJtX3N5bmNvYmpfc3R1Yl9mZW5jZSAqZmVuY2U7CkBAIC0yMDUs MTIgKzM5MCwxNTAgQEAgc3RhdGljIGludCBkcm1fc3luY29ial9hc3NpZ25fbnVsbF9oYW5kbGUo c3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqKQogCiAJcmV0dXJuIDA7CiB9CitzdGF0aWMgc3Ry dWN0IGRybV9zeW5jb2JqX3dhaXRfcHQgKgorZHJtX3N5bmNvYmpfdGltZWxpbmVfbG9va3VwX3dh aXRfcHQoc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLCB1NjQgcG9pbnQpCit7CisgICAgc3Ry dWN0IHJiX25vZGUgKm5vZGUgPSBzeW5jb2JqLT5zeW5jb2JqX3RpbWVsaW5lLndhaXRfcHRfdHJl ZS5yYl9ub2RlOworICAgIHN0cnVjdCBkcm1fc3luY29ial93YWl0X3B0ICp3YWl0X3B0ID0gTlVM TDsKKworCisgICAgc3Bpbl9sb2NrKCZzeW5jb2JqLT5sb2NrKTsKKyAgICB3aGlsZShub2RlKSB7 CisJICAgIGludCByZXN1bHQgPSBwb2ludCAtIHdhaXRfcHQtPnZhbHVlOworCisJICAgIHdhaXRf cHQgPSByYl9lbnRyeShub2RlLCBzdHJ1Y3QgZHJtX3N5bmNvYmpfd2FpdF9wdCwgbm9kZSk7CisJ ICAgIGlmIChyZXN1bHQgPCAwKQorCQkgICAgbm9kZSA9IG5vZGUtPnJiX2xlZnQ7CisJICAgIGVs c2UgaWYgKHJlc3VsdCA+IDApCisJCSAgICBub2RlID0gbm9kZS0+cmJfcmlnaHQ7CisJICAgIGVs c2UKKwkJICAgIGJyZWFrOworICAgIH0KKyAgICBzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7 CisKKyAgICByZXR1cm4gd2FpdF9wdDsKK30KKworc3RhdGljIHN0cnVjdCBkcm1fc3luY29ial93 YWl0X3B0ICoKK2RybV9zeW5jb2JqX3RpbWVsaW5lX2NyZWF0ZV93YWl0X3B0KHN0cnVjdCBkcm1f c3luY29iaiAqc3luY29iaiwgdTY0IHBvaW50KQoreworCXN0cnVjdCBkcm1fc3luY29ial93YWl0 X3B0ICp3YWl0X3B0OworCXN0cnVjdCByYl9ub2RlICoqbmV3ID0gJihzeW5jb2JqLT5zeW5jb2Jq X3RpbWVsaW5lLndhaXRfcHRfdHJlZS5yYl9ub2RlKSwgKnBhcmVudCA9IE5VTEw7CisKKwl3YWl0 X3B0ID0ga3phbGxvYyhzaXplb2YoKndhaXRfcHQpLCBHRlBfS0VSTkVMKTsKKwlpZiAoIXdhaXRf cHQpCisJCXJldHVybiBOVUxMOworCXNwaW5fbG9ja19pbml0KCZ3YWl0X3B0LT5iYXNlLmxvY2sp OworCWRtYV9mZW5jZV9pbml0KCZ3YWl0X3B0LT5iYXNlLmJhc2UsCisJCSAgICAgICAmZHJtX3N5 bmNvYmpfc3R1Yl9mZW5jZV9vcHMsCisJCSAgICAgICAmd2FpdF9wdC0+YmFzZS5sb2NrLAorCQkg ICAgICAgc3luY29iai0+c3luY29ial90aW1lbGluZS50aW1lbGluZV9jb250ZXh0LCBwb2ludCk7 CisJd2FpdF9wdC0+c3VibWlzc2lvbl9mZW5jZSA9IE5VTEw7CisJLyogY2hlY2sgaWYgdGhlIHB0 IGlzIGFscmVhZHkgc3VtYml0dGVkLCBpZiB5ZXMsIHRoZW4gZG9uJ3QgbmVlZCB0bworCSAqIGNy ZWF0ZSBzdWJtaXNzaW9uIGZlbmNlLCBvdGhlcndpc2UgY3JlYXRlIGl0ICovCisJaWYgKHBvaW50 ID4gc3luY29iai0+c3luY29ial90aW1lbGluZS5zaWduYWxfcG9pbnQpIHsKKwkJd2FpdF9wdC0+ c3VibWlzc2lvbl9mZW5jZSA9CisJCQlremFsbG9jKHNpemVvZihzdHJ1Y3QgZHJtX3N5bmNvYmpf c3R1Yl9mZW5jZSksCisJCQkJR0ZQX0tFUk5FTCk7CisJCWlmICghd2FpdF9wdC0+c3VibWlzc2lv bl9mZW5jZSkgeworCQkJZG1hX2ZlbmNlX3B1dCgmd2FpdF9wdC0+YmFzZS5iYXNlKTsKKwkJCXJl dHVybiBOVUxMOworCQl9CisJCXNwaW5fbG9ja19pbml0KCZ3YWl0X3B0LT5zdWJtaXNzaW9uX2Zl bmNlLT5sb2NrKTsKKwkJZG1hX2ZlbmNlX2luaXQoJndhaXRfcHQtPnN1Ym1pc3Npb25fZmVuY2Ut PmJhc2UsCisJCQkgICAgICAgJmRybV9zeW5jb2JqX3N0dWJfZmVuY2Vfb3BzLAorCQkJICAgICAg ICZ3YWl0X3B0LT5zdWJtaXNzaW9uX2ZlbmNlLT5sb2NrLAorCQkJICAgICAgIHN5bmNvYmotPnN5 bmNvYmpfdGltZWxpbmUuc3VibWlzc2lvbl9jb250ZXh0LAorCQkJICAgICAgIHBvaW50KTsKKwl9 CisJd2FpdF9wdC0+dmFsdWUgPSBwb2ludDsKKworCS8qIHdhaXQgcHQgbXVzdCBiZSBpbiBhbiBv cmRlciwgc28gdGhhdCB3ZSBjYW4gZWFzaWx5IGxvb2t1cCBhbmQgc2lnbmFsCisJICogaXQgKi8K KwlzcGluX2xvY2soJnN5bmNvYmotPmxvY2spOworCWlmIChwb2ludCA8PSBzeW5jb2JqLT5zeW5j b2JqX3RpbWVsaW5lLnRpbWVsaW5lKQorCQlkbWFfZmVuY2Vfc2lnbmFsKCZ3YWl0X3B0LT5iYXNl LmJhc2UpOworCWlmICh3YWl0X3B0LT5zdWJtaXNzaW9uX2ZlbmNlICYmCisJICAgIHBvaW50IDw9 IHN5bmNvYmotPnN5bmNvYmpfdGltZWxpbmUuc2lnbmFsX3BvaW50KQorCQlkbWFfZmVuY2Vfc2ln bmFsKCZ3YWl0X3B0LT5zdWJtaXNzaW9uX2ZlbmNlLT5iYXNlKTsKKwl3aGlsZSgqbmV3KSB7CisJ CXN0cnVjdCBkcm1fc3luY29ial93YWl0X3B0ICp0aGlzID0KKwkJCXJiX2VudHJ5KCpuZXcsIHN0 cnVjdCBkcm1fc3luY29ial93YWl0X3B0LCBub2RlKTsKKwkJaW50IHJlc3VsdCA9IHdhaXRfcHQt PnZhbHVlIC0gdGhpcy0+dmFsdWU7CisKKwkJcGFyZW50ID0gKm5ldzsKKwkJaWYgKHJlc3VsdCA8 IDApCisJCQluZXcgPSAmKCgqbmV3KS0+cmJfbGVmdCk7CisJCWVsc2UgaWYgKHJlc3VsdCA+IDAp CisJCQluZXcgPSAmKCgqbmV3KS0+cmJfcmlnaHQpOworCQllbHNlCisJCQlnb3RvIGV4aXN0Owor CX0KKworCXJiX2xpbmtfbm9kZSgmd2FpdF9wdC0+bm9kZSwgcGFyZW50LCBuZXcpOworCXJiX2lu c2VydF9jb2xvcigmd2FpdF9wdC0+bm9kZSwgJnN5bmNvYmotPnN5bmNvYmpfdGltZWxpbmUud2Fp dF9wdF90cmVlKTsKKwlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7CisJcmV0dXJuIHdhaXRf cHQ7CitleGlzdDoKKwlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7CisJaWYgKHdhaXRfcHQt PnN1Ym1pc3Npb25fZmVuY2UpCisJCWRtYV9mZW5jZV9wdXQoJndhaXRfcHQtPnN1Ym1pc3Npb25f ZmVuY2UtPmJhc2UpOworCWRtYV9mZW5jZV9wdXQoJndhaXRfcHQtPmJhc2UuYmFzZSk7CisJd2Fp dF9wdCA9IGRybV9zeW5jb2JqX3RpbWVsaW5lX2xvb2t1cF93YWl0X3B0KHN5bmNvYmosIHBvaW50 KTsKKwlyZXR1cm4gd2FpdF9wdDsKK30KKworc3RhdGljIHN0cnVjdCBkbWFfZmVuY2UgKgorZHJt X3N5bmNvYmpfdGltZWxpbmVfcG9pbnRfZ2V0KHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiwg dTY0IHBvaW50LCB1NjQgZmxhZykKK3sKKwlzdHJ1Y3QgZHJtX3N5bmNvYmpfd2FpdF9wdCAqd2Fp dF9wdDsKKworCS8qIGFscmVhZHkgc2lnbmFsZWQsIHNpbXBseSByZXR1cm4gYSBzaWduYWxlZCBz dHViIGZlbmNlICovCisJaWYgKHBvaW50IDw9IHN5bmNvYmotPnN5bmNvYmpfdGltZWxpbmUudGlt ZWxpbmUpIHsKKwkJc3RydWN0IGRybV9zeW5jb2JqX3N0dWJfZmVuY2UgKmZlbmNlOworCisJCWZl bmNlID0ga3phbGxvYyhzaXplb2YoKmZlbmNlKSwgR0ZQX0tFUk5FTCk7CisJCWlmIChmZW5jZSA9 PSBOVUxMKQorCQkJcmV0dXJuIE5VTEw7CisKKwkJc3Bpbl9sb2NrX2luaXQoJmZlbmNlLT5sb2Nr KTsKKwkJZG1hX2ZlbmNlX2luaXQoJmZlbmNlLT5iYXNlLCAmZHJtX3N5bmNvYmpfc3R1Yl9mZW5j ZV9vcHMsCisJCQkgICAgICAgJmZlbmNlLT5sb2NrLCAwLCAwKTsKKwkJZG1hX2ZlbmNlX3NpZ25h bCgmZmVuY2UtPmJhc2UpOworCQlyZXR1cm4gJmZlbmNlLT5iYXNlOworCX0KKworCS8qIGNoZWNr IGlmIHRoZSB3YWl0IHB0IGV4aXN0cyAqLworCXdhaXRfcHQgPSBkcm1fc3luY29ial90aW1lbGlu ZV9sb29rdXBfd2FpdF9wdChzeW5jb2JqLCBwb2ludCk7CisJaWYgKCF3YWl0X3B0KSB7CisJCS8q IFRoaXMgaXMgYSBuZXcgd2FpdCBwdCwgc28gY3JlYXRlIGl0ICovCisJCXdhaXRfcHQgPSBkcm1f c3luY29ial90aW1lbGluZV9jcmVhdGVfd2FpdF9wdChzeW5jb2JqLCBwb2ludCk7CisJCWlmICgh d2FpdF9wdCkKKwkJCXJldHVybiBOVUxMOworCX0KKwlpZiAod2FpdF9wdCkgeworCQlzdHJ1Y3Qg ZG1hX2ZlbmNlICpmZW5jZTsKKwkJaWYgKHdhaXRfcHQtPnN1Ym1pc3Npb25fZmVuY2UpIHsKKwkJ CWlmIChmbGFnICYgRFJNX1NZTkNPQkpfV0FJVF9GTEFHU19XQUlUX0ZPUl9TVUJNSVQpCisJCQkJ ZG1hX2ZlbmNlX3dhaXQoJndhaXRfcHQtPnN1Ym1pc3Npb25fZmVuY2UtPmJhc2UsIHRydWUpOwor CQkJZWxzZSBpZiAoIWRtYV9mZW5jZV9pc19zaWduYWxlZCgmd2FpdF9wdC0+c3VibWlzc2lvbl9m ZW5jZS0+YmFzZSkpCisJCQkJcmV0dXJuIE5VTEw7CisJCX0KKwkJcmN1X3JlYWRfbG9jaygpOwor CQlmZW5jZSA9IGRtYV9mZW5jZV9nZXRfcmN1KCZ3YWl0X3B0LT5iYXNlLmJhc2UpOworCQlyY3Vf cmVhZF91bmxvY2soKTsKKwkJcmV0dXJuIGZlbmNlOworCX0KKwlyZXR1cm4gTlVMTDsKK30KKwog CiAvKioKICAqIGRybV9zeW5jb2JqX2ZpbmRfZmVuY2UgLSBsb29rdXAgYW5kIHJlZmVyZW5jZSB0 aGUgZmVuY2UgaW4gYSBzeW5jIG9iamVjdAogICogQGZpbGVfcHJpdmF0ZTogZHJtIGZpbGUgcHJp dmF0ZSBwb2ludGVyCiAgKiBAaGFuZGxlOiBzeW5jIG9iamVjdCBoYW5kbGUgdG8gbG9va3VwLgog ICogQGZlbmNlOiBvdXQgcGFyYW1ldGVyIGZvciB0aGUgZmVuY2UKKyAqIEBwb2ludDogdGltZWxp bmUgcG9pbnQKICAqCiAgKiBUaGlzIGlzIGp1c3QgYSBjb252ZW5pZW5jZSBmdW5jdGlvbiB0aGF0 IGNvbWJpbmVzIGRybV9zeW5jb2JqX2ZpbmQoKSBhbmQKICAqIGRybV9zeW5jb2JqX2ZlbmNlX2dl dCgpLgpAQCAtMjIxLDcgKzU0NCw4IEBAIHN0YXRpYyBpbnQgZHJtX3N5bmNvYmpfYXNzaWduX251 bGxfaGFuZGxlKHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaikKICAqLwogaW50IGRybV9zeW5j b2JqX2ZpbmRfZmVuY2Uoc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXZhdGUsCiAJCQkgICB1MzIg aGFuZGxlLAotCQkJICAgc3RydWN0IGRtYV9mZW5jZSAqKmZlbmNlKQorCQkJICAgc3RydWN0IGRt YV9mZW5jZSAqKmZlbmNlLAorCQkJICAgdTY0IHBvaW50KQogewogCXN0cnVjdCBkcm1fc3luY29i aiAqc3luY29iaiA9IGRybV9zeW5jb2JqX2ZpbmQoZmlsZV9wcml2YXRlLCBoYW5kbGUpOwogCWlu dCByZXQgPSAwOwpAQCAtMjI5LDcgKzU1MywxNSBAQCBpbnQgZHJtX3N5bmNvYmpfZmluZF9mZW5j ZShzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdmF0ZSwKIAlpZiAoIXN5bmNvYmopCiAJCXJldHVy biAtRU5PRU5UOwogCi0JKmZlbmNlID0gZHJtX3N5bmNvYmpfZmVuY2VfZ2V0KHN5bmNvYmopOwor CWlmIChzeW5jb2JqLT50eXBlID09IERSTV9TWU5DT0JKX1RZUEVfTk9STUFMKSB7CisJCSpmZW5j ZSA9IGRybV9zeW5jb2JqX2ZlbmNlX2dldChzeW5jb2JqKTsKKwl9ZWxzZSBpZiAoc3luY29iai0+ dHlwZSA9PSBEUk1fU1lOQ09CSl9UWVBFX1RJTUVMSU5FKSB7CisJCSpmZW5jZSA9IGRybV9zeW5j b2JqX3RpbWVsaW5lX3BvaW50X2dldChzeW5jb2JqLCBwb2ludCwKKwkJCQkJCQlEUk1fU1lOQ09C Sl9XQUlUX0ZMQUdTX1dBSVRfRk9SX1NVQk1JVCk7CisJfSBlbHNlIHsKKwkJRFJNX0VSUk9SKCJp bnZhbGlkIHN5bmNvYmogdHlwZVxuIik7CisJCXJldHVybiAtRUlOVkFMOworCX0KIAlpZiAoISpm ZW5jZSkgewogCQlyZXQgPSAtRUlOVkFMOwogCX0KQEAgLTIzOCw2ICs1NzAsMzUgQEAgaW50IGRy bV9zeW5jb2JqX2ZpbmRfZmVuY2Uoc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXZhdGUsCiB9CiBF WFBPUlRfU1lNQk9MKGRybV9zeW5jb2JqX2ZpbmRfZmVuY2UpOwogCitzdGF0aWMgdm9pZCBkcm1f c3luY29ial90aW1lbGluZV9maW5pKHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiwKKwkJCQkg ICAgICBzdHJ1Y3QgZHJtX3N5bmNvYmpfdGltZWxpbmUgKnN5bmNvYmpfdGltZWxpbmUpCit7CisJ c3RydWN0IHJiX25vZGUgKm5vZGUgPSBOVUxMOworCXN0cnVjdCBkcm1fc3luY29ial93YWl0X3B0 ICp3YWl0X3B0ID0gTlVMTDsKKwlzdHJ1Y3QgZHJtX3N5bmNvYmpfc2lnbmFsX3B0ICpzaWduYWxf cHQgPSBOVUxMLCAqdG1wOworCisJc3Bpbl9sb2NrKCZzeW5jb2JqLT5sb2NrKTsKKwlmb3Iobm9k ZSA9IHJiX2ZpcnN0KCZzeW5jb2JqX3RpbWVsaW5lLT53YWl0X3B0X3RyZWUpOworCSAgICBub2Rl ICE9IE5VTEw7ICkgeworCQl3YWl0X3B0ID0gcmJfZW50cnkobm9kZSwgc3RydWN0IGRybV9zeW5j b2JqX3dhaXRfcHQsIG5vZGUpOworCQlub2RlID0gcmJfbmV4dChub2RlKTsKKwkJcmJfZXJhc2Uo JndhaXRfcHQtPm5vZGUsCisJCQkgJnN5bmNvYmpfdGltZWxpbmUtPndhaXRfcHRfdHJlZSk7CisJ CVJCX0NMRUFSX05PREUoJndhaXRfcHQtPm5vZGUpOworCQlpZiAod2FpdF9wdC0+c3VibWlzc2lv bl9mZW5jZSkKKwkJCWRtYV9mZW5jZV9wdXQoJndhaXRfcHQtPnN1Ym1pc3Npb25fZmVuY2UtPmJh c2UpOworCQkvKiBrZnJlZSh3YWl0X3B0KSBpcyBleGN1dGVkIGJ5IGZlbmNlIHB1dCAqLworCQlk bWFfZmVuY2VfcHV0KCZ3YWl0X3B0LT5iYXNlLmJhc2UpOworCX0KKwlsaXN0X2Zvcl9lYWNoX2Vu dHJ5X3NhZmUoc2lnbmFsX3B0LCB0bXAsCisJCQkJICZzeW5jb2JqX3RpbWVsaW5lLT5zaWduYWxf cHRfbGlzdCwgbGlzdCkgeworCQlsaXN0X2RlbCgmc2lnbmFsX3B0LT5saXN0KTsKKwkJZG1hX2Zl bmNlX3B1dChzaWduYWxfcHQtPnNpZ25hbF9mZW5jZSk7CisJCWRtYV9mZW5jZV9wdXQoc2lnbmFs X3B0LT5wcmVfcHRfYmFzZSk7CisJCWRtYV9mZW5jZV9wdXQoJnNpZ25hbF9wdC0+YmFzZS5iYXNl KTsKKwl9CisJc3Bpbl91bmxvY2soJnN5bmNvYmotPmxvY2spOworfQogLyoqCiAgKiBkcm1fc3lu Y29ial9mcmVlIC0gZnJlZSBhIHN5bmMgb2JqZWN0LgogICogQGtyZWY6IGtyZWYgdG8gZnJlZS4K QEAgLTI1MCwxMCArNjExLDIyIEBAIHZvaWQgZHJtX3N5bmNvYmpfZnJlZShzdHJ1Y3Qga3JlZiAq a3JlZikKIAkJCQkJCSAgIHN0cnVjdCBkcm1fc3luY29iaiwKIAkJCQkJCSAgIHJlZmNvdW50KTsK IAlkcm1fc3luY29ial9yZXBsYWNlX2ZlbmNlKHN5bmNvYmosIE5VTEwpOworCWRybV9zeW5jb2Jq X3RpbWVsaW5lX2Zpbmkoc3luY29iaiwgJnN5bmNvYmotPnN5bmNvYmpfdGltZWxpbmUpOwogCWtm cmVlKHN5bmNvYmopOwogfQogRVhQT1JUX1NZTUJPTChkcm1fc3luY29ial9mcmVlKTsKIAorc3Rh dGljIHZvaWQgZHJtX3N5bmNvYmpfdGltZWxpbmVfaW5pdChzdHJ1Y3QgZHJtX3N5bmNvYmpfdGlt ZWxpbmUKKwkJCQkgICAgICAqc3luY29ial90aW1lbGluZSkKK3sKKwlzeW5jb2JqX3RpbWVsaW5l LT50aW1lbGluZV9jb250ZXh0ID0gZG1hX2ZlbmNlX2NvbnRleHRfYWxsb2MoMSk7CisJc3luY29i al90aW1lbGluZS0+c3VibWlzc2lvbl9jb250ZXh0ID0gZG1hX2ZlbmNlX2NvbnRleHRfYWxsb2Mo MSk7CisJc3luY29ial90aW1lbGluZS0+dGltZWxpbmUgPSAwOworCXN5bmNvYmpfdGltZWxpbmUt PnNpZ25hbF9wb2ludCA9IDA7CisKKwlzeW5jb2JqX3RpbWVsaW5lLT53YWl0X3B0X3RyZWUgPSBS Ql9ST09UOworCUlOSVRfTElTVF9IRUFEKCZzeW5jb2JqX3RpbWVsaW5lLT5zaWduYWxfcHRfbGlz dCk7Cit9CiAvKioKICAqIGRybV9zeW5jb2JqX2NyZWF0ZSAtIGNyZWF0ZSBhIG5ldyBzeW5jb2Jq CiAgKiBAb3V0X3N5bmNvYmo6IHJldHVybmVkIHN5bmNvYmoKQEAgLTI3OSw2ICs2NTIsMTIgQEAg aW50IGRybV9zeW5jb2JqX2NyZWF0ZShzdHJ1Y3QgZHJtX3N5bmNvYmogKipvdXRfc3luY29iaiwg dWludDMyX3QgZmxhZ3MsCiAJa3JlZl9pbml0KCZzeW5jb2JqLT5yZWZjb3VudCk7CiAJSU5JVF9M SVNUX0hFQUQoJnN5bmNvYmotPmNiX2xpc3QpOwogCXNwaW5fbG9ja19pbml0KCZzeW5jb2JqLT5s b2NrKTsKKwlpZiAoZmxhZ3MgJiBEUk1fU1lOQ09CSl9DUkVBVEVfVFlQRV9USU1FTElORSkgewor CQlzeW5jb2JqLT50eXBlID0gRFJNX1NZTkNPQkpfVFlQRV9USU1FTElORTsKKwkJZHJtX3N5bmNv YmpfdGltZWxpbmVfaW5pdCgmc3luY29iai0+c3luY29ial90aW1lbGluZSk7CisJfSBlbHNlIHsK KwkJc3luY29iai0+dHlwZSA9IERSTV9TWU5DT0JKX1RZUEVfTk9STUFMOworCX0KIAogCWlmIChm bGFncyAmIERSTV9TWU5DT0JKX0NSRUFURV9TSUdOQUxFRCkgewogCQlyZXQgPSBkcm1fc3luY29i al9hc3NpZ25fbnVsbF9oYW5kbGUoc3luY29iaik7CkBAIC00OTEsNyArODcwLDcgQEAgc3RhdGlj IGludCBkcm1fc3luY29ial9leHBvcnRfc3luY19maWxlKHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9w cml2YXRlLAogCWlmIChmZCA8IDApCiAJCXJldHVybiBmZDsKIAotCXJldCA9IGRybV9zeW5jb2Jq X2ZpbmRfZmVuY2UoZmlsZV9wcml2YXRlLCBoYW5kbGUsICZmZW5jZSk7CisJcmV0ID0gZHJtX3N5 bmNvYmpfZmluZF9mZW5jZShmaWxlX3ByaXZhdGUsIGhhbmRsZSwgJmZlbmNlLCAwKTsKIAlpZiAo cmV0KQogCQlnb3RvIGVycl9wdXRfZmQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92 M2QvdjNkX2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfZ2VtLmMKaW5kZXggOTAyOTU5 MDI2N2FhLi5mMjRjM2VjY2I0ZDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92M2QvdjNk X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92M2QvdjNkX2dlbS5jCkBAIC01MjEsMTIgKzUy MSwxMiBAQCB2M2Rfc3VibWl0X2NsX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQg KmRhdGEsCiAJa3JlZl9pbml0KCZleGVjLT5yZWZjb3VudCk7CiAKIAlyZXQgPSBkcm1fc3luY29i al9maW5kX2ZlbmNlKGZpbGVfcHJpdiwgYXJncy0+aW5fc3luY19iY2wsCi0JCQkJICAgICAmZXhl Yy0+YmluLmluX2ZlbmNlKTsKKwkJCQkgICAgICZleGVjLT5iaW4uaW5fZmVuY2UsIDApOwogCWlm IChyZXQgPT0gLUVJTlZBTCkKIAkJZ290byBmYWlsOwogCiAJcmV0ID0gZHJtX3N5bmNvYmpfZmlu ZF9mZW5jZShmaWxlX3ByaXYsIGFyZ3MtPmluX3N5bmNfcmNsLAotCQkJCSAgICAgJmV4ZWMtPnJl bmRlci5pbl9mZW5jZSk7CisJCQkJICAgICAmZXhlYy0+cmVuZGVyLmluX2ZlbmNlLCAwKTsKIAlp ZiAocmV0ID09IC1FSU5WQUwpCiAJCWdvdG8gZmFpbDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL3ZjNC92YzRfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9nZW0uYwppbmRl eCA3OTEwYjlhY2VkZDYuLmY3YjQ5NzEzNDJlOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L3ZjNC92YzRfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZ2VtLmMKQEAgLTEx NzMsNyArMTE3Myw3IEBAIHZjNF9zdWJtaXRfY2xfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAogCWlmIChhcmdzLT5pbl9zeW5jKSB7CiAJCXJldCA9IGRybV9zeW5j b2JqX2ZpbmRfZmVuY2UoZmlsZV9wcml2LCBhcmdzLT5pbl9zeW5jLAotCQkJCQkgICAgICZpbl9m ZW5jZSk7CisJCQkJCSAgICAgJmluX2ZlbmNlLCAwKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gZmFp bDsKIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX3N5bmNvYmouaCBiL2luY2x1ZGUvZHJt L2RybV9zeW5jb2JqLmgKaW5kZXggYjA0YzQ5MmRkYmI1Li5iNmUxOTNjNmNjOWEgMTAwNjQ0Ci0t LSBhL2luY2x1ZGUvZHJtL2RybV9zeW5jb2JqLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX3N5bmNv YmouaApAQCAtNTQsNiArNTQsNDEgQEAgY29uc3Qgc3RydWN0IGRtYV9mZW5jZV9vcHMgZHJtX3N5 bmNvYmpfc3R1Yl9mZW5jZV9vcHMgPSB7CiAJLnJlbGVhc2UgPSBOVUxMLAogfTsKIAorZW51bSBk cm1fc3luY29ial90eXBlIHsKKwlEUk1fU1lOQ09CSl9UWVBFX05PUk1BTCwKKwlEUk1fU1lOQ09C Sl9UWVBFX1RJTUVMSU5FCit9OworCitzdHJ1Y3QgZHJtX3N5bmNvYmo7CitzdHJ1Y3QgZHJtX3N5 bmNvYmpfd2FpdF9wdCB7CisJc3RydWN0IGRybV9zeW5jb2JqX3N0dWJfZmVuY2UgYmFzZTsKKwlz dHJ1Y3QgZHJtX3N5bmNvYmpfc3R1Yl9mZW5jZSAqc3VibWlzc2lvbl9mZW5jZTsKKwl1NjQgICAg dmFsdWU7CisJc3RydWN0IHJiX25vZGUgICBub2RlOworfTsKK3N0cnVjdCBkcm1fc3luY29ial9z aWduYWxfcHQgeworCXN0cnVjdCBkcm1fc3luY29ial9zdHViX2ZlbmNlIGJhc2U7CisJc3RydWN0 IGRtYV9mZW5jZSAqc2lnbmFsX2ZlbmNlOworCXN0cnVjdCBkbWFfZmVuY2UgKnByZV9wdF9iYXNl OworCXN0cnVjdCBkbWFfZmVuY2VfY2Igc2lnbmFsX2NiOworCXN0cnVjdCBkbWFfZmVuY2VfY2Ig cHJlX3B0X2NiOworCXN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iajsKKwl1NjQgICAgdmFsdWU7 CisJc3RydWN0IGxpc3RfaGVhZCBsaXN0OworfTsKK3N0cnVjdCBkcm1fc3luY29ial90aW1lbGlu ZSB7CisJdTY0IHRpbWVsaW5lX2NvbnRleHQ7CisJdTY0IHN1Ym1pc3Npb25fY29udGV4dDsKKwkv KioKKwkgKiBAdGltZWxpbmU6IHN5bmNvYmogdGltZWxpbmUKKwkgKi8KKwl1NjQgdGltZWxpbmU7 CisJdTY0IHNpZ25hbF9wb2ludDsKKworCisJc3RydWN0IHJiX3Jvb3Qgd2FpdF9wdF90cmVlOwor CXN0cnVjdCBsaXN0X2hlYWQgc2lnbmFsX3B0X2xpc3Q7Cit9OwogLyoqCiAgKiBzdHJ1Y3QgZHJt X3N5bmNvYmogLSBzeW5jIG9iamVjdC4KICAqCkBAIC02NCw2ICs5OSwxMSBAQCBzdHJ1Y3QgZHJt X3N5bmNvYmogewogCSAqIEByZWZjb3VudDogUmVmZXJlbmNlIGNvdW50IG9mIHRoaXMgb2JqZWN0 LgogCSAqLwogCXN0cnVjdCBrcmVmIHJlZmNvdW50OworCS8qKgorCSAqIEB0eXBlOiBpbmRpY2F0 ZSBzeW5jb2JqIHR5cGUKKwkgKi8KKwllbnVtIGRybV9zeW5jb2JqX3R5cGUgdHlwZTsKKwlzdHJ1 Y3QgZHJtX3N5bmNvYmpfdGltZWxpbmUgc3luY29ial90aW1lbGluZTsKIAkvKioKIAkgKiBAZmVu Y2U6CiAJICogTlVMTCBvciBhIHBvaW50ZXIgdG8gdGhlIGZlbmNlIGJvdW5kIHRvIHRoaXMgb2Jq ZWN0LgpAQCAtMTYyLDkgKzIwMiwxMiBAQCB2b2lkIGRybV9zeW5jb2JqX3JlbW92ZV9jYWxsYmFj ayhzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCiAJCQkJIHN0cnVjdCBkcm1fc3luY29ial9j YiAqY2IpOwogdm9pZCBkcm1fc3luY29ial9yZXBsYWNlX2ZlbmNlKHN0cnVjdCBkcm1fc3luY29i aiAqc3luY29iaiwKIAkJCSAgICAgICBzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZSk7Cit2b2lkIGRy bV9zeW5jb2JqX3NpZ25hbF9mZW5jZShzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCisJCQkg ICAgICBzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZSwKKwkJCSAgICAgIHU2NCBwb2ludCk7CiBpbnQg ZHJtX3N5bmNvYmpfZmluZF9mZW5jZShzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdmF0ZSwKIAkJ CSAgIHUzMiBoYW5kbGUsCi0JCQkgICBzdHJ1Y3QgZG1hX2ZlbmNlICoqZmVuY2UpOworCQkJICAg c3RydWN0IGRtYV9mZW5jZSAqKmZlbmNlLCB1NjQgcG9pbnQpOwogdm9pZCBkcm1fc3luY29ial9m cmVlKHN0cnVjdCBrcmVmICprcmVmKTsKIGludCBkcm1fc3luY29ial9jcmVhdGUoc3RydWN0IGRy bV9zeW5jb2JqICoqb3V0X3N5bmNvYmosIHVpbnQzMl90IGZsYWdzLAogCQkgICAgICAgc3RydWN0 IGRtYV9mZW5jZSAqZmVuY2UpOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2RybS9kcm0uaCBi L2luY2x1ZGUvdWFwaS9kcm0vZHJtLmgKaW5kZXggMzAwZjMzNjYzM2YyLi43MWU2Y2QxYzg4Zjgg MTAwNjQ0Ci0tLSBhL2luY2x1ZGUvdWFwaS9kcm0vZHJtLmgKKysrIGIvaW5jbHVkZS91YXBpL2Ry bS9kcm0uaApAQCAtNzE3LDYgKzcxNyw4IEBAIHN0cnVjdCBkcm1fcHJpbWVfaGFuZGxlIHsKIHN0 cnVjdCBkcm1fc3luY29ial9jcmVhdGUgewogCV9fdTMyIGhhbmRsZTsKICNkZWZpbmUgRFJNX1NZ TkNPQkpfQ1JFQVRFX1NJR05BTEVEICgxIDw8IDApCisjZGVmaW5lIERSTV9TWU5DT0JKX0NSRUFU RV9UWVBFX05PUk1BTCAoMSA8PCAxKQorI2RlZmluZSBEUk1fU1lOQ09CSl9DUkVBVEVfVFlQRV9U SU1FTElORSAoMSA8PCAyKQogCV9fdTMyIGZsYWdzOwogfTsKIApAQCAtNzM0LDcgKzczNiw2IEBA IHN0cnVjdCBkcm1fc3luY29ial9oYW5kbGUgewogCV9fczMyIGZkOwogCV9fdTMyIHBhZDsKIH07 Ci0KICNkZWZpbmUgRFJNX1NZTkNPQkpfV0FJVF9GTEFHU19XQUlUX0FMTCAoMSA8PCAwKQogI2Rl ZmluZSBEUk1fU1lOQ09CSl9XQUlUX0ZMQUdTX1dBSVRfRk9SX1NVQk1JVCAoMSA8PCAxKQogc3Ry dWN0IGRybV9zeW5jb2JqX3dhaXQgewotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2FtZC1nZngK