From: Roger Pau Monne Subject: [PATCH v5 2/5] x86/mm: split p2m ioreq server pages special handling into helper Date: Thu, 21 Feb 2019 17:50:38 +0100 Message-ID: <20190221165041.39394-3-roger.pau@citrix.com> References: <20190221165041.39394-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 1gwrYn-0005mh-C1 for xen-devel@lists.xenproject.org; Thu, 21 Feb 2019 16:50:57 +0000 In-Reply-To: <20190221165041.39394-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 , Paul Durrant , Jun Nakajima , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org U28gdGhhdCBpdCBjYW4gYmUgc2hhcmVkIGJ5IGJvdGggZXB0LCBucHQgYW5kIHNoYWRvdyBjb2Rl LCBpbnN0ZWFkIG9mCmR1cGxpY2F0aW5nIGl0LgoKTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkg aW50ZW5kZWQuCgpTaWduZWQtb2ZmLWJ5OiBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVAY2l0 cml4LmNvbT4KUmV2aWV3ZWQtYnk6IFBhdWwgRHVycmFudCA8cGF1bC5kdXJyYW50QGNpdHJpeC5j b20+ClJldmlld2VkLWJ5OiBHZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGNpdHJpeC5jb20+ ClJldmlld2VkLWJ5OiBLZXZpbiBUaWFuIDxrZXZpbi50aWFuQGludGVsLmNvbT4KLS0tCkNjOiBH ZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGV1LmNpdHJpeC5jb20+CkNjOiBKYW4gQmV1bGlj aCA8amJldWxpY2hAc3VzZS5jb20+CkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgpDYzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ2M6IEp1biBOYWth amltYSA8anVuLm5ha2FqaW1hQGludGVsLmNvbT4KQ2M6IEtldmluIFRpYW4gPGtldmluLnRpYW5A aW50ZWwuY29tPgpDYzogUGF1bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KQ2M6 IFRpbSBEZWVnYW4gPHRpbUB4ZW4ub3JnPgotLS0KQ2hhbmdlcyBzaW5jZSB2NDoKIC0gUmVtb3Zl IHRoZSBwMm1fZ2V0X2hvc3RwMm0gZnJvbSBjYWxsZXJzIG9mIHAybV9lbnRyeV9tb2RpZnkuCgpD aGFuZ2VzIHNpbmNlIHYxOgogLSBSZW1vdmUgdW51c2VkIHAybXRfb2xkIGZyb20gcDJtX3B0X3Nl dF9lbnRyeS4KLS0tCiB4ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jICAgICAgIHwgIDMgKysKIHhl bi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMgICAgICAgfCA1NSArKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYyAgICAgICAgfCAyNCAtLS0tLS0t LS0tLS0tLQogeGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYyB8ICAzICsrCiB4ZW4vaW5j bHVkZS9hc20teDg2L3AybS5oICAgICAgIHwgMzIgKysrKysrKysrKysrKysrKysrKwogNSBmaWxl cyBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCA2MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jIGIveGVuL2FyY2gveDg2L21tL2hhcC9oYXAuYwpp bmRleCAyOGZlNDhkMTU4Li4yZGI3ZjJjMDRhIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0v aGFwL2hhcC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9oYXAvaGFwLmMKQEAgLTczNSw2ICs3MzUs OSBAQCBoYXBfd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVk IGxvbmcgZ2ZuLCBsMV9wZ2VudHJ5X3QgKnAsCiAgICAgICAgICAgICAmJiBwZXJtc19zdHJpY3Rs eV9pbmNyZWFzZWQob2xkX2ZsYWdzLCBsMWVfZ2V0X2ZsYWdzKG5ldykpICk7CiAgICAgfQogCisg ICAgcDJtX2VudHJ5X21vZGlmeShwMm0sIHAybV9mbGFnc190b190eXBlKGwxZV9nZXRfZmxhZ3Mo bmV3KSksCisgICAgICAgICAgICAgICAgICAgICBwMm1fZmxhZ3NfdG9fdHlwZShvbGRfZmxhZ3Mp LCBsZXZlbCk7CisKICAgICBzYWZlX3dyaXRlX3B0ZShwLCBuZXcpOwogICAgIGlmICggb2xkX2Zs YWdzICYgX1BBR0VfUFJFU0VOVCApCiAgICAgICAgIGZsdXNoX3RsYl9tYXNrKGQtPmRpcnR5X2Nw dW1hc2spOwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYyBiL3hlbi9hcmNo L3g4Ni9tbS9wMm0tZXB0LmMKaW5kZXggYmI1NjI2MDdmNy4uMGVjZTY2MDhjYiAxMDA2NDQKLS0t IGEveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLWVw dC5jCkBAIC00Niw3ICs0Niw4IEBAIHN0YXRpYyBpbmxpbmUgYm9vbF90IGlzX2VwdGVfdmFsaWQo ZXB0X2VudHJ5X3QgKmUpCiB9CiAKIC8qIHJldHVybnMgOiAwIGZvciBzdWNjZXNzLCAtZXJybm8g b3RoZXJ3aXNlICovCi1zdGF0aWMgaW50IGF0b21pY193cml0ZV9lcHRfZW50cnkoZXB0X2VudHJ5 X3QgKmVudHJ5cHRyLCBlcHRfZW50cnlfdCBuZXcsCitzdGF0aWMgaW50IGF0b21pY193cml0ZV9l cHRfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBlcHRfZW50cnlfdCAqZW50cnlwdHIsIGVwdF9lbnRyeV90IG5ldywKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbGV2ZWwpCiB7CiAgICAgaW50IHJjOwpA QCAtODksNiArOTAsOCBAQCBzdGF0aWMgaW50IGF0b21pY193cml0ZV9lcHRfZW50cnkoZXB0X2Vu dHJ5X3QgKmVudHJ5cHRyLCBlcHRfZW50cnlfdCBuZXcsCiAgICAgaWYgKCB1bmxpa2VseShwMm1f aXNfZm9yZWlnbihlbnRyeXB0ci0+c2FfcDJtdCkpICYmIGNoZWNrX2ZvcmVpZ24gKQogICAgICAg ICBvbGRtZm4gPSBlbnRyeXB0ci0+bWZuOwogCisgICAgcDJtX2VudHJ5X21vZGlmeShwMm0sIG5l dy5zYV9wMm10LCBlbnRyeXB0ci0+c2FfcDJtdCwgbGV2ZWwpOworCiAgICAgd3JpdGVfYXRvbWlj KCZlbnRyeXB0ci0+ZXB0ZSwgbmV3LmVwdGUpOwogCiAgICAgaWYgKCB1bmxpa2VseShvbGRtZm4g IT0gbWZuX3goSU5WQUxJRF9NRk4pKSApCkBAIC0zOTAsNyArMzkzLDggQEAgc3RhdGljIGludCBl cHRfbmV4dF9sZXZlbChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBib29sX3QgcmVhZF9vbmx5LAog ICogcHJlc2VudCBlbnRyaWVzIGluIHRoZSBnaXZlbiBwYWdlIHRhYmxlLCBvcHRpb25hbGx5IG1h cmtpbmcgdGhlIGVudHJpZXMKICAqIGFsc28gZm9yIHRoZWlyIHN1YnRyZWVzIG5lZWRpbmcgUDJN IHR5cGUgcmUtY2FsY3VsYXRpb24uCiAgKi8KLXN0YXRpYyBib29sX3QgZXB0X2ludmFsaWRhdGVf ZW10KG1mbl90IG1mbiwgYm9vbF90IHJlY2FsYywgaW50IGxldmVsKQorc3RhdGljIGJvb2xfdCBl cHRfaW52YWxpZGF0ZV9lbXQoc3RydWN0IHAybV9kb21haW4gKnAybSwgbWZuX3QgbWZuLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbF90IHJlY2FsYywgaW50IGxldmVsKQog ewogICAgIGludCByYzsKICAgICBlcHRfZW50cnlfdCAqZXB0ZSA9IG1hcF9kb21haW5fcGFnZSht Zm4pOwpAQCAtNDA4LDcgKzQxMiw3IEBAIHN0YXRpYyBib29sX3QgZXB0X2ludmFsaWRhdGVfZW10 KG1mbl90IG1mbiwgYm9vbF90IHJlY2FsYywgaW50IGxldmVsKQogICAgICAgICBlLmVtdCA9IE1U UlJfTlVNX1RZUEVTOwogICAgICAgICBpZiAoIHJlY2FsYyApCiAgICAgICAgICAgICBlLnJlY2Fs YyA9IDE7Ci0gICAgICAgIHJjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeSgmZXB0ZVtpXSwgZSwg bGV2ZWwpOworICAgICAgICByYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtp XSwgZSwgbGV2ZWwpOwogICAgICAgICBBU1NFUlQocmMgPT0gMCk7CiAgICAgICAgIGNoYW5nZWQg PSAxOwogICAgIH0KQEAgLTQ1OSw3ICs0NjMsNyBAQCBzdGF0aWMgaW50IGVwdF9pbnZhbGlkYXRl X2VtdF9yYW5nZShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgICAgICAgICAgcmMgPSAtRU5P TUVNOwogICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgICAgIH0KLSAgICAgICAgd3JjID0gYXRv bWljX3dyaXRlX2VwdF9lbnRyeSgmdGFibGVbaW5kZXhdLCBzcGxpdF9lcHRfZW50cnksIGkpOwor ICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgJnRhYmxlW2luZGV4XSwg c3BsaXRfZXB0X2VudHJ5LCBpKTsKICAgICAgICAgQVNTRVJUKHdyYyA9PSAwKTsKIAogICAgICAg ICBmb3IgKCA7IGkgPiB0YXJnZXQ7IC0taSApCkBAIC00NzksNyArNDgzLDcgQEAgc3RhdGljIGlu dCBlcHRfaW52YWxpZGF0ZV9lbXRfcmFuZ2Uoc3RydWN0IHAybV9kb21haW4gKnAybSwKICAgICAg ICAgewogICAgICAgICAgICAgZS5lbXQgPSBNVFJSX05VTV9UWVBFUzsKICAgICAgICAgICAgIGUu cmVjYWxjID0gMTsKLSAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkoJnRh YmxlW2luZGV4XSwgZSwgdGFyZ2V0KTsKKyAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9l cHRfZW50cnkocDJtLCAmdGFibGVbaW5kZXhdLCBlLCB0YXJnZXQpOwogICAgICAgICAgICAgQVNT RVJUKHdyYyA9PSAwKTsKICAgICAgICAgICAgIHJjID0gMTsKICAgICAgICAgfQpAQCAtNTQ5LDE3 ICs1NTMsMTEgQEAgc3RhdGljIGludCByZXNvbHZlX21pc2NvbmZpZyhzdHJ1Y3QgcDJtX2RvbWFp biAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAgICAgICAgICAgICAgbnQgPSBwMm1f cmVjYWxjX3R5cGUoZS5yZWNhbGMsIGUuc2FfcDJtdCwgcDJtLCBnZm4gKyBpKTsKICAgICAgICAg ICAgICAgICAgICAgaWYgKCBudCAhPSBlLnNhX3AybXQgKQogICAgICAgICAgICAgICAgICAgICB7 Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoIGUuc2FfcDJtdCA9PSBwMm1faW9yZXFfc2Vy dmVyICkKLSAgICAgICAgICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBBU1NFUlQocDJtLT5pb3JlcS5lbnRyeV9jb3VudCA+IDApOwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHAybS0+aW9yZXEuZW50cnlfY291bnQtLTsKLSAgICAgICAgICAgICAgICAg ICAgICAgIH0KLQogICAgICAgICAgICAgICAgICAgICAgICAgZS5zYV9wMm10ID0gbnQ7CiAgICAg ICAgICAgICAgICAgICAgICAgICBlcHRfcDJtX3R5cGVfdG9fZmxhZ3MocDJtLCAmZSwgZS5zYV9w Mm10LCBlLmFjY2Vzcyk7CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAg ICAgZS5yZWNhbGMgPSAwOwotICAgICAgICAgICAgICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVf ZXB0X2VudHJ5KCZlcHRlW2ldLCBlLCBsZXZlbCk7CisgICAgICAgICAgICAgICAgICAgIHdyYyA9 IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwogICAgICAg ICAgICAgICAgICAgICBBU1NFUlQod3JjID09IDApOwogICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIH0KQEAgLTU5NSw3ICs1OTMsNyBAQCBzdGF0aWMgaW50IHJlc29sdmVfbWlzY29uZmln KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuKQogICAgICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKCBlcHRfc3BsaXRfc3VwZXJfcGFnZShwMm0s ICZlLCBsZXZlbCwgbGV2ZWwgLSAxKSApCiAgICAgICAgICAgICAgICAgICAgIHsKLSAgICAgICAg ICAgICAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkoJmVwdGVbaV0sIGUs IGxldmVsKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRf ZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwogICAgICAgICAgICAgICAgICAgICAgICAg QVNTRVJUKHdyYyA9PSAwKTsKICAgICAgICAgICAgICAgICAgICAgICAgIHVubWFwX2RvbWFpbl9w YWdlKGVwdGUpOwogICAgICAgICAgICAgICAgICAgICAgICAgbWZuID0gZS5tZm47CkBAIC02MTAs NyArNjA4LDcgQEAgc3RhdGljIGludCByZXNvbHZlX21pc2NvbmZpZyhzdHJ1Y3QgcDJtX2RvbWFp biAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAgICAgICAgICBlLnJlY2FsYyA9IDA7 CiAgICAgICAgICAgICAgICAgaWYgKCByZWNhbGMgJiYgcDJtX2lzX2NoYW5nZWFibGUoZS5zYV9w Mm10KSApCiAgICAgICAgICAgICAgICAgICAgIGVwdF9wMm1fdHlwZV90b19mbGFncyhwMm0sICZl LCBlLnNhX3AybXQsIGUuYWNjZXNzKTsKLSAgICAgICAgICAgICAgICB3cmMgPSBhdG9taWNfd3Jp dGVfZXB0X2VudHJ5KCZlcHRlW2ldLCBlLCBsZXZlbCk7CisgICAgICAgICAgICAgICAgd3JjID0g YXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZlcHRlW2ldLCBlLCBsZXZlbCk7CiAgICAgICAg ICAgICAgICAgQVNTRVJUKHdyYyA9PSAwKTsKICAgICAgICAgICAgIH0KIApAQCAtNjIxLDExICs2 MTksMTEgQEAgc3RhdGljIGludCByZXNvbHZlX21pc2NvbmZpZyhzdHJ1Y3QgcDJtX2RvbWFpbiAq cDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAgaWYgKCBlLmVtdCA9PSBNVFJSX05VTV9U WVBFUyApCiAgICAgICAgIHsKICAgICAgICAgICAgIEFTU0VSVChpc19lcHRlX3ByZXNlbnQoJmUp KTsKLSAgICAgICAgICAgIGVwdF9pbnZhbGlkYXRlX2VtdChfbWZuKGUubWZuKSwgZS5yZWNhbGMs IGxldmVsKTsKKyAgICAgICAgICAgIGVwdF9pbnZhbGlkYXRlX2VtdChwMm0sIF9tZm4oZS5tZm4p LCBlLnJlY2FsYywgbGV2ZWwpOwogICAgICAgICAgICAgc21wX3dtYigpOwogICAgICAgICAgICAg ZS5lbXQgPSAwOwogICAgICAgICAgICAgZS5yZWNhbGMgPSAwOwotICAgICAgICAgICAgd3JjID0g YXRvbWljX3dyaXRlX2VwdF9lbnRyeSgmZXB0ZVtpXSwgZSwgbGV2ZWwpOworICAgICAgICAgICAg d3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZlcHRlW2ldLCBlLCBsZXZlbCk7CiAg ICAgICAgICAgICBBU1NFUlQod3JjID09IDApOwogICAgICAgICAgICAgdW5tYXBfZG9tYWluX3Bh Z2UoZXB0ZSk7CiAgICAgICAgICAgICByYyA9IDE7CkBAIC03ODYsNyArNzg0LDcgQEAgZXB0X3Nl dF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5fdCBnZm5fLCBtZm5fdCBtZm4sCiAK ICAgICAgICAgLyogbm93IGluc3RhbGwgdGhlIG5ld2x5IHNwbGl0IGVwdCBzdWItdHJlZSAqLwog ICAgICAgICAvKiBOQjogcGxlYXNlIG1ha2Ugc3VyZSBkb21pYW4gaXMgcGF1c2VkIGFuZCBubyBp bi1mbHkgVlQtZCBETUEuICovCi0gICAgICAgIHJjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShl cHRfZW50cnksIHNwbGl0X2VwdF9lbnRyeSwgaSk7CisgICAgICAgIHJjID0gYXRvbWljX3dyaXRl X2VwdF9lbnRyeShwMm0sIGVwdF9lbnRyeSwgc3BsaXRfZXB0X2VudHJ5LCBpKTsKICAgICAgICAg QVNTRVJUKHJjID09IDApOwogCiAgICAgICAgIC8qIHRoZW4gbW92ZSB0byB0aGUgbGV2ZWwgd2Ug d2FudCB0byBtYWtlIHJlYWwgY2hhbmdlcyAqLwpAQCAtODMzLDI0ICs4MzEsNyBAQCBlcHRfc2V0 X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwKICAg ICAgICAgbmV3X2VudHJ5LnN1cHByZXNzX3ZlID0gaXNfZXB0ZV92YWxpZCgmb2xkX2VudHJ5KSA/ CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvbGRfZW50cnkuc3VwcHJlc3Nf dmUgOiAxOwogCi0gICAgLyoKLSAgICAgKiBwMm1faW9yZXFfc2VydmVyIGlzIG9ubHkgdXNlZCBm b3IgNEsgcGFnZXMsIHNvIHRoZQotICAgICAqIGNvdW50IGlzIG9ubHkgZG9uZSBvbiBlcHQgcGFn ZSB0YWJsZSBlbnRyaWVzLgotICAgICAqLwotICAgIGlmICggcDJtdCA9PSBwMm1faW9yZXFfc2Vy dmVyICkKLSAgICB7Ci0gICAgICAgIEFTU0VSVChpID09IDApOwotICAgICAgICBwMm0tPmlvcmVx LmVudHJ5X2NvdW50Kys7Ci0gICAgfQotCi0gICAgaWYgKCBlcHRfZW50cnktPnNhX3AybXQgPT0g cDJtX2lvcmVxX3NlcnZlciApCi0gICAgewotICAgICAgICBBU1NFUlQoaSA9PSAwKTsKLSAgICAg ICAgQVNTRVJUKHAybS0+aW9yZXEuZW50cnlfY291bnQgPiAwKTsKLSAgICAgICAgcDJtLT5pb3Jl cS5lbnRyeV9jb3VudC0tOwotICAgIH0KLQotICAgIHJjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRy eShlcHRfZW50cnksIG5ld19lbnRyeSwgdGFyZ2V0KTsKKyAgICByYyA9IGF0b21pY193cml0ZV9l cHRfZW50cnkocDJtLCBlcHRfZW50cnksIG5ld19lbnRyeSwgdGFyZ2V0KTsKICAgICBpZiAoIHVu bGlrZWx5KHJjKSApCiAgICAgICAgIG9sZF9lbnRyeS5lcHRlID0gMDsKICAgICBlbHNlCkBAIC0x MDcwLDcgKzEwNTEsNyBAQCBzdGF0aWMgdm9pZCBlcHRfY2hhbmdlX2VudHJ5X3R5cGVfZ2xvYmFs KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAgICAgaWYgKCAhbWZuICkKICAgICAgICAgcmV0dXJu OwogCi0gICAgaWYgKCBlcHRfaW52YWxpZGF0ZV9lbXQoX21mbihtZm4pLCAxLCBwMm0tPmVwdC53 bCkgKQorICAgIGlmICggZXB0X2ludmFsaWRhdGVfZW10KHAybSwgX21mbihtZm4pLCAxLCBwMm0t PmVwdC53bCkgKQogICAgICAgICBlcHRfc3luY19kb21haW4ocDJtKTsKIH0KIApAQCAtMTEyOCw3 ICsxMTA5LDcgQEAgc3RhdGljIHZvaWQgZXB0X21lbW9yeV90eXBlX2NoYW5nZWQoc3RydWN0IHAy bV9kb21haW4gKnAybSkKICAgICBpZiAoICFtZm4gKQogICAgICAgICByZXR1cm47CiAKLSAgICBp ZiAoIGVwdF9pbnZhbGlkYXRlX2VtdChfbWZuKG1mbiksIDAsIHAybS0+ZXB0LndsKSApCisgICAg aWYgKCBlcHRfaW52YWxpZGF0ZV9lbXQocDJtLCBfbWZuKG1mbiksIDAsIHAybS0+ZXB0LndsKSAp CiAgICAgICAgIGVwdF9zeW5jX2RvbWFpbihwMm0pOwogfQogCmRpZmYgLS1naXQgYS94ZW4vYXJj aC94ODYvbW0vcDJtLXB0LmMgYi94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMKaW5kZXggNTJlYWEy NGIxOC4uMDRlOWQ4MWNmNiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3AybS1wdC5jCisr KyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYwpAQCAtNDM2LDEzICs0MzYsNiBAQCBzdGF0aWMg aW50IGRvX3JlY2FsYyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikK ICAgICAgICAgICAgICAgICBmbGFncyB8PSBfUEFHRV9QU0U7CiAgICAgICAgICAgICB9CiAKLSAg ICAgICAgICAgIGlmICggb3QgPT0gcDJtX2lvcmVxX3NlcnZlciApCi0gICAgICAgICAgICB7Ci0g ICAgICAgICAgICAgICAgQVNTRVJUKHAybS0+aW9yZXEuZW50cnlfY291bnQgPiAwKTsKLSAgICAg ICAgICAgICAgICBBU1NFUlQobGV2ZWwgPT0gMCk7Ci0gICAgICAgICAgICAgICAgcDJtLT5pb3Jl cS5lbnRyeV9jb3VudC0tOwotICAgICAgICAgICAgfQotCiAgICAgICAgICAgICBlID0gbDFlX2Zy b21fcGZuKG1mbiwgZmxhZ3MpOwogICAgICAgICAgICAgcDJtX2FkZF9pb21tdV9mbGFncygmZSwg bGV2ZWwsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChudCA9PSBwMm1fcmFtX3J3 KQpAQCAtNjE2LDggKzYwOSw2IEBAIHAybV9wdF9zZXRfZW50cnkoc3RydWN0IHAybV9kb21haW4g KnAybSwgZ2ZuX3QgZ2ZuXywgbWZuX3QgbWZuLAogCiAgICAgaWYgKCBwYWdlX29yZGVyID09IFBB R0VfT1JERVJfNEsgKQogICAgIHsKLSAgICAgICAgcDJtX3R5cGVfdCBwMm10X29sZDsKLQogICAg ICAgICByYyA9IHAybV9uZXh0X2xldmVsKHAybSwgJnRhYmxlLCAmZ2ZuX3JlbWFpbmRlciwgZ2Zu LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIEwyX1BBR0VUQUJMRV9TSElGVCAtIFBBR0Vf U0hJRlQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTDJfUEFHRVRBQkxFX0VOVFJJRVMs IDEsIDEpOwpAQCAtNjQxLDIxICs2MzIsNiBAQCBwMm1fcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1f ZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwKICAgICAgICAgaWYgKCBlbnRyeV9j b250ZW50LmwxICE9IDAgKQogICAgICAgICAgICAgcDJtX2FkZF9pb21tdV9mbGFncygmZW50cnlf Y29udGVudCwgMCwgaW9tbXVfcHRlX2ZsYWdzKTsKIAotICAgICAgICBwMm10X29sZCA9IHAybV9m bGFnc190b190eXBlKGwxZV9nZXRfZmxhZ3MoKnAybV9lbnRyeSkpOwotCi0gICAgICAgIC8qCi0g ICAgICAgICAqIHAybV9pb3JlcV9zZXJ2ZXIgaXMgb25seSB1c2VkIGZvciA0SyBwYWdlcywgc28K LSAgICAgICAgICogdGhlIGNvdW50IGlzIG9ubHkgZG9uZSBmb3IgbGV2ZWwgMSBlbnRyaWVzLgot ICAgICAgICAgKi8KLSAgICAgICAgaWYgKCBwMm10ID09IHAybV9pb3JlcV9zZXJ2ZXIgKQotICAg ICAgICAgICAgcDJtLT5pb3JlcS5lbnRyeV9jb3VudCsrOwotCi0gICAgICAgIGlmICggcDJtdF9v bGQgPT0gcDJtX2lvcmVxX3NlcnZlciApCi0gICAgICAgIHsKLSAgICAgICAgICAgIEFTU0VSVChw Mm0tPmlvcmVxLmVudHJ5X2NvdW50ID4gMCk7Ci0gICAgICAgICAgICBwMm0tPmlvcmVxLmVudHJ5 X2NvdW50LS07Ci0gICAgICAgIH0KLQogICAgICAgICAvKiBsZXZlbCAxIGVudHJ5ICovCiAgICAg ICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBwMm1fZW50cnksIGVudHJ5X2NvbnRl bnQsIDEpOwogICAgICAgICAvKiBOQjogcGFnaW5nX3dyaXRlX3AybV9lbnRyeSgpIGhhbmRsZXMg dGxiIGZsdXNoZXMgcHJvcGVybHkgKi8KZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9zaGFk b3cvY29tbW9uLmMgYi94ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jCmluZGV4IDZjNjdl ZjQ5OTYuLmRlN2FiZjcxNTAgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29t bW9uLmMKKysrIGIveGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYwpAQCAtMzE5MCw2ICsz MTkwLDkgQEAgc2hhZG93X3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1 bnNpZ25lZCBsb25nIGdmbiwKICAgICBpZiAoIGxpa2VseShkLT5hcmNoLnBhZ2luZy5zaGFkb3cu dG90YWxfcGFnZXMgIT0gMCkgKQogICAgICAgICAgc2hfdW5zaGFkb3dfZm9yX3AybV9jaGFuZ2Uo ZCwgZ2ZuLCBwLCBuZXcsIGxldmVsKTsKIAorICAgIHAybV9lbnRyeV9tb2RpZnkocDJtLCBwMm1f ZmxhZ3NfdG9fdHlwZShsMWVfZ2V0X2ZsYWdzKG5ldykpLAorICAgICAgICAgICAgICAgICAgICAg cDJtX2ZsYWdzX3RvX3R5cGUobDFlX2dldF9mbGFncygqcCkpLCBsZXZlbCk7CisKICAgICAvKiBV cGRhdGUgdGhlIGVudHJ5IHdpdGggbmV3IGNvbnRlbnQgKi8KICAgICBzYWZlX3dyaXRlX3B0ZShw LCBuZXcpOwogCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oIGIveGVuL2lu Y2x1ZGUvYXNtLXg4Ni9wMm0uaAppbmRleCAyMDk1MDc2NTU2Li44MzRkNDlkMmQ0IDEwMDY0NAot LS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYv cDJtLmgKQEAgLTkzMiw2ICs5MzIsMzggQEAgaW50IHAybV9zZXRfaW9yZXFfc2VydmVyKHN0cnVj dCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBmbGFncywKIHN0cnVjdCBodm1faW9yZXFfc2VydmVy ICpwMm1fZ2V0X2lvcmVxX3NlcnZlcihzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCAqZmxhZ3MpOwogCitz dGF0aWMgaW5saW5lIHZvaWQgcDJtX2VudHJ5X21vZGlmeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LCBwMm1fdHlwZV90IG50LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcDJt X3R5cGVfdCBvdCwgdW5zaWduZWQgaW50IGxldmVsKQoreworICAgIGlmICggbGV2ZWwgIT0gMSB8 fCBudCA9PSBvdCApCisgICAgICAgIHJldHVybjsKKworICAgIHN3aXRjaCAoIG50ICkKKyAgICB7 CisgICAgY2FzZSBwMm1faW9yZXFfc2VydmVyOgorICAgICAgICAvKgorICAgICAgICAgKiBwMm1f aW9yZXFfc2VydmVyIGlzIG9ubHkgdXNlZCBmb3IgNEsgcGFnZXMsIHNvCisgICAgICAgICAqIHRo ZSBjb3VudCBpcyBvbmx5IGRvbmUgZm9yIGxldmVsIDEgZW50cmllcy4KKyAgICAgICAgICovCisg ICAgICAgIHAybS0+aW9yZXEuZW50cnlfY291bnQrKzsKKyAgICAgICAgYnJlYWs7CisKKyAgICBk ZWZhdWx0OgorICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICBzd2l0Y2ggKCBvdCApCisgICAg eworICAgIGNhc2UgcDJtX2lvcmVxX3NlcnZlcjoKKyAgICAgICAgQVNTRVJUKHAybS0+aW9yZXEu ZW50cnlfY291bnQgPiAwKTsKKyAgICAgICAgcDJtLT5pb3JlcS5lbnRyeV9jb3VudC0tOworICAg ICAgICBicmVhazsKKworICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAgIH0KK30KKwog I2VuZGlmIC8qIF9YRU5fQVNNX1g4Nl9QMk1fSCAqLwogCiAvKgotLSAKMi4xNy4yIChBcHBsZSBH aXQtMTEzKQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Clhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0 dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=