From: Roger Pau Monne Subject: [PATCH v5 3/5] p2m: change write_p2m_entry to return an error code Date: Thu, 21 Feb 2019 17:50:39 +0100 Message-ID: <20190221165041.39394-4-roger.pau@citrix.com> References: <20190221165041.39394-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 1gwrYq-0005nM-JD for xen-devel@lists.xenproject.org; Thu, 21 Feb 2019 16:51:00 +0000 In-Reply-To: <20190221165041.39394-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 IFRpbSBEZWVnYW4gPHRpbUB4ZW4ub3JnPgotLS0KQ2hhbmdlcyBzaW5jZSB2NDoKIC0gSGFuZGxl IGVycm9ycyBpbiBsb29wcyB0byBhdm9pZCBvdmVyd3JpdGluZyB0aGUgdmFyaWFibGUKICAgY29u dGFpbmluZyB0aGUgZXJyb3IgY29kZSBpbiBub24tZGVidWcgYnVpbGRzLgogLSBDaGFuZ2UgZXJy b3IgaGFuZGxpbmcgaW4gcDJtX25leHRfbGV2ZWwgc28gaXQncyBkb25lIGluIGEgc2luZ2xlCiAg IHBsYWNlLgoKQ2hhbmdlcyBzaW5jZSB2MzoKIC0gVXNlIGFzc2VydHMgaW5zdGVhZCBvZiBidWdz IHRvIGNoZWNrIHJldHVybiBjb2RlIGZyb20KICAgd3JpdGVfcDJtX2VudHJ5IGZyb20gY2FsbGVy cyB0aGF0IGRvbid0IHN1cHBvcnQgb3IgZXhwZWN0CiAgIHdyaXRlX3AybV9lbnRyeSB0byBmYWls LgoKQ2hhbmdlcyBzaW5jZSB2MjoKIC0gTmV3IGluIHRoaXMgdmVyc2lvbi4KLS0tCiB4ZW4vYXJj aC94ODYvbW0vaGFwL2hhcC5jICAgICAgICB8ICA0ICstCiB4ZW4vYXJjaC94ODYvbW0vaGFwL25l c3RlZF9oYXAuYyB8ICA0ICstCiB4ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMgICAgICAgICB8IDgz ICsrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tCiB4ZW4vYXJjaC94ODYvbW0vcGFnaW5n LmMgICAgICAgICB8IDEyICsrKy0tCiB4ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jICB8 ICA0ICstCiB4ZW4vYXJjaC94ODYvbW0vc2hhZG93L25vbmUuYyAgICB8ICA3ICstLQogeGVuL2Fy Y2gveDg2L21tL3NoYWRvdy9wcml2YXRlLmggfCAgNiArLS0KIHhlbi9pbmNsdWRlL2FzbS14ODYv cDJtLmggICAgICAgIHwgIDQgKy0KIHhlbi9pbmNsdWRlL2FzbS14ODYvcGFnaW5nLmggICAgIHwg IDggKy0tCiA5IGZpbGVzIGNoYW5nZWQsIDk3IGluc2VydGlvbnMoKyksIDM1IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9oYXAvaGFwLmMgYi94ZW4vYXJjaC94ODYv bW0vaGFwL2hhcC5jCmluZGV4IDJkYjdmMmMwNGEuLmZkZjc3YzU5YTUgMTAwNjQ0Ci0tLSBhL3hl bi9hcmNoL3g4Ni9tbS9oYXAvaGFwLmMKKysrIGIveGVuL2FyY2gveDg2L21tL2hhcC9oYXAuYwpA QCAtNzA4LDcgKzcwOCw3IEBAIHN0YXRpYyB2b2lkIGhhcF91cGRhdGVfcGFnaW5nX21vZGVzKHN0 cnVjdCB2Y3B1ICp2KQogICAgIHB1dF9nZm4oZCwgY3IzX2dmbik7CiB9CiAKLXN0YXRpYyB2b2lk CitzdGF0aWMgaW50CiBoYXBfd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0s IHVuc2lnbmVkIGxvbmcgZ2ZuLCBsMV9wZ2VudHJ5X3QgKnAsCiAgICAgICAgICAgICAgICAgICAg IGwxX3BnZW50cnlfdCBuZXcsIHVuc2lnbmVkIGludCBsZXZlbCkKIHsKQEAgLTc0Niw2ICs3NDYs OCBAQCBoYXBfd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVk IGxvbmcgZ2ZuLCBsMV9wZ2VudHJ5X3QgKnAsCiAKICAgICBpZiAoIGZsdXNoX25lc3RlZHAybSAp CiAgICAgICAgIHAybV9mbHVzaF9uZXN0ZWRwMm0oZCk7CisKKyAgICByZXR1cm4gMDsKIH0KIAog c3RhdGljIHVuc2lnbmVkIGxvbmcgaGFwX2d2YV90b19nZm5fcmVhbF9tb2RlKApkaWZmIC0tZ2l0 IGEveGVuL2FyY2gveDg2L21tL2hhcC9uZXN0ZWRfaGFwLmMgYi94ZW4vYXJjaC94ODYvbW0vaGFw L25lc3RlZF9oYXAuYwppbmRleCBkMmEwN2E1Yzc5Li5hYmU1OTU4YTUyIDEwMDY0NAotLS0gYS94 ZW4vYXJjaC94ODYvbW0vaGFwL25lc3RlZF9oYXAuYworKysgYi94ZW4vYXJjaC94ODYvbW0vaGFw L25lc3RlZF9oYXAuYwpAQCAtNzEsNyArNzEsNyBAQAogLyogICAgICAgIE5FU1RFRCBWSVJUIFAy TSBGVU5DVElPTlMgICAgICAgICAqLwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqLwogCi12b2lkCitpbnQKIG5lc3RlZHAybV93cml0ZV9wMm1fZW50cnkoc3Ry dWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4sCiAgICAgbDFfcGdlbnRyeV90 ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LCB1bnNpZ25lZCBpbnQgbGV2ZWwpCiB7CkBAIC04Nyw2ICs4 Nyw4IEBAIG5lc3RlZHAybV93cml0ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwg dW5zaWduZWQgbG9uZyBnZm4sCiAgICAgICAgIGZsdXNoX3RsYl9tYXNrKHAybS0+ZGlydHlfY3B1 bWFzayk7CiAKICAgICBwYWdpbmdfdW5sb2NrKGQpOworCisgICAgcmV0dXJuIDA7CiB9CiAKIC8q KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KZGlmZiAtLWdpdCBh L3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYwppbmRl eCAwNGU5ZDgxY2Y2Li4yNTRjNWRmZDE5IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vcDJt LXB0LmMKKysrIGIveGVuL2FyY2gveDg2L21tL3AybS1wdC5jCkBAIC0xODQsNiArMTg0LDggQEAg cDJtX25leHRfbGV2ZWwoc3RydWN0IHAybV9kb21haW4gKnAybSwgdm9pZCAqKnRhYmxlLAogICAg IGwxX3BnZW50cnlfdCAqcDJtX2VudHJ5LCBuZXdfZW50cnk7CiAgICAgdm9pZCAqbmV4dDsKICAg ICB1bnNpZ25lZCBpbnQgZmxhZ3M7CisgICAgaW50IHJjOworICAgIG1mbl90IG1mbiA9IElOVkFM SURfTUZOOwogCiAgICAgaWYgKCAhKHAybV9lbnRyeSA9IHAybV9maW5kX2VudHJ5KCp0YWJsZSwg Z2ZuX3JlbWFpbmRlciwgZ2ZuLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBzaGlmdCwgbWF4KSkgKQpAQCAtMTk0LDcgKzE5Niw3IEBAIHAybV9uZXh0X2xldmVsKHN0cnVj dCBwMm1fZG9tYWluICpwMm0sIHZvaWQgKip0YWJsZSwKICAgICAvKiBQb0QvcGFnaW5nOiBOb3Qg cHJlc2VudCBkb2Vzbid0IGltcGx5IGVtcHR5LiAqLwogICAgIGlmICggIWZsYWdzICkKICAgICB7 Ci0gICAgICAgIG1mbl90IG1mbiA9IHAybV9hbGxvY19wdHAocDJtLCBsZXZlbCk7CisgICAgICAg IG1mbiA9IHAybV9hbGxvY19wdHAocDJtLCBsZXZlbCk7CiAKICAgICAgICAgaWYgKCBtZm5fZXEo bWZuLCBJTlZBTElEX01GTikgKQogICAgICAgICAgICAgcmV0dXJuIC1FTk9NRU07CkBAIC0yMDIs MTMgKzIwNCwxNCBAQCBwMm1fbmV4dF9sZXZlbChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB2b2lk ICoqdGFibGUsCiAgICAgICAgIG5ld19lbnRyeSA9IGwxZV9mcm9tX21mbihtZm4sIFAyTV9CQVNF X0ZMQUdTIHwgX1BBR0VfUlcpOwogCiAgICAgICAgIHAybV9hZGRfaW9tbXVfZmxhZ3MoJm5ld19l bnRyeSwgbGV2ZWwsIElPTU1VRl9yZWFkYWJsZXxJT01NVUZfd3JpdGFibGUpOwotICAgICAgICBw Mm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBuZXdfZW50cnksIGxldmVs ICsgMSk7CisgICAgICAgIHJjID0gcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHAybV9l bnRyeSwgbmV3X2VudHJ5LCBsZXZlbCArIDEpOworICAgICAgICBpZiAoIHJjICkKKyAgICAgICAg ICAgIEFTU0VSVF9VTlJFQUNIQUJMRSgpOwogICAgIH0KICAgICBlbHNlIGlmICggZmxhZ3MgJiBf UEFHRV9QU0UgKQogICAgIHsKICAgICAgICAgLyogU3BsaXQgc3VwZXJwYWdlcyBwYWdlcyBpbnRv IHNtYWxsZXIgb25lcy4gKi8KICAgICAgICAgdW5zaWduZWQgbG9uZyBwZm4gPSBsMWVfZ2V0X3Bm bigqcDJtX2VudHJ5KTsKLSAgICAgICAgbWZuX3QgbWZuOwogICAgICAgICBsMV9wZ2VudHJ5X3Qg KmwxX2VudHJ5OwogICAgICAgICB1bnNpZ25lZCBpbnQgaTsKIApAQCAtMjUwLDE4ICsyNTMsMzcg QEAgcDJtX25leHRfbGV2ZWwoc3RydWN0IHAybV9kb21haW4gKnAybSwgdm9pZCAqKnRhYmxlLAog ICAgICAgICB7CiAgICAgICAgICAgICBuZXdfZW50cnkgPSBsMWVfZnJvbV9wZm4ocGZuIHwgKGkg PDwgKChsZXZlbCAtIDEpICogUEFHRVRBQkxFX09SREVSKSksCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZmxhZ3MpOwotICAgICAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50 cnkocDJtLCBnZm4sIGwxX2VudHJ5ICsgaSwgbmV3X2VudHJ5LCBsZXZlbCk7CisgICAgICAgICAg ICByYyA9IHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBsMV9lbnRyeSArIGksIG5ld19l bnRyeSwgbGV2ZWwpOworICAgICAgICAgICAgaWYgKCByYyApCisgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgQVNTRVJUX1VOUkVBQ0hBQkxFKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAgICAgICB1bm1hcF9kb21haW5fcGFnZShs MV9lbnRyeSk7CiAKLSAgICAgICAgbmV3X2VudHJ5ID0gbDFlX2Zyb21fbWZuKG1mbiwgUDJNX0JB U0VfRkxBR1MgfCBfUEFHRV9SVyk7Ci0gICAgICAgIHAybV9hZGRfaW9tbXVfZmxhZ3MoJm5ld19l bnRyeSwgbGV2ZWwsIElPTU1VRl9yZWFkYWJsZXxJT01NVUZfd3JpdGFibGUpOwotICAgICAgICBw Mm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBuZXdfZW50cnksIGxldmVs ICsgMSk7CisgICAgICAgIGlmICggIXJjICkKKyAgICAgICAgeworICAgICAgICAgICAgbmV3X2Vu dHJ5ID0gbDFlX2Zyb21fbWZuKG1mbiwgUDJNX0JBU0VfRkxBR1MgfCBfUEFHRV9SVyk7CisgICAg ICAgICAgICBwMm1fYWRkX2lvbW11X2ZsYWdzKCZuZXdfZW50cnksIGxldmVsLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBJT01NVUZfcmVhZGFibGV8SU9NTVVGX3dyaXRhYmxlKTsK KyAgICAgICAgICAgIHJjID0gcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHAybV9lbnRy eSwgbmV3X2VudHJ5LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsZXZl bCArIDEpOworICAgICAgICAgICAgaWYgKCByYyApCisgICAgICAgICAgICAgICAgQVNTRVJUX1VO UkVBQ0hBQkxFKCk7CisgICAgICAgIH0KICAgICB9CiAgICAgZWxzZQogICAgICAgICBBU1NFUlQo ZmxhZ3MgJiBfUEFHRV9QUkVTRU5UKTsKIAorICAgIGlmICggcmMgKQorICAgIHsKKyAgICAgICAg QVNTRVJUKG1mbl92YWxpZChtZm4pKTsKKyAgICAgICAgcDJtX2ZyZWVfcHRwKHAybSwgbWZuX3Rv X3BhZ2UobWZuKSk7CisgICAgICAgIHJldHVybiByYzsKKyAgICB9CisKICAgICBuZXh0ID0gbWFw X2RvbWFpbl9wYWdlKGwxZV9nZXRfbWZuKCpwMm1fZW50cnkpKTsKICAgICBpZiAoIHVubWFwICkK ICAgICAgICAgdW5tYXBfZG9tYWluX3BhZ2UoKnRhYmxlKTsKQEAgLTMyMSw3ICszNDMsMTIgQEAg c3RhdGljIGludCBwMm1fcHRfc2V0X3JlY2FsY19yYW5nZShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LAogICAgICAgICAgICAgaWYgKCAobDFlX2dldF9mbGFncyhlKSAmIF9QQUdFX1BSRVNFTlQpICYm ICFuZWVkc19yZWNhbGMobDEsIGUpICkKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBz ZXRfcmVjYWxjKGwxLCBlKTsKLSAgICAgICAgICAgICAgICBwMm0tPndyaXRlX3AybV9lbnRyeShw Mm0sIGZpcnN0X2dmbiwgcGVudCwgZSwgbGV2ZWwpOworICAgICAgICAgICAgICAgIGVyciA9IHAy bS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZmlyc3RfZ2ZuLCBwZW50LCBlLCBsZXZlbCk7CisgICAg ICAgICAgICAgICAgaWYgKCBlcnIgKQorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICAgICAgQVNTRVJUX1VOUkVBQ0hBQkxFKCk7CisgICAgICAgICAgICAgICAgICAgIGdvdG8gb3V0 OworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGZpcnN0X2dm biArPSAxVUwgPDwgKGkgKiBQQUdFVEFCTEVfT1JERVIpOwogICAgICAgICB9CkBAIC0zOTIsMTQg KzQxOSwyNCBAQCBzdGF0aWMgaW50IGRvX3JlY2FsYyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1 bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAgICAgICAgICAgICAgICFuZWVkc19yZWNhbGMobDEs IGVudCkgKQogICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgc2V0X3JlY2Fs YyhsMSwgZW50KTsKLSAgICAgICAgICAgICAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJt LCBnZm4gLSByZW1haW5kZXIsICZwdGFiW2ldLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBlbnQsIGxldmVsKTsKKyAgICAgICAgICAgICAgICAgICAgZXJyID0gcDJt LT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4gLSByZW1haW5kZXIsICZwdGFiW2ldLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnQsIGxldmVsKTsKKyAg ICAgICAgICAgICAgICAgICAgaWYgKCBlcnIgKQorICAgICAgICAgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgICAgICAgICBBU1NFUlRfVU5SRUFDSEFCTEUoKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgIGdvdG8gb3V0OworICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIHJlbWFpbmRlciAtPSAxVUwgPDwgKChsZXZlbCAtIDEpICog UEFHRVRBQkxFX09SREVSKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHNtcF93bWIoKTsK ICAgICAgICAgICAgIGNsZWFyX3JlY2FsYyhsMSwgZSk7Ci0gICAgICAgICAgICBwMm0tPndyaXRl X3AybV9lbnRyeShwMm0sIGdmbiwgcGVudCwgZSwgbGV2ZWwgKyAxKTsKKyAgICAgICAgICAgIGVy ciA9IHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2ZuLCBwZW50LCBlLCBsZXZlbCArIDEpOwor ICAgICAgICAgICAgaWYgKCBlcnIgKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIEFT U0VSVF9VTlJFQUNIQUJMRSgpOworICAgICAgICAgICAgICAgIGdvdG8gb3V0OworICAgICAgICAg ICAgfQogICAgICAgICB9CiAgICAgICAgIHVubWFwX2RvbWFpbl9wYWdlKCh2b2lkICopKCh1bnNp Z25lZCBsb25nKXBlbnQgJiBQQUdFX01BU0spKTsKICAgICB9CkBAIC00NDQsNyArNDgxLDggQEAg c3RhdGljIGludCBkb19yZWNhbGMoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9u ZyBnZm4pCiAgICAgICAgIH0KICAgICAgICAgZWxzZQogICAgICAgICAgICAgY2xlYXJfcmVjYWxj KGwxLCBlKTsKLSAgICAgICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHBlbnQsIGUs IGxldmVsICsgMSk7CisgICAgICAgIGVyciA9IHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2Zu LCBwZW50LCBlLCBsZXZlbCArIDEpOworICAgICAgICBBU1NFUlQoIWVycik7CiAgICAgfQogCiAg b3V0OgpAQCAtNTk1LDggKzYzMywxMCBAQCBwMm1fcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9t YWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwKICAgICAgICAgaWYgKCBlbnRyeV9jb250 ZW50LmwxICE9IDAgKQogICAgICAgICAgICAgcDJtX2FkZF9pb21tdV9mbGFncygmZW50cnlfY29u dGVudCwgMCwgaW9tbXVfcHRlX2ZsYWdzKTsKIAotICAgICAgICBwMm0tPndyaXRlX3AybV9lbnRy eShwMm0sIGdmbiwgcDJtX2VudHJ5LCBlbnRyeV9jb250ZW50LCAzKTsKKyAgICAgICAgcmMgPSBw Mm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBlbnRyeV9jb250ZW50LCAz KTsKICAgICAgICAgLyogTkI6IHBhZ2luZ193cml0ZV9wMm1fZW50cnkoKSBoYW5kbGVzIHRsYiBm bHVzaGVzIHByb3Blcmx5ICovCisgICAgICAgIGlmICggcmMgKQorICAgICAgICAgICAgZ290byBv dXQ7CiAgICAgfQogICAgIGVsc2UgCiAgICAgewpAQCAtNjMzLDggKzY3MywxMCBAQCBwMm1fcHRf c2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwK ICAgICAgICAgICAgIHAybV9hZGRfaW9tbXVfZmxhZ3MoJmVudHJ5X2NvbnRlbnQsIDAsIGlvbW11 X3B0ZV9mbGFncyk7CiAKICAgICAgICAgLyogbGV2ZWwgMSBlbnRyeSAqLwotICAgICAgICBwMm0t PndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBlbnRyeV9jb250ZW50LCAxKTsK KyAgICAgICAgcmMgPSBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBl bnRyeV9jb250ZW50LCAxKTsKICAgICAgICAgLyogTkI6IHBhZ2luZ193cml0ZV9wMm1fZW50cnko KSBoYW5kbGVzIHRsYiBmbHVzaGVzIHByb3Blcmx5ICovCisgICAgICAgIGlmICggcmMgKQorICAg ICAgICAgICAgZ290byBvdXQ7CiAgICAgfQogICAgIGVsc2UgaWYgKCBwYWdlX29yZGVyID09IFBB R0VfT1JERVJfMk0gKQogICAgIHsKQEAgLTY2OSw4ICs3MTEsMTAgQEAgcDJtX3B0X3NldF9lbnRy eShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5fdCBnZm5fLCBtZm5fdCBtZm4sCiAgICAgICAg IGlmICggZW50cnlfY29udGVudC5sMSAhPSAwICkKICAgICAgICAgICAgIHAybV9hZGRfaW9tbXVf ZmxhZ3MoJmVudHJ5X2NvbnRlbnQsIDAsIGlvbW11X3B0ZV9mbGFncyk7CiAKLSAgICAgICAgcDJt LT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHAybV9lbnRyeSwgZW50cnlfY29udGVudCwgMik7 CisgICAgICAgIHJjID0gcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHAybV9lbnRyeSwg ZW50cnlfY29udGVudCwgMik7CiAgICAgICAgIC8qIE5COiBwYWdpbmdfd3JpdGVfcDJtX2VudHJ5 KCkgaGFuZGxlcyB0bGIgZmx1c2hlcyBwcm9wZXJseSAqLworICAgICAgICBpZiAoIHJjICkKKyAg ICAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAogICAgIC8qIFRyYWNrIHRoZSBoaWdoZXN0IGdm biBmb3Igd2hpY2ggd2UgaGF2ZSBldmVyIGhhZCBhIHZhbGlkIG1hcHBpbmcgKi8KQEAgLTg5NCw4 ICs5MzgsMTUgQEAgc3RhdGljIHZvaWQgcDJtX3B0X2NoYW5nZV9lbnRyeV90eXBlX2dsb2JhbChz dHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgICAgICBpZiAoIChsMWVfZ2V0X2ZsYWdzKGUpICYg X1BBR0VfUFJFU0VOVCkgJiYKICAgICAgICAgICAgICAhbmVlZHNfcmVjYWxjKGwxLCBlKSApCiAg ICAgICAgIHsKKyAgICAgICAgICAgIGludCByYzsKKwogICAgICAgICAgICAgc2V0X3JlY2FsYyhs MSwgZSk7Ci0gICAgICAgICAgICBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgJnRhYltp XSwgZSwgNCk7CisgICAgICAgICAgICByYyA9IHAybS0+d3JpdGVfcDJtX2VudHJ5KHAybSwgZ2Zu LCAmdGFiW2ldLCBlLCA0KTsKKyAgICAgICAgICAgIGlmICggcmMgKQorICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgIEFTU0VSVF9VTlJFQUNIQUJMRSgpOworICAgICAgICAgICAgICAgIGJy ZWFrOworICAgICAgICAgICAgfQogICAgICAgICAgICAgKytjaGFuZ2VkOwogICAgICAgICB9CiAg ICAgICAgIGdmbiArPSAxVUwgPDwgKEw0X1BBR0VUQUJMRV9TSElGVCAtIFBBR0VfU0hJRlQpOwpk aWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3BhZ2luZy5jIGIveGVuL2FyY2gveDg2L21tL3Bh Z2luZy5jCmluZGV4IGU2ZWQzMDA2ZmUuLjIxZGIzZWNlYjYgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNo L3g4Ni9tbS9wYWdpbmcuYworKysgYi94ZW4vYXJjaC94ODYvbW0vcGFnaW5nLmMKQEAgLTkzMiwx OCArOTMyLDIyIEBAIHZvaWQgcGFnaW5nX3VwZGF0ZV9uZXN0ZWRtb2RlKHN0cnVjdCB2Y3B1ICp2 KQogfQogI2VuZGlmCiAKLXZvaWQgcGFnaW5nX3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2Rv bWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlfdCBuZXcsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgdW5zaWduZWQgaW50IGxldmVsKQoraW50IHBhZ2luZ193cml0ZV9wMm1fZW50cnko c3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4sCisgICAgICAgICAgICAg ICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlfdCBuZXcsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpCiB7CiAgICAgc3RydWN0IGRv bWFpbiAqZCA9IHAybS0+ZG9tYWluOwogICAgIHN0cnVjdCB2Y3B1ICp2ID0gY3VycmVudDsKKyAg ICBpbnQgcmMgPSAwOworCiAgICAgaWYgKCB2LT5kb21haW4gIT0gZCApCiAgICAgICAgIHYgPSBk LT52Y3B1ID8gZC0+dmNwdVswXSA6IE5VTEw7CiAgICAgaWYgKCBsaWtlbHkodiAmJiBwYWdpbmdf bW9kZV9lbmFibGVkKGQpICYmIHBhZ2luZ19nZXRfaG9zdG1vZGUodikgIT0gTlVMTCkgKQotICAg ICAgICBwYWdpbmdfZ2V0X2hvc3Rtb2RlKHYpLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHAs IG5ldywgbGV2ZWwpOworICAgICAgICByYyA9IHBhZ2luZ19nZXRfaG9zdG1vZGUodiktPndyaXRl X3AybV9lbnRyeShwMm0sIGdmbiwgcCwgbmV3LCBsZXZlbCk7CiAgICAgZWxzZQogICAgICAgICBz YWZlX3dyaXRlX3B0ZShwLCBuZXcpOworCisgICAgcmV0dXJuIHJjOwogfQogCiBpbnQgcGFnaW5n X3NldF9hbGxvY2F0aW9uKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBwYWdlcywgYm9v bCAqcHJlZW1wdGVkKQpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24u YyBiL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMKaW5kZXggZGU3YWJmNzE1MC4uYzgx ODExMjM2MCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21tb24uYworKysg Yi94ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jCkBAIC0zMTc2LDcgKzMxNzYsNyBAQCBz dGF0aWMgdm9pZCBzaF91bnNoYWRvd19mb3JfcDJtX2NoYW5nZShzdHJ1Y3QgZG9tYWluICpkLCB1 bnNpZ25lZCBsb25nIGdmbiwKICAgICB9CiB9CiAKLXZvaWQKK2ludAogc2hhZG93X3dyaXRlX3Ay bV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwKICAgICAg ICAgICAgICAgICAgICAgICAgbDFfcGdlbnRyeV90ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LAogICAg ICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpCkBAIC0zMjExLDYgKzMyMTEs OCBAQCBzaGFkb3dfd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2ln bmVkIGxvbmcgZ2ZuLAogI2VuZGlmCiAKICAgICBwYWdpbmdfdW5sb2NrKGQpOworCisgICAgcmV0 dXJuIDA7CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4 Ni9tbS9zaGFkb3cvbm9uZS5jIGIveGVuL2FyY2gveDg2L21tL3NoYWRvdy9ub25lLmMKaW5kZXgg MzE2MDAyNzcxZC4uMWI1NGVjMDVhOCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3NoYWRv dy9ub25lLmMKKysrIGIveGVuL2FyY2gveDg2L21tL3NoYWRvdy9ub25lLmMKQEAgLTYwLDExICs2 MCwxMiBAQCBzdGF0aWMgdm9pZCBfdXBkYXRlX3BhZ2luZ19tb2RlcyhzdHJ1Y3QgdmNwdSAqdikK ICAgICBBU1NFUlRfVU5SRUFDSEFCTEUoKTsKIH0KIAotc3RhdGljIHZvaWQgX3dyaXRlX3AybV9l bnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbDFfcGdlbnRyeV90ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpCitzdGF0aWMg aW50IF93cml0ZV9wMm1fZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9u ZyBnZm4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgbDFfcGdlbnRyeV90ICpwLCBsMV9w Z2VudHJ5X3QgbmV3LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBs ZXZlbCkKIHsKICAgICBBU1NFUlRfVU5SRUFDSEFCTEUoKTsKKyAgICByZXR1cm4gLUVOT1NZUzsK IH0KIAogc3RhdGljIGNvbnN0IHN0cnVjdCBwYWdpbmdfbW9kZSBzaF9wYWdpbmdfbm9uZSA9IHsK ZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvcHJpdmF0ZS5oIGIveGVuL2FyY2gv eDg2L21tL3NoYWRvdy9wcml2YXRlLmgKaW5kZXggMGFhZWQxZWRmYy4uNTgwZWYzZTI5ZSAxMDA2 NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3NoYWRvdy9wcml2YXRlLmgKKysrIGIveGVuL2FyY2gv eDg2L21tL3NoYWRvdy9wcml2YXRlLmgKQEAgLTM3Miw5ICszNzIsOSBAQCBleHRlcm4gaW50IHNo X3JlbW92ZV93cml0ZV9hY2Nlc3Moc3RydWN0IGRvbWFpbiAqZCwgbWZuX3QgcmVhZG9ubHlfbWZu LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgZmF1bHRf YWRkcik7CiAKIC8qIEZ1bmN0aW9ucyB0aGF0IGF0b21pY2FsbHkgd3JpdGUgUFQvUDJNIGVudHJp ZXMgYW5kIHVwZGF0ZSBzdGF0ZSAqLwotdm9pZCBzaGFkb3dfd3JpdGVfcDJtX2VudHJ5KHN0cnVj dCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90IG5ldywKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpOworaW50IHNoYWRvd193cml0ZV9w Mm1fZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4sCisgICAg ICAgICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3BnZW50cnlfdCBuZXcs CisgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGV2ZWwpOwogCiAvKiBV cGRhdGUgYWxsIHRoZSB0aGluZ3MgdGhhdCBhcmUgZGVyaXZlZCBmcm9tIHRoZSBndWVzdCdzIENS MC9DUjMvQ1I0LgogICogQ2FsbGVkIHRvIGluaXRpYWxpemUgcGFnaW5nIHN0cnVjdHVyZXMgaWYg dGhlIHBhZ2luZyBtb2RlCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oIGIv eGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaAppbmRleCA4MzRkNDlkMmQ0Li5mNGVjMmJlY2JkIDEw MDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oCisrKyBiL3hlbi9pbmNsdWRlL2Fz bS14ODYvcDJtLmgKQEAgLTI2NSw3ICsyNjUsNyBAQCBzdHJ1Y3QgcDJtX2RvbWFpbiB7CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxv bmcgbGFzdF9nZm4pOwogICAgIHZvaWQgICAgICAgICAgICAgICAoKm1lbW9yeV90eXBlX2NoYW5n ZWQpKHN0cnVjdCBwMm1fZG9tYWluICpwMm0pOwogICAgIAotICAgIHZvaWQgICAgICAgICAgICAg ICAoKndyaXRlX3AybV9lbnRyeSkoc3RydWN0IHAybV9kb21haW4gKnAybSwKKyAgICBpbnQgICAg ICAgICAgICAgICAgKCp3cml0ZV9wMm1fZW50cnkpKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGdm biwgbDFfcGdlbnRyeV90ICpwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbDFfcGdlbnRyeV90IG5ldywgdW5zaWduZWQgaW50IGxldmVsKTsKICAgICBsb25nICAg ICAgICAgICAgICAgKCphdWRpdF9wMm0pKHN0cnVjdCBwMm1fZG9tYWluICpwMm0pOwpAQCAtODM3 LDcgKzgzNyw3IEBAIHZvaWQgcDJtX2ZsdXNoX25lc3RlZHAybShzdHJ1Y3QgZG9tYWluICpkKTsK IC8qIEZsdXNoZXMgdGhlIG5wMm0gc3BlY2lmaWVkIGJ5IG5wMm1fYmFzZSAoaWYgaXQgZXhpc3Rz KSAqLwogdm9pZCBucDJtX2ZsdXNoX2Jhc2Uoc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGxvbmcg bnAybV9iYXNlKTsKIAotdm9pZCBuZXN0ZWRwMm1fd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1f ZG9tYWluICpwMm0sIHVuc2lnbmVkIGxvbmcgZ2ZuLAoraW50IG5lc3RlZHAybV93cml0ZV9wMm1f ZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4sCiAgICAgbDFf cGdlbnRyeV90ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LCB1bnNpZ25lZCBpbnQgbGV2ZWwpOwogCiAv KgpkaWZmIC0tZ2l0IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9wYWdpbmcuaCBiL3hlbi9pbmNsdWRl L2FzbS14ODYvcGFnaW5nLmgKaW5kZXggN2VjMDlkN2IxMS4uMThhN2VhZWNhNCAxMDA2NDQKLS0t IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9wYWdpbmcuaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2 L3BhZ2luZy5oCkBAIC0xMjQsNyArMTI0LDcgQEAgc3RydWN0IHBhZ2luZ19tb2RlIHsKICAgICB2 b2lkICAgICAgICAgICgqdXBkYXRlX2NyMyAgICAgICAgICAgICkoc3RydWN0IHZjcHUgKnYsIGlu dCBkb19sb2NraW5nLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBib29sIG5vZmx1c2gpOwogICAgIHZvaWQgICAgICAgICAgKCp1cGRhdGVfcGFnaW5nX21vZGVz ICAgKShzdHJ1Y3QgdmNwdSAqdik7Ci0gICAgdm9pZCAgICAgICAgICAoKndyaXRlX3AybV9lbnRy eSAgICAgICApKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCisgICAgaW50ICAgICAgICAgICAoKndy aXRlX3AybV9lbnRyeSAgICAgICApKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgZ2ZuLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAs IGwxX3BnZW50cnlfdCBuZXcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHVuc2lnbmVkIGludCBsZXZlbCk7CkBAIC0zNDAsOSArMzQwLDkgQEAgc3RhdGljIGlu bGluZSB2b2lkIHNhZmVfd3JpdGVfcHRlKGwxX3BnZW50cnlfdCAqcCwgbDFfcGdlbnRyeV90IG5l dykKICAqIHdlIGFyZSB3cml0aW5nLiAqLwogc3RydWN0IHAybV9kb21haW47CiAKLXZvaWQgcGFn aW5nX3dyaXRlX3AybV9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25n IGdmbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5X3QgKnAsIGwxX3Bn ZW50cnlfdCBuZXcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGxl dmVsKTsKK2ludCBwYWdpbmdfd3JpdGVfcDJtX2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0s IHVuc2lnbmVkIGxvbmcgZ2ZuLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgbDFfcGdlbnRy eV90ICpwLCBsMV9wZ2VudHJ5X3QgbmV3LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5z aWduZWQgaW50IGxldmVsKTsKIAogLyoKICAqIENhbGxlZCBmcm9tIHRoZSBndWVzdCB0byBpbmRp Y2F0ZSB0aGF0IHRoZSBhIHByb2Nlc3MgaXMgYmVpbmcKLS0gCjIuMTcuMiAoQXBwbGUgR2l0LTEx MykKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczov L2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs