From: Roger Pau Monne Subject: [PATCH v2 6/7] x86/mm: handle foreign mappings in p2m_entry_modify Date: Mon, 11 Feb 2019 18:46:41 +0100 Message-ID: <20190211174642.38046-7-roger.pau@citrix.com> References: <20190211174642.38046-1-roger.pau@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 1gtFg9-00048h-DB for xen-devel@lists.xenproject.org; Mon, 11 Feb 2019 17:47:37 +0000 In-Reply-To: <20190211174642.38046-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 OiBUaW0gRGVlZ2FuIDx0aW1AeGVuLm9yZz4KLS0tCkNoYW5nZXMgc2luY2UgdjE6CiAtIFNpbXBs eSBjb2RlIHNpbmNlIG1mbl90b19wYWdlIGNhbm5vdCByZXR1cm4gTlVMTC4KIC0gQ2hlY2sgaWYg dGhlIG1mbiBpcyB2YWxpZCBiZWZvcmUgZ2V0dGluZy9kcm9wcGluZyB0aGUgcGFnZSByZWZlcmVu Y2UuCiAtIFVzZSBCVUdfT04gaW5zdGVhZCBvZiBBU1NFUlRzLCBzaW5jZSBnZXR0aW5nIHRoZSBy ZWZlcmVuY2UgY291bnRpbmcKICAgd3JvbmcgaXMgbW9yZSBkYW5nZXJvdXMgdGhhbiBhIERvUy4K LS0tCiB4ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jICAgICAgIHwgICAzICstCiB4ZW4vYXJjaC94 ODYvbW0vcDJtLWVwdC5jICAgICAgIHwgMTA4ICsrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiB4ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMgICAgICAgIHwgICA3IC0tLQogeGVuL2FyY2gv eDg2L21tL3NoYWRvdy9jb21tb24uYyB8ICAgMyArLQogeGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0u aCAgICAgICB8ICAxNyArKysrLQogNSBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCA5 OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jIGIv eGVuL2FyY2gveDg2L21tL2hhcC9oYXAuYwppbmRleCBkYzQ2ZDVlMTRmLi40ZjUyNjM5YmU1IDEw MDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9t bS9oYXAvaGFwLmMKQEAgLTczNSw3ICs3MzUsOCBAQCBoYXBfd3JpdGVfcDJtX2VudHJ5KHN0cnVj dCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuLCBsMV9wZ2VudHJ5X3QgKnAsCiAgICAgfQog CiAgICAgcDJtX2VudHJ5X21vZGlmeShwMm1fZ2V0X2hvc3RwMm0oZCksIHAybV9mbGFnc190b190 eXBlKGwxZV9nZXRfZmxhZ3MobmV3KSksCi0gICAgICAgICAgICAgICAgICAgICBwMm1fZmxhZ3Nf dG9fdHlwZShvbGRfZmxhZ3MpLCBsZXZlbCk7CisgICAgICAgICAgICAgICAgICAgICBwMm1fZmxh Z3NfdG9fdHlwZShvbGRfZmxhZ3MpLCBsMWVfZ2V0X21mbihuZXcpLAorICAgICAgICAgICAgICAg ICAgICAgbDFlX2dldF9tZm4oKnApLCBsZXZlbCk7CiAKICAgICBzYWZlX3dyaXRlX3B0ZShwLCBu ZXcpOwogICAgIGlmICggb2xkX2ZsYWdzICYgX1BBR0VfUFJFU0VOVCApCmRpZmYgLS1naXQgYS94 ZW4vYXJjaC94ODYvbW0vcDJtLWVwdC5jIGIveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYwppbmRl eCAwZWNlNjYwOGNiLi4yYjBjM2FiMjY1IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vcDJt LWVwdC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMKQEAgLTQ1LDY1ICs0NSwxMyBA QCBzdGF0aWMgaW5saW5lIGJvb2xfdCBpc19lcHRlX3ZhbGlkKGVwdF9lbnRyeV90ICplKQogICAg IHJldHVybiAoKGUtPmVwdGUgJiB+KDF1bCA8PCA2MykpICE9IDAgJiYgZS0+c2FfcDJtdCAhPSBw Mm1faW52YWxpZCk7CiB9CiAKLS8qIHJldHVybnMgOiAwIGZvciBzdWNjZXNzLCAtZXJybm8gb3Ro ZXJ3aXNlICovCi1zdGF0aWMgaW50IGF0b21pY193cml0ZV9lcHRfZW50cnkoc3RydWN0IHAybV9k b21haW4gKnAybSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlcHRfZW50cnlf dCAqZW50cnlwdHIsIGVwdF9lbnRyeV90IG5ldywKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpbnQgbGV2ZWwpCitzdGF0aWMgdm9pZCBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHN0 cnVjdCBwMm1fZG9tYWluICpwMm0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGVwdF9lbnRyeV90ICplbnRyeXB0ciwgZXB0X2VudHJ5X3QgbmV3LAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpbnQgbGV2ZWwpCiB7Ci0gICAgaW50IHJjOwotICAgIHVuc2ln bmVkIGxvbmcgb2xkbWZuID0gbWZuX3goSU5WQUxJRF9NRk4pOwotICAgIGJvb2xfdCBjaGVja19m b3JlaWduID0gKG5ldy5tZm4gIT0gZW50cnlwdHItPm1mbiB8fAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5ldy5zYV9wMm10ICE9IGVudHJ5cHRyLT5zYV9wMm10KTsKLQotICAgIGlmICgg bGV2ZWwgKQotICAgIHsKLSAgICAgICAgQVNTRVJUKCFpc19lcHRlX3N1cGVycGFnZSgmbmV3KSB8 fCAhcDJtX2lzX2ZvcmVpZ24obmV3LnNhX3AybXQpKTsKLSAgICAgICAgd3JpdGVfYXRvbWljKCZl bnRyeXB0ci0+ZXB0ZSwgbmV3LmVwdGUpOwotICAgICAgICByZXR1cm4gMDsKLSAgICB9Ci0KLSAg ICBpZiAoIHVubGlrZWx5KHAybV9pc19mb3JlaWduKG5ldy5zYV9wMm10KSkgKQotICAgIHsKLSAg ICAgICAgcmMgPSAtRUlOVkFMOwotICAgICAgICBpZiAoICFpc19lcHRlX3ByZXNlbnQoJm5ldykg KQotICAgICAgICAgICAgICAgIGdvdG8gb3V0OwotCi0gICAgICAgIGlmICggY2hlY2tfZm9yZWln biApCi0gICAgICAgIHsKLSAgICAgICAgICAgIHN0cnVjdCBkb21haW4gKmZkb207Ci0KLSAgICAg ICAgICAgIGlmICggIW1mbl92YWxpZChfbWZuKG5ldy5tZm4pKSApCi0gICAgICAgICAgICAgICAg Z290byBvdXQ7Ci0KLSAgICAgICAgICAgIHJjID0gLUVTUkNIOwotICAgICAgICAgICAgZmRvbSA9 IHBhZ2VfZ2V0X293bmVyKG1mbl90b19wYWdlKF9tZm4obmV3Lm1mbikpKTsKLSAgICAgICAgICAg IGlmICggZmRvbSA9PSBOVUxMICkKLSAgICAgICAgICAgICAgICBnb3RvIG91dDsKLQotICAgICAg ICAgICAgLyogZ2V0IHJlZmNvdW50IG9uIHRoZSBwYWdlICovCi0gICAgICAgICAgICByYyA9IC1F QlVTWTsKLSAgICAgICAgICAgIGlmICggIWdldF9wYWdlKG1mbl90b19wYWdlKF9tZm4obmV3Lm1m bikpLCBmZG9tKSApCi0gICAgICAgICAgICAgICAgZ290byBvdXQ7Ci0gICAgICAgIH0KLSAgICB9 Ci0KLSAgICBpZiAoIHVubGlrZWx5KHAybV9pc19mb3JlaWduKGVudHJ5cHRyLT5zYV9wMm10KSkg JiYgY2hlY2tfZm9yZWlnbiApCi0gICAgICAgIG9sZG1mbiA9IGVudHJ5cHRyLT5tZm47Ci0KLSAg ICBwMm1fZW50cnlfbW9kaWZ5KHAybSwgbmV3LnNhX3AybXQsIGVudHJ5cHRyLT5zYV9wMm10LCBs ZXZlbCk7Ci0KKyAgICBwMm1fZW50cnlfbW9kaWZ5KHAybSwgbmV3LnNhX3AybXQsIGVudHJ5cHRy LT5zYV9wMm10LCBfbWZuKG5ldy5tZm4pLAorICAgICAgICAgICAgICAgICAgICAgX21mbihlbnRy eXB0ci0+bWZuKSwgbGV2ZWwpOwogICAgIHdyaXRlX2F0b21pYygmZW50cnlwdHItPmVwdGUsIG5l dy5lcHRlKTsKLQotICAgIGlmICggdW5saWtlbHkob2xkbWZuICE9IG1mbl94KElOVkFMSURfTUZO KSkgKQotICAgICAgICBwdXRfcGFnZShtZm5fdG9fcGFnZShfbWZuKG9sZG1mbikpKTsKLQotICAg IHJjID0gMDsKLQotIG91dDoKLSAgICBpZiAoIHJjICkKLSAgICAgICAgZ2RwcmludGsoWEVOTE9H X0VSUiwgImVwdGUgbzolIlBSSXg2NCIgbjolIlBSSXg2NCIgcmM6JWRcbiIsCi0gICAgICAgICAg ICAgICAgIGVudHJ5cHRyLT5lcHRlLCBuZXcuZXB0ZSwgcmMpOwotICAgIHJldHVybiByYzsKIH0K IAogc3RhdGljIHZvaWQgZXB0X3AybV90eXBlX3RvX2ZsYWdzKHN0cnVjdCBwMm1fZG9tYWluICpw Mm0sIGVwdF9lbnRyeV90ICplbnRyeSwKQEAgLTM5Niw3ICszNDQsNiBAQCBzdGF0aWMgaW50IGVw dF9uZXh0X2xldmVsKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGJvb2xfdCByZWFkX29ubHksCiBz dGF0aWMgYm9vbF90IGVwdF9pbnZhbGlkYXRlX2VtdChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBt Zm5fdCBtZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sX3QgcmVjYWxj LCBpbnQgbGV2ZWwpCiB7Ci0gICAgaW50IHJjOwogICAgIGVwdF9lbnRyeV90ICplcHRlID0gbWFw X2RvbWFpbl9wYWdlKG1mbik7CiAgICAgdW5zaWduZWQgaW50IGk7CiAgICAgYm9vbF90IGNoYW5n ZWQgPSAwOwpAQCAtNDEyLDggKzM1OSw3IEBAIHN0YXRpYyBib29sX3QgZXB0X2ludmFsaWRhdGVf ZW10KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIG1mbl90IG1mbiwKICAgICAgICAgZS5lbXQgPSBN VFJSX05VTV9UWVBFUzsKICAgICAgICAgaWYgKCByZWNhbGMgKQogICAgICAgICAgICAgZS5yZWNh bGMgPSAxOwotICAgICAgICByYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtp XSwgZSwgbGV2ZWwpOwotICAgICAgICBBU1NFUlQocmMgPT0gMCk7CisgICAgICAgIGF0b21pY193 cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwogICAgICAgICBjaGFuZ2Vk ID0gMTsKICAgICB9CiAKQEAgLTQzNyw3ICszODMsNyBAQCBzdGF0aWMgaW50IGVwdF9pbnZhbGlk YXRlX2VtdF9yYW5nZShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgIGVwdF9lbnRyeV90ICp0 YWJsZTsKICAgICB1bnNpZ25lZCBsb25nIGdmbl9yZW1haW5kZXIgPSBmaXJzdF9nZm47CiAgICAg dW5zaWduZWQgaW50IGksIGluZGV4OwotICAgIGludCB3cmMsIHJjID0gMCwgcmV0ID0gR1VFU1Rf VEFCTEVfTUFQX0ZBSUxFRDsKKyAgICBpbnQgcmMgPSAwLCByZXQgPSBHVUVTVF9UQUJMRV9NQVBf RkFJTEVEOwogCiAgICAgdGFibGUgPSBtYXBfZG9tYWluX3BhZ2UocGFnZXRhYmxlX2dldF9tZm4o cDJtX2dldF9wYWdldGFibGUocDJtKSkpOwogICAgIGZvciAoIGkgPSBwMm0tPmVwdC53bDsgaSA+ IHRhcmdldDsgLS1pICkKQEAgLTQ2Myw4ICs0MDksNyBAQCBzdGF0aWMgaW50IGVwdF9pbnZhbGlk YXRlX2VtdF9yYW5nZShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgICAgICAgICAgcmMgPSAt RU5PTUVNOwogICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgICAgIH0KLSAgICAgICAgd3JjID0g YXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZ0YWJsZVtpbmRleF0sIHNwbGl0X2VwdF9lbnRy eSwgaSk7Ci0gICAgICAgIEFTU0VSVCh3cmMgPT0gMCk7CisgICAgICAgIGF0b21pY193cml0ZV9l cHRfZW50cnkocDJtLCAmdGFibGVbaW5kZXhdLCBzcGxpdF9lcHRfZW50cnksIGkpOwogCiAgICAg ICAgIGZvciAoIDsgaSA+IHRhcmdldDsgLS1pICkKICAgICAgICAgICAgIGlmICggIWVwdF9uZXh0 X2xldmVsKHAybSwgMSwgJnRhYmxlLCAmZ2ZuX3JlbWFpbmRlciwgaSkgKQpAQCAtNDgzLDggKzQy OCw3IEBAIHN0YXRpYyBpbnQgZXB0X2ludmFsaWRhdGVfZW10X3JhbmdlKHN0cnVjdCBwMm1fZG9t YWluICpwMm0sCiAgICAgICAgIHsKICAgICAgICAgICAgIGUuZW10ID0gTVRSUl9OVU1fVFlQRVM7 CiAgICAgICAgICAgICBlLnJlY2FsYyA9IDE7Ci0gICAgICAgICAgICB3cmMgPSBhdG9taWNfd3Jp dGVfZXB0X2VudHJ5KHAybSwgJnRhYmxlW2luZGV4XSwgZSwgdGFyZ2V0KTsKLSAgICAgICAgICAg IEFTU0VSVCh3cmMgPT0gMCk7CisgICAgICAgICAgICBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAy bSwgJnRhYmxlW2luZGV4XSwgZSwgdGFyZ2V0KTsKICAgICAgICAgICAgIHJjID0gMTsKICAgICAg ICAgfQogICAgIH0KQEAgLTUxMyw3ICs0NTcsNyBAQCBzdGF0aWMgaW50IHJlc29sdmVfbWlzY29u ZmlnKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuKQogICAgIHVuc2ln bmVkIGludCBsZXZlbCA9IGVwdC0+d2w7CiAgICAgdW5zaWduZWQgbG9uZyBtZm4gPSBlcHQtPm1m bjsKICAgICBlcHRfZW50cnlfdCAqZXB0ZTsKLSAgICBpbnQgd3JjLCByYyA9IDA7CisgICAgaW50 IHJjID0gMDsKIAogICAgIGlmICggIW1mbiApCiAgICAgICAgIHJldHVybiAwOwpAQCAtNTU3LDgg KzUwMSw3IEBAIHN0YXRpYyBpbnQgcmVzb2x2ZV9taXNjb25maWcoc3RydWN0IHAybV9kb21haW4g KnAybSwgdW5zaWduZWQgbG9uZyBnZm4pCiAgICAgICAgICAgICAgICAgICAgICAgICBlcHRfcDJt X3R5cGVfdG9fZmxhZ3MocDJtLCAmZSwgZS5zYV9wMm10LCBlLmFjY2Vzcyk7CiAgICAgICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgZS5yZWNhbGMgPSAwOwotICAgICAgICAg ICAgICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgJmVwdGVbaV0sIGUs IGxldmVsKTsKLSAgICAgICAgICAgICAgICAgICAgQVNTRVJUKHdyYyA9PSAwKTsKKyAgICAgICAg ICAgICAgICAgICAgYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZlcHRlW2ldLCBlLCBsZXZl bCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICAgICAgZWxzZQpA QCAtNTkzLDggKzUzNiw3IEBAIHN0YXRpYyBpbnQgcmVzb2x2ZV9taXNjb25maWcoc3RydWN0IHAy bV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4pCiAgICAgICAgICAgICAgICAgewogICAg ICAgICAgICAgICAgICAgICBpZiAoIGVwdF9zcGxpdF9zdXBlcl9wYWdlKHAybSwgJmUsIGxldmVs LCBsZXZlbCAtIDEpICkKICAgICAgICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAg ICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZlcHRlW2ldLCBlLCBsZXZl bCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQod3JjID09IDApOworICAgICAgICAg ICAgICAgICAgICAgICAgYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZlcHRlW2ldLCBlLCBs ZXZlbCk7CiAgICAgICAgICAgICAgICAgICAgICAgICB1bm1hcF9kb21haW5fcGFnZShlcHRlKTsK ICAgICAgICAgICAgICAgICAgICAgICAgIG1mbiA9IGUubWZuOwogICAgICAgICAgICAgICAgICAg ICAgICAgY29udGludWU7CkBAIC02MDgsOCArNTUwLDcgQEAgc3RhdGljIGludCByZXNvbHZlX21p c2NvbmZpZyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAg ICAgICAgICAgICBlLnJlY2FsYyA9IDA7CiAgICAgICAgICAgICAgICAgaWYgKCByZWNhbGMgJiYg cDJtX2lzX2NoYW5nZWFibGUoZS5zYV9wMm10KSApCiAgICAgICAgICAgICAgICAgICAgIGVwdF9w Mm1fdHlwZV90b19mbGFncyhwMm0sICZlLCBlLnNhX3AybXQsIGUuYWNjZXNzKTsKLSAgICAgICAg ICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgJmVwdGVbaV0sIGUsIGxl dmVsKTsKLSAgICAgICAgICAgICAgICBBU1NFUlQod3JjID09IDApOworICAgICAgICAgICAgICAg IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwogICAgICAg ICAgICAgfQogCiAgICAgICAgICAgICByYyA9IDE7CkBAIC02MjMsOCArNTY0LDcgQEAgc3RhdGlj IGludCByZXNvbHZlX21pc2NvbmZpZyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBs b25nIGdmbikKICAgICAgICAgICAgIHNtcF93bWIoKTsKICAgICAgICAgICAgIGUuZW10ID0gMDsK ICAgICAgICAgICAgIGUucmVjYWxjID0gMDsKLSAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0 ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwotICAgICAgICAgICAgQVNTRVJU KHdyYyA9PSAwKTsKKyAgICAgICAgICAgIGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0 ZVtpXSwgZSwgbGV2ZWwpOwogICAgICAgICAgICAgdW5tYXBfZG9tYWluX3BhZ2UoZXB0ZSk7CiAg ICAgICAgICAgICByYyA9IDE7CiAgICAgICAgIH0KQEAgLTc4NCw4ICs3MjQsNyBAQCBlcHRfc2V0 X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwKIAog ICAgICAgICAvKiBub3cgaW5zdGFsbCB0aGUgbmV3bHkgc3BsaXQgZXB0IHN1Yi10cmVlICovCiAg ICAgICAgIC8qIE5COiBwbGVhc2UgbWFrZSBzdXJlIGRvbWlhbiBpcyBwYXVzZWQgYW5kIG5vIGlu LWZseSBWVC1kIERNQS4gKi8KLSAgICAgICAgcmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAy bSwgZXB0X2VudHJ5LCBzcGxpdF9lcHRfZW50cnksIGkpOwotICAgICAgICBBU1NFUlQocmMgPT0g MCk7CisgICAgICAgIGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCBlcHRfZW50cnksIHNwbGl0 X2VwdF9lbnRyeSwgaSk7CiAKICAgICAgICAgLyogdGhlbiBtb3ZlIHRvIHRoZSBsZXZlbCB3ZSB3 YW50IHRvIG1ha2UgcmVhbCBjaGFuZ2VzICovCiAgICAgICAgIGZvciAoIDsgaSA+IHRhcmdldDsg aS0tICkKQEAgLTgzMSwxOCArNzcwLDEzIEBAIGVwdF9zZXRfZW50cnkoc3RydWN0IHAybV9kb21h aW4gKnAybSwgZ2ZuX3QgZ2ZuXywgbWZuX3QgbWZuLAogICAgICAgICBuZXdfZW50cnkuc3VwcHJl c3NfdmUgPSBpc19lcHRlX3ZhbGlkKCZvbGRfZW50cnkpID8KICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG9sZF9lbnRyeS5zdXBwcmVzc192ZSA6IDE7CiAKLSAgICByYyA9IGF0 b21pY193cml0ZV9lcHRfZW50cnkocDJtLCBlcHRfZW50cnksIG5ld19lbnRyeSwgdGFyZ2V0KTsK LSAgICBpZiAoIHVubGlrZWx5KHJjKSApCi0gICAgICAgIG9sZF9lbnRyeS5lcHRlID0gMDsKLSAg ICBlbHNlCi0gICAgewotICAgICAgICBlbnRyeV93cml0dGVuID0gMTsKKyAgICBhdG9taWNfd3Jp dGVfZXB0X2VudHJ5KHAybSwgZXB0X2VudHJ5LCBuZXdfZW50cnksIHRhcmdldCk7CisgICAgZW50 cnlfd3JpdHRlbiA9IDE7CiAKLSAgICAgICAgaWYgKCBwMm10ICE9IHAybV9pbnZhbGlkICYmCi0g ICAgICAgICAgICAgKGdmbiArICgxVUwgPDwgb3JkZXIpIC0gMSA+IHAybS0+bWF4X21hcHBlZF9w Zm4pICkKLSAgICAgICAgICAgIC8qIFRyYWNrIHRoZSBoaWdoZXN0IGdmbiBmb3Igd2hpY2ggd2Ug aGF2ZSBldmVyIGhhZCBhIHZhbGlkIG1hcHBpbmcgKi8KLSAgICAgICAgICAgIHAybS0+bWF4X21h cHBlZF9wZm4gPSBnZm4gKyAoMVVMIDw8IG9yZGVyKSAtIDE7Ci0gICAgfQorICAgIGlmICggcDJt dCAhPSBwMm1faW52YWxpZCAmJgorICAgICAgICAgKGdmbiArICgxVUwgPDwgb3JkZXIpIC0gMSA+ IHAybS0+bWF4X21hcHBlZF9wZm4pICkKKyAgICAgICAgLyogVHJhY2sgdGhlIGhpZ2hlc3QgZ2Zu IGZvciB3aGljaCB3ZSBoYXZlIGV2ZXIgaGFkIGEgdmFsaWQgbWFwcGluZyAqLworICAgICAgICBw Mm0tPm1heF9tYXBwZWRfcGZuID0gZ2ZuICsgKDFVTCA8PCBvcmRlcikgLSAxOwogCiBvdXQ6CiAg ICAgaWYgKCBuZWVkc19zeW5jICkKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQu YyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYwppbmRleCBmZDYzODZiOGZkLi5hZWE4MTEwMjU0 IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMKKysrIGIveGVuL2FyY2gveDg2 L21tL3AybS1wdC5jCkBAIC01MjMsMTMgKzUyMyw2IEBAIHAybV9wdF9zZXRfZW50cnkoc3RydWN0 IHAybV9kb21haW4gKnAybSwgZ2ZuX3QgZ2ZuXywgbWZuX3QgbWZuLAogICAgICAgICBfX3RyYWNl X3ZhcihUUkNfTUVNX1NFVF9QMk1fRU5UUlksIDAsIHNpemVvZih0KSwgJnQpOwogICAgIH0KIAot ICAgIGlmICggdW5saWtlbHkocDJtX2lzX2ZvcmVpZ24ocDJtdCkpICkKLSAgICB7Ci0gICAgICAg IC8qIGh2bSBmaXhtZTogZm9yZWlnbiB0eXBlcyBhcmUgb25seSBzdXBwb3J0ZWQgb24gZXB0IGF0 IHByZXNlbnQgKi8KLSAgICAgICAgZ2RwcmludGsoWEVOTE9HX1dBUk5JTkcsICJVbmltcGxlbWVu dGVkIGZvcmVpZ24gcDJtIHR5cGUuXG4iKTsKLSAgICAgICAgcmV0dXJuIC1FSU5WQUw7Ci0gICAg fQotCiAgICAgLyogQ2Fycnkgb3V0IGFueSBldmVudHVhbGx5IHBlbmRpbmcgZWFybGllciBjaGFu Z2VzIGZpcnN0LiAqLwogICAgIHJjID0gZG9fcmVjYWxjKHAybSwgZ2ZuKTsKICAgICBpZiAoIHJj IDwgMCApCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jIGIveGVu L2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYwppbmRleCA2ZDhhOTUwMDU0Li4wMWZlODEyMzBh IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jCisrKyBiL3hlbi9h cmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMKQEAgLTMxODEsNyArMzE4MSw4IEBAIHNoYWRvd193 cml0ZV9wMm1fZW50cnkoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBnZm4sCiAgICAg ICAgICBzaF91bnNoYWRvd19mb3JfcDJtX2NoYW5nZShkLCBnZm4sIHAsIG5ldywgbGV2ZWwpOwog CiAgICAgcDJtX2VudHJ5X21vZGlmeShwMm1fZ2V0X2hvc3RwMm0oZCksIHAybV9mbGFnc190b190 eXBlKGwxZV9nZXRfZmxhZ3MobmV3KSksCi0gICAgICAgICAgICAgICAgICAgICBwMm1fZmxhZ3Nf dG9fdHlwZShsMWVfZ2V0X2ZsYWdzKCpwKSksIGxldmVsKTsKKyAgICAgICAgICAgICAgICAgICAg IHAybV9mbGFnc190b190eXBlKGwxZV9nZXRfZmxhZ3MoKnApKSwgbDFlX2dldF9tZm4obmV3KSwK KyAgICAgICAgICAgICAgICAgICAgIGwxZV9nZXRfbWZuKCpwKSwgbGV2ZWwpOwogCiAgICAgLyog VXBkYXRlIHRoZSBlbnRyeSB3aXRoIG5ldyBjb250ZW50ICovCiAgICAgc2FmZV93cml0ZV9wdGUo cCwgbmV3KTsKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmggYi94ZW4vaW5j bHVkZS9hc20teDg2L3AybS5oCmluZGV4IDgzNGQ0OWQyZDQuLjBkZTI3MjM5YmUgMTAwNjQ0Ci0t LSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9w Mm0uaApAQCAtOTMzLDkgKzkzMywxMiBAQCBzdHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcDJtX2dl dF9pb3JlcV9zZXJ2ZXIoc3RydWN0IGRvbWFpbiAqZCwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgKmZsYWdzKTsKIAogc3RhdGljIGlu bGluZSB2b2lkIHAybV9lbnRyeV9tb2RpZnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgcDJtX3R5 cGVfdCBudCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAybV90eXBlX3Qg b3QsIHVuc2lnbmVkIGludCBsZXZlbCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHAybV90eXBlX3Qgb3QsIG1mbl90IG5mbiwgbWZuX3Qgb2ZuLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGxldmVsKQogewotICAgIGlmICggbGV2 ZWwgIT0gMSB8fCBudCA9PSBvdCApCisgICAgQlVHX09OKGxldmVsID4gMSAmJiAobnQgPT0gcDJt X2lvcmVxX3NlcnZlciB8fCBudCA9PSBwMm1fbWFwX2ZvcmVpZ24pKTsKKworICAgIGlmICggbGV2 ZWwgIT0gMSB8fCAobnQgPT0gb3QgJiYgbWZuX2VxKG5mbiwgb2ZuKSkgKQogICAgICAgICByZXR1 cm47CiAKICAgICBzd2l0Y2ggKCBudCApCkBAIC05NDgsNiArOTUxLDExIEBAIHN0YXRpYyBpbmxp bmUgdm9pZCBwMm1fZW50cnlfbW9kaWZ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHAybV90eXBl X3QgbnQsCiAgICAgICAgIHAybS0+aW9yZXEuZW50cnlfY291bnQrKzsKICAgICAgICAgYnJlYWs7 CiAKKyAgICBjYXNlIHAybV9tYXBfZm9yZWlnbjoKKyAgICAgICAgQlVHX09OKCFtZm5fdmFsaWQo bmZuKSB8fAorICAgICAgICAgICAgICAgIXBhZ2VfZ2V0X293bmVyX2FuZF9yZWZlcmVuY2UobWZu X3RvX3BhZ2UobmZuKSkpOworICAgICAgICBicmVhazsKKwogICAgIGRlZmF1bHQ6CiAgICAgICAg IGJyZWFrOwogICAgIH0KQEAgLTk1OSw2ICs5NjcsMTEgQEAgc3RhdGljIGlubGluZSB2b2lkIHAy bV9lbnRyeV9tb2RpZnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgcDJtX3R5cGVfdCBudCwKICAg ICAgICAgcDJtLT5pb3JlcS5lbnRyeV9jb3VudC0tOwogICAgICAgICBicmVhazsKIAorICAgIGNh c2UgcDJtX21hcF9mb3JlaWduOgorICAgICAgICBCVUdfT04oIW1mbl92YWxpZChvZm4pKTsKKyAg ICAgICAgcHV0X3BhZ2UobWZuX3RvX3BhZ2Uob2ZuKSk7CisgICAgICAgIGJyZWFrOworCiAgICAg ZGVmYXVsdDoKICAgICAgICAgYnJlYWs7CiAgICAgfQotLSAKMi4yMC4xCgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlz dApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0 Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==