From: Paul Durrant Subject: [PATCH v3 2/9] viridian: separately allocate domain and vcpu structures Date: Thu, 31 Jan 2019 10:47:23 +0000 Message-ID: <20190131104730.2085-3-paul.durrant@citrix.com> References: <20190131104730.2085-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 1gp9sk-000894-MI for xen-devel@lists.xenproject.org; Thu, 31 Jan 2019 10:47:42 +0000 In-Reply-To: <20190131104730.2085-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 bi9zeW5pYy5jICAgIHwgNDAgKysrKysrKy0tLS0tLS0tCiB4ZW4vYXJjaC94ODYvaHZtL3Zpcmlk aWFuL3RpbWUuYyAgICAgfCAzMiArKysrKystLS0tLS0KIHhlbi9hcmNoL3g4Ni9odm0vdmlyaWRp YW4vdmlyaWRpYW4uYyB8IDczICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIHhlbi9pbmNs dWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oICAgICB8ICAyICstCiB4ZW4vaW5jbHVkZS9hc20teDg2 L2h2bS9odm0uaCAgICAgICAgfCAgNCArKwogeGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vdmNwdS5o ICAgICAgIHwgIDIgKy0KIDYgZmlsZXMgY2hhbmdlZCwgODggaW5zZXJ0aW9ucygrKSwgNjUgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9zeW5pYy5j IGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9zeW5pYy5jCmluZGV4IGE2ZWJiYmM5ZjUuLjIw NzMxYzIzNzkgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vc3luaWMuYwor KysgYi94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3N5bmljLmMKQEAgLTMwLDcgKzMwLDcgQEAg dHlwZWRlZiB1bmlvbiBfSFZfVlBfQVNTSVNUX1BBR0UKIAogdm9pZCB2aXJpZGlhbl9hcGljX2Fz c2lzdF9zZXQoc3RydWN0IHZjcHUgKnYpCiB7Ci0gICAgSFZfVlBfQVNTSVNUX1BBR0UgKnB0ciA9 IHYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5wdHI7CisgICAgSFZfVlBfQVNTSVNUX1BB R0UgKnB0ciA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QucHRyOwogCiAgICAgaWYg KCAhcHRyICkKICAgICAgICAgcmV0dXJuOwpAQCAtNDAsMjUgKzQwLDI1IEBAIHZvaWQgdmlyaWRp YW5fYXBpY19hc3Npc3Rfc2V0KHN0cnVjdCB2Y3B1ICp2KQogICAgICAqIHdyb25nIGFuZCB0aGUg Vk0gd2lsbCBtb3N0IGxpa2VseSBoYW5nIHNvIGZvcmNlIGEgY3Jhc2ggbm93CiAgICAgICogdG8g bWFrZSB0aGUgcHJvYmxlbSBjbGVhci4KICAgICAgKi8KLSAgICBpZiAoIHYtPmFyY2guaHZtLnZp cmlkaWFuLmFwaWNfYXNzaXN0X3BlbmRpbmcgKQorICAgIGlmICggdi0+YXJjaC5odm0udmlyaWRp YW4tPmFwaWNfYXNzaXN0X3BlbmRpbmcgKQogICAgICAgICBkb21haW5fY3Jhc2godi0+ZG9tYWlu KTsKIAotICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmFwaWNfYXNzaXN0X3BlbmRpbmcgPSB0cnVl OworICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLT5hcGljX2Fzc2lzdF9wZW5kaW5nID0gdHJ1ZTsK ICAgICBwdHItPkFwaWNBc3Npc3Qubm9fZW9pID0gMTsKIH0KIAogYm9vbCB2aXJpZGlhbl9hcGlj X2Fzc2lzdF9jb21wbGV0ZWQoc3RydWN0IHZjcHUgKnYpCiB7Ci0gICAgSFZfVlBfQVNTSVNUX1BB R0UgKnB0ciA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5wdHI7CisgICAgSFZfVlBf QVNTSVNUX1BBR0UgKnB0ciA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QucHRyOwog CiAgICAgaWYgKCAhcHRyICkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCB2LT5h cmNoLmh2bS52aXJpZGlhbi5hcGljX2Fzc2lzdF9wZW5kaW5nICYmCisgICAgaWYgKCB2LT5hcmNo Lmh2bS52aXJpZGlhbi0+YXBpY19hc3Npc3RfcGVuZGluZyAmJgogICAgICAgICAgIXB0ci0+QXBp Y0Fzc2lzdC5ub19lb2kgKQogICAgIHsKICAgICAgICAgLyogQW4gRU9JIGhhcyBiZWVuIGF2b2lk ZWQgKi8KLSAgICAgICAgdi0+YXJjaC5odm0udmlyaWRpYW4uYXBpY19hc3Npc3RfcGVuZGluZyA9 IGZhbHNlOworICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+YXBpY19hc3Npc3RfcGVuZGlu ZyA9IGZhbHNlOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTY3LDEzICs2Nywx MyBAQCBib29sIHZpcmlkaWFuX2FwaWNfYXNzaXN0X2NvbXBsZXRlZChzdHJ1Y3QgdmNwdSAqdikK IAogdm9pZCB2aXJpZGlhbl9hcGljX2Fzc2lzdF9jbGVhcihzdHJ1Y3QgdmNwdSAqdikKIHsKLSAg ICBIVl9WUF9BU1NJU1RfUEFHRSAqcHRyID0gdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0 LnB0cjsKKyAgICBIVl9WUF9BU1NJU1RfUEFHRSAqcHRyID0gdi0+YXJjaC5odm0udmlyaWRpYW4t PnZwX2Fzc2lzdC5wdHI7CiAKICAgICBpZiAoICFwdHIgKQogICAgICAgICByZXR1cm47CiAKICAg ICBwdHItPkFwaWNBc3Npc3Qubm9fZW9pID0gMDsKLSAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi5h cGljX2Fzc2lzdF9wZW5kaW5nID0gZmFsc2U7CisgICAgdi0+YXJjaC5odm0udmlyaWRpYW4tPmFw aWNfYXNzaXN0X3BlbmRpbmcgPSBmYWxzZTsKIH0KIAogaW50IHZpcmlkaWFuX3N5bmljX3dybXNy KHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90IHZhbCkKQEAgLTk1LDEyICs5 NSwxMiBAQCBpbnQgdmlyaWRpYW5fc3luaWNfd3Jtc3Ioc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90 IGlkeCwgdWludDY0X3QgdmFsKQogCiAgICAgY2FzZSBIVl9YNjRfTVNSX1ZQX0FTU0lTVF9QQUdF OgogICAgICAgICAvKiByZWxlYXNlIGFueSBwcmV2aW91cyBtYXBwaW5nICovCi0gICAgICAgIHZp cmlkaWFuX3VubWFwX2d1ZXN0X3BhZ2UoJnYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdCk7 Ci0gICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5tc3IucmF3ID0gdmFsOwor ICAgICAgICB2aXJpZGlhbl91bm1hcF9ndWVzdF9wYWdlKCZ2LT5hcmNoLmh2bS52aXJpZGlhbi0+ dnBfYXNzaXN0KTsKKyAgICAgICAgdi0+YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdC5tc3Iu cmF3ID0gdmFsOwogICAgICAgICB2aXJpZGlhbl9kdW1wX2d1ZXN0X3BhZ2UodiwgIlZQX0FTU0lT VCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmdi0+YXJjaC5odm0udmlyaWRp YW4udnBfYXNzaXN0KTsKLSAgICAgICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Np c3QubXNyLmZpZWxkcy5lbmFibGVkICkKLSAgICAgICAgICAgIHZpcmlkaWFuX21hcF9ndWVzdF9w YWdlKHYsICZ2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QpOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJnYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QpOworICAg ICAgICBpZiAoIHYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QubXNyLmZpZWxkcy5lbmFi bGVkICkKKyAgICAgICAgICAgIHZpcmlkaWFuX21hcF9ndWVzdF9wYWdlKHYsICZ2LT5hcmNoLmh2 bS52aXJpZGlhbi0+dnBfYXNzaXN0KTsKICAgICAgICAgYnJlYWs7CiAKICAgICBkZWZhdWx0OgpA QCAtMTMyLDcgKzEzMiw3IEBAIGludCB2aXJpZGlhbl9zeW5pY19yZG1zcihjb25zdCBzdHJ1Y3Qg dmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCAqdmFsKQogICAgICAgICBicmVhazsKIAog ICAgIGNhc2UgSFZfWDY0X01TUl9WUF9BU1NJU1RfUEFHRToKLSAgICAgICAgKnZhbCA9IHYtPmFy Y2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5tc3IucmF3OworICAgICAgICAqdmFsID0gdi0+YXJj aC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdC5tc3IucmF3OwogICAgICAgICBicmVhazsKIAogICAg IGRlZmF1bHQ6CkBAIC0xNDYsMTggKzE0NiwxOCBAQCBpbnQgdmlyaWRpYW5fc3luaWNfcmRtc3Io Y29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgKnZhbCkKIHZvaWQg dmlyaWRpYW5fc3luaWNfc2F2ZV92Y3B1X2N0eHQoY29uc3Qgc3RydWN0IHZjcHUgKnYsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBodm1fdmlyaWRpYW5fdmNwdV9j b250ZXh0ICpjdHh0KQogewotICAgIGN0eHQtPmFwaWNfYXNzaXN0X3BlbmRpbmcgPSB2LT5hcmNo Lmh2bS52aXJpZGlhbi5hcGljX2Fzc2lzdF9wZW5kaW5nOwotICAgIGN0eHQtPnZwX2Fzc2lzdF9t c3IgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QubXNyLnJhdzsKKyAgICBjdHh0LT5h cGljX2Fzc2lzdF9wZW5kaW5nID0gdi0+YXJjaC5odm0udmlyaWRpYW4tPmFwaWNfYXNzaXN0X3Bl bmRpbmc7CisgICAgY3R4dC0+dnBfYXNzaXN0X21zciA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLT52 cF9hc3Npc3QubXNyLnJhdzsKIH0KIAogdm9pZCB2aXJpZGlhbl9zeW5pY19sb2FkX3ZjcHVfY3R4 dCgKICAgICBzdHJ1Y3QgdmNwdSAqdiwgY29uc3Qgc3RydWN0IGh2bV92aXJpZGlhbl92Y3B1X2Nv bnRleHQgKmN0eHQpCiB7Ci0gICAgdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0Lm1zci5y YXcgPSBjdHh0LT52cF9hc3Npc3RfbXNyOwotICAgIGlmICggdi0+YXJjaC5odm0udmlyaWRpYW4u dnBfYXNzaXN0Lm1zci5maWVsZHMuZW5hYmxlZCApCi0gICAgICAgIHZpcmlkaWFuX21hcF9ndWVz dF9wYWdlKHYsICZ2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QpOworICAgIHYtPmFyY2gu aHZtLnZpcmlkaWFuLT52cF9hc3Npc3QubXNyLnJhdyA9IGN0eHQtPnZwX2Fzc2lzdF9tc3I7Cisg ICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlhbi0+dnBfYXNzaXN0Lm1zci5maWVsZHMuZW5hYmxl ZCApCisgICAgICAgIHZpcmlkaWFuX21hcF9ndWVzdF9wYWdlKHYsICZ2LT5hcmNoLmh2bS52aXJp ZGlhbi0+dnBfYXNzaXN0KTsKIAotICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmFwaWNfYXNzaXN0 X3BlbmRpbmcgPSBjdHh0LT5hcGljX2Fzc2lzdF9wZW5kaW5nOworICAgIHYtPmFyY2guaHZtLnZp cmlkaWFuLT5hcGljX2Fzc2lzdF9wZW5kaW5nID0gY3R4dC0+YXBpY19hc3Npc3RfcGVuZGluZzsK IH0KIAogLyoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdGltZS5jIGIv eGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMKaW5kZXggODQwYTgyYjQ1Ny4uNDIzNjdm NjQ2MCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMKKysrIGIv eGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMKQEAgLTI3LDcgKzI3LDcgQEAgdHlwZWRl ZiBzdHJ1Y3QgX0hWX1JFRkVSRU5DRV9UU0NfUEFHRQogCiBzdGF0aWMgdm9pZCBkdW1wX3JlZmVy ZW5jZV90c2MoY29uc3Qgc3RydWN0IGRvbWFpbiAqZCkKIHsKLSAgICBjb25zdCB1bmlvbiB2aXJp ZGlhbl9wYWdlX21zciAqcnQgPSAmZC0+YXJjaC5odm0udmlyaWRpYW4ucmVmZXJlbmNlX3RzYzsK KyAgICBjb25zdCB1bmlvbiB2aXJpZGlhbl9wYWdlX21zciAqcnQgPSAmZC0+YXJjaC5odm0udmly aWRpYW4tPnJlZmVyZW5jZV90c2M7CiAKICAgICBpZiAoICFydC0+ZmllbGRzLmVuYWJsZWQgKQog ICAgICAgICByZXR1cm47CkBAIC0zOCw3ICszOCw3IEBAIHN0YXRpYyB2b2lkIGR1bXBfcmVmZXJl bmNlX3RzYyhjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQogCiBzdGF0aWMgdm9pZCB1cGRhdGVfcmVm ZXJlbmNlX3RzYyhzdHJ1Y3QgZG9tYWluICpkLCBib29sIGluaXRpYWxpemUpCiB7Ci0gICAgdW5z aWduZWQgbG9uZyBnbWZuID0gZC0+YXJjaC5odm0udmlyaWRpYW4ucmVmZXJlbmNlX3RzYy5maWVs ZHMucGZuOworICAgIHVuc2lnbmVkIGxvbmcgZ21mbiA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLT5y ZWZlcmVuY2VfdHNjLmZpZWxkcy5wZm47CiAgICAgc3RydWN0IHBhZ2VfaW5mbyAqcGFnZSA9IGdl dF9wYWdlX2Zyb21fZ2ZuKGQsIGdtZm4sIE5VTEwsIFAyTV9BTExPQyk7CiAgICAgSFZfUkVGRVJF TkNFX1RTQ19QQUdFICpwOwogCkBAIC0xMjEsOSArMTIxLDggQEAgc3RhdGljIGludDY0X3QgcmF3 X3RyY192YWwoc3RydWN0IGRvbWFpbiAqZCkKIAogdm9pZCB2aXJpZGlhbl90aW1lX3JlZl9jb3Vu dF9mcmVlemUoc3RydWN0IGRvbWFpbiAqZCkKIHsKLSAgICBzdHJ1Y3QgdmlyaWRpYW5fdGltZV9y ZWZfY291bnQgKnRyYzsKLQotICAgIHRyYyA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi50aW1lX3Jl Zl9jb3VudDsKKyAgICBzdHJ1Y3QgdmlyaWRpYW5fdGltZV9yZWZfY291bnQgKnRyYyA9CisgICAg ICAgICZkLT5hcmNoLmh2bS52aXJpZGlhbi0+dGltZV9yZWZfY291bnQ7CiAKICAgICBpZiAoIHRl c3RfYW5kX2NsZWFyX2JpdChfVFJDX3J1bm5pbmcsICZ0cmMtPmZsYWdzKSApCiAgICAgICAgIHRy Yy0+dmFsID0gcmF3X3RyY192YWwoZCkgKyB0cmMtPm9mZjsKQEAgLTEzMSw5ICsxMzAsOCBAQCB2 b2lkIHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50X2ZyZWV6ZShzdHJ1Y3QgZG9tYWluICpkKQogCiB2 b2lkIHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50X3RoYXcoc3RydWN0IGRvbWFpbiAqZCkKIHsKLSAg ICBzdHJ1Y3QgdmlyaWRpYW5fdGltZV9yZWZfY291bnQgKnRyYzsKLQotICAgIHRyYyA9ICZkLT5h cmNoLmh2bS52aXJpZGlhbi50aW1lX3JlZl9jb3VudDsKKyAgICBzdHJ1Y3QgdmlyaWRpYW5fdGlt ZV9yZWZfY291bnQgKnRyYyA9CisgICAgICAgICZkLT5hcmNoLmh2bS52aXJpZGlhbi0+dGltZV9y ZWZfY291bnQ7CiAKICAgICBpZiAoICFkLT5pc19zaHV0dGluZ19kb3duICYmCiAgICAgICAgICAh dGVzdF9hbmRfc2V0X2JpdChfVFJDX3J1bm5pbmcsICZ0cmMtPmZsYWdzKSApCkBAIC0xNTAsOSAr MTQ4LDkgQEAgaW50IHZpcmlkaWFuX3RpbWVfd3Jtc3Ioc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90 IGlkeCwgdWludDY0X3QgdmFsKQogICAgICAgICBpZiAoICEodmlyaWRpYW5fZmVhdHVyZV9tYXNr KGQpICYgSFZNUFZfcmVmZXJlbmNlX3RzYykgKQogICAgICAgICAgICAgcmV0dXJuIFg4NkVNVUxf RVhDRVBUSU9OOwogCi0gICAgICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLnJlZmVyZW5jZV90c2Mu cmF3ID0gdmFsOworICAgICAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVmZXJlbmNlX3RzYy5y YXcgPSB2YWw7CiAgICAgICAgIGR1bXBfcmVmZXJlbmNlX3RzYyhkKTsKLSAgICAgICAgaWYgKCBk LT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjLmZpZWxkcy5lbmFibGVkICkKKyAgICAg ICAgaWYgKCBkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVmZXJlbmNlX3RzYy5maWVsZHMuZW5hYmxl ZCApCiAgICAgICAgICAgICB1cGRhdGVfcmVmZXJlbmNlX3RzYyhkLCB0cnVlKTsKICAgICAgICAg YnJlYWs7CiAKQEAgLTE4OSwxMyArMTg3LDEzIEBAIGludCB2aXJpZGlhbl90aW1lX3JkbXNyKGNv bnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiAgICAgICAg IGlmICggISh2aXJpZGlhbl9mZWF0dXJlX21hc2soZCkgJiBIVk1QVl9yZWZlcmVuY2VfdHNjKSAp CiAgICAgICAgICAgICByZXR1cm4gWDg2RU1VTF9FWENFUFRJT047CiAKLSAgICAgICAgKnZhbCA9 IGQtPmFyY2guaHZtLnZpcmlkaWFuLnJlZmVyZW5jZV90c2MucmF3OworICAgICAgICAqdmFsID0g ZC0+YXJjaC5odm0udmlyaWRpYW4tPnJlZmVyZW5jZV90c2MucmF3OwogICAgICAgICBicmVhazsK IAogICAgIGNhc2UgSFZfWDY0X01TUl9USU1FX1JFRl9DT1VOVDoKICAgICB7CiAgICAgICAgIHN0 cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJjID0KLSAgICAgICAgICAgICZkLT5hcmNo Lmh2bS52aXJpZGlhbi50aW1lX3JlZl9jb3VudDsKKyAgICAgICAgICAgICZkLT5hcmNoLmh2bS52 aXJpZGlhbi0+dGltZV9yZWZfY291bnQ7CiAKICAgICAgICAgaWYgKCAhKHZpcmlkaWFuX2ZlYXR1 cmVfbWFzayhkKSAmIEhWTVBWX3RpbWVfcmVmX2NvdW50KSApCiAgICAgICAgICAgICByZXR1cm4g WDg2RU1VTF9FWENFUFRJT047CkBAIC0yMTksMTcgKzIxNywxNyBAQCBpbnQgdmlyaWRpYW5fdGlt ZV9yZG1zcihjb25zdCBzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCAqdmFs KQogdm9pZCB2aXJpZGlhbl90aW1lX3NhdmVfZG9tYWluX2N0eHQoCiAgICAgY29uc3Qgc3RydWN0 IGRvbWFpbiAqZCwgc3RydWN0IGh2bV92aXJpZGlhbl9kb21haW5fY29udGV4dCAqY3R4dCkKIHsK LSAgICBjdHh0LT50aW1lX3JlZl9jb3VudCA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLnRpbWVfcmVm X2NvdW50LnZhbDsKLSAgICBjdHh0LT5yZWZlcmVuY2VfdHNjID0gZC0+YXJjaC5odm0udmlyaWRp YW4ucmVmZXJlbmNlX3RzYy5yYXc7CisgICAgY3R4dC0+dGltZV9yZWZfY291bnQgPSBkLT5hcmNo Lmh2bS52aXJpZGlhbi0+dGltZV9yZWZfY291bnQudmFsOworICAgIGN0eHQtPnJlZmVyZW5jZV90 c2MgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVmZXJlbmNlX3RzYy5yYXc7CiB9CiAKIHZvaWQg dmlyaWRpYW5fdGltZV9sb2FkX2RvbWFpbl9jdHh0KAogICAgIHN0cnVjdCBkb21haW4gKmQsIGNv bnN0IHN0cnVjdCBodm1fdmlyaWRpYW5fZG9tYWluX2NvbnRleHQgKmN0eHQpCiB7Ci0gICAgZC0+ YXJjaC5odm0udmlyaWRpYW4udGltZV9yZWZfY291bnQudmFsID0gY3R4dC0+dGltZV9yZWZfY291 bnQ7Ci0gICAgZC0+YXJjaC5odm0udmlyaWRpYW4ucmVmZXJlbmNlX3RzYy5yYXcgPSBjdHh0LT5y ZWZlcmVuY2VfdHNjOworICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3VudC52 YWwgPSBjdHh0LT50aW1lX3JlZl9jb3VudDsKKyAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVm ZXJlbmNlX3RzYy5yYXcgPSBjdHh0LT5yZWZlcmVuY2VfdHNjOwogCi0gICAgaWYgKCBkLT5hcmNo Lmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjLmZpZWxkcy5lbmFibGVkICkKKyAgICBpZiAoIGQt PmFyY2guaHZtLnZpcmlkaWFuLT5yZWZlcmVuY2VfdHNjLmZpZWxkcy5lbmFibGVkICkKICAgICAg ICAgdXBkYXRlX3JlZmVyZW5jZV90c2MoZCwgZmFsc2UpOwogfQogCmRpZmYgLS1naXQgYS94ZW4v YXJjaC94ODYvaHZtL3ZpcmlkaWFuL3ZpcmlkaWFuLmMgYi94ZW4vYXJjaC94ODYvaHZtL3Zpcmlk aWFuL3ZpcmlkaWFuLmMKaW5kZXggYWQxMTBlZTZmMy4uMWU3Nzc2MTFiYSAxMDA2NDQKLS0tIGEv eGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi92aXJpZGlhbi5jCisrKyBiL3hlbi9hcmNoL3g4Ni9o dm0vdmlyaWRpYW4vdmlyaWRpYW4uYwpAQCAtMTQ2LDcgKzE0Niw3IEBAIHZvaWQgY3B1aWRfdmly aWRpYW5fbGVhdmVzKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBsZWFmLAogICAgICAg ICAgKiBIeXBlcnZpc29yIGluZm9ybWF0aW9uLCBidXQgb25seSBpZiB0aGUgZ3Vlc3QgaGFzIHNl dCBpdHMKICAgICAgICAgICogb3duIHZlcnNpb24gbnVtYmVyLgogICAgICAgICAgKi8KLSAgICAg ICAgaWYgKCBkLT5hcmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5yYXcgPT0gMCApCisgICAg ICAgIGlmICggZC0+YXJjaC5odm0udmlyaWRpYW4tPmd1ZXN0X29zX2lkLnJhdyA9PSAwICkKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICByZXMtPmEgPSB2aXJpZGlhbl9idWlsZDsKICAgICAg ICAgcmVzLT5iID0gKCh1aW50MzJfdCl2aXJpZGlhbl9tYWpvciA8PCAxNikgfCB2aXJpZGlhbl9t aW5vcjsKQEAgLTE5MSw4ICsxOTEsOCBAQCB2b2lkIGNwdWlkX3ZpcmlkaWFuX2xlYXZlcyhjb25z dCBzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgbGVhZiwKIAogICAgIGNhc2UgNDoKICAgICAgICAg LyogUmVjb21tZW5kZWQgaHlwZXJjYWxsIHVzYWdlLiAqLwotICAgICAgICBpZiAoIChkLT5hcmNo Lmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5yYXcgPT0gMCkgfHwKLSAgICAgICAgICAgICAoZC0+ YXJjaC5odm0udmlyaWRpYW4uZ3Vlc3Rfb3NfaWQuZmllbGRzLm9zIDwgNCkgKQorICAgICAgICBp ZiAoIChkLT5hcmNoLmh2bS52aXJpZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3ID09IDApIHx8CisgICAg ICAgICAgICAgKGQtPmFyY2guaHZtLnZpcmlkaWFuLT5ndWVzdF9vc19pZC5maWVsZHMub3MgPCA0 KSApCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgcmVzLT5hID0gQ1BVSUQ0QV9SRUxBWF9U SU1FUl9JTlQ7CiAgICAgICAgIGlmICggdmlyaWRpYW5fZmVhdHVyZV9tYXNrKGQpICYgSFZNUFZf aGNhbGxfcmVtb3RlX3RsYl9mbHVzaCApCkBAIC0yMjQsNyArMjI0LDcgQEAgc3RhdGljIHZvaWQg ZHVtcF9ndWVzdF9vc19pZChjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQogewogICAgIGNvbnN0IHVu aW9uIHZpcmlkaWFuX2d1ZXN0X29zX2lkX21zciAqZ29pOwogCi0gICAgZ29pID0gJmQtPmFyY2gu aHZtLnZpcmlkaWFuLmd1ZXN0X29zX2lkOworICAgIGdvaSA9ICZkLT5hcmNoLmh2bS52aXJpZGlh bi0+Z3Vlc3Rfb3NfaWQ7CiAKICAgICBwcmludGsoWEVOTE9HX0dfSU5GTwogICAgICAgICAgICAi ZCVkOiBWSVJJRElBTiBHVUVTVF9PU19JRDogdmVuZG9yOiAleCBvczogJXggbWFqb3I6ICV4IG1p bm9yOiAleCBzcDogJXggYnVpbGQ6ICV4XG4iLApAQCAtMjM4LDcgKzIzOCw3IEBAIHN0YXRpYyB2 b2lkIGR1bXBfaHlwZXJjYWxsKGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCiB7CiAgICAgY29uc3Qg dW5pb24gdmlyaWRpYW5fcGFnZV9tc3IgKmhnOwogCi0gICAgaGcgPSAmZC0+YXJjaC5odm0udmly aWRpYW4uaHlwZXJjYWxsX2dwYTsKKyAgICBoZyA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi0+aHlw ZXJjYWxsX2dwYTsKIAogICAgIHByaW50ayhYRU5MT0dfR19JTkZPICJkJWQ6IFZJUklESUFOIEhZ UEVSQ0FMTDogZW5hYmxlZDogJXggcGZuOiAlbHhcbiIsCiAgICAgICAgICAgIGQtPmRvbWFpbl9p ZCwKQEAgLTI0Nyw3ICsyNDcsNyBAQCBzdGF0aWMgdm9pZCBkdW1wX2h5cGVyY2FsbChjb25zdCBz dHJ1Y3QgZG9tYWluICpkKQogCiBzdGF0aWMgdm9pZCBlbmFibGVfaHlwZXJjYWxsX3BhZ2Uoc3Ry dWN0IGRvbWFpbiAqZCkKIHsKLSAgICB1bnNpZ25lZCBsb25nIGdtZm4gPSBkLT5hcmNoLmh2bS52 aXJpZGlhbi5oeXBlcmNhbGxfZ3BhLmZpZWxkcy5wZm47CisgICAgdW5zaWduZWQgbG9uZyBnbWZu ID0gZC0+YXJjaC5odm0udmlyaWRpYW4tPmh5cGVyY2FsbF9ncGEuZmllbGRzLnBmbjsKICAgICBz dHJ1Y3QgcGFnZV9pbmZvICpwYWdlID0gZ2V0X3BhZ2VfZnJvbV9nZm4oZCwgZ21mbiwgTlVMTCwg UDJNX0FMTE9DKTsKICAgICB1aW50OF90ICpwOwogCkBAIC0yODgsMTQgKzI4OCwxNCBAQCBpbnQg Z3Vlc3Rfd3Jtc3JfdmlyaWRpYW4oc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0 X3QgdmFsKQogICAgIHN3aXRjaCAoIGlkeCApCiAgICAgewogICAgIGNhc2UgSFZfWDY0X01TUl9H VUVTVF9PU19JRDoKLSAgICAgICAgZC0+YXJjaC5odm0udmlyaWRpYW4uZ3Vlc3Rfb3NfaWQucmF3 ID0gdmFsOworICAgICAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3ID0g dmFsOwogICAgICAgICBkdW1wX2d1ZXN0X29zX2lkKGQpOwogICAgICAgICBicmVhazsKIAogICAg IGNhc2UgSFZfWDY0X01TUl9IWVBFUkNBTEw6Ci0gICAgICAgIGQtPmFyY2guaHZtLnZpcmlkaWFu Lmh5cGVyY2FsbF9ncGEucmF3ID0gdmFsOworICAgICAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi0+ aHlwZXJjYWxsX2dwYS5yYXcgPSB2YWw7CiAgICAgICAgIGR1bXBfaHlwZXJjYWxsKGQpOwotICAg ICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLmh5cGVyY2FsbF9ncGEuZmllbGRzLmVuYWJs ZWQgKQorICAgICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5oeXBlcmNhbGxfZ3BhLmZp ZWxkcy5lbmFibGVkICkKICAgICAgICAgICAgIGVuYWJsZV9oeXBlcmNhbGxfcGFnZShkKTsKICAg ICAgICAgYnJlYWs7CiAKQEAgLTMxNywxMCArMzE3LDEwIEBAIGludCBndWVzdF93cm1zcl92aXJp ZGlhbihzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCB2YWwpCiAgICAgY2Fz ZSBIVl9YNjRfTVNSX0NSQVNIX1AzOgogICAgIGNhc2UgSFZfWDY0X01TUl9DUkFTSF9QNDoKICAg ICAgICAgQlVJTERfQlVHX09OKEhWX1g2NF9NU1JfQ1JBU0hfUDQgLSBIVl9YNjRfTVNSX0NSQVNI X1AwID49Ci0gICAgICAgICAgICAgICAgICAgICBBUlJBWV9TSVpFKHYtPmFyY2guaHZtLnZpcmlk aWFuLmNyYXNoX3BhcmFtKSk7CisgICAgICAgICAgICAgICAgICAgICBBUlJBWV9TSVpFKHYtPmFy Y2guaHZtLnZpcmlkaWFuLT5jcmFzaF9wYXJhbSkpOwogCiAgICAgICAgIGlkeCAtPSBIVl9YNjRf TVNSX0NSQVNIX1AwOwotICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi5jcmFzaF9wYXJhbVtp ZHhdID0gdmFsOworICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+Y3Jhc2hfcGFyYW1baWR4 XSA9IHZhbDsKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIEhWX1g2NF9NU1JfQ1JBU0hfQ1RM OgpAQCAtMzM3LDExICszMzcsMTEgQEAgaW50IGd1ZXN0X3dybXNyX3ZpcmlkaWFuKHN0cnVjdCB2 Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90IHZhbCkKICAgICAgICAgc3Bpbl91bmxvY2so JmQtPnNodXRkb3duX2xvY2spOwogCiAgICAgICAgIGdwcmludGsoWEVOTE9HX1dBUk5JTkcsICJW SVJJRElBTiBDUkFTSDogJWx4ICVseCAlbHggJWx4ICVseFxuIiwKLSAgICAgICAgICAgICAgICB2 LT5hcmNoLmh2bS52aXJpZGlhbi5jcmFzaF9wYXJhbVswXSwKLSAgICAgICAgICAgICAgICB2LT5h cmNoLmh2bS52aXJpZGlhbi5jcmFzaF9wYXJhbVsxXSwKLSAgICAgICAgICAgICAgICB2LT5hcmNo Lmh2bS52aXJpZGlhbi5jcmFzaF9wYXJhbVsyXSwKLSAgICAgICAgICAgICAgICB2LT5hcmNoLmh2 bS52aXJpZGlhbi5jcmFzaF9wYXJhbVszXSwKLSAgICAgICAgICAgICAgICB2LT5hcmNoLmh2bS52 aXJpZGlhbi5jcmFzaF9wYXJhbVs0XSk7CisgICAgICAgICAgICAgICAgdi0+YXJjaC5odm0udmly aWRpYW4tPmNyYXNoX3BhcmFtWzBdLAorICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlk aWFuLT5jcmFzaF9wYXJhbVsxXSwKKyAgICAgICAgICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlh bi0+Y3Jhc2hfcGFyYW1bMl0sCisgICAgICAgICAgICAgICAgdi0+YXJjaC5odm0udmlyaWRpYW4t PmNyYXNoX3BhcmFtWzNdLAorICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLT5j cmFzaF9wYXJhbVs0XSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KIApAQCAtMzY0LDExICszNjQs MTEgQEAgaW50IGd1ZXN0X3JkbXNyX3ZpcmlkaWFuKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50 MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiAgICAgc3dpdGNoICggaWR4ICkKICAgICB7CiAgICAg Y2FzZSBIVl9YNjRfTVNSX0dVRVNUX09TX0lEOgotICAgICAgICAqdmFsID0gZC0+YXJjaC5odm0u dmlyaWRpYW4uZ3Vlc3Rfb3NfaWQucmF3OworICAgICAgICAqdmFsID0gZC0+YXJjaC5odm0udmly aWRpYW4tPmd1ZXN0X29zX2lkLnJhdzsKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIEhWX1g2 NF9NU1JfSFlQRVJDQUxMOgotICAgICAgICAqdmFsID0gZC0+YXJjaC5odm0udmlyaWRpYW4uaHlw ZXJjYWxsX2dwYS5yYXc7CisgICAgICAgICp2YWwgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+aHlw ZXJjYWxsX2dwYS5yYXc7CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBIVl9YNjRfTVNSX1ZQ X0lOREVYOgpAQCAtMzkzLDEwICszOTMsMTAgQEAgaW50IGd1ZXN0X3JkbXNyX3ZpcmlkaWFuKGNv bnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiAgICAgY2Fz ZSBIVl9YNjRfTVNSX0NSQVNIX1AzOgogICAgIGNhc2UgSFZfWDY0X01TUl9DUkFTSF9QNDoKICAg ICAgICAgQlVJTERfQlVHX09OKEhWX1g2NF9NU1JfQ1JBU0hfUDQgLSBIVl9YNjRfTVNSX0NSQVNI X1AwID49Ci0gICAgICAgICAgICAgICAgICAgICBBUlJBWV9TSVpFKHYtPmFyY2guaHZtLnZpcmlk aWFuLmNyYXNoX3BhcmFtKSk7CisgICAgICAgICAgICAgICAgICAgICBBUlJBWV9TSVpFKHYtPmFy Y2guaHZtLnZpcmlkaWFuLT5jcmFzaF9wYXJhbSkpOwogCiAgICAgICAgIGlkeCAtPSBIVl9YNjRf TVNSX0NSQVNIX1AwOwotICAgICAgICAqdmFsID0gdi0+YXJjaC5odm0udmlyaWRpYW4uY3Jhc2hf cGFyYW1baWR4XTsKKyAgICAgICAgKnZhbCA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLT5jcmFzaF9w YXJhbVtpZHhdOwogICAgICAgICBicmVhazsKIAogICAgIGNhc2UgSFZfWDY0X01TUl9DUkFTSF9D VEw6CkBAIC00MTksMTcgKzQxOSwzMyBAQCBpbnQgZ3Vlc3RfcmRtc3JfdmlyaWRpYW4oY29uc3Qg c3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgKnZhbCkKIAogaW50IHZpcmlk aWFuX3ZjcHVfaW5pdChzdHJ1Y3QgdmNwdSAqdikKIHsKKyAgICBBU1NFUlQoIXYtPmFyY2guaHZt LnZpcmlkaWFuKTsKKyAgICB2LT5hcmNoLmh2bS52aXJpZGlhbiA9IHh6YWxsb2Moc3RydWN0IHZp cmlkaWFuX3ZjcHUpOworICAgIGlmICggIXYtPmFyY2guaHZtLnZpcmlkaWFuICkKKyAgICAgICAg cmV0dXJuIC1FTk9NRU07CisKICAgICByZXR1cm4gMDsKIH0KIAogaW50IHZpcmlkaWFuX2RvbWFp bl9pbml0KHN0cnVjdCBkb21haW4gKmQpCiB7CisgICAgQVNTRVJUKCFkLT5hcmNoLmh2bS52aXJp ZGlhbik7CisgICAgZC0+YXJjaC5odm0udmlyaWRpYW4gPSB4emFsbG9jKHN0cnVjdCB2aXJpZGlh bl9kb21haW4pOworICAgIGlmICggIWQtPmFyY2guaHZtLnZpcmlkaWFuICkKKyAgICAgICAgcmV0 dXJuIC1FTk9NRU07CisKICAgICByZXR1cm4gMDsKIH0KIAogdm9pZCB2aXJpZGlhbl92Y3B1X2Rl aW5pdChzdHJ1Y3QgdmNwdSAqdikKIHsKLSAgICB2aXJpZGlhbl9zeW5pY193cm1zcih2LCBIVl9Y NjRfTVNSX1ZQX0FTU0lTVF9QQUdFLCAwKTsKKyAgICBpZiAoICF2LT5hcmNoLmh2bS52aXJpZGlh biApCisgICAgICAgIHJldHVybjsKKworICAgIGlmICggaXNfdmlyaWRpYW5fdmNwdSh2KSApCisg ICAgICAgIHZpcmlkaWFuX3N5bmljX3dybXNyKHYsIEhWX1g2NF9NU1JfVlBfQVNTSVNUX1BBR0Us IDApOworCisgICAgWEZSRUUodi0+YXJjaC5odm0udmlyaWRpYW4pOwogfQogCiB2b2lkIHZpcmlk aWFuX2RvbWFpbl9kZWluaXQoc3RydWN0IGRvbWFpbiAqZCkKQEAgLTQzOCw2ICs0NTQsMTEgQEAg dm9pZCB2aXJpZGlhbl9kb21haW5fZGVpbml0KHN0cnVjdCBkb21haW4gKmQpCiAKICAgICBmb3Jf ZWFjaF92Y3B1ICggZCwgdiApCiAgICAgICAgIHZpcmlkaWFuX3ZjcHVfZGVpbml0KHYpOworCisg ICAgaWYgKCAhZC0+YXJjaC5odm0udmlyaWRpYW4gKQorICAgICAgICByZXR1cm47CisKKyAgICBY RlJFRShkLT5hcmNoLmh2bS52aXJpZGlhbik7CiB9CiAKIHN0YXRpYyBERUZJTkVfUEVSX0NQVShj cHVtYXNrX3QsIGlwaV9jcHVtYXNrKTsKQEAgLTY2Miw4ICs2ODMsOCBAQCBzdGF0aWMgaW50IHZp cmlkaWFuX3NhdmVfZG9tYWluX2N0eHQoc3RydWN0IHZjcHUgKnYsCiB7CiAgICAgY29uc3Qgc3Ry dWN0IGRvbWFpbiAqZCA9IHYtPmRvbWFpbjsKICAgICBzdHJ1Y3QgaHZtX3ZpcmlkaWFuX2RvbWFp bl9jb250ZXh0IGN0eHQgPSB7Ci0gICAgICAgIC5oeXBlcmNhbGxfZ3BhICA9IGQtPmFyY2guaHZt LnZpcmlkaWFuLmh5cGVyY2FsbF9ncGEucmF3LAotICAgICAgICAuZ3Vlc3Rfb3NfaWQgICAgPSBk LT5hcmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5yYXcsCisgICAgICAgIC5oeXBlcmNhbGxf Z3BhID0gZC0+YXJjaC5odm0udmlyaWRpYW4tPmh5cGVyY2FsbF9ncGEucmF3LAorICAgICAgICAu Z3Vlc3Rfb3NfaWQgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3LAogICAg IH07CiAKICAgICBpZiAoICFpc192aXJpZGlhbl9kb21haW4oZCkgKQpAQCAtNjgyLDggKzcwMyw4 IEBAIHN0YXRpYyBpbnQgdmlyaWRpYW5fbG9hZF9kb21haW5fY3R4dChzdHJ1Y3QgZG9tYWluICpk LAogICAgIGlmICggaHZtX2xvYWRfZW50cnlfemVyb2V4dGVuZChWSVJJRElBTl9ET01BSU4sIGgs ICZjdHh0KSAhPSAwICkKICAgICAgICAgcmV0dXJuIC1FSU5WQUw7CiAKLSAgICBkLT5hcmNoLmh2 bS52aXJpZGlhbi5oeXBlcmNhbGxfZ3BhLnJhdyAgPSBjdHh0Lmh5cGVyY2FsbF9ncGE7Ci0gICAg ZC0+YXJjaC5odm0udmlyaWRpYW4uZ3Vlc3Rfb3NfaWQucmF3ICAgID0gY3R4dC5ndWVzdF9vc19p ZDsKKyAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi0+aHlwZXJjYWxsX2dwYS5yYXcgPSBjdHh0Lmh5 cGVyY2FsbF9ncGE7CisgICAgZC0+YXJjaC5odm0udmlyaWRpYW4tPmd1ZXN0X29zX2lkLnJhdyA9 IGN0eHQuZ3Vlc3Rfb3NfaWQ7CiAKICAgICB2aXJpZGlhbl90aW1lX2xvYWRfZG9tYWluX2N0eHQo ZCwgJmN0eHQpOwogCkBAIC02OTcsNyArNzE4LDcgQEAgc3RhdGljIGludCB2aXJpZGlhbl9zYXZl X3ZjcHVfY3R4dChzdHJ1Y3QgdmNwdSAqdiwgaHZtX2RvbWFpbl9jb250ZXh0X3QgKmgpCiB7CiAg ICAgc3RydWN0IGh2bV92aXJpZGlhbl92Y3B1X2NvbnRleHQgY3R4dCA9IHt9OwogCi0gICAgaWYg KCAhaXNfdmlyaWRpYW5fZG9tYWluKHYtPmRvbWFpbikgKQorICAgIGlmICggIWlzX3ZpcmlkaWFu X3ZjcHUodikgKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIHZpcmlkaWFuX3N5bmljX3NhdmVf dmNwdV9jdHh0KHYsICZjdHh0KTsKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZt L2RvbWFpbi5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vZG9tYWluLmgKaW5kZXggM2U3MzMx ODE3Zi4uNmM3YzRmNWFhNiAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vZG9t YWluLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vZG9tYWluLmgKQEAgLTE1NCw3ICsx NTQsNyBAQCBzdHJ1Y3QgaHZtX2RvbWFpbiB7CiAgICAgLyogaHlwZXJ2aXNvciBpbnRlcmNlcHRl ZCBtc2l4IHRhYmxlICovCiAgICAgc3RydWN0IGxpc3RfaGVhZCAgICAgICBtc2l4dGJsX2xpc3Q7 CiAKLSAgICBzdHJ1Y3QgdmlyaWRpYW5fZG9tYWluIHZpcmlkaWFuOworICAgIHN0cnVjdCB2aXJp ZGlhbl9kb21haW4gKnZpcmlkaWFuOwogCiAgICAgYm9vbF90ICAgICAgICAgICAgICAgICBoYXBf ZW5hYmxlZDsKICAgICBib29sX3QgICAgICAgICAgICAgICAgIG1lbV9zaGFyaW5nX2VuYWJsZWQ7 CmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9odm0uaCBiL3hlbi9pbmNsdWRl L2FzbS14ODYvaHZtL2h2bS5oCmluZGV4IDBhMTBiNTE1NTQuLmQ4ZGY2ZjQzNTIgMTAwNjQ0Ci0t LSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL2h2bS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14 ODYvaHZtL2h2bS5oCkBAIC00NjEsNiArNDYxLDkgQEAgc3RhdGljIGlubGluZSBib29sIGh2bV9n ZXRfZ3Vlc3RfYm5kY2ZncyhzdHJ1Y3QgdmNwdSAqdiwgdTY0ICp2YWwpCiAjZGVmaW5lIGlzX3Zp cmlkaWFuX2RvbWFpbihkKSBcCiAgICAgKGlzX2h2bV9kb21haW4oZCkgJiYgKHZpcmlkaWFuX2Zl YXR1cmVfbWFzayhkKSAmIEhWTVBWX2Jhc2VfZnJlcSkpCiAKKyNkZWZpbmUgaXNfdmlyaWRpYW5f dmNwdSh2KSBcCisgICAgaXNfdmlyaWRpYW5fZG9tYWluKCh2KS0+ZG9tYWluKQorCiAjZGVmaW5l IGhhc192aXJpZGlhbl90aW1lX3JlZl9jb3VudChkKSBcCiAgICAgKGlzX3ZpcmlkaWFuX2RvbWFp bihkKSAmJiAodmlyaWRpYW5fZmVhdHVyZV9tYXNrKGQpICYgSFZNUFZfdGltZV9yZWZfY291bnQp KQogCkBAIC03NjAsNiArNzYzLDcgQEAgc3RhdGljIGlubGluZSBib29sIGh2bV9oYXNfc2V0X2Rl c2NyaXB0b3JfYWNjZXNzX2V4aXRpbmcodm9pZCkKIH0KIAogI2RlZmluZSBpc192aXJpZGlhbl9k b21haW4oZCkgKCh2b2lkKShkKSwgZmFsc2UpCisjZGVmaW5lIGlzX3ZpcmlkaWFuX3ZjcHUodikg KCh2b2lkKSh2KSwgZmFsc2UpCiAjZGVmaW5lIGhhc192aXJpZGlhbl90aW1lX3JlZl9jb3VudChk KSAoKHZvaWQpKGQpLCBmYWxzZSkKICNkZWZpbmUgaHZtX2xvbmdfbW9kZV9hY3RpdmUodikgKCh2 b2lkKSh2KSwgZmFsc2UpCiAjZGVmaW5lIGh2bV9nZXRfZ3Vlc3RfdGltZSh2KSAoKHZvaWQpKHYp LCAwKQpkaWZmIC0tZ2l0IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vdmNwdS5oIGIveGVuL2lu Y2x1ZGUvYXNtLXg4Ni9odm0vdmNwdS5oCmluZGV4IGM4YTQwZjZkNTUuLmJlOWZhNWI1YTQgMTAw NjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZjcHUuaAorKysgYi94ZW4vaW5jbHVk ZS9hc20teDg2L2h2bS92Y3B1LmgKQEAgLTIwMCw3ICsyMDAsNyBAQCBzdHJ1Y3QgaHZtX3ZjcHUg ewogICAgIC8qIFBlbmRpbmcgaHcvc3cgaW50ZXJydXB0ICgudmVjdG9yID0gLTEgbWVhbnMgbm90 aGluZyBwZW5kaW5nKS4gKi8KICAgICBzdHJ1Y3QgeDg2X2V2ZW50ICAgICBpbmplY3RfZXZlbnQ7 CiAKLSAgICBzdHJ1Y3QgdmlyaWRpYW5fdmNwdSB2aXJpZGlhbjsKKyAgICBzdHJ1Y3QgdmlyaWRp YW5fdmNwdSAqdmlyaWRpYW47CiB9OwogCiAjZW5kaWYgLyogX19BU01fWDg2X0hWTV9WQ1BVX0hf XyAqLwotLSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVj dC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1k ZXZlbA==