From: Paul Durrant Subject: [PATCH 2/8] viridian: separately allocate domain and vcpu structures Date: Thu, 20 Dec 2018 16:33:39 +0000 Message-ID: <20181220163345.10708-3-paul.durrant@citrix.com> References: <20181220163345.10708-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 1ga1TJ-0000Fy-IB for xen-devel@lists.xenproject.org; Thu, 20 Dec 2018 16:46:53 +0000 In-Reply-To: <20181220163345.10708-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 IHRoZXNlIGFsbG9jYXRpb25zLgoKTk9URTogVGhlIHBhdGNoIGFsc28gaW50cm9kdWNlZCB0aGUg J2lzX3ZpcmlkaWFuX3ZjcHUnIG1hY3JvIHRvIGF2b2lkCiAgICAgIGludHJvZHVjaW5nIGEgc2Vj b25kIGV2YWx1YXRpb24gb2YgJ2lzX3ZpcmlkaWFuX2RvbWFpbicgd2l0aCBhbgogICAgICBvcGVu LWNvZGVkICd2LT5kb21haW4nIGFyZ3VtZW50LiBUaGlzIG1hY3JvIHdpbGwgYWxzbyBiZSBmdXJ0 aGVyCiAgICAgIHVzZWQgaW4gYSBzdWJzZXF1ZW50IHBhdGNoLgoKU2lnbmVkLW9mZi1ieTogUGF1 bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KLS0tCkNjOiBKYW4gQmV1bGljaCA8 amJldWxpY2hAc3VzZS5jb20+CkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRy aXguY29tPgpDYzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ2M6ICJSb2dlciBQYXUg TW9ubsOpIiA8cm9nZXIucGF1QGNpdHJpeC5jb20+Ci0tLQogeGVuL2FyY2gveDg2L2h2bS92aXJp ZGlhbi9zeW5pYy5jICAgIHwgNDAgKysrKysrKy0tLS0tLS0tCiB4ZW4vYXJjaC94ODYvaHZtL3Zp cmlkaWFuL3RpbWUuYyAgICAgfCAzMiArKysrKystLS0tLS0KIHhlbi9hcmNoL3g4Ni9odm0vdmly aWRpYW4vdmlyaWRpYW4uYyB8IDc1ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIHhlbi9p bmNsdWRlL2FzbS14ODYvaHZtL2RvbWFpbi5oICAgICB8ICAyICstCiB4ZW4vaW5jbHVkZS9hc20t eDg2L2h2bS9odm0uaCAgICAgICAgfCAgNCArKwogeGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vdmNw dS5oICAgICAgIHwgIDIgKy0KIDYgZmlsZXMgY2hhbmdlZCwgOTAgaW5zZXJ0aW9ucygrKSwgNjUg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9zeW5p Yy5jIGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi9zeW5pYy5jCmluZGV4IGE2ZWJiYmM5ZjUu LjIwNzMxYzIzNzkgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vc3luaWMu YworKysgYi94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3N5bmljLmMKQEAgLTMwLDcgKzMwLDcg QEAgdHlwZWRlZiB1bmlvbiBfSFZfVlBfQVNTSVNUX1BBR0UKIAogdm9pZCB2aXJpZGlhbl9hcGlj X2Fzc2lzdF9zZXQoc3RydWN0IHZjcHUgKnYpCiB7Ci0gICAgSFZfVlBfQVNTSVNUX1BBR0UgKnB0 ciA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5wdHI7CisgICAgSFZfVlBfQVNTSVNU X1BBR0UgKnB0ciA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QucHRyOwogCiAgICAg aWYgKCAhcHRyICkKICAgICAgICAgcmV0dXJuOwpAQCAtNDAsMjUgKzQwLDI1IEBAIHZvaWQgdmly aWRpYW5fYXBpY19hc3Npc3Rfc2V0KHN0cnVjdCB2Y3B1ICp2KQogICAgICAqIHdyb25nIGFuZCB0 aGUgVk0gd2lsbCBtb3N0IGxpa2VseSBoYW5nIHNvIGZvcmNlIGEgY3Jhc2ggbm93CiAgICAgICog dG8gbWFrZSB0aGUgcHJvYmxlbSBjbGVhci4KICAgICAgKi8KLSAgICBpZiAoIHYtPmFyY2guaHZt LnZpcmlkaWFuLmFwaWNfYXNzaXN0X3BlbmRpbmcgKQorICAgIGlmICggdi0+YXJjaC5odm0udmly aWRpYW4tPmFwaWNfYXNzaXN0X3BlbmRpbmcgKQogICAgICAgICBkb21haW5fY3Jhc2godi0+ZG9t YWluKTsKIAotICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmFwaWNfYXNzaXN0X3BlbmRpbmcgPSB0 cnVlOworICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLT5hcGljX2Fzc2lzdF9wZW5kaW5nID0gdHJ1 ZTsKICAgICBwdHItPkFwaWNBc3Npc3Qubm9fZW9pID0gMTsKIH0KIAogYm9vbCB2aXJpZGlhbl9h cGljX2Fzc2lzdF9jb21wbGV0ZWQoc3RydWN0IHZjcHUgKnYpCiB7Ci0gICAgSFZfVlBfQVNTSVNU X1BBR0UgKnB0ciA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5wdHI7CisgICAgSFZf VlBfQVNTSVNUX1BBR0UgKnB0ciA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QucHRy OwogCiAgICAgaWYgKCAhcHRyICkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCB2 LT5hcmNoLmh2bS52aXJpZGlhbi5hcGljX2Fzc2lzdF9wZW5kaW5nICYmCisgICAgaWYgKCB2LT5h cmNoLmh2bS52aXJpZGlhbi0+YXBpY19hc3Npc3RfcGVuZGluZyAmJgogICAgICAgICAgIXB0ci0+ QXBpY0Fzc2lzdC5ub19lb2kgKQogICAgIHsKICAgICAgICAgLyogQW4gRU9JIGhhcyBiZWVuIGF2 b2lkZWQgKi8KLSAgICAgICAgdi0+YXJjaC5odm0udmlyaWRpYW4uYXBpY19hc3Npc3RfcGVuZGlu ZyA9IGZhbHNlOworICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+YXBpY19hc3Npc3RfcGVu ZGluZyA9IGZhbHNlOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTY3LDEzICs2 NywxMyBAQCBib29sIHZpcmlkaWFuX2FwaWNfYXNzaXN0X2NvbXBsZXRlZChzdHJ1Y3QgdmNwdSAq dikKIAogdm9pZCB2aXJpZGlhbl9hcGljX2Fzc2lzdF9jbGVhcihzdHJ1Y3QgdmNwdSAqdikKIHsK LSAgICBIVl9WUF9BU1NJU1RfUEFHRSAqcHRyID0gdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNz aXN0LnB0cjsKKyAgICBIVl9WUF9BU1NJU1RfUEFHRSAqcHRyID0gdi0+YXJjaC5odm0udmlyaWRp YW4tPnZwX2Fzc2lzdC5wdHI7CiAKICAgICBpZiAoICFwdHIgKQogICAgICAgICByZXR1cm47CiAK ICAgICBwdHItPkFwaWNBc3Npc3Qubm9fZW9pID0gMDsKLSAgICB2LT5hcmNoLmh2bS52aXJpZGlh bi5hcGljX2Fzc2lzdF9wZW5kaW5nID0gZmFsc2U7CisgICAgdi0+YXJjaC5odm0udmlyaWRpYW4t PmFwaWNfYXNzaXN0X3BlbmRpbmcgPSBmYWxzZTsKIH0KIAogaW50IHZpcmlkaWFuX3N5bmljX3dy bXNyKHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90IHZhbCkKQEAgLTk1LDEy ICs5NSwxMiBAQCBpbnQgdmlyaWRpYW5fc3luaWNfd3Jtc3Ioc3RydWN0IHZjcHUgKnYsIHVpbnQz Ml90IGlkeCwgdWludDY0X3QgdmFsKQogCiAgICAgY2FzZSBIVl9YNjRfTVNSX1ZQX0FTU0lTVF9Q QUdFOgogICAgICAgICAvKiByZWxlYXNlIGFueSBwcmV2aW91cyBtYXBwaW5nICovCi0gICAgICAg IHZpcmlkaWFuX3VubWFwX2d1ZXN0X3BhZ2UoJnYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lz dCk7Ci0gICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5tc3IucmF3ID0gdmFs OworICAgICAgICB2aXJpZGlhbl91bm1hcF9ndWVzdF9wYWdlKCZ2LT5hcmNoLmh2bS52aXJpZGlh bi0+dnBfYXNzaXN0KTsKKyAgICAgICAgdi0+YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdC5t c3IucmF3ID0gdmFsOwogICAgICAgICB2aXJpZGlhbl9kdW1wX2d1ZXN0X3BhZ2UodiwgIlZQX0FT U0lTVCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmdi0+YXJjaC5odm0udmly aWRpYW4udnBfYXNzaXN0KTsKLSAgICAgICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9h c3Npc3QubXNyLmZpZWxkcy5lbmFibGVkICkKLSAgICAgICAgICAgIHZpcmlkaWFuX21hcF9ndWVz dF9wYWdlKHYsICZ2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QpOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJnYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QpOwor ICAgICAgICBpZiAoIHYtPmFyY2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QubXNyLmZpZWxkcy5l bmFibGVkICkKKyAgICAgICAgICAgIHZpcmlkaWFuX21hcF9ndWVzdF9wYWdlKHYsICZ2LT5hcmNo Lmh2bS52aXJpZGlhbi0+dnBfYXNzaXN0KTsKICAgICAgICAgYnJlYWs7CiAKICAgICBkZWZhdWx0 OgpAQCAtMTMyLDcgKzEzMiw3IEBAIGludCB2aXJpZGlhbl9zeW5pY19yZG1zcihjb25zdCBzdHJ1 Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCAqdmFsKQogICAgICAgICBicmVhazsK IAogICAgIGNhc2UgSFZfWDY0X01TUl9WUF9BU1NJU1RfUEFHRToKLSAgICAgICAgKnZhbCA9IHYt PmFyY2guaHZtLnZpcmlkaWFuLnZwX2Fzc2lzdC5tc3IucmF3OworICAgICAgICAqdmFsID0gdi0+ YXJjaC5odm0udmlyaWRpYW4tPnZwX2Fzc2lzdC5tc3IucmF3OwogICAgICAgICBicmVhazsKIAog ICAgIGRlZmF1bHQ6CkBAIC0xNDYsMTggKzE0NiwxOCBAQCBpbnQgdmlyaWRpYW5fc3luaWNfcmRt c3IoY29uc3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgKnZhbCkKIHZv aWQgdmlyaWRpYW5fc3luaWNfc2F2ZV92Y3B1X2N0eHQoY29uc3Qgc3RydWN0IHZjcHUgKnYsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBodm1fdmlyaWRpYW5fdmNw dV9jb250ZXh0ICpjdHh0KQogewotICAgIGN0eHQtPmFwaWNfYXNzaXN0X3BlbmRpbmcgPSB2LT5h cmNoLmh2bS52aXJpZGlhbi5hcGljX2Fzc2lzdF9wZW5kaW5nOwotICAgIGN0eHQtPnZwX2Fzc2lz dF9tc3IgPSB2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QubXNyLnJhdzsKKyAgICBjdHh0 LT5hcGljX2Fzc2lzdF9wZW5kaW5nID0gdi0+YXJjaC5odm0udmlyaWRpYW4tPmFwaWNfYXNzaXN0 X3BlbmRpbmc7CisgICAgY3R4dC0+dnBfYXNzaXN0X21zciA9IHYtPmFyY2guaHZtLnZpcmlkaWFu LT52cF9hc3Npc3QubXNyLnJhdzsKIH0KIAogdm9pZCB2aXJpZGlhbl9zeW5pY19sb2FkX3ZjcHVf Y3R4dCgKICAgICBzdHJ1Y3QgdmNwdSAqdiwgY29uc3Qgc3RydWN0IGh2bV92aXJpZGlhbl92Y3B1 X2NvbnRleHQgKmN0eHQpCiB7Ci0gICAgdi0+YXJjaC5odm0udmlyaWRpYW4udnBfYXNzaXN0Lm1z ci5yYXcgPSBjdHh0LT52cF9hc3Npc3RfbXNyOwotICAgIGlmICggdi0+YXJjaC5odm0udmlyaWRp YW4udnBfYXNzaXN0Lm1zci5maWVsZHMuZW5hYmxlZCApCi0gICAgICAgIHZpcmlkaWFuX21hcF9n dWVzdF9wYWdlKHYsICZ2LT5hcmNoLmh2bS52aXJpZGlhbi52cF9hc3Npc3QpOworICAgIHYtPmFy Y2guaHZtLnZpcmlkaWFuLT52cF9hc3Npc3QubXNyLnJhdyA9IGN0eHQtPnZwX2Fzc2lzdF9tc3I7 CisgICAgaWYgKCB2LT5hcmNoLmh2bS52aXJpZGlhbi0+dnBfYXNzaXN0Lm1zci5maWVsZHMuZW5h YmxlZCApCisgICAgICAgIHZpcmlkaWFuX21hcF9ndWVzdF9wYWdlKHYsICZ2LT5hcmNoLmh2bS52 aXJpZGlhbi0+dnBfYXNzaXN0KTsKIAotICAgIHYtPmFyY2guaHZtLnZpcmlkaWFuLmFwaWNfYXNz aXN0X3BlbmRpbmcgPSBjdHh0LT5hcGljX2Fzc2lzdF9wZW5kaW5nOworICAgIHYtPmFyY2guaHZt LnZpcmlkaWFuLT5hcGljX2Fzc2lzdF9wZW5kaW5nID0gY3R4dC0+YXBpY19hc3Npc3RfcGVuZGlu ZzsKIH0KIAogLyoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdGltZS5j IGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMKaW5kZXggODQwYTgyYjQ1Ny4uNDIz NjdmNjQ2MCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMKKysr IGIveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMKQEAgLTI3LDcgKzI3LDcgQEAgdHlw ZWRlZiBzdHJ1Y3QgX0hWX1JFRkVSRU5DRV9UU0NfUEFHRQogCiBzdGF0aWMgdm9pZCBkdW1wX3Jl ZmVyZW5jZV90c2MoY29uc3Qgc3RydWN0IGRvbWFpbiAqZCkKIHsKLSAgICBjb25zdCB1bmlvbiB2 aXJpZGlhbl9wYWdlX21zciAqcnQgPSAmZC0+YXJjaC5odm0udmlyaWRpYW4ucmVmZXJlbmNlX3Rz YzsKKyAgICBjb25zdCB1bmlvbiB2aXJpZGlhbl9wYWdlX21zciAqcnQgPSAmZC0+YXJjaC5odm0u dmlyaWRpYW4tPnJlZmVyZW5jZV90c2M7CiAKICAgICBpZiAoICFydC0+ZmllbGRzLmVuYWJsZWQg KQogICAgICAgICByZXR1cm47CkBAIC0zOCw3ICszOCw3IEBAIHN0YXRpYyB2b2lkIGR1bXBfcmVm ZXJlbmNlX3RzYyhjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQogCiBzdGF0aWMgdm9pZCB1cGRhdGVf cmVmZXJlbmNlX3RzYyhzdHJ1Y3QgZG9tYWluICpkLCBib29sIGluaXRpYWxpemUpCiB7Ci0gICAg dW5zaWduZWQgbG9uZyBnbWZuID0gZC0+YXJjaC5odm0udmlyaWRpYW4ucmVmZXJlbmNlX3RzYy5m aWVsZHMucGZuOworICAgIHVuc2lnbmVkIGxvbmcgZ21mbiA9IGQtPmFyY2guaHZtLnZpcmlkaWFu LT5yZWZlcmVuY2VfdHNjLmZpZWxkcy5wZm47CiAgICAgc3RydWN0IHBhZ2VfaW5mbyAqcGFnZSA9 IGdldF9wYWdlX2Zyb21fZ2ZuKGQsIGdtZm4sIE5VTEwsIFAyTV9BTExPQyk7CiAgICAgSFZfUkVG RVJFTkNFX1RTQ19QQUdFICpwOwogCkBAIC0xMjEsOSArMTIxLDggQEAgc3RhdGljIGludDY0X3Qg cmF3X3RyY192YWwoc3RydWN0IGRvbWFpbiAqZCkKIAogdm9pZCB2aXJpZGlhbl90aW1lX3JlZl9j b3VudF9mcmVlemUoc3RydWN0IGRvbWFpbiAqZCkKIHsKLSAgICBzdHJ1Y3QgdmlyaWRpYW5fdGlt ZV9yZWZfY291bnQgKnRyYzsKLQotICAgIHRyYyA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi50aW1l X3JlZl9jb3VudDsKKyAgICBzdHJ1Y3QgdmlyaWRpYW5fdGltZV9yZWZfY291bnQgKnRyYyA9Cisg ICAgICAgICZkLT5hcmNoLmh2bS52aXJpZGlhbi0+dGltZV9yZWZfY291bnQ7CiAKICAgICBpZiAo IHRlc3RfYW5kX2NsZWFyX2JpdChfVFJDX3J1bm5pbmcsICZ0cmMtPmZsYWdzKSApCiAgICAgICAg IHRyYy0+dmFsID0gcmF3X3RyY192YWwoZCkgKyB0cmMtPm9mZjsKQEAgLTEzMSw5ICsxMzAsOCBA QCB2b2lkIHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50X2ZyZWV6ZShzdHJ1Y3QgZG9tYWluICpkKQog CiB2b2lkIHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50X3RoYXcoc3RydWN0IGRvbWFpbiAqZCkKIHsK LSAgICBzdHJ1Y3QgdmlyaWRpYW5fdGltZV9yZWZfY291bnQgKnRyYzsKLQotICAgIHRyYyA9ICZk LT5hcmNoLmh2bS52aXJpZGlhbi50aW1lX3JlZl9jb3VudDsKKyAgICBzdHJ1Y3QgdmlyaWRpYW5f dGltZV9yZWZfY291bnQgKnRyYyA9CisgICAgICAgICZkLT5hcmNoLmh2bS52aXJpZGlhbi0+dGlt ZV9yZWZfY291bnQ7CiAKICAgICBpZiAoICFkLT5pc19zaHV0dGluZ19kb3duICYmCiAgICAgICAg ICAhdGVzdF9hbmRfc2V0X2JpdChfVFJDX3J1bm5pbmcsICZ0cmMtPmZsYWdzKSApCkBAIC0xNTAs OSArMTQ4LDkgQEAgaW50IHZpcmlkaWFuX3RpbWVfd3Jtc3Ioc3RydWN0IHZjcHUgKnYsIHVpbnQz Ml90IGlkeCwgdWludDY0X3QgdmFsKQogICAgICAgICBpZiAoICEodmlyaWRpYW5fZmVhdHVyZV9t YXNrKGQpICYgSFZNUFZfcmVmZXJlbmNlX3RzYykgKQogICAgICAgICAgICAgcmV0dXJuIFg4NkVN VUxfRVhDRVBUSU9OOwogCi0gICAgICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLnJlZmVyZW5jZV90 c2MucmF3ID0gdmFsOworICAgICAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVmZXJlbmNlX3Rz Yy5yYXcgPSB2YWw7CiAgICAgICAgIGR1bXBfcmVmZXJlbmNlX3RzYyhkKTsKLSAgICAgICAgaWYg KCBkLT5hcmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjLmZpZWxkcy5lbmFibGVkICkKKyAg ICAgICAgaWYgKCBkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVmZXJlbmNlX3RzYy5maWVsZHMuZW5h YmxlZCApCiAgICAgICAgICAgICB1cGRhdGVfcmVmZXJlbmNlX3RzYyhkLCB0cnVlKTsKICAgICAg ICAgYnJlYWs7CiAKQEAgLTE4OSwxMyArMTg3LDEzIEBAIGludCB2aXJpZGlhbl90aW1lX3JkbXNy KGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiAgICAg ICAgIGlmICggISh2aXJpZGlhbl9mZWF0dXJlX21hc2soZCkgJiBIVk1QVl9yZWZlcmVuY2VfdHNj KSApCiAgICAgICAgICAgICByZXR1cm4gWDg2RU1VTF9FWENFUFRJT047CiAKLSAgICAgICAgKnZh bCA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLnJlZmVyZW5jZV90c2MucmF3OworICAgICAgICAqdmFs ID0gZC0+YXJjaC5odm0udmlyaWRpYW4tPnJlZmVyZW5jZV90c2MucmF3OwogICAgICAgICBicmVh azsKIAogICAgIGNhc2UgSFZfWDY0X01TUl9USU1FX1JFRl9DT1VOVDoKICAgICB7CiAgICAgICAg IHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJjID0KLSAgICAgICAgICAgICZkLT5h cmNoLmh2bS52aXJpZGlhbi50aW1lX3JlZl9jb3VudDsKKyAgICAgICAgICAgICZkLT5hcmNoLmh2 bS52aXJpZGlhbi0+dGltZV9yZWZfY291bnQ7CiAKICAgICAgICAgaWYgKCAhKHZpcmlkaWFuX2Zl YXR1cmVfbWFzayhkKSAmIEhWTVBWX3RpbWVfcmVmX2NvdW50KSApCiAgICAgICAgICAgICByZXR1 cm4gWDg2RU1VTF9FWENFUFRJT047CkBAIC0yMTksMTcgKzIxNywxNyBAQCBpbnQgdmlyaWRpYW5f dGltZV9yZG1zcihjb25zdCBzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCAq dmFsKQogdm9pZCB2aXJpZGlhbl90aW1lX3NhdmVfZG9tYWluX2N0eHQoCiAgICAgY29uc3Qgc3Ry dWN0IGRvbWFpbiAqZCwgc3RydWN0IGh2bV92aXJpZGlhbl9kb21haW5fY29udGV4dCAqY3R4dCkK IHsKLSAgICBjdHh0LT50aW1lX3JlZl9jb3VudCA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLnRpbWVf cmVmX2NvdW50LnZhbDsKLSAgICBjdHh0LT5yZWZlcmVuY2VfdHNjID0gZC0+YXJjaC5odm0udmly aWRpYW4ucmVmZXJlbmNlX3RzYy5yYXc7CisgICAgY3R4dC0+dGltZV9yZWZfY291bnQgPSBkLT5h cmNoLmh2bS52aXJpZGlhbi0+dGltZV9yZWZfY291bnQudmFsOworICAgIGN0eHQtPnJlZmVyZW5j ZV90c2MgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+cmVmZXJlbmNlX3RzYy5yYXc7CiB9CiAKIHZv aWQgdmlyaWRpYW5fdGltZV9sb2FkX2RvbWFpbl9jdHh0KAogICAgIHN0cnVjdCBkb21haW4gKmQs IGNvbnN0IHN0cnVjdCBodm1fdmlyaWRpYW5fZG9tYWluX2NvbnRleHQgKmN0eHQpCiB7Ci0gICAg ZC0+YXJjaC5odm0udmlyaWRpYW4udGltZV9yZWZfY291bnQudmFsID0gY3R4dC0+dGltZV9yZWZf Y291bnQ7Ci0gICAgZC0+YXJjaC5odm0udmlyaWRpYW4ucmVmZXJlbmNlX3RzYy5yYXcgPSBjdHh0 LT5yZWZlcmVuY2VfdHNjOworICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3Vu dC52YWwgPSBjdHh0LT50aW1lX3JlZl9jb3VudDsKKyAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi0+ cmVmZXJlbmNlX3RzYy5yYXcgPSBjdHh0LT5yZWZlcmVuY2VfdHNjOwogCi0gICAgaWYgKCBkLT5h cmNoLmh2bS52aXJpZGlhbi5yZWZlcmVuY2VfdHNjLmZpZWxkcy5lbmFibGVkICkKKyAgICBpZiAo IGQtPmFyY2guaHZtLnZpcmlkaWFuLT5yZWZlcmVuY2VfdHNjLmZpZWxkcy5lbmFibGVkICkKICAg ICAgICAgdXBkYXRlX3JlZmVyZW5jZV90c2MoZCwgZmFsc2UpOwogfQogCmRpZmYgLS1naXQgYS94 ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3ZpcmlkaWFuLmMgYi94ZW4vYXJjaC94ODYvaHZtL3Zp cmlkaWFuL3ZpcmlkaWFuLmMKaW5kZXggYWQxMTBlZTZmMy4uZTIwMGUyZWQxZCAxMDA2NDQKLS0t IGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi92aXJpZGlhbi5jCisrKyBiL3hlbi9hcmNoL3g4 Ni9odm0vdmlyaWRpYW4vdmlyaWRpYW4uYwpAQCAtMTQ2LDcgKzE0Niw3IEBAIHZvaWQgY3B1aWRf dmlyaWRpYW5fbGVhdmVzKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBsZWFmLAogICAg ICAgICAgKiBIeXBlcnZpc29yIGluZm9ybWF0aW9uLCBidXQgb25seSBpZiB0aGUgZ3Vlc3QgaGFz IHNldCBpdHMKICAgICAgICAgICogb3duIHZlcnNpb24gbnVtYmVyLgogICAgICAgICAgKi8KLSAg ICAgICAgaWYgKCBkLT5hcmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5yYXcgPT0gMCApCisg ICAgICAgIGlmICggZC0+YXJjaC5odm0udmlyaWRpYW4tPmd1ZXN0X29zX2lkLnJhdyA9PSAwICkK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICByZXMtPmEgPSB2aXJpZGlhbl9idWlsZDsKICAg ICAgICAgcmVzLT5iID0gKCh1aW50MzJfdCl2aXJpZGlhbl9tYWpvciA8PCAxNikgfCB2aXJpZGlh bl9taW5vcjsKQEAgLTE5MSw4ICsxOTEsOCBAQCB2b2lkIGNwdWlkX3ZpcmlkaWFuX2xlYXZlcyhj b25zdCBzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgbGVhZiwKIAogICAgIGNhc2UgNDoKICAgICAg ICAgLyogUmVjb21tZW5kZWQgaHlwZXJjYWxsIHVzYWdlLiAqLwotICAgICAgICBpZiAoIChkLT5h cmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5yYXcgPT0gMCkgfHwKLSAgICAgICAgICAgICAo ZC0+YXJjaC5odm0udmlyaWRpYW4uZ3Vlc3Rfb3NfaWQuZmllbGRzLm9zIDwgNCkgKQorICAgICAg ICBpZiAoIChkLT5hcmNoLmh2bS52aXJpZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3ID09IDApIHx8Cisg ICAgICAgICAgICAgKGQtPmFyY2guaHZtLnZpcmlkaWFuLT5ndWVzdF9vc19pZC5maWVsZHMub3Mg PCA0KSApCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgcmVzLT5hID0gQ1BVSUQ0QV9SRUxB WF9USU1FUl9JTlQ7CiAgICAgICAgIGlmICggdmlyaWRpYW5fZmVhdHVyZV9tYXNrKGQpICYgSFZN UFZfaGNhbGxfcmVtb3RlX3RsYl9mbHVzaCApCkBAIC0yMjQsNyArMjI0LDcgQEAgc3RhdGljIHZv aWQgZHVtcF9ndWVzdF9vc19pZChjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQogewogICAgIGNvbnN0 IHVuaW9uIHZpcmlkaWFuX2d1ZXN0X29zX2lkX21zciAqZ29pOwogCi0gICAgZ29pID0gJmQtPmFy Y2guaHZtLnZpcmlkaWFuLmd1ZXN0X29zX2lkOworICAgIGdvaSA9ICZkLT5hcmNoLmh2bS52aXJp ZGlhbi0+Z3Vlc3Rfb3NfaWQ7CiAKICAgICBwcmludGsoWEVOTE9HX0dfSU5GTwogICAgICAgICAg ICAiZCVkOiBWSVJJRElBTiBHVUVTVF9PU19JRDogdmVuZG9yOiAleCBvczogJXggbWFqb3I6ICV4 IG1pbm9yOiAleCBzcDogJXggYnVpbGQ6ICV4XG4iLApAQCAtMjM4LDcgKzIzOCw3IEBAIHN0YXRp YyB2b2lkIGR1bXBfaHlwZXJjYWxsKGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCiB7CiAgICAgY29u c3QgdW5pb24gdmlyaWRpYW5fcGFnZV9tc3IgKmhnOwogCi0gICAgaGcgPSAmZC0+YXJjaC5odm0u dmlyaWRpYW4uaHlwZXJjYWxsX2dwYTsKKyAgICBoZyA9ICZkLT5hcmNoLmh2bS52aXJpZGlhbi0+ aHlwZXJjYWxsX2dwYTsKIAogICAgIHByaW50ayhYRU5MT0dfR19JTkZPICJkJWQ6IFZJUklESUFO IEhZUEVSQ0FMTDogZW5hYmxlZDogJXggcGZuOiAlbHhcbiIsCiAgICAgICAgICAgIGQtPmRvbWFp bl9pZCwKQEAgLTI0Nyw3ICsyNDcsNyBAQCBzdGF0aWMgdm9pZCBkdW1wX2h5cGVyY2FsbChjb25z dCBzdHJ1Y3QgZG9tYWluICpkKQogCiBzdGF0aWMgdm9pZCBlbmFibGVfaHlwZXJjYWxsX3BhZ2Uo c3RydWN0IGRvbWFpbiAqZCkKIHsKLSAgICB1bnNpZ25lZCBsb25nIGdtZm4gPSBkLT5hcmNoLmh2 bS52aXJpZGlhbi5oeXBlcmNhbGxfZ3BhLmZpZWxkcy5wZm47CisgICAgdW5zaWduZWQgbG9uZyBn bWZuID0gZC0+YXJjaC5odm0udmlyaWRpYW4tPmh5cGVyY2FsbF9ncGEuZmllbGRzLnBmbjsKICAg ICBzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlID0gZ2V0X3BhZ2VfZnJvbV9nZm4oZCwgZ21mbiwgTlVM TCwgUDJNX0FMTE9DKTsKICAgICB1aW50OF90ICpwOwogCkBAIC0yODgsMTQgKzI4OCwxNCBAQCBp bnQgZ3Vlc3Rfd3Jtc3JfdmlyaWRpYW4oc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWlu dDY0X3QgdmFsKQogICAgIHN3aXRjaCAoIGlkeCApCiAgICAgewogICAgIGNhc2UgSFZfWDY0X01T Ul9HVUVTVF9PU19JRDoKLSAgICAgICAgZC0+YXJjaC5odm0udmlyaWRpYW4uZ3Vlc3Rfb3NfaWQu cmF3ID0gdmFsOworICAgICAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi0+Z3Vlc3Rfb3NfaWQucmF3 ID0gdmFsOwogICAgICAgICBkdW1wX2d1ZXN0X29zX2lkKGQpOwogICAgICAgICBicmVhazsKIAog ICAgIGNhc2UgSFZfWDY0X01TUl9IWVBFUkNBTEw6Ci0gICAgICAgIGQtPmFyY2guaHZtLnZpcmlk aWFuLmh5cGVyY2FsbF9ncGEucmF3ID0gdmFsOworICAgICAgICBkLT5hcmNoLmh2bS52aXJpZGlh bi0+aHlwZXJjYWxsX2dwYS5yYXcgPSB2YWw7CiAgICAgICAgIGR1bXBfaHlwZXJjYWxsKGQpOwot ICAgICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLmh5cGVyY2FsbF9ncGEuZmllbGRzLmVu YWJsZWQgKQorICAgICAgICBpZiAoIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5oeXBlcmNhbGxfZ3Bh LmZpZWxkcy5lbmFibGVkICkKICAgICAgICAgICAgIGVuYWJsZV9oeXBlcmNhbGxfcGFnZShkKTsK ICAgICAgICAgYnJlYWs7CiAKQEAgLTMxNywxMCArMzE3LDEwIEBAIGludCBndWVzdF93cm1zcl92 aXJpZGlhbihzdHJ1Y3QgdmNwdSAqdiwgdWludDMyX3QgaWR4LCB1aW50NjRfdCB2YWwpCiAgICAg Y2FzZSBIVl9YNjRfTVNSX0NSQVNIX1AzOgogICAgIGNhc2UgSFZfWDY0X01TUl9DUkFTSF9QNDoK ICAgICAgICAgQlVJTERfQlVHX09OKEhWX1g2NF9NU1JfQ1JBU0hfUDQgLSBIVl9YNjRfTVNSX0NS QVNIX1AwID49Ci0gICAgICAgICAgICAgICAgICAgICBBUlJBWV9TSVpFKHYtPmFyY2guaHZtLnZp cmlkaWFuLmNyYXNoX3BhcmFtKSk7CisgICAgICAgICAgICAgICAgICAgICBBUlJBWV9TSVpFKHYt PmFyY2guaHZtLnZpcmlkaWFuLT5jcmFzaF9wYXJhbSkpOwogCiAgICAgICAgIGlkeCAtPSBIVl9Y NjRfTVNSX0NSQVNIX1AwOwotICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi5jcmFzaF9wYXJh bVtpZHhdID0gdmFsOworICAgICAgICB2LT5hcmNoLmh2bS52aXJpZGlhbi0+Y3Jhc2hfcGFyYW1b aWR4XSA9IHZhbDsKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIEhWX1g2NF9NU1JfQ1JBU0hf Q1RMOgpAQCAtMzM3LDExICszMzcsMTEgQEAgaW50IGd1ZXN0X3dybXNyX3ZpcmlkaWFuKHN0cnVj dCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90IHZhbCkKICAgICAgICAgc3Bpbl91bmxv Y2soJmQtPnNodXRkb3duX2xvY2spOwogCiAgICAgICAgIGdwcmludGsoWEVOTE9HX1dBUk5JTkcs ICJWSVJJRElBTiBDUkFTSDogJWx4ICVseCAlbHggJWx4ICVseFxuIiwKLSAgICAgICAgICAgICAg ICB2LT5hcmNoLmh2bS52aXJpZGlhbi5jcmFzaF9wYXJhbVswXSwKLSAgICAgICAgICAgICAgICB2 LT5hcmNoLmh2bS52aXJpZGlhbi5jcmFzaF9wYXJhbVsxXSwKLSAgICAgICAgICAgICAgICB2LT5h cmNoLmh2bS52aXJpZGlhbi5jcmFzaF9wYXJhbVsyXSwKLSAgICAgICAgICAgICAgICB2LT5hcmNo Lmh2bS52aXJpZGlhbi5jcmFzaF9wYXJhbVszXSwKLSAgICAgICAgICAgICAgICB2LT5hcmNoLmh2 bS52aXJpZGlhbi5jcmFzaF9wYXJhbVs0XSk7CisgICAgICAgICAgICAgICAgdi0+YXJjaC5odm0u dmlyaWRpYW4tPmNyYXNoX3BhcmFtWzBdLAorICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZp cmlkaWFuLT5jcmFzaF9wYXJhbVsxXSwKKyAgICAgICAgICAgICAgICB2LT5hcmNoLmh2bS52aXJp ZGlhbi0+Y3Jhc2hfcGFyYW1bMl0sCisgICAgICAgICAgICAgICAgdi0+YXJjaC5odm0udmlyaWRp YW4tPmNyYXNoX3BhcmFtWzNdLAorICAgICAgICAgICAgICAgIHYtPmFyY2guaHZtLnZpcmlkaWFu LT5jcmFzaF9wYXJhbVs0XSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KIApAQCAtMzY0LDExICsz NjQsMTEgQEAgaW50IGd1ZXN0X3JkbXNyX3ZpcmlkaWFuKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1 aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiAgICAgc3dpdGNoICggaWR4ICkKICAgICB7CiAg ICAgY2FzZSBIVl9YNjRfTVNSX0dVRVNUX09TX0lEOgotICAgICAgICAqdmFsID0gZC0+YXJjaC5o dm0udmlyaWRpYW4uZ3Vlc3Rfb3NfaWQucmF3OworICAgICAgICAqdmFsID0gZC0+YXJjaC5odm0u dmlyaWRpYW4tPmd1ZXN0X29zX2lkLnJhdzsKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIEhW X1g2NF9NU1JfSFlQRVJDQUxMOgotICAgICAgICAqdmFsID0gZC0+YXJjaC5odm0udmlyaWRpYW4u aHlwZXJjYWxsX2dwYS5yYXc7CisgICAgICAgICp2YWwgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+ aHlwZXJjYWxsX2dwYS5yYXc7CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBIVl9YNjRfTVNS X1ZQX0lOREVYOgpAQCAtMzkzLDEwICszOTMsMTAgQEAgaW50IGd1ZXN0X3JkbXNyX3ZpcmlkaWFu KGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiAgICAg Y2FzZSBIVl9YNjRfTVNSX0NSQVNIX1AzOgogICAgIGNhc2UgSFZfWDY0X01TUl9DUkFTSF9QNDoK ICAgICAgICAgQlVJTERfQlVHX09OKEhWX1g2NF9NU1JfQ1JBU0hfUDQgLSBIVl9YNjRfTVNSX0NS QVNIX1AwID49Ci0gICAgICAgICAgICAgICAgICAgICBBUlJBWV9TSVpFKHYtPmFyY2guaHZtLnZp cmlkaWFuLmNyYXNoX3BhcmFtKSk7CisgICAgICAgICAgICAgICAgICAgICBBUlJBWV9TSVpFKHYt PmFyY2guaHZtLnZpcmlkaWFuLT5jcmFzaF9wYXJhbSkpOwogCiAgICAgICAgIGlkeCAtPSBIVl9Y NjRfTVNSX0NSQVNIX1AwOwotICAgICAgICAqdmFsID0gdi0+YXJjaC5odm0udmlyaWRpYW4uY3Jh c2hfcGFyYW1baWR4XTsKKyAgICAgICAgKnZhbCA9IHYtPmFyY2guaHZtLnZpcmlkaWFuLT5jcmFz aF9wYXJhbVtpZHhdOwogICAgICAgICBicmVhazsKIAogICAgIGNhc2UgSFZfWDY0X01TUl9DUkFT SF9DVEw6CkBAIC00MTksMTcgKzQxOSwzNCBAQCBpbnQgZ3Vlc3RfcmRtc3JfdmlyaWRpYW4oY29u c3Qgc3RydWN0IHZjcHUgKnYsIHVpbnQzMl90IGlkeCwgdWludDY0X3QgKnZhbCkKIAogaW50IHZp cmlkaWFuX3ZjcHVfaW5pdChzdHJ1Y3QgdmNwdSAqdikKIHsKKyAgICBBU1NFUlQoIXYtPmFyY2gu aHZtLnZpcmlkaWFuKTsKKyAgICB2LT5hcmNoLmh2bS52aXJpZGlhbiA9IHh6YWxsb2Moc3RydWN0 IHZpcmlkaWFuX3ZjcHUpOworICAgIGlmICggIXYtPmFyY2guaHZtLnZpcmlkaWFuICkKKyAgICAg ICAgcmV0dXJuIC1FTk9NRU07CisKICAgICByZXR1cm4gMDsKIH0KIAogaW50IHZpcmlkaWFuX2Rv bWFpbl9pbml0KHN0cnVjdCBkb21haW4gKmQpCiB7CisgICAgQVNTRVJUKCFkLT5hcmNoLmh2bS52 aXJpZGlhbik7CisgICAgZC0+YXJjaC5odm0udmlyaWRpYW4gPSB4emFsbG9jKHN0cnVjdCB2aXJp ZGlhbl9kb21haW4pOworICAgIGlmICggIWQtPmFyY2guaHZtLnZpcmlkaWFuICkKKyAgICAgICAg cmV0dXJuIC1FTk9NRU07CisKICAgICByZXR1cm4gMDsKIH0KIAogdm9pZCB2aXJpZGlhbl92Y3B1 X2RlaW5pdChzdHJ1Y3QgdmNwdSAqdikKIHsKLSAgICB2aXJpZGlhbl9zeW5pY193cm1zcih2LCBI Vl9YNjRfTVNSX1ZQX0FTU0lTVF9QQUdFLCAwKTsKKyAgICBpZiAoICF2LT5hcmNoLmh2bS52aXJp ZGlhbiApCisgICAgICAgIHJldHVybjsKKworICAgIGlmICggaXNfdmlyaWRpYW5fdmNwdSh2KSAp CisgICAgICAgIHZpcmlkaWFuX3N5bmljX3dybXNyKHYsIEhWX1g2NF9NU1JfVlBfQVNTSVNUX1BB R0UsIDApOworCisgICAgeGZyZWUodi0+YXJjaC5odm0udmlyaWRpYW4pOworICAgIHYtPmFyY2gu aHZtLnZpcmlkaWFuID0gTlVMTDsKIH0KIAogdm9pZCB2aXJpZGlhbl9kb21haW5fZGVpbml0KHN0 cnVjdCBkb21haW4gKmQpCkBAIC00MzgsNiArNDU1LDEyIEBAIHZvaWQgdmlyaWRpYW5fZG9tYWlu X2RlaW5pdChzdHJ1Y3QgZG9tYWluICpkKQogCiAgICAgZm9yX2VhY2hfdmNwdSAoIGQsIHYgKQog ICAgICAgICB2aXJpZGlhbl92Y3B1X2RlaW5pdCh2KTsKKworICAgIGlmICggIWQtPmFyY2guaHZt LnZpcmlkaWFuICkKKyAgICAgICAgcmV0dXJuOworCisgICAgeGZyZWUoZC0+YXJjaC5odm0udmly aWRpYW4pOworICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuID0gTlVMTDsKIH0KIAogc3RhdGljIERF RklORV9QRVJfQ1BVKGNwdW1hc2tfdCwgaXBpX2NwdW1hc2spOwpAQCAtNjYyLDggKzY4NSw4IEBA IHN0YXRpYyBpbnQgdmlyaWRpYW5fc2F2ZV9kb21haW5fY3R4dChzdHJ1Y3QgdmNwdSAqdiwKIHsK ICAgICBjb25zdCBzdHJ1Y3QgZG9tYWluICpkID0gdi0+ZG9tYWluOwogICAgIHN0cnVjdCBodm1f dmlyaWRpYW5fZG9tYWluX2NvbnRleHQgY3R4dCA9IHsKLSAgICAgICAgLmh5cGVyY2FsbF9ncGEg ID0gZC0+YXJjaC5odm0udmlyaWRpYW4uaHlwZXJjYWxsX2dwYS5yYXcsCi0gICAgICAgIC5ndWVz dF9vc19pZCAgICA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLmd1ZXN0X29zX2lkLnJhdywKKyAgICAg ICAgLmh5cGVyY2FsbF9ncGEgPSBkLT5hcmNoLmh2bS52aXJpZGlhbi0+aHlwZXJjYWxsX2dwYS5y YXcsCisgICAgICAgIC5ndWVzdF9vc19pZCA9IGQtPmFyY2guaHZtLnZpcmlkaWFuLT5ndWVzdF9v c19pZC5yYXcsCiAgICAgfTsKIAogICAgIGlmICggIWlzX3ZpcmlkaWFuX2RvbWFpbihkKSApCkBA IC02ODIsOCArNzA1LDggQEAgc3RhdGljIGludCB2aXJpZGlhbl9sb2FkX2RvbWFpbl9jdHh0KHN0 cnVjdCBkb21haW4gKmQsCiAgICAgaWYgKCBodm1fbG9hZF9lbnRyeV96ZXJvZXh0ZW5kKFZJUklE SUFOX0RPTUFJTiwgaCwgJmN0eHQpICE9IDAgKQogICAgICAgICByZXR1cm4gLUVJTlZBTDsKIAot ICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLmh5cGVyY2FsbF9ncGEucmF3ICA9IGN0eHQuaHlwZXJj YWxsX2dwYTsKLSAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi5ndWVzdF9vc19pZC5yYXcgICAgPSBj dHh0Lmd1ZXN0X29zX2lkOworICAgIGQtPmFyY2guaHZtLnZpcmlkaWFuLT5oeXBlcmNhbGxfZ3Bh LnJhdyA9IGN0eHQuaHlwZXJjYWxsX2dwYTsKKyAgICBkLT5hcmNoLmh2bS52aXJpZGlhbi0+Z3Vl c3Rfb3NfaWQucmF3ID0gY3R4dC5ndWVzdF9vc19pZDsKIAogICAgIHZpcmlkaWFuX3RpbWVfbG9h ZF9kb21haW5fY3R4dChkLCAmY3R4dCk7CiAKQEAgLTY5Nyw3ICs3MjAsNyBAQCBzdGF0aWMgaW50 IHZpcmlkaWFuX3NhdmVfdmNwdV9jdHh0KHN0cnVjdCB2Y3B1ICp2LCBodm1fZG9tYWluX2NvbnRl eHRfdCAqaCkKIHsKICAgICBzdHJ1Y3QgaHZtX3ZpcmlkaWFuX3ZjcHVfY29udGV4dCBjdHh0ID0g e307CiAKLSAgICBpZiAoICFpc192aXJpZGlhbl9kb21haW4odi0+ZG9tYWluKSApCisgICAgaWYg KCAhaXNfdmlyaWRpYW5fdmNwdSh2KSApCiAgICAgICAgIHJldHVybiAwOwogCiAgICAgdmlyaWRp YW5fc3luaWNfc2F2ZV92Y3B1X2N0eHQodiwgJmN0eHQpOwpkaWZmIC0tZ2l0IGEveGVuL2luY2x1 ZGUvYXNtLXg4Ni9odm0vZG9tYWluLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9kb21haW4u aAppbmRleCAzZTczMzE4MTdmLi42YzdjNGY1YWE2IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9h c20teDg2L2h2bS9kb21haW4uaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9kb21haW4u aApAQCAtMTU0LDcgKzE1NCw3IEBAIHN0cnVjdCBodm1fZG9tYWluIHsKICAgICAvKiBoeXBlcnZp c29yIGludGVyY2VwdGVkIG1zaXggdGFibGUgKi8KICAgICBzdHJ1Y3QgbGlzdF9oZWFkICAgICAg IG1zaXh0YmxfbGlzdDsKIAotICAgIHN0cnVjdCB2aXJpZGlhbl9kb21haW4gdmlyaWRpYW47Cisg ICAgc3RydWN0IHZpcmlkaWFuX2RvbWFpbiAqdmlyaWRpYW47CiAKICAgICBib29sX3QgICAgICAg ICAgICAgICAgIGhhcF9lbmFibGVkOwogICAgIGJvb2xfdCAgICAgICAgICAgICAgICAgbWVtX3No YXJpbmdfZW5hYmxlZDsKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL2h2bS5o IGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vaHZtLmgKaW5kZXggMGExMGI1MTU1NC4uZDhkZjZm NDM1MiAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vaHZtLmgKKysrIGIveGVu L2luY2x1ZGUvYXNtLXg4Ni9odm0vaHZtLmgKQEAgLTQ2MSw2ICs0NjEsOSBAQCBzdGF0aWMgaW5s aW5lIGJvb2wgaHZtX2dldF9ndWVzdF9ibmRjZmdzKHN0cnVjdCB2Y3B1ICp2LCB1NjQgKnZhbCkK ICNkZWZpbmUgaXNfdmlyaWRpYW5fZG9tYWluKGQpIFwKICAgICAoaXNfaHZtX2RvbWFpbihkKSAm JiAodmlyaWRpYW5fZmVhdHVyZV9tYXNrKGQpICYgSFZNUFZfYmFzZV9mcmVxKSkKIAorI2RlZmlu ZSBpc192aXJpZGlhbl92Y3B1KHYpIFwKKyAgICBpc192aXJpZGlhbl9kb21haW4oKHYpLT5kb21h aW4pCisKICNkZWZpbmUgaGFzX3ZpcmlkaWFuX3RpbWVfcmVmX2NvdW50KGQpIFwKICAgICAoaXNf dmlyaWRpYW5fZG9tYWluKGQpICYmICh2aXJpZGlhbl9mZWF0dXJlX21hc2soZCkgJiBIVk1QVl90 aW1lX3JlZl9jb3VudCkpCiAKQEAgLTc2MCw2ICs3NjMsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wg aHZtX2hhc19zZXRfZGVzY3JpcHRvcl9hY2Nlc3NfZXhpdGluZyh2b2lkKQogfQogCiAjZGVmaW5l IGlzX3ZpcmlkaWFuX2RvbWFpbihkKSAoKHZvaWQpKGQpLCBmYWxzZSkKKyNkZWZpbmUgaXNfdmly aWRpYW5fdmNwdSh2KSAoKHZvaWQpKHYpLCBmYWxzZSkKICNkZWZpbmUgaGFzX3ZpcmlkaWFuX3Rp bWVfcmVmX2NvdW50KGQpICgodm9pZCkoZCksIGZhbHNlKQogI2RlZmluZSBodm1fbG9uZ19tb2Rl X2FjdGl2ZSh2KSAoKHZvaWQpKHYpLCBmYWxzZSkKICNkZWZpbmUgaHZtX2dldF9ndWVzdF90aW1l KHYpICgodm9pZCkodiksIDApCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92 Y3B1LmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92Y3B1LmgKaW5kZXggYzhhNDBmNmQ1NS4u YmU5ZmE1YjVhNCAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vdmNwdS5oCisr KyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZjcHUuaApAQCAtMjAwLDcgKzIwMCw3IEBAIHN0 cnVjdCBodm1fdmNwdSB7CiAgICAgLyogUGVuZGluZyBody9zdyBpbnRlcnJ1cHQgKC52ZWN0b3Ig PSAtMSBtZWFucyBub3RoaW5nIHBlbmRpbmcpLiAqLwogICAgIHN0cnVjdCB4ODZfZXZlbnQgICAg IGluamVjdF9ldmVudDsKIAotICAgIHN0cnVjdCB2aXJpZGlhbl92Y3B1IHZpcmlkaWFuOworICAg IHN0cnVjdCB2aXJpZGlhbl92Y3B1ICp2aXJpZGlhbjsKIH07CiAKICNlbmRpZiAvKiBfX0FTTV9Y ODZfSFZNX1ZDUFVfSF9fICovCi0tIAoyLjIwLjEuMi5nYjIxZWJiNjcxCgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlz dApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0 Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==