From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH for-4.10] common/gnttab: Improve logging message by including relevent domid Date: Tue, 10 Oct 2017 21:24:35 +0100 Message-ID: <1507667075-15556-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Tim Deegan , Julien Grall , Jan Beulich List-Id: xen-devel@lists.xenproject.org U2V2ZXJhbCBsb2dnaW5nIG1lc3NhZ2VzIGNpdGUgImJhZCByZWYgJSN4Iiwgd2l0aG91dCBpZGVu dGlmeWluZyB3aGljaCBkb21haW4KdGhlIHJlZiBiZWxvbmdzIHRvLiAgQWRkIGEgZG9tYWluIGJh Y2stcG9pbnRlciB0byBzdHJ1Y3QgZ3JhbnRfdGFibGUgdG8KaW1wcm92ZSB0aGUgZGVidWdhYmls aXR5LgoKV2hpbGUgZWRpdGluZyB0aGUgbWVzc2FnZXMsIGNsZWFuIHVwIHNvbWUgb3RoZXJzOgoK ICogUmVtb3ZlIGV4dHJhbmlvdXMgcHVuY3R1YXRpb24KICogVXNlIGQlZCByYXRoZXIgdGhhbiBE b20lZAogKiBSZW1vdmUgImdudHRhYl90cmFuc2ZlcjoiIHByZWZpeGVzLCBhcyBpdCBpcyBpbmNs dWRlZCBieSB0aGUgZ2RwcmludGsoKQogKiBSZWZsb3cgc2V2ZXJhbCBtZXNzYWdlcyB0byBub3Qg YmUgc3BsaXQgYWNyb3NzIG11bHRpcGxlIGxpbmVzCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29v cGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0KQ0M6IEdlb3JnZSBEdW5sYXAgPEdl b3JnZS5EdW5sYXBAZXUuY2l0cml4LmNvbT4KQ0M6IEphbiBCZXVsaWNoIDxKQmV1bGljaEBzdXNl LmNvbT4KQ0M6IEtvbnJhZCBSemVzenV0ZWsgV2lsayA8a29ucmFkLndpbGtAb3JhY2xlLmNvbT4K Q0M6IFN0ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KQ0M6IFRpbSBE ZWVnYW4gPHRpbUB4ZW4ub3JnPgpDQzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ0M6 IEp1bGllbiBHcmFsbCA8anVsaWVuLmdyYWxsQGFybS5jb20+Ci0tLQogeGVuL2NvbW1vbi9ncmFu dF90YWJsZS5jIHwgOTEgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDggaW5zZXJ0aW9ucygrKSwgNDMgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9ncmFudF90YWJsZS5jIGIveGVuL2NvbW1vbi9ncmFu dF90YWJsZS5jCmluZGV4IDZkMjBiMTcuLjNhN2E3ZTQgMTAwNjQ0Ci0tLSBhL3hlbi9jb21tb24v Z3JhbnRfdGFibGUuYworKysgYi94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMKQEAgLTc2LDYgKzc2 LDkgQEAgc3RydWN0IGdyYW50X3RhYmxlIHsKICAgICAvKiBNYXBwaW5nIHRyYWNraW5nIHRhYmxl IHBlciB2Y3B1LiAqLwogICAgIHN0cnVjdCBncmFudF9tYXBwaW5nICoqbWFwdHJhY2s7CiAKKyAg ICAvKiBEb21haW4gdG8gd2hpY2ggdGhpcyBzdHJ1Y3QgZ3JhbnRfdGFibGUgYmVsb25ncy4gKi8K KyAgICBzdHJ1Y3QgZG9tYWluICpkb21haW47CisKICAgICBzdHJ1Y3QgZ3JhbnRfdGFibGVfYXJj aCBhcmNoOwogfTsKIApAQCAtNjUxLDcgKzY1NCw3IEBAIHN0YXRpYyBpbnQgX3NldF9zdGF0dXNf djEoZG9taWRfdCAgZG9taWQsCiAgICAgICAgICAgICAgICBHVEZfcGVybWl0X2FjY2VzcykgfHwK ICAgICAgICAgICAgICAgKHNjb21iby5zaG9ydHMuZG9taWQgIT0gZG9taWQpKSApCiAgICAgICAg ICAgICBQSU5fRkFJTChkb25lLCBHTlRTVF9nZW5lcmFsX2Vycm9yLAotICAgICAgICAgICAgICAg ICAgICAgIkJhZCBmbGFncyAoJXgpIG9yIGRvbSAoJWQpLiAoZXhwZWN0ZWQgZG9tICVkKVxuIiwK KyAgICAgICAgICAgICAgICAgICAgICJCYWQgZmxhZ3MgKCV4KSBvciBkb20gKCVkKTsgZXhwZWN0 ZWQgZCVkXG4iLAogICAgICAgICAgICAgICAgICAgICAgc2NvbWJvLnNob3J0cy5mbGFncywgc2Nv bWJvLnNob3J0cy5kb21pZCwKICAgICAgICAgICAgICAgICAgICAgIGRvbWlkKTsKIApAQCAtNjYz LDcgKzY2Niw3IEBAIHN0YXRpYyBpbnQgX3NldF9zdGF0dXNfdjEoZG9taWRfdCAgZG9taWQsCiAg ICAgICAgICAgICBuZXdfc2NvbWJvLnNob3J0cy5mbGFncyB8PSBHVEZfd3JpdGluZzsKICAgICAg ICAgICAgIGlmICggdW5saWtlbHkoc2NvbWJvLnNob3J0cy5mbGFncyAmIEdURl9yZWFkb25seSkg KQogICAgICAgICAgICAgICAgIFBJTl9GQUlMKGRvbmUsIEdOVFNUX2dlbmVyYWxfZXJyb3IsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgIkF0dGVtcHQgdG8gd3JpdGUtcGluIGEgci9vIGdyYW50 IGVudHJ5LlxuIik7CisgICAgICAgICAgICAgICAgICAgICAgICAgIkF0dGVtcHQgdG8gd3JpdGUt cGluIGEgci9vIGdyYW50IGVudHJ5XG4iKTsKICAgICAgICAgfQogCiAgICAgICAgIHByZXZfc2Nv bWJvLndvcmQgPSBjbXB4Y2hnKCh1MzIgKilzaGFoLApAQCAtNjczLDcgKzY3Niw3IEBAIHN0YXRp YyBpbnQgX3NldF9zdGF0dXNfdjEoZG9taWRfdCAgZG9taWQsCiAKICAgICAgICAgaWYgKCByZXRy aWVzKysgPT0gNCApCiAgICAgICAgICAgICBQSU5fRkFJTChkb25lLCBHTlRTVF9nZW5lcmFsX2Vy cm9yLAotICAgICAgICAgICAgICAgICAgICAgIlNoYXJlZCBncmFudCBlbnRyeSBpcyB1bnN0YWJs ZS5cbiIpOworICAgICAgICAgICAgICAgICAgICAgIlNoYXJlZCBncmFudCBlbnRyeSBpcyB1bnN0 YWJsZVxuIik7CiAKICAgICAgICAgc2NvbWJvID0gcHJldl9zY29tYm87CiAgICAgfQpAQCAtNzE1 LDcgKzcxOCw3IEBAIHN0YXRpYyBpbnQgX3NldF9zdGF0dXNfdjIoZG9taWRfdCAgZG9taWQsCiAg ICAgICAgICAgICAoKGZsYWdzICYgbWFzaykgIT0gR1RGX3RyYW5zaXRpdmUpKSB8fAogICAgICAg ICAgIChpZCAhPSBkb21pZCkpICkKICAgICAgICAgUElOX0ZBSUwoZG9uZSwgR05UU1RfZ2VuZXJh bF9lcnJvciwKLSAgICAgICAgICAgICAgICAgIkJhZCBmbGFncyAoJXgpIG9yIGRvbSAoJWQpLiAo ZXhwZWN0ZWQgZG9tICVkLCBmbGFncyAleClcbiIsCisgICAgICAgICAgICAgICAgICJCYWQgZmxh Z3MgKCV4KSBvciBkb20gKCVkKTsgZXhwZWN0ZWQgZCVkLCBmbGFncyAleFxuIiwKICAgICAgICAg ICAgICAgICAgZmxhZ3MsIGlkLCBkb21pZCwgbWFzayk7CiAKICAgICBpZiAoIHJlYWRvbmx5ICkK QEAgLTcyNiw3ICs3MjksNyBAQCBzdGF0aWMgaW50IF9zZXRfc3RhdHVzX3YyKGRvbWlkX3QgIGRv bWlkLAogICAgIHsKICAgICAgICAgaWYgKCB1bmxpa2VseShmbGFncyAmIEdURl9yZWFkb25seSkg KQogICAgICAgICAgICAgUElOX0ZBSUwoZG9uZSwgR05UU1RfZ2VuZXJhbF9lcnJvciwKLSAgICAg ICAgICAgICAgICAgICAgICJBdHRlbXB0IHRvIHdyaXRlLXBpbiBhIHIvbyBncmFudCBlbnRyeS5c biIpOworICAgICAgICAgICAgICAgICAgICAgIkF0dGVtcHQgdG8gd3JpdGUtcGluIGEgci9vIGdy YW50IGVudHJ5XG4iKTsKICAgICAgICAgKnN0YXR1cyB8PSBHVEZfcmVhZGluZyB8IEdURl93cml0 aW5nOwogICAgIH0KIApAQCAtNzQ5LDggKzc1Miw3IEBAIHN0YXRpYyBpbnQgX3NldF9zdGF0dXNf djIoZG9taWRfdCAgZG9taWQsCiAgICAgICAgICAgICBnbnR0YWJfY2xlYXJfZmxhZyhfR1RGX3dy aXRpbmcsIHN0YXR1cyk7CiAgICAgICAgICAgICBnbnR0YWJfY2xlYXJfZmxhZyhfR1RGX3JlYWRp bmcsIHN0YXR1cyk7CiAgICAgICAgICAgICBQSU5fRkFJTChkb25lLCBHTlRTVF9nZW5lcmFsX2Vy cm9yLAotICAgICAgICAgICAgICAgICAgICAgIlVuc3RhYmxlIGZsYWdzICgleCkgb3IgZG9tICgl ZCkuIChleHBlY3RlZCBkb20gJWQpICIKLSAgICAgICAgICAgICAgICAgICAgICIoci93OiAlZClc biIsCisgICAgICAgICAgICAgICAgICAgICAiVW5zdGFibGUgZmxhZ3MgKCV4KSBvciBkb20gKCVk KTsgZXhwZWN0ZWQgZCVkIChyL3c6ICVkKVxuIiwKICAgICAgICAgICAgICAgICAgICAgIGZsYWdz LCBpZCwgZG9taWQsICFyZWFkb25seSk7CiAgICAgICAgIH0KICAgICB9CkBAIC04OTYsNyArODk4 LDcgQEAgbWFwX2dyYW50X3JlZigKIAogICAgIGlmICggdW5saWtlbHkoKG9wLT5mbGFncyAmIChH TlRNQVBfZGV2aWNlX21hcHxHTlRNQVBfaG9zdF9tYXApKSA9PSAwKSApCiAgICAgewotICAgICAg ICBnZHByaW50ayhYRU5MT0dfSU5GTywgIkJhZCBmbGFncyBpbiBncmFudCBtYXAgb3AgKCV4KS5c biIsIG9wLT5mbGFncyk7CisgICAgICAgIGdkcHJpbnRrKFhFTkxPR19JTkZPLCAiQmFkIGZsYWdz IGluIGdyYW50IG1hcCBvcDogJXhcbiIsIG9wLT5mbGFncyk7CiAgICAgICAgIG9wLT5zdGF0dXMg PSBHTlRTVF9iYWRfZ250cmVmOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtOTA1LDcgKzkw Nyw3IEBAIG1hcF9ncmFudF9yZWYoCiAgICAgICAgICAgICAgICAgICAob3AtPmZsYWdzICYgKEdO VE1BUF9kZXZpY2VfbWFwfEdOVE1BUF9hcHBsaWNhdGlvbl9tYXB8CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgR05UTUFQX2NvbnRhaW5zX3B0ZSkpKSApCiAgICAgewotICAgICAgICBnZHBy aW50ayhYRU5MT0dfSU5GTywgIk5vIGRldmljZSBtYXBwaW5nIGluIEhWTSBkb21haW4uXG4iKTsK KyAgICAgICAgZ2RwcmludGsoWEVOTE9HX0lORk8sICJObyBkZXZpY2UgbWFwcGluZyBpbiBIVk0g ZG9tYWluXG4iKTsKICAgICAgICAgb3AtPnN0YXR1cyA9IEdOVFNUX2dlbmVyYWxfZXJyb3I7CiAg ICAgICAgIHJldHVybjsKICAgICB9CkBAIC05MzAsNyArOTMyLDcgQEAgbWFwX2dyYW50X3JlZigK ICAgICBpZiAoIHVubGlrZWx5KGhhbmRsZSA9PSBJTlZBTElEX01BUFRSQUNLX0hBTkRMRSkgKQog ICAgIHsKICAgICAgICAgcmN1X3VubG9ja19kb21haW4ocmQpOwotICAgICAgICBnZHByaW50ayhY RU5MT0dfSU5GTywgIkZhaWxlZCB0byBvYnRhaW4gbWFwdHJhY2sgaGFuZGxlLlxuIik7CisgICAg ICAgIGdkcHJpbnRrKFhFTkxPR19JTkZPLCAiRmFpbGVkIHRvIG9idGFpbiBtYXB0cmFjayBoYW5k bGVcbiIpOwogICAgICAgICBvcC0+c3RhdHVzID0gR05UU1Rfbm9fZGV2aWNlX3NwYWNlOwogICAg ICAgICByZXR1cm47CiAgICAgfQpAQCAtOTQwLDcgKzk0Miw4IEBAIG1hcF9ncmFudF9yZWYoCiAK ICAgICAvKiBCb3VuZHMgY2hlY2sgb24gdGhlIGdyYW50IHJlZiAqLwogICAgIGlmICggdW5saWtl bHkob3AtPnJlZiA+PSBucl9ncmFudF9lbnRyaWVzKHJndCkpKQotICAgICAgICBQSU5fRkFJTCh1 bmxvY2tfb3V0LCBHTlRTVF9iYWRfZ250cmVmLCAiQmFkIHJlZiAlI3hcbiIsIG9wLT5yZWYpOwor ICAgICAgICBQSU5fRkFJTCh1bmxvY2tfb3V0LCBHTlRTVF9iYWRfZ250cmVmLCAiQmFkIHJlZiAl I3ggZm9yIGQlZFxuIiwKKyAgICAgICAgICAgICAgICAgb3AtPnJlZiwgcmd0LT5kb21haW4tPmRv bWFpbl9pZCk7CiAKICAgICBhY3QgPSBhY3RpdmVfZW50cnlfYWNxdWlyZShyZ3QsIG9wLT5yZWYp OwogICAgIHNoYWggPSBzaGFyZWRfZW50cnlfaGVhZGVyKHJndCwgb3AtPnJlZik7CkBAIC0xMjM5 LDcgKzEyNDIsOCBAQCB1bm1hcF9jb21tb24oCiAKICAgICBpZiAoIHVubGlrZWx5KG9wLT5oYW5k bGUgPj0gbGd0LT5tYXB0cmFja19saW1pdCkgKQogICAgIHsKLSAgICAgICAgZ2RwcmludGsoWEVO TE9HX0lORk8sICJCYWQgaGFuZGxlICUjeFxuIiwgb3AtPmhhbmRsZSk7CisgICAgICAgIGdkcHJp bnRrKFhFTkxPR19JTkZPLCAiQmFkIGQlZCBoYW5kbGUgJSN4XG4iLAorICAgICAgICAgICAgICAg ICBsZ3QtPmRvbWFpbi0+ZG9tYWluX2lkLCBvcC0+aGFuZGxlKTsKICAgICAgICAgb3AtPnN0YXR1 cyA9IEdOVFNUX2JhZF9oYW5kbGU7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xMjQ5LDcg KzEyNTMsOCBAQCB1bm1hcF9jb21tb24oCiAKICAgICBpZiAoIHVubGlrZWx5KCFyZWFkX2F0b21p YygmbWFwLT5mbGFncykpICkKICAgICB7Ci0gICAgICAgIGdkcHJpbnRrKFhFTkxPR19JTkZPLCAi WmVybyBmbGFncyBmb3IgaGFuZGxlICUjeFxuIiwgb3AtPmhhbmRsZSk7CisgICAgICAgIGdkcHJp bnRrKFhFTkxPR19JTkZPLCAiWmVybyBmbGFncyBmb3IgZCVkIGhhbmRsZSAlI3hcbiIsCisgICAg ICAgICAgICAgICAgIGxndC0+ZG9tYWluLT5kb21haW5faWQsIG9wLT5oYW5kbGUpOwogICAgICAg ICBvcC0+c3RhdHVzID0gR05UU1RfYmFkX2hhbmRsZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K QEAgLTEzMDQsNyArMTMwOSw4IEBAIHVubWFwX2NvbW1vbigKICAgICBzbXBfcm1iKCk7CiAgICAg aWYgKCB1bmxpa2VseShvcC0+cmVmID49IG5yX2dyYW50X2VudHJpZXMocmd0KSkgKQogICAgIHsK LSAgICAgICAgZ2RwcmludGsoWEVOTE9HX1dBUk5JTkcsICJVbnN0YWJsZSBoYW5kbGUgJSN4XG4i LCBvcC0+aGFuZGxlKTsKKyAgICAgICAgZ2RwcmludGsoWEVOTE9HX1dBUk5JTkcsICJVbnN0YWJs ZSBkJWQgaGFuZGxlICUjeFxuIiwKKyAgICAgICAgICAgICAgICAgcmd0LT5kb21haW4tPmRvbWFp bl9pZCwgb3AtPmhhbmRsZSk7CiAgICAgICAgIHJjID0gR05UU1RfYmFkX2hhbmRsZTsKICAgICAg ICAgZmxhZ3MgPSAwOwogICAgICAgICBnb3RvIHVubG9ja19vdXQ7CkBAIC0xNjc4LDcgKzE2ODQs NyBAQCBnbnR0YWJfZ3Jvd190YWJsZShzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBpbnQgcmVx X25yX2ZyYW1lcykKICAgICBBU1NFUlQocmVxX25yX2ZyYW1lcyA8PSBndC0+bWF4X2dyYW50X2Zy YW1lcyk7CiAKICAgICBnZHByaW50ayhYRU5MT0dfSU5GTywKLSAgICAgICAgICAgICJFeHBhbmRp bmcgZG9tICglZCkgZ3JhbnQgdGFibGUgZnJvbSAoJWQpIHRvICglZCkgZnJhbWVzLlxuIiwKKyAg ICAgICAgICAgICJFeHBhbmRpbmcgZCVkIGdyYW50IHRhYmxlIGZyb20gJXUgdG8gJXUgZnJhbWVz XG4iLAogICAgICAgICAgICAgZC0+ZG9tYWluX2lkLCBucl9ncmFudF9mcmFtZXMoZ3QpLCByZXFf bnJfZnJhbWVzKTsKIAogICAgIC8qIEFjdGl2ZSAqLwpAQCAtMTcyNyw3ICsxNzMzLDggQEAgZ250 dGFiX2dyb3dfdGFibGUoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IHJlcV9ucl9mcmFt ZXMpCiAgICAgICAgIGZyZWVfeGVuaGVhcF9wYWdlKGd0LT5hY3RpdmVbaV0pOwogICAgICAgICBn dC0+YWN0aXZlW2ldID0gTlVMTDsKICAgICB9Ci0gICAgZ2RwcmludGsoWEVOTE9HX0lORk8sICJB bGxvY2F0aW9uIGZhaWx1cmUgd2hlbiBleHBhbmRpbmcgZ3JhbnQgdGFibGUuXG4iKTsKKyAgICBn ZHByaW50ayhYRU5MT0dfSU5GTywgIkFsbG9jYXRpb24gZmFpbHVyZSB3aGVuIGV4cGFuZGluZyBk JWQgZ3JhbnQgdGFibGVcbiIsCisgICAgICAgICAgICAgZC0+ZG9tYWluX2lkKTsKIAogICAgIHJl dHVybiAtRU5PTUVNOwogfQpAQCAtMTk3MSwxMCArMTk3OCwxMCBAQCBnbnR0YWJfcHJlcGFyZV9m b3JfdHJhbnNmZXIoCiAgICAgICAgIGlmICggdW5saWtlbHkoc2NvbWJvLnNob3J0cy5mbGFncyAh PSBHVEZfYWNjZXB0X3RyYW5zZmVyKSB8fAogICAgICAgICAgICAgIHVubGlrZWx5KHNjb21iby5z aG9ydHMuZG9taWQgIT0gbGQtPmRvbWFpbl9pZCkgKQogICAgICAgICB7Ci0gICAgICAgICAgICBn ZHByaW50ayhYRU5MT0dfSU5GTywgIkJhZCBmbGFncyAoJXgpIG9yIGRvbSAoJWQpLiAiCi0gICAg ICAgICAgICAgICAgICAgICIoTkIuIGV4cGVjdGVkIGRvbSAlZClcbiIsCi0gICAgICAgICAgICAg ICAgICAgIHNjb21iby5zaG9ydHMuZmxhZ3MsIHNjb21iby5zaG9ydHMuZG9taWQsCi0gICAgICAg ICAgICAgICAgICAgIGxkLT5kb21haW5faWQpOworICAgICAgICAgICAgZ2RwcmludGsoWEVOTE9H X0lORk8sCisgICAgICAgICAgICAgICAgICAgICAiQmFkIGZsYWdzICgleCkgb3IgZG9tICglZCk7 IGV4cGVjdGVkIGQlZFxuIiwKKyAgICAgICAgICAgICAgICAgICAgIHNjb21iby5zaG9ydHMuZmxh Z3MsIHNjb21iby5zaG9ydHMuZG9taWQsCisgICAgICAgICAgICAgICAgICAgICBsZC0+ZG9tYWlu X2lkKTsKICAgICAgICAgICAgIGdvdG8gZmFpbDsKICAgICAgICAgfQogCkBAIC0xOTg4LDcgKzE5 OTUsNyBAQCBnbnR0YWJfcHJlcGFyZV9mb3JfdHJhbnNmZXIoCiAKICAgICAgICAgaWYgKCByZXRy aWVzKysgPT0gNCApCiAgICAgICAgIHsKLSAgICAgICAgICAgIGdkcHJpbnRrKFhFTkxPR19XQVJO SU5HLCAiU2hhcmVkIGdyYW50IGVudHJ5IGlzIHVuc3RhYmxlLlxuIik7CisgICAgICAgICAgICBn ZHByaW50ayhYRU5MT0dfV0FSTklORywgIlNoYXJlZCBncmFudCBlbnRyeSBpcyB1bnN0YWJsZVxu Iik7CiAgICAgICAgICAgICBnb3RvIGZhaWw7CiAgICAgICAgIH0KIApAQCAtMjAyNyw3ICsyMDM0 LDcgQEAgZ250dGFiX3RyYW5zZmVyKAogICAgICAgICAvKiBSZWFkIGZyb20gY2FsbGVyIGFkZHJl c3Mgc3BhY2UuICovCiAgICAgICAgIGlmICggdW5saWtlbHkoX19jb3B5X2Zyb21fZ3Vlc3QoJmdv cCwgdW9wLCAxKSkgKQogICAgICAgICB7Ci0gICAgICAgICAgICBnZHByaW50ayhYRU5MT0dfSU5G TywgImdudHRhYl90cmFuc2ZlcjogZXJyb3IgcmVhZGluZyByZXEgJWQvJWRcbiIsCisgICAgICAg ICAgICBnZHByaW50ayhYRU5MT0dfSU5GTywgImVycm9yIHJlYWRpbmcgcmVxICVkLyVkXG4iLAog ICAgICAgICAgICAgICAgICAgICBpLCBjb3VudCk7CiAgICAgICAgICAgICByZXR1cm4gLUVGQVVM VDsKICAgICAgICAgfQpAQCAtMjA0OCw4ICsyMDU1LDcgQEAgZ250dGFiX3RyYW5zZmVyKAogICAg ICAgICBpZiAoIHVubGlrZWx5KCFtZm5fdmFsaWQoX21mbihtZm4pKSkgKQogICAgICAgICB7CiAg ICAgICAgICAgICBwdXRfZ2ZuKGQsIGdvcC5tZm4pOwotICAgICAgICAgICAgZ2RwcmludGsoWEVO TE9HX0lORk8sICJnbnR0YWJfdHJhbnNmZXI6IG91dC1vZi1yYW5nZSAlbHhcbiIsCi0gICAgICAg ICAgICAgICAgICAgICh1bnNpZ25lZCBsb25nKWdvcC5tZm4pOworICAgICAgICAgICAgZ2Rwcmlu dGsoWEVOTE9HX0lORk8sICJvdXQtb2YtcmFuZ2UgJWx4XG4iLCAodW5zaWduZWQgbG9uZylnb3Au bWZuKTsKICAgICAgICAgICAgIGdvcC5zdGF0dXMgPSBHTlRTVF9iYWRfcGFnZTsKICAgICAgICAg ICAgIGdvdG8gY29weWJhY2s7CiAgICAgICAgIH0KQEAgLTIwNjYsOCArMjA3Miw3IEBAIGdudHRh Yl90cmFuc2ZlcigKICAgICAgICAgZ250dGFiX2ZsdXNoX3RsYihkKTsKICAgICAgICAgaWYgKCBy YyApCiAgICAgICAgIHsKLSAgICAgICAgICAgIGdkcHJpbnRrKFhFTkxPR19JTkZPLAotICAgICAg ICAgICAgICAgICAgICAgImdudHRhYl90cmFuc2ZlcjogY2FuJ3QgcmVtb3ZlIEdGTiAlIlBSSV94 ZW5fcGZuIiAoTUZOICVseClcbiIsCisgICAgICAgICAgICBnZHByaW50ayhYRU5MT0dfSU5GTywg ImNhbid0IHJlbW92ZSBHRk4gJSJQUklfeGVuX3BmbiIgKE1GTiAlbHgpXG4iLAogICAgICAgICAg ICAgICAgICAgICAgZ29wLm1mbiwgbWZuKTsKICAgICAgICAgICAgIGdvcC5zdGF0dXMgPSBHTlRT VF9nZW5lcmFsX2Vycm9yOwogICAgICAgICAgICAgZ290byBwdXRfZ2ZuX2FuZF9jb3B5YmFjazsK QEAgLTIwNzYsOCArMjA4MSw3IEBAIGdudHRhYl90cmFuc2ZlcigKICAgICAgICAgLyogRmluZCB0 aGUgdGFyZ2V0IGRvbWFpbi4gKi8KICAgICAgICAgaWYgKCB1bmxpa2VseSgoZSA9IHJjdV9sb2Nr X2RvbWFpbl9ieV9pZChnb3AuZG9taWQpKSA9PSBOVUxMKSApCiAgICAgICAgIHsKLSAgICAgICAg ICAgIGdkcHJpbnRrKFhFTkxPR19JTkZPLCAiZ250dGFiX3RyYW5zZmVyOiBjYW4ndCBmaW5kIGRv bWFpbiAlZFxuIiwKLSAgICAgICAgICAgICAgICAgICAgZ29wLmRvbWlkKTsKKyAgICAgICAgICAg IGdkcHJpbnRrKFhFTkxPR19JTkZPLCAiY2FuJ3QgZmluZCBkb21haW4gJWRcbiIsIGdvcC5kb21p ZCk7CiAgICAgICAgICAgICBnb3Auc3RhdHVzID0gR05UU1RfYmFkX2RvbWFpbjsKICAgICAgICAg ICAgIGdvdG8gcHV0X2dmbl9hbmRfY29weWJhY2s7CiAgICAgICAgIH0KQEAgLTIxMzAsMTEgKzIx MzQsMTEgQEAgZ250dGFiX3RyYW5zZmVyKAogICAgICAgICAgICAgc3Bpbl91bmxvY2soJmUtPnBh Z2VfYWxsb2NfbG9jayk7CiAKICAgICAgICAgICAgIGlmICggZS0+aXNfZHlpbmcgKQotICAgICAg ICAgICAgICAgIGdkcHJpbnRrKFhFTkxPR19JTkZPLCAiZ250dGFiX3RyYW5zZmVyOiAiCi0gICAg ICAgICAgICAgICAgICAgICAgICAgIlRyYW5zZmVyZWUgKGQlZCkgaXMgZHlpbmdcbiIsIGUtPmRv bWFpbl9pZCk7CisgICAgICAgICAgICAgICAgZ2RwcmludGsoWEVOTE9HX0lORk8sICJUcmFuc2Zl cmVlIGQlZCBpcyBkeWluZ1xuIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICBlLT5kb21haW5f aWQpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIGdkcHJpbnRrKFhFTkxPR19J TkZPLCAiZ250dGFiX3RyYW5zZmVyOiAiCi0gICAgICAgICAgICAgICAgICAgICAgICAgIlRyYW5z ZmVyZWUgKGQlZCkgaGFzIG5vIGhlYWRyb29tICh0b3QgJXUsIG1heCAldSlcbiIsCisgICAgICAg ICAgICAgICAgZ2RwcmludGsoWEVOTE9HX0lORk8sCisgICAgICAgICAgICAgICAgICAgICAgICAg IlRyYW5zZmVyZWUgZCVkIGhhcyBubyBoZWFkcm9vbSAodG90ICV1LCBtYXggJXUpXG4iLAogICAg ICAgICAgICAgICAgICAgICAgICAgIGUtPmRvbWFpbl9pZCwgZS0+dG90X3BhZ2VzLCBlLT5tYXhf cGFnZXMpOwogCiAgICAgICAgICAgICBnb3Auc3RhdHVzID0gR05UU1RfZ2VuZXJhbF9lcnJvcjsK QEAgLTIxNjIsOCArMjE2Niw4IEBAIGdudHRhYl90cmFuc2ZlcigKICAgICAgICAgICAgIHNwaW5f dW5sb2NrKCZlLT5wYWdlX2FsbG9jX2xvY2spOwogCiAgICAgICAgICAgICBpZiAoIG9rYXkgLyog aS5lLiBlLT5pc19keWluZyBkdWUgdG8gdGhlIHN1cnJvdW5kaW5nIGlmKCkgKi8gKQotICAgICAg ICAgICAgICAgIGdkcHJpbnRrKFhFTkxPR19JTkZPLCAiZ250dGFiX3RyYW5zZmVyOiAiCi0gICAg ICAgICAgICAgICAgICAgICAgICAgIlRyYW5zZmVyZWUgKGQlZCkgaXMgbm93IGR5aW5nXG4iLCBl LT5kb21haW5faWQpOworICAgICAgICAgICAgICAgIGdkcHJpbnRrKFhFTkxPR19JTkZPLCAiVHJh bnNmZXJlZSBkJWQgaXMgbm93IGR5aW5nXG4iLAorICAgICAgICAgICAgICAgICAgICAgICAgIGUt PmRvbWFpbl9pZCk7CiAKICAgICAgICAgICAgIGlmICggZHJvcF9kb21fcmVmICkKICAgICAgICAg ICAgICAgICBwdXRfZG9tYWluKGUpOwpAQCAtMjIxNCw4ICsyMjE4LDcgQEAgZ250dGFiX3RyYW5z ZmVyKAogICAgIGNvcHliYWNrOgogICAgICAgICBpZiAoIHVubGlrZWx5KF9fY29weV9maWVsZF90 b19ndWVzdCh1b3AsICZnb3AsIHN0YXR1cykpICkKICAgICAgICAgewotICAgICAgICAgICAgZ2Rw cmludGsoWEVOTE9HX0lORk8sICJnbnR0YWJfdHJhbnNmZXI6IGVycm9yIHdyaXRpbmcgcmVzcCAi Ci0gICAgICAgICAgICAgICAgICAgICAiJWQvJWRcbiIsIGksIGNvdW50KTsKKyAgICAgICAgICAg IGdkcHJpbnRrKFhFTkxPR19JTkZPLCAiZXJyb3Igd3JpdGluZyByZXNwICVkLyV1XG4iLCBpLCBj b3VudCk7CiAgICAgICAgICAgICByZXR1cm4gLUVGQVVMVDsKICAgICAgICAgfQogICAgICAgICBn dWVzdF9oYW5kbGVfYWRkX29mZnNldCh1b3AsIDEpOwpAQCAtMjY4MCw3ICsyNjgzLDcgQEAgc3Rh dGljIGludCBnbnR0YWJfY29weV9jbGFpbV9idWYoY29uc3Qgc3RydWN0IGdudHRhYl9jb3B5ICpv cCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnVmLT5yZWFkX29ubHksIGJ1Zi0+ZG9t YWluKTsKICAgICAgICAgaWYgKCByYyAhPSBHTlRTVF9va2F5ICkKICAgICAgICAgICAgIFBJTl9G QUlMKG91dCwgcmMsCi0gICAgICAgICAgICAgICAgICAgICAic291cmNlIGZyYW1lICUiUFJJX3hl bl9wZm4iIGludmFsaWQuXG4iLCBwdHItPnUuZ21mbik7CisgICAgICAgICAgICAgICAgICAgICAi c291cmNlIGZyYW1lICUiUFJJX3hlbl9wZm4iIGludmFsaWRcbiIsIHB0ci0+dS5nbWZuKTsKIAog ICAgICAgICBidWYtPnB0ci51LmdtZm4gPSBwdHItPnUuZ21mbjsKICAgICAgICAgYnVmLT5wdHIu b2Zmc2V0ID0gMDsKQEAgLTI2OTIsNyArMjY5NSw4IEBAIHN0YXRpYyBpbnQgZ250dGFiX2NvcHlf Y2xhaW1fYnVmKGNvbnN0IHN0cnVjdCBnbnR0YWJfY29weSAqb3AsCiAgICAgICAgIGlmICggIWdl dF9wYWdlX3R5cGUoYnVmLT5wYWdlLCBQR1Rfd3JpdGFibGVfcGFnZSkgKQogICAgICAgICB7CiAg ICAgICAgICAgICBpZiAoICFidWYtPmRvbWFpbi0+aXNfZHlpbmcgKQotICAgICAgICAgICAgICAg IGdkcHJpbnRrKFhFTkxPR19XQVJOSU5HLCAiQ291bGQgbm90IGdldCB3cml0YWJsZSBmcmFtZSAl bHhcbiIsIGJ1Zi0+ZnJhbWUpOworICAgICAgICAgICAgICAgIGdkcHJpbnRrKFhFTkxPR19XQVJO SU5HLCAiQ291bGQgbm90IGdldCB3cml0YWJsZSBmcmFtZSAlbHhcbiIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgYnVmLT5mcmFtZSk7CiAgICAgICAgICAgICByYyA9IEdOVFNUX2dlbmVyYWxf ZXJyb3I7CiAgICAgICAgICAgICBnb3RvIG91dDsKICAgICAgICAgfQpAQCAtMjcyNSw3ICsyNzI5 LDcgQEAgc3RhdGljIGludCBnbnR0YWJfY29weV9idWYoY29uc3Qgc3RydWN0IGdudHRhYl9jb3B5 ICpvcCwKIAogICAgIGlmICggKChvcC0+c291cmNlLm9mZnNldCArIG9wLT5sZW4pID4gUEFHRV9T SVpFKSB8fAogICAgICAgICAgKChvcC0+ZGVzdC5vZmZzZXQgKyBvcC0+bGVuKSA+IFBBR0VfU0la RSkgKQotICAgICAgICBQSU5fRkFJTChvdXQsIEdOVFNUX2JhZF9jb3B5X2FyZywgImNvcHkgYmV5 b25kIHBhZ2UgYXJlYS5cbiIpOworICAgICAgICBQSU5fRkFJTChvdXQsIEdOVFNUX2JhZF9jb3B5 X2FyZywgImNvcHkgYmV5b25kIHBhZ2UgYXJlYVxuIik7CiAKICAgICBpZiAoIG9wLT5zb3VyY2Uu b2Zmc2V0IDwgc3JjLT5wdHIub2Zmc2V0IHx8CiAgICAgICAgICBvcC0+c291cmNlLm9mZnNldCAr IG9wLT5sZW4gPiBzcmMtPnB0ci5vZmZzZXQgKyBzcmMtPmxlbiApCkBAIC0zMDE3LDcgKzMwMjEs NyBAQCBnbnR0YWJfZ2V0X3N0YXR1c19mcmFtZXMoWEVOX0dVRVNUX0hBTkRMRV9QQVJBTShnbnR0 YWJfZ2V0X3N0YXR1c19mcmFtZXNfdCkgdW9wLAogICAgIGlmICggdW5saWtlbHkoY29weV9mcm9t X2d1ZXN0KCZvcCwgdW9wLCAxKSAhPSAwKSApCiAgICAgewogICAgICAgICBnZHByaW50ayhYRU5M T0dfSU5GTywKLSAgICAgICAgICAgICAgICAgIkZhdWx0IHdoaWxlIHJlYWRpbmcgZ250dGFiX2dl dF9zdGF0dXNfZnJhbWVzX3QuXG4iKTsKKyAgICAgICAgICAgICAgICAgIkZhdWx0IHdoaWxlIHJl YWRpbmcgZ250dGFiX2dldF9zdGF0dXNfZnJhbWVzX3RcbiIpOwogICAgICAgICByZXR1cm4gLUVG QVVMVDsKICAgICB9CiAKQEAgLTM0OTMsNiArMzQ5Nyw3IEBAIGdyYW50X3RhYmxlX2NyZWF0ZSgK ICAgICBzcGluX2xvY2tfaW5pdCgmdC0+bWFwdHJhY2tfbG9jayk7CiAKICAgICAvKiBPa2F5LCBp bnN0YWxsIHRoZSBzdHJ1Y3R1cmUuICovCisgICAgdC0+ZG9tYWluID0gZDsKICAgICBkLT5ncmFu dF90YWJsZSA9IHQ7CiAKICAgICBpZiAoIGQtPmRvbWFpbl9pZCA9PSAwICkKQEAgLTM1MjcsNyAr MzUzMiw3IEBAIGdudHRhYl9yZWxlYXNlX21hcHBpbmdzKAogCiAgICAgICAgIHJlZiA9IG1hcC0+ cmVmOwogCi0gICAgICAgIGdkcHJpbnRrKFhFTkxPR19JTkZPLCAiR3JhbnQgcmVsZWFzZSAlI3gg cmVmICUjeCBmbGFncyAlI3ggZG9tICV1XG4iLAorICAgICAgICBnZHByaW50ayhYRU5MT0dfSU5G TywgIkdyYW50IHJlbGVhc2UgJSN4IHJlZiAlI3ggZmxhZ3MgJSN4IGQlZFxuIiwKICAgICAgICAg ICAgICAgICAgaGFuZGxlLCByZWYsIG1hcC0+ZmxhZ3MsIG1hcC0+ZG9taWQpOwogCiAgICAgICAg IHJkID0gcmN1X2xvY2tfZG9tYWluX2J5X2lkKG1hcC0+ZG9taWQpOwpAQCAtMzYzMiw3ICszNjM3 LDcgQEAgdm9pZCBncmFudF90YWJsZV93YXJuX2FjdGl2ZV9ncmFudHMoc3RydWN0IGRvbWFpbiAq ZCkKIAogICAgICAgICBucl9hY3RpdmUrKzsKICAgICAgICAgaWYgKCBucl9hY3RpdmUgPD0gV0FS Tl9HUkFOVF9NQVggKQotICAgICAgICAgICAgcHJpbnRrKFhFTkxPR19HX0RFQlVHICJEb20lZCBo YXMgYWN0aXZlIGdyYW50ICV4ICgiCisgICAgICAgICAgICBwcmludGsoWEVOTE9HX0dfREVCVUcg ImQlZCBoYXMgYWN0aXZlIGdyYW50ICV4ICgiCiAjaWZuZGVmIE5ERUJVRwogICAgICAgICAgICAg ICAgICAgICJHRk4gJWx4LCAiCiAjZW5kaWYKQEAgLTM2NDYsNyArMzY1MSw3IEBAIHZvaWQgZ3Jh bnRfdGFibGVfd2Fybl9hY3RpdmVfZ3JhbnRzKHN0cnVjdCBkb21haW4gKmQpCiAgICAgfQogCiAg ICAgaWYgKCBucl9hY3RpdmUgPiBXQVJOX0dSQU5UX01BWCApCi0gICAgICAgIHByaW50ayhYRU5M T0dfR19ERUJVRyAiRG9tJWQgaGFzIHRvbyBtYW55ICglZCkgYWN0aXZlIGdyYW50cyB0byByZXBv cnRcbiIsCisgICAgICAgIHByaW50ayhYRU5MT0dfR19ERUJVRyAiZCVkIGhhcyB0b28gbWFueSAo JWQpIGFjdGl2ZSBncmFudHMgdG8gcmVwb3J0XG4iLAogICAgICAgICAgICAgICAgZC0+ZG9tYWlu X2lkLCBucl9hY3RpdmUpOwogCiAgICAgZ3JhbnRfcmVhZF91bmxvY2soZ3QpOwotLSAKMi4xLjQK CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2 ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVu Lm9yZy94ZW4tZGV2ZWwK