From: Roger Pau Monne Subject: [PATCH v6.1 3/5] p2m: change write_p2m_entry to return an error code Date: Wed, 27 Feb 2019 12:30:31 +0100 Message-ID: <20190227113031.53725-1-roger.pau@citrix.com> References: <20190227110905.53512-4-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 1gyxQU-0002kU-LZ for xen-devel@lists.xenproject.org; Wed, 27 Feb 2019 11:31:02 +0000 In-Reply-To: <20190227110905.53512-4-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: Wei Liu , George Dunlap , Andrew Cooper , Tim Deegan , Jan Beulich , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org VGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgYWxzbyBjaGFuZ2luZyBwMm1fZW50cnlfbW9kaWZ5 IHRvIHJldHVybiBhbgplcnJvciBjb2RlLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UgaW50ZW5kZWQu CgpTaWduZWQtb2ZmLWJ5OiBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVAY2l0cml4LmNvbT4K LS0tCkNjOiBHZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGV1LmNpdHJpeC5jb20+CkNjOiBK YW4gQmV1bGljaCA8amJldWxpY2hAc3VzZS5jb20+CkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcu Y29vcGVyM0BjaXRyaXguY29tPgpDYzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ2M6 IFRpbSBEZWVnYW4gPHRpbUB4ZW4ub3JnPgotLS0KQ2hhbmdlcyBzaW5jZSB2NjoKIC0gRml4IGxp bmUgd3JhcHBpbmcgaW4gcDJtX25leHRfbGV2ZWwuCgpDaGFuZ2VzIHNpbmNlIHY1OgogLSBSZXR1 cm4gLUVPUE5PVFNVUFAgZnJvbSBfd3JpdGVfcDJtX2VudHJ5LgogLSBVc2UgYW4gZXJyb3IgbGFi ZWwgaW4gcDJtX25leHRfbGV2ZWwuCgpDaGFuZ2VzIHNpbmNlIHY0OgogLSBIYW5kbGUgZXJyb3Jz IGluIGxvb3BzIHRvIGF2b2lkIG92ZXJ3cml0aW5nIHRoZSB2YXJpYWJsZQogICBjb250YWluaW5n IHRoZSBlcnJvciBjb2RlIGluIG5vbi1kZWJ1ZyBidWlsZHMuCiAtIENoYW5nZSBlcnJvciBoYW5k bGluZyBpbiBwMm1fbmV4dF9sZXZlbCBzbyBpdCdzIGRvbmUgaW4gYSBzaW5nbGUKICAgcGxhY2Uu CgpDaGFuZ2VzIHNpbmNlIHYzOgogLSBVc2UgYXNzZXJ0cyBpbnN0ZWFkIG9mIGJ1Z3MgdG8gY2hl Y2sgcmV0dXJuIGNvZGUgZnJvbQogICB3cml0ZV9wMm1fZW50cnkgZnJvbSBjYWxsZXJzIHRoYXQg ZG9uJ3Qgc3VwcG9ydCBvciBleHBlY3QKICAgd3JpdGVfcDJtX2VudHJ5IHRvIGZhaWwuCgpDaGFu Z2VzIHNpbmNlIHYyOgogLSBOZXcgaW4gdGhpcyB2ZXJzaW9uLgotLS0KIHhlbi9hcmNoL3g4Ni9t bS9oYXAvaGFwLmMgICAgICAgIHwgIDQgKy0KIHhlbi9hcmNoL3g4Ni9tbS9oYXAvbmVzdGVkX2hh cC5jIHwgIDQgKy0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYyAgICAgICAgIHwgNzMgKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tLS0KIHhlbi9hcmNoL3g4Ni9tbS9wYWdpbmcuYyAgICAg ICAgIHwgMTIgKysrKy0tCiB4ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jICB8ICA0ICst CiB4ZW4vYXJjaC94ODYvbW0vc2hhZG93L25vbmUuYyAgICB8ICA3ICstLQogeGVuL2FyY2gveDg2 L21tL3NoYWRvdy9wcml2YXRlLmggfCAgNiArLS0KIHhlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgg ICAgICAgIHwgIDQgKy0KIHhlbi9pbmNsdWRlL2FzbS14ODYvcGFnaW5nLmggICAgIHwgIDggKyst LQogOSBmaWxlcyBjaGFuZ2VkLCA4OSBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jIGIveGVuL2FyY2gveDg2L21tL2hh cC9oYXAuYwppbmRleCAyZGI3ZjJjMDRhLi5mZGY3N2M1OWE1IDEwMDY0NAotLS0gYS94ZW4vYXJj aC94ODYvbW0vaGFwL2hhcC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9oYXAvaGFwLmMKQEAgLTcw OCw3ICs3MDgsNyBAQCBzdGF0aWMgdm9pZCBoYXBfdXBkYXRlX3BhZ2luZ19tb2RlcyhzdHJ1Y3Qg dmNwdSAqdikKICAgICBwdXRfZ2ZuKGQsIGNyM19nZm4pOwogfQogCi1zdGF0aWMgdm9pZAorc3Rh dGljIGludAogaGFwX3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNp Z25lZCBsb25nIGdmbiwgbDFfcGdlbnRyeV90ICpwLAogICAgICAgICAgICAgICAgICAgICBsMV9w Z2VudHJ5X3QgbmV3LCB1bnNpZ25lZCBpbnQgbGV2ZWwpCiB7CkBAIC03NDYsNiArNzQ2LDggQEAg aGFwX3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25n IGdmbiwgbDFfcGdlbnRyeV90ICpwLAogCiAgICAgaWYgKCBmbHVzaF9uZXN0ZWRwMm0gKQogICAg ICAgICBwMm1fZmx1c2hfbmVzdGVkcDJtKGQpOworCisgICAgcmV0dXJuIDA7CiB9CiAKIHN0YXRp YyB1bnNpZ25lZCBsb25nIGhhcF9ndmFfdG9fZ2ZuX3JlYWxfbW9kZSgKZGlmZiAtLWdpdCBhL3hl bi9hcmNoL3g4Ni9tbS9oYXAvbmVzdGVkX2hhcC5jIGIveGVuL2FyY2gveDg2L21tL2hhcC9uZXN0 ZWRfaGFwLmMKaW5kZXggZDJhMDdhNWM3OS4uYWJlNTk1OGE1MiAxMDA2NDQKLS0tIGEveGVuL2Fy Y2gveDg2L21tL2hhcC9uZXN0ZWRfaGFwLmMKKysrIGIveGVuL2FyY2gveDg2L21tL2hhcC9uZXN0 ZWRfaGFwLmMKQEAgLTcxLDcgKzcxLDcgQEAKIC8qICAgICAgICBORVNURUQgVklSVCBQMk0gRlVO Q1RJT05TICAgICAgICAgKi8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKi8KIAotdm9pZAoraW50CiBuZXN0ZWRwMm1fd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBw Mm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuLAogICAgIGwxX3BnZW50cnlfdCAqcCwg bDFfcGdlbnRyeV90IG5ldywgdW5zaWduZWQgaW50IGxldmVsKQogewpAQCAtODcsNiArODcsOCBA QCBuZXN0ZWRwMm1fd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2ln bmVkIGxvbmcgZ2ZuLAogICAgICAgICBmbHVzaF90bGJfbWFzayhwMm0tPmRpcnR5X2NwdW1hc2sp OwogCiAgICAgcGFnaW5nX3VubG9jayhkKTsKKworICAgIHJldHVybiAwOwogfQogCiAvKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCmRpZmYgLS1naXQgYS94ZW4v YXJjaC94ODYvbW0vcDJtLXB0LmMgYi94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMKaW5kZXggMDRl OWQ4MWNmNi4uZDBmMzVkOGI0NyAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3AybS1wdC5j CisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYwpAQCAtMTg0LDYgKzE4NCw4IEBAIHAybV9u ZXh0X2xldmVsKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHZvaWQgKip0YWJsZSwKICAgICBsMV9w Z2VudHJ5X3QgKnAybV9lbnRyeSwgbmV3X2VudHJ5OwogICAgIHZvaWQgKm5leHQ7CiAgICAgdW5z aWduZWQgaW50IGZsYWdzOworICAgIGludCByYzsKKyAgICBtZm5fdCBtZm47CiAKICAgICBpZiAo ICEocDJtX2VudHJ5ID0gcDJtX2ZpbmRfZW50cnkoKnRhYmxlLCBnZm5fcmVtYWluZGVyLCBnZm4s CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNoaWZ0LCBtYXgpKSApCkBA IC0xOTQsNyArMTk2LDcgQEAgcDJtX25leHRfbGV2ZWwoc3RydWN0IHAybV9kb21haW4gKnAybSwg dm9pZCAqKnRhYmxlLAogICAgIC8qIFBvRC9wYWdpbmc6IE5vdCBwcmVzZW50IGRvZXNuJ3QgaW1w bHkgZW1wdHkuICovCiAgICAgaWYgKCAhZmxhZ3MgKQogICAgIHsKLSAgICAgICAgbWZuX3QgbWZu ID0gcDJtX2FsbG9jX3B0cChwMm0sIGxldmVsKTsKKyAgICAgICAgbWZuID0gcDJtX2FsbG9jX3B0 cChwMm0sIGxldmVsKTsKIAogICAgICAgICBpZiAoIG1mbl9lcShtZm4sIElOVkFMSURfTUZOKSAp CiAgICAgICAgICAgICByZXR1cm4gLUVOT01FTTsKQEAgLTIwMiwxMyArMjA0LDE0IEBAIHAybV9u ZXh0X2xldmVsKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHZvaWQgKip0YWJsZSwKICAgICAgICAg bmV3X2VudHJ5ID0gbDFlX2Zyb21fbWZuKG1mbiwgUDJNX0JBU0VfRkxBR1MgfCBfUEFHRV9SVyk7 CiAKICAgICAgICAgcDJtX2FkZF9pb21tdV9mbGFncygmbmV3X2VudHJ5LCBsZXZlbCwgSU9NTVVG X3JlYWRhYmxlfElPTU1VRl93cml0YWJsZSk7Ci0gICAgICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5 KHAybSwgZ2ZuLCBwMm1fZW50cnksIG5ld19lbnRyeSwgbGV2ZWwgKyAxKTsKKyAgICAgICAgcmMg PSBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBuZXdfZW50cnksIGxl dmVsICsgMSk7CisgICAgICAgIGlmICggcmMgKQorICAgICAgICAgICAgZ290byBlcnJvcjsKICAg ICB9CiAgICAgZWxzZSBpZiAoIGZsYWdzICYgX1BBR0VfUFNFICkKICAgICB7CiAgICAgICAgIC8q IFNwbGl0IHN1cGVycGFnZXMgcGFnZXMgaW50byBzbWFsbGVyIG9uZXMuICovCiAgICAgICAgIHVu c2lnbmVkIGxvbmcgcGZuID0gbDFlX2dldF9wZm4oKnAybV9lbnRyeSk7Ci0gICAgICAgIG1mbl90 IG1mbjsKICAgICAgICAgbDFfcGdlbnRyeV90ICpsMV9lbnRyeTsKICAgICAgICAgdW5zaWduZWQg aW50IGk7CiAKQEAgLTI1MCwxNCArMjUzLDIxIEBAIHAybV9uZXh0X2xldmVsKHN0cnVjdCBwMm1f ZG9tYWluICpwMm0sIHZvaWQgKip0YWJsZSwKICAgICAgICAgewogICAgICAgICAgICAgbmV3X2Vu dHJ5ID0gbDFlX2Zyb21fcGZuKHBmbiB8IChpIDw8ICgobGV2ZWwgLSAxKSAqIFBBR0VUQUJMRV9P UkRFUikpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdzKTsKLSAg ICAgICAgICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBsMV9lbnRyeSArIGksIG5l d19lbnRyeSwgbGV2ZWwpOworICAgICAgICAgICAgcmMgPSBwMm0tPndyaXRlX3AybV9lbnRyeShw Mm0sIGdmbiwgbDFfZW50cnkgKyBpLCBuZXdfZW50cnksIGxldmVsKTsKKyAgICAgICAgICAgIGlm ICggcmMgKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHVubWFwX2RvbWFpbl9wYWdl KGwxX2VudHJ5KTsKKyAgICAgICAgICAgICAgICBnb3RvIGVycm9yOworICAgICAgICAgICAgfQog ICAgICAgICB9CiAKICAgICAgICAgdW5tYXBfZG9tYWluX3BhZ2UobDFfZW50cnkpOwogCiAgICAg ICAgIG5ld19lbnRyeSA9IGwxZV9mcm9tX21mbihtZm4sIFAyTV9CQVNFX0ZMQUdTIHwgX1BBR0Vf UlcpOwogICAgICAgICBwMm1fYWRkX2lvbW11X2ZsYWdzKCZuZXdfZW50cnksIGxldmVsLCBJT01N VUZfcmVhZGFibGV8SU9NTVVGX3dyaXRhYmxlKTsKLSAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50 cnkocDJtLCBnZm4sIHAybV9lbnRyeSwgbmV3X2VudHJ5LCBsZXZlbCArIDEpOworICAgICAgICBy YyA9IHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBwMm1fZW50cnksIG5ld19lbnRyeSwg bGV2ZWwgKyAxKTsKKyAgICAgICAgaWYgKCByYyApCisgICAgICAgICAgICBnb3RvIGVycm9yOwog ICAgIH0KICAgICBlbHNlCiAgICAgICAgIEFTU0VSVChmbGFncyAmIF9QQUdFX1BSRVNFTlQpOwpA QCAtMjY4LDYgKzI3OCwxMiBAQCBwMm1fbmV4dF9sZXZlbChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LCB2b2lkICoqdGFibGUsCiAgICAgKnRhYmxlID0gbmV4dDsKIAogICAgIHJldHVybiAwOworCisg ZXJyb3I6CisgICAgQVNTRVJUKHJjICYmIG1mbl92YWxpZChtZm4pKTsKKyAgICBBU1NFUlRfVU5S RUFDSEFCTEUoKTsKKyAgICBwMm1fZnJlZV9wdHAocDJtLCBtZm5fdG9fcGFnZShtZm4pKTsKKyAg ICByZXR1cm4gcmM7CiB9CiAKIC8qCkBAIC0zMjEsNyArMzM3LDEyIEBAIHN0YXRpYyBpbnQgcDJt X3B0X3NldF9yZWNhbGNfcmFuZ2Uoc3RydWN0IHAybV9kb21haW4gKnAybSwKICAgICAgICAgICAg IGlmICggKGwxZV9nZXRfZmxhZ3MoZSkgJiBfUEFHRV9QUkVTRU5UKSAmJiAhbmVlZHNfcmVjYWxj KGwxLCBlKSApCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgc2V0X3JlY2FsYyhsMSwg ZSk7Ci0gICAgICAgICAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBmaXJzdF9nZm4s IHBlbnQsIGUsIGxldmVsKTsKKyAgICAgICAgICAgICAgICBlcnIgPSBwMm0tPndyaXRlX3AybV9l bnRyeShwMm0sIGZpcnN0X2dmbiwgcGVudCwgZSwgbGV2ZWwpOworICAgICAgICAgICAgICAgIGlm ICggZXJyICkKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIEFTU0VSVF9V TlJFQUNIQUJMRSgpOworICAgICAgICAgICAgICAgICAgICBnb3RvIG91dDsKKyAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBmaXJzdF9nZm4gKz0gMVVMIDw8IChp ICogUEFHRVRBQkxFX09SREVSKTsKICAgICAgICAgfQpAQCAtMzkyLDE0ICs0MTMsMjQgQEAgc3Rh dGljIGludCBkb19yZWNhbGMoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBn Zm4pCiAgICAgICAgICAgICAgICAgICAgICAhbmVlZHNfcmVjYWxjKGwxLCBlbnQpICkKICAgICAg ICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgIHNldF9yZWNhbGMobDEsIGVudCk7Ci0g ICAgICAgICAgICAgICAgICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuIC0gcmVtYWlu ZGVyLCAmcHRhYltpXSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZW50LCBsZXZlbCk7CisgICAgICAgICAgICAgICAgICAgIGVyciA9IHAybS0+d3JpdGVfcDJtX2Vu dHJ5KHAybSwgZ2ZuIC0gcmVtYWluZGVyLCAmcHRhYltpXSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZW50LCBsZXZlbCk7CisgICAgICAgICAgICAgICAg ICAgIGlmICggZXJyICkKKyAgICAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAg ICAgICAgQVNTRVJUX1VOUkVBQ0hBQkxFKCk7CisgICAgICAgICAgICAgICAgICAgICAgICBnb3Rv IG91dDsKKyAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICByZW1haW5kZXIgLT0gMVVMIDw8ICgobGV2ZWwgLSAxKSAqIFBBR0VUQUJMRV9PUkRF Uik7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBzbXBfd21iKCk7CiAgICAgICAgICAgICBj bGVhcl9yZWNhbGMobDEsIGUpOwotICAgICAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJt LCBnZm4sIHBlbnQsIGUsIGxldmVsICsgMSk7CisgICAgICAgICAgICBlcnIgPSBwMm0tPndyaXRl X3AybV9lbnRyeShwMm0sIGdmbiwgcGVudCwgZSwgbGV2ZWwgKyAxKTsKKyAgICAgICAgICAgIGlm ICggZXJyICkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBBU1NFUlRfVU5SRUFDSEFC TEUoKTsKKyAgICAgICAgICAgICAgICBnb3RvIG91dDsKKyAgICAgICAgICAgIH0KICAgICAgICAg fQogICAgICAgICB1bm1hcF9kb21haW5fcGFnZSgodm9pZCAqKSgodW5zaWduZWQgbG9uZylwZW50 ICYgUEFHRV9NQVNLKSk7CiAgICAgfQpAQCAtNDQ0LDcgKzQ3NSw4IEBAIHN0YXRpYyBpbnQgZG9f cmVjYWxjKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuKQogICAgICAg ICB9CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGNsZWFyX3JlY2FsYyhsMSwgZSk7Ci0gICAg ICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBwZW50LCBlLCBsZXZlbCArIDEpOwor ICAgICAgICBlcnIgPSBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcGVudCwgZSwgbGV2 ZWwgKyAxKTsKKyAgICAgICAgQVNTRVJUKCFlcnIpOwogICAgIH0KIAogIG91dDoKQEAgLTU5NSw4 ICs2MjcsMTAgQEAgcDJtX3B0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5f dCBnZm5fLCBtZm5fdCBtZm4sCiAgICAgICAgIGlmICggZW50cnlfY29udGVudC5sMSAhPSAwICkK ICAgICAgICAgICAgIHAybV9hZGRfaW9tbXVfZmxhZ3MoJmVudHJ5X2NvbnRlbnQsIDAsIGlvbW11 X3B0ZV9mbGFncyk7CiAKLSAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHAy bV9lbnRyeSwgZW50cnlfY29udGVudCwgMyk7CisgICAgICAgIHJjID0gcDJtLT53cml0ZV9wMm1f ZW50cnkocDJtLCBnZm4sIHAybV9lbnRyeSwgZW50cnlfY29udGVudCwgMyk7CiAgICAgICAgIC8q IE5COiBwYWdpbmdfd3JpdGVfcDJtX2VudHJ5KCkgaGFuZGxlcyB0bGIgZmx1c2hlcyBwcm9wZXJs eSAqLworICAgICAgICBpZiAoIHJjICkKKyAgICAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KICAg ICBlbHNlIAogICAgIHsKQEAgLTYzMyw4ICs2NjcsMTAgQEAgcDJtX3B0X3NldF9lbnRyeShzdHJ1 Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5fdCBnZm5fLCBtZm5fdCBtZm4sCiAgICAgICAgICAgICBw Mm1fYWRkX2lvbW11X2ZsYWdzKCZlbnRyeV9jb250ZW50LCAwLCBpb21tdV9wdGVfZmxhZ3MpOwog CiAgICAgICAgIC8qIGxldmVsIDEgZW50cnkgKi8KLSAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50 cnkocDJtLCBnZm4sIHAybV9lbnRyeSwgZW50cnlfY29udGVudCwgMSk7CisgICAgICAgIHJjID0g cDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHAybV9lbnRyeSwgZW50cnlfY29udGVudCwg MSk7CiAgICAgICAgIC8qIE5COiBwYWdpbmdfd3JpdGVfcDJtX2VudHJ5KCkgaGFuZGxlcyB0bGIg Zmx1c2hlcyBwcm9wZXJseSAqLworICAgICAgICBpZiAoIHJjICkKKyAgICAgICAgICAgIGdvdG8g b3V0OwogICAgIH0KICAgICBlbHNlIGlmICggcGFnZV9vcmRlciA9PSBQQUdFX09SREVSXzJNICkK ICAgICB7CkBAIC02NjksOCArNzA1LDEwIEBAIHAybV9wdF9zZXRfZW50cnkoc3RydWN0IHAybV9k b21haW4gKnAybSwgZ2ZuX3QgZ2ZuXywgbWZuX3QgbWZuLAogICAgICAgICBpZiAoIGVudHJ5X2Nv bnRlbnQubDEgIT0gMCApCiAgICAgICAgICAgICBwMm1fYWRkX2lvbW11X2ZsYWdzKCZlbnRyeV9j b250ZW50LCAwLCBpb21tdV9wdGVfZmxhZ3MpOwogCi0gICAgICAgIHAybS0+d3JpdGVfcDJtX2Vu dHJ5KHAybSwgZ2ZuLCBwMm1fZW50cnksIGVudHJ5X2NvbnRlbnQsIDIpOworICAgICAgICByYyA9 IHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBwMm1fZW50cnksIGVudHJ5X2NvbnRlbnQs IDIpOwogICAgICAgICAvKiBOQjogcGFnaW5nX3dyaXRlX3AybV9lbnRyeSgpIGhhbmRsZXMgdGxi IGZsdXNoZXMgcHJvcGVybHkgKi8KKyAgICAgICAgaWYgKCByYyApCisgICAgICAgICAgICBnb3Rv IG91dDsKICAgICB9CiAKICAgICAvKiBUcmFjayB0aGUgaGlnaGVzdCBnZm4gZm9yIHdoaWNoIHdl IGhhdmUgZXZlciBoYWQgYSB2YWxpZCBtYXBwaW5nICovCkBAIC04OTQsOCArOTMyLDE1IEBAIHN0 YXRpYyB2b2lkIHAybV9wdF9jaGFuZ2VfZW50cnlfdHlwZV9nbG9iYWwoc3RydWN0IHAybV9kb21h aW4gKnAybSwKICAgICAgICAgaWYgKCAobDFlX2dldF9mbGFncyhlKSAmIF9QQUdFX1BSRVNFTlQp ICYmCiAgICAgICAgICAgICAgIW5lZWRzX3JlY2FsYyhsMSwgZSkgKQogICAgICAgICB7CisgICAg ICAgICAgICBpbnQgcmM7CisKICAgICAgICAgICAgIHNldF9yZWNhbGMobDEsIGUpOwotICAgICAg ICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sICZ0YWJbaV0sIGUsIDQpOworICAg ICAgICAgICAgcmMgPSBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgJnRhYltpXSwgZSwg NCk7CisgICAgICAgICAgICBpZiAoIHJjICkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICBBU1NFUlRfVU5SRUFDSEFCTEUoKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgIH0KICAgICAgICAgICAgICsrY2hhbmdlZDsKICAgICAgICAgfQogICAgICAgICBnZm4gKz0g MVVMIDw8IChMNF9QQUdFVEFCTEVfU0hJRlQgLSBQQUdFX1NISUZUKTsKZGlmZiAtLWdpdCBhL3hl bi9hcmNoL3g4Ni9tbS9wYWdpbmcuYyBiL3hlbi9hcmNoL3g4Ni9tbS9wYWdpbmcuYwppbmRleCBl NmVkMzAwNmZlLi4yMWRiM2VjZWI2IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vcGFnaW5n LmMKKysrIGIveGVuL2FyY2gveDg2L21tL3BhZ2luZy5jCkBAIC05MzIsMTggKzkzMiwyMiBAQCB2 b2lkIHBhZ2luZ191cGRhdGVfbmVzdGVkbW9kZShzdHJ1Y3QgdmNwdSAqdikKIH0KICNlbmRpZgog Ci12b2lkIHBhZ2luZ193cml0ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5z aWduZWQgbG9uZyBnZm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbDFfcGdlbnRyeV90 ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2ln bmVkIGludCBsZXZlbCkKK2ludCBwYWdpbmdfd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9t YWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg bDFfcGdlbnRyeV90ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgdW5zaWduZWQgaW50IGxldmVsKQogewogICAgIHN0cnVjdCBkb21haW4gKmQgPSBwMm0t PmRvbWFpbjsKICAgICBzdHJ1Y3QgdmNwdSAqdiA9IGN1cnJlbnQ7CisgICAgaW50IHJjID0gMDsK KwogICAgIGlmICggdi0+ZG9tYWluICE9IGQgKQogICAgICAgICB2ID0gZC0+dmNwdSA/IGQtPnZj cHVbMF0gOiBOVUxMOwogICAgIGlmICggbGlrZWx5KHYgJiYgcGFnaW5nX21vZGVfZW5hYmxlZChk KSAmJiBwYWdpbmdfZ2V0X2hvc3Rtb2RlKHYpICE9IE5VTEwpICkKLSAgICAgICAgcGFnaW5nX2dl dF9ob3N0bW9kZSh2KS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBwLCBuZXcsIGxldmVsKTsK KyAgICAgICAgcmMgPSBwYWdpbmdfZ2V0X2hvc3Rtb2RlKHYpLT53cml0ZV9wMm1fZW50cnkocDJt LCBnZm4sIHAsIG5ldywgbGV2ZWwpOwogICAgIGVsc2UKICAgICAgICAgc2FmZV93cml0ZV9wdGUo cCwgbmV3KTsKKworICAgIHJldHVybiByYzsKIH0KIAogaW50IHBhZ2luZ19zZXRfYWxsb2NhdGlv bihzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBpbnQgcGFnZXMsIGJvb2wgKnByZWVtcHRlZCkK ZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMgYi94ZW4vYXJjaC94 ODYvbW0vc2hhZG93L2NvbW1vbi5jCmluZGV4IGRlN2FiZjcxNTAuLmM4MTgxMTIzNjAgMTAwNjQ0 Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMKKysrIGIveGVuL2FyY2gveDg2 L21tL3NoYWRvdy9jb21tb24uYwpAQCAtMzE3Niw3ICszMTc2LDcgQEAgc3RhdGljIHZvaWQgc2hf dW5zaGFkb3dfZm9yX3AybV9jaGFuZ2Uoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBn Zm4sCiAgICAgfQogfQogCi12b2lkCitpbnQKIHNoYWRvd193cml0ZV9wMm1fZW50cnkoc3RydWN0 IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4sCiAgICAgICAgICAgICAgICAgICAg ICAgIGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90IG5ldywKICAgICAgICAgICAgICAgICAg ICAgICAgdW5zaWduZWQgaW50IGxldmVsKQpAQCAtMzIxMSw2ICszMjExLDggQEAgc2hhZG93X3dy aXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwK ICNlbmRpZgogCiAgICAgcGFnaW5nX3VubG9jayhkKTsKKworICAgIHJldHVybiAwOwogfQogCiAv KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKiovCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vc2hhZG93L25v bmUuYyBiL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvbm9uZS5jCmluZGV4IDMxNjAwMjc3MWQuLmE3 MDg4OGJkOTggMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvbm9uZS5jCisrKyBi L3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvbm9uZS5jCkBAIC02MCwxMSArNjAsMTIgQEAgc3RhdGlj IHZvaWQgX3VwZGF0ZV9wYWdpbmdfbW9kZXMoc3RydWN0IHZjcHUgKnYpCiAgICAgQVNTRVJUX1VO UkVBQ0hBQkxFKCk7CiB9CiAKLXN0YXRpYyB2b2lkIF93cml0ZV9wMm1fZW50cnkoc3RydWN0IHAy bV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4sCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90IG5ldywKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGxldmVsKQorc3RhdGljIGludCBfd3JpdGVfcDJt X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90IG5ldywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpCiB7CiAgICAg QVNTRVJUX1VOUkVBQ0hBQkxFKCk7CisgICAgcmV0dXJuIC1FT1BOT1RTVVBQOwogfQogCiBzdGF0 aWMgY29uc3Qgc3RydWN0IHBhZ2luZ19tb2RlIHNoX3BhZ2luZ19ub25lID0gewpkaWZmIC0tZ2l0 IGEveGVuL2FyY2gveDg2L21tL3NoYWRvdy9wcml2YXRlLmggYi94ZW4vYXJjaC94ODYvbW0vc2hh ZG93L3ByaXZhdGUuaAppbmRleCAwYWFlZDFlZGZjLi41ODBlZjNlMjllIDEwMDY0NAotLS0gYS94 ZW4vYXJjaC94ODYvbW0vc2hhZG93L3ByaXZhdGUuaAorKysgYi94ZW4vYXJjaC94ODYvbW0vc2hh ZG93L3ByaXZhdGUuaApAQCAtMzcyLDkgKzM3Miw5IEBAIGV4dGVybiBpbnQgc2hfcmVtb3ZlX3dy aXRlX2FjY2VzcyhzdHJ1Y3QgZG9tYWluICpkLCBtZm5fdCByZWFkb25seV9tZm4sCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBmYXVsdF9hZGRyKTsKIAog LyogRnVuY3Rpb25zIHRoYXQgYXRvbWljYWxseSB3cml0ZSBQVC9QMk0gZW50cmllcyBhbmQgdXBk YXRlIHN0YXRlICovCi12b2lkIHNoYWRvd193cml0ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21h aW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg bDFfcGdlbnRyeV90ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHVuc2lnbmVkIGludCBsZXZlbCk7CitpbnQgc2hhZG93X3dyaXRlX3AybV9lbnRyeShz dHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgIGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90IG5ldywKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBsZXZlbCk7CiAKIC8qIFVwZGF0ZSBhbGwg dGhlIHRoaW5ncyB0aGF0IGFyZSBkZXJpdmVkIGZyb20gdGhlIGd1ZXN0J3MgQ1IwL0NSMy9DUjQu CiAgKiBDYWxsZWQgdG8gaW5pdGlhbGl6ZSBwYWdpbmcgc3RydWN0dXJlcyBpZiB0aGUgcGFnaW5n IG1vZGUKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmggYi94ZW4vaW5jbHVk ZS9hc20teDg2L3AybS5oCmluZGV4IDgzNGQ0OWQyZDQuLmY0ZWMyYmVjYmQgMTAwNjQ0Ci0tLSBh L3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0u aApAQCAtMjY1LDcgKzI2NSw3IEBAIHN0cnVjdCBwMm1fZG9tYWluIHsKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBsYXN0X2dm bik7CiAgICAgdm9pZCAgICAgICAgICAgICAgICgqbWVtb3J5X3R5cGVfY2hhbmdlZCkoc3RydWN0 IHAybV9kb21haW4gKnAybSk7CiAgICAgCi0gICAgdm9pZCAgICAgICAgICAgICAgICgqd3JpdGVf cDJtX2VudHJ5KShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAorICAgIGludCAgICAgICAgICAgICAg ICAoKndyaXRlX3AybV9lbnRyeSkoc3RydWN0IHAybV9kb21haW4gKnAybSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgZ2ZuLCBsMV9wZ2Vu dHJ5X3QgKnAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsMV9w Z2VudHJ5X3QgbmV3LCB1bnNpZ25lZCBpbnQgbGV2ZWwpOwogICAgIGxvbmcgICAgICAgICAgICAg ICAoKmF1ZGl0X3AybSkoc3RydWN0IHAybV9kb21haW4gKnAybSk7CkBAIC04MzcsNyArODM3LDcg QEAgdm9pZCBwMm1fZmx1c2hfbmVzdGVkcDJtKHN0cnVjdCBkb21haW4gKmQpOwogLyogRmx1c2hl cyB0aGUgbnAybSBzcGVjaWZpZWQgYnkgbnAybV9iYXNlIChpZiBpdCBleGlzdHMpICovCiB2b2lk IG5wMm1fZmx1c2hfYmFzZShzdHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgbG9uZyBucDJtX2Jhc2Up OwogCi12b2lkIG5lc3RlZHAybV93cml0ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAy bSwgdW5zaWduZWQgbG9uZyBnZm4sCitpbnQgbmVzdGVkcDJtX3dyaXRlX3AybV9lbnRyeShzdHJ1 Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwKICAgICBsMV9wZ2VudHJ5X3Qg KnAsIGwxX3BnZW50cnlfdCBuZXcsIHVuc2lnbmVkIGludCBsZXZlbCk7CiAKIC8qCmRpZmYgLS1n aXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L3BhZ2luZy5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9w YWdpbmcuaAppbmRleCA3ZWMwOWQ3YjExLi4xOGE3ZWFlY2E0IDEwMDY0NAotLS0gYS94ZW4vaW5j bHVkZS9hc20teDg2L3BhZ2luZy5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcGFnaW5nLmgK QEAgLTEyNCw3ICsxMjQsNyBAQCBzdHJ1Y3QgcGFnaW5nX21vZGUgewogICAgIHZvaWQgICAgICAg ICAgKCp1cGRhdGVfY3IzICAgICAgICAgICAgKShzdHJ1Y3QgdmNwdSAqdiwgaW50IGRvX2xvY2tp bmcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgbm9m bHVzaCk7CiAgICAgdm9pZCAgICAgICAgICAoKnVwZGF0ZV9wYWdpbmdfbW9kZXMgICApKHN0cnVj dCB2Y3B1ICp2KTsKLSAgICB2b2lkICAgICAgICAgICgqd3JpdGVfcDJtX2VudHJ5ICAgICAgICko c3RydWN0IHAybV9kb21haW4gKnAybSwKKyAgICBpbnQgICAgICAgICAgICgqd3JpdGVfcDJtX2Vu dHJ5ICAgICAgICkoc3RydWN0IHAybV9kb21haW4gKnAybSwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBnZm4sCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRy eV90IG5ldywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5z aWduZWQgaW50IGxldmVsKTsKQEAgLTM0MCw5ICszNDAsOSBAQCBzdGF0aWMgaW5saW5lIHZvaWQg c2FmZV93cml0ZV9wdGUobDFfcGdlbnRyeV90ICpwLCBsMV9wZ2VudHJ5X3QgbmV3KQogICogd2Ug YXJlIHdyaXRpbmcuICovCiBzdHJ1Y3QgcDJtX2RvbWFpbjsKIAotdm9pZCBwYWdpbmdfd3JpdGVf cDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90IG5l dywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpOworaW50 IHBhZ2luZ193cml0ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQg bG9uZyBnZm4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwx X3BnZW50cnlfdCBuZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQg bGV2ZWwpOwogCiAvKgogICogQ2FsbGVkIGZyb20gdGhlIGd1ZXN0IHRvIGluZGljYXRlIHRoYXQg dGhlIGEgcHJvY2VzcyBpcyBiZWluZwotLSAKMi4xNy4yIChBcHBsZSBHaXQtMTEzKQoKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWls aW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVu cHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=