From: Roger Pau Monne Subject: [PATCH 7/8] x86/mm: handle foreign mappings in p2m_entry_modify Date: Wed, 30 Jan 2019 11:36:45 +0100 Message-ID: <20190130103646.53649-8-roger.pau@citrix.com> References: <20190130103646.53649-1-roger.pau@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 1gonFB-0001UI-BN for xen-devel@lists.xenproject.org; Wed, 30 Jan 2019 10:37:21 +0000 In-Reply-To: <20190130103646.53649-1-roger.pau@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: Kevin Tian , Wei Liu , Jan Beulich , George Dunlap , Andrew Cooper , Tim Deegan , Jun Nakajima , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org U28gdGhhdCB0aGUgc3BlY2lmaWMgaGFuZGxpbmcgY2FuIGJlIHJlbW92ZWQgZnJvbQphdG9taWNf d3JpdGVfZXB0X2VudHJ5IGFuZCBiZSBzaGFyZWQgd2l0aCBucHQgYW5kIHNoYWRvdyBjb2RlLgoK VGhpcyBjb21taXQgYWxzbyByZW1vdmVzIHRoZSBjaGVjayB0aGF0IHByZXZlbnQgbm9uLWVwdCBQ VkggZG9tMCBmcm9tCm1hcHBpbmcgZm9yZWlnbiBwYWdlcy4KClNpZ25lZC1vZmYtYnk6IFJvZ2Vy IFBhdSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgotLS0KQ2M6IEdlb3JnZSBEdW5sYXAg PGdlb3JnZS5kdW5sYXBAZXUuY2l0cml4LmNvbT4KQ2M6IEphbiBCZXVsaWNoIDxqYmV1bGljaEBz dXNlLmNvbT4KQ2M6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+CkNj OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgpDYzogSnVuIE5ha2FqaW1hIDxqdW4ubmFr YWppbWFAaW50ZWwuY29tPgpDYzogS2V2aW4gVGlhbiA8a2V2aW4udGlhbkBpbnRlbC5jb20+CkNj OiBUaW0gRGVlZ2FuIDx0aW1AeGVuLm9yZz4KLS0tCiB4ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5j ICAgICAgIHwgICAzICstCiB4ZW4vYXJjaC94ODYvbW0vcDJtLWVwdC5jICAgICAgIHwgMTA4ICsr KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiB4ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMg ICAgICAgIHwgICA3IC0tLQogeGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYyB8ICAgMyAr LQogeGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaCAgICAgICB8ICAzMCArKysrKysrKy0KIDUgZmls ZXMgY2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgOTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEveGVuL2FyY2gveDg2L21tL2hhcC9oYXAuYyBiL3hlbi9hcmNoL3g4Ni9tbS9oYXAvaGFwLmMK aW5kZXggZGM0NmQ1ZTE0Zi4uNGY1MjYzOWJlNSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21t L2hhcC9oYXAuYworKysgYi94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jCkBAIC03MzUsNyArNzM1 LDggQEAgaGFwX3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25n IGdmbiwgbDFfcGdlbnRyeV90ICpwLAogICAgIH0KIAogICAgIHAybV9lbnRyeV9tb2RpZnkocDJt X2dldF9ob3N0cDJtKGQpLCBwMm1fZmxhZ3NfdG9fdHlwZShsMWVfZ2V0X2ZsYWdzKG5ldykpLAot ICAgICAgICAgICAgICAgICAgICAgcDJtX2ZsYWdzX3RvX3R5cGUob2xkX2ZsYWdzKSwgbGV2ZWwp OworICAgICAgICAgICAgICAgICAgICAgcDJtX2ZsYWdzX3RvX3R5cGUob2xkX2ZsYWdzKSwgbDFl X2dldF9tZm4obmV3KSwKKyAgICAgICAgICAgICAgICAgICAgIGwxZV9nZXRfbWZuKCpwKSwgbGV2 ZWwpOwogCiAgICAgc2FmZV93cml0ZV9wdGUocCwgbmV3KTsKICAgICBpZiAoIG9sZF9mbGFncyAm IF9QQUdFX1BSRVNFTlQgKQpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYyBi L3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMKaW5kZXggMGVjZTY2MDhjYi4uMmIwYzNhYjI2NSAx MDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYworKysgYi94ZW4vYXJjaC94ODYv bW0vcDJtLWVwdC5jCkBAIC00NSw2NSArNDUsMTMgQEAgc3RhdGljIGlubGluZSBib29sX3QgaXNf ZXB0ZV92YWxpZChlcHRfZW50cnlfdCAqZSkKICAgICByZXR1cm4gKChlLT5lcHRlICYgfigxdWwg PDwgNjMpKSAhPSAwICYmIGUtPnNhX3AybXQgIT0gcDJtX2ludmFsaWQpOwogfQogCi0vKiByZXR1 cm5zIDogMCBmb3Igc3VjY2VzcywgLWVycm5vIG90aGVyd2lzZSAqLwotc3RhdGljIGludCBhdG9t aWNfd3JpdGVfZXB0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZXB0X2VudHJ5X3QgKmVudHJ5cHRyLCBlcHRfZW50cnlfdCBu ZXcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGxldmVsKQorc3RhdGlj IHZvaWQgYXRvbWljX3dyaXRlX2VwdF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlcHRfZW50cnlfdCAqZW50cnlwdHIsIGVw dF9lbnRyeV90IG5ldywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGxl dmVsKQogewotICAgIGludCByYzsKLSAgICB1bnNpZ25lZCBsb25nIG9sZG1mbiA9IG1mbl94KElO VkFMSURfTUZOKTsKLSAgICBib29sX3QgY2hlY2tfZm9yZWlnbiA9IChuZXcubWZuICE9IGVudHJ5 cHRyLT5tZm4gfHwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBuZXcuc2FfcDJtdCAhPSBl bnRyeXB0ci0+c2FfcDJtdCk7Ci0KLSAgICBpZiAoIGxldmVsICkKLSAgICB7Ci0gICAgICAgIEFT U0VSVCghaXNfZXB0ZV9zdXBlcnBhZ2UoJm5ldykgfHwgIXAybV9pc19mb3JlaWduKG5ldy5zYV9w Mm10KSk7Ci0gICAgICAgIHdyaXRlX2F0b21pYygmZW50cnlwdHItPmVwdGUsIG5ldy5lcHRlKTsK LSAgICAgICAgcmV0dXJuIDA7Ci0gICAgfQotCi0gICAgaWYgKCB1bmxpa2VseShwMm1faXNfZm9y ZWlnbihuZXcuc2FfcDJtdCkpICkKLSAgICB7Ci0gICAgICAgIHJjID0gLUVJTlZBTDsKLSAgICAg ICAgaWYgKCAhaXNfZXB0ZV9wcmVzZW50KCZuZXcpICkKLSAgICAgICAgICAgICAgICBnb3RvIG91 dDsKLQotICAgICAgICBpZiAoIGNoZWNrX2ZvcmVpZ24gKQotICAgICAgICB7Ci0gICAgICAgICAg ICBzdHJ1Y3QgZG9tYWluICpmZG9tOwotCi0gICAgICAgICAgICBpZiAoICFtZm5fdmFsaWQoX21m bihuZXcubWZuKSkgKQotICAgICAgICAgICAgICAgIGdvdG8gb3V0OwotCi0gICAgICAgICAgICBy YyA9IC1FU1JDSDsKLSAgICAgICAgICAgIGZkb20gPSBwYWdlX2dldF9vd25lcihtZm5fdG9fcGFn ZShfbWZuKG5ldy5tZm4pKSk7Ci0gICAgICAgICAgICBpZiAoIGZkb20gPT0gTlVMTCApCi0gICAg ICAgICAgICAgICAgZ290byBvdXQ7Ci0KLSAgICAgICAgICAgIC8qIGdldCByZWZjb3VudCBvbiB0 aGUgcGFnZSAqLwotICAgICAgICAgICAgcmMgPSAtRUJVU1k7Ci0gICAgICAgICAgICBpZiAoICFn ZXRfcGFnZShtZm5fdG9fcGFnZShfbWZuKG5ldy5tZm4pKSwgZmRvbSkgKQotICAgICAgICAgICAg ICAgIGdvdG8gb3V0OwotICAgICAgICB9Ci0gICAgfQotCi0gICAgaWYgKCB1bmxpa2VseShwMm1f aXNfZm9yZWlnbihlbnRyeXB0ci0+c2FfcDJtdCkpICYmIGNoZWNrX2ZvcmVpZ24gKQotICAgICAg ICBvbGRtZm4gPSBlbnRyeXB0ci0+bWZuOwotCi0gICAgcDJtX2VudHJ5X21vZGlmeShwMm0sIG5l dy5zYV9wMm10LCBlbnRyeXB0ci0+c2FfcDJtdCwgbGV2ZWwpOwotCisgICAgcDJtX2VudHJ5X21v ZGlmeShwMm0sIG5ldy5zYV9wMm10LCBlbnRyeXB0ci0+c2FfcDJtdCwgX21mbihuZXcubWZuKSwK KyAgICAgICAgICAgICAgICAgICAgIF9tZm4oZW50cnlwdHItPm1mbiksIGxldmVsKTsKICAgICB3 cml0ZV9hdG9taWMoJmVudHJ5cHRyLT5lcHRlLCBuZXcuZXB0ZSk7Ci0KLSAgICBpZiAoIHVubGlr ZWx5KG9sZG1mbiAhPSBtZm5feChJTlZBTElEX01GTikpICkKLSAgICAgICAgcHV0X3BhZ2UobWZu X3RvX3BhZ2UoX21mbihvbGRtZm4pKSk7Ci0KLSAgICByYyA9IDA7Ci0KLSBvdXQ6Ci0gICAgaWYg KCByYyApCi0gICAgICAgIGdkcHJpbnRrKFhFTkxPR19FUlIsICJlcHRlIG86JSJQUkl4NjQiIG46 JSJQUkl4NjQiIHJjOiVkXG4iLAotICAgICAgICAgICAgICAgICBlbnRyeXB0ci0+ZXB0ZSwgbmV3 LmVwdGUsIHJjKTsKLSAgICByZXR1cm4gcmM7CiB9CiAKIHN0YXRpYyB2b2lkIGVwdF9wMm1fdHlw ZV90b19mbGFncyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBlcHRfZW50cnlfdCAqZW50cnksCkBA IC0zOTYsNyArMzQ0LDYgQEAgc3RhdGljIGludCBlcHRfbmV4dF9sZXZlbChzdHJ1Y3QgcDJtX2Rv bWFpbiAqcDJtLCBib29sX3QgcmVhZF9vbmx5LAogc3RhdGljIGJvb2xfdCBlcHRfaW52YWxpZGF0 ZV9lbXQoc3RydWN0IHAybV9kb21haW4gKnAybSwgbWZuX3QgbWZuLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYm9vbF90IHJlY2FsYywgaW50IGxldmVsKQogewotICAgIGludCBy YzsKICAgICBlcHRfZW50cnlfdCAqZXB0ZSA9IG1hcF9kb21haW5fcGFnZShtZm4pOwogICAgIHVu c2lnbmVkIGludCBpOwogICAgIGJvb2xfdCBjaGFuZ2VkID0gMDsKQEAgLTQxMiw4ICszNTksNyBA QCBzdGF0aWMgYm9vbF90IGVwdF9pbnZhbGlkYXRlX2VtdChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LCBtZm5fdCBtZm4sCiAgICAgICAgIGUuZW10ID0gTVRSUl9OVU1fVFlQRVM7CiAgICAgICAgIGlm ICggcmVjYWxjICkKICAgICAgICAgICAgIGUucmVjYWxjID0gMTsKLSAgICAgICAgcmMgPSBhdG9t aWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgJmVwdGVbaV0sIGUsIGxldmVsKTsKLSAgICAgICAgQVNT RVJUKHJjID09IDApOworICAgICAgICBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgJmVwdGVb aV0sIGUsIGxldmVsKTsKICAgICAgICAgY2hhbmdlZCA9IDE7CiAgICAgfQogCkBAIC00MzcsNyAr MzgzLDcgQEAgc3RhdGljIGludCBlcHRfaW52YWxpZGF0ZV9lbXRfcmFuZ2Uoc3RydWN0IHAybV9k b21haW4gKnAybSwKICAgICBlcHRfZW50cnlfdCAqdGFibGU7CiAgICAgdW5zaWduZWQgbG9uZyBn Zm5fcmVtYWluZGVyID0gZmlyc3RfZ2ZuOwogICAgIHVuc2lnbmVkIGludCBpLCBpbmRleDsKLSAg ICBpbnQgd3JjLCByYyA9IDAsIHJldCA9IEdVRVNUX1RBQkxFX01BUF9GQUlMRUQ7CisgICAgaW50 IHJjID0gMCwgcmV0ID0gR1VFU1RfVEFCTEVfTUFQX0ZBSUxFRDsKIAogICAgIHRhYmxlID0gbWFw X2RvbWFpbl9wYWdlKHBhZ2V0YWJsZV9nZXRfbWZuKHAybV9nZXRfcGFnZXRhYmxlKHAybSkpKTsK ICAgICBmb3IgKCBpID0gcDJtLT5lcHQud2w7IGkgPiB0YXJnZXQ7IC0taSApCkBAIC00NjMsOCAr NDA5LDcgQEAgc3RhdGljIGludCBlcHRfaW52YWxpZGF0ZV9lbXRfcmFuZ2Uoc3RydWN0IHAybV9k b21haW4gKnAybSwKICAgICAgICAgICAgIHJjID0gLUVOT01FTTsKICAgICAgICAgICAgIGdvdG8g b3V0OwogICAgICAgICB9Ci0gICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJt LCAmdGFibGVbaW5kZXhdLCBzcGxpdF9lcHRfZW50cnksIGkpOwotICAgICAgICBBU1NFUlQod3Jj ID09IDApOworICAgICAgICBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgJnRhYmxlW2luZGV4 XSwgc3BsaXRfZXB0X2VudHJ5LCBpKTsKIAogICAgICAgICBmb3IgKCA7IGkgPiB0YXJnZXQ7IC0t aSApCiAgICAgICAgICAgICBpZiAoICFlcHRfbmV4dF9sZXZlbChwMm0sIDEsICZ0YWJsZSwgJmdm bl9yZW1haW5kZXIsIGkpICkKQEAgLTQ4Myw4ICs0MjgsNyBAQCBzdGF0aWMgaW50IGVwdF9pbnZh bGlkYXRlX2VtdF9yYW5nZShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgICAgICB7CiAgICAg ICAgICAgICBlLmVtdCA9IE1UUlJfTlVNX1RZUEVTOwogICAgICAgICAgICAgZS5yZWNhbGMgPSAx OwotICAgICAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZ0YWJsZVtp bmRleF0sIGUsIHRhcmdldCk7Ci0gICAgICAgICAgICBBU1NFUlQod3JjID09IDApOworICAgICAg ICAgICAgYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZ0YWJsZVtpbmRleF0sIGUsIHRhcmdl dCk7CiAgICAgICAgICAgICByYyA9IDE7CiAgICAgICAgIH0KICAgICB9CkBAIC01MTMsNyArNDU3 LDcgQEAgc3RhdGljIGludCByZXNvbHZlX21pc2NvbmZpZyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LCB1bnNpZ25lZCBsb25nIGdmbikKICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwgPSBlcHQtPndsOwog ICAgIHVuc2lnbmVkIGxvbmcgbWZuID0gZXB0LT5tZm47CiAgICAgZXB0X2VudHJ5X3QgKmVwdGU7 Ci0gICAgaW50IHdyYywgcmMgPSAwOworICAgIGludCByYyA9IDA7CiAKICAgICBpZiAoICFtZm4g KQogICAgICAgICByZXR1cm4gMDsKQEAgLTU1Nyw4ICs1MDEsNyBAQCBzdGF0aWMgaW50IHJlc29s dmVfbWlzY29uZmlnKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuKQog ICAgICAgICAgICAgICAgICAgICAgICAgZXB0X3AybV90eXBlX3RvX2ZsYWdzKHAybSwgJmUsIGUu c2FfcDJtdCwgZS5hY2Nlc3MpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgICAgIGUucmVjYWxjID0gMDsKLSAgICAgICAgICAgICAgICAgICAgd3JjID0gYXRvbWljX3dy aXRlX2VwdF9lbnRyeShwMm0sICZlcHRlW2ldLCBlLCBsZXZlbCk7Ci0gICAgICAgICAgICAgICAg ICAgIEFTU0VSVCh3cmMgPT0gMCk7CisgICAgICAgICAgICAgICAgICAgIGF0b21pY193cml0ZV9l cHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwogICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIGVsc2UKQEAgLTU5Myw4ICs1MzYsNyBAQCBzdGF0aWMg aW50IHJlc29sdmVfbWlzY29uZmlnKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxv bmcgZ2ZuKQogICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKCBlcHRf c3BsaXRfc3VwZXJfcGFnZShwMm0sICZlLCBsZXZlbCwgbGV2ZWwgLSAxKSApCiAgICAgICAgICAg ICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9l cHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwotICAgICAgICAgICAgICAgICAgICAg ICAgQVNTRVJUKHdyYyA9PSAwKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGF0b21pY193cml0 ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwogICAgICAgICAgICAgICAgICAg ICAgICAgdW5tYXBfZG9tYWluX3BhZ2UoZXB0ZSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBt Zm4gPSBlLm1mbjsKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtNjA4LDgg KzU1MCw3IEBAIHN0YXRpYyBpbnQgcmVzb2x2ZV9taXNjb25maWcoc3RydWN0IHAybV9kb21haW4g KnAybSwgdW5zaWduZWQgbG9uZyBnZm4pCiAgICAgICAgICAgICAgICAgZS5yZWNhbGMgPSAwOwog ICAgICAgICAgICAgICAgIGlmICggcmVjYWxjICYmIHAybV9pc19jaGFuZ2VhYmxlKGUuc2FfcDJt dCkgKQogICAgICAgICAgICAgICAgICAgICBlcHRfcDJtX3R5cGVfdG9fZmxhZ3MocDJtLCAmZSwg ZS5zYV9wMm10LCBlLmFjY2Vzcyk7Ci0gICAgICAgICAgICAgICAgd3JjID0gYXRvbWljX3dyaXRl X2VwdF9lbnRyeShwMm0sICZlcHRlW2ldLCBlLCBsZXZlbCk7Ci0gICAgICAgICAgICAgICAgQVNT RVJUKHdyYyA9PSAwKTsKKyAgICAgICAgICAgICAgICBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAy bSwgJmVwdGVbaV0sIGUsIGxldmVsKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgcmMg PSAxOwpAQCAtNjIzLDggKzU2NCw3IEBAIHN0YXRpYyBpbnQgcmVzb2x2ZV9taXNjb25maWcoc3Ry dWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4pCiAgICAgICAgICAgICBzbXBf d21iKCk7CiAgICAgICAgICAgICBlLmVtdCA9IDA7CiAgICAgICAgICAgICBlLnJlY2FsYyA9IDA7 Ci0gICAgICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgJmVwdGVbaV0s IGUsIGxldmVsKTsKLSAgICAgICAgICAgIEFTU0VSVCh3cmMgPT0gMCk7CisgICAgICAgICAgICBh dG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgJmVwdGVbaV0sIGUsIGxldmVsKTsKICAgICAgICAg ICAgIHVubWFwX2RvbWFpbl9wYWdlKGVwdGUpOwogICAgICAgICAgICAgcmMgPSAxOwogICAgICAg ICB9CkBAIC03ODQsOCArNzI0LDcgQEAgZXB0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAq cDJtLCBnZm5fdCBnZm5fLCBtZm5fdCBtZm4sCiAKICAgICAgICAgLyogbm93IGluc3RhbGwgdGhl IG5ld2x5IHNwbGl0IGVwdCBzdWItdHJlZSAqLwogICAgICAgICAvKiBOQjogcGxlYXNlIG1ha2Ug c3VyZSBkb21pYW4gaXMgcGF1c2VkIGFuZCBubyBpbi1mbHkgVlQtZCBETUEuICovCi0gICAgICAg IHJjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sIGVwdF9lbnRyeSwgc3BsaXRfZXB0X2Vu dHJ5LCBpKTsKLSAgICAgICAgQVNTRVJUKHJjID09IDApOworICAgICAgICBhdG9taWNfd3JpdGVf ZXB0X2VudHJ5KHAybSwgZXB0X2VudHJ5LCBzcGxpdF9lcHRfZW50cnksIGkpOwogCiAgICAgICAg IC8qIHRoZW4gbW92ZSB0byB0aGUgbGV2ZWwgd2Ugd2FudCB0byBtYWtlIHJlYWwgY2hhbmdlcyAq LwogICAgICAgICBmb3IgKCA7IGkgPiB0YXJnZXQ7IGktLSApCkBAIC04MzEsMTggKzc3MCwxMyBA QCBlcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90 IG1mbiwKICAgICAgICAgbmV3X2VudHJ5LnN1cHByZXNzX3ZlID0gaXNfZXB0ZV92YWxpZCgmb2xk X2VudHJ5KSA/CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvbGRfZW50cnku c3VwcHJlc3NfdmUgOiAxOwogCi0gICAgcmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwg ZXB0X2VudHJ5LCBuZXdfZW50cnksIHRhcmdldCk7Ci0gICAgaWYgKCB1bmxpa2VseShyYykgKQot ICAgICAgICBvbGRfZW50cnkuZXB0ZSA9IDA7Ci0gICAgZWxzZQotICAgIHsKLSAgICAgICAgZW50 cnlfd3JpdHRlbiA9IDE7CisgICAgYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sIGVwdF9lbnRy eSwgbmV3X2VudHJ5LCB0YXJnZXQpOworICAgIGVudHJ5X3dyaXR0ZW4gPSAxOwogCi0gICAgICAg IGlmICggcDJtdCAhPSBwMm1faW52YWxpZCAmJgotICAgICAgICAgICAgIChnZm4gKyAoMVVMIDw8 IG9yZGVyKSAtIDEgPiBwMm0tPm1heF9tYXBwZWRfcGZuKSApCi0gICAgICAgICAgICAvKiBUcmFj ayB0aGUgaGlnaGVzdCBnZm4gZm9yIHdoaWNoIHdlIGhhdmUgZXZlciBoYWQgYSB2YWxpZCBtYXBw aW5nICovCi0gICAgICAgICAgICBwMm0tPm1heF9tYXBwZWRfcGZuID0gZ2ZuICsgKDFVTCA8PCBv cmRlcikgLSAxOwotICAgIH0KKyAgICBpZiAoIHAybXQgIT0gcDJtX2ludmFsaWQgJiYKKyAgICAg ICAgIChnZm4gKyAoMVVMIDw8IG9yZGVyKSAtIDEgPiBwMm0tPm1heF9tYXBwZWRfcGZuKSApCisg ICAgICAgIC8qIFRyYWNrIHRoZSBoaWdoZXN0IGdmbiBmb3Igd2hpY2ggd2UgaGF2ZSBldmVyIGhh ZCBhIHZhbGlkIG1hcHBpbmcgKi8KKyAgICAgICAgcDJtLT5tYXhfbWFwcGVkX3BmbiA9IGdmbiAr ICgxVUwgPDwgb3JkZXIpIC0gMTsKIAogb3V0OgogICAgIGlmICggbmVlZHNfc3luYyApCmRpZmYg LS1naXQgYS94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMgYi94ZW4vYXJjaC94ODYvbW0vcDJtLXB0 LmMKaW5kZXggYzg5MDVhNTU5Ny4uNjIzODA0M2FhNiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2 L21tL3AybS1wdC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYwpAQCAtNTIzLDEzICs1 MjMsNiBAQCBwMm1fcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdm bl8sIG1mbl90IG1mbiwKICAgICAgICAgX190cmFjZV92YXIoVFJDX01FTV9TRVRfUDJNX0VOVFJZ LCAwLCBzaXplb2YodCksICZ0KTsKICAgICB9CiAKLSAgICBpZiAoIHVubGlrZWx5KHAybV9pc19m b3JlaWduKHAybXQpKSApCi0gICAgewotICAgICAgICAvKiBodm0gZml4bWU6IGZvcmVpZ24gdHlw ZXMgYXJlIG9ubHkgc3VwcG9ydGVkIG9uIGVwdCBhdCBwcmVzZW50ICovCi0gICAgICAgIGdkcHJp bnRrKFhFTkxPR19XQVJOSU5HLCAiVW5pbXBsZW1lbnRlZCBmb3JlaWduIHAybSB0eXBlLlxuIik7 Ci0gICAgICAgIHJldHVybiAtRUlOVkFMOwotICAgIH0KLQogICAgIC8qIENhcnJ5IG91dCBhbnkg ZXZlbnR1YWxseSBwZW5kaW5nIGVhcmxpZXIgY2hhbmdlcyBmaXJzdC4gKi8KICAgICByYyA9IGRv X3JlY2FsYyhwMm0sIGdmbik7CiAgICAgaWYgKCByYyA8IDAgKQpkaWZmIC0tZ2l0IGEveGVuL2Fy Y2gveDg2L21tL3NoYWRvdy9jb21tb24uYyBiL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9u LmMKaW5kZXggYjIxMGM3NDQ3ZS4uN2YwZTA1MDQ1ZSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2 L21tL3NoYWRvdy9jb21tb24uYworKysgYi94ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5j CkBAIC0zMTg2LDcgKzMxODYsOCBAQCBzaGFkb3dfd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBkb21h aW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuLAogICAgICAgICAgc2hfdW5zaGFkb3dfZm9yX3AybV9j aGFuZ2UoZCwgZ2ZuLCBwLCBuZXcsIGxldmVsKTsKIAogICAgIHAybV9lbnRyeV9tb2RpZnkocDJt X2dldF9ob3N0cDJtKGQpLCBwMm1fZmxhZ3NfdG9fdHlwZShsMWVfZ2V0X2ZsYWdzKG5ldykpLAot ICAgICAgICAgICAgICAgICAgICAgcDJtX2ZsYWdzX3RvX3R5cGUobDFlX2dldF9mbGFncygqcCkp LCBsZXZlbCk7CisgICAgICAgICAgICAgICAgICAgICBwMm1fZmxhZ3NfdG9fdHlwZShsMWVfZ2V0 X2ZsYWdzKCpwKSksIGwxZV9nZXRfbWZuKG5ldyksCisgICAgICAgICAgICAgICAgICAgICBsMWVf Z2V0X21mbigqcCksIGxldmVsKTsKIAogICAgIC8qIFVwZGF0ZSB0aGUgZW50cnkgd2l0aCBuZXcg Y29udGVudCAqLwogICAgIHNhZmVfd3JpdGVfcHRlKHAsIG5ldyk7CmRpZmYgLS1naXQgYS94ZW4v aW5jbHVkZS9hc20teDg2L3AybS5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaAppbmRleCA4 MzRkNDlkMmQ0Li4xY2M4YWNiM2ZlIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L3Ay bS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKQEAgLTkzMyw5ICs5MzMsMTIgQEAg c3RydWN0IGh2bV9pb3JlcV9zZXJ2ZXIgKnAybV9nZXRfaW9yZXFfc2VydmVyKHN0cnVjdCBkb21h aW4gKmQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5z aWduZWQgaW50ICpmbGFncyk7CiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBwMm1fZW50cnlfbW9kaWZ5 KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHAybV90eXBlX3QgbnQsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBwMm1fdHlwZV90IG90LCB1bnNpZ25lZCBpbnQgbGV2ZWwpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwMm1fdHlwZV90IG90LCBtZm5fdCBu Zm4sIG1mbl90IG9mbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2ln bmVkIGludCBsZXZlbCkKIHsKLSAgICBpZiAoIGxldmVsICE9IDEgfHwgbnQgPT0gb3QgKQorICAg IHN0cnVjdCBwYWdlX2luZm8gKnBnOworCisgICAgaWYgKCBsZXZlbCAhPSAxIHx8IChudCA9PSBv dCAmJiBtZm5fZXEobmZuLCBvZm4pKSApCiAgICAgICAgIHJldHVybjsKIAogICAgIHN3aXRjaCAo IG50ICkKQEAgLTk0OCw2ICs5NTEsMTcgQEAgc3RhdGljIGlubGluZSB2b2lkIHAybV9lbnRyeV9t b2RpZnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgcDJtX3R5cGVfdCBudCwKICAgICAgICAgcDJt LT5pb3JlcS5lbnRyeV9jb3VudCsrOwogICAgICAgICBicmVhazsKIAorICAgIGNhc2UgcDJtX21h cF9mb3JlaWduOgorICAgICAgICBwZyA9IG1mbl90b19wYWdlKG5mbik7CisKKyAgICAgICAgaWYg KCAhcGcgfHwgIXBhZ2VfZ2V0X293bmVyX2FuZF9yZWZlcmVuY2UocGcpICkKKyAgICAgICAgewor ICAgICAgICAgICAgQVNTRVJUX1VOUkVBQ0hBQkxFKCk7CisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKworICAgICAgICBicmVhazsKKwogICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFr OwogICAgIH0KQEAgLTk1OSw2ICs5NzMsMTggQEAgc3RhdGljIGlubGluZSB2b2lkIHAybV9lbnRy eV9tb2RpZnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgcDJtX3R5cGVfdCBudCwKICAgICAgICAg cDJtLT5pb3JlcS5lbnRyeV9jb3VudC0tOwogICAgICAgICBicmVhazsKIAorICAgIGNhc2UgcDJt X21hcF9mb3JlaWduOgorICAgICAgICBwZyA9IG1mbl90b19wYWdlKG9mbik7CisKKyAgICAgICAg aWYgKCAhcGcgKQorICAgICAgICB7CisgICAgICAgICAgICBBU1NFUlRfVU5SRUFDSEFCTEUoKTsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBwdXRfcGFnZShwZyk7CisK KyAgICAgICAgYnJlYWs7CisKICAgICBkZWZhdWx0OgogICAgICAgICBicmVhazsKICAgICB9Ci0t IAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpo dHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs