From: Roger Pau Monne Subject: [PATCH v6 3/5] p2m: change write_p2m_entry to return an error code Date: Wed, 27 Feb 2019 12:09:03 +0100 Message-ID: <20190227110905.53512-4-roger.pau@citrix.com> References: <20190227110905.53512-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 1gyx5m-00083R-Ci for xen-devel@lists.xenproject.org; Wed, 27 Feb 2019 11:09:38 +0000 In-Reply-To: <20190227110905.53512-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: 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 IFRpbSBEZWVnYW4gPHRpbUB4ZW4ub3JnPgotLS0KQ2hhbmdlcyBzaW5jZSB2NToKIC0gUmV0dXJu IC1FT1BOT1RTVVBQIGZyb20gX3dyaXRlX3AybV9lbnRyeS4KIC0gVXNlIGFuIGVycm9yIGxhYmVs IGluIHAybV9uZXh0X2xldmVsLgoKQ2hhbmdlcyBzaW5jZSB2NDoKIC0gSGFuZGxlIGVycm9ycyBp biBsb29wcyB0byBhdm9pZCBvdmVyd3JpdGluZyB0aGUgdmFyaWFibGUKICAgY29udGFpbmluZyB0 aGUgZXJyb3IgY29kZSBpbiBub24tZGVidWcgYnVpbGRzLgogLSBDaGFuZ2UgZXJyb3IgaGFuZGxp bmcgaW4gcDJtX25leHRfbGV2ZWwgc28gaXQncyBkb25lIGluIGEgc2luZ2xlCiAgIHBsYWNlLgoK Q2hhbmdlcyBzaW5jZSB2MzoKIC0gVXNlIGFzc2VydHMgaW5zdGVhZCBvZiBidWdzIHRvIGNoZWNr IHJldHVybiBjb2RlIGZyb20KICAgd3JpdGVfcDJtX2VudHJ5IGZyb20gY2FsbGVycyB0aGF0IGRv bid0IHN1cHBvcnQgb3IgZXhwZWN0CiAgIHdyaXRlX3AybV9lbnRyeSB0byBmYWlsLgoKQ2hhbmdl cyBzaW5jZSB2MjoKIC0gTmV3IGluIHRoaXMgdmVyc2lvbi4KLS0tCiB4ZW4vYXJjaC94ODYvbW0v aGFwL2hhcC5jICAgICAgICB8ICA0ICstCiB4ZW4vYXJjaC94ODYvbW0vaGFwL25lc3RlZF9oYXAu YyB8ICA0ICstCiB4ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMgICAgICAgICB8IDc3ICsrKysrKysr KysrKysrKysrKysrKysrKystLS0tLS0tCiB4ZW4vYXJjaC94ODYvbW0vcGFnaW5nLmMgICAgICAg ICB8IDEyICsrKy0tCiB4ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jICB8ICA0ICstCiB4 ZW4vYXJjaC94ODYvbW0vc2hhZG93L25vbmUuYyAgICB8ICA3ICstLQogeGVuL2FyY2gveDg2L21t L3NoYWRvdy9wcml2YXRlLmggfCAgNiArLS0KIHhlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmggICAg ICAgIHwgIDQgKy0KIHhlbi9pbmNsdWRlL2FzbS14ODYvcGFnaW5nLmggICAgIHwgIDggKystLQog OSBmaWxlcyBjaGFuZ2VkLCA5MiBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jIGIveGVuL2FyY2gveDg2L21tL2hhcC9o YXAuYwppbmRleCAyZGI3ZjJjMDRhLi5mZGY3N2M1OWE1IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94 ODYvbW0vaGFwL2hhcC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9oYXAvaGFwLmMKQEAgLTcwOCw3 ICs3MDgsNyBAQCBzdGF0aWMgdm9pZCBoYXBfdXBkYXRlX3BhZ2luZ19tb2RlcyhzdHJ1Y3QgdmNw dSAqdikKICAgICBwdXRfZ2ZuKGQsIGNyM19nZm4pOwogfQogCi1zdGF0aWMgdm9pZAorc3RhdGlj IGludAogaGFwX3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25l ZCBsb25nIGdmbiwgbDFfcGdlbnRyeV90ICpwLAogICAgICAgICAgICAgICAgICAgICBsMV9wZ2Vu dHJ5X3QgbmV3LCB1bnNpZ25lZCBpbnQgbGV2ZWwpCiB7CkBAIC03NDYsNiArNzQ2LDggQEAgaGFw X3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdm biwgbDFfcGdlbnRyeV90ICpwLAogCiAgICAgaWYgKCBmbHVzaF9uZXN0ZWRwMm0gKQogICAgICAg ICBwMm1fZmx1c2hfbmVzdGVkcDJtKGQpOworCisgICAgcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyB1 bnNpZ25lZCBsb25nIGhhcF9ndmFfdG9fZ2ZuX3JlYWxfbW9kZSgKZGlmZiAtLWdpdCBhL3hlbi9h cmNoL3g4Ni9tbS9oYXAvbmVzdGVkX2hhcC5jIGIveGVuL2FyY2gveDg2L21tL2hhcC9uZXN0ZWRf aGFwLmMKaW5kZXggZDJhMDdhNWM3OS4uYWJlNTk1OGE1MiAxMDA2NDQKLS0tIGEveGVuL2FyY2gv eDg2L21tL2hhcC9uZXN0ZWRfaGFwLmMKKysrIGIveGVuL2FyY2gveDg2L21tL2hhcC9uZXN0ZWRf aGFwLmMKQEAgLTcxLDcgKzcxLDcgQEAKIC8qICAgICAgICBORVNURUQgVklSVCBQMk0gRlVOQ1RJ T05TICAgICAgICAgKi8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKi8KIAotdm9pZAoraW50CiBuZXN0ZWRwMm1fd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1f ZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuLAogICAgIGwxX3BnZW50cnlfdCAqcCwgbDFf cGdlbnRyeV90IG5ldywgdW5zaWduZWQgaW50IGxldmVsKQogewpAQCAtODcsNiArODcsOCBAQCBu ZXN0ZWRwMm1fd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVk IGxvbmcgZ2ZuLAogICAgICAgICBmbHVzaF90bGJfbWFzayhwMm0tPmRpcnR5X2NwdW1hc2spOwog CiAgICAgcGFnaW5nX3VubG9jayhkKTsKKworICAgIHJldHVybiAwOwogfQogCiAvKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCmRpZmYgLS1naXQgYS94ZW4vYXJj aC94ODYvbW0vcDJtLXB0LmMgYi94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMKaW5kZXggMDRlOWQ4 MWNmNi4uNGE1MzFmZGY5ZCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3AybS1wdC5jCisr KyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYwpAQCAtMTg0LDYgKzE4NCw4IEBAIHAybV9uZXh0 X2xldmVsKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHZvaWQgKip0YWJsZSwKICAgICBsMV9wZ2Vu dHJ5X3QgKnAybV9lbnRyeSwgbmV3X2VudHJ5OwogICAgIHZvaWQgKm5leHQ7CiAgICAgdW5zaWdu ZWQgaW50IGZsYWdzOworICAgIGludCByYzsKKyAgICBtZm5fdCBtZm47CiAKICAgICBpZiAoICEo cDJtX2VudHJ5ID0gcDJtX2ZpbmRfZW50cnkoKnRhYmxlLCBnZm5fcmVtYWluZGVyLCBnZm4sCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNoaWZ0LCBtYXgpKSApCkBAIC0x OTQsNyArMTk2LDcgQEAgcDJtX25leHRfbGV2ZWwoc3RydWN0IHAybV9kb21haW4gKnAybSwgdm9p ZCAqKnRhYmxlLAogICAgIC8qIFBvRC9wYWdpbmc6IE5vdCBwcmVzZW50IGRvZXNuJ3QgaW1wbHkg ZW1wdHkuICovCiAgICAgaWYgKCAhZmxhZ3MgKQogICAgIHsKLSAgICAgICAgbWZuX3QgbWZuID0g cDJtX2FsbG9jX3B0cChwMm0sIGxldmVsKTsKKyAgICAgICAgbWZuID0gcDJtX2FsbG9jX3B0cChw Mm0sIGxldmVsKTsKIAogICAgICAgICBpZiAoIG1mbl9lcShtZm4sIElOVkFMSURfTUZOKSApCiAg ICAgICAgICAgICByZXR1cm4gLUVOT01FTTsKQEAgLTIwMiwxMyArMjA0LDE0IEBAIHAybV9uZXh0 X2xldmVsKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHZvaWQgKip0YWJsZSwKICAgICAgICAgbmV3 X2VudHJ5ID0gbDFlX2Zyb21fbWZuKG1mbiwgUDJNX0JBU0VfRkxBR1MgfCBfUEFHRV9SVyk7CiAK ICAgICAgICAgcDJtX2FkZF9pb21tdV9mbGFncygmbmV3X2VudHJ5LCBsZXZlbCwgSU9NTVVGX3Jl YWRhYmxlfElPTU1VRl93cml0YWJsZSk7Ci0gICAgICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5KHAy bSwgZ2ZuLCBwMm1fZW50cnksIG5ld19lbnRyeSwgbGV2ZWwgKyAxKTsKKyAgICAgICAgcmMgPSBw Mm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBuZXdfZW50cnksIGxldmVs ICsgMSk7CisgICAgICAgIGlmICggcmMgKQorICAgICAgICAgICAgZ290byBlcnJvcjsKICAgICB9 CiAgICAgZWxzZSBpZiAoIGZsYWdzICYgX1BBR0VfUFNFICkKICAgICB7CiAgICAgICAgIC8qIFNw bGl0IHN1cGVycGFnZXMgcGFnZXMgaW50byBzbWFsbGVyIG9uZXMuICovCiAgICAgICAgIHVuc2ln bmVkIGxvbmcgcGZuID0gbDFlX2dldF9wZm4oKnAybV9lbnRyeSk7Ci0gICAgICAgIG1mbl90IG1m bjsKICAgICAgICAgbDFfcGdlbnRyeV90ICpsMV9lbnRyeTsKICAgICAgICAgdW5zaWduZWQgaW50 IGk7CiAKQEAgLTI1MCwxNCArMjUzLDIzIEBAIHAybV9uZXh0X2xldmVsKHN0cnVjdCBwMm1fZG9t YWluICpwMm0sIHZvaWQgKip0YWJsZSwKICAgICAgICAgewogICAgICAgICAgICAgbmV3X2VudHJ5 ID0gbDFlX2Zyb21fcGZuKHBmbiB8IChpIDw8ICgobGV2ZWwgLSAxKSAqIFBBR0VUQUJMRV9PUkRF UikpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdzKTsKLSAgICAg ICAgICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBsMV9lbnRyeSArIGksIG5ld19l bnRyeSwgbGV2ZWwpOworICAgICAgICAgICAgcmMgPSBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0s IGdmbiwgbDFfZW50cnkgKyBpLCBuZXdfZW50cnksIGxldmVsKTsKKyAgICAgICAgICAgIGlmICgg cmMgKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHVubWFwX2RvbWFpbl9wYWdlKGwx X2VudHJ5KTsKKyAgICAgICAgICAgICAgICBnb3RvIGVycm9yOworICAgICAgICAgICAgfQogICAg ICAgICB9CiAKICAgICAgICAgdW5tYXBfZG9tYWluX3BhZ2UobDFfZW50cnkpOwogCiAgICAgICAg IG5ld19lbnRyeSA9IGwxZV9mcm9tX21mbihtZm4sIFAyTV9CQVNFX0ZMQUdTIHwgX1BBR0VfUlcp OwotICAgICAgICBwMm1fYWRkX2lvbW11X2ZsYWdzKCZuZXdfZW50cnksIGxldmVsLCBJT01NVUZf cmVhZGFibGV8SU9NTVVGX3dyaXRhYmxlKTsKLSAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnko cDJtLCBnZm4sIHAybV9lbnRyeSwgbmV3X2VudHJ5LCBsZXZlbCArIDEpOworICAgICAgICBwMm1f YWRkX2lvbW11X2ZsYWdzKCZuZXdfZW50cnksIGxldmVsLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIElPTU1VRl9yZWFkYWJsZXxJT01NVUZfd3JpdGFibGUpOworICAgICAgICByYyA9IHAy bS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBwMm1fZW50cnksIG5ld19lbnRyeSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsZXZlbCArIDEpOworICAgICAgICBpZiAoIHJj ICkKKyAgICAgICAgICAgIGdvdG8gZXJyb3I7CiAgICAgfQogICAgIGVsc2UKICAgICAgICAgQVNT RVJUKGZsYWdzICYgX1BBR0VfUFJFU0VOVCk7CkBAIC0yNjgsNiArMjgwLDEyIEBAIHAybV9uZXh0 X2xldmVsKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHZvaWQgKip0YWJsZSwKICAgICAqdGFibGUg PSBuZXh0OwogCiAgICAgcmV0dXJuIDA7CisKKyBlcnJvcjoKKyAgICBBU1NFUlQocmMgJiYgbWZu X3ZhbGlkKG1mbikpOworICAgIEFTU0VSVF9VTlJFQUNIQUJMRSgpOworICAgIHAybV9mcmVlX3B0 cChwMm0sIG1mbl90b19wYWdlKG1mbikpOworICAgIHJldHVybiByYzsKIH0KIAogLyoKQEAgLTMy MSw3ICszMzksMTIgQEAgc3RhdGljIGludCBwMm1fcHRfc2V0X3JlY2FsY19yYW5nZShzdHJ1Y3Qg cDJtX2RvbWFpbiAqcDJtLAogICAgICAgICAgICAgaWYgKCAobDFlX2dldF9mbGFncyhlKSAmIF9Q QUdFX1BSRVNFTlQpICYmICFuZWVkc19yZWNhbGMobDEsIGUpICkKICAgICAgICAgICAgIHsKICAg ICAgICAgICAgICAgICBzZXRfcmVjYWxjKGwxLCBlKTsKLSAgICAgICAgICAgICAgICBwMm0tPndy aXRlX3AybV9lbnRyeShwMm0sIGZpcnN0X2dmbiwgcGVudCwgZSwgbGV2ZWwpOworICAgICAgICAg ICAgICAgIGVyciA9IHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZmlyc3RfZ2ZuLCBwZW50LCBl LCBsZXZlbCk7CisgICAgICAgICAgICAgICAgaWYgKCBlcnIgKQorICAgICAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICAgICAgQVNTRVJUX1VOUkVBQ0hBQkxFKCk7CisgICAgICAgICAgICAg ICAgICAgIGdvdG8gb3V0OworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIGZpcnN0X2dmbiArPSAxVUwgPDwgKGkgKiBQQUdFVEFCTEVfT1JERVIpOwogICAgICAg ICB9CkBAIC0zOTIsMTQgKzQxNSwyNCBAQCBzdGF0aWMgaW50IGRvX3JlY2FsYyhzdHJ1Y3QgcDJt X2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAgICAgICAgICAgICAgICFu ZWVkc19yZWNhbGMobDEsIGVudCkgKQogICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAg ICAgICAgc2V0X3JlY2FsYyhsMSwgZW50KTsKLSAgICAgICAgICAgICAgICAgICAgcDJtLT53cml0 ZV9wMm1fZW50cnkocDJtLCBnZm4gLSByZW1haW5kZXIsICZwdGFiW2ldLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnQsIGxldmVsKTsKKyAgICAgICAgICAgICAg ICAgICAgZXJyID0gcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4gLSByZW1haW5kZXIsICZw dGFiW2ldLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBl bnQsIGxldmVsKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCBlcnIgKQorICAgICAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlRfVU5SRUFDSEFCTEUoKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIGdvdG8gb3V0OworICAgICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHJlbWFpbmRlciAtPSAxVUwgPDwg KChsZXZlbCAtIDEpICogUEFHRVRBQkxFX09SREVSKTsKICAgICAgICAgICAgIH0KICAgICAgICAg ICAgIHNtcF93bWIoKTsKICAgICAgICAgICAgIGNsZWFyX3JlY2FsYyhsMSwgZSk7Ci0gICAgICAg ICAgICBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcGVudCwgZSwgbGV2ZWwgKyAxKTsK KyAgICAgICAgICAgIGVyciA9IHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBwZW50LCBl LCBsZXZlbCArIDEpOworICAgICAgICAgICAgaWYgKCBlcnIgKQorICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgIEFTU0VSVF9VTlJFQUNIQUJMRSgpOworICAgICAgICAgICAgICAgIGdvdG8g b3V0OworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIHVubWFwX2RvbWFpbl9wYWdl KCh2b2lkICopKCh1bnNpZ25lZCBsb25nKXBlbnQgJiBQQUdFX01BU0spKTsKICAgICB9CkBAIC00 NDQsNyArNDc3LDggQEAgc3RhdGljIGludCBkb19yZWNhbGMoc3RydWN0IHAybV9kb21haW4gKnAy bSwgdW5zaWduZWQgbG9uZyBnZm4pCiAgICAgICAgIH0KICAgICAgICAgZWxzZQogICAgICAgICAg ICAgY2xlYXJfcmVjYWxjKGwxLCBlKTsKLSAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJt LCBnZm4sIHBlbnQsIGUsIGxldmVsICsgMSk7CisgICAgICAgIGVyciA9IHAybS0+d3JpdGVfcDJt X2VudHJ5KHAybSwgZ2ZuLCBwZW50LCBlLCBsZXZlbCArIDEpOworICAgICAgICBBU1NFUlQoIWVy cik7CiAgICAgfQogCiAgb3V0OgpAQCAtNTk1LDggKzYyOSwxMCBAQCBwMm1fcHRfc2V0X2VudHJ5 KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwKICAgICAgICAg aWYgKCBlbnRyeV9jb250ZW50LmwxICE9IDAgKQogICAgICAgICAgICAgcDJtX2FkZF9pb21tdV9m bGFncygmZW50cnlfY29udGVudCwgMCwgaW9tbXVfcHRlX2ZsYWdzKTsKIAotICAgICAgICBwMm0t PndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBlbnRyeV9jb250ZW50LCAzKTsK KyAgICAgICAgcmMgPSBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBl bnRyeV9jb250ZW50LCAzKTsKICAgICAgICAgLyogTkI6IHBhZ2luZ193cml0ZV9wMm1fZW50cnko KSBoYW5kbGVzIHRsYiBmbHVzaGVzIHByb3Blcmx5ICovCisgICAgICAgIGlmICggcmMgKQorICAg ICAgICAgICAgZ290byBvdXQ7CiAgICAgfQogICAgIGVsc2UgCiAgICAgewpAQCAtNjMzLDggKzY2 OSwxMCBAQCBwMm1fcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdm bl8sIG1mbl90IG1mbiwKICAgICAgICAgICAgIHAybV9hZGRfaW9tbXVfZmxhZ3MoJmVudHJ5X2Nv bnRlbnQsIDAsIGlvbW11X3B0ZV9mbGFncyk7CiAKICAgICAgICAgLyogbGV2ZWwgMSBlbnRyeSAq LwotICAgICAgICBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBlbnRy eV9jb250ZW50LCAxKTsKKyAgICAgICAgcmMgPSBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdm biwgcDJtX2VudHJ5LCBlbnRyeV9jb250ZW50LCAxKTsKICAgICAgICAgLyogTkI6IHBhZ2luZ193 cml0ZV9wMm1fZW50cnkoKSBoYW5kbGVzIHRsYiBmbHVzaGVzIHByb3Blcmx5ICovCisgICAgICAg IGlmICggcmMgKQorICAgICAgICAgICAgZ290byBvdXQ7CiAgICAgfQogICAgIGVsc2UgaWYgKCBw YWdlX29yZGVyID09IFBBR0VfT1JERVJfMk0gKQogICAgIHsKQEAgLTY2OSw4ICs3MDcsMTAgQEAg cDJtX3B0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5fdCBnZm5fLCBtZm5f dCBtZm4sCiAgICAgICAgIGlmICggZW50cnlfY29udGVudC5sMSAhPSAwICkKICAgICAgICAgICAg IHAybV9hZGRfaW9tbXVfZmxhZ3MoJmVudHJ5X2NvbnRlbnQsIDAsIGlvbW11X3B0ZV9mbGFncyk7 CiAKLSAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHAybV9lbnRyeSwgZW50 cnlfY29udGVudCwgMik7CisgICAgICAgIHJjID0gcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBn Zm4sIHAybV9lbnRyeSwgZW50cnlfY29udGVudCwgMik7CiAgICAgICAgIC8qIE5COiBwYWdpbmdf d3JpdGVfcDJtX2VudHJ5KCkgaGFuZGxlcyB0bGIgZmx1c2hlcyBwcm9wZXJseSAqLworICAgICAg ICBpZiAoIHJjICkKKyAgICAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAogICAgIC8qIFRyYWNr IHRoZSBoaWdoZXN0IGdmbiBmb3Igd2hpY2ggd2UgaGF2ZSBldmVyIGhhZCBhIHZhbGlkIG1hcHBp bmcgKi8KQEAgLTg5NCw4ICs5MzQsMTUgQEAgc3RhdGljIHZvaWQgcDJtX3B0X2NoYW5nZV9lbnRy eV90eXBlX2dsb2JhbChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgICAgICBpZiAoIChsMWVf Z2V0X2ZsYWdzKGUpICYgX1BBR0VfUFJFU0VOVCkgJiYKICAgICAgICAgICAgICAhbmVlZHNfcmVj YWxjKGwxLCBlKSApCiAgICAgICAgIHsKKyAgICAgICAgICAgIGludCByYzsKKwogICAgICAgICAg ICAgc2V0X3JlY2FsYyhsMSwgZSk7Ci0gICAgICAgICAgICBwMm0tPndyaXRlX3AybV9lbnRyeShw Mm0sIGdmbiwgJnRhYltpXSwgZSwgNCk7CisgICAgICAgICAgICByYyA9IHAybS0+d3JpdGVfcDJt X2VudHJ5KHAybSwgZ2ZuLCAmdGFiW2ldLCBlLCA0KTsKKyAgICAgICAgICAgIGlmICggcmMgKQor ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIEFTU0VSVF9VTlJFQUNIQUJMRSgpOworICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQogICAgICAgICAgICAgKytjaGFuZ2Vk OwogICAgICAgICB9CiAgICAgICAgIGdmbiArPSAxVUwgPDwgKEw0X1BBR0VUQUJMRV9TSElGVCAt IFBBR0VfU0hJRlQpOwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3BhZ2luZy5jIGIveGVu L2FyY2gveDg2L21tL3BhZ2luZy5jCmluZGV4IGU2ZWQzMDA2ZmUuLjIxZGIzZWNlYjYgMTAwNjQ0 Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9wYWdpbmcuYworKysgYi94ZW4vYXJjaC94ODYvbW0vcGFn aW5nLmMKQEAgLTkzMiwxOCArOTMyLDIyIEBAIHZvaWQgcGFnaW5nX3VwZGF0ZV9uZXN0ZWRtb2Rl KHN0cnVjdCB2Y3B1ICp2KQogfQogI2VuZGlmCiAKLXZvaWQgcGFnaW5nX3dyaXRlX3AybV9lbnRy eShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlfdCBuZXcsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGxldmVsKQoraW50IHBhZ2luZ193 cml0ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4s CisgICAgICAgICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlf dCBuZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpCiB7 CiAgICAgc3RydWN0IGRvbWFpbiAqZCA9IHAybS0+ZG9tYWluOwogICAgIHN0cnVjdCB2Y3B1ICp2 ID0gY3VycmVudDsKKyAgICBpbnQgcmMgPSAwOworCiAgICAgaWYgKCB2LT5kb21haW4gIT0gZCAp CiAgICAgICAgIHYgPSBkLT52Y3B1ID8gZC0+dmNwdVswXSA6IE5VTEw7CiAgICAgaWYgKCBsaWtl bHkodiAmJiBwYWdpbmdfbW9kZV9lbmFibGVkKGQpICYmIHBhZ2luZ19nZXRfaG9zdG1vZGUodikg IT0gTlVMTCkgKQotICAgICAgICBwYWdpbmdfZ2V0X2hvc3Rtb2RlKHYpLT53cml0ZV9wMm1fZW50 cnkocDJtLCBnZm4sIHAsIG5ldywgbGV2ZWwpOworICAgICAgICByYyA9IHBhZ2luZ19nZXRfaG9z dG1vZGUodiktPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcCwgbmV3LCBsZXZlbCk7CiAgICAg ZWxzZQogICAgICAgICBzYWZlX3dyaXRlX3B0ZShwLCBuZXcpOworCisgICAgcmV0dXJuIHJjOwog fQogCiBpbnQgcGFnaW5nX3NldF9hbGxvY2F0aW9uKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVk IGludCBwYWdlcywgYm9vbCAqcHJlZW1wdGVkKQpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21t L3NoYWRvdy9jb21tb24uYyBiL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMKaW5kZXgg ZGU3YWJmNzE1MC4uYzgxODExMjM2MCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3NoYWRv dy9jb21tb24uYworKysgYi94ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jCkBAIC0zMTc2 LDcgKzMxNzYsNyBAQCBzdGF0aWMgdm9pZCBzaF91bnNoYWRvd19mb3JfcDJtX2NoYW5nZShzdHJ1 Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIGdmbiwKICAgICB9CiB9CiAKLXZvaWQKK2ludAog c2hhZG93X3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBs b25nIGdmbiwKICAgICAgICAgICAgICAgICAgICAgICAgbDFfcGdlbnRyeV90ICpwLCBsMV9wZ2Vu dHJ5X3QgbmV3LAogICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpCkBA IC0zMjExLDYgKzMyMTEsOCBAQCBzaGFkb3dfd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9t YWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuLAogI2VuZGlmCiAKICAgICBwYWdpbmdfdW5sb2Nr KGQpOworCisgICAgcmV0dXJuIDA7CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KZGlmZiAtLWdp dCBhL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvbm9uZS5jIGIveGVuL2FyY2gveDg2L21tL3NoYWRv dy9ub25lLmMKaW5kZXggMzE2MDAyNzcxZC4uYTcwODg4YmQ5OCAxMDA2NDQKLS0tIGEveGVuL2Fy Y2gveDg2L21tL3NoYWRvdy9ub25lLmMKKysrIGIveGVuL2FyY2gveDg2L21tL3NoYWRvdy9ub25l LmMKQEAgLTYwLDExICs2MCwxMiBAQCBzdGF0aWMgdm9pZCBfdXBkYXRlX3BhZ2luZ19tb2Rlcyhz dHJ1Y3QgdmNwdSAqdikKICAgICBBU1NFUlRfVU5SRUFDSEFCTEUoKTsKIH0KIAotc3RhdGljIHZv aWQgX3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25n IGdmbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbDFfcGdlbnRyeV90ICpwLCBsMV9w Z2VudHJ5X3QgbmV3LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQg bGV2ZWwpCitzdGF0aWMgaW50IF93cml0ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAy bSwgdW5zaWduZWQgbG9uZyBnZm4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgbDFfcGdl bnRyeV90ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LAorICAgICAgICAgICAgICAgICAgICAgICAgICAg IHVuc2lnbmVkIGludCBsZXZlbCkKIHsKICAgICBBU1NFUlRfVU5SRUFDSEFCTEUoKTsKKyAgICBy ZXR1cm4gLUVPUE5PVFNVUFA7CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgcGFnaW5nX21vZGUg c2hfcGFnaW5nX25vbmUgPSB7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vc2hhZG93L3By aXZhdGUuaCBiL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvcHJpdmF0ZS5oCmluZGV4IDBhYWVkMWVk ZmMuLjU4MGVmM2UyOWUgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvcHJpdmF0 ZS5oCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvcHJpdmF0ZS5oCkBAIC0zNzIsOSArMzcy LDkgQEAgZXh0ZXJuIGludCBzaF9yZW1vdmVfd3JpdGVfYWNjZXNzKHN0cnVjdCBkb21haW4gKmQs IG1mbl90IHJlYWRvbmx5X21mbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1 bnNpZ25lZCBsb25nIGZhdWx0X2FkZHIpOwogCiAvKiBGdW5jdGlvbnMgdGhhdCBhdG9taWNhbGx5 IHdyaXRlIFBUL1AyTSBlbnRyaWVzIGFuZCB1cGRhdGUgc3RhdGUgKi8KLXZvaWQgc2hhZG93X3dy aXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlf dCBuZXcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGxldmVsKTsK K2ludCBzaGFkb3dfd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2ln bmVkIGxvbmcgZ2ZuLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgbDFfcGdlbnRyeV90ICpw LCBsMV9wZ2VudHJ5X3QgbmV3LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQg aW50IGxldmVsKTsKIAogLyogVXBkYXRlIGFsbCB0aGUgdGhpbmdzIHRoYXQgYXJlIGRlcml2ZWQg ZnJvbSB0aGUgZ3Vlc3QncyBDUjAvQ1IzL0NSNC4KICAqIENhbGxlZCB0byBpbml0aWFsaXplIHBh Z2luZyBzdHJ1Y3R1cmVzIGlmIHRoZSBwYWdpbmcgbW9kZQpkaWZmIC0tZ2l0IGEveGVuL2luY2x1 ZGUvYXNtLXg4Ni9wMm0uaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKaW5kZXggODM0ZDQ5 ZDJkNC4uZjRlYzJiZWNiZCAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaAor KysgYi94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oCkBAIC0yNjUsNyArMjY1LDcgQEAgc3RydWN0 IHAybV9kb21haW4gewogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB1bnNpZ25lZCBsb25nIGxhc3RfZ2ZuKTsKICAgICB2b2lkICAgICAgICAgICAgICAg KCptZW1vcnlfdHlwZV9jaGFuZ2VkKShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtKTsKICAgICAKLSAg ICB2b2lkICAgICAgICAgICAgICAgKCp3cml0ZV9wMm1fZW50cnkpKHN0cnVjdCBwMm1fZG9tYWlu ICpwMm0sCisgICAgaW50ICAgICAgICAgICAgICAgICgqd3JpdGVfcDJtX2VudHJ5KShzdHJ1Y3Qg cDJtX2RvbWFpbiAqcDJtLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdW5zaWduZWQgbG9uZyBnZm4sIGwxX3BnZW50cnlfdCAqcCwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGwxX3BnZW50cnlfdCBuZXcsIHVuc2lnbmVkIGludCBs ZXZlbCk7CiAgICAgbG9uZyAgICAgICAgICAgICAgICgqYXVkaXRfcDJtKShzdHJ1Y3QgcDJtX2Rv bWFpbiAqcDJtKTsKQEAgLTgzNyw3ICs4MzcsNyBAQCB2b2lkIHAybV9mbHVzaF9uZXN0ZWRwMm0o c3RydWN0IGRvbWFpbiAqZCk7CiAvKiBGbHVzaGVzIHRoZSBucDJtIHNwZWNpZmllZCBieSBucDJt X2Jhc2UgKGlmIGl0IGV4aXN0cykgKi8KIHZvaWQgbnAybV9mbHVzaF9iYXNlKHN0cnVjdCB2Y3B1 ICp2LCB1bnNpZ25lZCBsb25nIG5wMm1fYmFzZSk7CiAKLXZvaWQgbmVzdGVkcDJtX3dyaXRlX3Ay bV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwKK2ludCBu ZXN0ZWRwMm1fd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVk IGxvbmcgZ2ZuLAogICAgIGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90IG5ldywgdW5zaWdu ZWQgaW50IGxldmVsKTsKIAogLyoKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcGFn aW5nLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L3BhZ2luZy5oCmluZGV4IDdlYzA5ZDdiMTEuLjE4 YTdlYWVjYTQgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcGFnaW5nLmgKKysrIGIv eGVuL2luY2x1ZGUvYXNtLXg4Ni9wYWdpbmcuaApAQCAtMTI0LDcgKzEyNCw3IEBAIHN0cnVjdCBw YWdpbmdfbW9kZSB7CiAgICAgdm9pZCAgICAgICAgICAoKnVwZGF0ZV9jcjMgICAgICAgICAgICAp KHN0cnVjdCB2Y3B1ICp2LCBpbnQgZG9fbG9ja2luZywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYm9vbCBub2ZsdXNoKTsKICAgICB2b2lkICAgICAgICAgICgq dXBkYXRlX3BhZ2luZ19tb2RlcyAgICkoc3RydWN0IHZjcHUgKnYpOwotICAgIHZvaWQgICAgICAg ICAgKCp3cml0ZV9wMm1fZW50cnkgICAgICAgKShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAorICAg IGludCAgICAgICAgICAgKCp3cml0ZV9wMm1fZW50cnkgICAgICAgKShzdHJ1Y3QgcDJtX2RvbWFp biAqcDJtLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNp Z25lZCBsb25nIGdmbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbDFfcGdlbnRyeV90ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpOwpAQCAtMzQwLDkg KzM0MCw5IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBzYWZlX3dyaXRlX3B0ZShsMV9wZ2VudHJ5X3Qg KnAsIGwxX3BnZW50cnlfdCBuZXcpCiAgKiB3ZSBhcmUgd3JpdGluZy4gKi8KIHN0cnVjdCBwMm1f ZG9tYWluOwogCi12b2lkIHBhZ2luZ193cml0ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21haW4g KnAybSwgdW5zaWduZWQgbG9uZyBnZm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbDFf cGdlbnRyeV90ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHVuc2lnbmVkIGludCBsZXZlbCk7CitpbnQgcGFnaW5nX3dyaXRlX3AybV9lbnRyeShzdHJ1 Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90IG5ldywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBsZXZlbCk7CiAKIC8qCiAgKiBDYWxsZWQgZnJv bSB0aGUgZ3Vlc3QgdG8gaW5kaWNhdGUgdGhhdCB0aGUgYSBwcm9jZXNzIGlzIGJlaW5nCi0tIAoy LjE3LjIgKEFwcGxlIEdpdC0xMTMpCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVu cHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZv L3hlbi1kZXZlbA==