From: Roger Pau Monne Subject: [PATCH v2 3/7] xen-blkback: implement LRU mechanism for persistent grants Date: Wed, 17 Apr 2013 20:18:57 +0200 Message-ID: <1366222741-39902-4-git-send-email-roger.pau@citrix.com> References: <1366222741-39902-1-git-send-email-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1366222741-39902-1-git-send-email-roger.pau@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: linux-kernel@vger.kernel.org, xen-devel@lists.xen.org Cc: Konrad Rzeszutek Wilk , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org VGhpcyBtZWNoYW5pc20gYWxsb3dzIGJsa2JhY2sgdG8gY2hhbmdlIHRoZSBudW1iZXIgb2YgZ3Jh bnRzCnBlcnNpc3RlbnRseSBtYXBwZWQgYXQgcnVuIHRpbWUuCgpUaGUgYWxnb3JpdGhtIHVzZXMg YSBzaW1wbGUgTFJVIG1lY2hhbmlzbSB0aGF0IHJlbW92ZXMgKGlmIG5lZWRlZCkgdGhlCnBlcnNp c3RlbnQgZ3JhbnRzIHRoYXQgaGF2ZSBub3QgYmVlbiB1c2VkIHNpbmNlIHRoZSBsYXN0IExSVSBy dW4sIG9yCmlmIGFsbCBncmFudHMgaGF2ZSBiZWVuIHVzZWQgaXQgcmVtb3ZlcyB0aGUgZmlyc3Qg Z3JhbnRzIGluIHRoZSBsaXN0Cih0aGF0IGFyZSBub3QgaW4gdXNlKS4KClRoZSBhbGdvcml0aG0g YWxsb3dzIHRoZSB1c2VyIHRvIGNoYW5nZSB0aGUgbWF4aW11bSBudW1iZXIgb2YKcGVyc2lzdGVu dCBncmFudHMsIGJ5IGNoYW5naW5nIG1heF9wZXJzaXN0ZW50X2dyYW50cyBpbiBzeXNmcy4KClNp bmNlIHdlIGFyZSBzdG9yaW5nIHRoZSBwZXJzaXN0ZW50IGdyYW50cyB1c2VkIGluc2lkZSB0aGUg cmVxdWVzdApzdHJ1Y3QgKHRvIGJlIGFibGUgdG8gbWFyayB0aGVtIGFzICJ1bnVzZWQiIHdoZW4g dW5tYXBwaW5nKSwgd2Ugbm8KbG9uZ2VyIG5lZWQgdGhlIGJpdG1hcCAodW5tYXBfc2VnKS4KClNp Z25lZC1vZmYtYnk6IFJvZ2VyIFBhdSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgpDYzog S29ucmFkIFJ6ZXN6dXRlayBXaWxrIDxrb25yYWQud2lsa0BvcmFjbGUuY29tPgpDYzogeGVuLWRl dmVsQGxpc3RzLnhlbi5vcmcKLS0tCkNoYW5nZXMgc2luY2UgUkZDOgogKiBPZmZsb2FkIHBhcnQg b2YgdGhlIHB1cmdlIHdvcmsgdG8gYSBrd29ya2VyIHRocmVhZC4KICogQWRkIGRvY3VtZW50YXRp b24gYWJvdXQgc3lzZnMgdHVuYWJsZS4KQ2hhbmdlcyBzaW5jZSB2MToKICogQ2hhbmdlZCBzb21l IG1vZHVsZV9wYXJhbSB0byBkZWZpbmVzLgogKiBSZXBsYWNlIGEgV0FSTl9PTiB3aXRoIGEgcmF0 ZSBsaW1pdGVkIHByaW50IGlmIHdlIGZvdW5kIG91dCB3ZSBhcmUKICAgdXNpbmcgdGhlIHNhbWUg Z3JhbnQgaW4gZGlmZmVyZW50IHNlZ21lbnRzIGNvbmN1cnJlbnRseSBhbmQgcmV0dXJuCiAgIE5V TEwuCiAqIFJlbmFtZSBQRVJTSVNURU5UX0dOVF9VU0VEIHRvIFBFUlNJU1RFTlRfR05UX1dBU19B Q1RJVkUuCiAqIEltcHJvdmUgZG9jdW1lbnRhdGlvbiBieSBhZGRpbmcgd2hhdCBjb25kaXRpb24g bWFrZXMgdGhlIExSVSBraWNrCiAgIGluLCBhbmQgdGhlIHRpbWUgaW50ZXJ2YWwgYW5kIG51bWJl ciBvZiBncmFudHMgcmVtb3ZlZCBhdCBlYWNoCiAgIGl0ZXJhdGlvbi4KLS0tCiBEb2N1bWVudGF0 aW9uL0FCSS9zdGFibGUvc3lzZnMtYnVzLXhlbi1iYWNrZW5kIHwgICAxMCArCiBkcml2ZXJzL2Js b2NrL3hlbi1ibGtiYWNrL2Jsa2JhY2suYyAgICAgICAgICAgIHwgIDI4NyArKysrKysrKysrKysr KysrKysrLS0tLS0KIGRyaXZlcnMvYmxvY2sveGVuLWJsa2JhY2svY29tbW9uLmggICAgICAgICAg ICAgfCAgIDE4ICsrCiBkcml2ZXJzL2Jsb2NrL3hlbi1ibGtiYWNrL3hlbmJ1cy5jICAgICAgICAg ICAgIHwgICAgMiArCiA0IGZpbGVzIGNoYW5nZWQsIDI2MCBpbnNlcnRpb25zKCspLCA1NyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL0FCSS9zdGFibGUvc3lzZnMtYnVz LXhlbi1iYWNrZW5kIGIvRG9jdW1lbnRhdGlvbi9BQkkvc3RhYmxlL3N5c2ZzLWJ1cy14ZW4tYmFj a2VuZAppbmRleCBlMDRhZmUwLi45NDdkYjExIDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL0FC SS9zdGFibGUvc3lzZnMtYnVzLXhlbi1iYWNrZW5kCisrKyBiL0RvY3VtZW50YXRpb24vQUJJL3N0 YWJsZS9zeXNmcy1idXMteGVuLWJhY2tlbmQKQEAgLTgxLDMgKzgxLDEzIEBAIENvbnRhY3Q6ICAg ICAgICBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVAY2l0cml4LmNvbT4KIERlc2NyaXB0aW9u OgogICAgICAgICAgICAgICAgIE1heGltdW0gbnVtYmVyIG9mIGZyZWUgcGFnZXMgdG8ga2VlcCBp biBlYWNoIGJsb2NrCiAgICAgICAgICAgICAgICAgYmFja2VuZCBidWZmZXIuCisKK1doYXQ6ICAg ICAgICAgICAvc3lzL21vZHVsZS94ZW5fYmxrYmFjay9wYXJhbWV0ZXJzL21heF9wZXJzaXN0ZW50 X2dyYW50cworRGF0ZTogICAgICAgICAgIE1hcmNoIDIwMTMKK0tlcm5lbFZlcnNpb246ICAzLjEw CitDb250YWN0OiAgICAgICAgUm9nZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1QGNpdHJpeC5jb20+ CitEZXNjcmlwdGlvbjoKKyAgICAgICAgICAgICAgICBNYXhpbXVtIG51bWJlciBvZiBncmFudHMg dG8gbWFwIHBlcnNpc3RlbnRseSBpbgorICAgICAgICAgICAgICAgIGJsa2JhY2suIElmIHRoZSBm cm9udGVuZCB0cmllcyB0byB1c2UgbW9yZSB0aGFuCisgICAgICAgICAgICAgICAgbWF4X3BlcnNp c3RlbnRfZ3JhbnRzLCB0aGUgTFJVIGtpY2tzIGluIGFuZCBzdGFydHMKKyAgICAgICAgICAgICAg ICByZW1vdmluZyA1JSBvZiBtYXhfcGVyc2lzdGVudF9ncmFudHMgZXZlcnkgMTAwbXMuCmRpZmYg LS1naXQgYS9kcml2ZXJzL2Jsb2NrL3hlbi1ibGtiYWNrL2Jsa2JhY2suYyBiL2RyaXZlcnMvYmxv Y2sveGVuLWJsa2JhY2svYmxrYmFjay5jCmluZGV4IDgyNDVjNmIuLjE3MDUyZjcgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvYmxvY2sveGVuLWJsa2JhY2svYmxrYmFjay5jCisrKyBiL2RyaXZlcnMvYmxv Y2sveGVuLWJsa2JhY2svYmxrYmFjay5jCkBAIC03OCw2ICs3OCwzNiBAQCBtb2R1bGVfcGFyYW1f bmFtZWQobWF4X2J1ZmZlcl9wYWdlcywgeGVuX2Jsa2lmX21heF9idWZmZXJfcGFnZXMsIGludCwg MDY0NCk7CiBNT0RVTEVfUEFSTV9ERVNDKG1heF9idWZmZXJfcGFnZXMsCiAiTWF4aW11bSBudW1i ZXIgb2YgZnJlZSBwYWdlcyB0byBrZWVwIGluIGVhY2ggYmxvY2sgYmFja2VuZCBidWZmZXIiKTsK IAorLyoKKyAqIE1heGltdW0gbnVtYmVyIG9mIGdyYW50cyB0byBtYXAgcGVyc2lzdGVudGx5IGlu IGJsa2JhY2suIEZvciBtYXhpbXVtCisgKiBwZXJmb3JtYW5jZSB0aGlzIHNob3VsZCBiZSB0aGUg dG90YWwgbnVtYmVycyBvZiBncmFudHMgdGhhdCBjYW4gYmUgdXNlZAorICogdG8gZmlsbCB0aGUg cmluZywgYnV0IHNpbmNlIHRoaXMgbWlnaHQgYmVjb21lIHRvbyBoaWdoLCBzcGVjaWFsbHkgd2l0 aAorICogdGhlIHVzZSBvZiBpbmRpcmVjdCBkZXNjcmlwdG9ycywgd2Ugc2V0IGl0IHRvIGEgdmFs dWUgdGhhdCBwcm92aWRlcyBnb29kCisgKiBwZXJmb3JtYW5jZSB3aXRob3V0IHVzaW5nIHRvbyBt dWNoIG1lbW9yeS4KKyAqCisgKiBXaGVuIHRoZSBsaXN0IG9mIHBlcnNpc3RlbnQgZ3JhbnRzIGlz IGZ1bGwgd2UgY2xlYW4gaXQgdXAgdXNpbmcgYSBMUlUKKyAqIGFsZ29yaXRobS4KKyAqLworCitz dGF0aWMgaW50IHhlbl9ibGtpZl9tYXhfcGdyYW50cyA9IDM1MjsKK21vZHVsZV9wYXJhbV9uYW1l ZChtYXhfcGVyc2lzdGVudF9ncmFudHMsIHhlbl9ibGtpZl9tYXhfcGdyYW50cywgaW50LCAwNjQ0 KTsKK01PRFVMRV9QQVJNX0RFU0MobWF4X3BlcnNpc3RlbnRfZ3JhbnRzLAorICAgICAgICAgICAg ICAgICAiTWF4aW11bSBudW1iZXIgb2YgZ3JhbnRzIHRvIG1hcCBwZXJzaXN0ZW50bHkiKTsKKwor LyoKKyAqIFRoZSBMUlUgbWVjaGFuaXNtIHRvIGNsZWFuIHRoZSBsaXN0cyBvZiBwZXJzaXN0ZW50 IGdyYW50cyBuZWVkcyB0bworICogYmUgZXhlY3V0ZWQgcGVyaW9kaWNhbGx5LiBUaGUgdGltZSBp bnRlcnZhbCBiZXR3ZWVuIGNvbnNlY3V0aXZlIGV4ZWN1dGlvbnMKKyAqIG9mIHRoZSBwdXJnZSBt ZWNoYW5pc20gaXMgc2V0IGluIG1zLgorICovCisjZGVmaW5lIExSVV9JTlRFUlZBTCAxMDAKKwor LyoKKyAqIFdoZW4gdGhlIHBlcnNpc3RlbnQgZ3JhbnRzIGxpc3QgaXMgZnVsbCB3ZSB3aWxsIHJl bW92ZSB1bnVzZWQgZ3JhbnRzCisgKiBmcm9tIHRoZSBsaXN0LiBUaGUgcGVyY2VudCBudW1iZXIg b2YgZ3JhbnRzIHRvIGJlIHJlbW92ZWQgYXQgZWFjaCBMUlUKKyAqIGV4ZWN1dGlvbi4KKyAqLwor I2RlZmluZSBMUlVfUEVSQ0VOVF9DTEVBTiA1CisKIC8qIFJ1bi10aW1lIHN3aXRjaGFibGU6IC9z eXMvbW9kdWxlL2Jsa2JhY2svcGFyYW1ldGVycy8gKi8KIHN0YXRpYyB1bnNpZ25lZCBpbnQgbG9n X3N0YXRzOwogbW9kdWxlX3BhcmFtKGxvZ19zdGF0cywgaW50LCAwNjQ0KTsKQEAgLTk2LDggKzEy Niw4IEBAIHN0cnVjdCBwZW5kaW5nX3JlcSB7CiAJdW5zaWduZWQgc2hvcnQJCW9wZXJhdGlvbjsK IAlpbnQJCQlzdGF0dXM7CiAJc3RydWN0IGxpc3RfaGVhZAlmcmVlX2xpc3Q7Ci0JREVDTEFSRV9C SVRNQVAodW5tYXBfc2VnLCBCTEtJRl9NQVhfU0VHTUVOVFNfUEVSX1JFUVVFU1QpOwogCXN0cnVj dCBwYWdlCQkqcGFnZXNbQkxLSUZfTUFYX1NFR01FTlRTX1BFUl9SRVFVRVNUXTsKKwlzdHJ1Y3Qg cGVyc2lzdGVudF9nbnQJKnBlcnNpc3RlbnRfZ250c1tCTEtJRl9NQVhfU0VHTUVOVFNfUEVSX1JF UVVFU1RdOwogfTsKIAogI2RlZmluZSBCTEtCQUNLX0lOVkFMSURfSEFORExFICh+MCkKQEAgLTEx OSwzNiArMTQ5LDYgQEAgc3RydWN0IHhlbl9ibGtiayB7CiBzdGF0aWMgc3RydWN0IHhlbl9ibGti ayAqYmxrYms7CiAKIC8qCi0gKiBNYXhpbXVtIG51bWJlciBvZiBncmFudCBwYWdlcyB0aGF0IGNh biBiZSBtYXBwZWQgaW4gYmxrYmFjay4KLSAqIEJMS0lGX01BWF9TRUdNRU5UU19QRVJfUkVRVUVT VCAqIFJJTkdfU0laRSBpcyB0aGUgbWF4aW11bSBudW1iZXIgb2YKLSAqIHBhZ2VzIHRoYXQgYmxr YmFjayB3aWxsIHBlcnNpc3RlbnRseSBtYXAuCi0gKiBDdXJyZW50bHksIHRoaXMgaXM6Ci0gKiBS SU5HX1NJWkUgPSAzMiAoZm9yIGFsbCBrbm93biByaW5nIHR5cGVzKQotICogQkxLSUZfTUFYX1NF R01FTlRTX1BFUl9SRVFVRVNUID0gMTEKLSAqIHNpemVvZihzdHJ1Y3QgcGVyc2lzdGVudF9nbnQp ID0gNDgKLSAqIFNvIHRoZSBtYXhpbXVtIG1lbW9yeSB1c2VkIHRvIHN0b3JlIHRoZSBncmFudHMg aXM6Ci0gKiAzMiAqIDExICogNDggPSAxNjg5NiBieXRlcwotICovCi1zdGF0aWMgaW5saW5lIHVu c2lnbmVkIGludCBtYXhfbWFwcGVkX2dyYW50X3BhZ2VzKGVudW0gYmxraWZfcHJvdG9jb2wgcHJv dG9jb2wpCi17Ci0Jc3dpdGNoIChwcm90b2NvbCkgewotCWNhc2UgQkxLSUZfUFJPVE9DT0xfTkFU SVZFOgotCQlyZXR1cm4gX19DT05TVF9SSU5HX1NJWkUoYmxraWYsIFBBR0VfU0laRSkgKgotCQkJ ICAgQkxLSUZfTUFYX1NFR01FTlRTX1BFUl9SRVFVRVNUOwotCWNhc2UgQkxLSUZfUFJPVE9DT0xf WDg2XzMyOgotCQlyZXR1cm4gX19DT05TVF9SSU5HX1NJWkUoYmxraWZfeDg2XzMyLCBQQUdFX1NJ WkUpICoKLQkJCSAgIEJMS0lGX01BWF9TRUdNRU5UU19QRVJfUkVRVUVTVDsKLQljYXNlIEJMS0lG X1BST1RPQ09MX1g4Nl82NDoKLQkJcmV0dXJuIF9fQ09OU1RfUklOR19TSVpFKGJsa2lmX3g4Nl82 NCwgUEFHRV9TSVpFKSAqCi0JCQkgICBCTEtJRl9NQVhfU0VHTUVOVFNfUEVSX1JFUVVFU1Q7Ci0J ZGVmYXVsdDoKLQkJQlVHKCk7Ci0JfQotCXJldHVybiAwOwotfQotCi0KLS8qCiAgKiBMaXR0bGUg aGVscGZ1bCBtYWNybyB0byBmaWd1cmUgb3V0IHRoZSBpbmRleCBhbmQgdmlydHVhbCBhZGRyZXNz IG9mIHRoZQogICogcGVuZGluZ19wYWdlc1suLl0uIEZvciBlYWNoICdwZW5kaW5nX3JlcScgd2Ug aGF2ZSBoYXZlIHVwIHRvCiAgKiBCTEtJRl9NQVhfU0VHTUVOVFNfUEVSX1JFUVVFU1QgKDExKSBw YWdlcy4gVGhlIHNlZyB3b3VsZCBiZSBmcm9tIDAgdGhyb3VnaApAQCAtMjM5LDEzICsyMzksMjkg QEAgc3RhdGljIHZvaWQgbWFrZV9yZXNwb25zZShzdHJ1Y3QgeGVuX2Jsa2lmICpibGtpZiwgdTY0 IGlkLAogCSAgICAgKG4pID0gKCYocG9zKS0+bm9kZSAhPSBOVUxMKSA/IHJiX25leHQoJihwb3Mp LT5ub2RlKSA6IE5VTEwpCiAKIAotc3RhdGljIGludCBhZGRfcGVyc2lzdGVudF9nbnQoc3RydWN0 IHJiX3Jvb3QgKnJvb3QsCisvKgorICogV2UgZG9uJ3QgbmVlZCBsb2NraW5nIGFyb3VuZCB0aGUg cGVyc2lzdGVudCBncmFudCBoZWxwZXJzCisgKiBiZWNhdXNlIGJsa2JhY2sgdXNlcyBhIHNpbmds ZS10aHJlYWQgZm9yIGVhY2ggYmFja2VkLCBzbyB3ZQorICogY2FuIGJlIHN1cmUgdGhhdCB0aGlz IGZ1bmN0aW9ucyB3aWxsIG5ldmVyIGJlIGNhbGxlZCByZWN1cnNpdmVseS4KKyAqCisgKiBUaGUg b25seSBleGNlcHRpb24gdG8gdGhhdCBpcyBwdXRfcGVyc2lzdGVudF9ncmFudCwgdGhhdCBjYW4g YmUgY2FsbGVkCisgKiBmcm9tIGludGVycnVwdCBjb250ZXh0IChieSB4ZW5fYmxrYmtfdW5tYXAp LCBzbyB3ZSBoYXZlIHRvIHVzZSBhdG9taWMKKyAqIGJpdCBvcGVyYXRpb25zIHRvIG1vZGlmeSB0 aGUgZmxhZ3Mgb2YgYSBwZXJzaXN0ZW50IGdyYW50IGFuZCB0byBjb3VudAorICogdGhlIG51bWJl ciBvZiB1c2VkIGdyYW50cy4KKyAqLworc3RhdGljIGludCBhZGRfcGVyc2lzdGVudF9nbnQoc3Ry dWN0IHhlbl9ibGtpZiAqYmxraWYsCiAJCQkgICAgICAgc3RydWN0IHBlcnNpc3RlbnRfZ250ICpw ZXJzaXN0ZW50X2dudCkKIHsKLQlzdHJ1Y3QgcmJfbm9kZSAqKm5ldyA9ICYocm9vdC0+cmJfbm9k ZSksICpwYXJlbnQgPSBOVUxMOworCXN0cnVjdCByYl9ub2RlICoqbmV3ID0gTlVMTCwgKnBhcmVu dCA9IE5VTEw7CiAJc3RydWN0IHBlcnNpc3RlbnRfZ250ICp0aGlzOwogCisJaWYgKGJsa2lmLT5w ZXJzaXN0ZW50X2dudF9jID49IHhlbl9ibGtpZl9tYXhfcGdyYW50cykgeworCQlpZiAoIWJsa2lm LT52YmQub3ZlcmZsb3dfbWF4X2dyYW50cykKKwkJCWJsa2lmLT52YmQub3ZlcmZsb3dfbWF4X2dy YW50cyA9IDE7CisJCXJldHVybiAtRUJVU1k7CisJfQogCS8qIEZpZ3VyZSBvdXQgd2hlcmUgdG8g cHV0IG5ldyBub2RlICovCisJbmV3ID0gJmJsa2lmLT5wZXJzaXN0ZW50X2dudHMucmJfbm9kZTsK IAl3aGlsZSAoKm5ldykgewogCQl0aGlzID0gY29udGFpbmVyX29mKCpuZXcsIHN0cnVjdCBwZXJz aXN0ZW50X2dudCwgbm9kZSk7CiAKQEAgLTI2MCwxOCArMjc2LDIzIEBAIHN0YXRpYyBpbnQgYWRk X3BlcnNpc3RlbnRfZ250KHN0cnVjdCByYl9yb290ICpyb290LAogCQl9CiAJfQogCisJYml0bWFw X3plcm8ocGVyc2lzdGVudF9nbnQtPmZsYWdzLCBQRVJTSVNURU5UX0dOVF9GTEFHU19TSVpFKTsK KwlzZXRfYml0KFBFUlNJU1RFTlRfR05UX0FDVElWRSwgcGVyc2lzdGVudF9nbnQtPmZsYWdzKTsK IAkvKiBBZGQgbmV3IG5vZGUgYW5kIHJlYmFsYW5jZSB0cmVlLiAqLwogCXJiX2xpbmtfbm9kZSgm KHBlcnNpc3RlbnRfZ250LT5ub2RlKSwgcGFyZW50LCBuZXcpOwotCXJiX2luc2VydF9jb2xvcigm KHBlcnNpc3RlbnRfZ250LT5ub2RlKSwgcm9vdCk7CisJcmJfaW5zZXJ0X2NvbG9yKCYocGVyc2lz dGVudF9nbnQtPm5vZGUpLCAmYmxraWYtPnBlcnNpc3RlbnRfZ250cyk7CisJYmxraWYtPnBlcnNp c3RlbnRfZ250X2MrKzsKKwlhdG9taWNfaW5jKCZibGtpZi0+cGVyc2lzdGVudF9nbnRfaW5fdXNl KTsKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHN0cnVjdCBwZXJzaXN0ZW50X2dudCAqZ2V0X3Bl cnNpc3RlbnRfZ250KHN0cnVjdCByYl9yb290ICpyb290LAorc3RhdGljIHN0cnVjdCBwZXJzaXN0 ZW50X2dudCAqZ2V0X3BlcnNpc3RlbnRfZ250KHN0cnVjdCB4ZW5fYmxraWYgKmJsa2lmLAogCQkJ CQkJIGdyYW50X3JlZl90IGdyZWYpCiB7CiAJc3RydWN0IHBlcnNpc3RlbnRfZ250ICpkYXRhOwot CXN0cnVjdCByYl9ub2RlICpub2RlID0gcm9vdC0+cmJfbm9kZTsKKwlzdHJ1Y3QgcmJfbm9kZSAq bm9kZSA9IE5VTEw7CiAKKwlub2RlID0gYmxraWYtPnBlcnNpc3RlbnRfZ250cy5yYl9ub2RlOwog CXdoaWxlIChub2RlKSB7CiAJCWRhdGEgPSBjb250YWluZXJfb2Yobm9kZSwgc3RydWN0IHBlcnNp c3RlbnRfZ250LCBub2RlKTsKIApAQCAtMjc5LDEyICszMDAsMjkgQEAgc3RhdGljIHN0cnVjdCBw ZXJzaXN0ZW50X2dudCAqZ2V0X3BlcnNpc3RlbnRfZ250KHN0cnVjdCByYl9yb290ICpyb290LAog CQkJbm9kZSA9IG5vZGUtPnJiX2xlZnQ7CiAJCWVsc2UgaWYgKGdyZWYgPiBkYXRhLT5nbnQpCiAJ CQlub2RlID0gbm9kZS0+cmJfcmlnaHQ7Ci0JCWVsc2UKKwkJZWxzZSB7CisJCQlpZih0ZXN0X2Jp dChQRVJTSVNURU5UX0dOVF9BQ1RJVkUsIGRhdGEtPmZsYWdzKSkgeworCQkJCXByX2FsZXJ0X3Jh dGVsaW1pdGVkKERSVl9QRlggIiByZXF1ZXN0aW5nIGEgZ3JhbnQgYWxyZWFkeSBpbiB1c2VcbiIp OworCQkJCXJldHVybiBOVUxMOworCQkJfQorCQkJc2V0X2JpdChQRVJTSVNURU5UX0dOVF9BQ1RJ VkUsIGRhdGEtPmZsYWdzKTsKKwkJCWF0b21pY19pbmMoJmJsa2lmLT5wZXJzaXN0ZW50X2dudF9p bl91c2UpOwogCQkJcmV0dXJuIGRhdGE7CisJCX0KIAl9CiAJcmV0dXJuIE5VTEw7CiB9CiAKK3N0 YXRpYyB2b2lkIHB1dF9wZXJzaXN0ZW50X2dudChzdHJ1Y3QgeGVuX2Jsa2lmICpibGtpZiwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgcGVyc2lzdGVudF9nbnQgKnBlcnNp c3RlbnRfZ250KQoreworCWlmKCF0ZXN0X2JpdChQRVJTSVNURU5UX0dOVF9BQ1RJVkUsIHBlcnNp c3RlbnRfZ250LT5mbGFncykpCisJICAgICAgICAgIHByX2FsZXJ0X3JhdGVsaW1pdGVkKERSVl9Q RlggIiBmcmVlaW5nIGEgZ3JhbnQgYWxyZWFkeSB1bnVzZWQiKTsKKwlzZXRfYml0KFBFUlNJU1RF TlRfR05UX1dBU19BQ1RJVkUsIHBlcnNpc3RlbnRfZ250LT5mbGFncyk7CisJY2xlYXJfYml0KFBF UlNJU1RFTlRfR05UX0FDVElWRSwgcGVyc2lzdGVudF9nbnQtPmZsYWdzKTsKKwlhdG9taWNfZGVj KCZibGtpZi0+cGVyc2lzdGVudF9nbnRfaW5fdXNlKTsKK30KKwogc3RhdGljIHZvaWQgZnJlZV9w ZXJzaXN0ZW50X2dudHMoc3RydWN0IHhlbl9ibGtpZiAqYmxraWYsIHN0cnVjdCByYl9yb290ICpy b290LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IG51bSkK IHsKQEAgLTMyMiw2ICszNjAsMTI5IEBAIHN0YXRpYyB2b2lkIGZyZWVfcGVyc2lzdGVudF9nbnRz KHN0cnVjdCB4ZW5fYmxraWYgKmJsa2lmLCBzdHJ1Y3QgcmJfcm9vdCAqcm9vdCwKIAlCVUdfT04o bnVtICE9IDApOwogfQogCitzdGF0aWMgdm9pZCB1bm1hcF9wdXJnZWRfZ3JhbnRzKHN0cnVjdCB3 b3JrX3N0cnVjdCAqd29yaykKK3sKKwlzdHJ1Y3QgZ250dGFiX3VubWFwX2dyYW50X3JlZiB1bm1h cFtCTEtJRl9NQVhfU0VHTUVOVFNfUEVSX1JFUVVFU1RdOworCXN0cnVjdCBwYWdlICpwYWdlc1tC TEtJRl9NQVhfU0VHTUVOVFNfUEVSX1JFUVVFU1RdOworCXN0cnVjdCBwZXJzaXN0ZW50X2dudCAq cGVyc2lzdGVudF9nbnQ7CisJaW50IHJldCwgc2Vnc190b191bm1hcCA9IDA7CisJc3RydWN0IHhl bl9ibGtpZiAqYmxraWYgPSBjb250YWluZXJfb2Yod29yaywgdHlwZW9mKCpibGtpZiksIHBlcnNp c3RlbnRfcHVyZ2Vfd29yayk7CisKKwl3aGlsZSghbGlzdF9lbXB0eSgmYmxraWYtPnBlcnNpc3Rl bnRfcHVyZ2VfbGlzdCkpIHsKKwkJcGVyc2lzdGVudF9nbnQgPSBsaXN0X2ZpcnN0X2VudHJ5KCZi bGtpZi0+cGVyc2lzdGVudF9wdXJnZV9saXN0LAorCQkgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc3RydWN0IHBlcnNpc3RlbnRfZ250LAorCQkgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmVtb3ZlX25vZGUpOworCQlsaXN0X2RlbCgmcGVyc2lzdGVudF9nbnQtPnJl bW92ZV9ub2RlKTsKKworCQlnbnR0YWJfc2V0X3VubWFwX29wKCZ1bm1hcFtzZWdzX3RvX3VubWFw XSwKKwkJCXZhZGRyKHBlcnNpc3RlbnRfZ250LT5wYWdlKSwKKwkJCUdOVE1BUF9ob3N0X21hcCwK KwkJCXBlcnNpc3RlbnRfZ250LT5oYW5kbGUpOworCisJCXBhZ2VzW3NlZ3NfdG9fdW5tYXBdID0g cGVyc2lzdGVudF9nbnQtPnBhZ2U7CisKKwkJaWYgKCsrc2Vnc190b191bm1hcCA9PSBCTEtJRl9N QVhfU0VHTUVOVFNfUEVSX1JFUVVFU1QpIHsKKwkJCXJldCA9IGdudHRhYl91bm1hcF9yZWZzKHVu bWFwLCBOVUxMLCBwYWdlcywKKwkJCQlzZWdzX3RvX3VubWFwKTsKKwkJCUJVR19PTihyZXQpOwor CQkJcHV0X2ZyZWVfcGFnZXMoYmxraWYsIHBhZ2VzLCBzZWdzX3RvX3VubWFwKTsKKwkJCXNlZ3Nf dG9fdW5tYXAgPSAwOworCQl9CisJCWtmcmVlKHBlcnNpc3RlbnRfZ250KTsKKwl9CisJaWYgKHNl Z3NfdG9fdW5tYXAgPiAwKSB7CisJCXJldCA9IGdudHRhYl91bm1hcF9yZWZzKHVubWFwLCBOVUxM LCBwYWdlcywgc2Vnc190b191bm1hcCk7CisJCUJVR19PTihyZXQpOworCQlwdXRfZnJlZV9wYWdl cyhibGtpZiwgcGFnZXMsIHNlZ3NfdG9fdW5tYXApOworCX0KK30KKworc3RhdGljIHZvaWQgcHVy Z2VfcGVyc2lzdGVudF9nbnQoc3RydWN0IHhlbl9ibGtpZiAqYmxraWYpCit7CisJc3RydWN0IHBl cnNpc3RlbnRfZ250ICpwZXJzaXN0ZW50X2dudDsKKwlzdHJ1Y3QgcmJfbm9kZSAqbjsKKwl1bnNp Z25lZCBpbnQgbnVtX2NsZWFuLCB0b3RhbDsKKwlib29sIHNjYW5fdXNlZCA9IGZhbHNlOworCXN0 cnVjdCByYl9yb290ICpyb290OworCisJaWYgKGJsa2lmLT5wZXJzaXN0ZW50X2dudF9jIDwgeGVu X2Jsa2lmX21heF9wZ3JhbnRzIHx8CisJICAgIChibGtpZi0+cGVyc2lzdGVudF9nbnRfYyA9PSB4 ZW5fYmxraWZfbWF4X3BncmFudHMgJiYKKwkgICAgIWJsa2lmLT52YmQub3ZlcmZsb3dfbWF4X2dy YW50cykpIHsKKwkJcmV0dXJuOworCX0KKworCWlmICh3b3JrX3BlbmRpbmcoJmJsa2lmLT5wZXJz aXN0ZW50X3B1cmdlX3dvcmspKSB7CisJCXByX2FsZXJ0X3JhdGVsaW1pdGVkKERSVl9QRlggIlNj aGVkdWxlZCB3b3JrIGZyb20gcHJldmlvdXMgcHVyZ2UgaXMgc3RpbGwgcGVuZGluZywgY2Fubm90 IHB1cmdlIGxpc3RcbiIpOworCQlyZXR1cm47CisJfQorCisJbnVtX2NsZWFuID0gKHhlbl9ibGtp Zl9tYXhfcGdyYW50cyAvIDEwMCkgKiBMUlVfUEVSQ0VOVF9DTEVBTjsKKwludW1fY2xlYW4gPSBi bGtpZi0+cGVyc2lzdGVudF9nbnRfYyAtIHhlbl9ibGtpZl9tYXhfcGdyYW50cyArIG51bV9jbGVh bjsKKwludW1fY2xlYW4gPSBtaW4oYmxraWYtPnBlcnNpc3RlbnRfZ250X2MsIG51bV9jbGVhbik7 CisJaWYgKG51bV9jbGVhbiA+CisJICAgIChibGtpZi0+cGVyc2lzdGVudF9nbnRfYyAtCisJICAg IGF0b21pY19yZWFkKCZibGtpZi0+cGVyc2lzdGVudF9nbnRfaW5fdXNlKSkpCisJCXJldHVybjsK KworCS8qCisJICogQXQgdGhpcyBwb2ludCwgd2UgY2FuIGFzc3VyZSB0aGF0IHRoZXJlIHdpbGwg YmUgbm8gY2FsbHMKKyAgICAgICAgICogdG8gZ2V0X3BlcnNpc3RlbnRfZ3JhbnQgKGJlY2F1c2Ug d2UgYXJlIGV4ZWN1dGluZyB0aGlzIGNvZGUgZnJvbQorICAgICAgICAgKiB4ZW5fYmxraWZfc2No ZWR1bGUpLCB0aGVyZSBjYW4gb25seSBiZSBjYWxscyB0byBwdXRfcGVyc2lzdGVudF9nbnQsCisg ICAgICAgICAqIHdoaWNoIG1lYW5zIHRoYXQgdGhlIG51bWJlciBvZiBjdXJyZW50bHkgdXNlZCBn cmFudHMgd2lsbCBnbyBkb3duLAorICAgICAgICAgKiBidXQgbmV2ZXIgdXAsIHNvIHdlIHdpbGwg YWx3YXlzIGJlIGFibGUgdG8gcmVtb3ZlIHRoZSByZXF1ZXN0ZWQKKyAgICAgICAgICogbnVtYmVy IG9mIGdyYW50cy4KKwkgKi8KKworCXRvdGFsID0gbnVtX2NsZWFuOworCisJcHJfZGVidWcoRFJW X1BGWCAiR29pbmcgdG8gcHVyZ2UgJXUgcGVyc2lzdGVudCBncmFudHNcbiIsIG51bV9jbGVhbik7 CisKKwlJTklUX0xJU1RfSEVBRCgmYmxraWYtPnBlcnNpc3RlbnRfcHVyZ2VfbGlzdCk7CisJcm9v dCA9ICZibGtpZi0+cGVyc2lzdGVudF9nbnRzOworcHVyZ2VfbGlzdDoKKwlmb3JlYWNoX2dyYW50 X3NhZmUocGVyc2lzdGVudF9nbnQsIG4sIHJvb3QsIG5vZGUpIHsKKwkJQlVHX09OKHBlcnNpc3Rl bnRfZ250LT5oYW5kbGUgPT0KKwkJCUJMS0JBQ0tfSU5WQUxJRF9IQU5ETEUpOworCisJCWlmICh0 ZXN0X2JpdChQRVJTSVNURU5UX0dOVF9BQ1RJVkUsIHBlcnNpc3RlbnRfZ250LT5mbGFncykpCisJ CQljb250aW51ZTsKKwkJaWYgKCFzY2FuX3VzZWQgJiYKKwkJICAgICh0ZXN0X2JpdChQRVJTSVNU RU5UX0dOVF9XQVNfQUNUSVZFLCBwZXJzaXN0ZW50X2dudC0+ZmxhZ3MpKSkKKwkJCWNvbnRpbnVl OworCisJCXJiX2VyYXNlKCZwZXJzaXN0ZW50X2dudC0+bm9kZSwgcm9vdCk7CisJCWxpc3RfYWRk KCZwZXJzaXN0ZW50X2dudC0+cmVtb3ZlX25vZGUsCisJCSAgICAgICAgICZibGtpZi0+cGVyc2lz dGVudF9wdXJnZV9saXN0KTsKKwkJaWYgKC0tbnVtX2NsZWFuID09IDApCisJCQlnb3RvIGZpbmlz aGVkOworCX0KKwkvKgorCSAqIElmIHdlIGdldCBoZXJlIGl0IG1lYW5zIHdlIGFsc28gbmVlZCB0 byBzdGFydCBjbGVhbmluZworCSAqIGdyYW50cyB0aGF0IHdlcmUgdXNlZCBzaW5jZSBsYXN0IHB1 cmdlIGluIG9yZGVyIHRvIGNvcGUKKwkgKiB3aXRoIHRoZSByZXF1ZXN0ZWQgbnVtCisJICovCisJ aWYgKCFzY2FuX3VzZWQpIHsKKwkJcHJfZGVidWcoRFJWX1BGWCAiU3RpbGwgbWlzc2luZyAldSBw dXJnZWQgZnJhbWVzXG4iLCBudW1fY2xlYW4pOworCQlzY2FuX3VzZWQgPSB0cnVlOworCQlnb3Rv IHB1cmdlX2xpc3Q7CisJfQorZmluaXNoZWQ6CisJLyogUmVtb3ZlIHRoZSAidXNlZCIgZmxhZyBm cm9tIGFsbCB0aGUgcGVyc2lzdGVudCBncmFudHMgKi8KKwlmb3JlYWNoX2dyYW50X3NhZmUocGVy c2lzdGVudF9nbnQsIG4sIHJvb3QsIG5vZGUpIHsKKwkJQlVHX09OKHBlcnNpc3RlbnRfZ250LT5o YW5kbGUgPT0KKwkJCUJMS0JBQ0tfSU5WQUxJRF9IQU5ETEUpOworCQljbGVhcl9iaXQoUEVSU0lT VEVOVF9HTlRfV0FTX0FDVElWRSwgcGVyc2lzdGVudF9nbnQtPmZsYWdzKTsKKwl9CisJYmxraWYt PnBlcnNpc3RlbnRfZ250X2MgLT0gKHRvdGFsIC0gbnVtX2NsZWFuKTsKKwlibGtpZi0+dmJkLm92 ZXJmbG93X21heF9ncmFudHMgPSAwOworCisJLyogV2UgY2FuIGRlZmVyIHRoaXMgd29yayAqLwor CUlOSVRfV09SSygmYmxraWYtPnBlcnNpc3RlbnRfcHVyZ2Vfd29yaywgdW5tYXBfcHVyZ2VkX2dy YW50cyk7CisJc2NoZWR1bGVfd29yaygmYmxraWYtPnBlcnNpc3RlbnRfcHVyZ2Vfd29yayk7CisJ cHJfZGVidWcoRFJWX1BGWCAiUHVyZ2VkICV1LyV1XG4iLCAodG90YWwgLSBudW1fY2xlYW4pLCB0 b3RhbCk7CisJcmV0dXJuOworfQorCiAvKgogICogUmV0cmlldmUgZnJvbSB0aGUgJ3BlbmRpbmdf cmVxcycgYSBmcmVlIHBlbmRpbmdfcmVxIHN0cnVjdHVyZSB0byBiZSB1c2VkLgogICovCkBAIC00 NTMsMTIgKzYxNCwxMiBAQCBpcnFyZXR1cm5fdCB4ZW5fYmxraWZfYmVfaW50KGludCBpcnEsIHZv aWQgKmRldl9pZCkKIHN0YXRpYyB2b2lkIHByaW50X3N0YXRzKHN0cnVjdCB4ZW5fYmxraWYgKmJs a2lmKQogewogCXByX2luZm8oInhlbi1ibGtiYWNrICglcyk6IG9vICUzbGx1ICB8ICByZCAlNGxs dSAgfCAgd3IgJTRsbHUgIHwgIGYgJTRsbHUiCi0JCSAiICB8ICBkcyAlNGxsdSB8IHBnOiAlNHUv JTR1XG4iLAorCQkgIiAgfCAgZHMgJTRsbHUgfCBwZzogJTR1LyU0ZFxuIiwKIAkJIGN1cnJlbnQt PmNvbW0sIGJsa2lmLT5zdF9vb19yZXEsCiAJCSBibGtpZi0+c3RfcmRfcmVxLCBibGtpZi0+c3Rf d3JfcmVxLAogCQkgYmxraWYtPnN0X2ZfcmVxLCBibGtpZi0+c3RfZHNfcmVxLAogCQkgYmxraWYt PnBlcnNpc3RlbnRfZ250X2MsCi0JCSBtYXhfbWFwcGVkX2dyYW50X3BhZ2VzKGJsa2lmLT5ibGtf cHJvdG9jb2wpKTsKKwkJIHhlbl9ibGtpZl9tYXhfcGdyYW50cyk7CiAJYmxraWYtPnN0X3ByaW50 ID0gamlmZmllcyArIG1zZWNzX3RvX2ppZmZpZXMoMTAgKiAxMDAwKTsKIAlibGtpZi0+c3RfcmRf cmVxID0gMDsKIAlibGtpZi0+c3Rfd3JfcmVxID0gMDsKQEAgLTQ3MCw2ICs2MzEsNyBAQCBpbnQg eGVuX2Jsa2lmX3NjaGVkdWxlKHZvaWQgKmFyZykKIHsKIAlzdHJ1Y3QgeGVuX2Jsa2lmICpibGtp ZiA9IGFyZzsKIAlzdHJ1Y3QgeGVuX3ZiZCAqdmJkID0gJmJsa2lmLT52YmQ7CisJdW5zaWduZWQg bG9uZyB0aW1lb3V0OwogCiAJeGVuX2Jsa2lmX2dldChibGtpZik7CiAKQEAgLTQ3OSwxMyArNjQx LDIxIEBAIGludCB4ZW5fYmxraWZfc2NoZWR1bGUodm9pZCAqYXJnKQogCQlpZiAodW5saWtlbHko dmJkLT5zaXplICE9IHZiZF9zeih2YmQpKSkKIAkJCXhlbl92YmRfcmVzaXplKGJsa2lmKTsKIAot CQl3YWl0X2V2ZW50X2ludGVycnVwdGlibGUoCisJCXRpbWVvdXQgPSBtc2Vjc190b19qaWZmaWVz KExSVV9JTlRFUlZBTCk7CisKKwkJdGltZW91dCA9IHdhaXRfZXZlbnRfaW50ZXJydXB0aWJsZV90 aW1lb3V0KAogCQkJYmxraWYtPndxLAotCQkJYmxraWYtPndhaXRpbmdfcmVxcyB8fCBrdGhyZWFk X3Nob3VsZF9zdG9wKCkpOwotCQl3YWl0X2V2ZW50X2ludGVycnVwdGlibGUoCisJCQlibGtpZi0+ d2FpdGluZ19yZXFzIHx8IGt0aHJlYWRfc2hvdWxkX3N0b3AoKSwKKwkJCXRpbWVvdXQpOworCQlp ZiAodGltZW91dCA9PSAwKQorCQkJZ290byBwdXJnZV9nbnRfbGlzdDsKKwkJdGltZW91dCA9IHdh aXRfZXZlbnRfaW50ZXJydXB0aWJsZV90aW1lb3V0KAogCQkJYmxrYmstPnBlbmRpbmdfZnJlZV93 cSwKIAkJCSFsaXN0X2VtcHR5KCZibGtiay0+cGVuZGluZ19mcmVlKSB8fAotCQkJa3RocmVhZF9z aG91bGRfc3RvcCgpKTsKKwkJCWt0aHJlYWRfc2hvdWxkX3N0b3AoKSwKKwkJCXRpbWVvdXQpOwor CQlpZiAodGltZW91dCA9PSAwKQorCQkJZ290byBwdXJnZV9nbnRfbGlzdDsKIAogCQlibGtpZi0+ d2FpdGluZ19yZXFzID0gMDsKIAkJc21wX21iKCk7IC8qIGNsZWFyIGZsYWcgKmJlZm9yZSogY2hl Y2tpbmcgZm9yIHdvcmsgKi8KQEAgLTQ5Myw2ICs2NjMsMTMgQEAgaW50IHhlbl9ibGtpZl9zY2hl ZHVsZSh2b2lkICphcmcpCiAJCWlmIChkb19ibG9ja19pb19vcChibGtpZikpCiAJCQlibGtpZi0+ d2FpdGluZ19yZXFzID0gMTsKIAorcHVyZ2VfZ250X2xpc3Q6CisJCWlmIChibGtpZi0+dmJkLmZl YXR1cmVfZ250X3BlcnNpc3RlbnQgJiYKKwkJICAgIHRpbWVfYWZ0ZXIoamlmZmllcywgYmxraWYt Pm5leHRfbHJ1KSkgeworCQkJcHVyZ2VfcGVyc2lzdGVudF9nbnQoYmxraWYpOworCQkJYmxraWYt Pm5leHRfbHJ1ID0gamlmZmllcyArIG1zZWNzX3RvX2ppZmZpZXMoTFJVX0lOVEVSVkFMKTsKKwkJ fQorCiAJCS8qIFNocmluayBpZiB3ZSBoYXZlIG1vcmUgdGhhbiB4ZW5fYmxraWZfbWF4X2J1ZmZl cl9wYWdlcyAqLwogCQlzaHJpbmtfZnJlZV9wYWdlcG9vbChibGtpZiwgeGVuX2Jsa2lmX21heF9i dWZmZXJfcGFnZXMpOwogCkBAIC01MzgsOCArNzE1LDEwIEBAIHN0YXRpYyB2b2lkIHhlbl9ibGti a191bm1hcChzdHJ1Y3QgcGVuZGluZ19yZXEgKnJlcSkKIAlpbnQgcmV0OwogCiAJZm9yIChpID0g MDsgaSA8IHJlcS0+bnJfcGFnZXM7IGkrKykgewotCQlpZiAoIXRlc3RfYml0KGksIHJlcS0+dW5t YXBfc2VnKSkKKwkJaWYgKHJlcS0+cGVyc2lzdGVudF9nbnRzW2ldICE9IE5VTEwpIHsKKwkJCXB1 dF9wZXJzaXN0ZW50X2dudChibGtpZiwgcmVxLT5wZXJzaXN0ZW50X2dudHNbaV0pOwogCQkJY29u dGludWU7CisJCX0KIAkJaGFuZGxlID0gcGVuZGluZ19oYW5kbGUocmVxLCBpKTsKIAkJcGFnZXNb aW52Y291bnRdID0gcmVxLT5wYWdlc1tpXTsKIAkJaWYgKGhhbmRsZSA9PSBCTEtCQUNLX0lOVkFM SURfSEFORExFKQpAQCAtNTYxLDggKzc0MCw4IEBAIHN0YXRpYyBpbnQgeGVuX2Jsa2JrX21hcChz dHJ1Y3QgYmxraWZfcmVxdWVzdCAqcmVxLAogCQkJIHN0cnVjdCBwYWdlICpwYWdlc1tdKQogewog CXN0cnVjdCBnbnR0YWJfbWFwX2dyYW50X3JlZiBtYXBbQkxLSUZfTUFYX1NFR01FTlRTX1BFUl9S RVFVRVNUXTsKLQlzdHJ1Y3QgcGVyc2lzdGVudF9nbnQgKnBlcnNpc3RlbnRfZ250c1tCTEtJRl9N QVhfU0VHTUVOVFNfUEVSX1JFUVVFU1RdOwogCXN0cnVjdCBwYWdlICpwYWdlc190b19nbnRbQkxL SUZfTUFYX1NFR01FTlRTX1BFUl9SRVFVRVNUXTsKKwlzdHJ1Y3QgcGVyc2lzdGVudF9nbnQgKipw ZXJzaXN0ZW50X2dudHMgPSBwZW5kaW5nX3JlcS0+cGVyc2lzdGVudF9nbnRzOwogCXN0cnVjdCBw ZXJzaXN0ZW50X2dudCAqcGVyc2lzdGVudF9nbnQgPSBOVUxMOwogCXN0cnVjdCB4ZW5fYmxraWYg KmJsa2lmID0gcGVuZGluZ19yZXEtPmJsa2lmOwogCXBoeXNfYWRkcl90IGFkZHIgPSAwOwpAQCAt NTc0LDkgKzc1Myw2IEBAIHN0YXRpYyBpbnQgeGVuX2Jsa2JrX21hcChzdHJ1Y3QgYmxraWZfcmVx dWVzdCAqcmVxLAogCiAJdXNlX3BlcnNpc3RlbnRfZ250cyA9IChibGtpZi0+dmJkLmZlYXR1cmVf Z250X3BlcnNpc3RlbnQpOwogCi0JQlVHX09OKGJsa2lmLT5wZXJzaXN0ZW50X2dudF9jID4KLQkJ ICAgbWF4X21hcHBlZF9ncmFudF9wYWdlcyhwZW5kaW5nX3JlcS0+YmxraWYtPmJsa19wcm90b2Nv bCkpOwotCiAJLyoKIAkgKiBGaWxsIG91dCBwcmVxLm5yX3NlY3RzIHdpdGggcHJvcGVyIGFtb3Vu dCBvZiBzZWN0b3JzLCBhbmQgc2V0dXAKIAkgKiBhc3NpZ24gbWFwWy4uXSB3aXRoIHRoZSBQRk4g b2YgdGhlIHBhZ2UgaW4gb3VyIGRvbWFpbiB3aXRoIHRoZQpAQCAtNTg3LDcgKzc2Myw3IEBAIHN0 YXRpYyBpbnQgeGVuX2Jsa2JrX21hcChzdHJ1Y3QgYmxraWZfcmVxdWVzdCAqcmVxLAogCiAJCWlm ICh1c2VfcGVyc2lzdGVudF9nbnRzKQogCQkJcGVyc2lzdGVudF9nbnQgPSBnZXRfcGVyc2lzdGVu dF9nbnQoCi0JCQkJJmJsa2lmLT5wZXJzaXN0ZW50X2dudHMsCisJCQkJYmxraWYsCiAJCQkJcmVx LT51LnJ3LnNlZ1tpXS5ncmVmKTsKIAogCQlpZiAocGVyc2lzdGVudF9nbnQpIHsKQEAgLTYyMyw3 ICs3OTksNiBAQCBzdGF0aWMgaW50IHhlbl9ibGtia19tYXAoc3RydWN0IGJsa2lmX3JlcXVlc3Qg KnJlcSwKIAkgKiBzbyB0aGF0IHdoZW4gd2UgYWNjZXNzIHZhZGRyKHBlbmRpbmdfcmVxLGkpIGl0 IGhhcyB0aGUgY29udGVudHMgb2YKIAkgKiB0aGUgcGFnZSBmcm9tIHRoZSBvdGhlciBkb21haW4u CiAJICovCi0JYml0bWFwX3plcm8ocGVuZGluZ19yZXEtPnVubWFwX3NlZywgQkxLSUZfTUFYX1NF R01FTlRTX1BFUl9SRVFVRVNUKTsKIAlmb3IgKHNlZ19pZHggPSAwLCBuZXdfbWFwX2lkeCA9IDA7 IHNlZ19pZHggPCBuc2VnOyBzZWdfaWR4KyspIHsKIAkJaWYgKCFwZXJzaXN0ZW50X2dudHNbc2Vn X2lkeF0pIHsKIAkJCS8qIFRoaXMgaXMgYSBuZXdseSBtYXBwZWQgZ3JhbnQgKi8KQEAgLTY0Niwx MSArODIxLDEwIEBAIHN0YXRpYyBpbnQgeGVuX2Jsa2JrX21hcChzdHJ1Y3QgYmxraWZfcmVxdWVz dCAqcmVxLAogCQkJZ290byBuZXh0OwogCQl9CiAJCWlmICh1c2VfcGVyc2lzdGVudF9nbnRzICYm Ci0JCSAgICBibGtpZi0+cGVyc2lzdGVudF9nbnRfYyA8Ci0JCSAgICBtYXhfbWFwcGVkX2dyYW50 X3BhZ2VzKGJsa2lmLT5ibGtfcHJvdG9jb2wpKSB7CisJCSAgICBibGtpZi0+cGVyc2lzdGVudF9n bnRfYyA8IHhlbl9ibGtpZl9tYXhfcGdyYW50cykgewogCQkJLyoKIAkJCSAqIFdlIGFyZSB1c2lu ZyBwZXJzaXN0ZW50IGdyYW50cywgdGhlIGdyYW50IGlzCi0JCQkgKiBub3QgbWFwcGVkIGJ1dCB3 ZSBoYXZlIHJvb20gZm9yIGl0CisJCQkgKiBub3QgbWFwcGVkIGJ1dCB3ZSBtaWdodCBoYXZlIHJv b20gZm9yIGl0LgogCQkJICovCiAJCQlwZXJzaXN0ZW50X2dudCA9IGttYWxsb2Moc2l6ZW9mKHN0 cnVjdCBwZXJzaXN0ZW50X2dudCksCiAJCQkJICAgICAgICAgICAgICAgICBHRlBfS0VSTkVMKTsK QEAgLTY2NSwxNiArODM5LDE2IEBAIHN0YXRpYyBpbnQgeGVuX2Jsa2JrX21hcChzdHJ1Y3QgYmxr aWZfcmVxdWVzdCAqcmVxLAogCQkJcGVyc2lzdGVudF9nbnQtPmdudCA9IG1hcFtuZXdfbWFwX2lk eF0ucmVmOwogCQkJcGVyc2lzdGVudF9nbnQtPmhhbmRsZSA9IG1hcFtuZXdfbWFwX2lkeF0uaGFu ZGxlOwogCQkJcGVyc2lzdGVudF9nbnQtPnBhZ2UgPSBwYWdlc1tzZWdfaWR4XTsKLQkJCWlmIChh ZGRfcGVyc2lzdGVudF9nbnQoJmJsa2lmLT5wZXJzaXN0ZW50X2dudHMsCisJCQlpZiAoYWRkX3Bl cnNpc3RlbnRfZ250KGJsa2lmLAogCQkJICAgICAgICAgICAgICAgICAgICAgICBwZXJzaXN0ZW50 X2dudCkpIHsKIAkJCQlrZnJlZShwZXJzaXN0ZW50X2dudCk7CiAJCQkJcGVyc2lzdGVudF9nbnQg PSBOVUxMOwogCQkJCWdvdG8gbmV4dF91bm1hcDsKIAkJCX0KLQkJCWJsa2lmLT5wZXJzaXN0ZW50 X2dudF9jKys7CisJCQlwZXJzaXN0ZW50X2dudHNbc2VnX2lkeF0gPSBwZXJzaXN0ZW50X2dudDsK IAkJCXByX2RlYnVnKERSVl9QRlggIiBncmFudCAldSBhZGRlZCB0byB0aGUgdHJlZSBvZiBwZXJz aXN0ZW50IGdyYW50cywgdXNpbmcgJXUvJXVcbiIsCiAJCQkJIHBlcnNpc3RlbnRfZ250LT5nbnQs IGJsa2lmLT5wZXJzaXN0ZW50X2dudF9jLAotCQkJCSBtYXhfbWFwcGVkX2dyYW50X3BhZ2VzKGJs a2lmLT5ibGtfcHJvdG9jb2wpKTsKKwkJCQkgeGVuX2Jsa2lmX21heF9wZ3JhbnRzKTsKIAkJCW5l d19tYXBfaWR4Kys7CiAJCQlnb3RvIG5leHQ7CiAJCX0KQEAgLTY4OCw3ICs4NjIsNiBAQCBuZXh0 X3VubWFwOgogCQkgKiBXZSBjb3VsZCBub3QgbWFwIHRoaXMgZ3JhbnQgcGVyc2lzdGVudGx5LCBz byB1c2UgaXQgYXMKIAkJICogYSBub24tcGVyc2lzdGVudCBncmFudC4KIAkJICovCi0JCWJpdG1h cF9zZXQocGVuZGluZ19yZXEtPnVubWFwX3NlZywgc2VnX2lkeCwgMSk7CiAJCW5ld19tYXBfaWR4 Kys7CiBuZXh0OgogCQlzZWdbc2VnX2lkeF0ub2Zmc2V0ID0gKHJlcS0+dS5ydy5zZWdbc2VnX2lk eF0uZmlyc3Rfc2VjdCA8PCA5KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvYmxvY2sveGVuLWJsa2Jh Y2svY29tbW9uLmggYi9kcml2ZXJzL2Jsb2NrL3hlbi1ibGtiYWNrL2NvbW1vbi5oCmluZGV4IDZj NzNjMzguLmFmOWJlZDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvYmxvY2sveGVuLWJsa2JhY2svY29t bW9uLmgKKysrIGIvZHJpdmVycy9ibG9jay94ZW4tYmxrYmFjay9jb21tb24uaApAQCAtMTgyLDEy ICsxODIsMjMgQEAgc3RydWN0IHhlbl92YmQgewogCiBzdHJ1Y3QgYmFja2VuZF9pbmZvOwogCisv KiBOdW1iZXIgb2YgYXZhaWxhYmxlIGZsYWdzICovCisjZGVmaW5lIFBFUlNJU1RFTlRfR05UX0ZM QUdTX1NJWkUJMgorLyogVGhpcyBwZXJzaXN0ZW50IGdyYW50IGlzIGN1cnJlbnRseSBpbiB1c2Ug Ki8KKyNkZWZpbmUgUEVSU0lTVEVOVF9HTlRfQUNUSVZFCQkwCisvKgorICogVGhpcyBwZXJzaXN0 ZW50IGdyYW50IGhhcyBiZWVuIHVzZWQsIHRoaXMgZmxhZyBpcyBzZXQgd2hlbiB3ZSByZW1vdmUg dGhlCisgKiBQRVJTSVNURU5UX0dOVF9BQ1RJVkUsIHRvIGtub3cgdGhhdCB0aGlzIGdyYW50IGhh cyBiZWVuIHVzZWQgcmVjZW50bHkuCisgKi8KKyNkZWZpbmUgUEVSU0lTVEVOVF9HTlRfV0FTX0FD VElWRQkxCiAKIHN0cnVjdCBwZXJzaXN0ZW50X2dudCB7CiAJc3RydWN0IHBhZ2UgKnBhZ2U7CiAJ Z3JhbnRfcmVmX3QgZ250OwogCWdyYW50X2hhbmRsZV90IGhhbmRsZTsKKwlERUNMQVJFX0JJVE1B UChmbGFncywgUEVSU0lTVEVOVF9HTlRfRkxBR1NfU0laRSk7CiAJc3RydWN0IHJiX25vZGUgbm9k ZTsKKwlzdHJ1Y3QgbGlzdF9oZWFkIHJlbW92ZV9ub2RlOwogfTsKIAogc3RydWN0IHhlbl9ibGtp ZiB7CkBAIC0yMTksNiArMjMwLDEyIEBAIHN0cnVjdCB4ZW5fYmxraWYgewogCS8qIHRyZWUgdG8g c3RvcmUgcGVyc2lzdGVudCBncmFudHMgKi8KIAlzdHJ1Y3QgcmJfcm9vdAkJcGVyc2lzdGVudF9n bnRzOwogCXVuc2lnbmVkIGludAkJcGVyc2lzdGVudF9nbnRfYzsKKwlhdG9taWNfdAkJcGVyc2lz dGVudF9nbnRfaW5fdXNlOworCXVuc2lnbmVkIGxvbmcgICAgICAgICAgIG5leHRfbHJ1OworCisJ LyogdXNlZCBieSB0aGUga3dvcmtlciB0aGF0IG9mZmxvYWQgd29yayBmcm9tIHRoZSBwZXJzaXN0 ZW50IHB1cmdlICovCisJc3RydWN0IGxpc3RfaGVhZAlwZXJzaXN0ZW50X3B1cmdlX2xpc3Q7CisJ c3RydWN0IHdvcmtfc3RydWN0CXBlcnNpc3RlbnRfcHVyZ2Vfd29yazsKIAogCS8qIGJ1ZmZlciBv ZiBmcmVlIHBhZ2VzIHRvIG1hcCBncmFudCByZWZzICovCiAJc3BpbmxvY2tfdAkJZnJlZV9wYWdl c19sb2NrOwpAQCAtMjYyLDYgKzI3OSw3IEBAIGludCB4ZW5fYmxraWZfeGVuYnVzX2luaXQodm9p ZCk7CiAKIGlycXJldHVybl90IHhlbl9ibGtpZl9iZV9pbnQoaW50IGlycSwgdm9pZCAqZGV2X2lk KTsKIGludCB4ZW5fYmxraWZfc2NoZWR1bGUodm9pZCAqYXJnKTsKK2ludCB4ZW5fYmxraWZfcHVy Z2VfcGVyc2lzdGVudCh2b2lkICphcmcpOwogCiBpbnQgeGVuX2Jsa2JrX2ZsdXNoX2Rpc2tjYWNo ZShzdHJ1Y3QgeGVuYnVzX3RyYW5zYWN0aW9uIHhidCwKIAkJCSAgICAgIHN0cnVjdCBiYWNrZW5k X2luZm8gKmJlLCBpbnQgc3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ibG9jay94ZW4tYmxr YmFjay94ZW5idXMuYyBiL2RyaXZlcnMvYmxvY2sveGVuLWJsa2JhY2sveGVuYnVzLmMKaW5kZXgg MjRmN2Y2ZC4uZTBmZDkyYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ibG9jay94ZW4tYmxrYmFjay94 ZW5idXMuYworKysgYi9kcml2ZXJzL2Jsb2NrL3hlbi1ibGtiYWNrL3hlbmJ1cy5jCkBAIC05OCw2 ICs5OCw3IEBAIHN0YXRpYyB2b2lkIHhlbl91cGRhdGVfYmxraWZfc3RhdHVzKHN0cnVjdCB4ZW5f YmxraWYgKmJsa2lmKQogCQllcnIgPSBQVFJfRVJSKGJsa2lmLT54ZW5ibGtkKTsKIAkJYmxraWYt PnhlbmJsa2QgPSBOVUxMOwogCQl4ZW5idXNfZGV2X2Vycm9yKGJsa2lmLT5iZS0+ZGV2LCBlcnIs ICJzdGFydCB4ZW5ibGtkIik7CisJCXJldHVybjsKIAl9CiB9CiAKQEAgLTEyMSw2ICsxMjIsNyBA QCBzdGF0aWMgc3RydWN0IHhlbl9ibGtpZiAqeGVuX2Jsa2lmX2FsbG9jKGRvbWlkX3QgZG9taWQp CiAJc3Bpbl9sb2NrX2luaXQoJmJsa2lmLT5mcmVlX3BhZ2VzX2xvY2spOwogCUlOSVRfTElTVF9I RUFEKCZibGtpZi0+ZnJlZV9wYWdlcyk7CiAJYmxraWYtPmZyZWVfcGFnZXNfbnVtID0gMDsKKwlh dG9taWNfc2V0KCZibGtpZi0+cGVyc2lzdGVudF9nbnRfaW5fdXNlLCAwKTsKIAogCXJldHVybiBi bGtpZjsKIH0KLS0gCjEuNy43LjUgKEFwcGxlIEdpdC0yNikKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=