From: Roger Pau Monne Subject: [PATCH v3 5/8] x86/mm: split p2m ioreq server pages special handling into helper Date: Fri, 15 Feb 2019 15:18:34 +0100 Message-ID: <20190215141837.1420-6-roger.pau@citrix.com> References: <20190215141837.1420-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 1gueKq-0001AM-8d for xen-devel@lists.xenproject.org; Fri, 15 Feb 2019 14:19:24 +0000 In-Reply-To: <20190215141837.1420-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+Ci0tLQpDYzogR2VvcmdlIER1bmxhcCA8Z2VvcmdlLmR1bmxhcEBldS5jaXRyaXguY29tPgpD YzogSmFuIEJldWxpY2ggPGpiZXVsaWNoQHN1c2UuY29tPgpDYzogQW5kcmV3IENvb3BlciA8YW5k cmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KQ2M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+ CkNjOiBKdW4gTmFrYWppbWEgPGp1bi5uYWthamltYUBpbnRlbC5jb20+CkNjOiBLZXZpbiBUaWFu IDxrZXZpbi50aWFuQGludGVsLmNvbT4KQ2M6IFBhdWwgRHVycmFudCA8cGF1bC5kdXJyYW50QGNp dHJpeC5jb20+Ci0tLQpDaGFuZ2VzIHNpbmNlIHYxOgogLSBSZW1vdmUgdW51c2VkIHAybXRfb2xk IGZyb20gcDJtX3B0X3NldF9lbnRyeS4KLS0tCiB4ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jICAg ICAgIHwgIDMgKysKIHhlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMgICAgICAgfCA1NSArKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYyAgICAg ICAgfCAyNCAtLS0tLS0tLS0tLS0tLQogeGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYyB8 ICAzICsrCiB4ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oICAgICAgIHwgMzIgKysrKysrKysrKysr KysrKysrKwogNSBmaWxlcyBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCA2MSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jIGIveGVuL2FyY2gveDg2 L21tL2hhcC9oYXAuYwppbmRleCAzZDY1MWI5NGMzLi5kYzQ2ZDVlMTRmIDEwMDY0NAotLS0gYS94 ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9oYXAvaGFwLmMK QEAgLTczNCw2ICs3MzQsOSBAQCBoYXBfd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBkb21haW4gKmQs IHVuc2lnbmVkIGxvbmcgZ2ZuLCBsMV9wZ2VudHJ5X3QgKnAsCiAgICAgICAgICAgICAmJiBwZXJt c19zdHJpY3RseV9pbmNyZWFzZWQob2xkX2ZsYWdzLCBsMWVfZ2V0X2ZsYWdzKG5ldykpICk7CiAg ICAgfQogCisgICAgcDJtX2VudHJ5X21vZGlmeShwMm1fZ2V0X2hvc3RwMm0oZCksIHAybV9mbGFn c190b190eXBlKGwxZV9nZXRfZmxhZ3MobmV3KSksCisgICAgICAgICAgICAgICAgICAgICBwMm1f ZmxhZ3NfdG9fdHlwZShvbGRfZmxhZ3MpLCBsZXZlbCk7CisKICAgICBzYWZlX3dyaXRlX3B0ZShw LCBuZXcpOwogICAgIGlmICggb2xkX2ZsYWdzICYgX1BBR0VfUFJFU0VOVCApCiAgICAgICAgIGZs dXNoX3RsYl9tYXNrKGQtPmRpcnR5X2NwdW1hc2spOwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2 L21tL3AybS1lcHQuYyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMKaW5kZXggYmI1NjI2MDdm Ny4uMGVjZTY2MDhjYiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYworKysg Yi94ZW4vYXJjaC94ODYvbW0vcDJtLWVwdC5jCkBAIC00Niw3ICs0Niw4IEBAIHN0YXRpYyBpbmxp bmUgYm9vbF90IGlzX2VwdGVfdmFsaWQoZXB0X2VudHJ5X3QgKmUpCiB9CiAKIC8qIHJldHVybnMg OiAwIGZvciBzdWNjZXNzLCAtZXJybm8gb3RoZXJ3aXNlICovCi1zdGF0aWMgaW50IGF0b21pY193 cml0ZV9lcHRfZW50cnkoZXB0X2VudHJ5X3QgKmVudHJ5cHRyLCBlcHRfZW50cnlfdCBuZXcsCitz dGF0aWMgaW50IGF0b21pY193cml0ZV9lcHRfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlcHRfZW50cnlfdCAqZW50cnlwdHIs IGVwdF9lbnRyeV90IG5ldywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQg bGV2ZWwpCiB7CiAgICAgaW50IHJjOwpAQCAtODksNiArOTAsOCBAQCBzdGF0aWMgaW50IGF0b21p Y193cml0ZV9lcHRfZW50cnkoZXB0X2VudHJ5X3QgKmVudHJ5cHRyLCBlcHRfZW50cnlfdCBuZXcs CiAgICAgaWYgKCB1bmxpa2VseShwMm1faXNfZm9yZWlnbihlbnRyeXB0ci0+c2FfcDJtdCkpICYm IGNoZWNrX2ZvcmVpZ24gKQogICAgICAgICBvbGRtZm4gPSBlbnRyeXB0ci0+bWZuOwogCisgICAg cDJtX2VudHJ5X21vZGlmeShwMm0sIG5ldy5zYV9wMm10LCBlbnRyeXB0ci0+c2FfcDJtdCwgbGV2 ZWwpOworCiAgICAgd3JpdGVfYXRvbWljKCZlbnRyeXB0ci0+ZXB0ZSwgbmV3LmVwdGUpOwogCiAg ICAgaWYgKCB1bmxpa2VseShvbGRtZm4gIT0gbWZuX3goSU5WQUxJRF9NRk4pKSApCkBAIC0zOTAs NyArMzkzLDggQEAgc3RhdGljIGludCBlcHRfbmV4dF9sZXZlbChzdHJ1Y3QgcDJtX2RvbWFpbiAq cDJtLCBib29sX3QgcmVhZF9vbmx5LAogICogcHJlc2VudCBlbnRyaWVzIGluIHRoZSBnaXZlbiBw YWdlIHRhYmxlLCBvcHRpb25hbGx5IG1hcmtpbmcgdGhlIGVudHJpZXMKICAqIGFsc28gZm9yIHRo ZWlyIHN1YnRyZWVzIG5lZWRpbmcgUDJNIHR5cGUgcmUtY2FsY3VsYXRpb24uCiAgKi8KLXN0YXRp YyBib29sX3QgZXB0X2ludmFsaWRhdGVfZW10KG1mbl90IG1mbiwgYm9vbF90IHJlY2FsYywgaW50 IGxldmVsKQorc3RhdGljIGJvb2xfdCBlcHRfaW52YWxpZGF0ZV9lbXQoc3RydWN0IHAybV9kb21h aW4gKnAybSwgbWZuX3QgbWZuLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9v bF90IHJlY2FsYywgaW50IGxldmVsKQogewogICAgIGludCByYzsKICAgICBlcHRfZW50cnlfdCAq ZXB0ZSA9IG1hcF9kb21haW5fcGFnZShtZm4pOwpAQCAtNDA4LDcgKzQxMiw3IEBAIHN0YXRpYyBi b29sX3QgZXB0X2ludmFsaWRhdGVfZW10KG1mbl90IG1mbiwgYm9vbF90IHJlY2FsYywgaW50IGxl dmVsKQogICAgICAgICBlLmVtdCA9IE1UUlJfTlVNX1RZUEVTOwogICAgICAgICBpZiAoIHJlY2Fs YyApCiAgICAgICAgICAgICBlLnJlY2FsYyA9IDE7Ci0gICAgICAgIHJjID0gYXRvbWljX3dyaXRl X2VwdF9lbnRyeSgmZXB0ZVtpXSwgZSwgbGV2ZWwpOworICAgICAgICByYyA9IGF0b21pY193cml0 ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwogICAgICAgICBBU1NFUlQocmMg PT0gMCk7CiAgICAgICAgIGNoYW5nZWQgPSAxOwogICAgIH0KQEAgLTQ1OSw3ICs0NjMsNyBAQCBz dGF0aWMgaW50IGVwdF9pbnZhbGlkYXRlX2VtdF9yYW5nZShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LAogICAgICAgICAgICAgcmMgPSAtRU5PTUVNOwogICAgICAgICAgICAgZ290byBvdXQ7CiAgICAg ICAgIH0KLSAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeSgmdGFibGVbaW5kZXhd LCBzcGxpdF9lcHRfZW50cnksIGkpOworICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2Vu dHJ5KHAybSwgJnRhYmxlW2luZGV4XSwgc3BsaXRfZXB0X2VudHJ5LCBpKTsKICAgICAgICAgQVNT RVJUKHdyYyA9PSAwKTsKIAogICAgICAgICBmb3IgKCA7IGkgPiB0YXJnZXQ7IC0taSApCkBAIC00 NzksNyArNDgzLDcgQEAgc3RhdGljIGludCBlcHRfaW52YWxpZGF0ZV9lbXRfcmFuZ2Uoc3RydWN0 IHAybV9kb21haW4gKnAybSwKICAgICAgICAgewogICAgICAgICAgICAgZS5lbXQgPSBNVFJSX05V TV9UWVBFUzsKICAgICAgICAgICAgIGUucmVjYWxjID0gMTsKLSAgICAgICAgICAgIHdyYyA9IGF0 b21pY193cml0ZV9lcHRfZW50cnkoJnRhYmxlW2luZGV4XSwgZSwgdGFyZ2V0KTsKKyAgICAgICAg ICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmdGFibGVbaW5kZXhdLCBlLCB0 YXJnZXQpOwogICAgICAgICAgICAgQVNTRVJUKHdyYyA9PSAwKTsKICAgICAgICAgICAgIHJjID0g MTsKICAgICAgICAgfQpAQCAtNTQ5LDE3ICs1NTMsMTEgQEAgc3RhdGljIGludCByZXNvbHZlX21p c2NvbmZpZyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAg ICAgICAgICAgICAgICAgbnQgPSBwMm1fcmVjYWxjX3R5cGUoZS5yZWNhbGMsIGUuc2FfcDJtdCwg cDJtLCBnZm4gKyBpKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKCBudCAhPSBlLnNhX3AybXQg KQogICAgICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoIGUu c2FfcDJtdCA9PSBwMm1faW9yZXFfc2VydmVyICkKLSAgICAgICAgICAgICAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQocDJtLT5pb3JlcS5lbnRyeV9jb3Vu dCA+IDApOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAybS0+aW9yZXEuZW50cnlfY291 bnQtLTsKLSAgICAgICAgICAgICAgICAgICAgICAgIH0KLQogICAgICAgICAgICAgICAgICAgICAg ICAgZS5zYV9wMm10ID0gbnQ7CiAgICAgICAgICAgICAgICAgICAgICAgICBlcHRfcDJtX3R5cGVf dG9fZmxhZ3MocDJtLCAmZSwgZS5zYV9wMm10LCBlLmFjY2Vzcyk7CiAgICAgICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICAgICAgZS5yZWNhbGMgPSAwOwotICAgICAgICAgICAgICAg ICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KCZlcHRlW2ldLCBlLCBsZXZlbCk7Cisg ICAgICAgICAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0 ZVtpXSwgZSwgbGV2ZWwpOwogICAgICAgICAgICAgICAgICAgICBBU1NFUlQod3JjID09IDApOwog ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KQEAgLTU5NSw3ICs1OTMsNyBAQCBzdGF0 aWMgaW50IHJlc29sdmVfbWlzY29uZmlnKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVk IGxvbmcgZ2ZuKQogICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKCBl cHRfc3BsaXRfc3VwZXJfcGFnZShwMm0sICZlLCBsZXZlbCwgbGV2ZWwgLSAxKSApCiAgICAgICAg ICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0 ZV9lcHRfZW50cnkoJmVwdGVbaV0sIGUsIGxldmVsKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2ZWwpOwog ICAgICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKHdyYyA9PSAwKTsKICAgICAgICAgICAgICAg ICAgICAgICAgIHVubWFwX2RvbWFpbl9wYWdlKGVwdGUpOwogICAgICAgICAgICAgICAgICAgICAg ICAgbWZuID0gZS5tZm47CkBAIC02MTAsNyArNjA4LDcgQEAgc3RhdGljIGludCByZXNvbHZlX21p c2NvbmZpZyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAg ICAgICAgICAgICBlLnJlY2FsYyA9IDA7CiAgICAgICAgICAgICAgICAgaWYgKCByZWNhbGMgJiYg cDJtX2lzX2NoYW5nZWFibGUoZS5zYV9wMm10KSApCiAgICAgICAgICAgICAgICAgICAgIGVwdF9w Mm1fdHlwZV90b19mbGFncyhwMm0sICZlLCBlLnNhX3AybXQsIGUuYWNjZXNzKTsKLSAgICAgICAg ICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KCZlcHRlW2ldLCBlLCBsZXZlbCk7 CisgICAgICAgICAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZlcHRl W2ldLCBlLCBsZXZlbCk7CiAgICAgICAgICAgICAgICAgQVNTRVJUKHdyYyA9PSAwKTsKICAgICAg ICAgICAgIH0KIApAQCAtNjIxLDExICs2MTksMTEgQEAgc3RhdGljIGludCByZXNvbHZlX21pc2Nv bmZpZyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAg aWYgKCBlLmVtdCA9PSBNVFJSX05VTV9UWVBFUyApCiAgICAgICAgIHsKICAgICAgICAgICAgIEFT U0VSVChpc19lcHRlX3ByZXNlbnQoJmUpKTsKLSAgICAgICAgICAgIGVwdF9pbnZhbGlkYXRlX2Vt dChfbWZuKGUubWZuKSwgZS5yZWNhbGMsIGxldmVsKTsKKyAgICAgICAgICAgIGVwdF9pbnZhbGlk YXRlX2VtdChwMm0sIF9tZm4oZS5tZm4pLCBlLnJlY2FsYywgbGV2ZWwpOwogICAgICAgICAgICAg c21wX3dtYigpOwogICAgICAgICAgICAgZS5lbXQgPSAwOwogICAgICAgICAgICAgZS5yZWNhbGMg PSAwOwotICAgICAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeSgmZXB0ZVtpXSwg ZSwgbGV2ZWwpOworICAgICAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0s ICZlcHRlW2ldLCBlLCBsZXZlbCk7CiAgICAgICAgICAgICBBU1NFUlQod3JjID09IDApOwogICAg ICAgICAgICAgdW5tYXBfZG9tYWluX3BhZ2UoZXB0ZSk7CiAgICAgICAgICAgICByYyA9IDE7CkBA IC03ODYsNyArNzg0LDcgQEAgZXB0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBn Zm5fdCBnZm5fLCBtZm5fdCBtZm4sCiAKICAgICAgICAgLyogbm93IGluc3RhbGwgdGhlIG5ld2x5 IHNwbGl0IGVwdCBzdWItdHJlZSAqLwogICAgICAgICAvKiBOQjogcGxlYXNlIG1ha2Ugc3VyZSBk b21pYW4gaXMgcGF1c2VkIGFuZCBubyBpbi1mbHkgVlQtZCBETUEuICovCi0gICAgICAgIHJjID0g YXRvbWljX3dyaXRlX2VwdF9lbnRyeShlcHRfZW50cnksIHNwbGl0X2VwdF9lbnRyeSwgaSk7Cisg ICAgICAgIHJjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sIGVwdF9lbnRyeSwgc3BsaXRf ZXB0X2VudHJ5LCBpKTsKICAgICAgICAgQVNTRVJUKHJjID09IDApOwogCiAgICAgICAgIC8qIHRo ZW4gbW92ZSB0byB0aGUgbGV2ZWwgd2Ugd2FudCB0byBtYWtlIHJlYWwgY2hhbmdlcyAqLwpAQCAt ODMzLDI0ICs4MzEsNyBAQCBlcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdm bl90IGdmbl8sIG1mbl90IG1mbiwKICAgICAgICAgbmV3X2VudHJ5LnN1cHByZXNzX3ZlID0gaXNf ZXB0ZV92YWxpZCgmb2xkX2VudHJ5KSA/CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBvbGRfZW50cnkuc3VwcHJlc3NfdmUgOiAxOwogCi0gICAgLyoKLSAgICAgKiBwMm1faW9y ZXFfc2VydmVyIGlzIG9ubHkgdXNlZCBmb3IgNEsgcGFnZXMsIHNvIHRoZQotICAgICAqIGNvdW50 IGlzIG9ubHkgZG9uZSBvbiBlcHQgcGFnZSB0YWJsZSBlbnRyaWVzLgotICAgICAqLwotICAgIGlm ICggcDJtdCA9PSBwMm1faW9yZXFfc2VydmVyICkKLSAgICB7Ci0gICAgICAgIEFTU0VSVChpID09 IDApOwotICAgICAgICBwMm0tPmlvcmVxLmVudHJ5X2NvdW50Kys7Ci0gICAgfQotCi0gICAgaWYg KCBlcHRfZW50cnktPnNhX3AybXQgPT0gcDJtX2lvcmVxX3NlcnZlciApCi0gICAgewotICAgICAg ICBBU1NFUlQoaSA9PSAwKTsKLSAgICAgICAgQVNTRVJUKHAybS0+aW9yZXEuZW50cnlfY291bnQg PiAwKTsKLSAgICAgICAgcDJtLT5pb3JlcS5lbnRyeV9jb3VudC0tOwotICAgIH0KLQotICAgIHJj ID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShlcHRfZW50cnksIG5ld19lbnRyeSwgdGFyZ2V0KTsK KyAgICByYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCBlcHRfZW50cnksIG5ld19lbnRy eSwgdGFyZ2V0KTsKICAgICBpZiAoIHVubGlrZWx5KHJjKSApCiAgICAgICAgIG9sZF9lbnRyeS5l cHRlID0gMDsKICAgICBlbHNlCkBAIC0xMDcwLDcgKzEwNTEsNyBAQCBzdGF0aWMgdm9pZCBlcHRf Y2hhbmdlX2VudHJ5X3R5cGVfZ2xvYmFsKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAgICAgaWYg KCAhbWZuICkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKCBlcHRfaW52YWxpZGF0ZV9lbXQo X21mbihtZm4pLCAxLCBwMm0tPmVwdC53bCkgKQorICAgIGlmICggZXB0X2ludmFsaWRhdGVfZW10 KHAybSwgX21mbihtZm4pLCAxLCBwMm0tPmVwdC53bCkgKQogICAgICAgICBlcHRfc3luY19kb21h aW4ocDJtKTsKIH0KIApAQCAtMTEyOCw3ICsxMTA5LDcgQEAgc3RhdGljIHZvaWQgZXB0X21lbW9y eV90eXBlX2NoYW5nZWQoc3RydWN0IHAybV9kb21haW4gKnAybSkKICAgICBpZiAoICFtZm4gKQog ICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIGVwdF9pbnZhbGlkYXRlX2VtdChfbWZuKG1mbiks IDAsIHAybS0+ZXB0LndsKSApCisgICAgaWYgKCBlcHRfaW52YWxpZGF0ZV9lbXQocDJtLCBfbWZu KG1mbiksIDAsIHAybS0+ZXB0LndsKSApCiAgICAgICAgIGVwdF9zeW5jX2RvbWFpbihwMm0pOwog fQogCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMgYi94ZW4vYXJjaC94ODYv bW0vcDJtLXB0LmMKaW5kZXggNTJlYWEyNGIxOC4uMDRlOWQ4MWNmNiAxMDA2NDQKLS0tIGEveGVu L2FyY2gveDg2L21tL3AybS1wdC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYwpAQCAt NDM2LDEzICs0MzYsNiBAQCBzdGF0aWMgaW50IGRvX3JlY2FsYyhzdHJ1Y3QgcDJtX2RvbWFpbiAq cDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAgICAgICAgICBmbGFncyB8PSBfUEFHRV9Q U0U7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmICggb3QgPT0gcDJtX2lvcmVxX3Nl cnZlciApCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKHAybS0+aW9yZXEu ZW50cnlfY291bnQgPiAwKTsKLSAgICAgICAgICAgICAgICBBU1NFUlQobGV2ZWwgPT0gMCk7Ci0g ICAgICAgICAgICAgICAgcDJtLT5pb3JlcS5lbnRyeV9jb3VudC0tOwotICAgICAgICAgICAgfQot CiAgICAgICAgICAgICBlID0gbDFlX2Zyb21fcGZuKG1mbiwgZmxhZ3MpOwogICAgICAgICAgICAg cDJtX2FkZF9pb21tdV9mbGFncygmZSwgbGV2ZWwsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChudCA9PSBwMm1fcmFtX3J3KQpAQCAtNjE2LDggKzYwOSw2IEBAIHAybV9wdF9zZXRf ZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgZ2ZuX3QgZ2ZuXywgbWZuX3QgbWZuLAogCiAg ICAgaWYgKCBwYWdlX29yZGVyID09IFBBR0VfT1JERVJfNEsgKQogICAgIHsKLSAgICAgICAgcDJt X3R5cGVfdCBwMm10X29sZDsKLQogICAgICAgICByYyA9IHAybV9uZXh0X2xldmVsKHAybSwgJnRh YmxlLCAmZ2ZuX3JlbWFpbmRlciwgZ2ZuLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIEwy X1BBR0VUQUJMRV9TSElGVCAtIFBBR0VfU0hJRlQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgTDJfUEFHRVRBQkxFX0VOVFJJRVMsIDEsIDEpOwpAQCAtNjQxLDIxICs2MzIsNiBAQCBwMm1f cHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1m biwKICAgICAgICAgaWYgKCBlbnRyeV9jb250ZW50LmwxICE9IDAgKQogICAgICAgICAgICAgcDJt X2FkZF9pb21tdV9mbGFncygmZW50cnlfY29udGVudCwgMCwgaW9tbXVfcHRlX2ZsYWdzKTsKIAot ICAgICAgICBwMm10X29sZCA9IHAybV9mbGFnc190b190eXBlKGwxZV9nZXRfZmxhZ3MoKnAybV9l bnRyeSkpOwotCi0gICAgICAgIC8qCi0gICAgICAgICAqIHAybV9pb3JlcV9zZXJ2ZXIgaXMgb25s eSB1c2VkIGZvciA0SyBwYWdlcywgc28KLSAgICAgICAgICogdGhlIGNvdW50IGlzIG9ubHkgZG9u ZSBmb3IgbGV2ZWwgMSBlbnRyaWVzLgotICAgICAgICAgKi8KLSAgICAgICAgaWYgKCBwMm10ID09 IHAybV9pb3JlcV9zZXJ2ZXIgKQotICAgICAgICAgICAgcDJtLT5pb3JlcS5lbnRyeV9jb3VudCsr OwotCi0gICAgICAgIGlmICggcDJtdF9vbGQgPT0gcDJtX2lvcmVxX3NlcnZlciApCi0gICAgICAg IHsKLSAgICAgICAgICAgIEFTU0VSVChwMm0tPmlvcmVxLmVudHJ5X2NvdW50ID4gMCk7Ci0gICAg ICAgICAgICBwMm0tPmlvcmVxLmVudHJ5X2NvdW50LS07Ci0gICAgICAgIH0KLQogICAgICAgICAv KiBsZXZlbCAxIGVudHJ5ICovCiAgICAgICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2Zu LCBwMm1fZW50cnksIGVudHJ5X2NvbnRlbnQsIDEpOwogICAgICAgICAvKiBOQjogcGFnaW5nX3dy aXRlX3AybV9lbnRyeSgpIGhhbmRsZXMgdGxiIGZsdXNoZXMgcHJvcGVybHkgKi8KZGlmZiAtLWdp dCBhL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMgYi94ZW4vYXJjaC94ODYvbW0vc2hh ZG93L2NvbW1vbi5jCmluZGV4IDA3ODQwZmY3MjcuLjA1NzZjM2MyZDIgMTAwNjQ0Ci0tLSBhL3hl bi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMKKysrIGIveGVuL2FyY2gveDg2L21tL3NoYWRv dy9jb21tb24uYwpAQCAtMzE4OCw2ICszMTg4LDkgQEAgc2hhZG93X3dyaXRlX3AybV9lbnRyeShz dHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIGdmbiwKICAgICBpZiAoIGxpa2VseShkLT5h cmNoLnBhZ2luZy5zaGFkb3cudG90YWxfcGFnZXMgIT0gMCkgKQogICAgICAgICAgc2hfdW5zaGFk b3dfZm9yX3AybV9jaGFuZ2UoZCwgZ2ZuLCBwLCBuZXcsIGxldmVsKTsKIAorICAgIHAybV9lbnRy eV9tb2RpZnkocDJtX2dldF9ob3N0cDJtKGQpLCBwMm1fZmxhZ3NfdG9fdHlwZShsMWVfZ2V0X2Zs YWdzKG5ldykpLAorICAgICAgICAgICAgICAgICAgICAgcDJtX2ZsYWdzX3RvX3R5cGUobDFlX2dl dF9mbGFncygqcCkpLCBsZXZlbCk7CisKICAgICAvKiBVcGRhdGUgdGhlIGVudHJ5IHdpdGggbmV3 IGNvbnRlbnQgKi8KICAgICBzYWZlX3dyaXRlX3B0ZShwLCBuZXcpOwogCmRpZmYgLS1naXQgYS94 ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaAppbmRl eCAyMDk1MDc2NTU2Li44MzRkNDlkMmQ0IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2 L3AybS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKQEAgLTkzMiw2ICs5MzIsMzgg QEAgaW50IHAybV9zZXRfaW9yZXFfc2VydmVyKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGlu dCBmbGFncywKIHN0cnVjdCBodm1faW9yZXFfc2VydmVyICpwMm1fZ2V0X2lvcmVxX3NlcnZlcihz dHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHVuc2lnbmVkIGludCAqZmxhZ3MpOwogCitzdGF0aWMgaW5saW5lIHZvaWQgcDJtX2Vu dHJ5X21vZGlmeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBwMm1fdHlwZV90IG50LAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcDJtX3R5cGVfdCBvdCwgdW5zaWduZWQgaW50 IGxldmVsKQoreworICAgIGlmICggbGV2ZWwgIT0gMSB8fCBudCA9PSBvdCApCisgICAgICAgIHJl dHVybjsKKworICAgIHN3aXRjaCAoIG50ICkKKyAgICB7CisgICAgY2FzZSBwMm1faW9yZXFfc2Vy dmVyOgorICAgICAgICAvKgorICAgICAgICAgKiBwMm1faW9yZXFfc2VydmVyIGlzIG9ubHkgdXNl ZCBmb3IgNEsgcGFnZXMsIHNvCisgICAgICAgICAqIHRoZSBjb3VudCBpcyBvbmx5IGRvbmUgZm9y IGxldmVsIDEgZW50cmllcy4KKyAgICAgICAgICovCisgICAgICAgIHAybS0+aW9yZXEuZW50cnlf Y291bnQrKzsKKyAgICAgICAgYnJlYWs7CisKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsK KyAgICB9CisKKyAgICBzd2l0Y2ggKCBvdCApCisgICAgeworICAgIGNhc2UgcDJtX2lvcmVxX3Nl cnZlcjoKKyAgICAgICAgQVNTRVJUKHAybS0+aW9yZXEuZW50cnlfY291bnQgPiAwKTsKKyAgICAg ICAgcDJtLT5pb3JlcS5lbnRyeV9jb3VudC0tOworICAgICAgICBicmVhazsKKworICAgIGRlZmF1 bHQ6CisgICAgICAgIGJyZWFrOworICAgIH0KK30KKwogI2VuZGlmIC8qIF9YRU5fQVNNX1g4Nl9Q Mk1fSCAqLwogCiAvKgotLSAKMi4xNy4yIChBcHBsZSBHaXQtMTEzKQoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QK WGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5v cmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=