From: Thomas Hellstrom Subject: [PATCH v3 2/2] locking: Implement an algorithm choice for Wound-Wait mutexes Date: Fri, 15 Jun 2018 14:08:27 +0200 Message-ID: <20180615120827.3989-2-thellstrom@vmware.com> References: <20180615120827.3989-1-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0069.outbound.protection.outlook.com [104.47.42.69]) by gabe.freedesktop.org (Postfix) with ESMTPS id DDDB96EB19 for ; Fri, 15 Jun 2018 12:09:21 +0000 (UTC) In-Reply-To: <20180615120827.3989-1-thellstrom@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, peterz@infradead.org Cc: Kate Stewart , Thomas Hellstrom , Davidlohr Bueso , Jonathan Corbet , David Airlie , linux-doc@vger.kernel.org, Josh Triplett , linaro-mm-sig@lists.linaro.org, Greg Kroah-Hartman , Ingo Molnar , Philippe Ombredanne , Thomas Gleixner , "Paul E. McKenney" , linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org VGhlIGN1cnJlbnQgV291bmQtV2FpdCBtdXRleCBhbGdvcml0aG0gaXMgYWN0dWFsbHkgbm90IFdv dW5kLVdhaXQgYnV0CldhaXQtRGllLiBJbXBsZW1lbnQgYWxzbyBXb3VuZC1XYWl0IGFzIGEgcGVy LXd3LWNsYXNzIGNob2ljZS4gV291bmQtV2FpdAppcywgY29udHJhcnkgdG8gV2FpdC1EaWUgYSBw cmVlbXB0aXZlIGFsZ29yaXRobSBhbmQgaXMga25vd24gdG8gZ2VuZXJhdGUKZmV3ZXIgYmFja29m ZnMuIFRlc3RpbmcgcmV2ZWFscyB0aGF0IHRoaXMgaXMgdHJ1ZSBpZiB0aGUKbnVtYmVyIG9mIHNp bXVsdGFuZW91cyBjb250ZW5kaW5nIHRyYW5zYWN0aW9ucyBpcyBzbWFsbC4KQXMgdGhlIG51bWJl ciBvZiBzaW11bHRhbmVvdXMgY29udGVuZGluZyB0aHJlYWRzIGluY3JlYXNlcywgV2FpdC1Xb3Vu ZApiZWNvbWVzIGluZmVyaW9yIHRvIFdhaXQtRGllIGluIHRlcm1zIG9mIGVsYXBzZWQgdGltZS4K UG9zc2libHkgZHVlIHRvIHRoZSBsYXJnZXIgbnVtYmVyIG9mIGhlbGQgbG9ja3Mgb2Ygc2xlZXBp bmcgdHJhbnNhY3Rpb25zLgoKVXBkYXRlIGRvY3VtZW50YXRpb24gYW5kIGNhbGxlcnMuCgpUaW1p bmdzIHVzaW5nIGdpdDovL3Blb3BsZS5mcmVlZGVza3RvcC5vcmcvfnRob21hc2gvd3dfbXV0ZXhf dGVzdAp0YWcgcGF0Y2gtMTgtMDYtMTUKCkVhY2ggdGhyZWFkIHJ1bnMgMTAwMDAwIGJhdGNoZXMg b2YgbG9jayAvIHVubG9jayA4MDAgd3cgbXV0ZXhlcyByYW5kb21seQpjaG9zZW4gb3V0IG9mIDEw MDAwMC4gRm91ciBjb3JlIEludGVsIHg4Nl82NDoKCkFsZ29yaXRobSAgICAjdGhyZWFkcyAgICAg ICBSb2xsYmFja3MgIHRpbWUKV291bmQtV2FpdCAgIDQgICAgICAgICAgICAgIH4xMDAgICAgICAg fjE3cy4KV2FpdC1EaWUgICAgIDQgICAgICAgICAgICAgIH4xNTAwMDAgICAgfjE5cy4KV291bmQt V2FpdCAgIDE2ICAgICAgICAgICAgIH4zNjAwMDAgICAgfjEwOXMuCldhaXQtRGllICAgICAxNiAg ICAgICAgICAgICB+NDUwMDAwICAgIH44MnMuCgpDYzogSW5nbyBNb2xuYXIgPG1pbmdvQHJlZGhh dC5jb20+CkNjOiBKb25hdGhhbiBDb3JiZXQgPGNvcmJldEBsd24ubmV0PgpDYzogR3VzdGF2byBQ YWRvdmFuIDxndXN0YXZvQHBhZG92YW4ub3JnPgpDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0 ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KQ2M6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hy b21pdW0ub3JnPgpDYzogRGF2aWQgQWlybGllIDxhaXJsaWVkQGxpbnV4LmllPgpDYzogRGF2aWRs b2hyIEJ1ZXNvIDxkYXZlQHN0Z29sYWJzLm5ldD4KQ2M6ICJQYXVsIEUuIE1jS2VubmV5IiA8cGF1 bG1ja0BsaW51eC52bmV0LmlibS5jb20+CkNjOiBKb3NoIFRyaXBsZXR0IDxqb3NoQGpvc2h0cmlw bGV0dC5vcmc+CkNjOiBUaG9tYXMgR2xlaXhuZXIgPHRnbHhAbGludXRyb25peC5kZT4KQ2M6IEth dGUgU3Rld2FydCA8a3N0ZXdhcnRAbGludXhmb3VuZGF0aW9uLm9yZz4KQ2M6IFBoaWxpcHBlIE9t YnJlZGFubmUgPHBvbWJyZWRhbm5lQG5leGIuY29tPgpDYzogR3JlZyBLcm9haC1IYXJ0bWFuIDxn cmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KQ2M6IGxpbnV4LWRvY0B2Z2VyLmtlcm5lbC5vcmcK Q2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpDYzogbGluYXJvLW1tLXNpZ0BsaXN0cy5s aW5hcm8ub3JnCkNvLWF1dGhvcmVkLWJ5OiBQZXRlciBaaWpsc3RyYSA8cGV0ZXJ6QGluZnJhZGVh ZC5vcmc+ClNpZ25lZC1vZmYtYnk6IFRob21hcyBIZWxsc3Ryb20gPHRoZWxsc3Ryb21Adm13YXJl LmNvbT4KLS0tCiBEb2N1bWVudGF0aW9uL2xvY2tpbmcvd3ctbXV0ZXgtZGVzaWduLnR4dCB8ICA1 NyArKysrKysrKystLS0KIGRyaXZlcnMvZG1hLWJ1Zi9yZXNlcnZhdGlvbi5jICAgICAgICAgICAg IHwgICAyICstCiBkcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzZXRfbG9jay5jICAgICAgICB8ICAg MiArLQogaW5jbHVkZS9saW51eC93d19tdXRleC5oICAgICAgICAgICAgICAgICAgfCAgMTcgKysr LQoga2VybmVsL2xvY2tpbmcvbG9ja3RvcnR1cmUuYyAgICAgICAgICAgICAgfCAgIDIgKy0KIGtl cm5lbC9sb2NraW5nL211dGV4LmMgICAgICAgICAgICAgICAgICAgIHwgMTQ4ICsrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLQoga2VybmVsL2xvY2tpbmcvdGVzdC13d19tdXRleC5jICAgICAg ICAgICAgfCAgIDIgKy0KIGxpYi9sb2NraW5nLXNlbGZ0ZXN0LmMgICAgICAgICAgICAgICAgICAg IHwgICAyICstCiA4IGZpbGVzIGNoYW5nZWQsIDE5OSBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2xvY2tpbmcvd3ctbXV0ZXgtZGVzaWdu LnR4dCBiL0RvY3VtZW50YXRpb24vbG9ja2luZy93dy1tdXRleC1kZXNpZ24udHh0CmluZGV4IDJm ZDdmMmEyYWYyMS4uZjBlZDdjMzBlNjk1IDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2xvY2tp bmcvd3ctbXV0ZXgtZGVzaWduLnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL2xvY2tpbmcvd3ctbXV0 ZXgtZGVzaWduLnR4dApAQCAtMSw0ICsxLDQgQEAKLVdhaXQvV291bmQgRGVhZGxvY2stUHJvb2Yg TXV0ZXggRGVzaWduCitXb3VuZC9XYWl0IERlYWRsb2NrLVByb29mIE11dGV4IERlc2lnbgogPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KIAogUGxlYXNlIHJlYWQgbXV0ZXgt ZGVzaWduLnR4dCBmaXJzdCwgYXMgaXQgYXBwbGllcyB0byB3YWl0L3dvdW5kIG11dGV4ZXMgdG9v LgpAQCAtMzIsMTAgKzMyLDI2IEBAIHRoZSBvbGRlc3QgdGFzaykgd2lucywgYW5kIHRoZSBvbmUg d2l0aCB0aGUgaGlnaGVyIHJlc2VydmF0aW9uIGlkIChpLmUuIHRoZQogeW91bmdlciB0YXNrKSB1 bmxvY2tzIGFsbCBvZiB0aGUgYnVmZmVycyB0aGF0IGl0IGhhcyBhbHJlYWR5IGxvY2tlZCwgYW5k IHRoZW4KIHRyaWVzIGFnYWluLgogCi1JbiB0aGUgUkRCTVMgbGl0ZXJhdHVyZSB0aGlzIGRlYWRs b2NrIGhhbmRsaW5nIGFwcHJvYWNoIGlzIGNhbGxlZCB3YWl0L2RpZToKLVRoZSBvbGRlciB0YXNr cyB3YWl0cyB1bnRpbCBpdCBjYW4gYWNxdWlyZSB0aGUgY29udGVuZGVkIGxvY2suIFRoZSB5b3Vu Z2VyIHRhc2tzCi1uZWVkcyB0byBiYWNrIG9mZiBhbmQgZHJvcCBhbGwgdGhlIGxvY2tzIGl0IGlz IGN1cnJlbnRseSBob2xkaW5nLCBpLmUuIHRoZQoteW91bmdlciB0YXNrIGRpZXMuCitJbiB0aGUg UkRCTVMgbGl0ZXJhdHVyZSwgYSByZXNlcnZhdGlvbiB0aWNrZXQgaXMgYXNzb2NpYXRlZCB3aXRo IGEgdHJhbnNhY3Rpb24uCithbmQgdGhlIGRlYWRsb2NrIGhhbmRsaW5nIGFwcHJvYWNoIGlzIGNh bGxlZCBXYWl0LURpZS4gVGhlIG5hbWUgaXMgYmFzZWQgb24KK3RoZSBhY3Rpb25zIG9mIGEgbG9j a2luZyB0aHJlYWQgd2hlbiBpdCBlbmNvdW50ZXJzIGFuIGFscmVhZHkgbG9ja2VkIG11dGV4Lgor SWYgdGhlIHRyYW5zYWN0aW9uIGhvbGRpbmcgdGhlIGxvY2sgaXMgeW91bmdlciwgdGhlIGxvY2tp bmcgdHJhbnNhY3Rpb24gd2FpdHMuCitJZiB0aGUgdHJhbnNhY3Rpb24gaG9sZGluZyB0aGUgbG9j ayBpcyBvbGRlciwgdGhlIGxvY2tpbmcgdHJhbnNhY3Rpb24gYmFja3Mgb2ZmCithbmQgZGllcy4g SGVuY2UgV2FpdC1EaWUuCitUaGVyZSBpcyBhbHNvIGFub3RoZXIgYWxnb3JpdGhtIGNhbGxlZCBX b3VuZC1XYWl0OgorSWYgdGhlIHRyYW5zYWN0aW9uIGhvbGRpbmcgdGhlIGxvY2sgaXMgeW91bmdl ciwgdGhlIGxvY2tpbmcgdHJhbnNhY3Rpb24KK3dvdW5kcyB0aGUgdHJhbnNhY3Rpb24gaG9sZGlu ZyB0aGUgbG9jaywgcmVxdWVzdGluZyBpdCB0byBkaWUuCitJZiB0aGUgdHJhbnNhY3Rpb24gaG9s ZGluZyB0aGUgbG9jayBpcyBvbGRlciwgaXQgd2FpdHMgZm9yIHRoZSBvdGhlcgordHJhbnNhY3Rp b24uIEhlbmNlIFdvdW5kLVdhaXQuCitUaGUgdHdvIGFsZ29yaXRobXMgYXJlIGJvdGggZmFpciBp biB0aGF0IGEgdHJhbnNhY3Rpb24gd2lsbCBldmVudHVhbGx5IHN1Y2NlZWQuCitIb3dldmVyLCB0 aGUgV291bmQtV2FpdCBhbGdvcml0aG0gaXMgdHlwaWNhbGx5IHN0YXRlZCB0byBnZW5lcmF0ZSBm ZXdlciBiYWNrb2ZmcworY29tcGFyZWQgdG8gV2FpdC1EaWUsIGJ1dCBpcywgb24gdGhlIG90aGVy IGhhbmQsIGFzc29jaWF0ZWQgd2l0aCBtb3JlIHdvcmsgdGhhbgorV2FpdC1EaWUgd2hlbiByZWNv dmVyaW5nIGZyb20gYSBiYWNrb2ZmLiBXb3VuZC1XYWl0IGlzIGFsc28gYSBwcmVlbXB0aXZlCith bGdvcml0aG0gaW4gdGhhdCB0cmFuc2FjdGlvbnMgYXJlIHdvdW5kZWQgYnkgb3RoZXIgdHJhbnNh Y3Rpb25zLCBhbmQgdGhhdAorcmVxdWlyZXMgYSByZWxpYWJsZSB3YXkgdG8gcGljayB1cCB1cCB0 aGUgd291bmRlZCBjb25kaXRpb24gYW5kIHByZWVtcHQgdGhlCitydW5uaW5nIHRyYW5zYWN0aW9u LiBOb3RlIHRoYXQgdGhpcyBpcyBub3QgdGhlIHNhbWUgYXMgcHJvY2VzcyBwcmVlbXB0aW9uLiBB CitXb3VuZC1XYWl0IHRyYW5zYWN0aW9uIGlzIGNvbnNpZGVyZWQgcHJlZW1wdGVkIHdoZW4gaXQg ZGllcyAocmV0dXJuaW5nCistRURFQURMSykgZm9sbG93aW5nIGEgd291bmQuCiAKIENvbmNlcHRz CiAtLS0tLS0tLQpAQCAtNDcsMTAgKzYzLDEyIEBAIEFjcXVpcmUgY29udGV4dDogVG8gZW5zdXJl IGV2ZW50dWFsIGZvcndhcmQgcHJvZ3Jlc3MgaXQgaXMgaW1wb3J0YW50IHRoZSBhIHRhc2sKIHRy eWluZyB0byBhY3F1aXJlIGxvY2tzIGRvZXNuJ3QgZ3JhYiBhIG5ldyByZXNlcnZhdGlvbiBpZCwg YnV0IGtlZXBzIHRoZSBvbmUgaXQKIGFjcXVpcmVkIHdoZW4gc3RhcnRpbmcgdGhlIGxvY2sgYWNx dWlzaXRpb24uIFRoaXMgdGlja2V0IGlzIHN0b3JlZCBpbiB0aGUKIGFjcXVpcmUgY29udGV4dC4g RnVydGhlcm1vcmUgdGhlIGFjcXVpcmUgY29udGV4dCBrZWVwcyB0cmFjayBvZiBkZWJ1Z2dpbmcg c3RhdGUKLXRvIGNhdGNoIHcvdyBtdXRleCBpbnRlcmZhY2UgYWJ1c2UuCit0byBjYXRjaCB3L3cg bXV0ZXggaW50ZXJmYWNlIGFidXNlLiBBbiBhY3F1aXJlIGNvbnRleHQgaXMgcmVwcmVzZW50aW5n IGEKK3RyYW5zYWN0aW9uLgogCiBXL3cgY2xhc3M6IEluIGNvbnRyYXN0IHRvIG5vcm1hbCBtdXRl eGVzIHRoZSBsb2NrIGNsYXNzIG5lZWRzIHRvIGJlIGV4cGxpY2l0IGZvcgotdy93IG11dGV4ZXMs IHNpbmNlIGl0IGlzIHJlcXVpcmVkIHRvIGluaXRpYWxpemUgdGhlIGFjcXVpcmUgY29udGV4dC4K K3cvdyBtdXRleGVzLCBzaW5jZSBpdCBpcyByZXF1aXJlZCB0byBpbml0aWFsaXplIHRoZSBhY3F1 aXJlIGNvbnRleHQuIFRoZSBsb2NrCitjbGFzcyBhbHNvIHNwZWNpZmllcyB3aGF0IGFsZ29yaXRo bSB0byB1c2UsIFdvdW5kLVdhaXQgb3IgV2FpdC1EaWUuCiAKIEZ1cnRoZXJtb3JlIHRoZXJlIGFy ZSB0aHJlZSBkaWZmZXJlbnQgY2xhc3Mgb2Ygdy93IGxvY2sgYWNxdWlyZSBmdW5jdGlvbnM6CiAK QEAgLTkwLDYgKzEwOCwxMiBAQCBwcm92aWRlZC4KIFVzYWdlCiAtLS0tLQogCitUaGUgYWxnb3Jp dGhtIChXYWl0LURpZSB2cyBXb3VuZC1XYWl0KSBpcyBjaG9zZW4gYnkgdXNpbmcgZWl0aGVyCitE RUZJTkVfV1dfQ0xBU1MoKSAoV291bmQtV2FpdCkgb3IgREVGSU5FX1dEX0NMQVNTKCkgKFdhaXQt RGllKQorQXMgYSByb3VnaCBydWxlIG9mIHRodW1iLCB1c2UgV291bmQtV2FpdCBpZmYgeW91Citl eHBlY3QgdGhlIG51bWJlciBvZiBzaW11bHRhbmVvdXMgY29tcGV0aW5nIHRyYW5zYWN0aW9ucyB0 byBiZSB0eXBpY2FsbHkgc21hbGwsCithbmQgeW91IHdhbnQgdG8gcmVkdWNlIHRoZSBudW1iZXIg b2Ygcm9sbGJhY2tzLgorCiBUaHJlZSBkaWZmZXJlbnQgd2F5cyB0byBhY3F1aXJlIGxvY2tzIHdp dGhpbiB0aGUgc2FtZSB3L3cgY2xhc3MuIENvbW1vbgogZGVmaW5pdGlvbnMgZm9yIG1ldGhvZHMg IzEgYW5kICMyOgogCkBAIC0zMTIsMTIgKzMzNiwyMyBAQCBEZXNpZ246CiAgIFdlIG1haW50YWlu IHRoZSBmb2xsb3dpbmcgaW52YXJpYW50cyBmb3IgdGhlIHdhaXQgbGlzdDoKICAgKDEpIFdhaXRl cnMgd2l0aCBhbiBhY3F1aXJlIGNvbnRleHQgYXJlIHNvcnRlZCBieSBzdGFtcCBvcmRlcjsgd2Fp dGVycwogICAgICAgd2l0aG91dCBhbiBhY3F1aXJlIGNvbnRleHQgYXJlIGludGVyc3BlcnNlZCBp biBGSUZPIG9yZGVyLgotICAoMikgQW1vbmcgd2FpdGVycyB3aXRoIGNvbnRleHRzLCBvbmx5IHRo ZSBmaXJzdCBvbmUgY2FuIGhhdmUgb3RoZXIgbG9ja3MKLSAgICAgIGFjcXVpcmVkIGFscmVhZHkg KGN0eC0+YWNxdWlyZWQgPiAwKS4gTm90ZSB0aGF0IHRoaXMgd2FpdGVyIG1heSBjb21lCi0gICAg ICBhZnRlciBvdGhlciB3YWl0ZXJzIHdpdGhvdXQgY29udGV4dHMgaW4gdGhlIGxpc3QuCisgICgy KSBGb3IgV2FpdC1EaWUsIGFtb25nIHdhaXRlcnMgd2l0aCBjb250ZXh0cywgb25seSB0aGUgZmly c3Qgb25lIGNhbiBoYXZlCisgICAgICBvdGhlciBsb2NrcyBhY3F1aXJlZCBhbHJlYWR5IChjdHgt PmFjcXVpcmVkID4gMCkuIE5vdGUgdGhhdCB0aGlzIHdhaXRlcgorICAgICAgbWF5IGNvbWUgYWZ0 ZXIgb3RoZXIgd2FpdGVycyB3aXRob3V0IGNvbnRleHRzIGluIHRoZSBsaXN0LgorCisgIFRoZSBX b3VuZC1XYWl0IHByZWVtcHRpb24gaXMgaW1wbGVtZW50ZWQgd2l0aCBhIGxhenktcHJlZW1wdGlv biBzY2hlbWU6CisgIFRoZSB3b3VuZGVkIHN0YXR1cyBvZiB0aGUgdHJhbnNhY3Rpb24gaXMgY2hl Y2tlZCBvbmx5IHdoZW4gdGhlcmUgaXMKKyAgY29udGVudGlvbiBmb3IgYSBuZXcgbG9jayBhbmQg aGVuY2UgYSB0cnVlIGNoYW5jZSBvZiBkZWFkbG9jay4gSW4gdGhhdAorICBzaXR1YXRpb24sIGlm IHRoZSB0cmFuc2FjdGlvbiBpcyB3b3VuZGVkLCBpdCBiYWNrcyBvZmYsIGNsZWFycyB0aGUKKyAg d291bmRlZCBzdGF0dXMgYW5kIHJldHJpZXMuIEEgZ3JlYXQgYmVuZWZpdCBvZiBpbXBsZW1lbnRp bmcgcHJlZW1wdGlvbiBpbgorICB0aGlzIHdheSBpcyB0aGF0IHRoZSB3b3VuZGVkIHRyYW5zYWN0 aW9uIGNhbiBpZGVudGlmeSBhIGNvbnRlbmRpbmcgbG9jayB0bworICB3YWl0IGZvciBiZWZvcmUg cmVzdGFydGluZyB0aGUgdHJhbnNhY3Rpb24uIEp1c3QgYmxpbmRseSByZXN0YXJ0aW5nIHRoZQor ICB0cmFuc2FjdGlvbiB3b3VsZCBsaWtlbHkgbWFrZSB0aGUgdHJhbnNhY3Rpb24gZW5kIHVwIGlu IGEgc2l0dWF0aW9uIHdoZXJlCisgIGl0IHdvdWxkIGhhdmUgdG8gYmFjayBvZmYgYWdhaW4uCiAK ICAgSW4gZ2VuZXJhbCwgbm90IG11Y2ggY29udGVudGlvbiBpcyBleHBlY3RlZC4gVGhlIGxvY2tz IGFyZSB0eXBpY2FsbHkgdXNlZCB0bwotICBzZXJpYWxpemUgYWNjZXNzIHRvIHJlc291cmNlcyBm b3IgZGV2aWNlcy4KKyAgc2VyaWFsaXplIGFjY2VzcyB0byByZXNvdXJjZXMgZm9yIGRldmljZXMs IGFuZCBvcHRpbWl6YXRpb24gZm9jdXMgc2hvdWxkCisgIHRoZXJlZm9yZSBiZSBkaXJlY3RlZCB0 b3dhcmRzIHRoZSB1bmNvbnRlbmRlZCBjYXNlcy4KIAogTG9ja2RlcDoKICAgU3BlY2lhbCBjYXJl IGhhcyBiZWVuIHRha2VuIHRvIHdhcm4gZm9yIGFzIG1hbnkgY2FzZXMgb2YgYXBpIGFidXNlCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2RtYS1idWYvcmVzZXJ2YXRpb24uYyBiL2RyaXZlcnMvZG1hLWJ1 Zi9yZXNlcnZhdGlvbi5jCmluZGV4IDMxNGViMTA3MWNjZS4uMjBiZjkwZjRlZTYzIDEwMDY0NAot LS0gYS9kcml2ZXJzL2RtYS1idWYvcmVzZXJ2YXRpb24uYworKysgYi9kcml2ZXJzL2RtYS1idWYv cmVzZXJ2YXRpb24uYwpAQCAtNDYsNyArNDYsNyBAQAogICogd3JpdGUtc2lkZSB1cGRhdGVzLgog ICovCiAKLURFRklORV9XV19DTEFTUyhyZXNlcnZhdGlvbl93d19jbGFzcyk7CitERUZJTkVfV0Rf Q0xBU1MocmVzZXJ2YXRpb25fd3dfY2xhc3MpOwogRVhQT1JUX1NZTUJPTChyZXNlcnZhdGlvbl93 d19jbGFzcyk7CiAKIHN0cnVjdCBsb2NrX2NsYXNzX2tleSByZXNlcnZhdGlvbl9zZXFjb3VudF9j bGFzczsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXNldF9sb2NrLmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzZXRfbG9jay5jCmluZGV4IDhhNTEwMDY4NTg3NS4uNjM4 YmUyZWI2N2I0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzZXRfbG9jay5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXNldF9sb2NrLmMKQEAgLTcwLDcgKzcwLDcg QEAKICAqIGxpc3RzIGFuZCBsb29rdXAgZGF0YSBzdHJ1Y3R1cmVzLgogICovCiAKLXN0YXRpYyBE RUZJTkVfV1dfQ0xBU1MoY3J0Y193d19jbGFzcyk7CitzdGF0aWMgREVGSU5FX1dEX0NMQVNTKGNy dGNfd3dfY2xhc3MpOwogCiAvKioKICAqIGRybV9tb2Rlc2V0X2xvY2tfYWxsIC0gdGFrZSBhbGwg bW9kZXNldCBsb2NrcwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC93d19tdXRleC5oIGIvaW5j bHVkZS9saW51eC93d19tdXRleC5oCmluZGV4IGY4MmZjZTIyMjljOC4uM2FmN2MwZTAzYmU1IDEw MDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L3d3X211dGV4LmgKKysrIGIvaW5jbHVkZS9saW51eC93 d19tdXRleC5oCkBAIC04LDYgKzgsOCBAQAogICoKICAqIFdhaXQvRGllIGltcGxlbWVudGF0aW9u OgogICogIENvcHlyaWdodCAoQykgMjAxMyBDYW5vbmljYWwgTHRkLgorICogQ2hvaWNlIG9mIGFs Z29yaXRobToKKyAqICBDb3B5cmlnaHQgKEMpIDIwMTggV01XYXJlIEluYy4KICAqCiAgKiBUaGlz IGZpbGUgY29udGFpbnMgdGhlIG1haW4gZGF0YSBzdHJ1Y3R1cmUgYW5kIEFQSSBkZWZpbml0aW9u cy4KICAqLwpAQCAtMjMsMTIgKzI1LDE1IEBAIHN0cnVjdCB3d19jbGFzcyB7CiAJc3RydWN0IGxv Y2tfY2xhc3Nfa2V5IG11dGV4X2tleTsKIAljb25zdCBjaGFyICphY3F1aXJlX25hbWU7CiAJY29u c3QgY2hhciAqbXV0ZXhfbmFtZTsKKwl1bnNpZ25lZCBpbnQgaXNfd2FpdF9kaWU7CiB9OwogCiBz dHJ1Y3Qgd3dfYWNxdWlyZV9jdHggewogCXN0cnVjdCB0YXNrX3N0cnVjdCAqdGFzazsKIAl1bnNp Z25lZCBsb25nIHN0YW1wOwogCXVuc2lnbmVkIGludCBhY3F1aXJlZDsKKwl1bnNpZ25lZCBzaG9y dCB3b3VuZGVkOworCXVuc2lnbmVkIHNob3J0IGlzX3dhaXRfZGllOwogI2lmZGVmIENPTkZJR19E RUJVR19NVVRFWEVTCiAJdW5zaWduZWQgaW50IGRvbmVfYWNxdWlyZTsKIAlzdHJ1Y3Qgd3dfY2xh c3MgKnd3X2NsYXNzOwpAQCAtNTgsMTcgKzYzLDIxIEBAIHN0cnVjdCB3d19tdXRleCB7CiAjIGRl ZmluZSBfX1dXX0NMQVNTX01VVEVYX0lOSVRJQUxJWkVSKGxvY2tuYW1lLCBjbGFzcykKICNlbmRp ZgogCi0jZGVmaW5lIF9fV1dfQ0xBU1NfSU5JVElBTElaRVIod3dfY2xhc3MpIFwKKyNkZWZpbmUg X19XV19DTEFTU19JTklUSUFMSVpFUih3d19jbGFzcywgX2lzX3dhaXRfZGllKQkgICAgXAogCQl7 IC5zdGFtcCA9IEFUT01JQ19MT05HX0lOSVQoMCkgXAogCQksIC5hY3F1aXJlX25hbWUgPSAjd3df Y2xhc3MgIl9hY3F1aXJlIiBcCi0JCSwgLm11dGV4X25hbWUgPSAjd3dfY2xhc3MgIl9tdXRleCIg fQorCQksIC5tdXRleF9uYW1lID0gI3d3X2NsYXNzICJfbXV0ZXgiIFwKKwkJLCAuaXNfd2FpdF9k aWUgPSBfaXNfd2FpdF9kaWUgfQogCiAjZGVmaW5lIF9fV1dfTVVURVhfSU5JVElBTElaRVIobG9j a25hbWUsIGNsYXNzKSBcCiAJCXsgLmJhc2UgPSAgX19NVVRFWF9JTklUSUFMSVpFUihsb2NrbmFt ZS5iYXNlKSBcCiAJCV9fV1dfQ0xBU1NfTVVURVhfSU5JVElBTElaRVIobG9ja25hbWUsIGNsYXNz KSB9CiAKKyNkZWZpbmUgREVGSU5FX1dEX0NMQVNTKGNsYXNzbmFtZSkgXAorCXN0cnVjdCB3d19j bGFzcyBjbGFzc25hbWUgPSBfX1dXX0NMQVNTX0lOSVRJQUxJWkVSKGNsYXNzbmFtZSwgMSkKKwog I2RlZmluZSBERUZJTkVfV1dfQ0xBU1MoY2xhc3NuYW1lKSBcCi0Jc3RydWN0IHd3X2NsYXNzIGNs YXNzbmFtZSA9IF9fV1dfQ0xBU1NfSU5JVElBTElaRVIoY2xhc3NuYW1lKQorCXN0cnVjdCB3d19j bGFzcyBjbGFzc25hbWUgPSBfX1dXX0NMQVNTX0lOSVRJQUxJWkVSKGNsYXNzbmFtZSwgMCkKIAog I2RlZmluZSBERUZJTkVfV1dfTVVURVgobXV0ZXhuYW1lLCB3d19jbGFzcykgXAogCXN0cnVjdCB3 d19tdXRleCBtdXRleG5hbWUgPSBfX1dXX01VVEVYX0lOSVRJQUxJWkVSKG11dGV4bmFtZSwgd3df Y2xhc3MpCkBAIC0xMjMsNiArMTMyLDggQEAgc3RhdGljIGlubGluZSB2b2lkIHd3X2FjcXVpcmVf aW5pdChzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggKmN0eCwKIAljdHgtPnRhc2sgPSBjdXJyZW50Owog CWN0eC0+c3RhbXAgPSBhdG9taWNfbG9uZ19pbmNfcmV0dXJuX3JlbGF4ZWQoJnd3X2NsYXNzLT5z dGFtcCk7CiAJY3R4LT5hY3F1aXJlZCA9IDA7CisJY3R4LT53b3VuZGVkID0gZmFsc2U7CisJY3R4 LT5pc193YWl0X2RpZSA9IHd3X2NsYXNzLT5pc193YWl0X2RpZTsKICNpZmRlZiBDT05GSUdfREVC VUdfTVVURVhFUwogCWN0eC0+d3dfY2xhc3MgPSB3d19jbGFzczsKIAljdHgtPmRvbmVfYWNxdWly ZSA9IDA7CmRpZmYgLS1naXQgYS9rZXJuZWwvbG9ja2luZy9sb2NrdG9ydHVyZS5jIGIva2VybmVs L2xvY2tpbmcvbG9ja3RvcnR1cmUuYwppbmRleCA2ODUwZmZkNjkxMjUuLjkwN2UwMzI1ODkyYyAx MDA2NDQKLS0tIGEva2VybmVsL2xvY2tpbmcvbG9ja3RvcnR1cmUuYworKysgYi9rZXJuZWwvbG9j a2luZy9sb2NrdG9ydHVyZS5jCkBAIC0zNjUsNyArMzY1LDcgQEAgc3RhdGljIHN0cnVjdCBsb2Nr X3RvcnR1cmVfb3BzIG11dGV4X2xvY2tfb3BzID0gewogfTsKIAogI2luY2x1ZGUgPGxpbnV4L3d3 X211dGV4Lmg+Ci1zdGF0aWMgREVGSU5FX1dXX0NMQVNTKHRvcnR1cmVfd3dfY2xhc3MpOworc3Rh dGljIERFRklORV9XRF9DTEFTUyh0b3J0dXJlX3d3X2NsYXNzKTsKIHN0YXRpYyBERUZJTkVfV1df TVVURVgodG9ydHVyZV93d19tdXRleF8wLCAmdG9ydHVyZV93d19jbGFzcyk7CiBzdGF0aWMgREVG SU5FX1dXX01VVEVYKHRvcnR1cmVfd3dfbXV0ZXhfMSwgJnRvcnR1cmVfd3dfY2xhc3MpOwogc3Rh dGljIERFRklORV9XV19NVVRFWCh0b3J0dXJlX3d3X211dGV4XzIsICZ0b3J0dXJlX3d3X2NsYXNz KTsKZGlmZiAtLWdpdCBhL2tlcm5lbC9sb2NraW5nL211dGV4LmMgYi9rZXJuZWwvbG9ja2luZy9t dXRleC5jCmluZGV4IDQxMmI0ZmMwODIzNS4uNTViNWFjOWJjZTE2IDEwMDY0NAotLS0gYS9rZXJu ZWwvbG9ja2luZy9tdXRleC5jCisrKyBiL2tlcm5lbC9sb2NraW5nL211dGV4LmMKQEAgLTI0OCw2 ICsyNDgsMTEgQEAgRVhQT1JUX1NZTUJPTChtdXRleF9sb2NrKTsKICAqICAgVGhlIG5ld2VyIHRy YW5zYWN0aW9ucyBhcmUga2lsbGVkIHdoZW46CiAgKiAgICAgSXQgKHRoZSBuZXcgdHJhbnNhY3Rp b24pIG1ha2VzIGEgcmVxdWVzdCBmb3IgYSBsb2NrIGJlaW5nIGhlbGQKICAqICAgICBieSBhbiBv bGRlciB0cmFuc2FjdGlvbi4KKyAqCisgKiBXb3VuZC1XYWl0OgorICogICBUaGUgbmV3ZXIgdHJh bnNhY3Rpb25zIGFyZSB3b3VuZGVkIHdoZW46CisgKiAgICAgQW4gb2xkZXIgdHJhbnNhY3Rpb24g bWFrZXMgYSByZXF1ZXN0IGZvciBhIGxvY2sgYmVpbmcgaGVsZCBieQorICogICAgIHRoZSBuZXdl ciB0cmFuc2FjdGlvbi4KICAqLwogCiAvKgpAQCAtMzE5LDYgKzMyNCw5IEBAIHN0YXRpYyBib29s IF9fc2NoZWQKIF9fd3dfbXV0ZXhfZGllKHN0cnVjdCBtdXRleCAqbG9jaywgc3RydWN0IG11dGV4 X3dhaXRlciAqd2FpdGVyLAogCSAgICAgICBzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggKnd3X2N0eCkK IHsKKwlpZiAoIXd3X2N0eC0+aXNfd2FpdF9kaWUpCisJCXJldHVybiBmYWxzZTsKKwogCWlmICh3 YWl0ZXItPnd3X2N0eC0+YWNxdWlyZWQgPiAwICYmCiAJCQlfX3d3X2N0eF9zdGFtcF9hZnRlcih3 YWl0ZXItPnd3X2N0eCwgd3dfY3R4KSkgewogCQlkZWJ1Z19tdXRleF93YWtlX3dhaXRlcihsb2Nr LCB3YWl0ZXIpOwpAQCAtMzI4LDEzICszMzYsNjUgQEAgX193d19tdXRleF9kaWUoc3RydWN0IG11 dGV4ICpsb2NrLCBzdHJ1Y3QgbXV0ZXhfd2FpdGVyICp3YWl0ZXIsCiAJcmV0dXJuIHRydWU7CiB9 CiAKKy8qCisgKiBXb3VuZC1XYWl0OyB3b3VuZCBhIHlvdW5nZXIgQGhvbGRfY3R4IGlmIGl0IGhv bGRzIHRoZSBsb2NrLgorICoKKyAqIFdvdW5kIHRoZSBsb2NrIGhvbGRlciBpZiB0aGVyZSBhcmUg d2FpdGVycyB3aXRoIG9sZGVyIHRyYW5zYWN0aW9ucyB0aGFuCisgKiB0aGUgbG9jayBob2xkZXJz LiBFdmVuIGlmIG11bHRpcGxlIHdhaXRlcnMgbWF5IHdvdW5kIHRoZSBsb2NrIGhvbGRlciwKKyAq IGl0J3Mgc3VmZmljaWVudCB0aGF0IG9ubHkgb25lIGRvZXMuCisgKi8KK3N0YXRpYyBib29sIF9f d3dfbXV0ZXhfd291bmQoc3RydWN0IG11dGV4ICpsb2NrLAorCQkJICAgICBzdHJ1Y3Qgd3dfYWNx dWlyZV9jdHggKnd3X2N0eCwKKwkJCSAgICAgc3RydWN0IHd3X2FjcXVpcmVfY3R4ICpob2xkX2N0 eCkKK3sKKwlzdHJ1Y3QgdGFza19zdHJ1Y3QgKm93bmVyID0gX19tdXRleF9vd25lcihsb2NrKTsK KworCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmxvY2stPndhaXRfbG9jayk7CisKKwkvKgorCSAqIFBv c3NpYmxlIHRocm91Z2ggX193d19tdXRleF9hZGRfd2FpdGVyKCkgd2hlbiB3ZSByYWNlIHdpdGgK KwkgKiB3d19tdXRleF9zZXRfY29udGV4dF9mYXN0cGF0aCgpLiBJbiB0aGF0IGNhc2Ugd2UnbGwg Z2V0IGhlcmUgYWdhaW4KKwkgKiB0aHJvdWdoIF9fd3dfbXV0ZXhfY2hlY2tfd2FpdGVycygpLgor CSAqLworCWlmICghaG9sZF9jdHgpCisJCXJldHVybiBmYWxzZTsKKworCS8qCisJICogQ2FuIGhh dmUgIW93bmVyIGJlY2F1c2Ugb2YgX19tdXRleF91bmxvY2tfc2xvd3BhdGgoKSwgYnV0IGlmIG93 bmVyLAorCSAqIGl0IGNhbm5vdCBnbyBhd2F5IGJlY2F1c2Ugd2UnbGwgaGF2ZSBGTEFHX1dBSVRF UlMgc2V0IGFuZCBob2xkCisJICogd2FpdF9sb2NrLgorCSAqLworCWlmICghb3duZXIpCisJCXJl dHVybiBmYWxzZTsKKworCWlmICh3d19jdHgtPmFjcXVpcmVkID4gMCAmJiBfX3d3X2N0eF9zdGFt cF9hZnRlcihob2xkX2N0eCwgd3dfY3R4KSkgeworCQlob2xkX2N0eC0+d291bmRlZCA9IDE7CisK KwkJLyoKKwkJICogd2FrZV91cF9wcm9jZXNzKCkgcGFpcmVkIHdpdGggc2V0X2N1cnJlbnRfc3Rh dGUoKQorCQkgKiBpbnNlcnRzIHN1ZmZpY2llbnQgYmFycmllcnMgdG8gbWFrZSBzdXJlIEBvd25l ciBlaXRoZXIgc2VlcworCQkgKiBpdCdzIHdvdW5kZWQgaW4gX193d19tdXRleF9sb2NrX2NoZWNr X3N0YW1wKCkgb3IgaGFzIGEKKwkJICogd2FrZXVwIHBlbmRpbmcgdG8gcmUtcmVhZCB0aGUgd291 bmRlZCBzdGF0ZS4KKwkJICovCisJCWlmIChvd25lciAhPSBjdXJyZW50KQorCQkJd2FrZV91cF9w cm9jZXNzKG93bmVyKTsKKworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlyZXR1cm4gZmFsc2U7Cit9 CisKIC8qCiAgKiBXZSBqdXN0IGFjcXVpcmVkIEBsb2NrIHVuZGVyIEB3d19jdHgsIGlmIHRoZXJl IGFyZSBsYXRlciBjb250ZXh0cyB3YWl0aW5nCi0gKiBiZWhpbmQgdXMgb24gdGhlIHdhaXQtbGlz dCwgY2hlY2sgaWYgdGhleSBuZWVkIHRvIGRpZS4KKyAqIGJlaGluZCB1cyBvbiB0aGUgd2FpdC1s aXN0LCBjaGVjayBpZiB0aGV5IG5lZWQgdG8gZGllLCBvciB3b3VuZCB1cy4KICAqCiAgKiBTZWUg X193d19tdXRleF9hZGRfd2FpdGVyKCkgZm9yIHRoZSBsaXN0LW9yZGVyIGNvbnN0cnVjdGlvbjsg YmFzaWNhbGx5IHRoZQogICogbGlzdCBpcyBvcmRlcmVkIGJ5IHN0YW1wLCBzbWFsbGVzdCAob2xk ZXN0KSBmaXJzdC4KICAqCisgKiBUaGlzIHJlbGllcyBvbiBuZXZlciBtaXhpbmcgd2FpdC1kaWUv d291bmQtd2FpdCBvbiB0aGUgc2FtZSB3YWl0LWxpc3Q7CisgKiB3aGljaCBpcyBjdXJyZW50bHkg ZW5zdXJlZCBieSB0aGF0IGJlaW5nIGEgd3dfY2xhc3MgcHJvcGVydHkuCisgKgogICogVGhlIGN1 cnJlbnQgdGFzayBtdXN0IG5vdCBiZSBvbiB0aGUgd2FpdCBsaXN0LgogICovCiBzdGF0aWMgdm9p ZCBfX3NjaGVkCkBAIC0zNDgsNyArNDA4LDggQEAgX193d19tdXRleF9jaGVja193YWl0ZXJzKHN0 cnVjdCBtdXRleCAqbG9jaywgc3RydWN0IHd3X2FjcXVpcmVfY3R4ICp3d19jdHgpCiAJCWlmICgh Y3VyLT53d19jdHgpCiAJCQljb250aW51ZTsKIAotCQlpZiAoX193d19tdXRleF9kaWUobG9jaywg Y3VyLCB3d19jdHgpKQorCQlpZiAoX193d19tdXRleF9kaWUobG9jaywgY3VyLCB3d19jdHgpIHx8 CisJCSAgICBfX3d3X211dGV4X3dvdW5kKGxvY2ssIGN1ci0+d3dfY3R4LCB3d19jdHgpKQogCQkJ YnJlYWs7CiAJfQogfQpAQCAtMzY5LDE3ICs0MzAsMjMgQEAgd3dfbXV0ZXhfc2V0X2NvbnRleHRf ZmFzdHBhdGgoc3RydWN0IHd3X211dGV4ICpsb2NrLCBzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggKmN0 eCkKIAkgKiBhbmQga2VlcCBzcGlubmluZywgb3IgaXQgd2lsbCBhY3F1aXJlIHdhaXRfbG9jaywg YWRkIGl0c2VsZgogCSAqIHRvIHdhaXRlciBsaXN0IGFuZCBzbGVlcC4KIAkgKi8KLQlzbXBfbWIo KTsgLyogXl5eICovCisJc21wX21iKCk7IC8qIFNlZSBjb21tZW50cyBhYm92ZSBhbmQgYmVsb3cu ICovCiAKIAkvKgotCSAqIENoZWNrIGlmIGxvY2sgaXMgY29udGVuZGVkLCBpZiBub3QgdGhlcmUg aXMgbm9ib2R5IHRvIHdha2UgdXAKKwkgKiBbV10gd3ctPmN0eCA9IGN0eAkgICAgW1ddIE1VVEVY X0ZMQUdfV0FJVEVSUworCSAqICAgICBNQgkJICAgICAgICBNQgorCSAqIFtSXSBNVVRFWF9GTEFH X1dBSVRFUlMgICBbUl0gd3ctPmN0eAorCSAqCisJICogVGhlIG1lbW9yeSBiYXJyaWVyIGFib3Zl IHBhaXJzIHdpdGggdGhlIG1lbW9yeSBiYXJyaWVyIGluCisJICogX193d19tdXRleF9hZGRfd2Fp dGVyKCkgYW5kIG1ha2VzIHN1cmUgd2UgZWl0aGVyIG9ic2VydmUgd3ctPmN0eAorCSAqIGFuZC9v ciAhZW1wdHkgbGlzdC4KIAkgKi8KIAlpZiAobGlrZWx5KCEoYXRvbWljX2xvbmdfcmVhZCgmbG9j ay0+YmFzZS5vd25lcikgJiBNVVRFWF9GTEFHX1dBSVRFUlMpKSkKIAkJcmV0dXJuOwogCiAJLyoK IAkgKiBVaCBvaCwgd2UgcmFjZWQgaW4gZmFzdHBhdGgsIGNoZWNrIGlmIGFueSBvZiB0aGUgd2Fp dGVycyBuZWVkIHRvCi0JICogZGllLgorCSAqIGRpZSBvciB3b3VuZCB1cy4KIAkgKi8KIAlzcGlu X2xvY2soJmxvY2stPmJhc2Uud2FpdF9sb2NrKTsKIAlfX3d3X211dGV4X2NoZWNrX3dhaXRlcnMo JmxvY2stPmJhc2UsIGN0eCk7CkBAIC02ODEsNyArNzQ4LDkgQEAgX193d19tdXRleF9raWxsKHN0 cnVjdCBtdXRleCAqbG9jaywgc3RydWN0IHd3X2FjcXVpcmVfY3R4ICp3d19jdHgpCiAKIAogLyoK LSAqIENoZWNrIHdoZXRoZXIgd2UgbmVlZCB0byBraWxsIHRoZSB0cmFuc2FjdGlvbiBmb3IgdGhl IGN1cnJlbnQgbG9jayBhY3F1aXJlLgorICogQ2hlY2sgdGhlIHdvdW5kIGNvbmRpdGlvbiBmb3Ig dGhlIGN1cnJlbnQgbG9jayBhY3F1aXJlLgorICoKKyAqIFdvdW5kLVdhaXQ6IElmIHdlJ3JlIHdv dW5kZWQsIGtpbGwgb3Vyc2VsZi4KICAqCiAgKiBXYWl0LURpZTogSWYgd2UncmUgdHJ5aW5nIHRv IGFjcXVpcmUgYSBsb2NrIGFscmVhZHkgaGVsZCBieSBhbiBvbGRlcgogICogICAgICAgICAgIGNv bnRleHQsIGtpbGwgb3Vyc2VsdmVzLgpAQCAtNzAwLDYgKzc2OSwxMyBAQCBfX3d3X211dGV4X2No ZWNrX2tpbGwoc3RydWN0IG11dGV4ICpsb2NrLCBzdHJ1Y3QgbXV0ZXhfd2FpdGVyICp3YWl0ZXIs CiAJaWYgKGN0eC0+YWNxdWlyZWQgPT0gMCkKIAkJcmV0dXJuIDA7CiAKKwlpZiAoIWN0eC0+aXNf d2FpdF9kaWUpIHsKKwkJaWYgKGN0eC0+d291bmRlZCkKKwkJCXJldHVybiBfX3d3X211dGV4X2tp bGwobG9jaywgY3R4KTsKKworCQlyZXR1cm4gMDsKKwl9CisKIAlpZiAoaG9sZF9jdHggJiYgX193 d19jdHhfc3RhbXBfYWZ0ZXIoY3R4LCBob2xkX2N0eCkpCiAJCXJldHVybiBfX3d3X211dGV4X2tp bGwobG9jaywgY3R4KTsKIApAQCAtNzI2LDcgKzgwMiw4IEBAIF9fd3dfbXV0ZXhfY2hlY2tfa2ls bChzdHJ1Y3QgbXV0ZXggKmxvY2ssIHN0cnVjdCBtdXRleF93YWl0ZXIgKndhaXRlciwKICAqIFdh aXRlcnMgd2l0aG91dCBjb250ZXh0IGFyZSBpbnRlcnNwZXJzZWQgaW4gRklGTyBvcmRlci4KICAq CiAgKiBGdXJ0aGVybW9yZSwgZm9yIFdhaXQtRGllIGtpbGwgb3Vyc2VsZiBpbW1lZGlhdGVseSB3 aGVuIHBvc3NpYmxlICh0aGVyZSBhcmUKLSAqIG9sZGVyIGNvbnRleHRzIGFscmVhZHkgd2FpdGlu ZykgdG8gYXZvaWQgdW5uZWNlc3Nhcnkgd2FpdGluZy4KKyAqIG9sZGVyIGNvbnRleHRzIGFscmVh ZHkgd2FpdGluZykgdG8gYXZvaWQgdW5uZWNlc3Nhcnkgd2FpdGluZyBhbmQgZm9yCisgKiBXb3Vu ZC1XYWl0IGVuc3VyZSB3ZSB3b3VuZCB0aGUgb3duaW5nIGNvbnRleHQgd2hlbiBpdCBpcyB5b3Vu Z2VyLgogICovCiBzdGF0aWMgaW5saW5lIGludCBfX3NjaGVkCiBfX3d3X211dGV4X2FkZF93YWl0 ZXIoc3RydWN0IG11dGV4X3dhaXRlciAqd2FpdGVyLApAQCAtNzM1LDE2ICs4MTIsMjEgQEAgX193 d19tdXRleF9hZGRfd2FpdGVyKHN0cnVjdCBtdXRleF93YWl0ZXIgKndhaXRlciwKIHsKIAlzdHJ1 Y3QgbXV0ZXhfd2FpdGVyICpjdXI7CiAJc3RydWN0IGxpc3RfaGVhZCAqcG9zOworCWJvb2wgaXNf d2FpdF9kaWU7CiAKIAlpZiAoIXd3X2N0eCkgewogCQlsaXN0X2FkZF90YWlsKCZ3YWl0ZXItPmxp c3QsICZsb2NrLT53YWl0X2xpc3QpOwogCQlyZXR1cm4gMDsKIAl9CiAKKwlpc193YWl0X2RpZSA9 IHd3X2N0eC0+aXNfd2FpdF9kaWU7CisKIAkvKgogCSAqIEFkZCB0aGUgd2FpdGVyIGJlZm9yZSB0 aGUgZmlyc3Qgd2FpdGVyIHdpdGggYSBoaWdoZXIgc3RhbXAuCiAJICogV2FpdGVycyB3aXRob3V0 IGEgY29udGV4dCBhcmUgc2tpcHBlZCB0byBhdm9pZCBzdGFydmluZwotCSAqIHRoZW0uIFdhaXQt RGllIHdhaXRlcnMgbWF5IGRpZSBoZXJlLgorCSAqIHRoZW0uIFdhaXQtRGllIHdhaXRlcnMgbWF5 IGRpZSBoZXJlLiBXb3VuZC1XYWl0IHdhaXRlcnMKKwkgKiBuZXZlciBkaWUgaGVyZSwgYnV0IHRo ZXkgYXJlIHNvcnRlZCBpbiBzdGFtcCBvcmRlciBhbmQKKwkgKiBtYXkgd291bmQgdGhlIGxvY2sg aG9sZGVyLgogCSAqLwogCXBvcyA9ICZsb2NrLT53YWl0X2xpc3Q7CiAJbGlzdF9mb3JfZWFjaF9l bnRyeV9yZXZlcnNlKGN1ciwgJmxvY2stPndhaXRfbGlzdCwgbGlzdCkgewpAQCAtNzU3LDEwICs4 MzksMTIgQEAgX193d19tdXRleF9hZGRfd2FpdGVyKHN0cnVjdCBtdXRleF93YWl0ZXIgKndhaXRl ciwKIAkJCSAqIGlzIG5vIHBvaW50IGluIHF1ZXVlaW5nIGJlaGluZCBpdCwgYXMgd2UnZCBoYXZl IHRvCiAJCQkgKiBkaWUgdGhlIG1vbWVudCBpdCB3b3VsZCBhY3F1aXJlIHRoZSBsb2NrLgogCQkJ ICovCi0JCQlpbnQgcmV0ID0gX193d19tdXRleF9raWxsKGxvY2ssIHd3X2N0eCk7CisJCQlpZiAo aXNfd2FpdF9kaWUpIHsKKwkJCQlpbnQgcmV0ID0gX193d19tdXRleF9raWxsKGxvY2ssIHd3X2N0 eCk7CiAKLQkJCWlmIChyZXQpCi0JCQkJcmV0dXJuIHJldDsKKwkJCQlpZiAocmV0KQorCQkJCQly ZXR1cm4gcmV0OworCQkJfQogCiAJCQlicmVhazsKIAkJfQpAQCAtNzcyLDYgKzg1NiwyNSBAQCBf X3d3X211dGV4X2FkZF93YWl0ZXIoc3RydWN0IG11dGV4X3dhaXRlciAqd2FpdGVyLAogCX0KIAog CWxpc3RfYWRkX3RhaWwoJndhaXRlci0+bGlzdCwgcG9zKTsKKwlpZiAoX19tdXRleF93YWl0ZXJf aXNfZmlyc3QobG9jaywgd2FpdGVyKSkKKwkJX19tdXRleF9zZXRfZmxhZyhsb2NrLCBNVVRFWF9G TEFHX1dBSVRFUlMpOworCisJLyoKKwkgKiBXb3VuZC1XYWl0OiBpZiB3ZSdyZSBibG9ja2luZyBv biBhIG11dGV4IG93bmVkIGJ5IGEgeW91bmdlciBjb250ZXh0LAorCSAqIHdvdW5kIHRoYXQgc3Vj aCB0aGF0IHdlIG1pZ2h0IHByb2NlZWQuCisJICovCisJaWYgKCFpc193YWl0X2RpZSkgeworCQlz dHJ1Y3Qgd3dfbXV0ZXggKnd3ID0gY29udGFpbmVyX29mKGxvY2ssIHN0cnVjdCB3d19tdXRleCwg YmFzZSk7CisKKwkJLyoKKwkJICogU2VlIHd3X211dGV4X3NldF9jb250ZXh0X2Zhc3RwYXRoKCku IE9yZGVycyBzZXR0aW5nCisJCSAqIE1VVEVYX0ZMQUdfV0FJVEVSUyAoYXRvbWljIG9wZXJhdGlv bikgdnMgdGhlIHd3LT5jdHggbG9hZCwKKwkJICogc3VjaCB0aGF0IGVpdGhlciB3ZSBvciB0aGUg ZmFzdHBhdGggd2lsbCB3b3VuZCBAd3ctPmN0eC4KKwkJICovCisJCXNtcF9tYl9fYWZ0ZXJfYXRv bWljKCk7CisKKwkJX193d19tdXRleF93b3VuZChsb2NrLCB3d19jdHgsIHd3LT5jdHgpOworCX0K IAogCXJldHVybiAwOwogfQpAQCAtNzk1LDYgKzg5OCwxNCBAQCBfX211dGV4X2xvY2tfY29tbW9u KHN0cnVjdCBtdXRleCAqbG9jaywgbG9uZyBzdGF0ZSwgdW5zaWduZWQgaW50IHN1YmNsYXNzLAog CWlmICh1c2Vfd3dfY3R4ICYmIHd3X2N0eCkgewogCQlpZiAodW5saWtlbHkod3dfY3R4ID09IFJF QURfT05DRSh3dy0+Y3R4KSkpCiAJCQlyZXR1cm4gLUVBTFJFQURZOworCisJCS8qCisJCSAqIFJl c2V0IHRoZSB3b3VuZGVkIGZsYWcgYWZ0ZXIgYSBraWxsLiBObyBvdGhlciBwcm9jZXNzIGNhbgor CQkgKiByYWNlIGFuZCB3b3VuZCB1cyBoZXJlIHNpbmNlIHRoZXkgY2FuJ3QgaGF2ZSBhIHZhbGlk IG93bmVyCisJCSAqIHBvaW50ZXIgaWYgd2UgZG9uJ3QgaGF2ZSBhbnkgbG9ja3MgaGVsZC4KKwkJ ICovCisJCWlmICh3d19jdHgtPmFjcXVpcmVkID09IDApCisJCQl3d19jdHgtPndvdW5kZWQgPSAw OwogCX0KIAogCXByZWVtcHRfZGlzYWJsZSgpOwpAQCAtODI5LDYgKzk0MCw5IEBAIF9fbXV0ZXhf bG9ja19jb21tb24oc3RydWN0IG11dGV4ICpsb2NrLCBsb25nIHN0YXRlLCB1bnNpZ25lZCBpbnQg c3ViY2xhc3MsCiAJaWYgKCF1c2Vfd3dfY3R4KSB7CiAJCS8qIGFkZCB3YWl0aW5nIHRhc2tzIHRv IHRoZSBlbmQgb2YgdGhlIHdhaXRxdWV1ZSAoRklGTyk6ICovCiAJCWxpc3RfYWRkX3RhaWwoJndh aXRlci5saXN0LCAmbG9jay0+d2FpdF9saXN0KTsKKwkJaWYgKF9fbXV0ZXhfd2FpdGVyX2lzX2Zp cnN0KGxvY2ssICZ3YWl0ZXIpKQorCQkJX19tdXRleF9zZXRfZmxhZyhsb2NrLCBNVVRFWF9GTEFH X1dBSVRFUlMpOworCiAKICNpZmRlZiBDT05GSUdfREVCVUdfTVVURVhFUwogCQl3YWl0ZXIud3df Y3R4ID0gTVVURVhfUE9JU09OX1dXX0NUWDsKQEAgLTg0Nyw5ICs5NjEsNiBAQCBfX211dGV4X2xv Y2tfY29tbW9uKHN0cnVjdCBtdXRleCAqbG9jaywgbG9uZyBzdGF0ZSwgdW5zaWduZWQgaW50IHN1 YmNsYXNzLAogCiAJd2FpdGVyLnRhc2sgPSBjdXJyZW50OwogCi0JaWYgKF9fbXV0ZXhfd2FpdGVy X2lzX2ZpcnN0KGxvY2ssICZ3YWl0ZXIpKQotCQlfX211dGV4X3NldF9mbGFnKGxvY2ssIE1VVEVY X0ZMQUdfV0FJVEVSUyk7Ci0KIAlzZXRfY3VycmVudF9zdGF0ZShzdGF0ZSk7CiAJZm9yICg7Oykg ewogCQkvKgpAQCAtOTA2LDYgKzEwMTcsMTUgQEAgX19tdXRleF9sb2NrX2NvbW1vbihzdHJ1Y3Qg bXV0ZXggKmxvY2ssIGxvbmcgc3RhdGUsIHVuc2lnbmVkIGludCBzdWJjbGFzcywKIGFjcXVpcmVk OgogCV9fc2V0X2N1cnJlbnRfc3RhdGUoVEFTS19SVU5OSU5HKTsKIAorCWlmICh1c2Vfd3dfY3R4 ICYmIHd3X2N0eCkgeworCQkvKgorCQkgKiBXb3VuZC1XYWl0OyB3ZSBzdG9sZSB0aGUgbG9jayAo IWZpcnN0X3dhaXRlciksIGNoZWNrIHRoZQorCQkgKiB3YWl0ZXJzIGFzIGFueW9uZSBtaWdodCB3 YW50IHRvIHdvdW5kIHVzLgorCQkgKi8KKwkJaWYgKCF3d19jdHgtPmlzX3dhaXRfZGllICYmICFf X211dGV4X3dhaXRlcl9pc19maXJzdChsb2NrLCAmd2FpdGVyKSkKKwkJCV9fd3dfbXV0ZXhfY2hl Y2tfd2FpdGVycyhsb2NrLCB3d19jdHgpOworCX0KKwogCW11dGV4X3JlbW92ZV93YWl0ZXIobG9j aywgJndhaXRlciwgY3VycmVudCk7CiAJaWYgKGxpa2VseShsaXN0X2VtcHR5KCZsb2NrLT53YWl0 X2xpc3QpKSkKIAkJX19tdXRleF9jbGVhcl9mbGFnKGxvY2ssIE1VVEVYX0ZMQUdTKTsKZGlmZiAt LWdpdCBhL2tlcm5lbC9sb2NraW5nL3Rlc3Qtd3dfbXV0ZXguYyBiL2tlcm5lbC9sb2NraW5nL3Rl c3Qtd3dfbXV0ZXguYwppbmRleCAwZTRjZDY0YWQyYzAuLjViOTE1YjM3MGQ1YSAxMDA2NDQKLS0t IGEva2VybmVsL2xvY2tpbmcvdGVzdC13d19tdXRleC5jCisrKyBiL2tlcm5lbC9sb2NraW5nL3Rl c3Qtd3dfbXV0ZXguYwpAQCAtMjYsNyArMjYsNyBAQAogI2luY2x1ZGUgPGxpbnV4L3NsYWIuaD4K ICNpbmNsdWRlIDxsaW51eC93d19tdXRleC5oPgogCi1zdGF0aWMgREVGSU5FX1dXX0NMQVNTKHd3 X2NsYXNzKTsKK3N0YXRpYyBERUZJTkVfV0RfQ0xBU1Mod3dfY2xhc3MpOwogc3RydWN0IHdvcmtx dWV1ZV9zdHJ1Y3QgKndxOwogCiBzdHJ1Y3QgdGVzdF9tdXRleCB7CmRpZmYgLS1naXQgYS9saWIv bG9ja2luZy1zZWxmdGVzdC5jIGIvbGliL2xvY2tpbmctc2VsZnRlc3QuYwppbmRleCBiNWMxMjkz Y2UxNDcuLjFlMWJiZjE3MWVjYSAxMDA2NDQKLS0tIGEvbGliL2xvY2tpbmctc2VsZnRlc3QuYwor KysgYi9saWIvbG9ja2luZy1zZWxmdGVzdC5jCkBAIC0yOSw3ICsyOSw3IEBACiAgKi8KIHN0YXRp YyB1bnNpZ25lZCBpbnQgZGVidWdfbG9ja3NfdmVyYm9zZTsKIAotc3RhdGljIERFRklORV9XV19D TEFTUyh3d19sb2NrZGVwKTsKK3N0YXRpYyBERUZJTkVfV0RfQ0xBU1Mod3dfbG9ja2RlcCk7CiAK IHN0YXRpYyBpbnQgX19pbml0IHNldHVwX2RlYnVnX2xvY2tzX3ZlcmJvc2UoY2hhciAqc3RyKQog ewotLSAKMi4xNC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwK