From: Paul Durrant Subject: [PATCH v10 02/11] viridian: separately allocate domain and vcpu structures Date: Tue, 19 Mar 2019 15:22:45 +0000 Message-ID: <20190319152254.1393-3-paul.durrant@citrix.com> References: <20190319152254.1393-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h6GcU-00040x-3T for xen-devel@lists.xenproject.org; Tue, 19 Mar 2019 15:25:38 +0000 In-Reply-To: <20190319152254.1393-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 bT4KQWNrZWQtYnk6IEphbiBCZXVsaWNoIDxqYmV1bGljaEBzdXNlLmNvbT4KLS0tCkNjOiBBbmRy ZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgpDYzogIlJvZ2VyIFBhdSBNb25u w6kiIDxyb2dlci5wYXVAY2l0cml4LmNvbT4KCnY0OgogLSBDb25zdC1pZnkgc29tZSB2Y3B1IGFu ZCBkb21haW4gcG9pbnRlcnMKCnYyOgogLSB1c2UgWEZSRUUoKQogLSBleHBhbmQgY29tbWl0IGNv bW1lbnQgdG8gcG9pbnQgb3V0IHdoeSBhbGxvY2F0aW9ucyBhcmUgdW5jb25kaXRpb25hbAotLS0K IHhlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vcHJpdmF0ZS5oICB8ICAyICstCiB4ZW4vYXJjaC94 ODYvaHZtL3ZpcmlkaWFuL3N5bmljLmMgICAgfCA0NiArKysrKysrKy0tLS0tLS0tLQogeGVuL2Fy Y2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMgICAgIHwgMzggKysrKysrKy0tLS0tLS0KIHhlbi9h cmNoL3g4Ni9odm0vdmlyaWRpYW4vdmlyaWRpYW4uYyB8IDc1ICsrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0KIHhlbi9pbmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oICAgICB8ICAyICstCiB4 ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9odm0uaCAgICAgICAgfCAgNCArKwogeGVuL2luY2x1ZGUv YXNtLXg4Ni9odm0vdmNwdS5oICAgICAgIHwgIDIgKy0KIHhlbi9pbmNsdWRlL2FzbS14ODYvaHZt L3ZpcmlkaWFuLmggICB8IDEwICsrLS0KIDggZmlsZXMgY2hhbmdlZCwgMTAxIGluc2VydGlvbnMo KyksIDc4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRp YW4vcHJpdmF0ZS5oIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9wcml2YXRlLmgKaW5kZXgg Mzk4YjIyZjEyZC4uNDYxNzRmNDhjZCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2h2bS92aXJp ZGlhbi9wcml2YXRlLmgKKysrIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9wcml2YXRlLmgK QEAgLTg5LDcgKzg5LDcgQEAgdm9pZCB2aXJpZGlhbl90aW1lX2xvYWRfZG9tYWluX2N0eHQoCiAK IHZvaWQgdmlyaWRpYW5fZHVtcF9ndWVzdF9wYWdlKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCBjb25z dCBjaGFyICpuYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0 IHZpcmlkaWFuX3BhZ2UgKnZwKTsKLXZvaWQgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2Uoc3RydWN0 IHZjcHUgKnYsIHN0cnVjdCB2aXJpZGlhbl9wYWdlICp2cCk7Cit2b2lkIHZpcmlkaWFuX21hcF9n dWVzdF9wYWdlKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCBzdHJ1Y3QgdmlyaWRpYW5fcGFnZSAqdnAp Owogdm9pZCB2aXJpZGlhbl91bm1hcF9ndWVzdF9wYWdlKHN0cnVjdCB2aXJpZGlhbl9wYWdlICp2 cCk7CiAKICNlbmRpZiAvKiBYODZfSFZNX1ZJUklESUFOX1BSSVZBVEVfSCAqLwpkaWZmIC0tZ2l0 IGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9zeW5pYy5jIGIveGVuL2FyY2gveDg2L2h2bS92 aXJpZGlhbi9zeW5pYy5jCmluZGV4IGE2ZWJiYmM5ZjUuLjI4ZWRhNzc5OGMgMTAwNjQ0Ci0tLSBh L3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vc3luaWMuYworKysgYi94ZW4vYXJjaC94ODYvaHZt L3ZpcmlkaWFuL3N5bmljLmMKQEAgLTI4LDkgKzI4LDkgQEAgdHlwZWRlZiB1bmlvbiBfSFZfVlBf QVNTSVNUX1BBR0UKICAgICB1aW50OF90IFJlc2VydmVkWkJ5dGVQYWRkaW5nW1BBR0VfU0laRV07 CiB9IEhWX1ZQX0FTU0lTVF9QQUdFOwogCi12b2lkIHZpcmlkaWFuX2FwaWNfYXNzaXN0X3NldChz dHJ1Y3QgdmNwdSAqdikKK3ZvaWQgdmlyaWRpYW5fYXBpY19hc3Npc3Rfc2V0KGNvbnN0IHN0cnVj dCB2Y3B1ICp2KQogewotICAgIEhWX1ZQX0FTU0lTVF9QQUdFICpwdHIgPSB2LT5hcmNoLmh2bS52 aXJpZGlhbi52cF9hc3Npc3QucHRyOworICAgIEhWX1ZQX0FTU0lTVF9QQUdFICpwdHIgPSB2LT5h cmNoLmh2bS52aXJpZGlhbi0+dnBfYXNzaXN0LnB0cjsKIAogICAgIGlmICggIXB0ciApCiAgICAg ICAgIHJldHVybjsKQEAgLTQwLDQwICs0MCw0MCBAQCB2b2lkIHZpcmlkaWFuX2FwaWNfYXNzaXN0 X3NldChzdHJ1Y3QgdmNwdSAqdikKICAgICAgKiB3cm9uZyBhbmQgdGhlIFZNIHdpbGwgbW9zdCBs aWtlbHkgaGFuZyBzbyBmb3JjZSBhIGNyYXNoIG5vdwogICAgICAqIHRvIG1ha2UgdGhlIHByb2Js ZW0gY2xlYXIuCiAgICAgICovCi0gICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlhbi5hcGljX2Fz c2lzdF9wZW5kaW5nICkKKyAgICBpZiAoIHYtPmFyY2guaHZtLnZpcmlkaWFuLT5hcGljX2Fzc2lz dF9wZW5kaW5nICkKICAgICAgICAgZG9tYWluX2NyYXNoKHYtPmRvbWFpbik7CiAKLSAgICB2LT5h cmNoLmh2bS52aXJpZGlhbi5hcGljX2Fzc2lzdF9wZW5kaW5nID0gdHJ1ZTsKKyAgICB2LT5hcmNo Lmh2bS52aXJpZGlhbi0+YXBpY19hc3Npc3RfcGVuZGluZyA9IHRydWU7CiAgICAgcHRyLT5BcGlj QXNzaXN0Lm5vX2VvaSA9IDE7CiB9CiAKLWJvb2wgdmlyaWRpYW5fYXBpY19hc3Npc3RfY29tcGxl dGVkKHN0cnVjdCB2Y3B1ICp2KQorYm9vbCB2aXJpZGlhbl9hcGljX2Fzc2lzdF9jb21wbGV0ZWQo Y29uc3Qgc3RydWN0IHZjcHUgKnYpCiB7Ci0gICAgSFZfVlBfQVNTSVNUX1BBR0UgKnB0ciA9IHYt PmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5wdHI7CisgICAgSFZfVlBfQVNTSVNUX1BBR0Ug KnB0ciA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QucHRyOwogCiAgICAgaWYgKCAh cHRyICkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCB2LT5hcmNoLmh2bS52aXJp ZGlhbi5hcGljX2Fzc2lzdF9wZW5kaW5nICYmCisgICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlh bi0+YXBpY19hc3Npc3RfcGVuZGluZyAmJgogICAgICAgICAgIXB0ci0+QXBpY0Fzc2lzdC5ub19l b2kgKQogICAgIHsKICAgICAgICAgLyogQW4gRU9JIGhhcyBiZWVuIGF2b2lkZWQgKi8KLSAgICAg ICAgdi0+YXJjaC5odm0udmlyaWRpYW4uYXBpY19hc3Npc3RfcGVuZGluZyA9IGZhbHNlOworICAg ICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+YXBpY19hc3Npc3RfcGVuZGluZyA9IGZhbHNlOwog ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZv aWQgdmlyaWRpYW5fYXBpY19hc3Npc3RfY2xlYXIoc3RydWN0IHZjcHUgKnYpCit2b2lkIHZpcmlk aWFuX2FwaWNfYXNzaXN0X2NsZWFyKGNvbnN0IHN0cnVjdCB2Y3B1ICp2KQogewotICAgIEhWX1ZQ X0FTU0lTVF9QQUdFICpwdHIgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QucHRyOwor ICAgIEhWX1ZQX0FTU0lTVF9QQUdFICpwdHIgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi0+dnBfYXNz aXN0LnB0cjsKIAogICAgIGlmICggIXB0ciApCiAgICAgICAgIHJldHVybjsKIAogICAgIHB0ci0+ QXBpY0Fzc2lzdC5ub19lb2kgPSAwOwotICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmFwaWNfYXNz aXN0X3BlbmRpbmcgPSBmYWxzZTsKKyAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+YXBpY19hc3Np c3RfcGVuZGluZyA9IGZhbHNlOwogfQogCiBpbnQgdmlyaWRpYW5fc3luaWNfd3Jtc3Ioc3RydWN0 IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgdmFsKQpAQCAtOTUsMTIgKzk1LDEyIEBA IGludCB2aXJpZGlhbl9zeW5pY193cm1zcihzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1 aW50NjRfdCB2YWwpCiAKICAgICBjYXNlIEhWX1g2NF9NU1JfVlBfQVNTSVNUX1BBR0U6CiAgICAg ICAgIC8qIHJlbGVhc2UgYW55IHByZXZpb3VzIG1hcHBpbmcgKi8KLSAgICAgICAgdmlyaWRpYW5f dW5tYXBfZ3Vlc3RfcGFnZSgmdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0KTsKLSAgICAg ICAgdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0Lm1zci5yYXcgPSB2YWw7CisgICAgICAg IHZpcmlkaWFuX3VubWFwX2d1ZXN0X3BhZ2UoJnYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Np c3QpOworICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+dnBfYXNzaXN0Lm1zci5yYXcgPSB2 YWw7CiAgICAgICAgIHZpcmlkaWFuX2R1bXBfZ3Vlc3RfcGFnZSh2LCAiVlBfQVNTSVNUIiwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZ2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9h c3Npc3QpOwotICAgICAgICBpZiAoIHYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5tc3Iu ZmllbGRzLmVuYWJsZWQgKQotICAgICAgICAgICAgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2Uodiwg JnYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdCk7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAmdi0+YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdCk7CisgICAgICAgIGlm ICggdi0+YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdC5tc3IuZmllbGRzLmVuYWJsZWQgKQor ICAgICAgICAgICAgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2UodiwgJnYtPmFyY2guaHZtLnZpcmlk aWFuLT52cF9hc3Npc3QpOwogICAgICAgICBicmVhazsKIAogICAgIGRlZmF1bHQ6CkBAIC0xMzIs NyArMTMyLDcgQEAgaW50IHZpcmlkaWFuX3N5bmljX3JkbXNyKGNvbnN0IHN0cnVjdCB2Y3B1ICp2 LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiAgICAgICAgIGJyZWFrOwogCiAgICAgY2Fz ZSBIVl9YNjRfTVNSX1ZQX0FTU0lTVF9QQUdFOgotICAgICAgICAqdmFsID0gdi0+YXJjaC5odm0u dmlyaWRpYW4udnBfYXNzaXN0Lm1zci5yYXc7CisgICAgICAgICp2YWwgPSB2LT5hcmNoLmh2bS52 aXJpZGlhbi0+dnBfYXNzaXN0Lm1zci5yYXc7CiAgICAgICAgIGJyZWFrOwogCiAgICAgZGVmYXVs dDoKQEAgLTE0NiwxOCArMTQ2LDE4IEBAIGludCB2aXJpZGlhbl9zeW5pY19yZG1zcihjb25zdCBz dHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCAqdmFsKQogdm9pZCB2aXJpZGlh bl9zeW5pY19zYXZlX3ZjcHVfY3R4dChjb25zdCBzdHJ1Y3QgdmNwdSAqdiwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc3RydWN0IGh2bV92aXJpZGlhbl92Y3B1X2NvbnRleHQg KmN0eHQpCiB7Ci0gICAgY3R4dC0+YXBpY19hc3Npc3RfcGVuZGluZyA9IHYtPmFyY2guaHZtLnZp cmlkaWFuLmFwaWNfYXNzaXN0X3BlbmRpbmc7Ci0gICAgY3R4dC0+dnBfYXNzaXN0X21zciA9IHYt PmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5tc3IucmF3OworICAgIGN0eHQtPmFwaWNfYXNz aXN0X3BlbmRpbmcgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi0+YXBpY19hc3Npc3RfcGVuZGluZzsK KyAgICBjdHh0LT52cF9hc3Npc3RfbXNyID0gdi0+YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lz dC5tc3IucmF3OwogfQogCiB2b2lkIHZpcmlkaWFuX3N5bmljX2xvYWRfdmNwdV9jdHh0KAogICAg IHN0cnVjdCB2Y3B1ICp2LCBjb25zdCBzdHJ1Y3QgaHZtX3ZpcmlkaWFuX3ZjcHVfY29udGV4dCAq Y3R4dCkKIHsKLSAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QubXNyLnJhdyA9IGN0 eHQtPnZwX2Fzc2lzdF9tc3I7Ci0gICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Np c3QubXNyLmZpZWxkcy5lbmFibGVkICkKLSAgICAgICAgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2Uo diwgJnYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdCk7CisgICAgdi0+YXJjaC5odm0udmly aWRpYW4tPnZwX2Fzc2lzdC5tc3IucmF3ID0gY3R4dC0+dnBfYXNzaXN0X21zcjsKKyAgICBpZiAo IHYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QubXNyLmZpZWxkcy5lbmFibGVkICkKKyAg ICAgICAgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2UodiwgJnYtPmFyY2guaHZtLnZpcmlkaWFuLT52 cF9hc3Npc3QpOwogCi0gICAgdi0+YXJjaC5odm0udmlyaWRpYW4uYXBpY19hc3Npc3RfcGVuZGlu ZyA9IGN0eHQtPmFwaWNfYXNzaXN0X3BlbmRpbmc7CisgICAgdi0+YXJjaC5odm0udmlyaWRpYW4t PmFwaWNfYXNzaXN0X3BlbmRpbmcgPSBjdHh0LT5hcGljX2Fzc2lzdF9wZW5kaW5nOwogfQogCiAv KgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMgYi94ZW4vYXJj aC94ODYvaHZtL3ZpcmlkaWFuL3RpbWUuYwppbmRleCA4NDBhODJiNDU3Li5hN2U5NGFhZGYwIDEw MDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3RpbWUuYworKysgYi94ZW4vYXJj aC94ODYvaHZtL3ZpcmlkaWFuL3RpbWUuYwpAQCAtMjcsNyArMjcsNyBAQCB0eXBlZGVmIHN0cnVj dCBfSFZfUkVGRVJFTkNFX1RTQ19QQUdFCiAKIHN0YXRpYyB2b2lkIGR1bXBfcmVmZXJlbmNlX3Rz Yyhjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIGNvbnN0IHVuaW9uIHZpcmlkaWFuX3Bh Z2VfbXNyICpydCA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjOworICAgIGNv bnN0IHVuaW9uIHZpcmlkaWFuX3BhZ2VfbXNyICpydCA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi0+ cmVmZXJlbmNlX3RzYzsKIAogICAgIGlmICggIXJ0LT5maWVsZHMuZW5hYmxlZCApCiAgICAgICAg IHJldHVybjsKQEAgLTM4LDcgKzM4LDcgQEAgc3RhdGljIHZvaWQgZHVtcF9yZWZlcmVuY2VfdHNj KGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCiAKIHN0YXRpYyB2b2lkIHVwZGF0ZV9yZWZlcmVuY2Vf dHNjKHN0cnVjdCBkb21haW4gKmQsIGJvb2wgaW5pdGlhbGl6ZSkKIHsKLSAgICB1bnNpZ25lZCBs b25nIGdtZm4gPSBkLT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjLmZpZWxkcy5wZm47 CisgICAgdW5zaWduZWQgbG9uZyBnbWZuID0gZC0+YXJjaC5odm0udmlyaWRpYW4tPnJlZmVyZW5j ZV90c2MuZmllbGRzLnBmbjsKICAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlID0gZ2V0X3BhZ2Vf ZnJvbV9nZm4oZCwgZ21mbiwgTlVMTCwgUDJNX0FMTE9DKTsKICAgICBIVl9SRUZFUkVOQ0VfVFND X1BBR0UgKnA7CiAKQEAgLTEwNyw3ICsxMDcsNyBAQCBzdGF0aWMgdm9pZCB1cGRhdGVfcmVmZXJl bmNlX3RzYyhzdHJ1Y3QgZG9tYWluICpkLCBib29sIGluaXRpYWxpemUpCiAgICAgcHV0X3BhZ2Vf YW5kX3R5cGUocGFnZSk7CiB9CiAKLXN0YXRpYyBpbnQ2NF90IHJhd190cmNfdmFsKHN0cnVjdCBk b21haW4gKmQpCitzdGF0aWMgaW50NjRfdCByYXdfdHJjX3ZhbChjb25zdCBzdHJ1Y3QgZG9tYWlu ICpkKQogewogICAgIHVpbnQ2NF90IHRzYzsKICAgICBzdHJ1Y3QgdGltZV9zY2FsZSB0c2NfdG9f bnM7CkBAIC0xMTksMjEgKzExOSwxOSBAQCBzdGF0aWMgaW50NjRfdCByYXdfdHJjX3ZhbChzdHJ1 Y3QgZG9tYWluICpkKQogICAgIHJldHVybiBzY2FsZV9kZWx0YSh0c2MsICZ0c2NfdG9fbnMpIC8g MTAwdWw7CiB9CiAKLXZvaWQgdmlyaWRpYW5fdGltZV9yZWZfY291bnRfZnJlZXplKHN0cnVjdCBk b21haW4gKmQpCit2b2lkIHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50X2ZyZWV6ZShjb25zdCBzdHJ1 Y3QgZG9tYWluICpkKQogewotICAgIHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJj OwotCi0gICAgdHJjID0gJmQtPmFyY2guaHZtLnZpcmlkaWFuLnRpbWVfcmVmX2NvdW50OworICAg IHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJjID0KKyAgICAgICAgJmQtPmFyY2gu aHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3VudDsKIAogICAgIGlmICggdGVzdF9hbmRfY2xlYXJf Yml0KF9UUkNfcnVubmluZywgJnRyYy0+ZmxhZ3MpICkKICAgICAgICAgdHJjLT52YWwgPSByYXdf dHJjX3ZhbChkKSArIHRyYy0+b2ZmOwogfQogCi12b2lkIHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50 X3RoYXcoc3RydWN0IGRvbWFpbiAqZCkKK3ZvaWQgdmlyaWRpYW5fdGltZV9yZWZfY291bnRfdGhh dyhjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIHN0cnVjdCB2aXJpZGlhbl90aW1lX3Jl Zl9jb3VudCAqdHJjOwotCi0gICAgdHJjID0gJmQtPmFyY2guaHZtLnZpcmlkaWFuLnRpbWVfcmVm X2NvdW50OworICAgIHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJjID0KKyAgICAg ICAgJmQtPmFyY2guaHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3VudDsKIAogICAgIGlmICggIWQt PmlzX3NodXR0aW5nX2Rvd24gJiYKICAgICAgICAgICF0ZXN0X2FuZF9zZXRfYml0KF9UUkNfcnVu bmluZywgJnRyYy0+ZmxhZ3MpICkKQEAgLTE1MCw5ICsxNDgsOSBAQCBpbnQgdmlyaWRpYW5fdGlt ZV93cm1zcihzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCB2YWwpCiAgICAg ICAgIGlmICggISh2aXJpZGlhbl9mZWF0dXJlX21hc2soZCkgJiBIVk1QVl9yZWZlcmVuY2VfdHNj KSApCiAgICAgICAgICAgICByZXR1cm4gWDg2RU1VTF9FWENFUFRJT047CiAKLSAgICAgICAgZC0+ YXJjaC5odm0udmlyaWRpYW4ucmVmZXJlbmNlX3RzYy5yYXcgPSB2YWw7CisgICAgICAgIGQtPmFy Y2guaHZtLnZpcmlkaWFuLT5yZWZlcmVuY2VfdHNjLnJhdyA9IHZhbDsKICAgICAgICAgZHVtcF9y ZWZlcmVuY2VfdHNjKGQpOwotICAgICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLnJlZmVy ZW5jZV90c2MuZmllbGRzLmVuYWJsZWQgKQorICAgICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlk aWFuLT5yZWZlcmVuY2VfdHNjLmZpZWxkcy5lbmFibGVkICkKICAgICAgICAgICAgIHVwZGF0ZV9y ZWZlcmVuY2VfdHNjKGQsIHRydWUpOwogICAgICAgICBicmVhazsKIApAQCAtMTg5LDEzICsxODcs MTMgQEAgaW50IHZpcmlkaWFuX3RpbWVfcmRtc3IoY29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQz Ml90IGlkeCwgdWludDY0X3QgKnZhbCkKICAgICAgICAgaWYgKCAhKHZpcmlkaWFuX2ZlYXR1cmVf bWFzayhkKSAmIEhWTVBWX3JlZmVyZW5jZV90c2MpICkKICAgICAgICAgICAgIHJldHVybiBYODZF TVVMX0VYQ0VQVElPTjsKIAotICAgICAgICAqdmFsID0gZC0+YXJjaC5odm0udmlyaWRpYW4ucmVm ZXJlbmNlX3RzYy5yYXc7CisgICAgICAgICp2YWwgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVm ZXJlbmNlX3RzYy5yYXc7CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBIVl9YNjRfTVNSX1RJ TUVfUkVGX0NPVU5UOgogICAgIHsKICAgICAgICAgc3RydWN0IHZpcmlkaWFuX3RpbWVfcmVmX2Nv dW50ICp0cmMgPQotICAgICAgICAgICAgJmQtPmFyY2guaHZtLnZpcmlkaWFuLnRpbWVfcmVmX2Nv dW50OworICAgICAgICAgICAgJmQtPmFyY2guaHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3VudDsK IAogICAgICAgICBpZiAoICEodmlyaWRpYW5fZmVhdHVyZV9tYXNrKGQpICYgSFZNUFZfdGltZV9y ZWZfY291bnQpICkKICAgICAgICAgICAgIHJldHVybiBYODZFTVVMX0VYQ0VQVElPTjsKQEAgLTIx OSwxNyArMjE3LDE3IEBAIGludCB2aXJpZGlhbl90aW1lX3JkbXNyKGNvbnN0IHN0cnVjdCB2Y3B1 ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiB2b2lkIHZpcmlkaWFuX3RpbWVfc2F2 ZV9kb21haW5fY3R4dCgKICAgICBjb25zdCBzdHJ1Y3QgZG9tYWluICpkLCBzdHJ1Y3QgaHZtX3Zp cmlkaWFuX2RvbWFpbl9jb250ZXh0ICpjdHh0KQogewotICAgIGN0eHQtPnRpbWVfcmVmX2NvdW50 ID0gZC0+YXJjaC5odm0udmlyaWRpYW4udGltZV9yZWZfY291bnQudmFsOwotICAgIGN0eHQtPnJl ZmVyZW5jZV90c2MgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjLnJhdzsKKyAg ICBjdHh0LT50aW1lX3JlZl9jb3VudCA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLT50aW1lX3JlZl9j b3VudC52YWw7CisgICAgY3R4dC0+cmVmZXJlbmNlX3RzYyA9IGQtPmFyY2guaHZtLnZpcmlkaWFu LT5yZWZlcmVuY2VfdHNjLnJhdzsKIH0KIAogdm9pZCB2aXJpZGlhbl90aW1lX2xvYWRfZG9tYWlu X2N0eHQoCiAgICAgc3RydWN0IGRvbWFpbiAqZCwgY29uc3Qgc3RydWN0IGh2bV92aXJpZGlhbl9k b21haW5fY29udGV4dCAqY3R4dCkKIHsKLSAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi50aW1lX3Jl Zl9jb3VudC52YWwgPSBjdHh0LT50aW1lX3JlZl9jb3VudDsKLSAgICBkLT5hcmNoLmh2bS52aXJp ZGlhbi5yZWZlcmVuY2VfdHNjLnJhdyA9IGN0eHQtPnJlZmVyZW5jZV90c2M7CisgICAgZC0+YXJj aC5odm0udmlyaWRpYW4tPnRpbWVfcmVmX2NvdW50LnZhbCA9IGN0eHQtPnRpbWVfcmVmX2NvdW50 OworICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5yZWZlcmVuY2VfdHNjLnJhdyA9IGN0eHQtPnJl ZmVyZW5jZV90c2M7CiAKLSAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLnJlZmVyZW5jZV90 c2MuZmllbGRzLmVuYWJsZWQgKQorICAgIGlmICggZC0+YXJjaC5odm0udmlyaWRpYW4tPnJlZmVy ZW5jZV90c2MuZmllbGRzLmVuYWJsZWQgKQogICAgICAgICB1cGRhdGVfcmVmZXJlbmNlX3RzYyhk LCBmYWxzZSk7CiB9CiAKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdmly aWRpYW4uYyBiL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdmlyaWRpYW4uYwppbmRleCA1YjBl YjhhOGM3Li43ODM5NzE4ZWY0IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFu L3ZpcmlkaWFuLmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi92aXJpZGlhbi5jCkBA IC0xNDYsNyArMTQ2LDcgQEAgdm9pZCBjcHVpZF92aXJpZGlhbl9sZWF2ZXMoY29uc3Qgc3RydWN0 IHZjcHUgKnYsIHVpbnQzMl90IGxlYWYsCiAgICAgICAgICAqIEh5cGVydmlzb3IgaW5mb3JtYXRp b24sIGJ1dCBvbmx5IGlmIHRoZSBndWVzdCBoYXMgc2V0IGl0cwogICAgICAgICAgKiBvd24gdmVy c2lvbiBudW1iZXIuCiAgICAgICAgICAqLwotICAgICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlk aWFuLmd1ZXN0X29zX2lkLnJhdyA9PSAwICkKKyAgICAgICAgaWYgKCBkLT5hcmNoLmh2bS52aXJp ZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3ID09IDAgKQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IHJlcy0+YSA9IHZpcmlkaWFuX2J1aWxkOwogICAgICAgICByZXMtPmIgPSAoKHVpbnQzMl90KXZp cmlkaWFuX21ham9yIDw8IDE2KSB8IHZpcmlkaWFuX21pbm9yOwpAQCAtMTkxLDggKzE5MSw4IEBA IHZvaWQgY3B1aWRfdmlyaWRpYW5fbGVhdmVzKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJf dCBsZWFmLAogCiAgICAgY2FzZSA0OgogICAgICAgICAvKiBSZWNvbW1lbmRlZCBoeXBlcmNhbGwg dXNhZ2UuICovCi0gICAgICAgIGlmICggKGQtPmFyY2guaHZtLnZpcmlkaWFuLmd1ZXN0X29zX2lk LnJhdyA9PSAwKSB8fAotICAgICAgICAgICAgIChkLT5hcmNoLmh2bS52aXJpZGlhbi5ndWVzdF9v c19pZC5maWVsZHMub3MgPCA0KSApCisgICAgICAgIGlmICggKGQtPmFyY2guaHZtLnZpcmlkaWFu LT5ndWVzdF9vc19pZC5yYXcgPT0gMCkgfHwKKyAgICAgICAgICAgICAoZC0+YXJjaC5odm0udmly aWRpYW4tPmd1ZXN0X29zX2lkLmZpZWxkcy5vcyA8IDQpICkKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICByZXMtPmEgPSBDUFVJRDRBX1JFTEFYX1RJTUVSX0lOVDsKICAgICAgICAgaWYgKCB2 aXJpZGlhbl9mZWF0dXJlX21hc2soZCkgJiBIVk1QVl9oY2FsbF9yZW1vdGVfdGxiX2ZsdXNoICkK QEAgLTIyNCw3ICsyMjQsNyBAQCBzdGF0aWMgdm9pZCBkdW1wX2d1ZXN0X29zX2lkKGNvbnN0IHN0 cnVjdCBkb21haW4gKmQpCiB7CiAgICAgY29uc3QgdW5pb24gdmlyaWRpYW5fZ3Vlc3Rfb3NfaWRf bXNyICpnb2k7CiAKLSAgICBnb2kgPSAmZC0+YXJjaC5odm0udmlyaWRpYW4uZ3Vlc3Rfb3NfaWQ7 CisgICAgZ29pID0gJmQtPmFyY2guaHZtLnZpcmlkaWFuLT5ndWVzdF9vc19pZDsKIAogICAgIHBy aW50ayhYRU5MT0dfR19JTkZPCiAgICAgICAgICAgICJkJWQ6IFZJUklESUFOIEdVRVNUX09TX0lE OiB2ZW5kb3I6ICV4IG9zOiAleCBtYWpvcjogJXggbWlub3I6ICV4IHNwOiAleCBidWlsZDogJXhc biIsCkBAIC0yMzgsNyArMjM4LDcgQEAgc3RhdGljIHZvaWQgZHVtcF9oeXBlcmNhbGwoY29uc3Qg c3RydWN0IGRvbWFpbiAqZCkKIHsKICAgICBjb25zdCB1bmlvbiB2aXJpZGlhbl9wYWdlX21zciAq aGc7CiAKLSAgICBoZyA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi5oeXBlcmNhbGxfZ3BhOworICAg IGhnID0gJmQtPmFyY2guaHZtLnZpcmlkaWFuLT5oeXBlcmNhbGxfZ3BhOwogCiAgICAgcHJpbnRr KFhFTkxPR19HX0lORk8gImQlZDogVklSSURJQU4gSFlQRVJDQUxMOiBlbmFibGVkOiAleCBwZm46 ICVseFxuIiwKICAgICAgICAgICAgZC0+ZG9tYWluX2lkLApAQCAtMjQ3LDcgKzI0Nyw3IEBAIHN0 YXRpYyB2b2lkIGR1bXBfaHlwZXJjYWxsKGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCiAKIHN0YXRp YyB2b2lkIGVuYWJsZV9oeXBlcmNhbGxfcGFnZShzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIHVu c2lnbmVkIGxvbmcgZ21mbiA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLmh5cGVyY2FsbF9ncGEuZmll bGRzLnBmbjsKKyAgICB1bnNpZ25lZCBsb25nIGdtZm4gPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+ aHlwZXJjYWxsX2dwYS5maWVsZHMucGZuOwogICAgIHN0cnVjdCBwYWdlX2luZm8gKnBhZ2UgPSBn ZXRfcGFnZV9mcm9tX2dmbihkLCBnbWZuLCBOVUxMLCBQMk1fQUxMT0MpOwogICAgIHVpbnQ4X3Qg KnA7CiAKQEAgLTI4OCwxNCArMjg4LDE0IEBAIGludCBndWVzdF93cm1zcl92aXJpZGlhbihzdHJ1 Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCB2YWwpCiAgICAgc3dpdGNoICggaWR4 ICkKICAgICB7CiAgICAgY2FzZSBIVl9YNjRfTVNSX0dVRVNUX09TX0lEOgotICAgICAgICBkLT5h cmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5yYXcgPSB2YWw7CisgICAgICAgIGQtPmFyY2gu aHZtLnZpcmlkaWFuLT5ndWVzdF9vc19pZC5yYXcgPSB2YWw7CiAgICAgICAgIGR1bXBfZ3Vlc3Rf b3NfaWQoZCk7CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBIVl9YNjRfTVNSX0hZUEVSQ0FM TDoKLSAgICAgICAgZC0+YXJjaC5odm0udmlyaWRpYW4uaHlwZXJjYWxsX2dwYS5yYXcgPSB2YWw7 CisgICAgICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5oeXBlcmNhbGxfZ3BhLnJhdyA9IHZhbDsK ICAgICAgICAgZHVtcF9oeXBlcmNhbGwoZCk7Ci0gICAgICAgIGlmICggZC0+YXJjaC5odm0udmly aWRpYW4uaHlwZXJjYWxsX2dwYS5maWVsZHMuZW5hYmxlZCApCisgICAgICAgIGlmICggZC0+YXJj aC5odm0udmlyaWRpYW4tPmh5cGVyY2FsbF9ncGEuZmllbGRzLmVuYWJsZWQgKQogICAgICAgICAg ICAgZW5hYmxlX2h5cGVyY2FsbF9wYWdlKGQpOwogICAgICAgICBicmVhazsKIApAQCAtMzE3LDEw ICszMTcsMTAgQEAgaW50IGd1ZXN0X3dybXNyX3ZpcmlkaWFuKHN0cnVjdCB2Y3B1ICp2LCB1aW50 MzJfdCBpZHgsIHVpbnQ2NF90IHZhbCkKICAgICBjYXNlIEhWX1g2NF9NU1JfQ1JBU0hfUDM6CiAg ICAgY2FzZSBIVl9YNjRfTVNSX0NSQVNIX1A0OgogICAgICAgICBCVUlMRF9CVUdfT04oSFZfWDY0 X01TUl9DUkFTSF9QNCAtIEhWX1g2NF9NU1JfQ1JBU0hfUDAgPj0KLSAgICAgICAgICAgICAgICAg ICAgIEFSUkFZX1NJWkUodi0+YXJjaC5odm0udmlyaWRpYW4uY3Jhc2hfcGFyYW0pKTsKKyAgICAg ICAgICAgICAgICAgICAgIEFSUkFZX1NJWkUodi0+YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3Bh cmFtKSk7CiAKICAgICAgICAgaWR4IC09IEhWX1g2NF9NU1JfQ1JBU0hfUDA7Ci0gICAgICAgIHYt PmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtW2lkeF0gPSB2YWw7CisgICAgICAgIHYtPmFy Y2guaHZtLnZpcmlkaWFuLT5jcmFzaF9wYXJhbVtpZHhdID0gdmFsOwogICAgICAgICBicmVhazsK IAogICAgIGNhc2UgSFZfWDY0X01TUl9DUkFTSF9DVEw6CkBAIC0zMzcsMTEgKzMzNywxMSBAQCBp bnQgZ3Vlc3Rfd3Jtc3JfdmlyaWRpYW4oc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWlu dDY0X3QgdmFsKQogICAgICAgICBzcGluX3VubG9jaygmZC0+c2h1dGRvd25fbG9jayk7CiAKICAg ICAgICAgZ3ByaW50ayhYRU5MT0dfV0FSTklORywgIlZJUklESUFOIENSQVNIOiAlbHggJWx4ICVs eCAlbHggJWx4XG4iLAotICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNo X3BhcmFtWzBdLAotICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3Bh cmFtWzFdLAotICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFt WzJdLAotICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtWzNd LAotICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtWzRdKTsK KyAgICAgICAgICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+Y3Jhc2hfcGFyYW1bMF0sCisg ICAgICAgICAgICAgICAgdi0+YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3BhcmFtWzFdLAorICAg ICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLT5jcmFzaF9wYXJhbVsyXSwKKyAgICAg ICAgICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+Y3Jhc2hfcGFyYW1bM10sCisgICAgICAg ICAgICAgICAgdi0+YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3BhcmFtWzRdKTsKICAgICAgICAg YnJlYWs7CiAgICAgfQogCkBAIC0zNjQsMTEgKzM2NCwxMSBAQCBpbnQgZ3Vlc3RfcmRtc3Jfdmly aWRpYW4oY29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgKnZhbCkK ICAgICBzd2l0Y2ggKCBpZHggKQogICAgIHsKICAgICBjYXNlIEhWX1g2NF9NU1JfR1VFU1RfT1Nf SUQ6Ci0gICAgICAgICp2YWwgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5yYXc7 CisgICAgICAgICp2YWwgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3Owog ICAgICAgICBicmVhazsKIAogICAgIGNhc2UgSFZfWDY0X01TUl9IWVBFUkNBTEw6Ci0gICAgICAg ICp2YWwgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi5oeXBlcmNhbGxfZ3BhLnJhdzsKKyAgICAgICAg KnZhbCA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLT5oeXBlcmNhbGxfZ3BhLnJhdzsKICAgICAgICAg YnJlYWs7CiAKICAgICBjYXNlIEhWX1g2NF9NU1JfVlBfSU5ERVg6CkBAIC0zOTMsMTAgKzM5Mywx MCBAQCBpbnQgZ3Vlc3RfcmRtc3JfdmlyaWRpYW4oY29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQz Ml90IGlkeCwgdWludDY0X3QgKnZhbCkKICAgICBjYXNlIEhWX1g2NF9NU1JfQ1JBU0hfUDM6CiAg ICAgY2FzZSBIVl9YNjRfTVNSX0NSQVNIX1A0OgogICAgICAgICBCVUlMRF9CVUdfT04oSFZfWDY0 X01TUl9DUkFTSF9QNCAtIEhWX1g2NF9NU1JfQ1JBU0hfUDAgPj0KLSAgICAgICAgICAgICAgICAg ICAgIEFSUkFZX1NJWkUodi0+YXJjaC5odm0udmlyaWRpYW4uY3Jhc2hfcGFyYW0pKTsKKyAgICAg ICAgICAgICAgICAgICAgIEFSUkFZX1NJWkUodi0+YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3Bh cmFtKSk7CiAKICAgICAgICAgaWR4IC09IEhWX1g2NF9NU1JfQ1JBU0hfUDA7Ci0gICAgICAgICp2 YWwgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi5jcmFzaF9wYXJhbVtpZHhdOworICAgICAgICAqdmFs ID0gdi0+YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3BhcmFtW2lkeF07CiAgICAgICAgIGJyZWFr OwogCiAgICAgY2FzZSBIVl9YNjRfTVNSX0NSQVNIX0NUTDoKQEAgLTQxOSwxNyArNDE5LDMzIEBA IGludCBndWVzdF9yZG1zcl92aXJpZGlhbihjb25zdCBzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3Qg aWR4LCB1aW50NjRfdCAqdmFsKQogCiBpbnQgdmlyaWRpYW5fdmNwdV9pbml0KHN0cnVjdCB2Y3B1 ICp2KQogeworICAgIEFTU0VSVCghdi0+YXJjaC5odm0udmlyaWRpYW4pOworICAgIHYtPmFyY2gu aHZtLnZpcmlkaWFuID0geHphbGxvYyhzdHJ1Y3QgdmlyaWRpYW5fdmNwdSk7CisgICAgaWYgKCAh di0+YXJjaC5odm0udmlyaWRpYW4gKQorICAgICAgICByZXR1cm4gLUVOT01FTTsKKwogICAgIHJl dHVybiAwOwogfQogCiBpbnQgdmlyaWRpYW5fZG9tYWluX2luaXQoc3RydWN0IGRvbWFpbiAqZCkK IHsKKyAgICBBU1NFUlQoIWQtPmFyY2guaHZtLnZpcmlkaWFuKTsKKyAgICBkLT5hcmNoLmh2bS52 aXJpZGlhbiA9IHh6YWxsb2Moc3RydWN0IHZpcmlkaWFuX2RvbWFpbik7CisgICAgaWYgKCAhZC0+ YXJjaC5odm0udmlyaWRpYW4gKQorICAgICAgICByZXR1cm4gLUVOT01FTTsKKwogICAgIHJldHVy biAwOwogfQogCiB2b2lkIHZpcmlkaWFuX3ZjcHVfZGVpbml0KHN0cnVjdCB2Y3B1ICp2KQogewot ICAgIHZpcmlkaWFuX3N5bmljX3dybXNyKHYsIEhWX1g2NF9NU1JfVlBfQVNTSVNUX1BBR0UsIDAp OworICAgIGlmICggIXYtPmFyY2guaHZtLnZpcmlkaWFuICkKKyAgICAgICAgcmV0dXJuOworCisg ICAgaWYgKCBpc192aXJpZGlhbl92Y3B1KHYpICkKKyAgICAgICAgdmlyaWRpYW5fc3luaWNfd3Jt c3IodiwgSFZfWDY0X01TUl9WUF9BU1NJU1RfUEFHRSwgMCk7CisKKyAgICBYRlJFRSh2LT5hcmNo Lmh2bS52aXJpZGlhbik7CiB9CiAKIHZvaWQgdmlyaWRpYW5fZG9tYWluX2RlaW5pdChzdHJ1Y3Qg ZG9tYWluICpkKQpAQCAtNDM4LDYgKzQ1NCwxMSBAQCB2b2lkIHZpcmlkaWFuX2RvbWFpbl9kZWlu aXQoc3RydWN0IGRvbWFpbiAqZCkKIAogICAgIGZvcl9lYWNoX3ZjcHUgKCBkLCB2ICkKICAgICAg ICAgdmlyaWRpYW5fdmNwdV9kZWluaXQodik7CisKKyAgICBpZiAoICFkLT5hcmNoLmh2bS52aXJp ZGlhbiApCisgICAgICAgIHJldHVybjsKKworICAgIFhGUkVFKGQtPmFyY2guaHZtLnZpcmlkaWFu KTsKIH0KIAogLyoKQEAgLTU5MSw3ICs2MTIsNyBAQCB2b2lkIHZpcmlkaWFuX2R1bXBfZ3Vlc3Rf cGFnZShjb25zdCBzdHJ1Y3QgdmNwdSAqdiwgY29uc3QgY2hhciAqbmFtZSwKICAgICAgICAgICAg diwgbmFtZSwgKHVuc2lnbmVkIGxvbmcpdnAtPm1zci5maWVsZHMucGZuKTsKIH0KIAotdm9pZCB2 aXJpZGlhbl9tYXBfZ3Vlc3RfcGFnZShzdHJ1Y3QgdmNwdSAqdiwgc3RydWN0IHZpcmlkaWFuX3Bh Z2UgKnZwKQordm9pZCB2aXJpZGlhbl9tYXBfZ3Vlc3RfcGFnZShjb25zdCBzdHJ1Y3QgdmNwdSAq diwgc3RydWN0IHZpcmlkaWFuX3BhZ2UgKnZwKQogewogICAgIHN0cnVjdCBkb21haW4gKmQgPSB2 LT5kb21haW47CiAgICAgdW5zaWduZWQgbG9uZyBnbWZuID0gdnAtPm1zci5maWVsZHMucGZuOwpA QCAtNjQ1LDggKzY2Niw4IEBAIHN0YXRpYyBpbnQgdmlyaWRpYW5fc2F2ZV9kb21haW5fY3R4dChz dHJ1Y3QgdmNwdSAqdiwKIHsKICAgICBjb25zdCBzdHJ1Y3QgZG9tYWluICpkID0gdi0+ZG9tYWlu OwogICAgIHN0cnVjdCBodm1fdmlyaWRpYW5fZG9tYWluX2NvbnRleHQgY3R4dCA9IHsKLSAgICAg ICAgLmh5cGVyY2FsbF9ncGEgID0gZC0+YXJjaC5odm0udmlyaWRpYW4uaHlwZXJjYWxsX2dwYS5y YXcsCi0gICAgICAgIC5ndWVzdF9vc19pZCAgICA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLmd1ZXN0 X29zX2lkLnJhdywKKyAgICAgICAgLmh5cGVyY2FsbF9ncGEgPSBkLT5hcmNoLmh2bS52aXJpZGlh bi0+aHlwZXJjYWxsX2dwYS5yYXcsCisgICAgICAgIC5ndWVzdF9vc19pZCA9IGQtPmFyY2guaHZt LnZpcmlkaWFuLT5ndWVzdF9vc19pZC5yYXcsCiAgICAgfTsKIAogICAgIGlmICggIWlzX3Zpcmlk aWFuX2RvbWFpbihkKSApCkBAIC02NjUsOCArNjg2LDggQEAgc3RhdGljIGludCB2aXJpZGlhbl9s b2FkX2RvbWFpbl9jdHh0KHN0cnVjdCBkb21haW4gKmQsCiAgICAgaWYgKCBodm1fbG9hZF9lbnRy eV96ZXJvZXh0ZW5kKFZJUklESUFOX0RPTUFJTiwgaCwgJmN0eHQpICE9IDAgKQogICAgICAgICBy ZXR1cm4gLUVJTlZBTDsKIAotICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLmh5cGVyY2FsbF9ncGEu cmF3ICA9IGN0eHQuaHlwZXJjYWxsX2dwYTsKLSAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi5ndWVz dF9vc19pZC5yYXcgICAgPSBjdHh0Lmd1ZXN0X29zX2lkOworICAgIGQtPmFyY2guaHZtLnZpcmlk aWFuLT5oeXBlcmNhbGxfZ3BhLnJhdyA9IGN0eHQuaHlwZXJjYWxsX2dwYTsKKyAgICBkLT5hcmNo Lmh2bS52aXJpZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3ID0gY3R4dC5ndWVzdF9vc19pZDsKIAogICAg IHZpcmlkaWFuX3RpbWVfbG9hZF9kb21haW5fY3R4dChkLCAmY3R4dCk7CiAKQEAgLTY4MCw3ICs3 MDEsNyBAQCBzdGF0aWMgaW50IHZpcmlkaWFuX3NhdmVfdmNwdV9jdHh0KHN0cnVjdCB2Y3B1ICp2 LCBodm1fZG9tYWluX2NvbnRleHRfdCAqaCkKIHsKICAgICBzdHJ1Y3QgaHZtX3ZpcmlkaWFuX3Zj cHVfY29udGV4dCBjdHh0ID0ge307CiAKLSAgICBpZiAoICFpc192aXJpZGlhbl9kb21haW4odi0+ ZG9tYWluKSApCisgICAgaWYgKCAhaXNfdmlyaWRpYW5fdmNwdSh2KSApCiAgICAgICAgIHJldHVy biAwOwogCiAgICAgdmlyaWRpYW5fc3luaWNfc2F2ZV92Y3B1X2N0eHQodiwgJmN0eHQpOwpkaWZm IC0tZ2l0IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vZG9tYWluLmggYi94ZW4vaW5jbHVkZS9h c20teDg2L2h2bS9kb21haW4uaAppbmRleCAzZTczMzE4MTdmLi42YzdjNGY1YWE2IDEwMDY0NAot LS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9kb21haW4uaAorKysgYi94ZW4vaW5jbHVkZS9h c20teDg2L2h2bS9kb21haW4uaApAQCAtMTU0LDcgKzE1NCw3IEBAIHN0cnVjdCBodm1fZG9tYWlu IHsKICAgICAvKiBoeXBlcnZpc29yIGludGVyY2VwdGVkIG1zaXggdGFibGUgKi8KICAgICBzdHJ1 Y3QgbGlzdF9oZWFkICAgICAgIG1zaXh0YmxfbGlzdDsKIAotICAgIHN0cnVjdCB2aXJpZGlhbl9k b21haW4gdmlyaWRpYW47CisgICAgc3RydWN0IHZpcmlkaWFuX2RvbWFpbiAqdmlyaWRpYW47CiAK ICAgICBib29sX3QgICAgICAgICAgICAgICAgIGhhcF9lbmFibGVkOwogICAgIGJvb2xfdCAgICAg ICAgICAgICAgICAgbWVtX3NoYXJpbmdfZW5hYmxlZDsKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRl L2FzbS14ODYvaHZtL2h2bS5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vaHZtLmgKaW5kZXgg NTNmZmViYjJjNS4uMzdjMzU2N2E1NyAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9o dm0vaHZtLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vaHZtLmgKQEAgLTQ2Myw2ICs0 NjMsOSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaHZtX2dldF9ndWVzdF9ibmRjZmdzKHN0cnVjdCB2 Y3B1ICp2LCB1NjQgKnZhbCkKICNkZWZpbmUgaXNfdmlyaWRpYW5fZG9tYWluKGQpIFwKICAgICAo aXNfaHZtX2RvbWFpbihkKSAmJiAodmlyaWRpYW5fZmVhdHVyZV9tYXNrKGQpICYgSFZNUFZfYmFz ZV9mcmVxKSkKIAorI2RlZmluZSBpc192aXJpZGlhbl92Y3B1KHYpIFwKKyAgICBpc192aXJpZGlh bl9kb21haW4oKHYpLT5kb21haW4pCisKICNkZWZpbmUgaGFzX3ZpcmlkaWFuX3RpbWVfcmVmX2Nv dW50KGQpIFwKICAgICAoaXNfdmlyaWRpYW5fZG9tYWluKGQpICYmICh2aXJpZGlhbl9mZWF0dXJl X21hc2soZCkgJiBIVk1QVl90aW1lX3JlZl9jb3VudCkpCiAKQEAgLTc2Miw2ICs3NjUsNyBAQCBz dGF0aWMgaW5saW5lIGJvb2wgaHZtX2hhc19zZXRfZGVzY3JpcHRvcl9hY2Nlc3NfZXhpdGluZyh2 b2lkKQogfQogCiAjZGVmaW5lIGlzX3ZpcmlkaWFuX2RvbWFpbihkKSAoKHZvaWQpKGQpLCBmYWxz ZSkKKyNkZWZpbmUgaXNfdmlyaWRpYW5fdmNwdSh2KSAoKHZvaWQpKHYpLCBmYWxzZSkKICNkZWZp bmUgaGFzX3ZpcmlkaWFuX3RpbWVfcmVmX2NvdW50KGQpICgodm9pZCkoZCksIGZhbHNlKQogI2Rl ZmluZSBodm1fbG9uZ19tb2RlX2FjdGl2ZSh2KSAoKHZvaWQpKHYpLCBmYWxzZSkKICNkZWZpbmUg aHZtX2dldF9ndWVzdF90aW1lKHYpICgodm9pZCkodiksIDApCmRpZmYgLS1naXQgYS94ZW4vaW5j bHVkZS9hc20teDg2L2h2bS92Y3B1LmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92Y3B1LmgK aW5kZXggNmM4NGQ1YTVhNi4uZDE1ODlmM2E5NiAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNt LXg4Ni9odm0vdmNwdS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZjcHUuaApAQCAt MjA1LDcgKzIwNSw3IEBAIHN0cnVjdCBodm1fdmNwdSB7CiAgICAgLyogUGVuZGluZyBody9zdyBp bnRlcnJ1cHQgKC52ZWN0b3IgPSAtMSBtZWFucyBub3RoaW5nIHBlbmRpbmcpLiAqLwogICAgIHN0 cnVjdCB4ODZfZXZlbnQgICAgIGluamVjdF9ldmVudDsKIAotICAgIHN0cnVjdCB2aXJpZGlhbl92 Y3B1IHZpcmlkaWFuOworICAgIHN0cnVjdCB2aXJpZGlhbl92Y3B1ICp2aXJpZGlhbjsKIH07CiAK ICNlbmRpZiAvKiBfX0FTTV9YODZfSFZNX1ZDUFVfSF9fICovCmRpZmYgLS1naXQgYS94ZW4vaW5j bHVkZS9hc20teDg2L2h2bS92aXJpZGlhbi5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vdmly aWRpYW4uaAppbmRleCBmMDcyODM4OTU1Li5jNTYyNDI0MzMyIDEwMDY0NAotLS0gYS94ZW4vaW5j bHVkZS9hc20teDg2L2h2bS92aXJpZGlhbi5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZt L3ZpcmlkaWFuLmgKQEAgLTc3LDggKzc3LDggQEAgaW50IGd1ZXN0X3JkbXNyX3ZpcmlkaWFuKGNv bnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpOwogaW50CiB2 aXJpZGlhbl9oeXBlcmNhbGwoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpOwogCi12b2lkIHZp cmlkaWFuX3RpbWVfcmVmX2NvdW50X2ZyZWV6ZShzdHJ1Y3QgZG9tYWluICpkKTsKLXZvaWQgdmly aWRpYW5fdGltZV9yZWZfY291bnRfdGhhdyhzdHJ1Y3QgZG9tYWluICpkKTsKK3ZvaWQgdmlyaWRp YW5fdGltZV9yZWZfY291bnRfZnJlZXplKGNvbnN0IHN0cnVjdCBkb21haW4gKmQpOwordm9pZCB2 aXJpZGlhbl90aW1lX3JlZl9jb3VudF90aGF3KGNvbnN0IHN0cnVjdCBkb21haW4gKmQpOwogCiBp bnQgdmlyaWRpYW5fdmNwdV9pbml0KHN0cnVjdCB2Y3B1ICp2KTsKIGludCB2aXJpZGlhbl9kb21h aW5faW5pdChzdHJ1Y3QgZG9tYWluICpkKTsKQEAgLTg2LDkgKzg2LDkgQEAgaW50IHZpcmlkaWFu X2RvbWFpbl9pbml0KHN0cnVjdCBkb21haW4gKmQpOwogdm9pZCB2aXJpZGlhbl92Y3B1X2RlaW5p dChzdHJ1Y3QgdmNwdSAqdik7CiB2b2lkIHZpcmlkaWFuX2RvbWFpbl9kZWluaXQoc3RydWN0IGRv bWFpbiAqZCk7CiAKLXZvaWQgdmlyaWRpYW5fYXBpY19hc3Npc3Rfc2V0KHN0cnVjdCB2Y3B1ICp2 KTsKLWJvb2wgdmlyaWRpYW5fYXBpY19hc3Npc3RfY29tcGxldGVkKHN0cnVjdCB2Y3B1ICp2KTsK LXZvaWQgdmlyaWRpYW5fYXBpY19hc3Npc3RfY2xlYXIoc3RydWN0IHZjcHUgKnYpOwordm9pZCB2 aXJpZGlhbl9hcGljX2Fzc2lzdF9zZXQoY29uc3Qgc3RydWN0IHZjcHUgKnYpOworYm9vbCB2aXJp ZGlhbl9hcGljX2Fzc2lzdF9jb21wbGV0ZWQoY29uc3Qgc3RydWN0IHZjcHUgKnYpOwordm9pZCB2 aXJpZGlhbl9hcGljX2Fzc2lzdF9jbGVhcihjb25zdCBzdHJ1Y3QgdmNwdSAqdik7CiAKICNlbmRp ZiAvKiBfX0FTTV9YODZfSFZNX1ZJUklESUFOX0hfXyAqLwogCi0tIAoyLjIwLjEKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGlu ZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnBy b2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs