From: Paul Durrant Subject: [PATCH v2 2/8] viridian: separately allocate domain and vcpu structures Date: Tue, 8 Jan 2019 15:18:05 +0000 Message-ID: <20190108151811.19510-3-paul.durrant@citrix.com> References: <20190108151811.19510-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 1ggt94-0002I1-LC for xen-devel@lists.xenproject.org; Tue, 08 Jan 2019 15:18:22 +0000 In-Reply-To: <20190108151811.19510-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 IHRoZXNlIGFsbG9jYXRpb25zLgoKSWRlYWxseSwgbm93IHRoYXQgdGhleSBhcmUgbm8gbG9uZ2Vy IGlubGluZSwgdGhlIGFsbG9jYXRpb25zIG9mIHRoZQp2aXJpZGlhbiBzdHJ1Y3R1cmVzIGNvdWxk IGJlIG1hZGUgY29uZGl0aW9uYWwgb24gd2hldGhlciB0aGUgdG9vbHN0YWNrCmlzIGdvaW5nIHRv IGNvbmZpZ3VyZSB0aGUgdmlyaWRpYW4gZW5saWdodGVubWVudHMuIEhvd2V2ZXIgdGhlIHRvb2xz dGFjawppcyBjdXJyZW50bHkgdW5hYmxlIHRvIGNvbnZleSB0aGlzIGluZm9ybWF0aW9uIHRvIHRo ZSBkb21haW4gY3JlYXRpb24gY29kZQpzbyBzdWNoIGFuIGVuaGFuY2VtZW50IGlzIGRlZmVycmVk IHVudGlsIHRoYXQgYmVjb21lcyBwb3NzaWJsZS4KCk5PVEU6IFRoZSBwYXRjaCBhbHNvIGludHJv ZHVjZWQgdGhlICdpc192aXJpZGlhbl92Y3B1JyBtYWNybyB0byBhdm9pZAogICAgICBpbnRyb2R1 Y2luZyBhIHNlY29uZCBldmFsdWF0aW9uIG9mICdpc192aXJpZGlhbl9kb21haW4nIHdpdGggYW4K ICAgICAgb3Blbi1jb2RlZCAndi0+ZG9tYWluJyBhcmd1bWVudC4gVGhpcyBtYWNybyB3aWxsIGFs c28gYmUgZnVydGhlcgogICAgICB1c2VkIGluIGEgc3Vic2VxdWVudCBwYXRjaC4KClNpZ25lZC1v ZmYtYnk6IFBhdWwgRHVycmFudCA8cGF1bC5kdXJyYW50QGNpdHJpeC5jb20+ClJldmlld2VkLWJ5 OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KQ2M6IEphbiBCZXVsaWNoIDxqYmV1 bGljaEBzdXNlLmNvbT4KQ2M6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5j b20+CkNjOiAiUm9nZXIgUGF1IE1vbm7DqSIgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgoKdjI6CiAt IHVzZSBYRlJFRSgpCiAtIGV4cGFuZCBjb21taXQgY29tbWVudCB0byBwb2ludCBvdXQgd2h5IGFs bG9jYXRpb25zIGFyZSB1bmNvbmRpdGlvbmFsCi0tLQogeGVuL2FyY2gveDg2L2h2bS92aXJpZGlh bi9zeW5pYy5jICAgIHwgNDAgKysrKysrKystLS0tLS0tLQogeGVuL2FyY2gveDg2L2h2bS92aXJp ZGlhbi90aW1lLmMgICAgIHwgMzIgKysrKysrLS0tLS0tLQogeGVuL2FyY2gveDg2L2h2bS92aXJp ZGlhbi92aXJpZGlhbi5jIHwgNzIgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogeGVuL2lu Y2x1ZGUvYXNtLXg4Ni9odm0vZG9tYWluLmggICAgIHwgIDIgKy0KIHhlbi9pbmNsdWRlL2FzbS14 ODYvaHZtL2h2bS5oICAgICAgICB8ICA0ICsrCiB4ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92Y3B1 LmggICAgICAgfCAgMiArLQogNiBmaWxlcyBjaGFuZ2VkLCA4NyBpbnNlcnRpb25zKCspLCA2NSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3N5bmlj LmMgYi94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3N5bmljLmMKaW5kZXggYTZlYmJiYzlmNS4u MjA3MzFjMjM3OSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9zeW5pYy5j CisrKyBiL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vc3luaWMuYwpAQCAtMzAsNyArMzAsNyBA QCB0eXBlZGVmIHVuaW9uIF9IVl9WUF9BU1NJU1RfUEFHRQogCiB2b2lkIHZpcmlkaWFuX2FwaWNf YXNzaXN0X3NldChzdHJ1Y3QgdmNwdSAqdikKIHsKLSAgICBIVl9WUF9BU1NJU1RfUEFHRSAqcHRy ID0gdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0LnB0cjsKKyAgICBIVl9WUF9BU1NJU1Rf UEFHRSAqcHRyID0gdi0+YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdC5wdHI7CiAKICAgICBp ZiAoICFwdHIgKQogICAgICAgICByZXR1cm47CkBAIC00MCwyNSArNDAsMjUgQEAgdm9pZCB2aXJp ZGlhbl9hcGljX2Fzc2lzdF9zZXQoc3RydWN0IHZjcHUgKnYpCiAgICAgICogd3JvbmcgYW5kIHRo ZSBWTSB3aWxsIG1vc3QgbGlrZWx5IGhhbmcgc28gZm9yY2UgYSBjcmFzaCBub3cKICAgICAgKiB0 byBtYWtlIHRoZSBwcm9ibGVtIGNsZWFyLgogICAgICAqLwotICAgIGlmICggdi0+YXJjaC5odm0u dmlyaWRpYW4uYXBpY19hc3Npc3RfcGVuZGluZyApCisgICAgaWYgKCB2LT5hcmNoLmh2bS52aXJp ZGlhbi0+YXBpY19hc3Npc3RfcGVuZGluZyApCiAgICAgICAgIGRvbWFpbl9jcmFzaCh2LT5kb21h aW4pOwogCi0gICAgdi0+YXJjaC5odm0udmlyaWRpYW4uYXBpY19hc3Npc3RfcGVuZGluZyA9IHRy dWU7CisgICAgdi0+YXJjaC5odm0udmlyaWRpYW4tPmFwaWNfYXNzaXN0X3BlbmRpbmcgPSB0cnVl OwogICAgIHB0ci0+QXBpY0Fzc2lzdC5ub19lb2kgPSAxOwogfQogCiBib29sIHZpcmlkaWFuX2Fw aWNfYXNzaXN0X2NvbXBsZXRlZChzdHJ1Y3QgdmNwdSAqdikKIHsKLSAgICBIVl9WUF9BU1NJU1Rf UEFHRSAqcHRyID0gdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0LnB0cjsKKyAgICBIVl9W UF9BU1NJU1RfUEFHRSAqcHRyID0gdi0+YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdC5wdHI7 CiAKICAgICBpZiAoICFwdHIgKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIHYt PmFyY2guaHZtLnZpcmlkaWFuLmFwaWNfYXNzaXN0X3BlbmRpbmcgJiYKKyAgICBpZiAoIHYtPmFy Y2guaHZtLnZpcmlkaWFuLT5hcGljX2Fzc2lzdF9wZW5kaW5nICYmCiAgICAgICAgICAhcHRyLT5B cGljQXNzaXN0Lm5vX2VvaSApCiAgICAgewogICAgICAgICAvKiBBbiBFT0kgaGFzIGJlZW4gYXZv aWRlZCAqLwotICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi5hcGljX2Fzc2lzdF9wZW5kaW5n ID0gZmFsc2U7CisgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLT5hcGljX2Fzc2lzdF9wZW5k aW5nID0gZmFsc2U7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIApAQCAtNjcsMTMgKzY3 LDEzIEBAIGJvb2wgdmlyaWRpYW5fYXBpY19hc3Npc3RfY29tcGxldGVkKHN0cnVjdCB2Y3B1ICp2 KQogCiB2b2lkIHZpcmlkaWFuX2FwaWNfYXNzaXN0X2NsZWFyKHN0cnVjdCB2Y3B1ICp2KQogewot ICAgIEhWX1ZQX0FTU0lTVF9QQUdFICpwdHIgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Np c3QucHRyOworICAgIEhWX1ZQX0FTU0lTVF9QQUdFICpwdHIgPSB2LT5hcmNoLmh2bS52aXJpZGlh bi0+dnBfYXNzaXN0LnB0cjsKIAogICAgIGlmICggIXB0ciApCiAgICAgICAgIHJldHVybjsKIAog ICAgIHB0ci0+QXBpY0Fzc2lzdC5ub19lb2kgPSAwOwotICAgIHYtPmFyY2guaHZtLnZpcmlkaWFu LmFwaWNfYXNzaXN0X3BlbmRpbmcgPSBmYWxzZTsKKyAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+ YXBpY19hc3Npc3RfcGVuZGluZyA9IGZhbHNlOwogfQogCiBpbnQgdmlyaWRpYW5fc3luaWNfd3Jt c3Ioc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgdmFsKQpAQCAtOTUsMTIg Kzk1LDEyIEBAIGludCB2aXJpZGlhbl9zeW5pY193cm1zcihzdHJ1Y3QgdmNwdSAqdiwgdWludDMy X3QgaWR4LCB1aW50NjRfdCB2YWwpCiAKICAgICBjYXNlIEhWX1g2NF9NU1JfVlBfQVNTSVNUX1BB R0U6CiAgICAgICAgIC8qIHJlbGVhc2UgYW55IHByZXZpb3VzIG1hcHBpbmcgKi8KLSAgICAgICAg dmlyaWRpYW5fdW5tYXBfZ3Vlc3RfcGFnZSgmdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0 KTsKLSAgICAgICAgdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0Lm1zci5yYXcgPSB2YWw7 CisgICAgICAgIHZpcmlkaWFuX3VubWFwX2d1ZXN0X3BhZ2UoJnYtPmFyY2guaHZtLnZpcmlkaWFu LT52cF9hc3Npc3QpOworICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+dnBfYXNzaXN0Lm1z ci5yYXcgPSB2YWw7CiAgICAgICAgIHZpcmlkaWFuX2R1bXBfZ3Vlc3RfcGFnZSh2LCAiVlBfQVNT SVNUIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZ2LT5hcmNoLmh2bS52aXJp ZGlhbi52cF9hc3Npc3QpOwotICAgICAgICBpZiAoIHYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fz c2lzdC5tc3IuZmllbGRzLmVuYWJsZWQgKQotICAgICAgICAgICAgdmlyaWRpYW5fbWFwX2d1ZXN0 X3BhZ2UodiwgJnYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdCk7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAmdi0+YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdCk7Cisg ICAgICAgIGlmICggdi0+YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdC5tc3IuZmllbGRzLmVu YWJsZWQgKQorICAgICAgICAgICAgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2UodiwgJnYtPmFyY2gu aHZtLnZpcmlkaWFuLT52cF9hc3Npc3QpOwogICAgICAgICBicmVhazsKIAogICAgIGRlZmF1bHQ6 CkBAIC0xMzIsNyArMTMyLDcgQEAgaW50IHZpcmlkaWFuX3N5bmljX3JkbXNyKGNvbnN0IHN0cnVj dCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiAgICAgICAgIGJyZWFrOwog CiAgICAgY2FzZSBIVl9YNjRfTVNSX1ZQX0FTU0lTVF9QQUdFOgotICAgICAgICAqdmFsID0gdi0+ YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0Lm1zci5yYXc7CisgICAgICAgICp2YWwgPSB2LT5h cmNoLmh2bS52aXJpZGlhbi0+dnBfYXNzaXN0Lm1zci5yYXc7CiAgICAgICAgIGJyZWFrOwogCiAg ICAgZGVmYXVsdDoKQEAgLTE0NiwxOCArMTQ2LDE4IEBAIGludCB2aXJpZGlhbl9zeW5pY19yZG1z cihjb25zdCBzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCAqdmFsKQogdm9p ZCB2aXJpZGlhbl9zeW5pY19zYXZlX3ZjcHVfY3R4dChjb25zdCBzdHJ1Y3QgdmNwdSAqdiwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RydWN0IGh2bV92aXJpZGlhbl92Y3B1 X2NvbnRleHQgKmN0eHQpCiB7Ci0gICAgY3R4dC0+YXBpY19hc3Npc3RfcGVuZGluZyA9IHYtPmFy Y2guaHZtLnZpcmlkaWFuLmFwaWNfYXNzaXN0X3BlbmRpbmc7Ci0gICAgY3R4dC0+dnBfYXNzaXN0 X21zciA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5tc3IucmF3OworICAgIGN0eHQt PmFwaWNfYXNzaXN0X3BlbmRpbmcgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi0+YXBpY19hc3Npc3Rf cGVuZGluZzsKKyAgICBjdHh0LT52cF9hc3Npc3RfbXNyID0gdi0+YXJjaC5odm0udmlyaWRpYW4t PnZwX2Fzc2lzdC5tc3IucmF3OwogfQogCiB2b2lkIHZpcmlkaWFuX3N5bmljX2xvYWRfdmNwdV9j dHh0KAogICAgIHN0cnVjdCB2Y3B1ICp2LCBjb25zdCBzdHJ1Y3QgaHZtX3ZpcmlkaWFuX3ZjcHVf Y29udGV4dCAqY3R4dCkKIHsKLSAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QubXNy LnJhdyA9IGN0eHQtPnZwX2Fzc2lzdF9tc3I7Ci0gICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlh bi52cF9hc3Npc3QubXNyLmZpZWxkcy5lbmFibGVkICkKLSAgICAgICAgdmlyaWRpYW5fbWFwX2d1 ZXN0X3BhZ2UodiwgJnYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdCk7CisgICAgdi0+YXJj aC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdC5tc3IucmF3ID0gY3R4dC0+dnBfYXNzaXN0X21zcjsK KyAgICBpZiAoIHYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QubXNyLmZpZWxkcy5lbmFi bGVkICkKKyAgICAgICAgdmlyaWRpYW5fbWFwX2d1ZXN0X3BhZ2UodiwgJnYtPmFyY2guaHZtLnZp cmlkaWFuLT52cF9hc3Npc3QpOwogCi0gICAgdi0+YXJjaC5odm0udmlyaWRpYW4uYXBpY19hc3Np c3RfcGVuZGluZyA9IGN0eHQtPmFwaWNfYXNzaXN0X3BlbmRpbmc7CisgICAgdi0+YXJjaC5odm0u dmlyaWRpYW4tPmFwaWNfYXNzaXN0X3BlbmRpbmcgPSBjdHh0LT5hcGljX2Fzc2lzdF9wZW5kaW5n OwogfQogCiAvKgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMg Yi94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3RpbWUuYwppbmRleCA4NDBhODJiNDU3Li40MjM2 N2Y2NDYwIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3RpbWUuYworKysg Yi94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3RpbWUuYwpAQCAtMjcsNyArMjcsNyBAQCB0eXBl ZGVmIHN0cnVjdCBfSFZfUkVGRVJFTkNFX1RTQ19QQUdFCiAKIHN0YXRpYyB2b2lkIGR1bXBfcmVm ZXJlbmNlX3RzYyhjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIGNvbnN0IHVuaW9uIHZp cmlkaWFuX3BhZ2VfbXNyICpydCA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNj OworICAgIGNvbnN0IHVuaW9uIHZpcmlkaWFuX3BhZ2VfbXNyICpydCA9ICZkLT5hcmNoLmh2bS52 aXJpZGlhbi0+cmVmZXJlbmNlX3RzYzsKIAogICAgIGlmICggIXJ0LT5maWVsZHMuZW5hYmxlZCAp CiAgICAgICAgIHJldHVybjsKQEAgLTM4LDcgKzM4LDcgQEAgc3RhdGljIHZvaWQgZHVtcF9yZWZl cmVuY2VfdHNjKGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCiAKIHN0YXRpYyB2b2lkIHVwZGF0ZV9y ZWZlcmVuY2VfdHNjKHN0cnVjdCBkb21haW4gKmQsIGJvb2wgaW5pdGlhbGl6ZSkKIHsKLSAgICB1 bnNpZ25lZCBsb25nIGdtZm4gPSBkLT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjLmZp ZWxkcy5wZm47CisgICAgdW5zaWduZWQgbG9uZyBnbWZuID0gZC0+YXJjaC5odm0udmlyaWRpYW4t PnJlZmVyZW5jZV90c2MuZmllbGRzLnBmbjsKICAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlID0g Z2V0X3BhZ2VfZnJvbV9nZm4oZCwgZ21mbiwgTlVMTCwgUDJNX0FMTE9DKTsKICAgICBIVl9SRUZF UkVOQ0VfVFNDX1BBR0UgKnA7CiAKQEAgLTEyMSw5ICsxMjEsOCBAQCBzdGF0aWMgaW50NjRfdCBy YXdfdHJjX3ZhbChzdHJ1Y3QgZG9tYWluICpkKQogCiB2b2lkIHZpcmlkaWFuX3RpbWVfcmVmX2Nv dW50X2ZyZWV6ZShzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIHN0cnVjdCB2aXJpZGlhbl90aW1l X3JlZl9jb3VudCAqdHJjOwotCi0gICAgdHJjID0gJmQtPmFyY2guaHZtLnZpcmlkaWFuLnRpbWVf cmVmX2NvdW50OworICAgIHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJjID0KKyAg ICAgICAgJmQtPmFyY2guaHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3VudDsKIAogICAgIGlmICgg dGVzdF9hbmRfY2xlYXJfYml0KF9UUkNfcnVubmluZywgJnRyYy0+ZmxhZ3MpICkKICAgICAgICAg dHJjLT52YWwgPSByYXdfdHJjX3ZhbChkKSArIHRyYy0+b2ZmOwpAQCAtMTMxLDkgKzEzMCw4IEBA IHZvaWQgdmlyaWRpYW5fdGltZV9yZWZfY291bnRfZnJlZXplKHN0cnVjdCBkb21haW4gKmQpCiAK IHZvaWQgdmlyaWRpYW5fdGltZV9yZWZfY291bnRfdGhhdyhzdHJ1Y3QgZG9tYWluICpkKQogewot ICAgIHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJjOwotCi0gICAgdHJjID0gJmQt PmFyY2guaHZtLnZpcmlkaWFuLnRpbWVfcmVmX2NvdW50OworICAgIHN0cnVjdCB2aXJpZGlhbl90 aW1lX3JlZl9jb3VudCAqdHJjID0KKyAgICAgICAgJmQtPmFyY2guaHZtLnZpcmlkaWFuLT50aW1l X3JlZl9jb3VudDsKIAogICAgIGlmICggIWQtPmlzX3NodXR0aW5nX2Rvd24gJiYKICAgICAgICAg ICF0ZXN0X2FuZF9zZXRfYml0KF9UUkNfcnVubmluZywgJnRyYy0+ZmxhZ3MpICkKQEAgLTE1MCw5 ICsxNDgsOSBAQCBpbnQgdmlyaWRpYW5fdGltZV93cm1zcihzdHJ1Y3QgdmNwdSAqdiwgdWludDMy X3QgaWR4LCB1aW50NjRfdCB2YWwpCiAgICAgICAgIGlmICggISh2aXJpZGlhbl9mZWF0dXJlX21h c2soZCkgJiBIVk1QVl9yZWZlcmVuY2VfdHNjKSApCiAgICAgICAgICAgICByZXR1cm4gWDg2RU1V TF9FWENFUFRJT047CiAKLSAgICAgICAgZC0+YXJjaC5odm0udmlyaWRpYW4ucmVmZXJlbmNlX3Rz Yy5yYXcgPSB2YWw7CisgICAgICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5yZWZlcmVuY2VfdHNj LnJhdyA9IHZhbDsKICAgICAgICAgZHVtcF9yZWZlcmVuY2VfdHNjKGQpOwotICAgICAgICBpZiAo IGQtPmFyY2guaHZtLnZpcmlkaWFuLnJlZmVyZW5jZV90c2MuZmllbGRzLmVuYWJsZWQgKQorICAg ICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5yZWZlcmVuY2VfdHNjLmZpZWxkcy5lbmFi bGVkICkKICAgICAgICAgICAgIHVwZGF0ZV9yZWZlcmVuY2VfdHNjKGQsIHRydWUpOwogICAgICAg ICBicmVhazsKIApAQCAtMTg5LDEzICsxODcsMTMgQEAgaW50IHZpcmlkaWFuX3RpbWVfcmRtc3Io Y29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgKnZhbCkKICAgICAg ICAgaWYgKCAhKHZpcmlkaWFuX2ZlYXR1cmVfbWFzayhkKSAmIEhWTVBWX3JlZmVyZW5jZV90c2Mp ICkKICAgICAgICAgICAgIHJldHVybiBYODZFTVVMX0VYQ0VQVElPTjsKIAotICAgICAgICAqdmFs ID0gZC0+YXJjaC5odm0udmlyaWRpYW4ucmVmZXJlbmNlX3RzYy5yYXc7CisgICAgICAgICp2YWwg PSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVmZXJlbmNlX3RzYy5yYXc7CiAgICAgICAgIGJyZWFr OwogCiAgICAgY2FzZSBIVl9YNjRfTVNSX1RJTUVfUkVGX0NPVU5UOgogICAgIHsKICAgICAgICAg c3RydWN0IHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50ICp0cmMgPQotICAgICAgICAgICAgJmQtPmFy Y2guaHZtLnZpcmlkaWFuLnRpbWVfcmVmX2NvdW50OworICAgICAgICAgICAgJmQtPmFyY2guaHZt LnZpcmlkaWFuLT50aW1lX3JlZl9jb3VudDsKIAogICAgICAgICBpZiAoICEodmlyaWRpYW5fZmVh dHVyZV9tYXNrKGQpICYgSFZNUFZfdGltZV9yZWZfY291bnQpICkKICAgICAgICAgICAgIHJldHVy biBYODZFTVVMX0VYQ0VQVElPTjsKQEAgLTIxOSwxNyArMjE3LDE3IEBAIGludCB2aXJpZGlhbl90 aW1lX3JkbXNyKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2 YWwpCiB2b2lkIHZpcmlkaWFuX3RpbWVfc2F2ZV9kb21haW5fY3R4dCgKICAgICBjb25zdCBzdHJ1 Y3QgZG9tYWluICpkLCBzdHJ1Y3QgaHZtX3ZpcmlkaWFuX2RvbWFpbl9jb250ZXh0ICpjdHh0KQog ewotICAgIGN0eHQtPnRpbWVfcmVmX2NvdW50ID0gZC0+YXJjaC5odm0udmlyaWRpYW4udGltZV9y ZWZfY291bnQudmFsOwotICAgIGN0eHQtPnJlZmVyZW5jZV90c2MgPSBkLT5hcmNoLmh2bS52aXJp ZGlhbi5yZWZlcmVuY2VfdHNjLnJhdzsKKyAgICBjdHh0LT50aW1lX3JlZl9jb3VudCA9IGQtPmFy Y2guaHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3VudC52YWw7CisgICAgY3R4dC0+cmVmZXJlbmNl X3RzYyA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLT5yZWZlcmVuY2VfdHNjLnJhdzsKIH0KIAogdm9p ZCB2aXJpZGlhbl90aW1lX2xvYWRfZG9tYWluX2N0eHQoCiAgICAgc3RydWN0IGRvbWFpbiAqZCwg Y29uc3Qgc3RydWN0IGh2bV92aXJpZGlhbl9kb21haW5fY29udGV4dCAqY3R4dCkKIHsKLSAgICBk LT5hcmNoLmh2bS52aXJpZGlhbi50aW1lX3JlZl9jb3VudC52YWwgPSBjdHh0LT50aW1lX3JlZl9j b3VudDsKLSAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjLnJhdyA9IGN0eHQt PnJlZmVyZW5jZV90c2M7CisgICAgZC0+YXJjaC5odm0udmlyaWRpYW4tPnRpbWVfcmVmX2NvdW50 LnZhbCA9IGN0eHQtPnRpbWVfcmVmX2NvdW50OworICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5y ZWZlcmVuY2VfdHNjLnJhdyA9IGN0eHQtPnJlZmVyZW5jZV90c2M7CiAKLSAgICBpZiAoIGQtPmFy Y2guaHZtLnZpcmlkaWFuLnJlZmVyZW5jZV90c2MuZmllbGRzLmVuYWJsZWQgKQorICAgIGlmICgg ZC0+YXJjaC5odm0udmlyaWRpYW4tPnJlZmVyZW5jZV90c2MuZmllbGRzLmVuYWJsZWQgKQogICAg ICAgICB1cGRhdGVfcmVmZXJlbmNlX3RzYyhkLCBmYWxzZSk7CiB9CiAKZGlmZiAtLWdpdCBhL3hl bi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdmlyaWRpYW4uYyBiL3hlbi9hcmNoL3g4Ni9odm0vdmly aWRpYW4vdmlyaWRpYW4uYwppbmRleCA2NWFmYTA0OWQ5Li4wMDAyMTEyYWExIDEwMDY0NAotLS0g YS94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3ZpcmlkaWFuLmMKKysrIGIveGVuL2FyY2gveDg2 L2h2bS92aXJpZGlhbi92aXJpZGlhbi5jCkBAIC0xNDYsNyArMTQ2LDcgQEAgdm9pZCBjcHVpZF92 aXJpZGlhbl9sZWF2ZXMoY29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGxlYWYsCiAgICAg ICAgICAqIEh5cGVydmlzb3IgaW5mb3JtYXRpb24sIGJ1dCBvbmx5IGlmIHRoZSBndWVzdCBoYXMg c2V0IGl0cwogICAgICAgICAgKiBvd24gdmVyc2lvbiBudW1iZXIuCiAgICAgICAgICAqLwotICAg ICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLmd1ZXN0X29zX2lkLnJhdyA9PSAwICkKKyAg ICAgICAgaWYgKCBkLT5hcmNoLmh2bS52aXJpZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3ID09IDAgKQog ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIHJlcy0+YSA9IHZpcmlkaWFuX2J1aWxkOwogICAg ICAgICByZXMtPmIgPSAoKHVpbnQzMl90KXZpcmlkaWFuX21ham9yIDw8IDE2KSB8IHZpcmlkaWFu X21pbm9yOwpAQCAtMTkxLDggKzE5MSw4IEBAIHZvaWQgY3B1aWRfdmlyaWRpYW5fbGVhdmVzKGNv bnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBsZWFmLAogCiAgICAgY2FzZSA0OgogICAgICAg ICAvKiBSZWNvbW1lbmRlZCBoeXBlcmNhbGwgdXNhZ2UuICovCi0gICAgICAgIGlmICggKGQtPmFy Y2guaHZtLnZpcmlkaWFuLmd1ZXN0X29zX2lkLnJhdyA9PSAwKSB8fAotICAgICAgICAgICAgIChk LT5hcmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5maWVsZHMub3MgPCA0KSApCisgICAgICAg IGlmICggKGQtPmFyY2guaHZtLnZpcmlkaWFuLT5ndWVzdF9vc19pZC5yYXcgPT0gMCkgfHwKKyAg ICAgICAgICAgICAoZC0+YXJjaC5odm0udmlyaWRpYW4tPmd1ZXN0X29zX2lkLmZpZWxkcy5vcyA8 IDQpICkKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICByZXMtPmEgPSBDUFVJRDRBX1JFTEFY X1RJTUVSX0lOVDsKICAgICAgICAgaWYgKCB2aXJpZGlhbl9mZWF0dXJlX21hc2soZCkgJiBIVk1Q Vl9oY2FsbF9yZW1vdGVfdGxiX2ZsdXNoICkKQEAgLTIyNCw3ICsyMjQsNyBAQCBzdGF0aWMgdm9p ZCBkdW1wX2d1ZXN0X29zX2lkKGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCiB7CiAgICAgY29uc3Qg dW5pb24gdmlyaWRpYW5fZ3Vlc3Rfb3NfaWRfbXNyICpnb2k7CiAKLSAgICBnb2kgPSAmZC0+YXJj aC5odm0udmlyaWRpYW4uZ3Vlc3Rfb3NfaWQ7CisgICAgZ29pID0gJmQtPmFyY2guaHZtLnZpcmlk aWFuLT5ndWVzdF9vc19pZDsKIAogICAgIHByaW50ayhYRU5MT0dfR19JTkZPCiAgICAgICAgICAg ICJkJWQ6IFZJUklESUFOIEdVRVNUX09TX0lEOiB2ZW5kb3I6ICV4IG9zOiAleCBtYWpvcjogJXgg bWlub3I6ICV4IHNwOiAleCBidWlsZDogJXhcbiIsCkBAIC0yMzgsNyArMjM4LDcgQEAgc3RhdGlj IHZvaWQgZHVtcF9oeXBlcmNhbGwoY29uc3Qgc3RydWN0IGRvbWFpbiAqZCkKIHsKICAgICBjb25z dCB1bmlvbiB2aXJpZGlhbl9wYWdlX21zciAqaGc7CiAKLSAgICBoZyA9ICZkLT5hcmNoLmh2bS52 aXJpZGlhbi5oeXBlcmNhbGxfZ3BhOworICAgIGhnID0gJmQtPmFyY2guaHZtLnZpcmlkaWFuLT5o eXBlcmNhbGxfZ3BhOwogCiAgICAgcHJpbnRrKFhFTkxPR19HX0lORk8gImQlZDogVklSSURJQU4g SFlQRVJDQUxMOiBlbmFibGVkOiAleCBwZm46ICVseFxuIiwKICAgICAgICAgICAgZC0+ZG9tYWlu X2lkLApAQCAtMjQ3LDcgKzI0Nyw3IEBAIHN0YXRpYyB2b2lkIGR1bXBfaHlwZXJjYWxsKGNvbnN0 IHN0cnVjdCBkb21haW4gKmQpCiAKIHN0YXRpYyB2b2lkIGVuYWJsZV9oeXBlcmNhbGxfcGFnZShz dHJ1Y3QgZG9tYWluICpkKQogewotICAgIHVuc2lnbmVkIGxvbmcgZ21mbiA9IGQtPmFyY2guaHZt LnZpcmlkaWFuLmh5cGVyY2FsbF9ncGEuZmllbGRzLnBmbjsKKyAgICB1bnNpZ25lZCBsb25nIGdt Zm4gPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+aHlwZXJjYWxsX2dwYS5maWVsZHMucGZuOwogICAg IHN0cnVjdCBwYWdlX2luZm8gKnBhZ2UgPSBnZXRfcGFnZV9mcm9tX2dmbihkLCBnbWZuLCBOVUxM LCBQMk1fQUxMT0MpOwogICAgIHVpbnQ4X3QgKnA7CiAKQEAgLTI4OCwxNCArMjg4LDE0IEBAIGlu dCBndWVzdF93cm1zcl92aXJpZGlhbihzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50 NjRfdCB2YWwpCiAgICAgc3dpdGNoICggaWR4ICkKICAgICB7CiAgICAgY2FzZSBIVl9YNjRfTVNS X0dVRVNUX09TX0lEOgotICAgICAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5y YXcgPSB2YWw7CisgICAgICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5ndWVzdF9vc19pZC5yYXcg PSB2YWw7CiAgICAgICAgIGR1bXBfZ3Vlc3Rfb3NfaWQoZCk7CiAgICAgICAgIGJyZWFrOwogCiAg ICAgY2FzZSBIVl9YNjRfTVNSX0hZUEVSQ0FMTDoKLSAgICAgICAgZC0+YXJjaC5odm0udmlyaWRp YW4uaHlwZXJjYWxsX2dwYS5yYXcgPSB2YWw7CisgICAgICAgIGQtPmFyY2guaHZtLnZpcmlkaWFu LT5oeXBlcmNhbGxfZ3BhLnJhdyA9IHZhbDsKICAgICAgICAgZHVtcF9oeXBlcmNhbGwoZCk7Ci0g ICAgICAgIGlmICggZC0+YXJjaC5odm0udmlyaWRpYW4uaHlwZXJjYWxsX2dwYS5maWVsZHMuZW5h YmxlZCApCisgICAgICAgIGlmICggZC0+YXJjaC5odm0udmlyaWRpYW4tPmh5cGVyY2FsbF9ncGEu ZmllbGRzLmVuYWJsZWQgKQogICAgICAgICAgICAgZW5hYmxlX2h5cGVyY2FsbF9wYWdlKGQpOwog ICAgICAgICBicmVhazsKIApAQCAtMzE3LDEwICszMTcsMTAgQEAgaW50IGd1ZXN0X3dybXNyX3Zp cmlkaWFuKHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90IHZhbCkKICAgICBj YXNlIEhWX1g2NF9NU1JfQ1JBU0hfUDM6CiAgICAgY2FzZSBIVl9YNjRfTVNSX0NSQVNIX1A0Ogog ICAgICAgICBCVUlMRF9CVUdfT04oSFZfWDY0X01TUl9DUkFTSF9QNCAtIEhWX1g2NF9NU1JfQ1JB U0hfUDAgPj0KLSAgICAgICAgICAgICAgICAgICAgIEFSUkFZX1NJWkUodi0+YXJjaC5odm0udmly aWRpYW4uY3Jhc2hfcGFyYW0pKTsKKyAgICAgICAgICAgICAgICAgICAgIEFSUkFZX1NJWkUodi0+ YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3BhcmFtKSk7CiAKICAgICAgICAgaWR4IC09IEhWX1g2 NF9NU1JfQ1JBU0hfUDA7Ci0gICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFt W2lkeF0gPSB2YWw7CisgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLT5jcmFzaF9wYXJhbVtp ZHhdID0gdmFsOwogICAgICAgICBicmVhazsKIAogICAgIGNhc2UgSFZfWDY0X01TUl9DUkFTSF9D VEw6CkBAIC0zMzcsMTEgKzMzNywxMSBAQCBpbnQgZ3Vlc3Rfd3Jtc3JfdmlyaWRpYW4oc3RydWN0 IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgdmFsKQogICAgICAgICBzcGluX3VubG9j aygmZC0+c2h1dGRvd25fbG9jayk7CiAKICAgICAgICAgZ3ByaW50ayhYRU5MT0dfV0FSTklORywg IlZJUklESUFOIENSQVNIOiAlbHggJWx4ICVseCAlbHggJWx4XG4iLAotICAgICAgICAgICAgICAg IHYtPmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtWzBdLAotICAgICAgICAgICAgICAgIHYt PmFyY2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtWzFdLAotICAgICAgICAgICAgICAgIHYtPmFy Y2guaHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtWzJdLAotICAgICAgICAgICAgICAgIHYtPmFyY2gu aHZtLnZpcmlkaWFuLmNyYXNoX3BhcmFtWzNdLAotICAgICAgICAgICAgICAgIHYtPmFyY2guaHZt LnZpcmlkaWFuLmNyYXNoX3BhcmFtWzRdKTsKKyAgICAgICAgICAgICAgICB2LT5hcmNoLmh2bS52 aXJpZGlhbi0+Y3Jhc2hfcGFyYW1bMF0sCisgICAgICAgICAgICAgICAgdi0+YXJjaC5odm0udmly aWRpYW4tPmNyYXNoX3BhcmFtWzFdLAorICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlk aWFuLT5jcmFzaF9wYXJhbVsyXSwKKyAgICAgICAgICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlh bi0+Y3Jhc2hfcGFyYW1bM10sCisgICAgICAgICAgICAgICAgdi0+YXJjaC5odm0udmlyaWRpYW4t PmNyYXNoX3BhcmFtWzRdKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogCkBAIC0zNjQsMTEgKzM2 NCwxMSBAQCBpbnQgZ3Vlc3RfcmRtc3JfdmlyaWRpYW4oY29uc3Qgc3RydWN0IHZjcHUgKnYsIHVp bnQzMl90IGlkeCwgdWludDY0X3QgKnZhbCkKICAgICBzd2l0Y2ggKCBpZHggKQogICAgIHsKICAg ICBjYXNlIEhWX1g2NF9NU1JfR1VFU1RfT1NfSUQ6Ci0gICAgICAgICp2YWwgPSBkLT5hcmNoLmh2 bS52aXJpZGlhbi5ndWVzdF9vc19pZC5yYXc7CisgICAgICAgICp2YWwgPSBkLT5hcmNoLmh2bS52 aXJpZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3OwogICAgICAgICBicmVhazsKIAogICAgIGNhc2UgSFZf WDY0X01TUl9IWVBFUkNBTEw6Ci0gICAgICAgICp2YWwgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi5o eXBlcmNhbGxfZ3BhLnJhdzsKKyAgICAgICAgKnZhbCA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLT5o eXBlcmNhbGxfZ3BhLnJhdzsKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIEhWX1g2NF9NU1Jf VlBfSU5ERVg6CkBAIC0zOTMsMTAgKzM5MywxMCBAQCBpbnQgZ3Vlc3RfcmRtc3JfdmlyaWRpYW4o Y29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgKnZhbCkKICAgICBj YXNlIEhWX1g2NF9NU1JfQ1JBU0hfUDM6CiAgICAgY2FzZSBIVl9YNjRfTVNSX0NSQVNIX1A0Ogog ICAgICAgICBCVUlMRF9CVUdfT04oSFZfWDY0X01TUl9DUkFTSF9QNCAtIEhWX1g2NF9NU1JfQ1JB U0hfUDAgPj0KLSAgICAgICAgICAgICAgICAgICAgIEFSUkFZX1NJWkUodi0+YXJjaC5odm0udmly aWRpYW4uY3Jhc2hfcGFyYW0pKTsKKyAgICAgICAgICAgICAgICAgICAgIEFSUkFZX1NJWkUodi0+ YXJjaC5odm0udmlyaWRpYW4tPmNyYXNoX3BhcmFtKSk7CiAKICAgICAgICAgaWR4IC09IEhWX1g2 NF9NU1JfQ1JBU0hfUDA7Ci0gICAgICAgICp2YWwgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi5jcmFz aF9wYXJhbVtpZHhdOworICAgICAgICAqdmFsID0gdi0+YXJjaC5odm0udmlyaWRpYW4tPmNyYXNo X3BhcmFtW2lkeF07CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBIVl9YNjRfTVNSX0NSQVNI X0NUTDoKQEAgLTQxOSwyMSArNDE5LDQxIEBAIGludCBndWVzdF9yZG1zcl92aXJpZGlhbihjb25z dCBzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCAqdmFsKQogCiBpbnQgdmly aWRpYW5fdmNwdV9pbml0KHN0cnVjdCB2Y3B1ICp2KQogeworICAgIEFTU0VSVCghdi0+YXJjaC5o dm0udmlyaWRpYW4pOworICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuID0geHphbGxvYyhzdHJ1Y3Qg dmlyaWRpYW5fdmNwdSk7CisgICAgaWYgKCAhdi0+YXJjaC5odm0udmlyaWRpYW4gKQorICAgICAg ICByZXR1cm4gLUVOT01FTTsKKwogICAgIHJldHVybiAwOwogfQogCiBpbnQgdmlyaWRpYW5fZG9t YWluX2luaXQoc3RydWN0IGRvbWFpbiAqZCkKIHsKKyAgICBBU1NFUlQoIWQtPmFyY2guaHZtLnZp cmlkaWFuKTsKKyAgICBkLT5hcmNoLmh2bS52aXJpZGlhbiA9IHh6YWxsb2Moc3RydWN0IHZpcmlk aWFuX2RvbWFpbik7CisgICAgaWYgKCAhZC0+YXJjaC5odm0udmlyaWRpYW4gKQorICAgICAgICBy ZXR1cm4gLUVOT01FTTsKKwogICAgIHJldHVybiAwOwogfQogCiB2b2lkIHZpcmlkaWFuX3ZjcHVf ZGVpbml0KHN0cnVjdCB2Y3B1ICp2KQogewotICAgIHZpcmlkaWFuX3N5bmljX3dybXNyKHYsIEhW X1g2NF9NU1JfVlBfQVNTSVNUX1BBR0UsIDApOworICAgIGlmICggIXYtPmFyY2guaHZtLnZpcmlk aWFuICkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKCBpc192aXJpZGlhbl92Y3B1KHYpICkK KyAgICAgICAgdmlyaWRpYW5fc3luaWNfd3Jtc3IodiwgSFZfWDY0X01TUl9WUF9BU1NJU1RfUEFH RSwgMCk7CisKKyAgICBYRlJFRSh2LT5hcmNoLmh2bS52aXJpZGlhbik7CiB9CiAKIHZvaWQgdmly aWRpYW5fZG9tYWluX2RlaW5pdChzdHJ1Y3QgZG9tYWluICpkKQogeworICAgIGlmICggIWQtPmFy Y2guaHZtLnZpcmlkaWFuICkKKyAgICAgICAgcmV0dXJuOworCisgICAgWEZSRUUoZC0+YXJjaC5o dm0udmlyaWRpYW4pOwogfQogCiBzdGF0aWMgREVGSU5FX1BFUl9DUFUoY3B1bWFza190LCBpcGlf Y3B1bWFzayk7CkBAIC02NTgsOCArNjc4LDggQEAgc3RhdGljIGludCB2aXJpZGlhbl9zYXZlX2Rv bWFpbl9jdHh0KHN0cnVjdCB2Y3B1ICp2LAogewogICAgIGNvbnN0IHN0cnVjdCBkb21haW4gKmQg PSB2LT5kb21haW47CiAgICAgc3RydWN0IGh2bV92aXJpZGlhbl9kb21haW5fY29udGV4dCBjdHh0 ID0gewotICAgICAgICAuaHlwZXJjYWxsX2dwYSAgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi5oeXBl cmNhbGxfZ3BhLnJhdywKLSAgICAgICAgLmd1ZXN0X29zX2lkICAgID0gZC0+YXJjaC5odm0udmly aWRpYW4uZ3Vlc3Rfb3NfaWQucmF3LAorICAgICAgICAuaHlwZXJjYWxsX2dwYSA9IGQtPmFyY2gu aHZtLnZpcmlkaWFuLT5oeXBlcmNhbGxfZ3BhLnJhdywKKyAgICAgICAgLmd1ZXN0X29zX2lkID0g ZC0+YXJjaC5odm0udmlyaWRpYW4tPmd1ZXN0X29zX2lkLnJhdywKICAgICB9OwogCiAgICAgaWYg KCAhaXNfdmlyaWRpYW5fZG9tYWluKGQpICkKQEAgLTY3OCw4ICs2OTgsOCBAQCBzdGF0aWMgaW50 IHZpcmlkaWFuX2xvYWRfZG9tYWluX2N0eHQoc3RydWN0IGRvbWFpbiAqZCwKICAgICBpZiAoIGh2 bV9sb2FkX2VudHJ5X3plcm9leHRlbmQoVklSSURJQU5fRE9NQUlOLCBoLCAmY3R4dCkgIT0gMCAp CiAgICAgICAgIHJldHVybiAtRUlOVkFMOwogCi0gICAgZC0+YXJjaC5odm0udmlyaWRpYW4uaHlw ZXJjYWxsX2dwYS5yYXcgID0gY3R4dC5oeXBlcmNhbGxfZ3BhOwotICAgIGQtPmFyY2guaHZtLnZp cmlkaWFuLmd1ZXN0X29zX2lkLnJhdyAgICA9IGN0eHQuZ3Vlc3Rfb3NfaWQ7CisgICAgZC0+YXJj aC5odm0udmlyaWRpYW4tPmh5cGVyY2FsbF9ncGEucmF3ID0gY3R4dC5oeXBlcmNhbGxfZ3BhOwor ICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5ndWVzdF9vc19pZC5yYXcgPSBjdHh0Lmd1ZXN0X29z X2lkOwogCiAgICAgdmlyaWRpYW5fdGltZV9sb2FkX2RvbWFpbl9jdHh0KGQsICZjdHh0KTsKIApA QCAtNjkzLDcgKzcxMyw3IEBAIHN0YXRpYyBpbnQgdmlyaWRpYW5fc2F2ZV92Y3B1X2N0eHQoc3Ry dWN0IHZjcHUgKnYsIGh2bV9kb21haW5fY29udGV4dF90ICpoKQogewogICAgIHN0cnVjdCBodm1f dmlyaWRpYW5fdmNwdV9jb250ZXh0IGN0eHQgPSB7fTsKIAotICAgIGlmICggIWlzX3ZpcmlkaWFu X2RvbWFpbih2LT5kb21haW4pICkKKyAgICBpZiAoICFpc192aXJpZGlhbl92Y3B1KHYpICkKICAg ICAgICAgcmV0dXJuIDA7CiAKICAgICB2aXJpZGlhbl9zeW5pY19zYXZlX3ZjcHVfY3R4dCh2LCAm Y3R4dCk7CmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9kb21haW4uaCBiL3hl bi9pbmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oCmluZGV4IDNlNzMzMTgxN2YuLjZjN2M0ZjVh YTYgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oCisrKyBiL3hl bi9pbmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oCkBAIC0xNTQsNyArMTU0LDcgQEAgc3RydWN0 IGh2bV9kb21haW4gewogICAgIC8qIGh5cGVydmlzb3IgaW50ZXJjZXB0ZWQgbXNpeCB0YWJsZSAq LwogICAgIHN0cnVjdCBsaXN0X2hlYWQgICAgICAgbXNpeHRibF9saXN0OwogCi0gICAgc3RydWN0 IHZpcmlkaWFuX2RvbWFpbiB2aXJpZGlhbjsKKyAgICBzdHJ1Y3QgdmlyaWRpYW5fZG9tYWluICp2 aXJpZGlhbjsKIAogICAgIGJvb2xfdCAgICAgICAgICAgICAgICAgaGFwX2VuYWJsZWQ7CiAgICAg Ym9vbF90ICAgICAgICAgICAgICAgICBtZW1fc2hhcmluZ19lbmFibGVkOwpkaWZmIC0tZ2l0IGEv eGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vaHZtLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9o dm0uaAppbmRleCAwYTEwYjUxNTU0Li5kOGRmNmY0MzUyIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVk ZS9hc20teDg2L2h2bS9odm0uaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9odm0uaApA QCAtNDYxLDYgKzQ2MSw5IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBodm1fZ2V0X2d1ZXN0X2JuZGNm Z3Moc3RydWN0IHZjcHUgKnYsIHU2NCAqdmFsKQogI2RlZmluZSBpc192aXJpZGlhbl9kb21haW4o ZCkgXAogICAgIChpc19odm1fZG9tYWluKGQpICYmICh2aXJpZGlhbl9mZWF0dXJlX21hc2soZCkg JiBIVk1QVl9iYXNlX2ZyZXEpKQogCisjZGVmaW5lIGlzX3ZpcmlkaWFuX3ZjcHUodikgXAorICAg IGlzX3ZpcmlkaWFuX2RvbWFpbigodiktPmRvbWFpbikKKwogI2RlZmluZSBoYXNfdmlyaWRpYW5f dGltZV9yZWZfY291bnQoZCkgXAogICAgIChpc192aXJpZGlhbl9kb21haW4oZCkgJiYgKHZpcmlk aWFuX2ZlYXR1cmVfbWFzayhkKSAmIEhWTVBWX3RpbWVfcmVmX2NvdW50KSkKIApAQCAtNzYwLDYg Kzc2Myw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBodm1faGFzX3NldF9kZXNjcmlwdG9yX2FjY2Vz c19leGl0aW5nKHZvaWQpCiB9CiAKICNkZWZpbmUgaXNfdmlyaWRpYW5fZG9tYWluKGQpICgodm9p ZCkoZCksIGZhbHNlKQorI2RlZmluZSBpc192aXJpZGlhbl92Y3B1KHYpICgodm9pZCkodiksIGZh bHNlKQogI2RlZmluZSBoYXNfdmlyaWRpYW5fdGltZV9yZWZfY291bnQoZCkgKCh2b2lkKShkKSwg ZmFsc2UpCiAjZGVmaW5lIGh2bV9sb25nX21vZGVfYWN0aXZlKHYpICgodm9pZCkodiksIGZhbHNl KQogI2RlZmluZSBodm1fZ2V0X2d1ZXN0X3RpbWUodikgKCh2b2lkKSh2KSwgMCkKZGlmZiAtLWdp dCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZjcHUuaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYv aHZtL3ZjcHUuaAppbmRleCBjOGE0MGY2ZDU1Li5iZTlmYTViNWE0IDEwMDY0NAotLS0gYS94ZW4v aW5jbHVkZS9hc20teDg2L2h2bS92Y3B1LmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0v dmNwdS5oCkBAIC0yMDAsNyArMjAwLDcgQEAgc3RydWN0IGh2bV92Y3B1IHsKICAgICAvKiBQZW5k aW5nIGh3L3N3IGludGVycnVwdCAoLnZlY3RvciA9IC0xIG1lYW5zIG5vdGhpbmcgcGVuZGluZyku ICovCiAgICAgc3RydWN0IHg4Nl9ldmVudCAgICAgaW5qZWN0X2V2ZW50OwogCi0gICAgc3RydWN0 IHZpcmlkaWFuX3ZjcHUgdmlyaWRpYW47CisgICAgc3RydWN0IHZpcmlkaWFuX3ZjcHUgKnZpcmlk aWFuOwogfTsKIAogI2VuZGlmIC8qIF9fQVNNX1g4Nl9IVk1fVkNQVV9IX18gKi8KLS0gCjIuMjAu MS4yLmdiMjFlYmI2NzEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0 Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRl dmVs