From: akash.goel@intel.com Subject: [PATCH 07/18] relay: Use per CPU constructs for the relay channel buffer pointers Date: Thu, 8 Sep 2016 16:09:07 +0530 Message-ID: <1473331158-21082-8-git-send-email-akash.goel@intel.com> References: <1473331158-21082-1-git-send-email-akash.goel@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id C68C1892BF for ; Thu, 8 Sep 2016 10:25:49 +0000 (UTC) In-Reply-To: <1473331158-21082-1-git-send-email-akash.goel@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Akash Goel List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQWthc2ggR29lbCA8YWthc2guZ29lbEBpbnRlbC5jb20+CgpyZWxheSBlc3NlbnRpYWxs eSBuZWVkcyB0byBtYWludGFpbiB0aGUgcGVyIENQVSBhcnJheSBvZiBjaGFubmVsIGJ1ZmZlcgpw b2ludGVycyBidXQgaXQgbWFudWFsbHkgY3JlYXRlcyB0aGF0IGFycmF5LgpJbnN0ZWFkIGl0cyBi ZXR0ZXIgdG8gYXZhaWwgdGhlIHBlciBDUFUgY29uc3RydWN0cywgcHJvdmlkZWQgYnkgdGhlCmtl cm5lbCwgdG8gYWxsb2NhdGUgJiBhY2Nlc3MgdGhlIGFycmF5IG9mIHBvaW50ZXIgdG8gY2hhbm5l bCBidWZmZXJzLgoKVGhpcyBwYXRjaCBpcyBxdWV1ZWQgZm9yIG1lcmdlIGluIGxpbnV4LW5leHQg dmlhIGFrcG0uCgp2MjogSW5jbHVkZSA8bGludXgvcGVyY3B1Lmg+IGluIHJlbGF5Lmggc28gdGhh dCBpdCBwdWxscyBpbiB0aGUgcGVyY3B1CiAgICBhcGkgZXhwbGljaXRseS4gKENocmlzKQoKTGlu azogaHR0cDovL2xrbWwua2VybmVsLm9yZy9yLzE0NzA5MDkxNDAtMjU5MTktMS1naXQtc2VuZC1l bWFpbC1ha2FzaC5nb2VsQGludGVsLmNvbQpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29t PgpTaWduZWQtb2ZmLWJ5OiBBa2FzaCBHb2VsIDxha2FzaC5nb2VsQGludGVsLmNvbT4KUmV2aWV3 ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGluY2x1 ZGUvbGludXgvcmVsYXkuaCB8IDE3ICsrKysrKystLS0tLQoga2VybmVsL3JlbGF5LmMgICAgICAg IHwgNzQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDM5IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvcmVsYXkuaCBiL2luY2x1ZGUvbGludXgvcmVsYXkuaApp bmRleCBkN2M4MzU5Li5lYjI5NWUzIDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L3JlbGF5LmgK KysrIGIvaW5jbHVkZS9saW51eC9yZWxheS5oCkBAIC0xOSw2ICsxOSw3IEBACiAjaW5jbHVkZSA8 bGludXgvZnMuaD4KICNpbmNsdWRlIDxsaW51eC9wb2xsLmg+CiAjaW5jbHVkZSA8bGludXgva3Jl Zi5oPgorI2luY2x1ZGUgPGxpbnV4L3BlcmNwdS5oPgogCiAvKgogICogVHJhY2tzIGNoYW5nZXMg dG8gcmNoYW4vcmNoYW5fYnVmIHN0cnVjdHMKQEAgLTYzLDcgKzY0LDcgQEAgc3RydWN0IHJjaGFu CiAJc3RydWN0IGtyZWYga3JlZjsJCS8qIGNoYW5uZWwgcmVmY291bnQgKi8KIAl2b2lkICpwcml2 YXRlX2RhdGE7CQkvKiBmb3IgdXNlci1kZWZpbmVkIGRhdGEgKi8KIAlzaXplX3QgbGFzdF90b29i aWc7CQkvKiB0cmllZCB0byBsb2cgZXZlbnQgPiBzdWJidWYgc2l6ZSAqLwotCXN0cnVjdCByY2hh bl9idWYgKmJ1ZltOUl9DUFVTXTsgLyogcGVyLWNwdSBjaGFubmVsIGJ1ZmZlcnMgKi8KKwlzdHJ1 Y3QgcmNoYW5fYnVmICoqIF9fcGVyY3B1IGJ1ZjsgLyogcGVyLWNwdSBjaGFubmVsIGJ1ZmZlcnMg Ki8KIAlpbnQgaXNfZ2xvYmFsOwkJCS8qIE9uZSBnbG9iYWwgYnVmZmVyID8gKi8KIAlzdHJ1Y3Qg bGlzdF9oZWFkIGxpc3Q7CQkvKiBmb3IgY2hhbm5lbCBsaXN0ICovCiAJc3RydWN0IGRlbnRyeSAq cGFyZW50OwkJLyogcGFyZW50IGRlbnRyeSBwYXNzZWQgdG8gb3BlbiAqLwpAQCAtMjA0LDcgKzIw NSw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCByZWxheV93cml0ZShzdHJ1Y3QgcmNoYW4gKmNoYW4s CiAJc3RydWN0IHJjaGFuX2J1ZiAqYnVmOwogCiAJbG9jYWxfaXJxX3NhdmUoZmxhZ3MpOwotCWJ1 ZiA9IGNoYW4tPmJ1ZltzbXBfcHJvY2Vzc29yX2lkKCldOworCWJ1ZiA9ICp0aGlzX2NwdV9wdHIo Y2hhbi0+YnVmKTsKIAlpZiAodW5saWtlbHkoYnVmLT5vZmZzZXQgKyBsZW5ndGggPiBjaGFuLT5z dWJidWZfc2l6ZSkpCiAJCWxlbmd0aCA9IHJlbGF5X3N3aXRjaF9zdWJidWYoYnVmLCBsZW5ndGgp OwogCW1lbWNweShidWYtPmRhdGEgKyBidWYtPm9mZnNldCwgZGF0YSwgbGVuZ3RoKTsKQEAgLTIz MCwxMiArMjMxLDEyIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBfX3JlbGF5X3dyaXRlKHN0cnVjdCBy Y2hhbiAqY2hhbiwKIHsKIAlzdHJ1Y3QgcmNoYW5fYnVmICpidWY7CiAKLQlidWYgPSBjaGFuLT5i dWZbZ2V0X2NwdSgpXTsKKwlidWYgPSAqZ2V0X2NwdV9wdHIoY2hhbi0+YnVmKTsKIAlpZiAodW5s aWtlbHkoYnVmLT5vZmZzZXQgKyBsZW5ndGggPiBidWYtPmNoYW4tPnN1YmJ1Zl9zaXplKSkKIAkJ bGVuZ3RoID0gcmVsYXlfc3dpdGNoX3N1YmJ1ZihidWYsIGxlbmd0aCk7CiAJbWVtY3B5KGJ1Zi0+ ZGF0YSArIGJ1Zi0+b2Zmc2V0LCBkYXRhLCBsZW5ndGgpOwogCWJ1Zi0+b2Zmc2V0ICs9IGxlbmd0 aDsKLQlwdXRfY3B1KCk7CisJcHV0X2NwdV9wdHIoY2hhbi0+YnVmKTsKIH0KIAogLyoqCkBAIC0y NTEsMTcgKzI1MiwxOSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgX19yZWxheV93cml0ZShzdHJ1Y3Qg cmNoYW4gKmNoYW4sCiAgKi8KIHN0YXRpYyBpbmxpbmUgdm9pZCAqcmVsYXlfcmVzZXJ2ZShzdHJ1 Y3QgcmNoYW4gKmNoYW4sIHNpemVfdCBsZW5ndGgpCiB7Ci0Jdm9pZCAqcmVzZXJ2ZWQ7Ci0Jc3Ry dWN0IHJjaGFuX2J1ZiAqYnVmID0gY2hhbi0+YnVmW3NtcF9wcm9jZXNzb3JfaWQoKV07CisJdm9p ZCAqcmVzZXJ2ZWQgPSBOVUxMOworCXN0cnVjdCByY2hhbl9idWYgKmJ1ZiA9ICpnZXRfY3B1X3B0 cihjaGFuLT5idWYpOwogCiAJaWYgKHVubGlrZWx5KGJ1Zi0+b2Zmc2V0ICsgbGVuZ3RoID4gYnVm LT5jaGFuLT5zdWJidWZfc2l6ZSkpIHsKIAkJbGVuZ3RoID0gcmVsYXlfc3dpdGNoX3N1YmJ1Zihi dWYsIGxlbmd0aCk7CiAJCWlmICghbGVuZ3RoKQotCQkJcmV0dXJuIE5VTEw7CisJCQlnb3RvIGVu ZDsKIAl9CiAJcmVzZXJ2ZWQgPSBidWYtPmRhdGEgKyBidWYtPm9mZnNldDsKIAlidWYtPm9mZnNl dCArPSBsZW5ndGg7CiAKK2VuZDoKKwlwdXRfY3B1X3B0cihjaGFuLT5idWYpOwogCXJldHVybiBy ZXNlcnZlZDsKIH0KIApkaWZmIC0tZ2l0IGEva2VybmVsL3JlbGF5LmMgYi9rZXJuZWwvcmVsYXku YwppbmRleCBkNzk3NTAyLi5mNTVhYjgyIDEwMDY0NAotLS0gYS9rZXJuZWwvcmVsYXkuYworKysg Yi9rZXJuZWwvcmVsYXkuYwpAQCAtMjE0LDcgKzIxNCw3IEBAIHN0YXRpYyB2b2lkIHJlbGF5X2Rl c3Ryb3lfYnVmKHN0cnVjdCByY2hhbl9idWYgKmJ1ZikKIAkJCV9fZnJlZV9wYWdlKGJ1Zi0+cGFn ZV9hcnJheVtpXSk7CiAJCXJlbGF5X2ZyZWVfcGFnZV9hcnJheShidWYtPnBhZ2VfYXJyYXkpOwog CX0KLQljaGFuLT5idWZbYnVmLT5jcHVdID0gTlVMTDsKKwkqcGVyX2NwdV9wdHIoY2hhbi0+YnVm LCBidWYtPmNwdSkgPSBOVUxMOwogCWtmcmVlKGJ1Zi0+cGFkZGluZyk7CiAJa2ZyZWUoYnVmKTsK IAlrcmVmX3B1dCgmY2hhbi0+a3JlZiwgcmVsYXlfZGVzdHJveV9jaGFubmVsKTsKQEAgLTM4Miwy MCArMzgyLDIxIEBAIHN0YXRpYyB2b2lkIF9fcmVsYXlfcmVzZXQoc3RydWN0IHJjaGFuX2J1ZiAq YnVmLCB1bnNpZ25lZCBpbnQgaW5pdCkKICAqLwogdm9pZCByZWxheV9yZXNldChzdHJ1Y3QgcmNo YW4gKmNoYW4pCiB7CisJc3RydWN0IHJjaGFuX2J1ZiAqYnVmOwogCXVuc2lnbmVkIGludCBpOwog CiAJaWYgKCFjaGFuKQogCQlyZXR1cm47CiAKLQlpZiAoY2hhbi0+aXNfZ2xvYmFsICYmIGNoYW4t PmJ1ZlswXSkgewotCQlfX3JlbGF5X3Jlc2V0KGNoYW4tPmJ1ZlswXSwgMCk7CisJaWYgKGNoYW4t PmlzX2dsb2JhbCAmJiAoYnVmID0gKnBlcl9jcHVfcHRyKGNoYW4tPmJ1ZiwgMCkpKSB7CisJCV9f cmVsYXlfcmVzZXQoYnVmLCAwKTsKIAkJcmV0dXJuOwogCX0KIAogCW11dGV4X2xvY2soJnJlbGF5 X2NoYW5uZWxzX211dGV4KTsKIAlmb3JfZWFjaF9wb3NzaWJsZV9jcHUoaSkKLQkJaWYgKGNoYW4t PmJ1ZltpXSkKLQkJCV9fcmVsYXlfcmVzZXQoY2hhbi0+YnVmW2ldLCAwKTsKKwkJaWYgKChidWYg PSAqcGVyX2NwdV9wdHIoY2hhbi0+YnVmLCBpKSkpCisJCQlfX3JlbGF5X3Jlc2V0KGJ1ZiwgMCk7 CiAJbXV0ZXhfdW5sb2NrKCZyZWxheV9jaGFubmVsc19tdXRleCk7CiB9CiBFWFBPUlRfU1lNQk9M X0dQTChyZWxheV9yZXNldCk7CkBAIC00NDAsNyArNDQxLDcgQEAgc3RhdGljIHN0cnVjdCByY2hh bl9idWYgKnJlbGF5X29wZW5fYnVmKHN0cnVjdCByY2hhbiAqY2hhbiwgdW5zaWduZWQgaW50IGNw dSkKIAlzdHJ1Y3QgZGVudHJ5ICpkZW50cnk7CiAKICAJaWYgKGNoYW4tPmlzX2dsb2JhbCkKLQkJ cmV0dXJuIGNoYW4tPmJ1ZlswXTsKKwkJcmV0dXJuICpwZXJfY3B1X3B0cihjaGFuLT5idWYsIDAp OwogCiAJYnVmID0gcmVsYXlfY3JlYXRlX2J1ZihjaGFuKTsKIAlpZiAoIWJ1ZikKQEAgLTQ2NCw3 ICs0NjUsNyBAQCBzdGF0aWMgc3RydWN0IHJjaGFuX2J1ZiAqcmVsYXlfb3Blbl9idWYoc3RydWN0 IHJjaGFuICpjaGFuLCB1bnNpZ25lZCBpbnQgY3B1KQogIAlfX3JlbGF5X3Jlc2V0KGJ1ZiwgMSk7 CiAKICAJaWYoY2hhbi0+aXNfZ2xvYmFsKSB7Ci0gCQljaGFuLT5idWZbMF0gPSBidWY7CisJCSpw ZXJfY3B1X3B0cihjaGFuLT5idWYsIDApID0gYnVmOwogIAkJYnVmLT5jcHUgPSAwOwogICAJfQog CkBAIC01MjYsMjIgKzUyNywyNCBAQCBzdGF0aWMgaW50IHJlbGF5X2hvdGNwdV9jYWxsYmFjayhz dHJ1Y3Qgbm90aWZpZXJfYmxvY2sgKm5iLAogewogCXVuc2lnbmVkIGludCBob3RjcHUgPSAodW5z aWduZWQgbG9uZyloY3B1OwogCXN0cnVjdCByY2hhbiAqY2hhbjsKKwlzdHJ1Y3QgcmNoYW5fYnVm ICpidWY7CiAKIAlzd2l0Y2goYWN0aW9uKSB7CiAJY2FzZSBDUFVfVVBfUFJFUEFSRToKIAljYXNl IENQVV9VUF9QUkVQQVJFX0ZST1pFTjoKIAkJbXV0ZXhfbG9jaygmcmVsYXlfY2hhbm5lbHNfbXV0 ZXgpOwogCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNoYW4sICZyZWxheV9jaGFubmVscywgbGlzdCkg ewotCQkJaWYgKGNoYW4tPmJ1Zltob3RjcHVdKQorCQkJaWYgKChidWYgPSAqcGVyX2NwdV9wdHIo Y2hhbi0+YnVmLCBob3RjcHUpKSkKIAkJCQljb250aW51ZTsKLQkJCWNoYW4tPmJ1Zltob3RjcHVd ID0gcmVsYXlfb3Blbl9idWYoY2hhbiwgaG90Y3B1KTsKLQkJCWlmKCFjaGFuLT5idWZbaG90Y3B1 XSkgeworCQkJYnVmID0gcmVsYXlfb3Blbl9idWYoY2hhbiwgaG90Y3B1KTsKKwkJCWlmKCFidWYp IHsKIAkJCQlwcmludGsoS0VSTl9FUlIKIAkJCQkJInJlbGF5X2hvdGNwdV9jYWxsYmFjazogY3B1 ICVkIGJ1ZmZlciAiCiAJCQkJCSJjcmVhdGlvbiBmYWlsZWRcbiIsIGhvdGNwdSk7CiAJCQkJbXV0 ZXhfdW5sb2NrKCZyZWxheV9jaGFubmVsc19tdXRleCk7CiAJCQkJcmV0dXJuIG5vdGlmaWVyX2Zy b21fZXJybm8oLUVOT01FTSk7CiAJCQl9CisJCQkqcGVyX2NwdV9wdHIoY2hhbi0+YnVmLCBob3Rj cHUpID0gYnVmOwogCQl9CiAJCW11dGV4X3VubG9jaygmcmVsYXlfY2hhbm5lbHNfbXV0ZXgpOwog CQlicmVhazsKQEAgLTU4Myw2ICs1ODYsNyBAQCBzdHJ1Y3QgcmNoYW4gKnJlbGF5X29wZW4oY29u c3QgY2hhciAqYmFzZV9maWxlbmFtZSwKIHsKIAl1bnNpZ25lZCBpbnQgaTsKIAlzdHJ1Y3QgcmNo YW4gKmNoYW47CisJc3RydWN0IHJjaGFuX2J1ZiAqYnVmOwogCiAJaWYgKCEoc3ViYnVmX3NpemUg JiYgbl9zdWJidWZzKSkKIAkJcmV0dXJuIE5VTEw7CkBAIC01OTMsNiArNTk3LDcgQEAgc3RydWN0 IHJjaGFuICpyZWxheV9vcGVuKGNvbnN0IGNoYXIgKmJhc2VfZmlsZW5hbWUsCiAJaWYgKCFjaGFu KQogCQlyZXR1cm4gTlVMTDsKIAorCWNoYW4tPmJ1ZiA9IGFsbG9jX3BlcmNwdShzdHJ1Y3QgcmNo YW5fYnVmICopOwogCWNoYW4tPnZlcnNpb24gPSBSRUxBWUZTX0NIQU5ORUxfVkVSU0lPTjsKIAlj aGFuLT5uX3N1YmJ1ZnMgPSBuX3N1YmJ1ZnM7CiAJY2hhbi0+c3ViYnVmX3NpemUgPSBzdWJidWZf c2l6ZTsKQEAgLTYwOCw5ICs2MTMsMTAgQEAgc3RydWN0IHJjaGFuICpyZWxheV9vcGVuKGNvbnN0 IGNoYXIgKmJhc2VfZmlsZW5hbWUsCiAKIAltdXRleF9sb2NrKCZyZWxheV9jaGFubmVsc19tdXRl eCk7CiAJZm9yX2VhY2hfb25saW5lX2NwdShpKSB7Ci0JCWNoYW4tPmJ1ZltpXSA9IHJlbGF5X29w ZW5fYnVmKGNoYW4sIGkpOwotCQlpZiAoIWNoYW4tPmJ1ZltpXSkKKwkJYnVmID0gcmVsYXlfb3Bl bl9idWYoY2hhbiwgaSk7CisJCWlmICghYnVmKQogCQkJZ290byBmcmVlX2J1ZnM7CisJCSpwZXJf Y3B1X3B0cihjaGFuLT5idWYsIGkpID0gYnVmOwogCX0KIAlsaXN0X2FkZCgmY2hhbi0+bGlzdCwg JnJlbGF5X2NoYW5uZWxzKTsKIAltdXRleF91bmxvY2soJnJlbGF5X2NoYW5uZWxzX211dGV4KTsK QEAgLTYxOSw4ICs2MjUsOCBAQCBzdHJ1Y3QgcmNoYW4gKnJlbGF5X29wZW4oY29uc3QgY2hhciAq YmFzZV9maWxlbmFtZSwKIAogZnJlZV9idWZzOgogCWZvcl9lYWNoX3Bvc3NpYmxlX2NwdShpKSB7 Ci0JCWlmIChjaGFuLT5idWZbaV0pCi0JCQlyZWxheV9jbG9zZV9idWYoY2hhbi0+YnVmW2ldKTsK KwkJaWYgKChidWYgPSAqcGVyX2NwdV9wdHIoY2hhbi0+YnVmLCBpKSkpCisJCQlyZWxheV9jbG9z ZV9idWYoYnVmKTsKIAl9CiAKIAlrcmVmX3B1dCgmY2hhbi0+a3JlZiwgcmVsYXlfZGVzdHJveV9j aGFubmVsKTsKQEAgLTY2Niw2ICs2NzIsNyBAQCBpbnQgcmVsYXlfbGF0ZV9zZXR1cF9maWxlcyhz dHJ1Y3QgcmNoYW4gKmNoYW4sCiAJdW5zaWduZWQgaW50IGksIGN1cnJfY3B1OwogCXVuc2lnbmVk IGxvbmcgZmxhZ3M7CiAJc3RydWN0IGRlbnRyeSAqZGVudHJ5OworCXN0cnVjdCByY2hhbl9idWYg KmJ1ZjsKIAlzdHJ1Y3QgcmNoYW5fcGVyY3B1X2J1Zl9kaXNwYXRjaGVyIGRpc3A7CiAKIAlpZiAo IWNoYW4gfHwgIWJhc2VfZmlsZW5hbWUpCkBAIC02ODQsMTAgKzY5MSwxMSBAQCBpbnQgcmVsYXlf bGF0ZV9zZXR1cF9maWxlcyhzdHJ1Y3QgcmNoYW4gKmNoYW4sCiAKIAlpZiAoY2hhbi0+aXNfZ2xv YmFsKSB7CiAJCWVyciA9IC1FSU5WQUw7Ci0JCWlmICghV0FSTl9PTl9PTkNFKCFjaGFuLT5idWZb MF0pKSB7Ci0JCQlkZW50cnkgPSByZWxheV9jcmVhdGVfYnVmX2ZpbGUoY2hhbiwgY2hhbi0+YnVm WzBdLCAwKTsKKwkJYnVmID0gKnBlcl9jcHVfcHRyKGNoYW4tPmJ1ZiwgMCk7CisJCWlmICghV0FS Tl9PTl9PTkNFKCFidWYpKSB7CisJCQlkZW50cnkgPSByZWxheV9jcmVhdGVfYnVmX2ZpbGUoY2hh biwgYnVmLCAwKTsKIAkJCWlmIChkZW50cnkgJiYgIVdBUk5fT05fT05DRSghY2hhbi0+aXNfZ2xv YmFsKSkgewotCQkJCXJlbGF5X3NldF9idWZfZGVudHJ5KGNoYW4tPmJ1ZlswXSwgZGVudHJ5KTsK KwkJCQlyZWxheV9zZXRfYnVmX2RlbnRyeShidWYsIGRlbnRyeSk7CiAJCQkJZXJyID0gMDsKIAkJ CX0KIAkJfQpAQCAtNzAyLDEzICs3MTAsMTQgQEAgaW50IHJlbGF5X2xhdGVfc2V0dXBfZmlsZXMo c3RydWN0IHJjaGFuICpjaGFuLAogCSAqIG9uIGFsbCBjdXJyZW50bHkgb25saW5lIENQVXMuCiAJ ICovCiAJZm9yX2VhY2hfb25saW5lX2NwdShpKSB7Ci0JCWlmICh1bmxpa2VseSghY2hhbi0+YnVm W2ldKSkgeworCQlidWYgPSAqcGVyX2NwdV9wdHIoY2hhbi0+YnVmLCBpKTsKKwkJaWYgKHVubGlr ZWx5KCFidWYpKSB7CiAJCQlXQVJOX09OQ0UoMSwgS0VSTl9FUlIgIkNQVSBoYXMgbm8gYnVmZmVy IVxuIik7CiAJCQllcnIgPSAtRUlOVkFMOwogCQkJYnJlYWs7CiAJCX0KIAotCQlkZW50cnkgPSBy ZWxheV9jcmVhdGVfYnVmX2ZpbGUoY2hhbiwgY2hhbi0+YnVmW2ldLCBpKTsKKwkJZGVudHJ5ID0g cmVsYXlfY3JlYXRlX2J1Zl9maWxlKGNoYW4sIGJ1ZiwgaSk7CiAJCWlmICh1bmxpa2VseSghZGVu dHJ5KSkgewogCQkJZXJyID0gLUVJTlZBTDsKIAkJCWJyZWFrOwpAQCAtNzE2LDEwICs3MjUsMTAg QEAgaW50IHJlbGF5X2xhdGVfc2V0dXBfZmlsZXMoc3RydWN0IHJjaGFuICpjaGFuLAogCiAJCWlm IChjdXJyX2NwdSA9PSBpKSB7CiAJCQlsb2NhbF9pcnFfc2F2ZShmbGFncyk7Ci0JCQlyZWxheV9z ZXRfYnVmX2RlbnRyeShjaGFuLT5idWZbaV0sIGRlbnRyeSk7CisJCQlyZWxheV9zZXRfYnVmX2Rl bnRyeShidWYsIGRlbnRyeSk7CiAJCQlsb2NhbF9pcnFfcmVzdG9yZShmbGFncyk7CiAJCX0gZWxz ZSB7Ci0JCQlkaXNwLmJ1ZiA9IGNoYW4tPmJ1ZltpXTsKKwkJCWRpc3AuYnVmID0gYnVmOwogCQkJ ZGlzcC5kZW50cnkgPSBkZW50cnk7CiAJCQlzbXBfbWIoKTsKIAkJCS8qIHJlbGF5X2NoYW5uZWxz X211dGV4IG11c3QgYmUgaGVsZCwgc28gd2FpdC4gKi8KQEAgLTgyMiwxMSArODMxLDEwIEBAIHZv aWQgcmVsYXlfc3ViYnVmc19jb25zdW1lZChzdHJ1Y3QgcmNoYW4gKmNoYW4sCiAJaWYgKCFjaGFu KQogCQlyZXR1cm47CiAKLQlpZiAoY3B1ID49IE5SX0NQVVMgfHwgIWNoYW4tPmJ1ZltjcHVdIHx8 Ci0JCQkJCXN1YmJ1ZnNfY29uc3VtZWQgPiBjaGFuLT5uX3N1YmJ1ZnMpCisJYnVmID0gKnBlcl9j cHVfcHRyKGNoYW4tPmJ1ZiwgY3B1KTsKKwlpZiAoY3B1ID49IE5SX0NQVVMgfHwgIWJ1ZiB8fCBz dWJidWZzX2NvbnN1bWVkID4gY2hhbi0+bl9zdWJidWZzKQogCQlyZXR1cm47CiAKLQlidWYgPSBj aGFuLT5idWZbY3B1XTsKIAlpZiAoc3ViYnVmc19jb25zdW1lZCA+IGJ1Zi0+c3ViYnVmc19wcm9k dWNlZCAtIGJ1Zi0+c3ViYnVmc19jb25zdW1lZCkKIAkJYnVmLT5zdWJidWZzX2NvbnN1bWVkID0g YnVmLT5zdWJidWZzX3Byb2R1Y2VkOwogCWVsc2UKQEAgLTg0MiwxOCArODUwLDE5IEBAIEVYUE9S VF9TWU1CT0xfR1BMKHJlbGF5X3N1YmJ1ZnNfY29uc3VtZWQpOwogICovCiB2b2lkIHJlbGF5X2Ns b3NlKHN0cnVjdCByY2hhbiAqY2hhbikKIHsKKwlzdHJ1Y3QgcmNoYW5fYnVmICpidWY7CiAJdW5z aWduZWQgaW50IGk7CiAKIAlpZiAoIWNoYW4pCiAJCXJldHVybjsKIAogCW11dGV4X2xvY2soJnJl bGF5X2NoYW5uZWxzX211dGV4KTsKLQlpZiAoY2hhbi0+aXNfZ2xvYmFsICYmIGNoYW4tPmJ1Zlsw XSkKLQkJcmVsYXlfY2xvc2VfYnVmKGNoYW4tPmJ1ZlswXSk7CisJaWYgKGNoYW4tPmlzX2dsb2Jh bCAmJiAoYnVmID0gKnBlcl9jcHVfcHRyKGNoYW4tPmJ1ZiwgMCkpKQorCQlyZWxheV9jbG9zZV9i dWYoYnVmKTsKIAllbHNlCiAJCWZvcl9lYWNoX3Bvc3NpYmxlX2NwdShpKQotCQkJaWYgKGNoYW4t PmJ1ZltpXSkKLQkJCQlyZWxheV9jbG9zZV9idWYoY2hhbi0+YnVmW2ldKTsKKwkJCWlmICgoYnVm ID0gKnBlcl9jcHVfcHRyKGNoYW4tPmJ1ZiwgaSkpKQorCQkJCXJlbGF5X2Nsb3NlX2J1ZihidWYp OwogCiAJaWYgKGNoYW4tPmxhc3RfdG9vYmlnKQogCQlwcmludGsoS0VSTl9XQVJOSU5HICJyZWxh eTogb25lIG9yIG1vcmUgaXRlbXMgbm90IGxvZ2dlZCAiCkBAIC04NzQsMjAgKzg4MywyMSBAQCBF WFBPUlRfU1lNQk9MX0dQTChyZWxheV9jbG9zZSk7CiAgKi8KIHZvaWQgcmVsYXlfZmx1c2goc3Ry dWN0IHJjaGFuICpjaGFuKQogeworCXN0cnVjdCByY2hhbl9idWYgKmJ1ZjsKIAl1bnNpZ25lZCBp bnQgaTsKIAogCWlmICghY2hhbikKIAkJcmV0dXJuOwogCi0JaWYgKGNoYW4tPmlzX2dsb2JhbCAm JiBjaGFuLT5idWZbMF0pIHsKLQkJcmVsYXlfc3dpdGNoX3N1YmJ1ZihjaGFuLT5idWZbMF0sIDAp OworCWlmIChjaGFuLT5pc19nbG9iYWwgJiYgKGJ1ZiA9ICpwZXJfY3B1X3B0cihjaGFuLT5idWYs IDApKSkgeworCQlyZWxheV9zd2l0Y2hfc3ViYnVmKGJ1ZiwgMCk7CiAJCXJldHVybjsKIAl9CiAK IAltdXRleF9sb2NrKCZyZWxheV9jaGFubmVsc19tdXRleCk7CiAJZm9yX2VhY2hfcG9zc2libGVf Y3B1KGkpCi0JCWlmIChjaGFuLT5idWZbaV0pCi0JCQlyZWxheV9zd2l0Y2hfc3ViYnVmKGNoYW4t PmJ1ZltpXSwgMCk7CisJCWlmICgoYnVmID0gKnBlcl9jcHVfcHRyKGNoYW4tPmJ1ZiwgaSkpKQor CQkJcmVsYXlfc3dpdGNoX3N1YmJ1ZihidWYsIDApOwogCW11dGV4X3VubG9jaygmcmVsYXlfY2hh bm5lbHNfbXV0ZXgpOwogfQogRVhQT1JUX1NZTUJPTF9HUEwocmVsYXlfZmx1c2gpOwotLSAKMS45 LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=