From: Roger Pau Monne Subject: [PATCH RFC 06/12] xen-blkback: implement LRU mechanism for persistent grants Date: Thu, 28 Feb 2013 11:28:49 +0100 Message-ID: <1362047335-26402-7-git-send-email-roger.pau@citrix.com> References: <1362047335-26402-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: <1362047335-26402-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 aGFzIHNldmVyYWwgcGFyYW1ldGVycyB0aGF0IGNhbiBiZSB0dW5lZCBieSB0aGUgdXNlcgpmcm9t IHN5c2ZzOgoKICogbWF4X3BlcnNpc3RlbnRfZ3JhbnRzOiBtYXhpbXVtIG51bWJlciBvZiBncmFu dHMgdGhhdCB3aWxsIGJlCiAgIHBlcnNpc3RlbnRseSBtYXBwZWQuCiAqIGxydV9pbnRlcnZhbDog bWluaW11bSBpbnRlcnZhbCAoaW4gbXMpIGF0IHdoaWNoIHRoZSBMUlUgc2hvdWxkIGJlCiAgIHJ1 bgogKiBscnVfbnVtX2NsZWFuOiBudW1iZXIgb2YgcGVyc2lzdGVudCBncmFudHMgdG8gcmVtb3Zl IHdoZW4gZXhlY3V0aW5nCiAgIHRoZSBMUlUuCgpTaWduZWQtb2ZmLWJ5OiBSb2dlciBQYXUgTW9u bsOpIDxyb2dlci5wYXVAY2l0cml4LmNvbT4KQ2M6IEtvbnJhZCBSemVzenV0ZWsgV2lsayA8a29u cmFkLndpbGtAb3JhY2xlLmNvbT4KQ2M6IHhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCi0tLQogZHJp dmVycy9ibG9jay94ZW4tYmxrYmFjay9ibGtiYWNrLmMgfCAgMjA3ICsrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2Jsb2NrL3hlbi1ibGtiYWNrL2NvbW1vbi5oICB8 ICAgIDQgKwogZHJpdmVycy9ibG9jay94ZW4tYmxrYmFjay94ZW5idXMuYyAgfCAgICAxICsKIDMg ZmlsZXMgY2hhbmdlZCwgMTY2IGluc2VydGlvbnMoKyksIDQ2IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvYmxvY2sveGVuLWJsa2JhY2svYmxrYmFjay5jIGIvZHJpdmVycy9ibG9j ay94ZW4tYmxrYmFjay9ibGtiYWNrLmMKaW5kZXggNDE1YTBjNy4uYzE0YjczNiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ibG9jay94ZW4tYmxrYmFjay9ibGtiYWNrLmMKKysrIGIvZHJpdmVycy9ibG9j ay94ZW4tYmxrYmFjay9ibGtiYWNrLmMKQEAgLTYzLDYgKzYzLDQ0IEBAIHN0YXRpYyBpbnQgeGVu X2Jsa2lmX3JlcXMgPSA2NDsKIG1vZHVsZV9wYXJhbV9uYW1lZChyZXFzLCB4ZW5fYmxraWZfcmVx cywgaW50LCAwKTsKIE1PRFVMRV9QQVJNX0RFU0MocmVxcywgIk51bWJlciBvZiBibGtiYWNrIHJl cXVlc3RzIHRvIGFsbG9jYXRlIik7CiAKKy8qCisgKiBNYXhpbXVtIG51bWJlciBvZiBncmFudHMg dG8gbWFwIHBlcnNpc3RlbnRseSBpbiBibGtiYWNrLiBGb3IgbWF4aW11bQorICogcGVyZm9ybWFu Y2UgdGhpcyBzaG91bGQgYmUgdGhlIHRvdGFsIG51bWJlcnMgb2YgZ3JhbnRzIHRoYXQgY2FuIGJl IHVzZWQKKyAqIHRvIGZpbGwgdGhlIHJpbmcsIGJ1dCBzaW5jZSB0aGlzIG1pZ2h0IGJlY29tZSB0 b28gaGlnaCwgc3BlY2lhbGx5IHdpdGgKKyAqIHRoZSB1c2Ugb2YgaW5kaXJlY3QgZGVzY3JpcHRv cnMsIHdlIHNldCBpdCB0byBhIHZhbHVlIHRoYXQgcHJvdmlkZXMgZ29vZAorICogcGVyZm9ybWFu Y2Ugd2l0aG91dCB1c2luZyB0b28gbXVjaCBtZW1vcnkuCisgKgorICogV2hlbiB0aGUgbGlzdCBv ZiBwZXJzaXN0ZW50IGdyYW50cyBpcyBmdWxsIHdlIGNsZWFuIGl0IHVzaW5nIGEgTFJVCisgKiBh bGdvcml0aG0uCisgKi8KKworc3RhdGljIGludCB4ZW5fYmxraWZfbWF4X3BncmFudHMgPSAzNTI7 Cittb2R1bGVfcGFyYW1fbmFtZWQobWF4X3BlcnNpc3RlbnRfZ3JhbnRzLCB4ZW5fYmxraWZfbWF4 X3BncmFudHMsIGludCwgMDY0NCk7CitNT0RVTEVfUEFSTV9ERVNDKG1heF9wZXJzaXN0ZW50X2dy YW50cywKKyAgICAgICAgICAgICAgICAgIk1heGltdW0gbnVtYmVyIG9mIGdyYW50cyB0byBtYXAg cGVyc2lzdGVudGx5Iik7CisKKy8qCisgKiBUaGUgTFJVIG1lY2hhbmlzbSB0byBjbGVhbiB0aGUg bGlzdHMgb2YgcGVyc2lzdGVudCBncmFudHMgbmVlZHMgdG8KKyAqIGJlIGV4ZWN1dGVkIHBlcmlv ZGljYWxseS4gVGhlIHRpbWUgaW50ZXJ2YWwgYmV0d2VlbiBjb25zZWN1dGl2ZSBleGVjdXRpb25z CisgKiBvZiB0aGUgcHVyZ2UgbWVjaGFuaXNtIGlzIHNldCBpbiBtcy4KKyAqLworCitzdGF0aWMg aW50IHhlbl9ibGtpZl9scnVfaW50ZXJ2YWwgPSAxMDA7Cittb2R1bGVfcGFyYW1fbmFtZWQobHJ1 X2ludGVydmFsLCB4ZW5fYmxraWZfbHJ1X2ludGVydmFsLCBpbnQsIDA2NDQpOworTU9EVUxFX1BB Uk1fREVTQyhscnVfaW50ZXJ2YWwsCisiRXhlY3V0aW9uIGludGVydmFsIChpbiBtcykgb2YgdGhl IExSVSBtZWNoYW5pc20gdG8gY2xlYW4gdGhlIGxpc3Qgb2YgcGVyc2lzdGVudCBncmFudHMiKTsK KworLyoKKyAqIFdoZW4gdGhlIHBlcnNpc3RlbnQgZ3JhbnRzIGxpc3QgaXMgZnVsbCB3ZSB3aWxs IHJlbW92ZSB1bnVzZWQgZ3JhbnRzCisgKiBmcm9tIHRoZSBsaXN0LiBUaGUgbnVtYmVyIG9mIGdy YW50cyB0byBiZSByZW1vdmVkIGF0IGVhY2ggTFJVIGV4ZWN1dGlvbgorICogY2FuIGJlIHNldCBk eW5hbWljYWxseS4KKyAqLworCitzdGF0aWMgaW50IHhlbl9ibGtpZl9scnVfbnVtX2NsZWFuID0g QkxLSUZfTUFYX1NFR01FTlRTX1BFUl9SRVFVRVNUOworbW9kdWxlX3BhcmFtX25hbWVkKGxydV9u dW1fY2xlYW4sIHhlbl9ibGtpZl9scnVfbnVtX2NsZWFuLCBpbnQsIDA2NDQpOworTU9EVUxFX1BB Uk1fREVTQyhscnVfbnVtX2NsZWFuLAorIk51bWJlciBvZiBwZXJzaXN0ZW50IGdyYW50cyB0byB1 bm1hcCB3aGVuIHRoZSBsaXN0IGlzIGZ1bGwiKTsKKwogLyogUnVuLXRpbWUgc3dpdGNoYWJsZTog L3N5cy9tb2R1bGUvYmxrYmFjay9wYXJhbWV0ZXJzLyAqLwogc3RhdGljIHVuc2lnbmVkIGludCBs b2dfc3RhdHM7CiBtb2R1bGVfcGFyYW0obG9nX3N0YXRzLCBpbnQsIDA2NDQpOwpAQCAtODEsNyAr MTE5LDcgQEAgc3RydWN0IHBlbmRpbmdfcmVxIHsKIAl1bnNpZ25lZCBzaG9ydAkJb3BlcmF0aW9u OwogCWludAkJCXN0YXR1czsKIAlzdHJ1Y3QgbGlzdF9oZWFkCWZyZWVfbGlzdDsKLQlERUNMQVJF X0JJVE1BUCh1bm1hcF9zZWcsIEJMS0lGX01BWF9TRUdNRU5UU19QRVJfUkVRVUVTVCk7CisJc3Ry dWN0IHBlcnNpc3RlbnRfZ250CSpwZXJzaXN0ZW50X2dudHNbQkxLSUZfTUFYX1NFR01FTlRTX1BF Ul9SRVFVRVNUXTsKIH07CiAKICNkZWZpbmUgQkxLQkFDS19JTlZBTElEX0hBTkRMRSAofjApCkBA IC0xMDIsMzYgKzE0MCw2IEBAIHN0cnVjdCB4ZW5fYmxrYmsgewogc3RhdGljIHN0cnVjdCB4ZW5f YmxrYmsgKmJsa2JrOwogCiAvKgotICogTWF4aW11bSBudW1iZXIgb2YgZ3JhbnQgcGFnZXMgdGhh dCBjYW4gYmUgbWFwcGVkIGluIGJsa2JhY2suCi0gKiBCTEtJRl9NQVhfU0VHTUVOVFNfUEVSX1JF UVVFU1QgKiBSSU5HX1NJWkUgaXMgdGhlIG1heGltdW0gbnVtYmVyIG9mCi0gKiBwYWdlcyB0aGF0 IGJsa2JhY2sgd2lsbCBwZXJzaXN0ZW50bHkgbWFwLgotICogQ3VycmVudGx5LCB0aGlzIGlzOgot ICogUklOR19TSVpFID0gMzIgKGZvciBhbGwga25vd24gcmluZyB0eXBlcykKLSAqIEJMS0lGX01B WF9TRUdNRU5UU19QRVJfUkVRVUVTVCA9IDExCi0gKiBzaXplb2Yoc3RydWN0IHBlcnNpc3RlbnRf Z250KSA9IDQ4Ci0gKiBTbyB0aGUgbWF4aW11bSBtZW1vcnkgdXNlZCB0byBzdG9yZSB0aGUgZ3Jh bnRzIGlzOgotICogMzIgKiAxMSAqIDQ4ID0gMTY4OTYgYnl0ZXMKLSAqLwotc3RhdGljIGlubGlu ZSB1bnNpZ25lZCBpbnQgbWF4X21hcHBlZF9ncmFudF9wYWdlcyhlbnVtIGJsa2lmX3Byb3RvY29s IHByb3RvY29sKQotewotCXN3aXRjaCAocHJvdG9jb2wpIHsKLQljYXNlIEJMS0lGX1BST1RPQ09M X05BVElWRToKLQkJcmV0dXJuIF9fQ09OU1RfUklOR19TSVpFKGJsa2lmLCBQQUdFX1NJWkUpICoK LQkJCSAgIEJMS0lGX01BWF9TRUdNRU5UU19QRVJfUkVRVUVTVDsKLQljYXNlIEJMS0lGX1BST1RP Q09MX1g4Nl8zMjoKLQkJcmV0dXJuIF9fQ09OU1RfUklOR19TSVpFKGJsa2lmX3g4Nl8zMiwgUEFH RV9TSVpFKSAqCi0JCQkgICBCTEtJRl9NQVhfU0VHTUVOVFNfUEVSX1JFUVVFU1Q7Ci0JY2FzZSBC TEtJRl9QUk9UT0NPTF9YODZfNjQ6Ci0JCXJldHVybiBfX0NPTlNUX1JJTkdfU0laRShibGtpZl94 ODZfNjQsIFBBR0VfU0laRSkgKgotCQkJICAgQkxLSUZfTUFYX1NFR01FTlRTX1BFUl9SRVFVRVNU OwotCWRlZmF1bHQ6Ci0JCUJVRygpOwotCX0KLQlyZXR1cm4gMDsKLX0KLQotCi0vKgogICogTGl0 dGxlIGhlbHBmdWwgbWFjcm8gdG8gZmlndXJlIG91dCB0aGUgaW5kZXggYW5kIHZpcnR1YWwgYWRk cmVzcyBvZiB0aGUKICAqIHBlbmRpbmdfcGFnZXNbLi5dLiBGb3IgZWFjaCAncGVuZGluZ19yZXEn IHdlIGhhdmUgaGF2ZSB1cCB0bwogICogQkxLSUZfTUFYX1NFR01FTlRTX1BFUl9SRVFVRVNUICgx MSkgcGFnZXMuIFRoZSBzZWcgd291bGQgYmUgZnJvbSAwIHRocm91Z2gKQEAgLTI1MSw2ICsyNTks NzYgQEAgc3RhdGljIHZvaWQgZnJlZV9wZXJzaXN0ZW50X2dudHMoc3RydWN0IHJiX3Jvb3QgKnJv b3QsIHVuc2lnbmVkIGludCBudW0pCiAJQlVHX09OKG51bSAhPSAwKTsKIH0KIAorc3RhdGljIGlu dCBwdXJnZV9wZXJzaXN0ZW50X2dudChzdHJ1Y3QgcmJfcm9vdCAqcm9vdCwgaW50IG51bSkKK3sK KwlzdHJ1Y3QgZ250dGFiX3VubWFwX2dyYW50X3JlZiB1bm1hcFtCTEtJRl9NQVhfU0VHTUVOVFNf UEVSX1JFUVVFU1RdOworCXN0cnVjdCBwYWdlICpwYWdlc1tCTEtJRl9NQVhfU0VHTUVOVFNfUEVS X1JFUVVFU1RdOworCXN0cnVjdCBwZXJzaXN0ZW50X2dudCAqcGVyc2lzdGVudF9nbnQ7CisJc3Ry dWN0IHJiX25vZGUgKm47CisJaW50IHJldCwgc2Vnc190b191bm1hcCA9IDA7CisJaW50IHJlcXVl c3RlZF9udW0gPSBudW07CisJaW50IHByZXNlcnZlX3VzZWQgPSAxOworCisJcHJfZGVidWcoIlJl cXVlc3RlZCB0aGUgcHVyZ2Ugb2YgJWQgcGVyc2lzdGVudCBncmFudHNcbiIsIG51bSk7CisKK3B1 cmdlX2xpc3Q6CisJZm9yZWFjaF9ncmFudF9zYWZlKHBlcnNpc3RlbnRfZ250LCBuLCByb290LCBu b2RlKSB7CisJCUJVR19PTihwZXJzaXN0ZW50X2dudC0+aGFuZGxlID09CisJCQlCTEtCQUNLX0lO VkFMSURfSEFORExFKTsKKworCQlpZiAocGVyc2lzdGVudF9nbnQtPmZsYWdzICYgUEVSU0lTVEVO VF9HTlRfQUNUSVZFKQorCQkJY29udGludWU7CisJCWlmIChwcmVzZXJ2ZV91c2VkICYmCisJCSAg ICAocGVyc2lzdGVudF9nbnQtPmZsYWdzICYgUEVSU0lTVEVOVF9HTlRfVVNFRCkpCisJCQljb250 aW51ZTsKKworCQlnbnR0YWJfc2V0X3VubWFwX29wKCZ1bm1hcFtzZWdzX3RvX3VubWFwXSwKKwkJ CSh1bnNpZ25lZCBsb25nKSBwZm5fdG9fa2FkZHIocGFnZV90b19wZm4oCisJCQkJcGVyc2lzdGVu dF9nbnQtPnBhZ2UpKSwKKwkJCUdOVE1BUF9ob3N0X21hcCwKKwkJCXBlcnNpc3RlbnRfZ250LT5o YW5kbGUpOworCisJCXBhZ2VzW3NlZ3NfdG9fdW5tYXBdID0gcGVyc2lzdGVudF9nbnQtPnBhZ2U7 CisKKwkJaWYgKCsrc2Vnc190b191bm1hcCA9PSBCTEtJRl9NQVhfU0VHTUVOVFNfUEVSX1JFUVVF U1QpIHsKKwkJCXJldCA9IGdudHRhYl91bm1hcF9yZWZzKHVubWFwLCBOVUxMLCBwYWdlcywKKwkJ CQlzZWdzX3RvX3VubWFwKTsKKwkJCUJVR19PTihyZXQpOworCQkJZnJlZV94ZW5iYWxsb29uZWRf cGFnZXMoc2Vnc190b191bm1hcCwgcGFnZXMpOworCQkJc2Vnc190b191bm1hcCA9IDA7CisJCX0K KworCQlyYl9lcmFzZSgmcGVyc2lzdGVudF9nbnQtPm5vZGUsIHJvb3QpOworCQlrZnJlZShwZXJz aXN0ZW50X2dudCk7CisJCWlmICgtLW51bSA9PSAwKQorCQkJZ290byBmaW5pc2hlZDsKKwl9CisJ LyoKKwkgKiBJZiB3ZSBnZXQgaGVyZSBpdCBtZWFucyB3ZSBhbHNvIG5lZWQgdG8gc3RhcnQgY2xl YW5pbmcKKwkgKiBncmFudHMgdGhhdCB3ZXJlIHVzZWQgc2luY2UgbGFzdCBwdXJnZSBpbiBvcmRl ciB0byBjb3BlCisJICogd2l0aCB0aGUgcmVxdWVzdGVkIG51bQorCSAqLworCWlmIChwcmVzZXJ2 ZV91c2VkKSB7CisJCXByX2RlYnVnKCJTdGlsbCBtaXNzaW5nICVkIHB1cmdlZCBmcmFtZXNcbiIs IG51bSk7CisJCXByZXNlcnZlX3VzZWQgPSAwOworCQlnb3RvIHB1cmdlX2xpc3Q7CisJfQorZmlu aXNoZWQ6CisJaWYgKHNlZ3NfdG9fdW5tYXAgPiAwKSB7CisJCXJldCA9IGdudHRhYl91bm1hcF9y ZWZzKHVubWFwLCBOVUxMLCBwYWdlcywgc2Vnc190b191bm1hcCk7CisJCUJVR19PTihyZXQpOwor CQlmcmVlX3hlbmJhbGxvb25lZF9wYWdlcyhzZWdzX3RvX3VubWFwLCBwYWdlcyk7CisJfQorCS8q IEZpbmFsbHkgcmVtb3ZlIHRoZSAidXNlZCIgZmxhZyBmcm9tIGFsbCB0aGUgcGVyc2lzdGVudCBn cmFudHMgKi8KKwlmb3JlYWNoX2dyYW50X3NhZmUocGVyc2lzdGVudF9nbnQsIG4sIHJvb3QsIG5v ZGUpIHsKKwkJQlVHX09OKHBlcnNpc3RlbnRfZ250LT5oYW5kbGUgPT0KKwkJCUJMS0JBQ0tfSU5W QUxJRF9IQU5ETEUpOworCQlwZXJzaXN0ZW50X2dudC0+ZmxhZ3MgJj0gflBFUlNJU1RFTlRfR05U X1VTRUQ7CisJfQorCXByX2RlYnVnKCJQdXJnZWQgJWQvJWRcbiIsIChyZXF1ZXN0ZWRfbnVtIC0g bnVtKSwgcmVxdWVzdGVkX251bSk7CisJcmV0dXJuIChyZXF1ZXN0ZWRfbnVtIC0gbnVtKTsKK30K KwogLyoKICAqIFJldHJpZXZlIGZyb20gdGhlICdwZW5kaW5nX3JlcXMnIGEgZnJlZSBwZW5kaW5n X3JlcSBzdHJ1Y3R1cmUgdG8gYmUgdXNlZC4KICAqLwpAQCAtMzk3LDYgKzQ3NSw4IEBAIGludCB4 ZW5fYmxraWZfc2NoZWR1bGUodm9pZCAqYXJnKQogewogCXN0cnVjdCB4ZW5fYmxraWYgKmJsa2lm ID0gYXJnOwogCXN0cnVjdCB4ZW5fdmJkICp2YmQgPSAmYmxraWYtPnZiZDsKKwlpbnQgcnFfcHVy Z2UsIHB1cmdlZDsKKwl1bnNpZ25lZCBsb25nIHRpbWVvdXQ7CiAKIAl4ZW5fYmxraWZfZ2V0KGJs a2lmKTsKIApAQCAtNDA2LDEzICs0ODYsMjEgQEAgaW50IHhlbl9ibGtpZl9zY2hlZHVsZSh2b2lk ICphcmcpCiAJCWlmICh1bmxpa2VseSh2YmQtPnNpemUgIT0gdmJkX3N6KHZiZCkpKQogCQkJeGVu X3ZiZF9yZXNpemUoYmxraWYpOwogCi0JCXdhaXRfZXZlbnRfaW50ZXJydXB0aWJsZSgKKwkJdGlt ZW91dCA9IG1zZWNzX3RvX2ppZmZpZXMoeGVuX2Jsa2lmX2xydV9pbnRlcnZhbCk7CisKKwkJdGlt ZW91dCA9IHdhaXRfZXZlbnRfaW50ZXJydXB0aWJsZV90aW1lb3V0KAogCQkJYmxraWYtPndxLAot CQkJYmxraWYtPndhaXRpbmdfcmVxcyB8fCBrdGhyZWFkX3Nob3VsZF9zdG9wKCkpOwotCQl3YWl0 X2V2ZW50X2ludGVycnVwdGlibGUoCisJCQlibGtpZi0+d2FpdGluZ19yZXFzIHx8IGt0aHJlYWRf c2hvdWxkX3N0b3AoKSwKKwkJCXRpbWVvdXQpOworCQlpZiAodGltZW91dCA9PSAwKQorCQkJZ290 byBwdXJnZV9nbnRfbGlzdDsKKwkJdGltZW91dCA9IHdhaXRfZXZlbnRfaW50ZXJydXB0aWJsZV90 aW1lb3V0KAogCQkJYmxrYmstPnBlbmRpbmdfZnJlZV93cSwKIAkJCSFsaXN0X2VtcHR5KCZibGti ay0+cGVuZGluZ19mcmVlKSB8fAotCQkJa3RocmVhZF9zaG91bGRfc3RvcCgpKTsKKwkJCWt0aHJl YWRfc2hvdWxkX3N0b3AoKSwKKwkJCXRpbWVvdXQpOworCQlpZiAodGltZW91dCA9PSAwKQorCQkJ Z290byBwdXJnZV9nbnRfbGlzdDsKIAogCQlibGtpZi0+d2FpdGluZ19yZXFzID0gMDsKIAkJc21w X21iKCk7IC8qIGNsZWFyIGZsYWcgKmJlZm9yZSogY2hlY2tpbmcgZm9yIHdvcmsgKi8KQEAgLTQy MCw2ICs1MDgsMzIgQEAgaW50IHhlbl9ibGtpZl9zY2hlZHVsZSh2b2lkICphcmcpCiAJCWlmIChk b19ibG9ja19pb19vcChibGtpZikpCiAJCQlibGtpZi0+d2FpdGluZ19yZXFzID0gMTsKIAorcHVy Z2VfZ250X2xpc3Q6CisJCWlmIChibGtpZi0+dmJkLmZlYXR1cmVfZ250X3BlcnNpc3RlbnQgJiYK KwkJICAgIHRpbWVfYWZ0ZXIoamlmZmllcywgYmxraWYtPm5leHRfbHJ1KSkgeworCQkJLyogQ2xl YW4gdGhlIGxpc3Qgb2YgcGVyc2lzdGVudCBncmFudHMgKi8KKwkJCWlmIChibGtpZi0+cGVyc2lz dGVudF9nbnRfYyA+IHhlbl9ibGtpZl9tYXhfcGdyYW50cyB8fAorCQkJICAgIChibGtpZi0+cGVy c2lzdGVudF9nbnRfYyA9PSB4ZW5fYmxraWZfbWF4X3BncmFudHMgJiYKKwkJCSAgICAgYmxraWYt PnZiZC5vdmVyZmxvd19tYXhfZ3JhbnRzKSkgeworCQkJCXJxX3B1cmdlID0gYmxraWYtPnBlcnNp c3RlbnRfZ250X2MgLQorCQkJCSAgICAgICAgICAgeGVuX2Jsa2lmX21heF9wZ3JhbnRzICsKKwkJ CQkgICAgICAgICAgIHhlbl9ibGtpZl9scnVfbnVtX2NsZWFuOworCQkJCXJxX3B1cmdlID0gcnFf cHVyZ2UgPiBibGtpZi0+cGVyc2lzdGVudF9nbnRfYyA/CisJCQkJICAgICAgICAgICBibGtpZi0+ cGVyc2lzdGVudF9nbnRfYyA6IHJxX3B1cmdlOworCQkJCXB1cmdlZCA9IHB1cmdlX3BlcnNpc3Rl bnRfZ250KAorCQkJCQkgICZibGtpZi0+cGVyc2lzdGVudF9nbnRzLCBycV9wdXJnZSk7CisJCQkJ aWYgKHB1cmdlZCAhPSBycV9wdXJnZSkKKwkJCQkJcHJfZGVidWcoRFJWX1BGWCAiIHVuYWJsZSB0 byBtZWV0IHBlcnNpc3RlbnQgZ3JhbnRzIHB1cmdlIHJlcXVpcmVtZW50cyBmb3IgZGV2aWNlICUj eCwgZG9tYWluICV1LCByZXF1ZXN0ZWQgJWQgZG9uZSAlZFxuIiwKKwkJCQkJICAgICAgICAgYmxr aWYtPmRvbWlkLAorCQkJCQkgICAgICAgICBibGtpZi0+dmJkLmhhbmRsZSwKKwkJCQkJICAgICAg ICAgcnFfcHVyZ2UsIHB1cmdlZCk7CisJCQkJYmxraWYtPnBlcnNpc3RlbnRfZ250X2MgLT0gcHVy Z2VkOworCQkJCWJsa2lmLT52YmQub3ZlcmZsb3dfbWF4X2dyYW50cyA9IDA7CisJCQl9CisJCQli bGtpZi0+bmV4dF9scnUgPSBqaWZmaWVzICsKKwkJCSAgICAgICAgbXNlY3NfdG9famlmZmllcyh4 ZW5fYmxraWZfbHJ1X2ludGVydmFsKTsKKwkJfQorCiAJCWlmIChsb2dfc3RhdHMgJiYgdGltZV9h ZnRlcihqaWZmaWVzLCBibGtpZi0+c3RfcHJpbnQpKQogCQkJcHJpbnRfc3RhdHMoYmxraWYpOwog CX0KQEAgLTQ1MywxMyArNTY3LDE4IEBAIHN0YXRpYyB2b2lkIHhlbl9ibGtia191bm1hcChzdHJ1 Y3QgcGVuZGluZ19yZXEgKnJlcSkKIHsKIAlzdHJ1Y3QgZ250dGFiX3VubWFwX2dyYW50X3JlZiB1 bm1hcFtCTEtJRl9NQVhfU0VHTUVOVFNfUEVSX1JFUVVFU1RdOwogCXN0cnVjdCBwYWdlICpwYWdl c1tCTEtJRl9NQVhfU0VHTUVOVFNfUEVSX1JFUVVFU1RdOworCXN0cnVjdCBwZXJzaXN0ZW50X2du dCAqcGVyc2lzdGVudF9nbnQ7CiAJdW5zaWduZWQgaW50IGksIGludmNvdW50ID0gMDsKIAlncmFu dF9oYW5kbGVfdCBoYW5kbGU7CiAJaW50IHJldDsKIAogCWZvciAoaSA9IDA7IGkgPCByZXEtPm5y X3BhZ2VzOyBpKyspIHsKLQkJaWYgKCF0ZXN0X2JpdChpLCByZXEtPnVubWFwX3NlZykpCisJCWlm IChyZXEtPnBlcnNpc3RlbnRfZ250c1tpXSAhPSBOVUxMKSB7CisJCQlwZXJzaXN0ZW50X2dudCA9 IHJlcS0+cGVyc2lzdGVudF9nbnRzW2ldOworCQkJcGVyc2lzdGVudF9nbnQtPmZsYWdzIHw9IFBF UlNJU1RFTlRfR05UX1VTRUQ7CisJCQlwZXJzaXN0ZW50X2dudC0+ZmxhZ3MgJj0gflBFUlNJU1RF TlRfR05UX0FDVElWRTsKIAkJCWNvbnRpbnVlOworCQl9CiAJCWhhbmRsZSA9IHBlbmRpbmdfaGFu ZGxlKHJlcSwgaSk7CiAJCWlmIChoYW5kbGUgPT0gQkxLQkFDS19JTlZBTElEX0hBTkRMRSkKIAkJ CWNvbnRpbnVlOwpAQCAtNDgwLDggKzU5OSw4IEBAIHN0YXRpYyBpbnQgeGVuX2Jsa2JrX21hcChz dHJ1Y3QgYmxraWZfcmVxdWVzdCAqcmVxLAogCQkJIHN0cnVjdCBwYWdlICpwYWdlc1tdKQogewog CXN0cnVjdCBnbnR0YWJfbWFwX2dyYW50X3JlZiBtYXBbQkxLSUZfTUFYX1NFR01FTlRTX1BFUl9S RVFVRVNUXTsKLQlzdHJ1Y3QgcGVyc2lzdGVudF9nbnQgKnBlcnNpc3RlbnRfZ250c1tCTEtJRl9N QVhfU0VHTUVOVFNfUEVSX1JFUVVFU1RdOwogCXN0cnVjdCBwYWdlICpwYWdlc190b19nbnRbQkxL SUZfTUFYX1NFR01FTlRTX1BFUl9SRVFVRVNUXTsKKwlzdHJ1Y3QgcGVyc2lzdGVudF9nbnQgKipw ZXJzaXN0ZW50X2dudHMgPSBwZW5kaW5nX3JlcS0+cGVyc2lzdGVudF9nbnRzOwogCXN0cnVjdCBw ZXJzaXN0ZW50X2dudCAqcGVyc2lzdGVudF9nbnQgPSBOVUxMOwogCXN0cnVjdCB4ZW5fYmxraWYg KmJsa2lmID0gcGVuZGluZ19yZXEtPmJsa2lmOwogCXBoeXNfYWRkcl90IGFkZHIgPSAwOwpAQCAt NDk0LDkgKzYxMyw2IEBAIHN0YXRpYyBpbnQgeGVuX2Jsa2JrX21hcChzdHJ1Y3QgYmxraWZfcmVx dWVzdCAqcmVxLAogCiAJdXNlX3BlcnNpc3RlbnRfZ250cyA9IChibGtpZi0+dmJkLmZlYXR1cmVf Z250X3BlcnNpc3RlbnQpOwogCi0JQlVHX09OKGJsa2lmLT5wZXJzaXN0ZW50X2dudF9jID4KLQkJ ICAgbWF4X21hcHBlZF9ncmFudF9wYWdlcyhwZW5kaW5nX3JlcS0+YmxraWYtPmJsa19wcm90b2Nv bCkpOwotCiAJLyoKIAkgKiBGaWxsIG91dCBwcmVxLm5yX3NlY3RzIHdpdGggcHJvcGVyIGFtb3Vu dCBvZiBzZWN0b3JzLCBhbmQgc2V0dXAKIAkgKiBhc3NpZ24gbWFwWy4uXSB3aXRoIHRoZSBQRk4g b2YgdGhlIHBhZ2UgaW4gb3VyIGRvbWFpbiB3aXRoIHRoZQpAQCAtNTE2LDkgKzYzMiw5IEBAIHN0 YXRpYyBpbnQgeGVuX2Jsa2JrX21hcChzdHJ1Y3QgYmxraWZfcmVxdWVzdCAqcmVxLAogCQkJICog dGhlIGdyYW50IGlzIGFscmVhZHkgbWFwcGVkCiAJCQkgKi8KIAkJCW5ld19tYXAgPSBmYWxzZTsK KwkJCXBlcnNpc3RlbnRfZ250LT5mbGFncyB8PSBQRVJTSVNURU5UX0dOVF9BQ1RJVkU7CiAJCX0g ZWxzZSBpZiAodXNlX3BlcnNpc3RlbnRfZ250cyAmJgotCQkJICAgYmxraWYtPnBlcnNpc3RlbnRf Z250X2MgPAotCQkJICAgbWF4X21hcHBlZF9ncmFudF9wYWdlcyhibGtpZi0+YmxrX3Byb3RvY29s KSkgeworCQkJICAgYmxraWYtPnBlcnNpc3RlbnRfZ250X2MgPCB4ZW5fYmxraWZfbWF4X3BncmFu dHMpIHsKIAkJCS8qCiAJCQkgKiBXZSBhcmUgdXNpbmcgcGVyc2lzdGVudCBncmFudHMsIHRoZSBn cmFudCBpcwogCQkJICogbm90IG1hcHBlZCBidXQgd2UgaGF2ZSByb29tIGZvciBpdApAQCAtNTM2 LDYgKzY1Miw3IEBAIHN0YXRpYyBpbnQgeGVuX2Jsa2JrX21hcChzdHJ1Y3QgYmxraWZfcmVxdWVz dCAqcmVxLAogCQkJfQogCQkJcGVyc2lzdGVudF9nbnQtPmdudCA9IHJlcS0+dS5ydy5zZWdbaV0u Z3JlZjsKIAkJCXBlcnNpc3RlbnRfZ250LT5oYW5kbGUgPSBCTEtCQUNLX0lOVkFMSURfSEFORExF OworCQkJcGVyc2lzdGVudF9nbnQtPmZsYWdzID0gUEVSU0lTVEVOVF9HTlRfQUNUSVZFOwogCiAJ CQlwYWdlc190b19nbnRbc2Vnc190b19tYXBdID0KIAkJCQlwZXJzaXN0ZW50X2dudC0+cGFnZTsK QEAgLTU0Nyw3ICs2NjQsNyBAQCBzdGF0aWMgaW50IHhlbl9ibGtia19tYXAoc3RydWN0IGJsa2lm X3JlcXVlc3QgKnJlcSwKIAkJCWJsa2lmLT5wZXJzaXN0ZW50X2dudF9jKys7CiAJCQlwcl9kZWJ1 ZyhEUlZfUEZYICIgZ3JhbnQgJXUgYWRkZWQgdG8gdGhlIHRyZWUgb2YgcGVyc2lzdGVudCBncmFu dHMsIHVzaW5nICV1LyV1XG4iLAogCQkJCSBwZXJzaXN0ZW50X2dudC0+Z250LCBibGtpZi0+cGVy c2lzdGVudF9nbnRfYywKLQkJCQkgbWF4X21hcHBlZF9ncmFudF9wYWdlcyhibGtpZi0+YmxrX3By b3RvY29sKSk7CisJCQkJIHhlbl9ibGtpZl9tYXhfcGdyYW50cyk7CiAJCX0gZWxzZSB7CiAJCQkv KgogCQkJICogV2UgYXJlIGVpdGhlciB1c2luZyBwZXJzaXN0ZW50IGdyYW50cyBhbmQKQEAgLTU1 Nyw3ICs2NzQsNyBAQCBzdGF0aWMgaW50IHhlbl9ibGtia19tYXAoc3RydWN0IGJsa2lmX3JlcXVl c3QgKnJlcSwKIAkJCWlmICh1c2VfcGVyc2lzdGVudF9nbnRzICYmCiAJCQkJIWJsa2lmLT52YmQu b3ZlcmZsb3dfbWF4X2dyYW50cykgewogCQkJCWJsa2lmLT52YmQub3ZlcmZsb3dfbWF4X2dyYW50 cyA9IDE7Ci0JCQkJcHJfYWxlcnQoRFJWX1BGWCAiIGRvbWFpbiAldSwgZGV2aWNlICUjeCBpcyB1 c2luZyBtYXhpbXVtIG51bWJlciBvZiBwZXJzaXN0ZW50IGdyYW50c1xuIiwKKwkJCQlwcl9kZWJ1 ZyhEUlZfUEZYICIgZG9tYWluICV1LCBkZXZpY2UgJSN4IGlzIHVzaW5nIG1heGltdW0gbnVtYmVy IG9mIHBlcnNpc3RlbnQgZ3JhbnRzXG4iLAogCQkJCQkgYmxraWYtPmRvbWlkLCBibGtpZi0+dmJk LmhhbmRsZSk7CiAJCQl9CiAJCQluZXdfbWFwID0gdHJ1ZTsKQEAgLTU5NSw3ICs3MTIsNiBAQCBz dGF0aWMgaW50IHhlbl9ibGtia19tYXAoc3RydWN0IGJsa2lmX3JlcXVlc3QgKnJlcSwKIAkgKiBz byB0aGF0IHdoZW4gd2UgYWNjZXNzIHZhZGRyKHBlbmRpbmdfcmVxLGkpIGl0IGhhcyB0aGUgY29u dGVudHMgb2YKIAkgKiB0aGUgcGFnZSBmcm9tIHRoZSBvdGhlciBkb21haW4uCiAJICovCi0JYml0 bWFwX3plcm8ocGVuZGluZ19yZXEtPnVubWFwX3NlZywgQkxLSUZfTUFYX1NFR01FTlRTX1BFUl9S RVFVRVNUKTsKIAlmb3IgKGkgPSAwLCBqID0gMDsgaSA8IG5zZWc7IGkrKykgewogCQlpZiAoIXBl cnNpc3RlbnRfZ250c1tpXSB8fAogCQkgICAgcGVyc2lzdGVudF9nbnRzW2ldLT5oYW5kbGUgPT0g QkxLQkFDS19JTlZBTElEX0hBTkRMRSkgewpAQCAtNjM0LDcgKzc1MCw2IEBAIHN0YXRpYyBpbnQg eGVuX2Jsa2JrX21hcChzdHJ1Y3QgYmxraWZfcmVxdWVzdCAqcmVxLAogCQkJCShyZXEtPnUucncu c2VnW2ldLmZpcnN0X3NlY3QgPDwgOSk7CiAJCX0gZWxzZSB7CiAJCQlwZW5kaW5nX2hhbmRsZShw ZW5kaW5nX3JlcSwgaSkgPSBtYXBbal0uaGFuZGxlOwotCQkJYml0bWFwX3NldChwZW5kaW5nX3Jl cS0+dW5tYXBfc2VnLCBpLCAxKTsKIAogCQkJaWYgKHJldCkgewogCQkJCWorKzsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvYmxvY2sveGVuLWJsa2JhY2svY29tbW9uLmggYi9kcml2ZXJzL2Jsb2NrL3hl bi1ibGtiYWNrL2NvbW1vbi5oCmluZGV4IGYzMzhmOGEuLmJkNDRkNzUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvYmxvY2sveGVuLWJsa2JhY2svY29tbW9uLmgKKysrIGIvZHJpdmVycy9ibG9jay94ZW4t YmxrYmFjay9jb21tb24uaApAQCAtMTY3LDExICsxNjcsMTQgQEAgc3RydWN0IHhlbl92YmQgewog CiBzdHJ1Y3QgYmFja2VuZF9pbmZvOwogCisjZGVmaW5lIFBFUlNJU1RFTlRfR05UX0FDVElWRQkw eDEKKyNkZWZpbmUgUEVSU0lTVEVOVF9HTlRfVVNFRAkJMHgyCiAKIHN0cnVjdCBwZXJzaXN0ZW50 X2dudCB7CiAJc3RydWN0IHBhZ2UgKnBhZ2U7CiAJZ3JhbnRfcmVmX3QgZ250OwogCWdyYW50X2hh bmRsZV90IGhhbmRsZTsKKwl1aW50OF90IGZsYWdzOwogCXN0cnVjdCByYl9ub2RlIG5vZGU7CiB9 OwogCkBAIC0yMDQsNiArMjA3LDcgQEAgc3RydWN0IHhlbl9ibGtpZiB7CiAJLyogdHJlZSB0byBz dG9yZSBwZXJzaXN0ZW50IGdyYW50cyAqLwogCXN0cnVjdCByYl9yb290CQlwZXJzaXN0ZW50X2du dHM7CiAJdW5zaWduZWQgaW50CQlwZXJzaXN0ZW50X2dudF9jOworCXVuc2lnbmVkIGxvbmcJCW5l eHRfbHJ1OwogCiAJLyogc3RhdGlzdGljcyAqLwogCXVuc2lnbmVkIGxvbmcJCXN0X3ByaW50Owpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ibG9jay94ZW4tYmxrYmFjay94ZW5idXMuYyBiL2RyaXZlcnMv YmxvY2sveGVuLWJsa2JhY2sveGVuYnVzLmMKaW5kZXggNWUyMzdmNi4uYWJiMzk5YSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ibG9jay94ZW4tYmxrYmFjay94ZW5idXMuYworKysgYi9kcml2ZXJzL2Js b2NrL3hlbi1ibGtiYWNrL3hlbmJ1cy5jCkBAIC0xMTYsNiArMTE2LDcgQEAgc3RhdGljIHN0cnVj dCB4ZW5fYmxraWYgKnhlbl9ibGtpZl9hbGxvYyhkb21pZF90IGRvbWlkKQogCWluaXRfY29tcGxl dGlvbigmYmxraWYtPmRyYWluX2NvbXBsZXRlKTsKIAlhdG9taWNfc2V0KCZibGtpZi0+ZHJhaW4s IDApOwogCWJsa2lmLT5zdF9wcmludCA9IGppZmZpZXM7CisJYmxraWYtPm5leHRfbHJ1ID0gamlm ZmllczsKIAlpbml0X3dhaXRxdWV1ZV9oZWFkKCZibGtpZi0+d2FpdGluZ190b19mcmVlKTsKIAli bGtpZi0+cGVyc2lzdGVudF9nbnRzLnJiX25vZGUgPSBOVUxMOwogCi0tIAoxLjcuNy41IChBcHBs ZSBHaXQtMjYpCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8v bGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK