From: Roger Pau Monne Subject: [PATCH 2/4] iommu: generalize iommu_inclusive_mapping Date: Fri, 27 Jul 2018 17:31:47 +0200 Message-ID: <20180727153149.25094-3-roger.pau@citrix.com> References: <20180727153149.25094-1-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]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fj4k9-0007Xm-Bt for xen-devel@lists.xenproject.org; Fri, 27 Jul 2018 15:33:25 +0000 In-Reply-To: <20180727153149.25094-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 , Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org SW50cm9kdWNlIGEgbmV3IGlvbW11PWluY2x1c2l2ZSBnZW5lcmljIG9wdGlvbiB0aGF0IHN1cGVy c2VkZXMKaW9tbXVfaW5jbHVzaXZlX21hcHBpbmcuIFRoaXMgc2hvdWxkIGJlIGEgbm9uLWZ1bmN0 aW9uYWwgY2hhbmdlIG9uCkludGVsIGhhcmR3YXJlLCB3aGlsZSBBTUQgaGFyZHdhcmUgd2lsbCBn YWluIHRoZSBzYW1lIGZ1bmN0aW9uYWxpdHkgb2YKbWFwcGluZyBhbG1vc3QgZXZlcnl0aGluZyBi ZWxvdyB0aGUgNEdCIGJvdW5kYXJ5LgoKTm90ZSB0aGF0IGlzIGEgbm9vcCBmb3IgQVJNIGhhcmR3 YXJlLgoKU2lnbmVkLW9mZi1ieTogUm9nZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1QGNpdHJpeC5j b20+Ci0tLQpDYzogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KQ2M6 IEdlb3JnZSBEdW5sYXAgPEdlb3JnZS5EdW5sYXBAZXUuY2l0cml4LmNvbT4KQ2M6IElhbiBKYWNr c29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgpDYzogSmFuIEJldWxpY2ggPGpiZXVsaWNo QHN1c2UuY29tPgpDYzogSnVsaWVuIEdyYWxsIDxqdWxpZW4uZ3JhbGxAYXJtLmNvbT4KQ2M6IEtv bnJhZCBSemVzenV0ZWsgV2lsayA8a29ucmFkLndpbGtAb3JhY2xlLmNvbT4KQ2M6IFN0ZWZhbm8g U3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KQ2M6IFRpbSBEZWVnYW4gPHRpbUB4 ZW4ub3JnPgpDYzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ2M6IEtldmluIFRpYW4g PGtldmluLnRpYW5AaW50ZWwuY29tPgotLS0KIGRvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1h cmtkb3duICAgfCAxNCArKysrKysKIHhlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2FybS9pb21tdS5j ICAgfCAgNCArKwogeGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvaW9tbXUuYyAgICAgICB8ICA2ICsr KwogeGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvdnRkL2V4dGVybi5oICB8ICAyIC0KIHhlbi9kcml2 ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC9pb21tdS5jICAgfCAgNiAtLS0KIHhlbi9kcml2ZXJzL3Bhc3N0 aHJvdWdoL3Z0ZC94ODYvdnRkLmMgfCA2NiArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiB4ZW4v ZHJpdmVycy9wYXNzdGhyb3VnaC94ODYvaW9tbXUuYyAgIHwgNzAgKysrKysrKysrKysrKysrKysr KysrKysrKysrCiB4ZW4vaW5jbHVkZS94ZW4vaW9tbXUuaCAgICAgICAgICAgICAgIHwgIDIgKwog OCBmaWxlcyBjaGFuZ2VkLCA5NyBpbnNlcnRpb25zKCspLCA3MyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kb2NzL21pc2MveGVuLWNvbW1hbmQtbGluZS5tYXJrZG93biBiL2RvY3MvbWlzYy94 ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCmluZGV4IDY1YjQ3NTQ0MTguLjkxYThiZmM5YTYgMTAw NjQ0Ci0tLSBhL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCisrKyBiL2RvY3Mv bWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCkBAIC0xMTk4LDYgKzExOTgsMTcgQEAgZGV0 ZWN0aW9uIG9mIHN5c3RlbXMga25vd24gdG8gbWlzYmVoYXZlIHVwb24gYWNjZXNzZXMgdG8gdGhh dCBwb3J0LgogCiA+PiBFbmFibGUgSU9NTVUgZGVidWdnaW5nIGNvZGUgKGltcGxpZXMgYHZlcmJv c2VgKS4KIAorPiBgaW5jbHVzaXZlYAorCis+IERlZmF1bHQ6IGB0cnVlYAorCis+PiBVc2UgdGhp cyB0byB3b3JrIGFyb3VuZCBmaXJtd2FyZSBpc3N1ZXMgcHJvdmlkaW5nIGluY29ycmVjdCBSTVJS IG9yIElWTUQKKz4+IGVudHJpZXMuIFJhdGhlciB0aGFuIG9ubHkgbWFwcGluZyBSQU0gcGFnZXMg Zm9yIElPTU1VIGFjY2Vzc2VzIGZvciBEb20wLAorPj4gd2l0aCB0aGlzIG9wdGlvbiBhbGwgcGFn ZXMgdXAgdG8gNEdCLCBub3QgbWFya2VkIGFzIHVudXNhYmxlIGluIHRoZSBFODIwCis+PiB0YWJs ZSwgd2lsbCBnZXQgYSBtYXBwaW5nIGVzdGFibGlzaGVkLiBOb3RlIHRoYXQgdGhpcyBvcHRpb24g aXMgb25seQorPj4gYXBwbGljYWJsZSB0byBhIFBWIGRvbTAuIEFsc28gbm90ZSB0aGF0IGlmIGBk b20wLXN0cmljdGAgbW9kZSBpcyBlbmFibGVkCis+PiB0aGVuIGNvbnZlbnRpb25hbCBSQU0gcGFn ZXMgbm90IGFzc2lnbmVkIHRvIGRvbTAgd2lsbCBub3QgYmUgbWFwcGVkLgorCiAjIyMgaW9tbXVc X2RldlxfaW90bGJcX3RpbWVvdXQKID4gYD0gPGludGVnZXI+YAogCkBAIC0xMjEyLDYgKzEyMjMs OSBAQCB3YWl0IGRlc2NyaXB0b3IgdGltZWQgb3V0JywgdHJ5IGluY3JlYXNpbmcgdGhpcyB2YWx1 ZS4KIAogPiBEZWZhdWx0OiBgdHJ1ZWAKIAorKipXQVJOSU5HOiBUaGlzIGNvbW1hbmQgbGluZSBv cHRpb24gaXMgZGVwcmVjYXRlZCwgYW5kIHN1cGVyc2VkZWQgYnkKK19pb21tdT1pbmNsdXNpdmVf IC0gdXNpbmcgYm90aCBvcHRpb25zIGluIGNvbWJpbmF0aW9uIGlzIHVuZGVmaW5lZC4qKgorCiBV c2UgdGhpcyB0byB3b3JrIGFyb3VuZCBmaXJtd2FyZSBpc3N1ZXMgcHJvdmlkaW5nIGluY29ycmVj dCBSTVJSIGVudHJpZXMuCiBSYXRoZXIgdGhhbiBvbmx5IG1hcHBpbmcgUkFNIHBhZ2VzIGZvciBJ T01NVSBhY2Nlc3NlcyBmb3IgRG9tMCwgd2l0aCB0aGlzCiBvcHRpb24gYWxsIHBhZ2VzIHVwIHRv IDRHQiwgbm90IG1hcmtlZCBhcyB1bnVzYWJsZSBpbiB0aGUgRTgyMCB0YWJsZSwgd2lsbApkaWZm IC0tZ2l0IGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvYXJtL2lvbW11LmMgYi94ZW4vZHJpdmVy cy9wYXNzdGhyb3VnaC9hcm0vaW9tbXUuYwppbmRleCA5NWIxYWJiOTcyLi4zMjU5OTdiMTlmIDEw MDY0NAotLS0gYS94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9hcm0vaW9tbXUuYworKysgYi94ZW4v ZHJpdmVycy9wYXNzdGhyb3VnaC9hcm0vaW9tbXUuYwpAQCAtNzMsMyArNzMsNyBAQCBpbnQgYXJj aF9pb21tdV9wb3B1bGF0ZV9wYWdlX3RhYmxlKHN0cnVjdCBkb21haW4gKmQpCiAgICAgLyogVGhl IElPTU1VIHNoYXJlcyB0aGUgcDJtIHdpdGggdGhlIENQVSAqLwogICAgIHJldHVybiAtRU5PU1lT OwogfQorCit2b2lkIF9faHdkb21faW5pdCBhcmNoX2lvbW11X2h3ZG9tX2luaXQoc3RydWN0IGRv bWFpbiAqZCkKK3sKK30KZGlmZiAtLWdpdCBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2lvbW11 LmMgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9pb21tdS5jCmluZGV4IDcwZDIxOGY5MTAuLjNm M2FhNzFiMmMgMTAwNjQ0Ci0tLSBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2lvbW11LmMKKysr IGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvaW9tbXUuYwpAQCAtNDcsNiArNDcsOSBAQCBpbnRl Z2VyX3BhcmFtKCJpb21tdV9kZXZfaW90bGJfdGltZW91dCIsIGlvbW11X2Rldl9pb3RsYl90aW1l b3V0KTsKICAqICAgbm8taWdmeCAgICAgICAgICAgICAgICAgICAgRGlzYWJsZSBWVC1kIGZvciBJ R0QgZGV2aWNlcyAoaW5zZWN1cmUpCiAgKiAgIG5vLWFtZC1pb21tdS1wZXJkZXYtaW50cmVtYXAg RG9uJ3QgdXNlIHBlci1kZXZpY2UgaW50ZXJydXB0IHJlbWFwcGluZwogICogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB0YWJsZXMgKGluc2VjdXJlKQorICogICBpbmNsdXNpdmUgICAgICAg ICAgICAgICAgICBNYXAgYWRkaXRpb25hbCByZWdpb25zIGludG8gdGhlIElPTU1VIHBhZ2UKKyAq ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGFibGVzIGluIG9yZGVyIHRvIHdvcmthcm91 bmQgYnVncyBpbiBBQ1BJCisgKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRhYmxlcy4K ICAqLwogY3VzdG9tX3BhcmFtKCJpb21tdSIsIHBhcnNlX2lvbW11X3BhcmFtKTsKIGJvb2xfdCBf X2luaXRkYXRhIGlvbW11X2VuYWJsZSA9IDE7CkBAIC02MCw2ICs2Myw3IEBAIGJvb2xfdCBfX3Jl YWRfbW9zdGx5IGlvbW11X3Bhc3N0aHJvdWdoOwogYm9vbF90IF9fcmVhZF9tb3N0bHkgaW9tbXVf c25vb3AgPSAxOwogYm9vbF90IF9fcmVhZF9tb3N0bHkgaW9tbXVfcWludmFsID0gMTsKIGJvb2xf dCBfX3JlYWRfbW9zdGx5IGlvbW11X2ludHJlbWFwID0gMTsKK2Jvb2wgX19od2RvbV9pbml0ZGF0 YSBpb21tdV9pbmNsdXNpdmUgPSB0cnVlOwogCiAvKgogICogSW4gdGhlIGN1cnJlbnQgaW1wbGVt ZW50YXRpb24gb2YgVlQtZCBwb3N0ZWQgaW50ZXJydXB0cywgaW4gc29tZSBleHRyZW1lCkBAIC0y MDgsNiArMjEyLDggQEAgdm9pZCBfX2h3ZG9tX2luaXQgaW9tbXVfaHdkb21faW5pdChzdHJ1Y3Qg ZG9tYWluICpkKQogICAgIH0KIAogICAgIGhkLT5wbGF0Zm9ybV9vcHMtPmh3ZG9tX2luaXQoZCk7 CisKKyAgICBhcmNoX2lvbW11X2h3ZG9tX2luaXQoZCk7CiB9CiAKIHZvaWQgaW9tbXVfdGVhcmRv d24oc3RydWN0IGRvbWFpbiAqZCkKZGlmZiAtLWdpdCBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdo L3Z0ZC9leHRlcm4uaCBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC9leHRlcm4uaAppbmRl eCBmYjdlZGZhZWY5Li45MWNhZGM2MDJlIDEwMDY0NAotLS0gYS94ZW4vZHJpdmVycy9wYXNzdGhy b3VnaC92dGQvZXh0ZXJuLmgKKysrIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvdnRkL2V4dGVy bi5oCkBAIC05OSw2ICs5OSw0IEBAIHZvaWQgcGNpX3Z0ZF9xdWlyayhjb25zdCBzdHJ1Y3QgcGNp X2RldiAqKTsKIGJvb2xfdCBwbGF0Zm9ybV9zdXBwb3J0c19pbnRyZW1hcCh2b2lkKTsKIGJvb2xf dCBwbGF0Zm9ybV9zdXBwb3J0c194MmFwaWModm9pZCk7CiAKLXZvaWQgdnRkX3NldF9od2RvbV9t YXBwaW5nKHN0cnVjdCBkb21haW4gKmQpOwotCiAjZW5kaWYgLy8gX1ZURF9FWFRFUk5fSF8KZGlm ZiAtLWdpdCBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC9pb21tdS5jIGIveGVuL2RyaXZl cnMvcGFzc3Rocm91Z2gvdnRkL2lvbW11LmMKaW5kZXggMTcxMDI1NjgyMy4uNTY5ZWM0YWVjMiAx MDA2NDQKLS0tIGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvdnRkL2lvbW11LmMKKysrIGIveGVu L2RyaXZlcnMvcGFzc3Rocm91Z2gvdnRkL2lvbW11LmMKQEAgLTEzMDQsMTIgKzEzMDQsNiBAQCBz dGF0aWMgdm9pZCBfX2h3ZG9tX2luaXQgaW50ZWxfaW9tbXVfaHdkb21faW5pdChzdHJ1Y3QgZG9t YWluICpkKQogewogICAgIHN0cnVjdCBhY3BpX2RyaGRfdW5pdCAqZHJoZDsKIAotICAgIGlmICgg IWlvbW11X3Bhc3N0aHJvdWdoICYmIGlzX3B2X2RvbWFpbihkKSApCi0gICAgewotICAgICAgICAv KiBTZXQgdXAgMToxIHBhZ2UgdGFibGUgZm9yIGhhcmR3YXJlIGRvbWFpbi4gKi8KLSAgICAgICAg dnRkX3NldF9od2RvbV9tYXBwaW5nKGQpOwotICAgIH0KLQogICAgIHNldHVwX2h3ZG9tX3BjaV9k ZXZpY2VzKGQsIHNldHVwX2h3ZG9tX2RldmljZSk7CiAgICAgc2V0dXBfaHdkb21fcm1ycihkKTsK IApkaWZmIC0tZ2l0IGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvdnRkL3g4Ni92dGQuYyBiL3hl bi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC94ODYvdnRkLmMKaW5kZXggY2MyYmZlYTE2Mi4uNTVk NzRhOTdlMiAxMDA2NDQKLS0tIGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvdnRkL3g4Ni92dGQu YworKysgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC92dGQveDg2L3Z0ZC5jCkBAIC0zNSw4ICsz NSw3IEBACiAgKiBpb21tdV9pbmNsdXNpdmVfbWFwcGluZzogd2hlbiBzZXQsIGFsbCBtZW1vcnkg YmVsb3cgNEdCIGlzIGluY2x1ZGVkIGluIGRvbTAKICAqIDE6MSBpb21tdSBtYXBwaW5ncyBleGNl cHQgeGVuIGFuZCB1bnVzYWJsZSByZWdpb25zLgogICovCi1zdGF0aWMgYm9vbF90IF9faHdkb21f aW5pdGRhdGEgaW9tbXVfaW5jbHVzaXZlX21hcHBpbmcgPSAxOwotYm9vbGVhbl9wYXJhbSgiaW9t bXVfaW5jbHVzaXZlX21hcHBpbmciLCBpb21tdV9pbmNsdXNpdmVfbWFwcGluZyk7Citib29sZWFu X3BhcmFtKCJpb21tdV9pbmNsdXNpdmVfbWFwcGluZyIsIGlvbW11X2luY2x1c2l2ZSk7CiAKIHZv aWQgKm1hcF92dGRfZG9tYWluX3BhZ2UodTY0IG1hZGRyKQogewpAQCAtMTA4LDY2ICsxMDcsMyBA QCB2b2lkIGh2bV9kcGNpX2lzYWlycV9lb2koc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50 IGlzYWlycSkKICAgICBzcGluX3VubG9jaygmZC0+ZXZlbnRfbG9jayk7CiB9CiAKLXZvaWQgX19o d2RvbV9pbml0IHZ0ZF9zZXRfaHdkb21fbWFwcGluZyhzdHJ1Y3QgZG9tYWluICpkKQotewotICAg IHVuc2lnbmVkIGxvbmcgaSwgaiwgdG1wLCB0b3AsIG1heF9wZm47Ci0KLSAgICBCVUdfT04oIWlz X2hhcmR3YXJlX2RvbWFpbihkKSk7Ci0KLSAgICBtYXhfcGZuID0gKEdCKDQpID4+IFBBR0VfU0hJ RlQpIC0gMTsKLSAgICB0b3AgPSBtYXgobWF4X3BkeCwgcGZuX3RvX3BkeChtYXhfcGZuKSArIDEp OwotCi0gICAgZm9yICggaSA9IDA7IGkgPCB0b3A7IGkrKyApCi0gICAgewotICAgICAgICB1bnNp Z25lZCBsb25nIHBmbiA9IHBkeF90b19wZm4oaSk7Ci0gICAgICAgIGJvb2wgbWFwOwotICAgICAg ICBpbnQgcmMgPSAwOwotCi0gICAgICAgIC8qCi0gICAgICAgICAqIFNldCB1cCAxOjEgbWFwcGlu ZyBmb3IgZG9tMC4gRGVmYXVsdCB0byBpbmNsdWRlIG9ubHkKLSAgICAgICAgICogY29udmVudGlv bmFsIFJBTSBhcmVhcyBhbmQgbGV0IFJNUlJzIGluY2x1ZGUgbmVlZGVkIHJlc2VydmVkCi0gICAg ICAgICAqIHJlZ2lvbnMuIFdoZW4gc2V0LCB0aGUgaW5jbHVzaXZlIG1hcHBpbmcgYWRkaXRpb25h bGx5IG1hcHMgaW4KLSAgICAgICAgICogZXZlcnkgcGZuIHVwIHRvIDRHQiBleGNlcHQgdGhvc2Ug dGhhdCBmYWxsIGluIHVudXNhYmxlIHJhbmdlcy4KLSAgICAgICAgICovCi0gICAgICAgIGlmICgg cGZuID4gbWF4X3BmbiAmJiAhbWZuX3ZhbGlkKF9tZm4ocGZuKSkgKQotICAgICAgICAgICAgY29u dGludWU7Ci0KLSAgICAgICAgaWYgKCBpb21tdV9pbmNsdXNpdmVfbWFwcGluZyAmJiBwZm4gPD0g bWF4X3BmbiApCi0gICAgICAgICAgICBtYXAgPSAhcGFnZV9pc19yYW1fdHlwZShwZm4sIFJBTV9U WVBFX1VOVVNBQkxFKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbWFwID0gcGFnZV9pc19y YW1fdHlwZShwZm4sIFJBTV9UWVBFX0NPTlZFTlRJT05BTCk7Ci0KLSAgICAgICAgaWYgKCAhbWFw ICkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgIC8qIEV4Y2x1ZGUgWGVuIGJpdHMg Ki8KLSAgICAgICAgaWYgKCB4ZW5faW5fcmFuZ2UocGZuKSApCi0gICAgICAgICAgICBjb250aW51 ZTsKLQotICAgICAgICAvKgotICAgICAgICAgKiBJZiBkb20wLXN0cmljdCBtb2RlIGlzIGVuYWJs ZWQgdGhlbiBleGNsdWRlIGNvbnZlbnRpb25hbCBSQU0KLSAgICAgICAgICogYW5kIGxldCB0aGUg Y29tbW9uIGNvZGUgbWFwIGRvbTAncyBwYWdlcy4KLSAgICAgICAgICovCi0gICAgICAgIGlmICgg aW9tbXVfZG9tMF9zdHJpY3QgJiYKLSAgICAgICAgICAgICBwYWdlX2lzX3JhbV90eXBlKHBmbiwg UkFNX1RZUEVfQ09OVkVOVElPTkFMKSApCi0gICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAg ICB0bXAgPSAxIDw8IChQQUdFX1NISUZUIC0gUEFHRV9TSElGVF80Syk7Ci0gICAgICAgIGZvciAo IGogPSAwOyBqIDwgdG1wOyBqKysgKQotICAgICAgICB7Ci0gICAgICAgICAgICBpbnQgcmV0ID0g aW9tbXVfbWFwX3BhZ2UoZCwgcGZuICogdG1wICsgaiwgcGZuICogdG1wICsgaiwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJT01NVUZfcmVhZGFibGV8SU9NTVVGX3dyaXRh YmxlKTsKLQotICAgICAgICAgICAgaWYgKCAhcmMgKQotICAgICAgICAgICAgICAgcmMgPSByZXQ7 Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoIHJjICkKLSAgICAgICAgICAgIHByaW50ayhYRU5M T0dfV0FSTklORyBWVERQUkVGSVggIiBkJWQ6IElPTU1VIG1hcHBpbmcgZmFpbGVkOiAlZFxuIiwK LSAgICAgICAgICAgICAgICAgICBkLT5kb21haW5faWQsIHJjKTsKLQotICAgICAgICBpZiAoIShp ICYgKDB4ZmZmZmYgPj4gKFBBR0VfU0hJRlQgLSBQQUdFX1NISUZUXzRLKSkpKQotICAgICAgICAg ICAgcHJvY2Vzc19wZW5kaW5nX3NvZnRpcnFzKCk7Ci0gICAgfQotfQotCmRpZmYgLS1naXQgYS94 ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC94ODYvaW9tbXUuYyBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJv dWdoL3g4Ni9pb21tdS5jCmluZGV4IDY4MTgyYWZkOTEuLmJhMGJiZDlhMTUgMTAwNjQ0Ci0tLSBh L3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3g4Ni9pb21tdS5jCisrKyBiL3hlbi9kcml2ZXJzL3Bh c3N0aHJvdWdoL3g4Ni9pb21tdS5jCkBAIC0yMCw2ICsyMCw4IEBACiAjaW5jbHVkZSA8eGVuL3Nv ZnRpcnEuaD4KICNpbmNsdWRlIDx4c20veHNtLmg+CiAKKyNpbmNsdWRlIDxhc20vc2V0dXAuaD4K Kwogdm9pZCBpb21tdV91cGRhdGVfaXJlX2Zyb21fYXBpYygKICAgICB1bnNpZ25lZCBpbnQgYXBp YywgdW5zaWduZWQgaW50IHJlZywgdW5zaWduZWQgaW50IHZhbHVlKQogewpAQCAtMTMyLDYgKzEz NCw3NCBAQCB2b2lkIGFyY2hfaW9tbXVfZG9tYWluX2Rlc3Ryb3koc3RydWN0IGRvbWFpbiAqZCkK IHsKIH0KIAordm9pZCBfX2h3ZG9tX2luaXQgYXJjaF9pb21tdV9od2RvbV9pbml0KHN0cnVjdCBk b21haW4gKmQpCit7CisgICAgdW5zaWduZWQgbG9uZyBpLCBqLCB0bXAsIHRvcCwgbWF4X3BmbjsK KworICAgIGlmICggaW9tbXVfcGFzc3Rocm91Z2ggfHwgIWlzX3B2X2RvbWFpbihkKSApCisgICAg ICAgIHJldHVybjsKKworICAgIEJVR19PTighaXNfaGFyZHdhcmVfZG9tYWluKGQpKTsKKworICAg IG1heF9wZm4gPSAoR0IoNCkgPj4gUEFHRV9TSElGVCkgLSAxOworICAgIHRvcCA9IG1heChtYXhf cGR4LCBwZm5fdG9fcGR4KG1heF9wZm4pICsgMSk7CisKKyAgICBmb3IgKCBpID0gMDsgaSA8IHRv cDsgaSsrICkKKyAgICB7CisgICAgICAgIHVuc2lnbmVkIGxvbmcgcGZuID0gcGR4X3RvX3Bmbihp KTsKKyAgICAgICAgYm9vbCBtYXA7CisgICAgICAgIGludCByYyA9IDA7CisKKyAgICAgICAgLyoK KyAgICAgICAgICogU2V0IHVwIDE6MSBtYXBwaW5nIGZvciBkb20wLiBEZWZhdWx0IHRvIGluY2x1 ZGUgb25seQorICAgICAgICAgKiBjb252ZW50aW9uYWwgUkFNIGFyZWFzIGFuZCBsZXQgUk1SUnMg aW5jbHVkZSBuZWVkZWQgcmVzZXJ2ZWQKKyAgICAgICAgICogcmVnaW9ucy4gV2hlbiBzZXQsIHRo ZSBpbmNsdXNpdmUgbWFwcGluZyBhZGRpdGlvbmFsbHkgbWFwcyBpbgorICAgICAgICAgKiBldmVy eSBwZm4gdXAgdG8gNEdCIGV4Y2VwdCB0aG9zZSB0aGF0IGZhbGwgaW4gdW51c2FibGUgcmFuZ2Vz LgorICAgICAgICAgKi8KKyAgICAgICAgaWYgKCBwZm4gPiBtYXhfcGZuICYmICFtZm5fdmFsaWQo X21mbihwZm4pKSApCisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICBpZiAoIGlvbW11 X2luY2x1c2l2ZSAmJiBwZm4gPD0gbWF4X3BmbiApCisgICAgICAgICAgICBtYXAgPSAhcGFnZV9p c19yYW1fdHlwZShwZm4sIFJBTV9UWVBFX1VOVVNBQkxFKTsKKyAgICAgICAgZWxzZQorICAgICAg ICAgICAgbWFwID0gcGFnZV9pc19yYW1fdHlwZShwZm4sIFJBTV9UWVBFX0NPTlZFTlRJT05BTCk7 CisKKyAgICAgICAgaWYgKCAhbWFwICkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAg IC8qIEV4Y2x1ZGUgWGVuIGJpdHMgKi8KKyAgICAgICAgaWYgKCB4ZW5faW5fcmFuZ2UocGZuKSAp CisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAvKgorICAgICAgICAgKiBJZiBkb20w LXN0cmljdCBtb2RlIGlzIGVuYWJsZWQgdGhlbiBleGNsdWRlIGNvbnZlbnRpb25hbCBSQU0KKyAg ICAgICAgICogYW5kIGxldCB0aGUgY29tbW9uIGNvZGUgbWFwIGRvbTAncyBwYWdlcy4KKyAgICAg ICAgICovCisgICAgICAgIGlmICggaW9tbXVfZG9tMF9zdHJpY3QgJiYKKyAgICAgICAgICAgICBw YWdlX2lzX3JhbV90eXBlKHBmbiwgUkFNX1RZUEVfQ09OVkVOVElPTkFMKSApCisgICAgICAgICAg ICBjb250aW51ZTsKKworICAgICAgICB0bXAgPSAxIDw8IChQQUdFX1NISUZUIC0gUEFHRV9TSElG VF80Syk7CisgICAgICAgIGZvciAoIGogPSAwOyBqIDwgdG1wOyBqKysgKQorICAgICAgICB7Cisg ICAgICAgICAgICBpbnQgcmV0ID0gaW9tbXVfbWFwX3BhZ2UoZCwgcGZuICogdG1wICsgaiwgcGZu ICogdG1wICsgaiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJT01NVUZf cmVhZGFibGV8SU9NTVVGX3dyaXRhYmxlKTsKKworICAgICAgICAgICAgaWYgKCAhcmMgKQorICAg ICAgICAgICAgICAgcmMgPSByZXQ7CisgICAgICAgIH0KKworICAgICAgICBpZiAoIHJjICkKKyAg ICAgICAgICAgIHByaW50ayhYRU5MT0dfV0FSTklORyAiZCVkOiBJT01NVSBtYXBwaW5nIGZhaWxl ZDogJWRcbiIsCisgICAgICAgICAgICAgICAgICAgZC0+ZG9tYWluX2lkLCByYyk7CisKKyAgICAg ICAgaWYgKCEoaSAmICgweGZmZmZmID4+IChQQUdFX1NISUZUIC0gUEFHRV9TSElGVF80SykpKSkK KyAgICAgICAgICAgIHByb2Nlc3NfcGVuZGluZ19zb2Z0aXJxcygpOworICAgIH0KKworCit9CisK IC8qCiAgKiBMb2NhbCB2YXJpYWJsZXM6CiAgKiBtb2RlOiBDCmRpZmYgLS1naXQgYS94ZW4vaW5j bHVkZS94ZW4vaW9tbXUuaCBiL3hlbi9pbmNsdWRlL3hlbi9pb21tdS5oCmluZGV4IDZiNDJlM2I4 NzYuLjc4NzU2NmE0ZTcgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL3hlbi9pb21tdS5oCisrKyBi L3hlbi9pbmNsdWRlL3hlbi9pb21tdS5oCkBAIC0zNSw2ICszNSw3IEBAIGV4dGVybiBib29sX3Qg aW9tbXVfc25vb3AsIGlvbW11X3FpbnZhbCwgaW9tbXVfaW50cmVtYXAsIGlvbW11X2ludHBvc3Q7 CiBleHRlcm4gYm9vbF90IGlvbW11X2hhcF9wdF9zaGFyZTsKIGV4dGVybiBib29sX3QgaW9tbXVf ZGVidWc7CiBleHRlcm4gYm9vbF90IGFtZF9pb21tdV9wZXJkZXZfaW50cmVtYXA7CitleHRlcm4g Ym9vbCBpb21tdV9pbmNsdXNpdmU7CiAKIGV4dGVybiB1bnNpZ25lZCBpbnQgaW9tbXVfZGV2X2lv dGxiX3RpbWVvdXQ7CiAKQEAgLTQ5LDYgKzUwLDcgQEAgdm9pZCBhcmNoX2lvbW11X2RvbWFpbl9k ZXN0cm95KHN0cnVjdCBkb21haW4gKmQpOwogaW50IGFyY2hfaW9tbXVfZG9tYWluX2luaXQoc3Ry dWN0IGRvbWFpbiAqZCk7CiBpbnQgYXJjaF9pb21tdV9wb3B1bGF0ZV9wYWdlX3RhYmxlKHN0cnVj dCBkb21haW4gKmQpOwogdm9pZCBhcmNoX2lvbW11X2NoZWNrX2F1dG90cmFuc2xhdGVkX2h3ZG9t KHN0cnVjdCBkb21haW4gKmQpOwordm9pZCBhcmNoX2lvbW11X2h3ZG9tX2luaXQoc3RydWN0IGRv bWFpbiAqZCk7CiAKIGludCBpb21tdV9jb25zdHJ1Y3Qoc3RydWN0IGRvbWFpbiAqZCk7CiAKLS0g CjIuMTguMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Clhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0 dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=