From: Roger Pau Monne Subject: [PATCH v2 5/7] x86/mm: split p2m ioreq server pages special handling into helper Date: Mon, 11 Feb 2019 18:46:40 +0100 Message-ID: <20190211174642.38046-6-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 1gtFg4-00046I-7L for xen-devel@lists.xenproject.org; Mon, 11 Feb 2019 17:47:32 +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 , Paul Durrant , Jun Nakajima , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org U28gdGhhdCBpdCBjYW4gYmUgc2hhcmVkIGJ5IGJvdGggZXB0LCBucHQgYW5kIHNoYWRvdyBjb2Rl LCBpbnN0ZWFkIG9mCmR1cGxpY2F0aW5nIGl0LgoKTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkg aW50ZW5kZWQuCgpTaWduZWQtb2ZmLWJ5OiBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVAY2l0 cml4LmNvbT4KLS0tCkNjOiBHZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGV1LmNpdHJpeC5j b20+CkNjOiBKYW4gQmV1bGljaCA8amJldWxpY2hAc3VzZS5jb20+CkNjOiBBbmRyZXcgQ29vcGVy IDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgpDYzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4 LmNvbT4KQ2M6IEp1biBOYWthamltYSA8anVuLm5ha2FqaW1hQGludGVsLmNvbT4KQ2M6IEtldmlu IFRpYW4gPGtldmluLnRpYW5AaW50ZWwuY29tPgpDYzogUGF1bCBEdXJyYW50IDxwYXVsLmR1cnJh bnRAY2l0cml4LmNvbT4KLS0tCkNoYW5nZXMgc2luY2UgdjE6CiAtIFJlbW92ZSB1bnVzZWQgcDJt dF9vbGQgZnJvbSBwMm1fcHRfc2V0X2VudHJ5LgotLS0KIHhlbi9hcmNoL3g4Ni9tbS9oYXAvaGFw LmMgICAgICAgfCAgMyArKwogeGVuL2FyY2gveDg2L21tL3AybS1lcHQuYyAgICAgICB8IDU1ICsr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogeGVuL2FyY2gveDg2L21tL3AybS1wdC5j ICAgICAgICB8IDI0IC0tLS0tLS0tLS0tLS0tCiB4ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1v bi5jIHwgIDMgKysKIHhlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmggICAgICAgfCAzMiArKysrKysr KysrKysrKysrKysrCiA1IGZpbGVzIGNoYW5nZWQsIDU2IGluc2VydGlvbnMoKyksIDYxIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9oYXAvaGFwLmMgYi94ZW4vYXJj aC94ODYvbW0vaGFwL2hhcC5jCmluZGV4IDNkNjUxYjk0YzMuLmRjNDZkNWUxNGYgMTAwNjQ0Ci0t LSBhL3hlbi9hcmNoL3g4Ni9tbS9oYXAvaGFwLmMKKysrIGIveGVuL2FyY2gveDg2L21tL2hhcC9o YXAuYwpAQCAtNzM0LDYgKzczNCw5IEBAIGhhcF93cml0ZV9wMm1fZW50cnkoc3RydWN0IGRvbWFp biAqZCwgdW5zaWduZWQgbG9uZyBnZm4sIGwxX3BnZW50cnlfdCAqcCwKICAgICAgICAgICAgICYm IHBlcm1zX3N0cmljdGx5X2luY3JlYXNlZChvbGRfZmxhZ3MsIGwxZV9nZXRfZmxhZ3MobmV3KSkg KTsKICAgICB9CiAKKyAgICBwMm1fZW50cnlfbW9kaWZ5KHAybV9nZXRfaG9zdHAybShkKSwgcDJt X2ZsYWdzX3RvX3R5cGUobDFlX2dldF9mbGFncyhuZXcpKSwKKyAgICAgICAgICAgICAgICAgICAg IHAybV9mbGFnc190b190eXBlKG9sZF9mbGFncyksIGxldmVsKTsKKwogICAgIHNhZmVfd3JpdGVf cHRlKHAsIG5ldyk7CiAgICAgaWYgKCBvbGRfZmxhZ3MgJiBfUEFHRV9QUkVTRU5UICkKICAgICAg ICAgZmx1c2hfdGxiX21hc2soZC0+ZGlydHlfY3B1bWFzayk7CmRpZmYgLS1naXQgYS94ZW4vYXJj aC94ODYvbW0vcDJtLWVwdC5jIGIveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYwppbmRleCBiYjU2 MjYwN2Y3Li4wZWNlNjYwOGNiIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vcDJtLWVwdC5j CisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMKQEAgLTQ2LDcgKzQ2LDggQEAgc3RhdGlj IGlubGluZSBib29sX3QgaXNfZXB0ZV92YWxpZChlcHRfZW50cnlfdCAqZSkKIH0KIAogLyogcmV0 dXJucyA6IDAgZm9yIHN1Y2Nlc3MsIC1lcnJubyBvdGhlcndpc2UgKi8KLXN0YXRpYyBpbnQgYXRv bWljX3dyaXRlX2VwdF9lbnRyeShlcHRfZW50cnlfdCAqZW50cnlwdHIsIGVwdF9lbnRyeV90IG5l dywKK3N0YXRpYyBpbnQgYXRvbWljX3dyaXRlX2VwdF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAq cDJtLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVwdF9lbnRyeV90ICplbnRy eXB0ciwgZXB0X2VudHJ5X3QgbmV3LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGludCBsZXZlbCkKIHsKICAgICBpbnQgcmM7CkBAIC04OSw2ICs5MCw4IEBAIHN0YXRpYyBpbnQg YXRvbWljX3dyaXRlX2VwdF9lbnRyeShlcHRfZW50cnlfdCAqZW50cnlwdHIsIGVwdF9lbnRyeV90 IG5ldywKICAgICBpZiAoIHVubGlrZWx5KHAybV9pc19mb3JlaWduKGVudHJ5cHRyLT5zYV9wMm10 KSkgJiYgY2hlY2tfZm9yZWlnbiApCiAgICAgICAgIG9sZG1mbiA9IGVudHJ5cHRyLT5tZm47CiAK KyAgICBwMm1fZW50cnlfbW9kaWZ5KHAybSwgbmV3LnNhX3AybXQsIGVudHJ5cHRyLT5zYV9wMm10 LCBsZXZlbCk7CisKICAgICB3cml0ZV9hdG9taWMoJmVudHJ5cHRyLT5lcHRlLCBuZXcuZXB0ZSk7 CiAKICAgICBpZiAoIHVubGlrZWx5KG9sZG1mbiAhPSBtZm5feChJTlZBTElEX01GTikpICkKQEAg LTM5MCw3ICszOTMsOCBAQCBzdGF0aWMgaW50IGVwdF9uZXh0X2xldmVsKHN0cnVjdCBwMm1fZG9t YWluICpwMm0sIGJvb2xfdCByZWFkX29ubHksCiAgKiBwcmVzZW50IGVudHJpZXMgaW4gdGhlIGdp dmVuIHBhZ2UgdGFibGUsIG9wdGlvbmFsbHkgbWFya2luZyB0aGUgZW50cmllcwogICogYWxzbyBm b3IgdGhlaXIgc3VidHJlZXMgbmVlZGluZyBQMk0gdHlwZSByZS1jYWxjdWxhdGlvbi4KICAqLwot c3RhdGljIGJvb2xfdCBlcHRfaW52YWxpZGF0ZV9lbXQobWZuX3QgbWZuLCBib29sX3QgcmVjYWxj LCBpbnQgbGV2ZWwpCitzdGF0aWMgYm9vbF90IGVwdF9pbnZhbGlkYXRlX2VtdChzdHJ1Y3QgcDJt X2RvbWFpbiAqcDJtLCBtZm5fdCBtZm4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBib29sX3QgcmVjYWxjLCBpbnQgbGV2ZWwpCiB7CiAgICAgaW50IHJjOwogICAgIGVwdF9lbnRy eV90ICplcHRlID0gbWFwX2RvbWFpbl9wYWdlKG1mbik7CkBAIC00MDgsNyArNDEyLDcgQEAgc3Rh dGljIGJvb2xfdCBlcHRfaW52YWxpZGF0ZV9lbXQobWZuX3QgbWZuLCBib29sX3QgcmVjYWxjLCBp bnQgbGV2ZWwpCiAgICAgICAgIGUuZW10ID0gTVRSUl9OVU1fVFlQRVM7CiAgICAgICAgIGlmICgg cmVjYWxjICkKICAgICAgICAgICAgIGUucmVjYWxjID0gMTsKLSAgICAgICAgcmMgPSBhdG9taWNf d3JpdGVfZXB0X2VudHJ5KCZlcHRlW2ldLCBlLCBsZXZlbCk7CisgICAgICAgIHJjID0gYXRvbWlj X3dyaXRlX2VwdF9lbnRyeShwMm0sICZlcHRlW2ldLCBlLCBsZXZlbCk7CiAgICAgICAgIEFTU0VS VChyYyA9PSAwKTsKICAgICAgICAgY2hhbmdlZCA9IDE7CiAgICAgfQpAQCAtNDU5LDcgKzQ2Myw3 IEBAIHN0YXRpYyBpbnQgZXB0X2ludmFsaWRhdGVfZW10X3JhbmdlKHN0cnVjdCBwMm1fZG9tYWlu ICpwMm0sCiAgICAgICAgICAgICByYyA9IC1FTk9NRU07CiAgICAgICAgICAgICBnb3RvIG91dDsK ICAgICAgICAgfQotICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KCZ0YWJsZVtp bmRleF0sIHNwbGl0X2VwdF9lbnRyeSwgaSk7CisgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9l cHRfZW50cnkocDJtLCAmdGFibGVbaW5kZXhdLCBzcGxpdF9lcHRfZW50cnksIGkpOwogICAgICAg ICBBU1NFUlQod3JjID09IDApOwogCiAgICAgICAgIGZvciAoIDsgaSA+IHRhcmdldDsgLS1pICkK QEAgLTQ3OSw3ICs0ODMsNyBAQCBzdGF0aWMgaW50IGVwdF9pbnZhbGlkYXRlX2VtdF9yYW5nZShz dHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgICAgICB7CiAgICAgICAgICAgICBlLmVtdCA9IE1U UlJfTlVNX1RZUEVTOwogICAgICAgICAgICAgZS5yZWNhbGMgPSAxOwotICAgICAgICAgICAgd3Jj ID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeSgmdGFibGVbaW5kZXhdLCBlLCB0YXJnZXQpOworICAg ICAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZ0YWJsZVtpbmRleF0s IGUsIHRhcmdldCk7CiAgICAgICAgICAgICBBU1NFUlQod3JjID09IDApOwogICAgICAgICAgICAg cmMgPSAxOwogICAgICAgICB9CkBAIC01NDksMTcgKzU1MywxMSBAQCBzdGF0aWMgaW50IHJlc29s dmVfbWlzY29uZmlnKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuKQog ICAgICAgICAgICAgICAgICAgICBudCA9IHAybV9yZWNhbGNfdHlwZShlLnJlY2FsYywgZS5zYV9w Mm10LCBwMm0sIGdmbiArIGkpOwogICAgICAgICAgICAgICAgICAgICBpZiAoIG50ICE9IGUuc2Ff cDJtdCApCiAgICAgICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlm ICggZS5zYV9wMm10ID09IHAybV9pb3JlcV9zZXJ2ZXIgKQotICAgICAgICAgICAgICAgICAgICAg ICAgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFTU0VSVChwMm0tPmlvcmVxLmVudHJ5 X2NvdW50ID4gMCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgcDJtLT5pb3JlcS5lbnRy eV9jb3VudC0tOwotICAgICAgICAgICAgICAgICAgICAgICAgfQotCiAgICAgICAgICAgICAgICAg ICAgICAgICBlLnNhX3AybXQgPSBudDsKICAgICAgICAgICAgICAgICAgICAgICAgIGVwdF9wMm1f dHlwZV90b19mbGFncyhwMm0sICZlLCBlLnNhX3AybXQsIGUuYWNjZXNzKTsKICAgICAgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBlLnJlY2FsYyA9IDA7Ci0gICAgICAgICAg ICAgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkoJmVwdGVbaV0sIGUsIGxldmVs KTsKKyAgICAgICAgICAgICAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0s ICZlcHRlW2ldLCBlLCBsZXZlbCk7CiAgICAgICAgICAgICAgICAgICAgIEFTU0VSVCh3cmMgPT0g MCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQpAQCAtNTk1LDcgKzU5Myw3IEBA IHN0YXRpYyBpbnQgcmVzb2x2ZV9taXNjb25maWcoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5z aWduZWQgbG9uZyBnZm4pCiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICBp ZiAoIGVwdF9zcGxpdF9zdXBlcl9wYWdlKHAybSwgJmUsIGxldmVsLCBsZXZlbCAtIDEpICkKICAg ICAgICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICAgICAgd3JjID0gYXRvbWlj X3dyaXRlX2VwdF9lbnRyeSgmZXB0ZVtpXSwgZSwgbGV2ZWwpOworICAgICAgICAgICAgICAgICAg ICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZlcHRlW2ldLCBlLCBsZXZl bCk7CiAgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQod3JjID09IDApOwogICAgICAgICAg ICAgICAgICAgICAgICAgdW5tYXBfZG9tYWluX3BhZ2UoZXB0ZSk7CiAgICAgICAgICAgICAgICAg ICAgICAgICBtZm4gPSBlLm1mbjsKQEAgLTYxMCw3ICs2MDgsNyBAQCBzdGF0aWMgaW50IHJlc29s dmVfbWlzY29uZmlnKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuKQog ICAgICAgICAgICAgICAgIGUucmVjYWxjID0gMDsKICAgICAgICAgICAgICAgICBpZiAoIHJlY2Fs YyAmJiBwMm1faXNfY2hhbmdlYWJsZShlLnNhX3AybXQpICkKICAgICAgICAgICAgICAgICAgICAg ZXB0X3AybV90eXBlX3RvX2ZsYWdzKHAybSwgJmUsIGUuc2FfcDJtdCwgZS5hY2Nlc3MpOwotICAg ICAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkoJmVwdGVbaV0sIGUsIGxl dmVsKTsKKyAgICAgICAgICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwg JmVwdGVbaV0sIGUsIGxldmVsKTsKICAgICAgICAgICAgICAgICBBU1NFUlQod3JjID09IDApOwog ICAgICAgICAgICAgfQogCkBAIC02MjEsMTEgKzYxOSwxMSBAQCBzdGF0aWMgaW50IHJlc29sdmVf bWlzY29uZmlnKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuKQogICAg ICAgICBpZiAoIGUuZW10ID09IE1UUlJfTlVNX1RZUEVTICkKICAgICAgICAgewogICAgICAgICAg ICAgQVNTRVJUKGlzX2VwdGVfcHJlc2VudCgmZSkpOwotICAgICAgICAgICAgZXB0X2ludmFsaWRh dGVfZW10KF9tZm4oZS5tZm4pLCBlLnJlY2FsYywgbGV2ZWwpOworICAgICAgICAgICAgZXB0X2lu dmFsaWRhdGVfZW10KHAybSwgX21mbihlLm1mbiksIGUucmVjYWxjLCBsZXZlbCk7CiAgICAgICAg ICAgICBzbXBfd21iKCk7CiAgICAgICAgICAgICBlLmVtdCA9IDA7CiAgICAgICAgICAgICBlLnJl Y2FsYyA9IDA7Ci0gICAgICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KCZlcHRl W2ldLCBlLCBsZXZlbCk7CisgICAgICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5 KHAybSwgJmVwdGVbaV0sIGUsIGxldmVsKTsKICAgICAgICAgICAgIEFTU0VSVCh3cmMgPT0gMCk7 CiAgICAgICAgICAgICB1bm1hcF9kb21haW5fcGFnZShlcHRlKTsKICAgICAgICAgICAgIHJjID0g MTsKQEAgLTc4Niw3ICs3ODQsNyBAQCBlcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpw Mm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwKIAogICAgICAgICAvKiBub3cgaW5zdGFsbCB0aGUg bmV3bHkgc3BsaXQgZXB0IHN1Yi10cmVlICovCiAgICAgICAgIC8qIE5COiBwbGVhc2UgbWFrZSBz dXJlIGRvbWlhbiBpcyBwYXVzZWQgYW5kIG5vIGluLWZseSBWVC1kIERNQS4gKi8KLSAgICAgICAg cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KGVwdF9lbnRyeSwgc3BsaXRfZXB0X2VudHJ5LCBp KTsKKyAgICAgICAgcmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgZXB0X2VudHJ5LCBz cGxpdF9lcHRfZW50cnksIGkpOwogICAgICAgICBBU1NFUlQocmMgPT0gMCk7CiAKICAgICAgICAg LyogdGhlbiBtb3ZlIHRvIHRoZSBsZXZlbCB3ZSB3YW50IHRvIG1ha2UgcmVhbCBjaGFuZ2VzICov CkBAIC04MzMsMjQgKzgzMSw3IEBAIGVwdF9zZXRfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAy bSwgZ2ZuX3QgZ2ZuXywgbWZuX3QgbWZuLAogICAgICAgICBuZXdfZW50cnkuc3VwcHJlc3NfdmUg PSBpc19lcHRlX3ZhbGlkKCZvbGRfZW50cnkpID8KICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG9sZF9lbnRyeS5zdXBwcmVzc192ZSA6IDE7CiAKLSAgICAvKgotICAgICAqIHAy bV9pb3JlcV9zZXJ2ZXIgaXMgb25seSB1c2VkIGZvciA0SyBwYWdlcywgc28gdGhlCi0gICAgICog Y291bnQgaXMgb25seSBkb25lIG9uIGVwdCBwYWdlIHRhYmxlIGVudHJpZXMuCi0gICAgICovCi0g ICAgaWYgKCBwMm10ID09IHAybV9pb3JlcV9zZXJ2ZXIgKQotICAgIHsKLSAgICAgICAgQVNTRVJU KGkgPT0gMCk7Ci0gICAgICAgIHAybS0+aW9yZXEuZW50cnlfY291bnQrKzsKLSAgICB9Ci0KLSAg ICBpZiAoIGVwdF9lbnRyeS0+c2FfcDJtdCA9PSBwMm1faW9yZXFfc2VydmVyICkKLSAgICB7Ci0g ICAgICAgIEFTU0VSVChpID09IDApOwotICAgICAgICBBU1NFUlQocDJtLT5pb3JlcS5lbnRyeV9j b3VudCA+IDApOwotICAgICAgICBwMm0tPmlvcmVxLmVudHJ5X2NvdW50LS07Ci0gICAgfQotCi0g ICAgcmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KGVwdF9lbnRyeSwgbmV3X2VudHJ5LCB0YXJn ZXQpOworICAgIHJjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sIGVwdF9lbnRyeSwgbmV3 X2VudHJ5LCB0YXJnZXQpOwogICAgIGlmICggdW5saWtlbHkocmMpICkKICAgICAgICAgb2xkX2Vu dHJ5LmVwdGUgPSAwOwogICAgIGVsc2UKQEAgLTEwNzAsNyArMTA1MSw3IEBAIHN0YXRpYyB2b2lk IGVwdF9jaGFuZ2VfZW50cnlfdHlwZV9nbG9iYWwoc3RydWN0IHAybV9kb21haW4gKnAybSwKICAg ICBpZiAoICFtZm4gKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIGVwdF9pbnZhbGlkYXRl X2VtdChfbWZuKG1mbiksIDEsIHAybS0+ZXB0LndsKSApCisgICAgaWYgKCBlcHRfaW52YWxpZGF0 ZV9lbXQocDJtLCBfbWZuKG1mbiksIDEsIHAybS0+ZXB0LndsKSApCiAgICAgICAgIGVwdF9zeW5j X2RvbWFpbihwMm0pOwogfQogCkBAIC0xMTI4LDcgKzExMDksNyBAQCBzdGF0aWMgdm9pZCBlcHRf bWVtb3J5X3R5cGVfY2hhbmdlZChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtKQogICAgIGlmICggIW1m biApCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICggZXB0X2ludmFsaWRhdGVfZW10KF9tZm4o bWZuKSwgMCwgcDJtLT5lcHQud2wpICkKKyAgICBpZiAoIGVwdF9pbnZhbGlkYXRlX2VtdChwMm0s IF9tZm4obWZuKSwgMCwgcDJtLT5lcHQud2wpICkKICAgICAgICAgZXB0X3N5bmNfZG9tYWluKHAy bSk7CiB9CiAKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYyBiL3hlbi9hcmNo L3g4Ni9tbS9wMm0tcHQuYwppbmRleCA3OTE2MDBmNmJhLi5mZDYzODZiOGZkIDEwMDY0NAotLS0g YS94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMKKysrIGIveGVuL2FyY2gveDg2L21tL3AybS1wdC5j CkBAIC00MzYsMTMgKzQzNiw2IEBAIHN0YXRpYyBpbnQgZG9fcmVjYWxjKHN0cnVjdCBwMm1fZG9t YWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuKQogICAgICAgICAgICAgICAgIGZsYWdzIHw9IF9Q QUdFX1BTRTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgaWYgKCBvdCA9PSBwMm1faW9y ZXFfc2VydmVyICkKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBBU1NFUlQocDJtLT5p b3JlcS5lbnRyeV9jb3VudCA+IDApOwotICAgICAgICAgICAgICAgIEFTU0VSVChsZXZlbCA9PSAw KTsKLSAgICAgICAgICAgICAgICBwMm0tPmlvcmVxLmVudHJ5X2NvdW50LS07Ci0gICAgICAgICAg ICB9Ci0KICAgICAgICAgICAgIGUgPSBsMWVfZnJvbV9wZm4obWZuLCBmbGFncyk7CiAgICAgICAg ICAgICBwMm1fYWRkX2lvbW11X2ZsYWdzKCZlLCBsZXZlbCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKG50ID09IHAybV9yYW1fcncpCkBAIC02MDgsOCArNjAxLDYgQEAgcDJtX3B0 X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5fdCBnZm5fLCBtZm5fdCBtZm4s CiAKICAgICBpZiAoIHBhZ2Vfb3JkZXIgPT0gUEFHRV9PUkRFUl80SyApCiAgICAgewotICAgICAg ICBwMm1fdHlwZV90IHAybXRfb2xkOwotCiAgICAgICAgIHJjID0gcDJtX25leHRfbGV2ZWwocDJt LCAmdGFibGUsICZnZm5fcmVtYWluZGVyLCBnZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgTDJfUEFHRVRBQkxFX1NISUZUIC0gUEFHRV9TSElGVCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBMMl9QQUdFVEFCTEVfRU5UUklFUywgMSwgMSk7CkBAIC02MzMsMjEgKzYyNCw2IEBA IHAybV9wdF9zZXRfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgZ2ZuX3QgZ2ZuXywgbWZu X3QgbWZuLAogICAgICAgICBpZiAoIGVudHJ5X2NvbnRlbnQubDEgIT0gMCApCiAgICAgICAgICAg ICBwMm1fYWRkX2lvbW11X2ZsYWdzKCZlbnRyeV9jb250ZW50LCAwLCBpb21tdV9wdGVfZmxhZ3Mp OwogCi0gICAgICAgIHAybXRfb2xkID0gcDJtX2ZsYWdzX3RvX3R5cGUobDFlX2dldF9mbGFncygq cDJtX2VudHJ5KSk7Ci0KLSAgICAgICAgLyoKLSAgICAgICAgICogcDJtX2lvcmVxX3NlcnZlciBp cyBvbmx5IHVzZWQgZm9yIDRLIHBhZ2VzLCBzbwotICAgICAgICAgKiB0aGUgY291bnQgaXMgb25s eSBkb25lIGZvciBsZXZlbCAxIGVudHJpZXMuCi0gICAgICAgICAqLwotICAgICAgICBpZiAoIHAy bXQgPT0gcDJtX2lvcmVxX3NlcnZlciApCi0gICAgICAgICAgICBwMm0tPmlvcmVxLmVudHJ5X2Nv dW50Kys7Ci0KLSAgICAgICAgaWYgKCBwMm10X29sZCA9PSBwMm1faW9yZXFfc2VydmVyICkKLSAg ICAgICAgewotICAgICAgICAgICAgQVNTRVJUKHAybS0+aW9yZXEuZW50cnlfY291bnQgPiAwKTsK LSAgICAgICAgICAgIHAybS0+aW9yZXEuZW50cnlfY291bnQtLTsKLSAgICAgICAgfQotCiAgICAg ICAgIC8qIGxldmVsIDEgZW50cnkgKi8KICAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJt LCBnZm4sIHAybV9lbnRyeSwgZW50cnlfY29udGVudCwgMSk7CiAgICAgICAgIC8qIE5COiBwYWdp bmdfd3JpdGVfcDJtX2VudHJ5KCkgaGFuZGxlcyB0bGIgZmx1c2hlcyBwcm9wZXJseSAqLwpkaWZm IC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYyBiL3hlbi9hcmNoL3g4Ni9t bS9zaGFkb3cvY29tbW9uLmMKaW5kZXggYzQ5YWViNWU2MC4uNmQ4YTk1MDA1NCAxMDA2NDQKLS0t IGEveGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYworKysgYi94ZW4vYXJjaC94ODYvbW0v c2hhZG93L2NvbW1vbi5jCkBAIC0zMTgwLDYgKzMxODAsOSBAQCBzaGFkb3dfd3JpdGVfcDJtX2Vu dHJ5KHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuLAogICAgIGlmICggbGlrZWx5 KGQtPmFyY2gucGFnaW5nLnNoYWRvdy50b3RhbF9wYWdlcyAhPSAwKSApCiAgICAgICAgICBzaF91 bnNoYWRvd19mb3JfcDJtX2NoYW5nZShkLCBnZm4sIHAsIG5ldywgbGV2ZWwpOwogCisgICAgcDJt X2VudHJ5X21vZGlmeShwMm1fZ2V0X2hvc3RwMm0oZCksIHAybV9mbGFnc190b190eXBlKGwxZV9n ZXRfZmxhZ3MobmV3KSksCisgICAgICAgICAgICAgICAgICAgICBwMm1fZmxhZ3NfdG9fdHlwZShs MWVfZ2V0X2ZsYWdzKCpwKSksIGxldmVsKTsKKwogICAgIC8qIFVwZGF0ZSB0aGUgZW50cnkgd2l0 aCBuZXcgY29udGVudCAqLwogICAgIHNhZmVfd3JpdGVfcHRlKHAsIG5ldyk7CiAKZGlmZiAtLWdp dCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5o CmluZGV4IDIwOTUwNzY1NTYuLjgzNGQ0OWQyZDQgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2Fz bS14ODYvcDJtLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaApAQCAtOTMyLDYgKzkz MiwzOCBAQCBpbnQgcDJtX3NldF9pb3JlcV9zZXJ2ZXIoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWdu ZWQgaW50IGZsYWdzLAogc3RydWN0IGh2bV9pb3JlcV9zZXJ2ZXIgKnAybV9nZXRfaW9yZXFfc2Vy dmVyKHN0cnVjdCBkb21haW4gKmQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdW5zaWduZWQgaW50ICpmbGFncyk7CiAKK3N0YXRpYyBpbmxpbmUgdm9pZCBw Mm1fZW50cnlfbW9kaWZ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHAybV90eXBlX3QgbnQsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwMm1fdHlwZV90IG90LCB1bnNpZ25l ZCBpbnQgbGV2ZWwpCit7CisgICAgaWYgKCBsZXZlbCAhPSAxIHx8IG50ID09IG90ICkKKyAgICAg ICAgcmV0dXJuOworCisgICAgc3dpdGNoICggbnQgKQorICAgIHsKKyAgICBjYXNlIHAybV9pb3Jl cV9zZXJ2ZXI6CisgICAgICAgIC8qCisgICAgICAgICAqIHAybV9pb3JlcV9zZXJ2ZXIgaXMgb25s eSB1c2VkIGZvciA0SyBwYWdlcywgc28KKyAgICAgICAgICogdGhlIGNvdW50IGlzIG9ubHkgZG9u ZSBmb3IgbGV2ZWwgMSBlbnRyaWVzLgorICAgICAgICAgKi8KKyAgICAgICAgcDJtLT5pb3JlcS5l bnRyeV9jb3VudCsrOworICAgICAgICBicmVhazsKKworICAgIGRlZmF1bHQ6CisgICAgICAgIGJy ZWFrOworICAgIH0KKworICAgIHN3aXRjaCAoIG90ICkKKyAgICB7CisgICAgY2FzZSBwMm1faW9y ZXFfc2VydmVyOgorICAgICAgICBBU1NFUlQocDJtLT5pb3JlcS5lbnRyeV9jb3VudCA+IDApOwor ICAgICAgICBwMm0tPmlvcmVxLmVudHJ5X2NvdW50LS07CisgICAgICAgIGJyZWFrOworCisgICAg ZGVmYXVsdDoKKyAgICAgICAgYnJlYWs7CisgICAgfQorfQorCiAjZW5kaWYgLyogX1hFTl9BU01f WDg2X1AyTV9IICovCiAKIC8qCi0tIAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4v bGlzdGluZm8veGVuLWRldmVs