From: Roger Pau Monne Subject: [PATCH v4 1/4] x86/mm: split p2m ioreq server pages special handling into helper Date: Mon, 18 Feb 2019 18:27:24 +0100 Message-ID: <20190218172727.19644-2-roger.pau@citrix.com> References: <20190218172727.19644-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 1gvmhs-0001fu-S9 for xen-devel@lists.xenproject.org; Mon, 18 Feb 2019 17:27:52 +0000 In-Reply-To: <20190218172727.19644-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 , Paul Durrant , Jun Nakajima , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org U28gdGhhdCBpdCBjYW4gYmUgc2hhcmVkIGJ5IGJvdGggZXB0LCBucHQgYW5kIHNoYWRvdyBjb2Rl LCBpbnN0ZWFkIG9mCmR1cGxpY2F0aW5nIGl0LgoKTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkg aW50ZW5kZWQuCgpTaWduZWQtb2ZmLWJ5OiBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVAY2l0 cml4LmNvbT4KUmV2aWV3ZWQtYnk6IFBhdWwgRHVycmFudCA8cGF1bC5kdXJyYW50QGNpdHJpeC5j b20+ClJldmlld2VkLWJ5OiBHZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGNpdHJpeC5jb20+ Ci0tLQpDYzogR2VvcmdlIER1bmxhcCA8Z2VvcmdlLmR1bmxhcEBldS5jaXRyaXguY29tPgpDYzog SmFuIEJldWxpY2ggPGpiZXVsaWNoQHN1c2UuY29tPgpDYzogQW5kcmV3IENvb3BlciA8YW5kcmV3 LmNvb3BlcjNAY2l0cml4LmNvbT4KQ2M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CkNj OiBKdW4gTmFrYWppbWEgPGp1bi5uYWthamltYUBpbnRlbC5jb20+CkNjOiBLZXZpbiBUaWFuIDxr ZXZpbi50aWFuQGludGVsLmNvbT4KQ2M6IFBhdWwgRHVycmFudCA8cGF1bC5kdXJyYW50QGNpdHJp eC5jb20+Ci0tLQpDaGFuZ2VzIHNpbmNlIHYxOgogLSBSZW1vdmUgdW51c2VkIHAybXRfb2xkIGZy b20gcDJtX3B0X3NldF9lbnRyeS4KLS0tCiB4ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jICAgICAg IHwgIDMgKysKIHhlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMgICAgICAgfCA1NSArKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYyAgICAgICAg fCAyNCAtLS0tLS0tLS0tLS0tLQogeGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYyB8ICAz ICsrCiB4ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oICAgICAgIHwgMzIgKysrKysrKysrKysrKysr KysrKwogNSBmaWxlcyBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCA2MSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jIGIveGVuL2FyY2gveDg2L21t L2hhcC9oYXAuYwppbmRleCAzZDY1MWI5NGMzLi5kYzQ2ZDVlMTRmIDEwMDY0NAotLS0gYS94ZW4v YXJjaC94ODYvbW0vaGFwL2hhcC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9oYXAvaGFwLmMKQEAg LTczNCw2ICs3MzQsOSBAQCBoYXBfd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBkb21haW4gKmQsIHVu c2lnbmVkIGxvbmcgZ2ZuLCBsMV9wZ2VudHJ5X3QgKnAsCiAgICAgICAgICAgICAmJiBwZXJtc19z dHJpY3RseV9pbmNyZWFzZWQob2xkX2ZsYWdzLCBsMWVfZ2V0X2ZsYWdzKG5ldykpICk7CiAgICAg fQogCisgICAgcDJtX2VudHJ5X21vZGlmeShwMm1fZ2V0X2hvc3RwMm0oZCksIHAybV9mbGFnc190 b190eXBlKGwxZV9nZXRfZmxhZ3MobmV3KSksCisgICAgICAgICAgICAgICAgICAgICBwMm1fZmxh Z3NfdG9fdHlwZShvbGRfZmxhZ3MpLCBsZXZlbCk7CisKICAgICBzYWZlX3dyaXRlX3B0ZShwLCBu ZXcpOwogICAgIGlmICggb2xkX2ZsYWdzICYgX1BBR0VfUFJFU0VOVCApCiAgICAgICAgIGZsdXNo X3RsYl9tYXNrKGQtPmRpcnR5X2NwdW1hc2spOwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21t L3AybS1lcHQuYyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMKaW5kZXggYmI1NjI2MDdmNy4u MGVjZTY2MDhjYiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYworKysgYi94 ZW4vYXJjaC94ODYvbW0vcDJtLWVwdC5jCkBAIC00Niw3ICs0Niw4IEBAIHN0YXRpYyBpbmxpbmUg Ym9vbF90IGlzX2VwdGVfdmFsaWQoZXB0X2VudHJ5X3QgKmUpCiB9CiAKIC8qIHJldHVybnMgOiAw IGZvciBzdWNjZXNzLCAtZXJybm8gb3RoZXJ3aXNlICovCi1zdGF0aWMgaW50IGF0b21pY193cml0 ZV9lcHRfZW50cnkoZXB0X2VudHJ5X3QgKmVudHJ5cHRyLCBlcHRfZW50cnlfdCBuZXcsCitzdGF0 aWMgaW50IGF0b21pY193cml0ZV9lcHRfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlcHRfZW50cnlfdCAqZW50cnlwdHIsIGVw dF9lbnRyeV90IG5ldywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbGV2 ZWwpCiB7CiAgICAgaW50IHJjOwpAQCAtODksNiArOTAsOCBAQCBzdGF0aWMgaW50IGF0b21pY193 cml0ZV9lcHRfZW50cnkoZXB0X2VudHJ5X3QgKmVudHJ5cHRyLCBlcHRfZW50cnlfdCBuZXcsCiAg ICAgaWYgKCB1bmxpa2VseShwMm1faXNfZm9yZWlnbihlbnRyeXB0ci0+c2FfcDJtdCkpICYmIGNo ZWNrX2ZvcmVpZ24gKQogICAgICAgICBvbGRtZm4gPSBlbnRyeXB0ci0+bWZuOwogCisgICAgcDJt X2VudHJ5X21vZGlmeShwMm0sIG5ldy5zYV9wMm10LCBlbnRyeXB0ci0+c2FfcDJtdCwgbGV2ZWwp OworCiAgICAgd3JpdGVfYXRvbWljKCZlbnRyeXB0ci0+ZXB0ZSwgbmV3LmVwdGUpOwogCiAgICAg aWYgKCB1bmxpa2VseShvbGRtZm4gIT0gbWZuX3goSU5WQUxJRF9NRk4pKSApCkBAIC0zOTAsNyAr MzkzLDggQEAgc3RhdGljIGludCBlcHRfbmV4dF9sZXZlbChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LCBib29sX3QgcmVhZF9vbmx5LAogICogcHJlc2VudCBlbnRyaWVzIGluIHRoZSBnaXZlbiBwYWdl IHRhYmxlLCBvcHRpb25hbGx5IG1hcmtpbmcgdGhlIGVudHJpZXMKICAqIGFsc28gZm9yIHRoZWly IHN1YnRyZWVzIG5lZWRpbmcgUDJNIHR5cGUgcmUtY2FsY3VsYXRpb24uCiAgKi8KLXN0YXRpYyBi b29sX3QgZXB0X2ludmFsaWRhdGVfZW10KG1mbl90IG1mbiwgYm9vbF90IHJlY2FsYywgaW50IGxl dmVsKQorc3RhdGljIGJvb2xfdCBlcHRfaW52YWxpZGF0ZV9lbXQoc3RydWN0IHAybV9kb21haW4g KnAybSwgbWZuX3QgbWZuLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbF90 IHJlY2FsYywgaW50IGxldmVsKQogewogICAgIGludCByYzsKICAgICBlcHRfZW50cnlfdCAqZXB0 ZSA9IG1hcF9kb21haW5fcGFnZShtZm4pOwpAQCAtNDA4LDcgKzQxMiw3IEBAIHN0YXRpYyBib29s X3QgZXB0X2ludmFsaWRhdGVfZW10KG1mbl90IG1mbiwgYm9vbF90IHJlY2FsYywgaW50IGxldmVs KQogICAgICAgICBlLmVtdCA9IE1UUlJfTlVNX1RZUEVTOwogICAgICAgICBpZiAoIHJlY2FsYyAp CiAgICAgICAgICAgICBlLnJlY2FsYyA9IDE7Ci0gICAgICAgIHJjID0gYXRvbWljX3dyaXRlX2Vw dF9lbnRyeSgmZXB0ZVtpXSwgZSwgbGV2ZWwpOworICAgICAgICByYyA9IGF0b21pY193cml0ZV9l cHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwogICAgICAgICBBU1NFUlQocmMgPT0g MCk7CiAgICAgICAgIGNoYW5nZWQgPSAxOwogICAgIH0KQEAgLTQ1OSw3ICs0NjMsNyBAQCBzdGF0 aWMgaW50IGVwdF9pbnZhbGlkYXRlX2VtdF9yYW5nZShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAog ICAgICAgICAgICAgcmMgPSAtRU5PTUVNOwogICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgICAg IH0KLSAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeSgmdGFibGVbaW5kZXhdLCBz cGxpdF9lcHRfZW50cnksIGkpOworICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5 KHAybSwgJnRhYmxlW2luZGV4XSwgc3BsaXRfZXB0X2VudHJ5LCBpKTsKICAgICAgICAgQVNTRVJU KHdyYyA9PSAwKTsKIAogICAgICAgICBmb3IgKCA7IGkgPiB0YXJnZXQ7IC0taSApCkBAIC00Nzks NyArNDgzLDcgQEAgc3RhdGljIGludCBlcHRfaW52YWxpZGF0ZV9lbXRfcmFuZ2Uoc3RydWN0IHAy bV9kb21haW4gKnAybSwKICAgICAgICAgewogICAgICAgICAgICAgZS5lbXQgPSBNVFJSX05VTV9U WVBFUzsKICAgICAgICAgICAgIGUucmVjYWxjID0gMTsKLSAgICAgICAgICAgIHdyYyA9IGF0b21p Y193cml0ZV9lcHRfZW50cnkoJnRhYmxlW2luZGV4XSwgZSwgdGFyZ2V0KTsKKyAgICAgICAgICAg IHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmdGFibGVbaW5kZXhdLCBlLCB0YXJn ZXQpOwogICAgICAgICAgICAgQVNTRVJUKHdyYyA9PSAwKTsKICAgICAgICAgICAgIHJjID0gMTsK ICAgICAgICAgfQpAQCAtNTQ5LDE3ICs1NTMsMTEgQEAgc3RhdGljIGludCByZXNvbHZlX21pc2Nv bmZpZyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAg ICAgICAgICAgICAgbnQgPSBwMm1fcmVjYWxjX3R5cGUoZS5yZWNhbGMsIGUuc2FfcDJtdCwgcDJt LCBnZm4gKyBpKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKCBudCAhPSBlLnNhX3AybXQgKQog ICAgICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoIGUuc2Ff cDJtdCA9PSBwMm1faW9yZXFfc2VydmVyICkKLSAgICAgICAgICAgICAgICAgICAgICAgIHsKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQocDJtLT5pb3JlcS5lbnRyeV9jb3VudCA+ IDApOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAybS0+aW9yZXEuZW50cnlfY291bnQt LTsKLSAgICAgICAgICAgICAgICAgICAgICAgIH0KLQogICAgICAgICAgICAgICAgICAgICAgICAg ZS5zYV9wMm10ID0gbnQ7CiAgICAgICAgICAgICAgICAgICAgICAgICBlcHRfcDJtX3R5cGVfdG9f ZmxhZ3MocDJtLCAmZSwgZS5zYV9wMm10LCBlLmFjY2Vzcyk7CiAgICAgICAgICAgICAgICAgICAg IH0KICAgICAgICAgICAgICAgICAgICAgZS5yZWNhbGMgPSAwOwotICAgICAgICAgICAgICAgICAg ICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KCZlcHRlW2ldLCBlLCBsZXZlbCk7CisgICAg ICAgICAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtp XSwgZSwgbGV2ZWwpOwogICAgICAgICAgICAgICAgICAgICBBU1NFUlQod3JjID09IDApOwogICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KQEAgLTU5NSw3ICs1OTMsNyBAQCBzdGF0aWMg aW50IHJlc29sdmVfbWlzY29uZmlnKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxv bmcgZ2ZuKQogICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKCBlcHRf c3BsaXRfc3VwZXJfcGFnZShwMm0sICZlLCBsZXZlbCwgbGV2ZWwgLSAxKSApCiAgICAgICAgICAg ICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9l cHRfZW50cnkoJmVwdGVbaV0sIGUsIGxldmVsKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHdy YyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwogICAg ICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKHdyYyA9PSAwKTsKICAgICAgICAgICAgICAgICAg ICAgICAgIHVubWFwX2RvbWFpbl9wYWdlKGVwdGUpOwogICAgICAgICAgICAgICAgICAgICAgICAg bWZuID0gZS5tZm47CkBAIC02MTAsNyArNjA4LDcgQEAgc3RhdGljIGludCByZXNvbHZlX21pc2Nv bmZpZyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAg ICAgICAgICBlLnJlY2FsYyA9IDA7CiAgICAgICAgICAgICAgICAgaWYgKCByZWNhbGMgJiYgcDJt X2lzX2NoYW5nZWFibGUoZS5zYV9wMm10KSApCiAgICAgICAgICAgICAgICAgICAgIGVwdF9wMm1f dHlwZV90b19mbGFncyhwMm0sICZlLCBlLnNhX3AybXQsIGUuYWNjZXNzKTsKLSAgICAgICAgICAg ICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KCZlcHRlW2ldLCBlLCBsZXZlbCk7Cisg ICAgICAgICAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZlcHRlW2ld LCBlLCBsZXZlbCk7CiAgICAgICAgICAgICAgICAgQVNTRVJUKHdyYyA9PSAwKTsKICAgICAgICAg ICAgIH0KIApAQCAtNjIxLDExICs2MTksMTEgQEAgc3RhdGljIGludCByZXNvbHZlX21pc2NvbmZp ZyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAgaWYg KCBlLmVtdCA9PSBNVFJSX05VTV9UWVBFUyApCiAgICAgICAgIHsKICAgICAgICAgICAgIEFTU0VS VChpc19lcHRlX3ByZXNlbnQoJmUpKTsKLSAgICAgICAgICAgIGVwdF9pbnZhbGlkYXRlX2VtdChf bWZuKGUubWZuKSwgZS5yZWNhbGMsIGxldmVsKTsKKyAgICAgICAgICAgIGVwdF9pbnZhbGlkYXRl X2VtdChwMm0sIF9tZm4oZS5tZm4pLCBlLnJlY2FsYywgbGV2ZWwpOwogICAgICAgICAgICAgc21w X3dtYigpOwogICAgICAgICAgICAgZS5lbXQgPSAwOwogICAgICAgICAgICAgZS5yZWNhbGMgPSAw OwotICAgICAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeSgmZXB0ZVtpXSwgZSwg bGV2ZWwpOworICAgICAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZl cHRlW2ldLCBlLCBsZXZlbCk7CiAgICAgICAgICAgICBBU1NFUlQod3JjID09IDApOwogICAgICAg ICAgICAgdW5tYXBfZG9tYWluX3BhZ2UoZXB0ZSk7CiAgICAgICAgICAgICByYyA9IDE7CkBAIC03 ODYsNyArNzg0LDcgQEAgZXB0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5f dCBnZm5fLCBtZm5fdCBtZm4sCiAKICAgICAgICAgLyogbm93IGluc3RhbGwgdGhlIG5ld2x5IHNw bGl0IGVwdCBzdWItdHJlZSAqLwogICAgICAgICAvKiBOQjogcGxlYXNlIG1ha2Ugc3VyZSBkb21p YW4gaXMgcGF1c2VkIGFuZCBubyBpbi1mbHkgVlQtZCBETUEuICovCi0gICAgICAgIHJjID0gYXRv bWljX3dyaXRlX2VwdF9lbnRyeShlcHRfZW50cnksIHNwbGl0X2VwdF9lbnRyeSwgaSk7CisgICAg ICAgIHJjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sIGVwdF9lbnRyeSwgc3BsaXRfZXB0 X2VudHJ5LCBpKTsKICAgICAgICAgQVNTRVJUKHJjID09IDApOwogCiAgICAgICAgIC8qIHRoZW4g bW92ZSB0byB0aGUgbGV2ZWwgd2Ugd2FudCB0byBtYWtlIHJlYWwgY2hhbmdlcyAqLwpAQCAtODMz LDI0ICs4MzEsNyBAQCBlcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90 IGdmbl8sIG1mbl90IG1mbiwKICAgICAgICAgbmV3X2VudHJ5LnN1cHByZXNzX3ZlID0gaXNfZXB0 ZV92YWxpZCgmb2xkX2VudHJ5KSA/CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBvbGRfZW50cnkuc3VwcHJlc3NfdmUgOiAxOwogCi0gICAgLyoKLSAgICAgKiBwMm1faW9yZXFf c2VydmVyIGlzIG9ubHkgdXNlZCBmb3IgNEsgcGFnZXMsIHNvIHRoZQotICAgICAqIGNvdW50IGlz IG9ubHkgZG9uZSBvbiBlcHQgcGFnZSB0YWJsZSBlbnRyaWVzLgotICAgICAqLwotICAgIGlmICgg cDJtdCA9PSBwMm1faW9yZXFfc2VydmVyICkKLSAgICB7Ci0gICAgICAgIEFTU0VSVChpID09IDAp OwotICAgICAgICBwMm0tPmlvcmVxLmVudHJ5X2NvdW50Kys7Ci0gICAgfQotCi0gICAgaWYgKCBl cHRfZW50cnktPnNhX3AybXQgPT0gcDJtX2lvcmVxX3NlcnZlciApCi0gICAgewotICAgICAgICBB U1NFUlQoaSA9PSAwKTsKLSAgICAgICAgQVNTRVJUKHAybS0+aW9yZXEuZW50cnlfY291bnQgPiAw KTsKLSAgICAgICAgcDJtLT5pb3JlcS5lbnRyeV9jb3VudC0tOwotICAgIH0KLQotICAgIHJjID0g YXRvbWljX3dyaXRlX2VwdF9lbnRyeShlcHRfZW50cnksIG5ld19lbnRyeSwgdGFyZ2V0KTsKKyAg ICByYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCBlcHRfZW50cnksIG5ld19lbnRyeSwg dGFyZ2V0KTsKICAgICBpZiAoIHVubGlrZWx5KHJjKSApCiAgICAgICAgIG9sZF9lbnRyeS5lcHRl ID0gMDsKICAgICBlbHNlCkBAIC0xMDcwLDcgKzEwNTEsNyBAQCBzdGF0aWMgdm9pZCBlcHRfY2hh bmdlX2VudHJ5X3R5cGVfZ2xvYmFsKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAgICAgaWYgKCAh bWZuICkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKCBlcHRfaW52YWxpZGF0ZV9lbXQoX21m bihtZm4pLCAxLCBwMm0tPmVwdC53bCkgKQorICAgIGlmICggZXB0X2ludmFsaWRhdGVfZW10KHAy bSwgX21mbihtZm4pLCAxLCBwMm0tPmVwdC53bCkgKQogICAgICAgICBlcHRfc3luY19kb21haW4o cDJtKTsKIH0KIApAQCAtMTEyOCw3ICsxMTA5LDcgQEAgc3RhdGljIHZvaWQgZXB0X21lbW9yeV90 eXBlX2NoYW5nZWQoc3RydWN0IHAybV9kb21haW4gKnAybSkKICAgICBpZiAoICFtZm4gKQogICAg ICAgICByZXR1cm47CiAKLSAgICBpZiAoIGVwdF9pbnZhbGlkYXRlX2VtdChfbWZuKG1mbiksIDAs IHAybS0+ZXB0LndsKSApCisgICAgaWYgKCBlcHRfaW52YWxpZGF0ZV9lbXQocDJtLCBfbWZuKG1m biksIDAsIHAybS0+ZXB0LndsKSApCiAgICAgICAgIGVwdF9zeW5jX2RvbWFpbihwMm0pOwogfQog CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMgYi94ZW4vYXJjaC94ODYvbW0v cDJtLXB0LmMKaW5kZXggNTJlYWEyNGIxOC4uMDRlOWQ4MWNmNiAxMDA2NDQKLS0tIGEveGVuL2Fy Y2gveDg2L21tL3AybS1wdC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYwpAQCAtNDM2 LDEzICs0MzYsNiBAQCBzdGF0aWMgaW50IGRvX3JlY2FsYyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAgICAgICAgICBmbGFncyB8PSBfUEFHRV9QU0U7 CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmICggb3QgPT0gcDJtX2lvcmVxX3NlcnZl ciApCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKHAybS0+aW9yZXEuZW50 cnlfY291bnQgPiAwKTsKLSAgICAgICAgICAgICAgICBBU1NFUlQobGV2ZWwgPT0gMCk7Ci0gICAg ICAgICAgICAgICAgcDJtLT5pb3JlcS5lbnRyeV9jb3VudC0tOwotICAgICAgICAgICAgfQotCiAg ICAgICAgICAgICBlID0gbDFlX2Zyb21fcGZuKG1mbiwgZmxhZ3MpOwogICAgICAgICAgICAgcDJt X2FkZF9pb21tdV9mbGFncygmZSwgbGV2ZWwsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIChudCA9PSBwMm1fcmFtX3J3KQpAQCAtNjE2LDggKzYwOSw2IEBAIHAybV9wdF9zZXRfZW50 cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgZ2ZuX3QgZ2ZuXywgbWZuX3QgbWZuLAogCiAgICAg aWYgKCBwYWdlX29yZGVyID09IFBBR0VfT1JERVJfNEsgKQogICAgIHsKLSAgICAgICAgcDJtX3R5 cGVfdCBwMm10X29sZDsKLQogICAgICAgICByYyA9IHAybV9uZXh0X2xldmVsKHAybSwgJnRhYmxl LCAmZ2ZuX3JlbWFpbmRlciwgZ2ZuLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIEwyX1BB R0VUQUJMRV9TSElGVCAtIFBBR0VfU0hJRlQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg TDJfUEFHRVRBQkxFX0VOVFJJRVMsIDEsIDEpOwpAQCAtNjQxLDIxICs2MzIsNiBAQCBwMm1fcHRf c2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwK ICAgICAgICAgaWYgKCBlbnRyeV9jb250ZW50LmwxICE9IDAgKQogICAgICAgICAgICAgcDJtX2Fk ZF9pb21tdV9mbGFncygmZW50cnlfY29udGVudCwgMCwgaW9tbXVfcHRlX2ZsYWdzKTsKIAotICAg ICAgICBwMm10X29sZCA9IHAybV9mbGFnc190b190eXBlKGwxZV9nZXRfZmxhZ3MoKnAybV9lbnRy eSkpOwotCi0gICAgICAgIC8qCi0gICAgICAgICAqIHAybV9pb3JlcV9zZXJ2ZXIgaXMgb25seSB1 c2VkIGZvciA0SyBwYWdlcywgc28KLSAgICAgICAgICogdGhlIGNvdW50IGlzIG9ubHkgZG9uZSBm b3IgbGV2ZWwgMSBlbnRyaWVzLgotICAgICAgICAgKi8KLSAgICAgICAgaWYgKCBwMm10ID09IHAy bV9pb3JlcV9zZXJ2ZXIgKQotICAgICAgICAgICAgcDJtLT5pb3JlcS5lbnRyeV9jb3VudCsrOwot Ci0gICAgICAgIGlmICggcDJtdF9vbGQgPT0gcDJtX2lvcmVxX3NlcnZlciApCi0gICAgICAgIHsK LSAgICAgICAgICAgIEFTU0VSVChwMm0tPmlvcmVxLmVudHJ5X2NvdW50ID4gMCk7Ci0gICAgICAg ICAgICBwMm0tPmlvcmVxLmVudHJ5X2NvdW50LS07Ci0gICAgICAgIH0KLQogICAgICAgICAvKiBs ZXZlbCAxIGVudHJ5ICovCiAgICAgICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBw Mm1fZW50cnksIGVudHJ5X2NvbnRlbnQsIDEpOwogICAgICAgICAvKiBOQjogcGFnaW5nX3dyaXRl X3AybV9lbnRyeSgpIGhhbmRsZXMgdGxiIGZsdXNoZXMgcHJvcGVybHkgKi8KZGlmZiAtLWdpdCBh L3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMgYi94ZW4vYXJjaC94ODYvbW0vc2hhZG93 L2NvbW1vbi5jCmluZGV4IDA3ODQwZmY3MjcuLjA1NzZjM2MyZDIgMTAwNjQ0Ci0tLSBhL3hlbi9h cmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMKKysrIGIveGVuL2FyY2gveDg2L21tL3NoYWRvdy9j b21tb24uYwpAQCAtMzE4OCw2ICszMTg4LDkgQEAgc2hhZG93X3dyaXRlX3AybV9lbnRyeShzdHJ1 Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIGdmbiwKICAgICBpZiAoIGxpa2VseShkLT5hcmNo LnBhZ2luZy5zaGFkb3cudG90YWxfcGFnZXMgIT0gMCkgKQogICAgICAgICAgc2hfdW5zaGFkb3df Zm9yX3AybV9jaGFuZ2UoZCwgZ2ZuLCBwLCBuZXcsIGxldmVsKTsKIAorICAgIHAybV9lbnRyeV9t b2RpZnkocDJtX2dldF9ob3N0cDJtKGQpLCBwMm1fZmxhZ3NfdG9fdHlwZShsMWVfZ2V0X2ZsYWdz KG5ldykpLAorICAgICAgICAgICAgICAgICAgICAgcDJtX2ZsYWdzX3RvX3R5cGUobDFlX2dldF9m bGFncygqcCkpLCBsZXZlbCk7CisKICAgICAvKiBVcGRhdGUgdGhlIGVudHJ5IHdpdGggbmV3IGNv bnRlbnQgKi8KICAgICBzYWZlX3dyaXRlX3B0ZShwLCBuZXcpOwogCmRpZmYgLS1naXQgYS94ZW4v aW5jbHVkZS9hc20teDg2L3AybS5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaAppbmRleCAy MDk1MDc2NTU2Li44MzRkNDlkMmQ0IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L3Ay bS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKQEAgLTkzMiw2ICs5MzIsMzggQEAg aW50IHAybV9zZXRfaW9yZXFfc2VydmVyKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBm bGFncywKIHN0cnVjdCBodm1faW9yZXFfc2VydmVyICpwMm1fZ2V0X2lvcmVxX3NlcnZlcihzdHJ1 Y3QgZG9tYWluICpkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHVuc2lnbmVkIGludCAqZmxhZ3MpOwogCitzdGF0aWMgaW5saW5lIHZvaWQgcDJtX2VudHJ5 X21vZGlmeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBwMm1fdHlwZV90IG50LAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcDJtX3R5cGVfdCBvdCwgdW5zaWduZWQgaW50IGxl dmVsKQoreworICAgIGlmICggbGV2ZWwgIT0gMSB8fCBudCA9PSBvdCApCisgICAgICAgIHJldHVy bjsKKworICAgIHN3aXRjaCAoIG50ICkKKyAgICB7CisgICAgY2FzZSBwMm1faW9yZXFfc2VydmVy OgorICAgICAgICAvKgorICAgICAgICAgKiBwMm1faW9yZXFfc2VydmVyIGlzIG9ubHkgdXNlZCBm b3IgNEsgcGFnZXMsIHNvCisgICAgICAgICAqIHRoZSBjb3VudCBpcyBvbmx5IGRvbmUgZm9yIGxl dmVsIDEgZW50cmllcy4KKyAgICAgICAgICovCisgICAgICAgIHAybS0+aW9yZXEuZW50cnlfY291 bnQrKzsKKyAgICAgICAgYnJlYWs7CisKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKKyAg ICB9CisKKyAgICBzd2l0Y2ggKCBvdCApCisgICAgeworICAgIGNhc2UgcDJtX2lvcmVxX3NlcnZl cjoKKyAgICAgICAgQVNTRVJUKHAybS0+aW9yZXEuZW50cnlfY291bnQgPiAwKTsKKyAgICAgICAg cDJtLT5pb3JlcS5lbnRyeV9jb3VudC0tOworICAgICAgICBicmVhazsKKworICAgIGRlZmF1bHQ6 CisgICAgICAgIGJyZWFrOworICAgIH0KK30KKwogI2VuZGlmIC8qIF9YRU5fQVNNX1g4Nl9QMk1f SCAqLwogCiAvKgotLSAKMi4xNy4yIChBcHBsZSBHaXQtMTEzKQoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcv bWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=