From: Paul Durrant Subject: [PATCH v5 02/11] viridian: separately allocate domain and vcpu structures Date: Mon, 11 Mar 2019 13:41:23 +0000 Message-ID: <20190311134132.20536-3-paul.durrant@citrix.com> References: <20190311134132.20536-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h3LBY-00006H-Tr for xen-devel@lists.xenproject.org; Mon, 11 Mar 2019 13:41:44 +0000 In-Reply-To: <20190311134132.20536-1-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , Paul Durrant , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org Q3VycmVudGx5IHRoZSB2aXJpZGlhbl9kb21haW4gYW5kIHZpcmlkaWFuX3ZjcHUgc3RydWN0dXJl cyBhcmUgaW5saW5lIGluCnRoZSBodm1fZG9tYWluIGFuZCBodm1fdmNwdSBzdHJ1Y3R1cmVzIHJl c3BlY3RpdmVseS4gU3Vic2VxdWVudCBwYXRjaGVzCndpbGwgbmVlZCB0byBhZGQgc2l6YWJsZSBl eHRyYSBmaWVsZHMgdG8gdGhlIHZpcmlkaWFuIHN0cnVjdHVyZXMgd2hpY2gKd2lsbCBjYXVzZSB0 aGUgUEFHRV9TSVpFIGxpbWl0IG9mIHRoZSBvdmVyYWxsIHZjcHUgc3RydWN0dXJlIHRvIGJlCmV4 Y2VlZGVkLiBUaGlzIHBhdGNoLCB0aGVyZWZvcmUsIHVzZXMgdGhlIG5ldyBpbml0IGhvb2tzIHRv IHNlcGFyYXRlbHkKYWxsb2NhdGUgdGhlIHN0cnVjdHVyZXMgYW5kIGNvbnZlcnRzIHRoZSAndmly aWRpYW4nIGZpZWxkcyBpbiBodm1fZG9tYWluCmFuZCBodm1fY3B1IHRvIGJlIHBvaW50ZXJzIHRv IHRoZXNlIGFsbG9jYXRpb25zLiBUaGVzZSBzZXBhcmF0ZSBhbGxvY2F0aW9ucwphbHNvIGFsbG93 IHNvbWUgdmNwdSBhbmQgZG9tYWluIHBvaW50ZXJzIHRvIGJlY29tZSBjb25zdC4KCklkZWFsbHks IG5vdyB0aGF0IHRoZXkgYXJlIG5vIGxvbmdlciBpbmxpbmUsIHRoZSBhbGxvY2F0aW9ucyBvZiB0 aGUKdmlyaWRpYW4gc3RydWN0dXJlcyBjb3VsZCBiZSBtYWRlIGNvbmRpdGlvbmFsIG9uIHdoZXRo ZXIgdGhlIHRvb2xzdGFjawppcyBnb2luZyB0byBjb25maWd1cmUgdGhlIHZpcmlkaWFuIGVubGln aHRlbm1lbnRzLiBIb3dldmVyIHRoZSB0b29sc3RhY2sKaXMgY3VycmVudGx5IHVuYWJsZSB0byBj b252ZXkgdGhpcyBpbmZvcm1hdGlvbiB0byB0aGUgZG9tYWluIGNyZWF0aW9uIGNvZGUKc28gc3Vj aCBhbiBlbmhhbmNlbWVudCBpcyBkZWZlcnJlZCB1bnRpbCB0aGF0IGJlY29tZXMgcG9zc2libGUu CgpOT1RFOiBUaGUgcGF0Y2ggYWxzbyBpbnRyb2R1Y2VkIHRoZSAnaXNfdmlyaWRpYW5fdmNwdScg bWFjcm8gdG8gYXZvaWQKICAgICAgaW50cm9kdWNpbmcgYSBzZWNvbmQgZXZhbHVhdGlvbiBvZiAn aXNfdmlyaWRpYW5fZG9tYWluJyB3aXRoIGFuCiAgICAgIG9wZW4tY29kZWQgJ3YtPmRvbWFpbicg YXJndW1lbnQuIFRoaXMgbWFjcm8gd2lsbCBhbHNvIGJlIGZ1cnRoZXIKICAgICAgdXNlZCBpbiBh IHN1YnNlcXVlbnQgcGF0Y2guCgpTaWduZWQtb2ZmLWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwuZHVy cmFudEBjaXRyaXguY29tPgpSZXZpZXdlZC1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNv bT4KLS0tCkNjOiBKYW4gQmV1bGljaCA8amJldWxpY2hAc3VzZS5jb20+CkNjOiBBbmRyZXcgQ29v cGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgpDYzogIlJvZ2VyIFBhdSBNb25uw6kiIDxy b2dlci5wYXVAY2l0cml4LmNvbT4KCnY0OgogLSBDb25zdC1pZnkgc29tZSB2Y3B1IGFuZCBkb21h aW4gcG9pbnRlcnMKCnYyOgogLSB1c2UgWEZSRUUoKQogLSBleHBhbmQgY29tbWl0IGNvbW1lbnQg dG8gcG9pbnQgb3V0IHdoeSBhbGxvY2F0aW9ucyBhcmUgdW5jb25kaXRpb25hbAotLS0KIHhlbi9h cmNoL3g4Ni9odm0vdmlyaWRpYW4vcHJpdmF0ZS5oICB8ICAyICstCiB4ZW4vYXJjaC94ODYvaHZt L3ZpcmlkaWFuL3N5bmljLmMgICAgfCA0NiArKysrKysrKy0tLS0tLS0tLQogeGVuL2FyY2gveDg2 L2h2bS92aXJpZGlhbi90aW1lLmMgICAgIHwgMzggKysrKysrKy0tLS0tLS0KIHhlbi9hcmNoL3g4 Ni9odm0vdmlyaWRpYW4vdmlyaWRpYW4uYyB8IDc1ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0KIHhlbi9pbmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oICAgICB8ICAyICstCiB4ZW4vaW5j bHVkZS9hc20teDg2L2h2bS9odm0uaCAgICAgICAgfCAgNCArKwogeGVuL2luY2x1ZGUvYXNtLXg4 Ni9odm0vdmNwdS5oICAgICAgIHwgIDIgKy0KIHhlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3Zpcmlk aWFuLmggICB8IDEwICsrLS0KIDggZmlsZXMgY2hhbmdlZCwgMTAxIGluc2VydGlvbnMoKyksIDc4 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vcHJp dmF0ZS5oIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9wcml2YXRlLmgKaW5kZXggMzk4YjIy ZjEyZC4uNDYxNzRmNDhjZCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9w cml2YXRlLmgKKysrIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9wcml2YXRlLmgKQEAgLTg5 LDcgKzg5LDcgQEAgdm9pZCB2aXJpZGlhbl90aW1lX2xvYWRfZG9tYWluX2N0eHQoCiAKIHZvaWQg dmlyaWRpYW5fZHVtcF9ndWVzdF9wYWdlKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCBjb25zdCBjaGFy ICpuYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0IHZpcmlk aWFuX3BhZ2UgKnZwKTsKLXZvaWQgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2Uoc3RydWN0IHZjcHUg KnYsIHN0cnVjdCB2aXJpZGlhbl9wYWdlICp2cCk7Cit2b2lkIHZpcmlkaWFuX21hcF9ndWVzdF9w YWdlKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCBzdHJ1Y3QgdmlyaWRpYW5fcGFnZSAqdnApOwogdm9p ZCB2aXJpZGlhbl91bm1hcF9ndWVzdF9wYWdlKHN0cnVjdCB2aXJpZGlhbl9wYWdlICp2cCk7CiAK ICNlbmRpZiAvKiBYODZfSFZNX1ZJUklESUFOX1BSSVZBVEVfSCAqLwpkaWZmIC0tZ2l0IGEveGVu L2FyY2gveDg2L2h2bS92aXJpZGlhbi9zeW5pYy5jIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlh bi9zeW5pYy5jCmluZGV4IGE2ZWJiYmM5ZjUuLjI4ZWRhNzc5OGMgMTAwNjQ0Ci0tLSBhL3hlbi9h cmNoL3g4Ni9odm0vdmlyaWRpYW4vc3luaWMuYworKysgYi94ZW4vYXJjaC94ODYvaHZtL3Zpcmlk aWFuL3N5bmljLmMKQEAgLTI4LDkgKzI4LDkgQEAgdHlwZWRlZiB1bmlvbiBfSFZfVlBfQVNTSVNU X1BBR0UKICAgICB1aW50OF90IFJlc2VydmVkWkJ5dGVQYWRkaW5nW1BBR0VfU0laRV07CiB9IEhW X1ZQX0FTU0lTVF9QQUdFOwogCi12b2lkIHZpcmlkaWFuX2FwaWNfYXNzaXN0X3NldChzdHJ1Y3Qg dmNwdSAqdikKK3ZvaWQgdmlyaWRpYW5fYXBpY19hc3Npc3Rfc2V0KGNvbnN0IHN0cnVjdCB2Y3B1 ICp2KQogewotICAgIEhWX1ZQX0FTU0lTVF9QQUdFICpwdHIgPSB2LT5hcmNoLmh2bS52aXJpZGlh bi52cF9hc3Npc3QucHRyOworICAgIEhWX1ZQX0FTU0lTVF9QQUdFICpwdHIgPSB2LT5hcmNoLmh2 bS52aXJpZGlhbi0+dnBfYXNzaXN0LnB0cjsKIAogICAgIGlmICggIXB0ciApCiAgICAgICAgIHJl dHVybjsKQEAgLTQwLDQwICs0MCw0MCBAQCB2b2lkIHZpcmlkaWFuX2FwaWNfYXNzaXN0X3NldChz dHJ1Y3QgdmNwdSAqdikKICAgICAgKiB3cm9uZyBhbmQgdGhlIFZNIHdpbGwgbW9zdCBsaWtlbHkg aGFuZyBzbyBmb3JjZSBhIGNyYXNoIG5vdwogICAgICAqIHRvIG1ha2UgdGhlIHByb2JsZW0gY2xl YXIuCiAgICAgICovCi0gICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlhbi5hcGljX2Fzc2lzdF9w ZW5kaW5nICkKKyAgICBpZiAoIHYtPmFyY2guaHZtLnZpcmlkaWFuLT5hcGljX2Fzc2lzdF9wZW5k aW5nICkKICAgICAgICAgZG9tYWluX2NyYXNoKHYtPmRvbWFpbik7CiAKLSAgICB2LT5hcmNoLmh2 bS52aXJpZGlhbi5hcGljX2Fzc2lzdF9wZW5kaW5nID0gdHJ1ZTsKKyAgICB2LT5hcmNoLmh2bS52 aXJpZGlhbi0+YXBpY19hc3Npc3RfcGVuZGluZyA9IHRydWU7CiAgICAgcHRyLT5BcGljQXNzaXN0 Lm5vX2VvaSA9IDE7CiB9CiAKLWJvb2wgdmlyaWRpYW5fYXBpY19hc3Npc3RfY29tcGxldGVkKHN0 cnVjdCB2Y3B1ICp2KQorYm9vbCB2aXJpZGlhbl9hcGljX2Fzc2lzdF9jb21wbGV0ZWQoY29uc3Qg c3RydWN0IHZjcHUgKnYpCiB7Ci0gICAgSFZfVlBfQVNTSVNUX1BBR0UgKnB0ciA9IHYtPmFyY2gu aHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5wdHI7CisgICAgSFZfVlBfQVNTSVNUX1BBR0UgKnB0ciA9 IHYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QucHRyOwogCiAgICAgaWYgKCAhcHRyICkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlhbi5h cGljX2Fzc2lzdF9wZW5kaW5nICYmCisgICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlhbi0+YXBp Y19hc3Npc3RfcGVuZGluZyAmJgogICAgICAgICAgIXB0ci0+QXBpY0Fzc2lzdC5ub19lb2kgKQog ICAgIHsKICAgICAgICAgLyogQW4gRU9JIGhhcyBiZWVuIGF2b2lkZWQgKi8KLSAgICAgICAgdi0+ YXJjaC5odm0udmlyaWRpYW4uYXBpY19hc3Npc3RfcGVuZGluZyA9IGZhbHNlOworICAgICAgICB2 LT5hcmNoLmh2bS52aXJpZGlhbi0+YXBpY19hc3Npc3RfcGVuZGluZyA9IGZhbHNlOwogICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgdmly aWRpYW5fYXBpY19hc3Npc3RfY2xlYXIoc3RydWN0IHZjcHUgKnYpCit2b2lkIHZpcmlkaWFuX2Fw aWNfYXNzaXN0X2NsZWFyKGNvbnN0IHN0cnVjdCB2Y3B1ICp2KQogewotICAgIEhWX1ZQX0FTU0lT VF9QQUdFICpwdHIgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QucHRyOworICAgIEhW X1ZQX0FTU0lTVF9QQUdFICpwdHIgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi0+dnBfYXNzaXN0LnB0 cjsKIAogICAgIGlmICggIXB0ciApCiAgICAgICAgIHJldHVybjsKIAogICAgIHB0ci0+QXBpY0Fz c2lzdC5ub19lb2kgPSAwOwotICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmFwaWNfYXNzaXN0X3Bl bmRpbmcgPSBmYWxzZTsKKyAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+YXBpY19hc3Npc3RfcGVu ZGluZyA9IGZhbHNlOwogfQogCiBpbnQgdmlyaWRpYW5fc3luaWNfd3Jtc3Ioc3RydWN0IHZjcHUg KnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgdmFsKQpAQCAtOTUsMTIgKzk1LDEyIEBAIGludCB2 aXJpZGlhbl9zeW5pY193cm1zcihzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRf dCB2YWwpCiAKICAgICBjYXNlIEhWX1g2NF9NU1JfVlBfQVNTSVNUX1BBR0U6CiAgICAgICAgIC8q IHJlbGVhc2UgYW55IHByZXZpb3VzIG1hcHBpbmcgKi8KLSAgICAgICAgdmlyaWRpYW5fdW5tYXBf Z3Vlc3RfcGFnZSgmdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0KTsKLSAgICAgICAgdi0+ YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0Lm1zci5yYXcgPSB2YWw7CisgICAgICAgIHZpcmlk aWFuX3VubWFwX2d1ZXN0X3BhZ2UoJnYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QpOwor ICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+dnBfYXNzaXN0Lm1zci5yYXcgPSB2YWw7CiAg ICAgICAgIHZpcmlkaWFuX2R1bXBfZ3Vlc3RfcGFnZSh2LCAiVlBfQVNTSVNUIiwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICZ2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3Qp OwotICAgICAgICBpZiAoIHYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5tc3IuZmllbGRz LmVuYWJsZWQgKQotICAgICAgICAgICAgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2UodiwgJnYtPmFy Y2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAmdi0+YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdCk7CisgICAgICAgIGlmICggdi0+ YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdC5tc3IuZmllbGRzLmVuYWJsZWQgKQorICAgICAg ICAgICAgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2UodiwgJnYtPmFyY2guaHZtLnZpcmlkaWFuLT52 cF9hc3Npc3QpOwogICAgICAgICBicmVhazsKIAogICAgIGRlZmF1bHQ6CkBAIC0xMzIsNyArMTMy LDcgQEAgaW50IHZpcmlkaWFuX3N5bmljX3JkbXNyKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50 MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBIVl9Y NjRfTVNSX1ZQX0FTU0lTVF9QQUdFOgotICAgICAgICAqdmFsID0gdi0+YXJjaC5odm0udmlyaWRp YW4udnBfYXNzaXN0Lm1zci5yYXc7CisgICAgICAgICp2YWwgPSB2LT5hcmNoLmh2bS52aXJpZGlh bi0+dnBfYXNzaXN0Lm1zci5yYXc7CiAgICAgICAgIGJyZWFrOwogCiAgICAgZGVmYXVsdDoKQEAg LTE0NiwxOCArMTQ2LDE4IEBAIGludCB2aXJpZGlhbl9zeW5pY19yZG1zcihjb25zdCBzdHJ1Y3Qg dmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCAqdmFsKQogdm9pZCB2aXJpZGlhbl9zeW5p Y19zYXZlX3ZjcHVfY3R4dChjb25zdCBzdHJ1Y3QgdmNwdSAqdiwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc3RydWN0IGh2bV92aXJpZGlhbl92Y3B1X2NvbnRleHQgKmN0eHQp CiB7Ci0gICAgY3R4dC0+YXBpY19hc3Npc3RfcGVuZGluZyA9IHYtPmFyY2guaHZtLnZpcmlkaWFu LmFwaWNfYXNzaXN0X3BlbmRpbmc7Ci0gICAgY3R4dC0+dnBfYXNzaXN0X21zciA9IHYtPmFyY2gu aHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5tc3IucmF3OworICAgIGN0eHQtPmFwaWNfYXNzaXN0X3Bl bmRpbmcgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi0+YXBpY19hc3Npc3RfcGVuZGluZzsKKyAgICBj dHh0LT52cF9hc3Npc3RfbXNyID0gdi0+YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdC5tc3Iu cmF3OwogfQogCiB2b2lkIHZpcmlkaWFuX3N5bmljX2xvYWRfdmNwdV9jdHh0KAogICAgIHN0cnVj dCB2Y3B1ICp2LCBjb25zdCBzdHJ1Y3QgaHZtX3ZpcmlkaWFuX3ZjcHVfY29udGV4dCAqY3R4dCkK IHsKLSAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QubXNyLnJhdyA9IGN0eHQtPnZw X2Fzc2lzdF9tc3I7Ci0gICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QubXNy LmZpZWxkcy5lbmFibGVkICkKLSAgICAgICAgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2UodiwgJnYt PmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdCk7CisgICAgdi0+YXJjaC5odm0udmlyaWRpYW4t PnZwX2Fzc2lzdC5tc3IucmF3ID0gY3R4dC0+dnBfYXNzaXN0X21zcjsKKyAgICBpZiAoIHYtPmFy Y2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QubXNyLmZpZWxkcy5lbmFibGVkICkKKyAgICAgICAg dmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2UodiwgJnYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Np c3QpOwogCi0gICAgdi0+YXJjaC5odm0udmlyaWRpYW4uYXBpY19hc3Npc3RfcGVuZGluZyA9IGN0 eHQtPmFwaWNfYXNzaXN0X3BlbmRpbmc7CisgICAgdi0+YXJjaC5odm0udmlyaWRpYW4tPmFwaWNf YXNzaXN0X3BlbmRpbmcgPSBjdHh0LT5hcGljX2Fzc2lzdF9wZW5kaW5nOwogfQogCiAvKgpkaWZm IC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMgYi94ZW4vYXJjaC94ODYv aHZtL3ZpcmlkaWFuL3RpbWUuYwppbmRleCA4NDBhODJiNDU3Li5hN2U5NGFhZGYwIDEwMDY0NAot LS0gYS94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3RpbWUuYworKysgYi94ZW4vYXJjaC94ODYv aHZtL3ZpcmlkaWFuL3RpbWUuYwpAQCAtMjcsNyArMjcsNyBAQCB0eXBlZGVmIHN0cnVjdCBfSFZf UkVGRVJFTkNFX1RTQ19QQUdFCiAKIHN0YXRpYyB2b2lkIGR1bXBfcmVmZXJlbmNlX3RzYyhjb25z dCBzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIGNvbnN0IHVuaW9uIHZpcmlkaWFuX3BhZ2VfbXNy ICpydCA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjOworICAgIGNvbnN0IHVu aW9uIHZpcmlkaWFuX3BhZ2VfbXNyICpydCA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVmZXJl bmNlX3RzYzsKIAogICAgIGlmICggIXJ0LT5maWVsZHMuZW5hYmxlZCApCiAgICAgICAgIHJldHVy bjsKQEAgLTM4LDcgKzM4LDcgQEAgc3RhdGljIHZvaWQgZHVtcF9yZWZlcmVuY2VfdHNjKGNvbnN0 IHN0cnVjdCBkb21haW4gKmQpCiAKIHN0YXRpYyB2b2lkIHVwZGF0ZV9yZWZlcmVuY2VfdHNjKHN0 cnVjdCBkb21haW4gKmQsIGJvb2wgaW5pdGlhbGl6ZSkKIHsKLSAgICB1bnNpZ25lZCBsb25nIGdt Zm4gPSBkLT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjLmZpZWxkcy5wZm47CisgICAg dW5zaWduZWQgbG9uZyBnbWZuID0gZC0+YXJjaC5odm0udmlyaWRpYW4tPnJlZmVyZW5jZV90c2Mu ZmllbGRzLnBmbjsKICAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlID0gZ2V0X3BhZ2VfZnJvbV9n Zm4oZCwgZ21mbiwgTlVMTCwgUDJNX0FMTE9DKTsKICAgICBIVl9SRUZFUkVOQ0VfVFNDX1BBR0Ug KnA7CiAKQEAgLTEwNyw3ICsxMDcsNyBAQCBzdGF0aWMgdm9pZCB1cGRhdGVfcmVmZXJlbmNlX3Rz YyhzdHJ1Y3QgZG9tYWluICpkLCBib29sIGluaXRpYWxpemUpCiAgICAgcHV0X3BhZ2VfYW5kX3R5 cGUocGFnZSk7CiB9CiAKLXN0YXRpYyBpbnQ2NF90IHJhd190cmNfdmFsKHN0cnVjdCBkb21haW4g KmQpCitzdGF0aWMgaW50NjRfdCByYXdfdHJjX3ZhbChjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQog ewogICAgIHVpbnQ2NF90IHRzYzsKICAgICBzdHJ1Y3QgdGltZV9zY2FsZSB0c2NfdG9fbnM7CkBA IC0xMTksMjEgKzExOSwxOSBAQCBzdGF0aWMgaW50NjRfdCByYXdfdHJjX3ZhbChzdHJ1Y3QgZG9t YWluICpkKQogICAgIHJldHVybiBzY2FsZV9kZWx0YSh0c2MsICZ0c2NfdG9fbnMpIC8gMTAwdWw7 CiB9CiAKLXZvaWQgdmlyaWRpYW5fdGltZV9yZWZfY291bnRfZnJlZXplKHN0cnVjdCBkb21haW4g KmQpCit2b2lkIHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50X2ZyZWV6ZShjb25zdCBzdHJ1Y3QgZG9t YWluICpkKQogewotICAgIHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJjOwotCi0g ICAgdHJjID0gJmQtPmFyY2guaHZtLnZpcmlkaWFuLnRpbWVfcmVmX2NvdW50OworICAgIHN0cnVj dCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJjID0KKyAgICAgICAgJmQtPmFyY2guaHZtLnZp cmlkaWFuLT50aW1lX3JlZl9jb3VudDsKIAogICAgIGlmICggdGVzdF9hbmRfY2xlYXJfYml0KF9U UkNfcnVubmluZywgJnRyYy0+ZmxhZ3MpICkKICAgICAgICAgdHJjLT52YWwgPSByYXdfdHJjX3Zh bChkKSArIHRyYy0+b2ZmOwogfQogCi12b2lkIHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50X3RoYXco c3RydWN0IGRvbWFpbiAqZCkKK3ZvaWQgdmlyaWRpYW5fdGltZV9yZWZfY291bnRfdGhhdyhjb25z dCBzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3Vu dCAqdHJjOwotCi0gICAgdHJjID0gJmQtPmFyY2guaHZtLnZpcmlkaWFuLnRpbWVfcmVmX2NvdW50 OworICAgIHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJjID0KKyAgICAgICAgJmQt PmFyY2guaHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3VudDsKIAogICAgIGlmICggIWQtPmlzX3No dXR0aW5nX2Rvd24gJiYKICAgICAgICAgICF0ZXN0X2FuZF9zZXRfYml0KF9UUkNfcnVubmluZywg JnRyYy0+ZmxhZ3MpICkKQEAgLTE1MCw5ICsxNDgsOSBAQCBpbnQgdmlyaWRpYW5fdGltZV93cm1z cihzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCB2YWwpCiAgICAgICAgIGlm ICggISh2aXJpZGlhbl9mZWF0dXJlX21hc2soZCkgJiBIVk1QVl9yZWZlcmVuY2VfdHNjKSApCiAg ICAgICAgICAgICByZXR1cm4gWDg2RU1VTF9FWENFUFRJT047CiAKLSAgICAgICAgZC0+YXJjaC5o dm0udmlyaWRpYW4ucmVmZXJlbmNlX3RzYy5yYXcgPSB2YWw7CisgICAgICAgIGQtPmFyY2guaHZt LnZpcmlkaWFuLT5yZWZlcmVuY2VfdHNjLnJhdyA9IHZhbDsKICAgICAgICAgZHVtcF9yZWZlcmVu Y2VfdHNjKGQpOwotICAgICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLnJlZmVyZW5jZV90 c2MuZmllbGRzLmVuYWJsZWQgKQorICAgICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5y ZWZlcmVuY2VfdHNjLmZpZWxkcy5lbmFibGVkICkKICAgICAgICAgICAgIHVwZGF0ZV9yZWZlcmVu Y2VfdHNjKGQsIHRydWUpOwogICAgICAgICBicmVhazsKIApAQCAtMTg5LDEzICsxODcsMTMgQEAg aW50IHZpcmlkaWFuX3RpbWVfcmRtc3IoY29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlk eCwgdWludDY0X3QgKnZhbCkKICAgICAgICAgaWYgKCAhKHZpcmlkaWFuX2ZlYXR1cmVfbWFzayhk KSAmIEhWTVBWX3JlZmVyZW5jZV90c2MpICkKICAgICAgICAgICAgIHJldHVybiBYODZFTVVMX0VY Q0VQVElPTjsKIAotICAgICAgICAqdmFsID0gZC0+YXJjaC5odm0udmlyaWRpYW4ucmVmZXJlbmNl X3RzYy5yYXc7CisgICAgICAgICp2YWwgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVmZXJlbmNl X3RzYy5yYXc7CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBIVl9YNjRfTVNSX1RJTUVfUkVG X0NPVU5UOgogICAgIHsKICAgICAgICAgc3RydWN0IHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50ICp0 cmMgPQotICAgICAgICAgICAgJmQtPmFyY2guaHZtLnZpcmlkaWFuLnRpbWVfcmVmX2NvdW50Owor ICAgICAgICAgICAgJmQtPmFyY2guaHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3VudDsKIAogICAg ICAgICBpZiAoICEodmlyaWRpYW5fZmVhdHVyZV9tYXNrKGQpICYgSFZNUFZfdGltZV9yZWZfY291 bnQpICkKICAgICAgICAgICAgIHJldHVybiBYODZFTVVMX0VYQ0VQVElPTjsKQEAgLTIxOSwxNyAr MjE3LDE3IEBAIGludCB2aXJpZGlhbl90aW1lX3JkbXNyKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1 aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiB2b2lkIHZpcmlkaWFuX3RpbWVfc2F2ZV9kb21h aW5fY3R4dCgKICAgICBjb25zdCBzdHJ1Y3QgZG9tYWluICpkLCBzdHJ1Y3QgaHZtX3ZpcmlkaWFu X2RvbWFpbl9jb250ZXh0ICpjdHh0KQogewotICAgIGN0eHQtPnRpbWVfcmVmX2NvdW50ID0gZC0+ YXJjaC5odm0udmlyaWRpYW4udGltZV9yZWZfY291bnQudmFsOwotICAgIGN0eHQtPnJlZmVyZW5j ZV90c2MgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjLnJhdzsKKyAgICBjdHh0 LT50aW1lX3JlZl9jb3VudCA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3VudC52 YWw7CisgICAgY3R4dC0+cmVmZXJlbmNlX3RzYyA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLT5yZWZl cmVuY2VfdHNjLnJhdzsKIH0KIAogdm9pZCB2aXJpZGlhbl90aW1lX2xvYWRfZG9tYWluX2N0eHQo CiAgICAgc3RydWN0IGRvbWFpbiAqZCwgY29uc3Qgc3RydWN0IGh2bV92aXJpZGlhbl9kb21haW5f Y29udGV4dCAqY3R4dCkKIHsKLSAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi50aW1lX3JlZl9jb3Vu dC52YWwgPSBjdHh0LT50aW1lX3JlZl9jb3VudDsKLSAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi5y ZWZlcmVuY2VfdHNjLnJhdyA9IGN0eHQtPnJlZmVyZW5jZV90c2M7CisgICAgZC0+YXJjaC5odm0u dmlyaWRpYW4tPnRpbWVfcmVmX2NvdW50LnZhbCA9IGN0eHQtPnRpbWVfcmVmX2NvdW50OworICAg IGQtPmFyY2guaHZtLnZpcmlkaWFuLT5yZWZlcmVuY2VfdHNjLnJhdyA9IGN0eHQtPnJlZmVyZW5j ZV90c2M7CiAKLSAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLnJlZmVyZW5jZV90c2MuZmll bGRzLmVuYWJsZWQgKQorICAgIGlmICggZC0+YXJjaC5odm0udmlyaWRpYW4tPnJlZmVyZW5jZV90 c2MuZmllbGRzLmVuYWJsZWQgKQogICAgICAgICB1cGRhdGVfcmVmZXJlbmNlX3RzYyhkLCBmYWxz ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdmlyaWRpYW4u YyBiL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdmlyaWRpYW4uYwppbmRleCA1YjBlYjhhOGM3 Li43ODM5NzE4ZWY0IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3Zpcmlk aWFuLmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi92aXJpZGlhbi5jCkBAIC0xNDYs NyArMTQ2LDcgQEAgdm9pZCBjcHVpZF92aXJpZGlhbl9sZWF2ZXMoY29uc3Qgc3RydWN0IHZjcHUg KnYsIHVpbnQzMl90IGxlYWYsCiAgICAgICAgICAqIEh5cGVydmlzb3IgaW5mb3JtYXRpb24sIGJ1 dCBvbmx5IGlmIHRoZSBndWVzdCBoYXMgc2V0IGl0cwogICAgICAgICAgKiBvd24gdmVyc2lvbiBu dW1iZXIuCiAgICAgICAgICAqLwotICAgICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLmd1 ZXN0X29zX2lkLnJhdyA9PSAwICkKKyAgICAgICAgaWYgKCBkLT5hcmNoLmh2bS52aXJpZGlhbi0+ Z3Vlc3Rfb3NfaWQucmF3ID09IDAgKQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIHJlcy0+ YSA9IHZpcmlkaWFuX2J1aWxkOwogICAgICAgICByZXMtPmIgPSAoKHVpbnQzMl90KXZpcmlkaWFu X21ham9yIDw8IDE2KSB8IHZpcmlkaWFuX21pbm9yOwpAQCAtMTkxLDggKzE5MSw4IEBAIHZvaWQg Y3B1aWRfdmlyaWRpYW5fbGVhdmVzKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBsZWFm LAogCiAgICAgY2FzZSA0OgogICAgICAgICAvKiBSZWNvbW1lbmRlZCBoeXBlcmNhbGwgdXNhZ2Uu ICovCi0gICAgICAgIGlmICggKGQtPmFyY2guaHZtLnZpcmlkaWFuLmd1ZXN0X29zX2lkLnJhdyA9 PSAwKSB8fAotICAgICAgICAgICAgIChkLT5hcmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5m aWVsZHMub3MgPCA0KSApCisgICAgICAgIGlmICggKGQtPmFyY2guaHZtLnZpcmlkaWFuLT5ndWVz dF9vc19pZC5yYXcgPT0gMCkgfHwKKyAgICAgICAgICAgICAoZC0+YXJjaC5odm0udmlyaWRpYW4t Pmd1ZXN0X29zX2lkLmZpZWxkcy5vcyA8IDQpICkKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICByZXMtPmEgPSBDUFVJRDRBX1JFTEFYX1RJTUVSX0lOVDsKICAgICAgICAgaWYgKCB2aXJpZGlh bl9mZWF0dXJlX21hc2soZCkgJiBIVk1QVl9oY2FsbF9yZW1vdGVfdGxiX2ZsdXNoICkKQEAgLTIy NCw3ICsyMjQsNyBAQCBzdGF0aWMgdm9pZCBkdW1wX2d1ZXN0X29zX2lkKGNvbnN0IHN0cnVjdCBk b21haW4gKmQpCiB7CiAgICAgY29uc3QgdW5pb24gdmlyaWRpYW5fZ3Vlc3Rfb3NfaWRfbXNyICpn b2k7CiAKLSAgICBnb2kgPSAmZC0+YXJjaC5odm0udmlyaWRpYW4uZ3Vlc3Rfb3NfaWQ7CisgICAg Z29pID0gJmQtPmFyY2guaHZtLnZpcmlkaWFuLT5ndWVzdF9vc19pZDsKIAogICAgIHByaW50ayhY RU5MT0dfR19JTkZPCiAgICAgICAgICAgICJkJWQ6IFZJUklESUFOIEdVRVNUX09TX0lEOiB2ZW5k b3I6ICV4IG9zOiAleCBtYWpvcjogJXggbWlub3I6ICV4IHNwOiAleCBidWlsZDogJXhcbiIsCkBA IC0yMzgsNyArMjM4LDcgQEAgc3RhdGljIHZvaWQgZHVtcF9oeXBlcmNhbGwoY29uc3Qgc3RydWN0 IGRvbWFpbiAqZCkKIHsKICAgICBjb25zdCB1bmlvbiB2aXJpZGlhbl9wYWdlX21zciAqaGc7CiAK LSAgICBoZyA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi5oeXBlcmNhbGxfZ3BhOworICAgIGhnID0g JmQtPmFyY2guaHZtLnZpcmlkaWFuLT5oeXBlcmNhbGxfZ3BhOwogCiAgICAgcHJpbnRrKFhFTkxP R19HX0lORk8gImQlZDogVklSSURJQU4gSFlQRVJDQUxMOiBlbmFibGVkOiAleCBwZm46ICVseFxu IiwKICAgICAgICAgICAgZC0+ZG9tYWluX2lkLApAQCAtMjQ3LDcgKzI0Nyw3IEBAIHN0YXRpYyB2 b2lkIGR1bXBfaHlwZXJjYWxsKGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCiAKIHN0YXRpYyB2b2lk IGVuYWJsZV9oeXBlcmNhbGxfcGFnZShzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIHVuc2lnbmVk IGxvbmcgZ21mbiA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLmh5cGVyY2FsbF9ncGEuZmllbGRzLnBm bjsKKyAgICB1bnNpZ25lZCBsb25nIGdtZm4gPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+aHlwZXJj YWxsX2dwYS5maWVsZHMucGZuOwogICAgIHN0cnVjdCBwYWdlX2luZm8gKnBhZ2UgPSBnZXRfcGFn ZV9mcm9tX2dmbihkLCBnbWZuLCBOVUxMLCBQMk1fQUxMT0MpOwogICAgIHVpbnQ4X3QgKnA7CiAK QEAgLTI4OCwxNCArMjg4LDE0IEBAIGludCBndWVzdF93cm1zcl92aXJpZGlhbihzdHJ1Y3QgdmNw dSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCB2YWwpCiAgICAgc3dpdGNoICggaWR4ICkKICAg ICB7CiAgICAgY2FzZSBIVl9YNjRfTVNSX0dVRVNUX09TX0lEOgotICAgICAgICBkLT5hcmNoLmh2 bS52aXJpZGlhbi5ndWVzdF9vc19pZC5yYXcgPSB2YWw7CisgICAgICAgIGQtPmFyY2guaHZtLnZp cmlkaWFuLT5ndWVzdF9vc19pZC5yYXcgPSB2YWw7CiAgICAgICAgIGR1bXBfZ3Vlc3Rfb3NfaWQo ZCk7CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBIVl9YNjRfTVNSX0hZUEVSQ0FMTDoKLSAg ICAgICAgZC0+YXJjaC5odm0udmlyaWRpYW4uaHlwZXJjYWxsX2dwYS5yYXcgPSB2YWw7CisgICAg ICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5oeXBlcmNhbGxfZ3BhLnJhdyA9IHZhbDsKICAgICAg ICAgZHVtcF9oeXBlcmNhbGwoZCk7Ci0gICAgICAgIGlmICggZC0+YXJjaC5odm0udmlyaWRpYW4u aHlwZXJjYWxsX2dwYS5maWVsZHMuZW5hYmxlZCApCisgICAgICAgIGlmICggZC0+YXJjaC5odm0u dmlyaWRpYW4tPmh5cGVyY2FsbF9ncGEuZmllbGRzLmVuYWJsZWQgKQogICAgICAgICAgICAgZW5h YmxlX2h5cGVyY2FsbF9wYWdlKGQpOwogICAgICAgICBicmVhazsKIApAQCAtMzE3LDEwICszMTcs MTAgQEAgaW50IGd1ZXN0X3dybXNyX3ZpcmlkaWFuKHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBp ZHgsIHVpbnQ2NF90IHZhbCkKICAgICBjYXNlIEhWX1g2NF9NU1JfQ1JBU0hfUDM6CiAgICAgY2Fz ZSBIVl9YNjRfTVNSX0NSQVNIX1A0OgogICAgICAgICBCVUlMRF9CVUdfT04oSFZfWDY0X01TUl9D UkFTSF9QNCAtIEhWX1g2NF9NU1JfQ1JBU0hfUDAgPj0KLSAgICAgICAgICAgICAgICAgICAgIEFS UkFZX1NJWkUodi0+YXJjaC5odm0udmlyaWRpYW4uY3Jhc2hfcGFyYW0pKTsKKyAgICAgICAgICAg ICAgICAgICAgIEFSUkFZX1NJWkUodi0+YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3BhcmFtKSk7 CiAKICAgICAgICAgaWR4IC09IEhWX1g2NF9NU1JfQ1JBU0hfUDA7Ci0gICAgICAgIHYtPmFyY2gu aHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtW2lkeF0gPSB2YWw7CisgICAgICAgIHYtPmFyY2guaHZt LnZpcmlkaWFuLT5jcmFzaF9wYXJhbVtpZHhdID0gdmFsOwogICAgICAgICBicmVhazsKIAogICAg IGNhc2UgSFZfWDY0X01TUl9DUkFTSF9DVEw6CkBAIC0zMzcsMTEgKzMzNywxMSBAQCBpbnQgZ3Vl c3Rfd3Jtc3JfdmlyaWRpYW4oc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3Qg dmFsKQogICAgICAgICBzcGluX3VubG9jaygmZC0+c2h1dGRvd25fbG9jayk7CiAKICAgICAgICAg Z3ByaW50ayhYRU5MT0dfV0FSTklORywgIlZJUklESUFOIENSQVNIOiAlbHggJWx4ICVseCAlbHgg JWx4XG4iLAotICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFt WzBdLAotICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtWzFd LAotICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtWzJdLAot ICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtWzNdLAotICAg ICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtWzRdKTsKKyAgICAg ICAgICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+Y3Jhc2hfcGFyYW1bMF0sCisgICAgICAg ICAgICAgICAgdi0+YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3BhcmFtWzFdLAorICAgICAgICAg ICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLT5jcmFzaF9wYXJhbVsyXSwKKyAgICAgICAgICAg ICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+Y3Jhc2hfcGFyYW1bM10sCisgICAgICAgICAgICAg ICAgdi0+YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3BhcmFtWzRdKTsKICAgICAgICAgYnJlYWs7 CiAgICAgfQogCkBAIC0zNjQsMTEgKzM2NCwxMSBAQCBpbnQgZ3Vlc3RfcmRtc3JfdmlyaWRpYW4o Y29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgKnZhbCkKICAgICBz d2l0Y2ggKCBpZHggKQogICAgIHsKICAgICBjYXNlIEhWX1g2NF9NU1JfR1VFU1RfT1NfSUQ6Ci0g ICAgICAgICp2YWwgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5yYXc7CisgICAg ICAgICp2YWwgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3OwogICAgICAg ICBicmVhazsKIAogICAgIGNhc2UgSFZfWDY0X01TUl9IWVBFUkNBTEw6Ci0gICAgICAgICp2YWwg PSBkLT5hcmNoLmh2bS52aXJpZGlhbi5oeXBlcmNhbGxfZ3BhLnJhdzsKKyAgICAgICAgKnZhbCA9 IGQtPmFyY2guaHZtLnZpcmlkaWFuLT5oeXBlcmNhbGxfZ3BhLnJhdzsKICAgICAgICAgYnJlYWs7 CiAKICAgICBjYXNlIEhWX1g2NF9NU1JfVlBfSU5ERVg6CkBAIC0zOTMsMTAgKzM5MywxMCBAQCBp bnQgZ3Vlc3RfcmRtc3JfdmlyaWRpYW4oY29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlk eCwgdWludDY0X3QgKnZhbCkKICAgICBjYXNlIEhWX1g2NF9NU1JfQ1JBU0hfUDM6CiAgICAgY2Fz ZSBIVl9YNjRfTVNSX0NSQVNIX1A0OgogICAgICAgICBCVUlMRF9CVUdfT04oSFZfWDY0X01TUl9D UkFTSF9QNCAtIEhWX1g2NF9NU1JfQ1JBU0hfUDAgPj0KLSAgICAgICAgICAgICAgICAgICAgIEFS UkFZX1NJWkUodi0+YXJjaC5odm0udmlyaWRpYW4uY3Jhc2hfcGFyYW0pKTsKKyAgICAgICAgICAg ICAgICAgICAgIEFSUkFZX1NJWkUodi0+YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3BhcmFtKSk7 CiAKICAgICAgICAgaWR4IC09IEhWX1g2NF9NU1JfQ1JBU0hfUDA7Ci0gICAgICAgICp2YWwgPSB2 LT5hcmNoLmh2bS52aXJpZGlhbi5jcmFzaF9wYXJhbVtpZHhdOworICAgICAgICAqdmFsID0gdi0+ YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3BhcmFtW2lkeF07CiAgICAgICAgIGJyZWFrOwogCiAg ICAgY2FzZSBIVl9YNjRfTVNSX0NSQVNIX0NUTDoKQEAgLTQxOSwxNyArNDE5LDMzIEBAIGludCBn dWVzdF9yZG1zcl92aXJpZGlhbihjb25zdCBzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1 aW50NjRfdCAqdmFsKQogCiBpbnQgdmlyaWRpYW5fdmNwdV9pbml0KHN0cnVjdCB2Y3B1ICp2KQog eworICAgIEFTU0VSVCghdi0+YXJjaC5odm0udmlyaWRpYW4pOworICAgIHYtPmFyY2guaHZtLnZp cmlkaWFuID0geHphbGxvYyhzdHJ1Y3QgdmlyaWRpYW5fdmNwdSk7CisgICAgaWYgKCAhdi0+YXJj aC5odm0udmlyaWRpYW4gKQorICAgICAgICByZXR1cm4gLUVOT01FTTsKKwogICAgIHJldHVybiAw OwogfQogCiBpbnQgdmlyaWRpYW5fZG9tYWluX2luaXQoc3RydWN0IGRvbWFpbiAqZCkKIHsKKyAg ICBBU1NFUlQoIWQtPmFyY2guaHZtLnZpcmlkaWFuKTsKKyAgICBkLT5hcmNoLmh2bS52aXJpZGlh biA9IHh6YWxsb2Moc3RydWN0IHZpcmlkaWFuX2RvbWFpbik7CisgICAgaWYgKCAhZC0+YXJjaC5o dm0udmlyaWRpYW4gKQorICAgICAgICByZXR1cm4gLUVOT01FTTsKKwogICAgIHJldHVybiAwOwog fQogCiB2b2lkIHZpcmlkaWFuX3ZjcHVfZGVpbml0KHN0cnVjdCB2Y3B1ICp2KQogewotICAgIHZp cmlkaWFuX3N5bmljX3dybXNyKHYsIEhWX1g2NF9NU1JfVlBfQVNTSVNUX1BBR0UsIDApOworICAg IGlmICggIXYtPmFyY2guaHZtLnZpcmlkaWFuICkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYg KCBpc192aXJpZGlhbl92Y3B1KHYpICkKKyAgICAgICAgdmlyaWRpYW5fc3luaWNfd3Jtc3Iodiwg SFZfWDY0X01TUl9WUF9BU1NJU1RfUEFHRSwgMCk7CisKKyAgICBYRlJFRSh2LT5hcmNoLmh2bS52 aXJpZGlhbik7CiB9CiAKIHZvaWQgdmlyaWRpYW5fZG9tYWluX2RlaW5pdChzdHJ1Y3QgZG9tYWlu ICpkKQpAQCAtNDM4LDYgKzQ1NCwxMSBAQCB2b2lkIHZpcmlkaWFuX2RvbWFpbl9kZWluaXQoc3Ry dWN0IGRvbWFpbiAqZCkKIAogICAgIGZvcl9lYWNoX3ZjcHUgKCBkLCB2ICkKICAgICAgICAgdmly aWRpYW5fdmNwdV9kZWluaXQodik7CisKKyAgICBpZiAoICFkLT5hcmNoLmh2bS52aXJpZGlhbiAp CisgICAgICAgIHJldHVybjsKKworICAgIFhGUkVFKGQtPmFyY2guaHZtLnZpcmlkaWFuKTsKIH0K IAogLyoKQEAgLTU5MSw3ICs2MTIsNyBAQCB2b2lkIHZpcmlkaWFuX2R1bXBfZ3Vlc3RfcGFnZShj b25zdCBzdHJ1Y3QgdmNwdSAqdiwgY29uc3QgY2hhciAqbmFtZSwKICAgICAgICAgICAgdiwgbmFt ZSwgKHVuc2lnbmVkIGxvbmcpdnAtPm1zci5maWVsZHMucGZuKTsKIH0KIAotdm9pZCB2aXJpZGlh bl9tYXBfZ3Vlc3RfcGFnZShzdHJ1Y3QgdmNwdSAqdiwgc3RydWN0IHZpcmlkaWFuX3BhZ2UgKnZw KQordm9pZCB2aXJpZGlhbl9tYXBfZ3Vlc3RfcGFnZShjb25zdCBzdHJ1Y3QgdmNwdSAqdiwgc3Ry dWN0IHZpcmlkaWFuX3BhZ2UgKnZwKQogewogICAgIHN0cnVjdCBkb21haW4gKmQgPSB2LT5kb21h aW47CiAgICAgdW5zaWduZWQgbG9uZyBnbWZuID0gdnAtPm1zci5maWVsZHMucGZuOwpAQCAtNjQ1 LDggKzY2Niw4IEBAIHN0YXRpYyBpbnQgdmlyaWRpYW5fc2F2ZV9kb21haW5fY3R4dChzdHJ1Y3Qg dmNwdSAqdiwKIHsKICAgICBjb25zdCBzdHJ1Y3QgZG9tYWluICpkID0gdi0+ZG9tYWluOwogICAg IHN0cnVjdCBodm1fdmlyaWRpYW5fZG9tYWluX2NvbnRleHQgY3R4dCA9IHsKLSAgICAgICAgLmh5 cGVyY2FsbF9ncGEgID0gZC0+YXJjaC5odm0udmlyaWRpYW4uaHlwZXJjYWxsX2dwYS5yYXcsCi0g ICAgICAgIC5ndWVzdF9vc19pZCAgICA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLmd1ZXN0X29zX2lk LnJhdywKKyAgICAgICAgLmh5cGVyY2FsbF9ncGEgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+aHlw ZXJjYWxsX2dwYS5yYXcsCisgICAgICAgIC5ndWVzdF9vc19pZCA9IGQtPmFyY2guaHZtLnZpcmlk aWFuLT5ndWVzdF9vc19pZC5yYXcsCiAgICAgfTsKIAogICAgIGlmICggIWlzX3ZpcmlkaWFuX2Rv bWFpbihkKSApCkBAIC02NjUsOCArNjg2LDggQEAgc3RhdGljIGludCB2aXJpZGlhbl9sb2FkX2Rv bWFpbl9jdHh0KHN0cnVjdCBkb21haW4gKmQsCiAgICAgaWYgKCBodm1fbG9hZF9lbnRyeV96ZXJv ZXh0ZW5kKFZJUklESUFOX0RPTUFJTiwgaCwgJmN0eHQpICE9IDAgKQogICAgICAgICByZXR1cm4g LUVJTlZBTDsKIAotICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLmh5cGVyY2FsbF9ncGEucmF3ICA9 IGN0eHQuaHlwZXJjYWxsX2dwYTsKLSAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19p ZC5yYXcgICAgPSBjdHh0Lmd1ZXN0X29zX2lkOworICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5o eXBlcmNhbGxfZ3BhLnJhdyA9IGN0eHQuaHlwZXJjYWxsX2dwYTsKKyAgICBkLT5hcmNoLmh2bS52 aXJpZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3ID0gY3R4dC5ndWVzdF9vc19pZDsKIAogICAgIHZpcmlk aWFuX3RpbWVfbG9hZF9kb21haW5fY3R4dChkLCAmY3R4dCk7CiAKQEAgLTY4MCw3ICs3MDEsNyBA QCBzdGF0aWMgaW50IHZpcmlkaWFuX3NhdmVfdmNwdV9jdHh0KHN0cnVjdCB2Y3B1ICp2LCBodm1f ZG9tYWluX2NvbnRleHRfdCAqaCkKIHsKICAgICBzdHJ1Y3QgaHZtX3ZpcmlkaWFuX3ZjcHVfY29u dGV4dCBjdHh0ID0ge307CiAKLSAgICBpZiAoICFpc192aXJpZGlhbl9kb21haW4odi0+ZG9tYWlu KSApCisgICAgaWYgKCAhaXNfdmlyaWRpYW5fdmNwdSh2KSApCiAgICAgICAgIHJldHVybiAwOwog CiAgICAgdmlyaWRpYW5fc3luaWNfc2F2ZV92Y3B1X2N0eHQodiwgJmN0eHQpOwpkaWZmIC0tZ2l0 IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vZG9tYWluLmggYi94ZW4vaW5jbHVkZS9hc20teDg2 L2h2bS9kb21haW4uaAppbmRleCAzZTczMzE4MTdmLi42YzdjNGY1YWE2IDEwMDY0NAotLS0gYS94 ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9kb21haW4uaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2 L2h2bS9kb21haW4uaApAQCAtMTU0LDcgKzE1NCw3IEBAIHN0cnVjdCBodm1fZG9tYWluIHsKICAg ICAvKiBoeXBlcnZpc29yIGludGVyY2VwdGVkIG1zaXggdGFibGUgKi8KICAgICBzdHJ1Y3QgbGlz dF9oZWFkICAgICAgIG1zaXh0YmxfbGlzdDsKIAotICAgIHN0cnVjdCB2aXJpZGlhbl9kb21haW4g dmlyaWRpYW47CisgICAgc3RydWN0IHZpcmlkaWFuX2RvbWFpbiAqdmlyaWRpYW47CiAKICAgICBi b29sX3QgICAgICAgICAgICAgICAgIGhhcF9lbmFibGVkOwogICAgIGJvb2xfdCAgICAgICAgICAg ICAgICAgbWVtX3NoYXJpbmdfZW5hYmxlZDsKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14 ODYvaHZtL2h2bS5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vaHZtLmgKaW5kZXggNTNmZmVi YjJjNS4uMzdjMzU2N2E1NyAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vaHZt LmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vaHZtLmgKQEAgLTQ2Myw2ICs0NjMsOSBA QCBzdGF0aWMgaW5saW5lIGJvb2wgaHZtX2dldF9ndWVzdF9ibmRjZmdzKHN0cnVjdCB2Y3B1ICp2 LCB1NjQgKnZhbCkKICNkZWZpbmUgaXNfdmlyaWRpYW5fZG9tYWluKGQpIFwKICAgICAoaXNfaHZt X2RvbWFpbihkKSAmJiAodmlyaWRpYW5fZmVhdHVyZV9tYXNrKGQpICYgSFZNUFZfYmFzZV9mcmVx KSkKIAorI2RlZmluZSBpc192aXJpZGlhbl92Y3B1KHYpIFwKKyAgICBpc192aXJpZGlhbl9kb21h aW4oKHYpLT5kb21haW4pCisKICNkZWZpbmUgaGFzX3ZpcmlkaWFuX3RpbWVfcmVmX2NvdW50KGQp IFwKICAgICAoaXNfdmlyaWRpYW5fZG9tYWluKGQpICYmICh2aXJpZGlhbl9mZWF0dXJlX21hc2so ZCkgJiBIVk1QVl90aW1lX3JlZl9jb3VudCkpCiAKQEAgLTc2Miw2ICs3NjUsNyBAQCBzdGF0aWMg aW5saW5lIGJvb2wgaHZtX2hhc19zZXRfZGVzY3JpcHRvcl9hY2Nlc3NfZXhpdGluZyh2b2lkKQog fQogCiAjZGVmaW5lIGlzX3ZpcmlkaWFuX2RvbWFpbihkKSAoKHZvaWQpKGQpLCBmYWxzZSkKKyNk ZWZpbmUgaXNfdmlyaWRpYW5fdmNwdSh2KSAoKHZvaWQpKHYpLCBmYWxzZSkKICNkZWZpbmUgaGFz X3ZpcmlkaWFuX3RpbWVfcmVmX2NvdW50KGQpICgodm9pZCkoZCksIGZhbHNlKQogI2RlZmluZSBo dm1fbG9uZ19tb2RlX2FjdGl2ZSh2KSAoKHZvaWQpKHYpLCBmYWxzZSkKICNkZWZpbmUgaHZtX2dl dF9ndWVzdF90aW1lKHYpICgodm9pZCkodiksIDApCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9h c20teDg2L2h2bS92Y3B1LmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92Y3B1LmgKaW5kZXgg NmM4NGQ1YTVhNi4uZDE1ODlmM2E5NiAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9o dm0vdmNwdS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZjcHUuaApAQCAtMjA1LDcg KzIwNSw3IEBAIHN0cnVjdCBodm1fdmNwdSB7CiAgICAgLyogUGVuZGluZyBody9zdyBpbnRlcnJ1 cHQgKC52ZWN0b3IgPSAtMSBtZWFucyBub3RoaW5nIHBlbmRpbmcpLiAqLwogICAgIHN0cnVjdCB4 ODZfZXZlbnQgICAgIGluamVjdF9ldmVudDsKIAotICAgIHN0cnVjdCB2aXJpZGlhbl92Y3B1IHZp cmlkaWFuOworICAgIHN0cnVjdCB2aXJpZGlhbl92Y3B1ICp2aXJpZGlhbjsKIH07CiAKICNlbmRp ZiAvKiBfX0FTTV9YODZfSFZNX1ZDUFVfSF9fICovCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9h c20teDg2L2h2bS92aXJpZGlhbi5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vdmlyaWRpYW4u aAppbmRleCBmMDcyODM4OTU1Li5jNTYyNDI0MzMyIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9h c20teDg2L2h2bS92aXJpZGlhbi5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3Zpcmlk aWFuLmgKQEAgLTc3LDggKzc3LDggQEAgaW50IGd1ZXN0X3JkbXNyX3ZpcmlkaWFuKGNvbnN0IHN0 cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpOwogaW50CiB2aXJpZGlh bl9oeXBlcmNhbGwoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpOwogCi12b2lkIHZpcmlkaWFu X3RpbWVfcmVmX2NvdW50X2ZyZWV6ZShzdHJ1Y3QgZG9tYWluICpkKTsKLXZvaWQgdmlyaWRpYW5f dGltZV9yZWZfY291bnRfdGhhdyhzdHJ1Y3QgZG9tYWluICpkKTsKK3ZvaWQgdmlyaWRpYW5fdGlt ZV9yZWZfY291bnRfZnJlZXplKGNvbnN0IHN0cnVjdCBkb21haW4gKmQpOwordm9pZCB2aXJpZGlh bl90aW1lX3JlZl9jb3VudF90aGF3KGNvbnN0IHN0cnVjdCBkb21haW4gKmQpOwogCiBpbnQgdmly aWRpYW5fdmNwdV9pbml0KHN0cnVjdCB2Y3B1ICp2KTsKIGludCB2aXJpZGlhbl9kb21haW5faW5p dChzdHJ1Y3QgZG9tYWluICpkKTsKQEAgLTg2LDkgKzg2LDkgQEAgaW50IHZpcmlkaWFuX2RvbWFp bl9pbml0KHN0cnVjdCBkb21haW4gKmQpOwogdm9pZCB2aXJpZGlhbl92Y3B1X2RlaW5pdChzdHJ1 Y3QgdmNwdSAqdik7CiB2b2lkIHZpcmlkaWFuX2RvbWFpbl9kZWluaXQoc3RydWN0IGRvbWFpbiAq ZCk7CiAKLXZvaWQgdmlyaWRpYW5fYXBpY19hc3Npc3Rfc2V0KHN0cnVjdCB2Y3B1ICp2KTsKLWJv b2wgdmlyaWRpYW5fYXBpY19hc3Npc3RfY29tcGxldGVkKHN0cnVjdCB2Y3B1ICp2KTsKLXZvaWQg dmlyaWRpYW5fYXBpY19hc3Npc3RfY2xlYXIoc3RydWN0IHZjcHUgKnYpOwordm9pZCB2aXJpZGlh bl9hcGljX2Fzc2lzdF9zZXQoY29uc3Qgc3RydWN0IHZjcHUgKnYpOworYm9vbCB2aXJpZGlhbl9h cGljX2Fzc2lzdF9jb21wbGV0ZWQoY29uc3Qgc3RydWN0IHZjcHUgKnYpOwordm9pZCB2aXJpZGlh bl9hcGljX2Fzc2lzdF9jbGVhcihjb25zdCBzdHJ1Y3QgdmNwdSAqdik7CiAKICNlbmRpZiAvKiBf X0FTTV9YODZfSFZNX1ZJUklESUFOX0hfXyAqLwogCi0tIAoyLjIwLjEKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0 Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qu b3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs