From: Roger Pau Monne Subject: [PATCH v4 2/4] iommu: make iommu_inclusive_mapping a suboption of dom0-iommu Date: Wed, 8 Aug 2018 12:07:45 +0200 Message-ID: <20180808100747.19464-3-roger.pau@citrix.com> References: <20180808100747.19464-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 1fnLO0-0001np-14 for xen-devel@lists.xenproject.org; Wed, 08 Aug 2018 10:08:12 +0000 In-Reply-To: <20180808100747.19464-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 SW50cm9kdWNlIGEgbmV3IGRvbTAtaW9tbXU9aW5jbHVzaXZlIGdlbmVyaWMgb3B0aW9uIHRoYXQg c3VwZXJzZWRlcwppb21tdV9pbmNsdXNpdmVfbWFwcGluZy4gVGhlIHByZXZpb3VzIGJlaGF2aW91 ciBpcyBwcmVzZXJ2ZWQgYW5kIHRoZQpvcHRpb24gc2hvdWxkIG9ubHkgYmUgZW5hYmxlZCBieSBk ZWZhdWx0IG9uIEludGVsIGhhcmR3YXJlLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UgaW50ZW5kZWQu CgpTaWduZWQtb2ZmLWJ5OiBSb2dlciBQYXUgTW9ubsOpIDxyb2dlci5wYXVAY2l0cml4LmNvbT4K UmV2aWV3ZWQtYnk6IFBhdWwgRHVycmFudCA8cGF1bC5kdXJyYW50QGNpdHJpeC5jb20+Ci0tLQpD aGFuZ2VzIHNpbmNlIHYyOgogLSBGaXggdHlwbyBpbiBjb21taXQgbWVzc2FnZS4KIC0gQ2hhbmdl IHN0eWxlIGFuZCB0ZXh0IG9mIHRoZSBkb2N1bWVudGF0aW9uIGluIHhlbiBjb21tYW5kIGxpbmUu CiAtIFNldCB0aGUgZGVmYXVsdHMgaW4ge2ludGVsL2FtZH1faW9tbXVfaHdkb21faW5pdCBmb3Ig aW5jbHVzaXZlLgogLSBSZS1hZGQgdGhlIGlvbW11X2RvbTBfcGFzc3Rocm91Z2ggfHwgIWlzX3B2 X2RvbWFpbihkKSBjaGVjay4KCkNoYW5nZXMgc2luY2UgdjE6CiAtIFVzZSBkb20wLWlvbW11IGlu c3RlYWQgb2YgdGhlIGlvbW11IG9wdGlvbi4KIC0gT25seSBlbmFibGUgYnkgZGVmYXVsdCBvbiBJ bnRlbCBoYXJkd2FyZS4KLS0tCkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRy aXguY29tPgpDYzogR2VvcmdlIER1bmxhcCA8R2VvcmdlLkR1bmxhcEBldS5jaXRyaXguY29tPgpD YzogSWFuIEphY2tzb24gPGlhbi5qYWNrc29uQGV1LmNpdHJpeC5jb20+CkNjOiBKYW4gQmV1bGlj aCA8amJldWxpY2hAc3VzZS5jb20+CkNjOiBKdWxpZW4gR3JhbGwgPGp1bGllbi5ncmFsbEBhcm0u Y29tPgpDYzogS29ucmFkIFJ6ZXN6dXRlayBXaWxrIDxrb25yYWQud2lsa0BvcmFjbGUuY29tPgpD YzogU3RlZmFubyBTdGFiZWxsaW5pIDxzc3RhYmVsbGluaUBrZXJuZWwub3JnPgpDYzogVGltIERl ZWdhbiA8dGltQHhlbi5vcmc+CkNjOiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgpDYzog S2V2aW4gVGlhbiA8a2V2aW4udGlhbkBpbnRlbC5jb20+Ci0tLQogZG9jcy9taXNjL3hlbi1jb21t YW5kLWxpbmUubWFya2Rvd24gICAgICAgICB8IDE3ICsrKysrLQogeGVuL2RyaXZlcnMvcGFzc3Ro cm91Z2gvYW1kL3BjaV9hbWRfaW9tbXUuYyB8ICA0ICsrCiB4ZW4vZHJpdmVycy9wYXNzdGhyb3Vn aC9hcm0vaW9tbXUuYyAgICAgICAgIHwgIDQgKysKIHhlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2lv bW11LmMgICAgICAgICAgICAgfCAyMyArKysrKystLQogeGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gv dnRkL2V4dGVybi5oICAgICAgICB8ICAyIC0KIHhlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC9p b21tdS5jICAgICAgICAgfCAgOCArKy0KIHhlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC94ODYv dnRkLmMgICAgICAgfCA1OCArLS0tLS0tLS0tLS0tLS0tLS0tLQogeGVuL2RyaXZlcnMvcGFzc3Ro cm91Z2gveDg2L2lvbW11LmMgICAgICAgICB8IDU5ICsrKysrKysrKysrKysrKysrKysrKwogeGVu L2luY2x1ZGUveGVuL2lvbW11LmggICAgICAgICAgICAgICAgICAgICB8ICAyICsKIDkgZmlsZXMg Y2hhbmdlZCwgMTA5IGluc2VydGlvbnMoKyksIDY4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duIGIvZG9jcy9taXNjL3hlbi1jb21t YW5kLWxpbmUubWFya2Rvd24KaW5kZXggZWE0NTFmMDg4ZS4uOTBiMzJmZTNmMCAxMDA2NDQKLS0t IGEvZG9jcy9taXNjL3hlbi1jb21tYW5kLWxpbmUubWFya2Rvd24KKysrIGIvZG9jcy9taXNjL3hl bi1jb21tYW5kLWxpbmUubWFya2Rvd24KQEAgLTEyMDUsNyArMTIwNSw3IEBAIGRldGVjdGlvbiBv ZiBzeXN0ZW1zIGtub3duIHRvIG1pc2JlaGF2ZSB1cG9uIGFjY2Vzc2VzIHRvIHRoYXQgcG9ydC4K ID4+IEVuYWJsZSBJT01NVSBkZWJ1Z2dpbmcgY29kZSAoaW1wbGllcyBgdmVyYm9zZWApLgogCiAj IyMgZG9tMC1pb21tdQotPiBgPSBMaXN0IG9mIFsgbm9uZSB8IHN0cmljdCB8IHJlbGF4ZWQgXWAK Kz4gYD0gTGlzdCBvZiBbIG5vbmUgfCBzdHJpY3QgfCByZWxheGVkIHwgaW5jbHVzaXZlIF1gCiAK ICogYG5vbmVgOiBkaXNhYmxlcyBETUEgcmVtYXBwaW5nIGZvciBEb20wLgogCkBAIC0xMjIxLDYg KzEyMjEsMTggQEAgUFYgRG9tMDoKIE5vdGUgdGhhdCBhbGwgdGhlIGFib3ZlIG9wdGlvbnMgYXJl IG11dHVhbGx5IGV4Y2x1c2l2ZS4gU3BlY2lmeWluZyBtb3JlIHRoYW4KIG9uZSBvbiB0aGUgYGRv bTAtaW9tbXVgIGNvbW1hbmQgbGluZSB3aWxsIHJlc3VsdCBpbiB1bmRlZmluZWQgYmVoYXZpb3Iu CiAKK1RoZSBmb2xsb3dpbmcgb3B0aW9ucyBjb250cm9sIHdoZXRoZXIgbm9uLVJBTSByZWdpb25z IGFyZSBhZGRlZCB0byB0aGUgRG9tMAoraW9tbXUgdGFibGVzLiBOb3RlIHRoYXQgdGhleSBjYW4g YmUgcHJlZml4ZWQgd2l0aCBgbm8tYCB0byBlZmZlY3QgdGhlIGludmVyc2UKK21lYW5pbmc6CisK KyogYGluY2x1c2l2ZWA6IHNldHMgdXAgRE1BIHJlbWFwcGluZyBmb3IgYWxsIHRoZSBub24tUkFN IG1lbW9yeSBiZWxvdyA0R0IKKyAgZXhjZXB0IGZvciB1bnVzYWJsZSByYW5nZXMuIFVzZSB0aGlz IHRvIHdvcmsgYXJvdW5kIGZpcm13YXJlIGlzc3VlcyBwcm92aWRpbmcKKyAgaW5jb3JyZWN0IFJN UlIvSVZNRCBlbnRyaWVzLiBSYXRoZXIgdGhhbiBvbmx5IG1hcHBpbmcgUkFNIHBhZ2VzIGZvciBJ T01NVQorICBhY2Nlc3NlcyBmb3IgRG9tMCwgd2l0aCB0aGlzIG9wdGlvbiBhbGwgcGFnZXMgdXAg dG8gNEdCLCBub3QgbWFya2VkIGFzCisgIHVudXNhYmxlIGluIHRoZSBFODIwIHRhYmxlLCB3aWxs IGdldCBhIG1hcHBpbmcgZXN0YWJsaXNoZWQuIE5vdGUgdGhhdCB0aGlzCisgIG9wdGlvbiBpcyBv bmx5IGFwcGxpY2FibGUgdG8gYSBQViBEb20wIGFuZCBpcyBlbmFibGVkIGJ5IGRlZmF1bHQgb24g SW50ZWwKKyAgaGFyZHdhcmUuCisKICMjIyBpb21tdVxfZGV2XF9pb3RsYlxfdGltZW91dAogPiBg PSA8aW50ZWdlcj5gCiAKQEAgLTEyMzMsNiArMTI0NSw5IEBAIHdhaXQgZGVzY3JpcHRvciB0aW1l ZCBvdXQnLCB0cnkgaW5jcmVhc2luZyB0aGlzIHZhbHVlLgogIyMjIGlvbW11XF9pbmNsdXNpdmVc X21hcHBpbmcgKFZULWQpCiA+IGA9IDxib29sZWFuPmAKIAorKipXQVJOSU5HOiBUaGlzIGNvbW1h bmQgbGluZSBvcHRpb24gaXMgZGVwcmVjYXRlZCwgYW5kIHN1cGVyc2VkZWQgYnkKK19kb20wLWlv bW11PWluY2x1c2l2ZV8gLSB1c2luZyBib3RoIG9wdGlvbnMgaW4gY29tYmluYXRpb24gaXMgdW5k ZWZpbmVkLioqCisKID4gRGVmYXVsdDogYHRydWVgCiAKIFVzZSB0aGlzIHRvIHdvcmsgYXJvdW5k IGZpcm13YXJlIGlzc3VlcyBwcm92aWRpbmcgaW5jb3JyZWN0IFJNUlIgZW50cmllcy4KZGlmZiAt LWdpdCBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2FtZC9wY2lfYW1kX2lvbW11LmMgYi94ZW4v ZHJpdmVycy9wYXNzdGhyb3VnaC9hbWQvcGNpX2FtZF9pb21tdS5jCmluZGV4IGVlYWNmNzEzZTQu LjBlMGM5OWM5NDIgMTAwNjQ0Ci0tLSBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2FtZC9wY2lf YW1kX2lvbW11LmMKKysrIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvYW1kL3BjaV9hbWRfaW9t bXUuYwpAQCAtMjUzLDYgKzI1MywxMCBAQCBzdGF0aWMgdm9pZCBfX2h3ZG9tX2luaXQgYW1kX2lv bW11X2h3ZG9tX2luaXQoc3RydWN0IGRvbWFpbiAqZCkKICAgICB1bnNpZ25lZCBsb25nIGk7IAog ICAgIGNvbnN0IHN0cnVjdCBhbWRfaW9tbXUgKmlvbW11OwogCisgICAgLyogSW5jbHVzaXZlIElP TU1VIG1hcHBpbmdzIGFyZSBkaXNhYmxlZCBieSBkZWZhdWx0IG9uIEFNRCBoYXJkd2FyZS4gKi8K KyAgICBpb21tdV9kb20wX2luY2x1c2l2ZSA9IGlvbW11X2RvbTBfaW5jbHVzaXZlID09IC0xID8g ZmFsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDogaW9tbXVfZG9tMF9pbmNsdXNpdmU7CisKICAgICBpZiAoIGFsbG9jYXRlX2RvbWFpbl9y ZXNvdXJjZXMoZG9tX2lvbW11KGQpKSApCiAgICAgICAgIEJVRygpOwogCmRpZmYgLS1naXQgYS94 ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9hcm0vaW9tbXUuYyBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJv dWdoL2FybS9pb21tdS5jCmluZGV4IDk1YjFhYmI5NzIuLjMyNTk5N2IxOWYgMTAwNjQ0Ci0tLSBh L3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2FybS9pb21tdS5jCisrKyBiL3hlbi9kcml2ZXJzL3Bh c3N0aHJvdWdoL2FybS9pb21tdS5jCkBAIC03MywzICs3Myw3IEBAIGludCBhcmNoX2lvbW11X3Bv cHVsYXRlX3BhZ2VfdGFibGUoc3RydWN0IGRvbWFpbiAqZCkKICAgICAvKiBUaGUgSU9NTVUgc2hh cmVzIHRoZSBwMm0gd2l0aCB0aGUgQ1BVICovCiAgICAgcmV0dXJuIC1FTk9TWVM7CiB9CisKK3Zv aWQgX19od2RvbV9pbml0IGFyY2hfaW9tbXVfaHdkb21faW5pdChzdHJ1Y3QgZG9tYWluICpkKQor eworfQpkaWZmIC0tZ2l0IGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvaW9tbXUuYyBiL3hlbi9k cml2ZXJzL3Bhc3N0aHJvdWdoL2lvbW11LmMKaW5kZXggODMwNTYwYmRjZi4uZjE1Yzk0YmU0MiAx MDA2NDQKLS0tIGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvaW9tbXUuYworKysgYi94ZW4vZHJp dmVycy9wYXNzdGhyb3VnaC9pb21tdS5jCkBAIC03NCw2ICs3NCw3IEBAIGJvb2xfdCBfX3JlYWRf bW9zdGx5IGFtZF9pb21tdV9wZXJkZXZfaW50cmVtYXAgPSAxOwogY3VzdG9tX3BhcmFtKCJkb20w LWlvbW11IiwgcGFyc2VfZG9tMF9pb21tdV9wYXJhbSk7CiBib29sIF9faHdkb21faW5pdGRhdGEg aW9tbXVfZG9tMF9zdHJpY3Q7CiBib29sIF9fcmVhZF9tb3N0bHkgaW9tbXVfZG9tMF9wYXNzdGhy b3VnaDsKK2ludDhfdCBfX2h3ZG9tX2luaXRkYXRhIGlvbW11X2RvbTBfaW5jbHVzaXZlID0gLTE7 CiAKIERFRklORV9QRVJfQ1BVKGJvb2xfdCwgaW9tbXVfZG9udF9mbHVzaF9pb3RsYik7CiAKQEAg LTE0NCwxNiArMTQ1LDIzIEBAIHN0YXRpYyBpbnQgX19pbml0IHBhcnNlX2RvbTBfaW9tbXVfcGFy YW0oY29uc3QgY2hhciAqcykKICAgICBpbnQgcmMgPSAwOwogCiAgICAgZG8geworICAgICAgICBi b29sIHZhbCA9ICEhc3RybmNtcChzLCAibm8tIiwgMyk7CisKKyAgICAgICAgaWYgKCAhdmFsICkK KyAgICAgICAgICAgIHMgKz0gMzsKKwogICAgICAgICBzcyA9IHN0cmNocihzLCAnLCcpOwogICAg ICAgICBpZiAoICFzcyApCiAgICAgICAgICAgICBzcyA9IHN0cmNocihzLCAnXDAnKTsKIAotICAg ICAgICBpZiAoICFzdHJuY21wKHMsICJub25lIiwgc3MgLSBzKSApCisgICAgICAgIGlmICggIXN0 cm5jbXAocywgIm5vbmUiLCBzcyAtIHMpICYmIHZhbCApCiAgICAgICAgICAgICBpb21tdV9kb20w X3Bhc3N0aHJvdWdoID0gdHJ1ZTsKLSAgICAgICAgZWxzZSBpZiAoICFzdHJuY21wKHMsICJzdHJp Y3QiLCBzcyAtIHMpICkKKyAgICAgICAgZWxzZSBpZiAoICFzdHJuY21wKHMsICJzdHJpY3QiLCBz cyAtIHMpICYmIHZhbCApCiAgICAgICAgICAgICBpb21tdV9kb20wX3N0cmljdCA9IHRydWU7Ci0g ICAgICAgIGVsc2UgaWYgKCAhc3RybmNtcChzLCAicmVsYXhlZCIsIHNzIC0gcykgKQorICAgICAg ICBlbHNlIGlmICggIXN0cm5jbXAocywgInJlbGF4ZWQiLCBzcyAtIHMpICYmIHZhbCApCiAgICAg ICAgICAgICBpb21tdV9kb20wX3N0cmljdCA9IGZhbHNlOworICAgICAgICBlbHNlIGlmICggIXN0 cm5jbXAocywgImluY2x1c2l2ZSIsIHNzIC0gcykgKQorICAgICAgICAgICAgaW9tbXVfZG9tMF9p bmNsdXNpdmUgPSB2YWw7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHJjID0gLUVJTlZBTDsK IApAQCAtMjAyLDYgKzIxMCwxMyBAQCB2b2lkIF9faHdkb21faW5pdCBpb21tdV9od2RvbV9pbml0 KHN0cnVjdCBkb21haW4gKmQpCiAgICAgaWYgKCAhaW9tbXVfZW5hYmxlZCApCiAgICAgICAgIHJl dHVybjsKIAorICAgIGlmICggaW9tbXVfZG9tMF9pbmNsdXNpdmUgPT0gdHJ1ZSAmJiAhaXNfcHZf ZG9tYWluKGQpICkKKyAgICB7CisgICAgICAgIHByaW50ayhYRU5MT0dfV0FSTklORworICAgICAg ICAgICAgICAgIklPTU1VIGluY2x1c2l2ZSBtYXBwaW5ncyBhcmUgb25seSBzdXBwb3J0ZWQgb24g UFYgRG9tMFxuIik7CisgICAgICAgIGlvbW11X2RvbTBfaW5jbHVzaXZlID0gZmFsc2U7CisgICAg fQorCiAgICAgcmVnaXN0ZXJfa2V5aGFuZGxlcignbycsICZpb21tdV9kdW1wX3AybV90YWJsZSwg ImR1bXAgaW9tbXUgcDJtIHRhYmxlIiwgMCk7CiAgICAgZC0+bmVlZF9pb21tdSA9ICEhaW9tbXVf ZG9tMF9zdHJpY3Q7CiAgICAgaWYgKCBuZWVkX2lvbW11KGQpICYmICFpb21tdV91c2VfaGFwX3B0 KGQpICkKQEAgLTIzNiw2ICsyNTEsOCBAQCB2b2lkIF9faHdkb21faW5pdCBpb21tdV9od2RvbV9p bml0KHN0cnVjdCBkb21haW4gKmQpCiAgICAgfQogCiAgICAgaGQtPnBsYXRmb3JtX29wcy0+aHdk b21faW5pdChkKTsKKworICAgIGFyY2hfaW9tbXVfaHdkb21faW5pdChkKTsKIH0KIAogdm9pZCBp b21tdV90ZWFyZG93bihzdHJ1Y3QgZG9tYWluICpkKQpkaWZmIC0tZ2l0IGEveGVuL2RyaXZlcnMv cGFzc3Rocm91Z2gvdnRkL2V4dGVybi5oIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvdnRkL2V4 dGVybi5oCmluZGV4IGZiN2VkZmFlZjkuLjkxY2FkYzYwMmUgMTAwNjQ0Ci0tLSBhL3hlbi9kcml2 ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC9leHRlcm4uaAorKysgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3Vn aC92dGQvZXh0ZXJuLmgKQEAgLTk5LDYgKzk5LDQgQEAgdm9pZCBwY2lfdnRkX3F1aXJrKGNvbnN0 IHN0cnVjdCBwY2lfZGV2ICopOwogYm9vbF90IHBsYXRmb3JtX3N1cHBvcnRzX2ludHJlbWFwKHZv aWQpOwogYm9vbF90IHBsYXRmb3JtX3N1cHBvcnRzX3gyYXBpYyh2b2lkKTsKIAotdm9pZCB2dGRf c2V0X2h3ZG9tX21hcHBpbmcoc3RydWN0IGRvbWFpbiAqZCk7Ci0KICNlbmRpZiAvLyBfVlREX0VY VEVSTl9IXwpkaWZmIC0tZ2l0IGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvdnRkL2lvbW11LmMg Yi94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC92dGQvaW9tbXUuYwppbmRleCA4YWM3NzQyMTViLi43 YzdlMTU3NTVkIDEwMDY0NAotLS0gYS94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC92dGQvaW9tbXUu YworKysgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC92dGQvaW9tbXUuYwpAQCAtMTMwNCwxMSAr MTMwNCw5IEBAIHN0YXRpYyB2b2lkIF9faHdkb21faW5pdCBpbnRlbF9pb21tdV9od2RvbV9pbml0 KHN0cnVjdCBkb21haW4gKmQpCiB7CiAgICAgc3RydWN0IGFjcGlfZHJoZF91bml0ICpkcmhkOwog Ci0gICAgaWYgKCAhaW9tbXVfZG9tMF9wYXNzdGhyb3VnaCAmJiBpc19wdl9kb21haW4oZCkgKQot ICAgIHsKLSAgICAgICAgLyogU2V0IHVwIDE6MSBwYWdlIHRhYmxlIGZvciBoYXJkd2FyZSBkb21h aW4uICovCi0gICAgICAgIHZ0ZF9zZXRfaHdkb21fbWFwcGluZyhkKTsKLSAgICB9CisgICAgLyog SW5jbHVzaXZlIG1hcHBpbmdzIGFyZSBlbmFibGVkIGJ5IGRlZmF1bHQgb24gSW50ZWwgaGFyZHdh cmUgZm9yIFBWLiAqLworICAgIGlvbW11X2RvbTBfaW5jbHVzaXZlID0gaW9tbXVfZG9tMF9pbmNs dXNpdmUgPT0gLTEgPyBpc19wdl9kb21haW4oZCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogaW9tbXVfZG9tMF9pbmNsdXNpdmU7CiAKICAg ICBzZXR1cF9od2RvbV9wY2lfZGV2aWNlcyhkLCBzZXR1cF9od2RvbV9kZXZpY2UpOwogICAgIHNl dHVwX2h3ZG9tX3JtcnIoZCk7CmRpZmYgLS1naXQgYS94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC92 dGQveDg2L3Z0ZC5jIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvdnRkL3g4Ni92dGQuYwppbmRl eCAwMGE5ODkxMDA1Li4yMDMyMzA1MWQwIDEwMDY0NAotLS0gYS94ZW4vZHJpdmVycy9wYXNzdGhy b3VnaC92dGQveDg2L3Z0ZC5jCisrKyBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC94ODYv dnRkLmMKQEAgLTI1LDcgKzI1LDYgQEAKICNpbmNsdWRlIDx4ZW4vaXJxLmg+CiAjaW5jbHVkZSA8 eGVuL251bWEuaD4KICNpbmNsdWRlIDxhc20vZml4bWFwLmg+Ci0jaW5jbHVkZSA8YXNtL3NldHVw Lmg+CiAjaW5jbHVkZSAiLi4vaW9tbXUuaCIKICNpbmNsdWRlICIuLi9kbWFyLmgiCiAjaW5jbHVk ZSAiLi4vdnRkLmgiCkBAIC0zNSw4ICszNCw3IEBACiAgKiBpb21tdV9pbmNsdXNpdmVfbWFwcGlu Zzogd2hlbiBzZXQsIGFsbCBtZW1vcnkgYmVsb3cgNEdCIGlzIGluY2x1ZGVkIGluIGRvbTAKICAq IDE6MSBpb21tdSBtYXBwaW5ncyBleGNlcHQgeGVuIGFuZCB1bnVzYWJsZSByZWdpb25zLgogICov Ci1zdGF0aWMgYm9vbF90IF9faHdkb21faW5pdGRhdGEgaW9tbXVfaW5jbHVzaXZlX21hcHBpbmcg PSAxOwotYm9vbGVhbl9wYXJhbSgiaW9tbXVfaW5jbHVzaXZlX21hcHBpbmciLCBpb21tdV9pbmNs dXNpdmVfbWFwcGluZyk7Citib29sZWFuX3BhcmFtKCJpb21tdV9pbmNsdXNpdmVfbWFwcGluZyIs IGlvbW11X2RvbTBfaW5jbHVzaXZlKTsKIAogdm9pZCAqbWFwX3Z0ZF9kb21haW5fcGFnZSh1NjQg bWFkZHIpCiB7CkBAIC0xMDgsNTcgKzEwNiwzIEBAIHZvaWQgaHZtX2RwY2lfaXNhaXJxX2VvaShz dHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBpbnQgaXNhaXJxKQogICAgIHNwaW5fdW5sb2NrKCZk LT5ldmVudF9sb2NrKTsKIH0KIAotdm9pZCBfX2h3ZG9tX2luaXQgdnRkX3NldF9od2RvbV9tYXBw aW5nKHN0cnVjdCBkb21haW4gKmQpCi17Ci0gICAgdW5zaWduZWQgbG9uZyBpLCB0b3AsIG1heF9w Zm47Ci0KLSAgICBCVUdfT04oIWlzX2hhcmR3YXJlX2RvbWFpbihkKSk7Ci0KLSAgICBtYXhfcGZu ID0gKEdCKDQpID4+IFBBR0VfU0hJRlQpIC0gMTsKLSAgICB0b3AgPSBtYXgobWF4X3BkeCwgcGZu X3RvX3BkeChtYXhfcGZuKSArIDEpOwotCi0gICAgZm9yICggaSA9IDA7IGkgPCB0b3A7IGkrKyAp Ci0gICAgewotICAgICAgICB1bnNpZ25lZCBsb25nIHBmbiA9IHBkeF90b19wZm4oaSk7Ci0gICAg ICAgIGJvb2wgbWFwOwotICAgICAgICBpbnQgcmM7Ci0KLSAgICAgICAgLyoKLSAgICAgICAgICog U2V0IHVwIDE6MSBtYXBwaW5nIGZvciBkb20wLiBEZWZhdWx0IHRvIGluY2x1ZGUgb25seQotICAg ICAgICAgKiBjb252ZW50aW9uYWwgUkFNIGFyZWFzIGFuZCBsZXQgUk1SUnMgaW5jbHVkZSBuZWVk ZWQgcmVzZXJ2ZWQKLSAgICAgICAgICogcmVnaW9ucy4gV2hlbiBzZXQsIHRoZSBpbmNsdXNpdmUg bWFwcGluZyBhZGRpdGlvbmFsbHkgbWFwcyBpbgotICAgICAgICAgKiBldmVyeSBwZm4gdXAgdG8g NEdCIGV4Y2VwdCB0aG9zZSB0aGF0IGZhbGwgaW4gdW51c2FibGUgcmFuZ2VzLgotICAgICAgICAg Ki8KLSAgICAgICAgaWYgKCBwZm4gPiBtYXhfcGZuICYmICFtZm5fdmFsaWQoX21mbihwZm4pKSAp Ci0gICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICBpZiAoIGlvbW11X2luY2x1c2l2ZV9t YXBwaW5nICYmIHBmbiA8PSBtYXhfcGZuICkKLSAgICAgICAgICAgIG1hcCA9ICFwYWdlX2lzX3Jh bV90eXBlKHBmbiwgUkFNX1RZUEVfVU5VU0FCTEUpOwotICAgICAgICBlbHNlCi0gICAgICAgICAg ICBtYXAgPSBwYWdlX2lzX3JhbV90eXBlKHBmbiwgUkFNX1RZUEVfQ09OVkVOVElPTkFMKTsKLQot ICAgICAgICBpZiAoICFtYXAgKQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgLyog RXhjbHVkZSBYZW4gYml0cyAqLwotICAgICAgICBpZiAoIHhlbl9pbl9yYW5nZShwZm4pICkKLSAg ICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgIC8qCi0gICAgICAgICAqIElmIGRvbTAtc3Ry aWN0IG1vZGUgaXMgZW5hYmxlZCB0aGVuIGV4Y2x1ZGUgY29udmVudGlvbmFsIFJBTQotICAgICAg ICAgKiBhbmQgbGV0IHRoZSBjb21tb24gY29kZSBtYXAgZG9tMCdzIHBhZ2VzLgotICAgICAgICAg Ki8KLSAgICAgICAgaWYgKCBpb21tdV9kb20wX3N0cmljdCAmJgotICAgICAgICAgICAgIHBhZ2Vf aXNfcmFtX3R5cGUocGZuLCBSQU1fVFlQRV9DT05WRU5USU9OQUwpICkKLSAgICAgICAgICAgIGNv bnRpbnVlOwotCi0gICAgICAgIHJjID0gaW9tbXVfbWFwX3BhZ2UoZCwgcGZuLCBwZm4sIElPTU1V Rl9yZWFkYWJsZXxJT01NVUZfd3JpdGFibGUpOwotICAgICAgICBpZiAoIHJjICkKLSAgICAgICAg ICAgIHByaW50ayhYRU5MT0dfV0FSTklORyBWVERQUkVGSVggIiBkJWQ6IElPTU1VIG1hcHBpbmcg ZmFpbGVkOiAlZFxuIiwKLSAgICAgICAgICAgICAgICAgICBkLT5kb21haW5faWQsIHJjKTsKLQot ICAgICAgICBpZiAoIShpICYgMHhmZmZmZikpCi0gICAgICAgICAgICBwcm9jZXNzX3BlbmRpbmdf c29mdGlycXMoKTsKLSAgICB9Ci19Ci0KZGlmZiAtLWdpdCBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJv dWdoL3g4Ni9pb21tdS5jIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gveDg2L2lvbW11LmMKaW5k ZXggNjgxODJhZmQ5MS4uNWE3YTc2NWU5ZCAxMDA2NDQKLS0tIGEveGVuL2RyaXZlcnMvcGFzc3Ro cm91Z2gveDg2L2lvbW11LmMKKysrIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gveDg2L2lvbW11 LmMKQEAgLTIwLDYgKzIwLDggQEAKICNpbmNsdWRlIDx4ZW4vc29mdGlycS5oPgogI2luY2x1ZGUg PHhzbS94c20uaD4KIAorI2luY2x1ZGUgPGFzbS9zZXR1cC5oPgorCiB2b2lkIGlvbW11X3VwZGF0 ZV9pcmVfZnJvbV9hcGljKAogICAgIHVuc2lnbmVkIGludCBhcGljLCB1bnNpZ25lZCBpbnQgcmVn LCB1bnNpZ25lZCBpbnQgdmFsdWUpCiB7CkBAIC0xMzIsNiArMTM0LDYzIEBAIHZvaWQgYXJjaF9p b21tdV9kb21haW5fZGVzdHJveShzdHJ1Y3QgZG9tYWluICpkKQogewogfQogCit2b2lkIF9faHdk b21faW5pdCBhcmNoX2lvbW11X2h3ZG9tX2luaXQoc3RydWN0IGRvbWFpbiAqZCkKK3sKKyAgICB1 bnNpZ25lZCBsb25nIGksIHRvcCwgbWF4X3BmbjsKKworICAgIEJVR19PTighaXNfaGFyZHdhcmVf ZG9tYWluKGQpKTsKKworICAgIGlmICggaW9tbXVfZG9tMF9wYXNzdGhyb3VnaCB8fCAhaXNfcHZf ZG9tYWluKGQpICkKKyAgICAgICAgcmV0dXJuOworCisgICAgbWF4X3BmbiA9IChHQig0KSA+PiBQ QUdFX1NISUZUKSAtIDE7CisgICAgdG9wID0gbWF4KG1heF9wZHgsIHBmbl90b19wZHgobWF4X3Bm bikgKyAxKTsKKworICAgIGZvciAoIGkgPSAwOyBpIDwgdG9wOyBpKysgKQorICAgIHsKKyAgICAg ICAgdW5zaWduZWQgbG9uZyBwZm4gPSBwZHhfdG9fcGZuKGkpOworICAgICAgICBib29sIG1hcDsK KyAgICAgICAgaW50IHJjOworCisgICAgICAgIC8qCisgICAgICAgICAqIFNldCB1cCAxOjEgbWFw cGluZyBmb3IgZG9tMC4gRGVmYXVsdCB0byBpbmNsdWRlIG9ubHkKKyAgICAgICAgICogY29udmVu dGlvbmFsIFJBTSBhcmVhcyBhbmQgbGV0IFJNUlJzIGluY2x1ZGUgbmVlZGVkIHJlc2VydmVkCisg ICAgICAgICAqIHJlZ2lvbnMuIFdoZW4gc2V0LCB0aGUgaW5jbHVzaXZlIG1hcHBpbmcgYWRkaXRp b25hbGx5IG1hcHMgaW4KKyAgICAgICAgICogZXZlcnkgcGZuIHVwIHRvIDRHQiBleGNlcHQgdGhv c2UgdGhhdCBmYWxsIGluIHVudXNhYmxlIHJhbmdlcy4KKyAgICAgICAgICovCisgICAgICAgIGlm ICggcGZuID4gbWF4X3BmbiAmJiAhbWZuX3ZhbGlkKF9tZm4ocGZuKSkgKQorICAgICAgICAgICAg Y29udGludWU7CisKKyAgICAgICAgaWYgKCBpb21tdV9kb20wX2luY2x1c2l2ZSAmJiBwZm4gPD0g bWF4X3BmbiApCisgICAgICAgICAgICBtYXAgPSAhcGFnZV9pc19yYW1fdHlwZShwZm4sIFJBTV9U WVBFX1VOVVNBQkxFKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbWFwID0gcGFnZV9pc19y YW1fdHlwZShwZm4sIFJBTV9UWVBFX0NPTlZFTlRJT05BTCk7CisKKyAgICAgICAgaWYgKCAhbWFw ICkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIC8qIEV4Y2x1ZGUgWGVuIGJpdHMg Ki8KKyAgICAgICAgaWYgKCB4ZW5faW5fcmFuZ2UocGZuKSApCisgICAgICAgICAgICBjb250aW51 ZTsKKworICAgICAgICAvKgorICAgICAgICAgKiBJZiBkb20wLXN0cmljdCBtb2RlIGlzIGVuYWJs ZWQgdGhlbiBleGNsdWRlIGNvbnZlbnRpb25hbCBSQU0KKyAgICAgICAgICogYW5kIGxldCB0aGUg Y29tbW9uIGNvZGUgbWFwIGRvbTAncyBwYWdlcy4KKyAgICAgICAgICovCisgICAgICAgIGlmICgg aW9tbXVfZG9tMF9zdHJpY3QgJiYKKyAgICAgICAgICAgICBwYWdlX2lzX3JhbV90eXBlKHBmbiwg UkFNX1RZUEVfQ09OVkVOVElPTkFMKSApCisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAg ICByYyA9IGlvbW11X21hcF9wYWdlKGQsIHBmbiwgcGZuLCBJT01NVUZfcmVhZGFibGV8SU9NTVVG X3dyaXRhYmxlKTsKKyAgICAgICAgaWYgKCByYyApCisgICAgICAgICAgICBwcmludGsoWEVOTE9H X1dBUk5JTkcgIiBkJWQ6IElPTU1VIG1hcHBpbmcgZmFpbGVkOiAlZFxuIiwKKyAgICAgICAgICAg ICAgICAgICBkLT5kb21haW5faWQsIHJjKTsKKworICAgICAgICBpZiAoIShpICYgMHhmZmZmZikp CisgICAgICAgICAgICBwcm9jZXNzX3BlbmRpbmdfc29mdGlycXMoKTsKKyAgICB9Cit9CisKIC8q CiAgKiBMb2NhbCB2YXJpYWJsZXM6CiAgKiBtb2RlOiBDCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVk ZS94ZW4vaW9tbXUuaCBiL3hlbi9pbmNsdWRlL3hlbi9pb21tdS5oCmluZGV4IGMwYzY5NzVhYzQu Ljk5ZTViODljMGYgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL3hlbi9pb21tdS5oCisrKyBiL3hl bi9pbmNsdWRlL3hlbi9pb21tdS5oCkBAIC0zNyw2ICszNyw3IEBAIGV4dGVybiBib29sX3QgaW9t bXVfZGVidWc7CiBleHRlcm4gYm9vbF90IGFtZF9pb21tdV9wZXJkZXZfaW50cmVtYXA7CiAKIGV4 dGVybiBib29sIGlvbW11X2RvbTBfc3RyaWN0LCBpb21tdV9kb20wX3Bhc3N0aHJvdWdoOworZXh0 ZXJuIGludDhfdCBpb21tdV9kb20wX2luY2x1c2l2ZTsKIAogZXh0ZXJuIHVuc2lnbmVkIGludCBp b21tdV9kZXZfaW90bGJfdGltZW91dDsKIApAQCAtNTEsNiArNTIsNyBAQCB2b2lkIGFyY2hfaW9t bXVfZG9tYWluX2Rlc3Ryb3koc3RydWN0IGRvbWFpbiAqZCk7CiBpbnQgYXJjaF9pb21tdV9kb21h aW5faW5pdChzdHJ1Y3QgZG9tYWluICpkKTsKIGludCBhcmNoX2lvbW11X3BvcHVsYXRlX3BhZ2Vf dGFibGUoc3RydWN0IGRvbWFpbiAqZCk7CiB2b2lkIGFyY2hfaW9tbXVfY2hlY2tfYXV0b3RyYW5z bGF0ZWRfaHdkb20oc3RydWN0IGRvbWFpbiAqZCk7Cit2b2lkIGFyY2hfaW9tbXVfaHdkb21faW5p dChzdHJ1Y3QgZG9tYWluICpkKTsKIAogaW50IGlvbW11X2NvbnN0cnVjdChzdHJ1Y3QgZG9tYWlu ICpkKTsKIAotLSAKMi4xOC4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJv amVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hl bi1kZXZlbA==