From: Roger Pau Monne Subject: [PATCH 6/8] x86/mm: split p2m ioreq server pages special handling into helper Date: Wed, 30 Jan 2019 11:36:44 +0100 Message-ID: <20190130103646.53649-7-roger.pau@citrix.com> References: <20190130103646.53649-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 1gonF7-0001RA-4C for xen-devel@lists.xenproject.org; Wed, 30 Jan 2019 10:37:17 +0000 In-Reply-To: <20190130103646.53649-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 bnRAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jICAgICAgIHwgIDMg KysKIHhlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMgICAgICAgfCA1NSArKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYyAgICAgICAgfCAyMCAt LS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMgfCAgMyArKwogeGVu L2luY2x1ZGUvYXNtLXg4Ni9wMm0uaCAgICAgICB8IDMyICsrKysrKysrKysrKysrKysrKysKIDUg ZmlsZXMgY2hhbmdlZCwgNTYgaW5zZXJ0aW9ucygrKSwgNTcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEveGVuL2FyY2gveDg2L21tL2hhcC9oYXAuYyBiL3hlbi9hcmNoL3g4Ni9tbS9oYXAvaGFw LmMKaW5kZXggM2Q2NTFiOTRjMy4uZGM0NmQ1ZTE0ZiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2 L21tL2hhcC9oYXAuYworKysgYi94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jCkBAIC03MzQsNiAr NzM0LDkgQEAgaGFwX3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBs b25nIGdmbiwgbDFfcGdlbnRyeV90ICpwLAogICAgICAgICAgICAgJiYgcGVybXNfc3RyaWN0bHlf aW5jcmVhc2VkKG9sZF9mbGFncywgbDFlX2dldF9mbGFncyhuZXcpKSApOwogICAgIH0KIAorICAg IHAybV9lbnRyeV9tb2RpZnkocDJtX2dldF9ob3N0cDJtKGQpLCBwMm1fZmxhZ3NfdG9fdHlwZShs MWVfZ2V0X2ZsYWdzKG5ldykpLAorICAgICAgICAgICAgICAgICAgICAgcDJtX2ZsYWdzX3RvX3R5 cGUob2xkX2ZsYWdzKSwgbGV2ZWwpOworCiAgICAgc2FmZV93cml0ZV9wdGUocCwgbmV3KTsKICAg ICBpZiAoIG9sZF9mbGFncyAmIF9QQUdFX1BSRVNFTlQgKQogICAgICAgICBmbHVzaF90bGJfbWFz ayhkLT5kaXJ0eV9jcHVtYXNrKTsKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0 LmMgYi94ZW4vYXJjaC94ODYvbW0vcDJtLWVwdC5jCmluZGV4IGJiNTYyNjA3ZjcuLjBlY2U2NjA4 Y2IgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMKKysrIGIveGVuL2FyY2gv eDg2L21tL3AybS1lcHQuYwpAQCAtNDYsNyArNDYsOCBAQCBzdGF0aWMgaW5saW5lIGJvb2xfdCBp c19lcHRlX3ZhbGlkKGVwdF9lbnRyeV90ICplKQogfQogCiAvKiByZXR1cm5zIDogMCBmb3Igc3Vj Y2VzcywgLWVycm5vIG90aGVyd2lzZSAqLwotc3RhdGljIGludCBhdG9taWNfd3JpdGVfZXB0X2Vu dHJ5KGVwdF9lbnRyeV90ICplbnRyeXB0ciwgZXB0X2VudHJ5X3QgbmV3LAorc3RhdGljIGludCBh dG9taWNfd3JpdGVfZXB0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZXB0X2VudHJ5X3QgKmVudHJ5cHRyLCBlcHRfZW50cnlf dCBuZXcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGxldmVsKQogewog ICAgIGludCByYzsKQEAgLTg5LDYgKzkwLDggQEAgc3RhdGljIGludCBhdG9taWNfd3JpdGVfZXB0 X2VudHJ5KGVwdF9lbnRyeV90ICplbnRyeXB0ciwgZXB0X2VudHJ5X3QgbmV3LAogICAgIGlmICgg dW5saWtlbHkocDJtX2lzX2ZvcmVpZ24oZW50cnlwdHItPnNhX3AybXQpKSAmJiBjaGVja19mb3Jl aWduICkKICAgICAgICAgb2xkbWZuID0gZW50cnlwdHItPm1mbjsKIAorICAgIHAybV9lbnRyeV9t b2RpZnkocDJtLCBuZXcuc2FfcDJtdCwgZW50cnlwdHItPnNhX3AybXQsIGxldmVsKTsKKwogICAg IHdyaXRlX2F0b21pYygmZW50cnlwdHItPmVwdGUsIG5ldy5lcHRlKTsKIAogICAgIGlmICggdW5s aWtlbHkob2xkbWZuICE9IG1mbl94KElOVkFMSURfTUZOKSkgKQpAQCAtMzkwLDcgKzM5Myw4IEBA IHN0YXRpYyBpbnQgZXB0X25leHRfbGV2ZWwoc3RydWN0IHAybV9kb21haW4gKnAybSwgYm9vbF90 IHJlYWRfb25seSwKICAqIHByZXNlbnQgZW50cmllcyBpbiB0aGUgZ2l2ZW4gcGFnZSB0YWJsZSwg b3B0aW9uYWxseSBtYXJraW5nIHRoZSBlbnRyaWVzCiAgKiBhbHNvIGZvciB0aGVpciBzdWJ0cmVl cyBuZWVkaW5nIFAyTSB0eXBlIHJlLWNhbGN1bGF0aW9uLgogICovCi1zdGF0aWMgYm9vbF90IGVw dF9pbnZhbGlkYXRlX2VtdChtZm5fdCBtZm4sIGJvb2xfdCByZWNhbGMsIGludCBsZXZlbCkKK3N0 YXRpYyBib29sX3QgZXB0X2ludmFsaWRhdGVfZW10KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIG1m bl90IG1mbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2xfdCByZWNhbGMs IGludCBsZXZlbCkKIHsKICAgICBpbnQgcmM7CiAgICAgZXB0X2VudHJ5X3QgKmVwdGUgPSBtYXBf ZG9tYWluX3BhZ2UobWZuKTsKQEAgLTQwOCw3ICs0MTIsNyBAQCBzdGF0aWMgYm9vbF90IGVwdF9p bnZhbGlkYXRlX2VtdChtZm5fdCBtZm4sIGJvb2xfdCByZWNhbGMsIGludCBsZXZlbCkKICAgICAg ICAgZS5lbXQgPSBNVFJSX05VTV9UWVBFUzsKICAgICAgICAgaWYgKCByZWNhbGMgKQogICAgICAg ICAgICAgZS5yZWNhbGMgPSAxOwotICAgICAgICByYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnko JmVwdGVbaV0sIGUsIGxldmVsKTsKKyAgICAgICAgcmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5 KHAybSwgJmVwdGVbaV0sIGUsIGxldmVsKTsKICAgICAgICAgQVNTRVJUKHJjID09IDApOwogICAg ICAgICBjaGFuZ2VkID0gMTsKICAgICB9CkBAIC00NTksNyArNDYzLDcgQEAgc3RhdGljIGludCBl cHRfaW52YWxpZGF0ZV9lbXRfcmFuZ2Uoc3RydWN0IHAybV9kb21haW4gKnAybSwKICAgICAgICAg ICAgIHJjID0gLUVOT01FTTsKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgICAgICB9Ci0gICAg ICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkoJnRhYmxlW2luZGV4XSwgc3BsaXRfZXB0 X2VudHJ5LCBpKTsKKyAgICAgICAgd3JjID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeShwMm0sICZ0 YWJsZVtpbmRleF0sIHNwbGl0X2VwdF9lbnRyeSwgaSk7CiAgICAgICAgIEFTU0VSVCh3cmMgPT0g MCk7CiAKICAgICAgICAgZm9yICggOyBpID4gdGFyZ2V0OyAtLWkgKQpAQCAtNDc5LDcgKzQ4Myw3 IEBAIHN0YXRpYyBpbnQgZXB0X2ludmFsaWRhdGVfZW10X3JhbmdlKHN0cnVjdCBwMm1fZG9tYWlu ICpwMm0sCiAgICAgICAgIHsKICAgICAgICAgICAgIGUuZW10ID0gTVRSUl9OVU1fVFlQRVM7CiAg ICAgICAgICAgICBlLnJlY2FsYyA9IDE7Ci0gICAgICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVf ZXB0X2VudHJ5KCZ0YWJsZVtpbmRleF0sIGUsIHRhcmdldCk7CisgICAgICAgICAgICB3cmMgPSBh dG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgJnRhYmxlW2luZGV4XSwgZSwgdGFyZ2V0KTsKICAg ICAgICAgICAgIEFTU0VSVCh3cmMgPT0gMCk7CiAgICAgICAgICAgICByYyA9IDE7CiAgICAgICAg IH0KQEAgLTU0OSwxNyArNTUzLDExIEBAIHN0YXRpYyBpbnQgcmVzb2x2ZV9taXNjb25maWcoc3Ry dWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4pCiAgICAgICAgICAgICAgICAg ICAgIG50ID0gcDJtX3JlY2FsY190eXBlKGUucmVjYWxjLCBlLnNhX3AybXQsIHAybSwgZ2ZuICsg aSk7CiAgICAgICAgICAgICAgICAgICAgIGlmICggbnQgIT0gZS5zYV9wMm10ICkKICAgICAgICAg ICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCBlLnNhX3AybXQgPT0g cDJtX2lvcmVxX3NlcnZlciApCi0gICAgICAgICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgQVNTRVJUKHAybS0+aW9yZXEuZW50cnlfY291bnQgPiAwKTsKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBwMm0tPmlvcmVxLmVudHJ5X2NvdW50LS07Ci0gICAg ICAgICAgICAgICAgICAgICAgICB9Ci0KICAgICAgICAgICAgICAgICAgICAgICAgIGUuc2FfcDJt dCA9IG50OwogICAgICAgICAgICAgICAgICAgICAgICAgZXB0X3AybV90eXBlX3RvX2ZsYWdzKHAy bSwgJmUsIGUuc2FfcDJtdCwgZS5hY2Nlc3MpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgICAgIGUucmVjYWxjID0gMDsKLSAgICAgICAgICAgICAgICAgICAgd3JjID0g YXRvbWljX3dyaXRlX2VwdF9lbnRyeSgmZXB0ZVtpXSwgZSwgbGV2ZWwpOworICAgICAgICAgICAg ICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgJmVwdGVbaV0sIGUsIGxl dmVsKTsKICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKHdyYyA9PSAwKTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9CkBAIC01OTUsNyArNTkzLDcgQEAgc3RhdGljIGludCByZXNv bHZlX21pc2NvbmZpZyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikK ICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgIGlmICggZXB0X3NwbGl0X3N1 cGVyX3BhZ2UocDJtLCAmZSwgbGV2ZWwsIGxldmVsIC0gMSkgKQogICAgICAgICAgICAgICAgICAg ICB7Ci0gICAgICAgICAgICAgICAgICAgICAgICB3cmMgPSBhdG9taWNfd3JpdGVfZXB0X2VudHJ5 KCZlcHRlW2ldLCBlLCBsZXZlbCk7CisgICAgICAgICAgICAgICAgICAgICAgICB3cmMgPSBhdG9t aWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgJmVwdGVbaV0sIGUsIGxldmVsKTsKICAgICAgICAgICAg ICAgICAgICAgICAgIEFTU0VSVCh3cmMgPT0gMCk7CiAgICAgICAgICAgICAgICAgICAgICAgICB1 bm1hcF9kb21haW5fcGFnZShlcHRlKTsKICAgICAgICAgICAgICAgICAgICAgICAgIG1mbiA9IGUu bWZuOwpAQCAtNjEwLDcgKzYwOCw3IEBAIHN0YXRpYyBpbnQgcmVzb2x2ZV9taXNjb25maWcoc3Ry dWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4pCiAgICAgICAgICAgICAgICAg ZS5yZWNhbGMgPSAwOwogICAgICAgICAgICAgICAgIGlmICggcmVjYWxjICYmIHAybV9pc19jaGFu Z2VhYmxlKGUuc2FfcDJtdCkgKQogICAgICAgICAgICAgICAgICAgICBlcHRfcDJtX3R5cGVfdG9f ZmxhZ3MocDJtLCAmZSwgZS5zYV9wMm10LCBlLmFjY2Vzcyk7Ci0gICAgICAgICAgICAgICAgd3Jj ID0gYXRvbWljX3dyaXRlX2VwdF9lbnRyeSgmZXB0ZVtpXSwgZSwgbGV2ZWwpOworICAgICAgICAg ICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtpXSwgZSwgbGV2 ZWwpOwogICAgICAgICAgICAgICAgIEFTU0VSVCh3cmMgPT0gMCk7CiAgICAgICAgICAgICB9CiAK QEAgLTYyMSwxMSArNjE5LDExIEBAIHN0YXRpYyBpbnQgcmVzb2x2ZV9taXNjb25maWcoc3RydWN0 IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4pCiAgICAgICAgIGlmICggZS5lbXQg PT0gTVRSUl9OVU1fVFlQRVMgKQogICAgICAgICB7CiAgICAgICAgICAgICBBU1NFUlQoaXNfZXB0 ZV9wcmVzZW50KCZlKSk7Ci0gICAgICAgICAgICBlcHRfaW52YWxpZGF0ZV9lbXQoX21mbihlLm1m biksIGUucmVjYWxjLCBsZXZlbCk7CisgICAgICAgICAgICBlcHRfaW52YWxpZGF0ZV9lbXQocDJt LCBfbWZuKGUubWZuKSwgZS5yZWNhbGMsIGxldmVsKTsKICAgICAgICAgICAgIHNtcF93bWIoKTsK ICAgICAgICAgICAgIGUuZW10ID0gMDsKICAgICAgICAgICAgIGUucmVjYWxjID0gMDsKLSAgICAg ICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkoJmVwdGVbaV0sIGUsIGxldmVsKTsK KyAgICAgICAgICAgIHdyYyA9IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCAmZXB0ZVtpXSwg ZSwgbGV2ZWwpOwogICAgICAgICAgICAgQVNTRVJUKHdyYyA9PSAwKTsKICAgICAgICAgICAgIHVu bWFwX2RvbWFpbl9wYWdlKGVwdGUpOwogICAgICAgICAgICAgcmMgPSAxOwpAQCAtNzg2LDcgKzc4 NCw3IEBAIGVwdF9zZXRfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgZ2ZuX3QgZ2ZuXywg bWZuX3QgbWZuLAogCiAgICAgICAgIC8qIG5vdyBpbnN0YWxsIHRoZSBuZXdseSBzcGxpdCBlcHQg c3ViLXRyZWUgKi8KICAgICAgICAgLyogTkI6IHBsZWFzZSBtYWtlIHN1cmUgZG9taWFuIGlzIHBh dXNlZCBhbmQgbm8gaW4tZmx5IFZULWQgRE1BLiAqLwotICAgICAgICByYyA9IGF0b21pY193cml0 ZV9lcHRfZW50cnkoZXB0X2VudHJ5LCBzcGxpdF9lcHRfZW50cnksIGkpOworICAgICAgICByYyA9 IGF0b21pY193cml0ZV9lcHRfZW50cnkocDJtLCBlcHRfZW50cnksIHNwbGl0X2VwdF9lbnRyeSwg aSk7CiAgICAgICAgIEFTU0VSVChyYyA9PSAwKTsKIAogICAgICAgICAvKiB0aGVuIG1vdmUgdG8g dGhlIGxldmVsIHdlIHdhbnQgdG8gbWFrZSByZWFsIGNoYW5nZXMgKi8KQEAgLTgzMywyNCArODMx LDcgQEAgZXB0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5fdCBnZm5fLCBt Zm5fdCBtZm4sCiAgICAgICAgIG5ld19lbnRyeS5zdXBwcmVzc192ZSA9IGlzX2VwdGVfdmFsaWQo Jm9sZF9lbnRyeSkgPwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2xkX2Vu dHJ5LnN1cHByZXNzX3ZlIDogMTsKIAotICAgIC8qCi0gICAgICogcDJtX2lvcmVxX3NlcnZlciBp cyBvbmx5IHVzZWQgZm9yIDRLIHBhZ2VzLCBzbyB0aGUKLSAgICAgKiBjb3VudCBpcyBvbmx5IGRv bmUgb24gZXB0IHBhZ2UgdGFibGUgZW50cmllcy4KLSAgICAgKi8KLSAgICBpZiAoIHAybXQgPT0g cDJtX2lvcmVxX3NlcnZlciApCi0gICAgewotICAgICAgICBBU1NFUlQoaSA9PSAwKTsKLSAgICAg ICAgcDJtLT5pb3JlcS5lbnRyeV9jb3VudCsrOwotICAgIH0KLQotICAgIGlmICggZXB0X2VudHJ5 LT5zYV9wMm10ID09IHAybV9pb3JlcV9zZXJ2ZXIgKQotICAgIHsKLSAgICAgICAgQVNTRVJUKGkg PT0gMCk7Ci0gICAgICAgIEFTU0VSVChwMm0tPmlvcmVxLmVudHJ5X2NvdW50ID4gMCk7Ci0gICAg ICAgIHAybS0+aW9yZXEuZW50cnlfY291bnQtLTsKLSAgICB9Ci0KLSAgICByYyA9IGF0b21pY193 cml0ZV9lcHRfZW50cnkoZXB0X2VudHJ5LCBuZXdfZW50cnksIHRhcmdldCk7CisgICAgcmMgPSBh dG9taWNfd3JpdGVfZXB0X2VudHJ5KHAybSwgZXB0X2VudHJ5LCBuZXdfZW50cnksIHRhcmdldCk7 CiAgICAgaWYgKCB1bmxpa2VseShyYykgKQogICAgICAgICBvbGRfZW50cnkuZXB0ZSA9IDA7CiAg ICAgZWxzZQpAQCAtMTA3MCw3ICsxMDUxLDcgQEAgc3RhdGljIHZvaWQgZXB0X2NoYW5nZV9lbnRy eV90eXBlX2dsb2JhbChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgIGlmICggIW1mbiApCiAg ICAgICAgIHJldHVybjsKIAotICAgIGlmICggZXB0X2ludmFsaWRhdGVfZW10KF9tZm4obWZuKSwg MSwgcDJtLT5lcHQud2wpICkKKyAgICBpZiAoIGVwdF9pbnZhbGlkYXRlX2VtdChwMm0sIF9tZm4o bWZuKSwgMSwgcDJtLT5lcHQud2wpICkKICAgICAgICAgZXB0X3N5bmNfZG9tYWluKHAybSk7CiB9 CiAKQEAgLTExMjgsNyArMTEwOSw3IEBAIHN0YXRpYyB2b2lkIGVwdF9tZW1vcnlfdHlwZV9jaGFu Z2VkKHN0cnVjdCBwMm1fZG9tYWluICpwMm0pCiAgICAgaWYgKCAhbWZuICkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgaWYgKCBlcHRfaW52YWxpZGF0ZV9lbXQoX21mbihtZm4pLCAwLCBwMm0tPmVw dC53bCkgKQorICAgIGlmICggZXB0X2ludmFsaWRhdGVfZW10KHAybSwgX21mbihtZm4pLCAwLCBw Mm0tPmVwdC53bCkgKQogICAgICAgICBlcHRfc3luY19kb21haW4ocDJtKTsKIH0KIApkaWZmIC0t Z2l0IGEveGVuL2FyY2gveDg2L21tL3AybS1wdC5jIGIveGVuL2FyY2gveDg2L21tL3AybS1wdC5j CmluZGV4IGI4OTk2ZTU0MTUuLmM4OTA1YTU1OTcgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9t bS9wMm0tcHQuYworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMKQEAgLTQzNiwxMyArNDM2 LDYgQEAgc3RhdGljIGludCBkb19yZWNhbGMoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWdu ZWQgbG9uZyBnZm4pCiAgICAgICAgICAgICAgICAgZmxhZ3MgfD0gX1BBR0VfUFNFOwogICAgICAg ICAgICAgfQogCi0gICAgICAgICAgICBpZiAoIG90ID09IHAybV9pb3JlcV9zZXJ2ZXIgKQotICAg ICAgICAgICAgewotICAgICAgICAgICAgICAgIEFTU0VSVChwMm0tPmlvcmVxLmVudHJ5X2NvdW50 ID4gMCk7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKGxldmVsID09IDApOwotICAgICAgICAgICAg ICAgIHAybS0+aW9yZXEuZW50cnlfY291bnQtLTsKLSAgICAgICAgICAgIH0KLQogICAgICAgICAg ICAgZSA9IGwxZV9mcm9tX3BmbihtZm4sIGZsYWdzKTsKICAgICAgICAgICAgIHAybV9hZGRfaW9t bXVfZmxhZ3MoJmUsIGxldmVsLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobnQg PT0gcDJtX3JhbV9ydykKQEAgLTYyNywxOSArNjIwLDYgQEAgcDJtX3B0X3NldF9lbnRyeShzdHJ1 Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5fdCBnZm5fLCBtZm5fdCBtZm4sCiAKICAgICAgICAgcDJt dF9vbGQgPSBwMm1fZmxhZ3NfdG9fdHlwZShsMWVfZ2V0X2ZsYWdzKCpwMm1fZW50cnkpKTsKIAot ICAgICAgICAvKgotICAgICAgICAgKiBwMm1faW9yZXFfc2VydmVyIGlzIG9ubHkgdXNlZCBmb3Ig NEsgcGFnZXMsIHNvCi0gICAgICAgICAqIHRoZSBjb3VudCBpcyBvbmx5IGRvbmUgZm9yIGxldmVs IDEgZW50cmllcy4KLSAgICAgICAgICovCi0gICAgICAgIGlmICggcDJtdCA9PSBwMm1faW9yZXFf c2VydmVyICkKLSAgICAgICAgICAgIHAybS0+aW9yZXEuZW50cnlfY291bnQrKzsKLQotICAgICAg ICBpZiAoIHAybXRfb2xkID09IHAybV9pb3JlcV9zZXJ2ZXIgKQotICAgICAgICB7Ci0gICAgICAg ICAgICBBU1NFUlQocDJtLT5pb3JlcS5lbnRyeV9jb3VudCA+IDApOwotICAgICAgICAgICAgcDJt LT5pb3JlcS5lbnRyeV9jb3VudC0tOwotICAgICAgICB9Ci0KICAgICAgICAgLyogbGV2ZWwgMSBl bnRyeSAqLwogICAgICAgICBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5 LCBlbnRyeV9jb250ZW50LCAxKTsKICAgICAgICAgLyogTkI6IHBhZ2luZ193cml0ZV9wMm1fZW50 cnkoKSBoYW5kbGVzIHRsYiBmbHVzaGVzIHByb3Blcmx5ICovCmRpZmYgLS1naXQgYS94ZW4vYXJj aC94ODYvbW0vc2hhZG93L2NvbW1vbi5jIGIveGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24u YwppbmRleCA3ODUyNWRkZDIzLi5iMjEwYzc0NDdlIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYv bW0vc2hhZG93L2NvbW1vbi5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMK QEAgLTMxODUsNiArMzE4NSw5IEBAIHNoYWRvd193cml0ZV9wMm1fZW50cnkoc3RydWN0IGRvbWFp biAqZCwgdW5zaWduZWQgbG9uZyBnZm4sCiAgICAgaWYgKCBsaWtlbHkoZC0+YXJjaC5wYWdpbmcu c2hhZG93LnRvdGFsX3BhZ2VzICE9IDApICkKICAgICAgICAgIHNoX3Vuc2hhZG93X2Zvcl9wMm1f Y2hhbmdlKGQsIGdmbiwgcCwgbmV3LCBsZXZlbCk7CiAKKyAgICBwMm1fZW50cnlfbW9kaWZ5KHAy bV9nZXRfaG9zdHAybShkKSwgcDJtX2ZsYWdzX3RvX3R5cGUobDFlX2dldF9mbGFncyhuZXcpKSwK KyAgICAgICAgICAgICAgICAgICAgIHAybV9mbGFnc190b190eXBlKGwxZV9nZXRfZmxhZ3MoKnAp KSwgbGV2ZWwpOworCiAgICAgLyogVXBkYXRlIHRoZSBlbnRyeSB3aXRoIG5ldyBjb250ZW50ICov CiAgICAgc2FmZV93cml0ZV9wdGUocCwgbmV3KTsKIApkaWZmIC0tZ2l0IGEveGVuL2luY2x1ZGUv YXNtLXg4Ni9wMm0uaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKaW5kZXggMjA5NTA3NjU1 Ni4uODM0ZDQ5ZDJkNCAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaAorKysg Yi94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oCkBAIC05MzIsNiArOTMyLDM4IEBAIGludCBwMm1f c2V0X2lvcmVxX3NlcnZlcihzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBpbnQgZmxhZ3MsCiBz dHJ1Y3QgaHZtX2lvcmVxX3NlcnZlciAqcDJtX2dldF9pb3JlcV9zZXJ2ZXIoc3RydWN0IGRvbWFp biAqZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNp Z25lZCBpbnQgKmZsYWdzKTsKIAorc3RhdGljIGlubGluZSB2b2lkIHAybV9lbnRyeV9tb2RpZnko c3RydWN0IHAybV9kb21haW4gKnAybSwgcDJtX3R5cGVfdCBudCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHAybV90eXBlX3Qgb3QsIHVuc2lnbmVkIGludCBsZXZlbCkKK3sK KyAgICBpZiAoIGxldmVsICE9IDEgfHwgbnQgPT0gb3QgKQorICAgICAgICByZXR1cm47CisKKyAg ICBzd2l0Y2ggKCBudCApCisgICAgeworICAgIGNhc2UgcDJtX2lvcmVxX3NlcnZlcjoKKyAgICAg ICAgLyoKKyAgICAgICAgICogcDJtX2lvcmVxX3NlcnZlciBpcyBvbmx5IHVzZWQgZm9yIDRLIHBh Z2VzLCBzbworICAgICAgICAgKiB0aGUgY291bnQgaXMgb25seSBkb25lIGZvciBsZXZlbCAxIGVu dHJpZXMuCisgICAgICAgICAqLworICAgICAgICBwMm0tPmlvcmVxLmVudHJ5X2NvdW50Kys7Cisg ICAgICAgIGJyZWFrOworCisgICAgZGVmYXVsdDoKKyAgICAgICAgYnJlYWs7CisgICAgfQorCisg ICAgc3dpdGNoICggb3QgKQorICAgIHsKKyAgICBjYXNlIHAybV9pb3JlcV9zZXJ2ZXI6CisgICAg ICAgIEFTU0VSVChwMm0tPmlvcmVxLmVudHJ5X2NvdW50ID4gMCk7CisgICAgICAgIHAybS0+aW9y ZXEuZW50cnlfY291bnQtLTsKKyAgICAgICAgYnJlYWs7CisKKyAgICBkZWZhdWx0OgorICAgICAg ICBicmVhazsKKyAgICB9Cit9CisKICNlbmRpZiAvKiBfWEVOX0FTTV9YODZfUDJNX0ggKi8KIAog LyoKLS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qu b3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2 ZWw=