Return-path: Received: from mail-ed1-f66.google.com ([209.85.208.66]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1glwvy-00051O-9F for ath10k@lists.infradead.org; Tue, 22 Jan 2019 14:21:48 +0000 Received: by mail-ed1-f66.google.com with SMTP id f9so19409039eds.10 for ; Tue, 22 Jan 2019 06:21:45 -0800 (PST) From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Subject: [PATCH v6 2/4] ath9k: Switch to mac80211 TXQ scheduling and airtime APIs Date: Tue, 22 Jan 2019 15:20:17 +0100 Message-Id: <20190122142019.21417-3-toke@redhat.com> In-Reply-To: <20190122142019.21417-1-toke@redhat.com> References: <20190122142019.21417-1-toke@redhat.com> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "ath10k" Errors-To: ath10k-bounces+kvalo=adurom.com@lists.infradead.org To: linux-wireless@vger.kernel.org Cc: make-wifi-fast@lists.bufferbloat.net, =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , ath10k@lists.infradead.org, Rajkumar Manoharan RnJvbTogVG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2VuIDx0b2tlQHRva2UuZGs+CgpUaGlzIG1vdmVz IHRoZSBhdGg5ayBkcml2ZXIgdG8gdXNlIHRoZSBtYWM4MDIxMSBUWFEgc2NoZWR1bGluZyBhbmQK YWlydGltZSBhY2NvdW50aW5nIEFQSXMsIHJlbW92aW5nIHRoZSBjb3JyZXNwb25kaW5nIHN0YXRl IHRyYWNraW5nCmluc2lkZSB0aGUgZHJpdmVyLgoKU2lnbmVkLW9mZi1ieTogVG9rZSBIw7hpbGFu ZC1Kw7hyZ2Vuc2VuIDx0b2tlQHRva2UuZGs+CltybWFub2hhckBjb2RlYXVyb3JhLm9yZzogZml4 ZWQgY2hlY2twYXRjaCBlcnJvciBhbmQgd2FybmluZ3NdClNpZ25lZC1vZmYtYnk6IFJhamt1bWFy IE1hbm9oYXJhbiA8cm1hbm9oYXJAY29kZWF1cm9yYS5vcmc+Ci0tLQp2NjoKICAtIFVzZSB0aGUg aWVlZTgwMjExX3NjaGVkdWxlX3R4cSgpIGZ1bmN0aW9uIGludHJvZHVjZWQgaW4gdGhlIHByZXZp b3VzIHBhdGNoCiAgICBpbnN0ZWFkIG9mIGNhbGxpbmcgaWVlZTgwMjExX3JldHVybl90eHEoKSB3 aXRoIG5vIGxvY2tpbmcuICAKCiBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvYXRoOWsu aCAgICAgfCAgMTQgLS0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg5ay9kZWJ1Zy5jICAg ICB8ICAgMyAtCiBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvZGVidWcuaCAgICAgfCAg IDggLQogZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL2RlYnVnX3N0YS5jIHwgIDcwIC0t LS0tLQogZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL2luaXQuYyAgICAgIHwgICAzICst CiBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvcmVjdi5jICAgICAgfCAgIDkgKy0KIGRy aXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg5ay94bWl0LmMgICAgICB8IDI0NCArKysrKystLS0t LS0tLS0tLS0tLS0KIDcgZmlsZXMgY2hhbmdlZCwgNzUgaW5zZXJ0aW9ucygrKSwgMjc2IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg5ay9hdGg5 ay5oIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL2F0aDlrLmgKaW5kZXggMGZjYTQ0 ZTkxYTcxLi5hNDEyYjM1MjE4MmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0 aC9hdGg5ay9hdGg5ay5oCisrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg5ay9hdGg5 ay5oCkBAIC0xMTIsOCArMTEyLDYgQEAgaW50IGF0aF9kZXNjZG1hX3NldHVwKHN0cnVjdCBhdGhf c29mdGMgKnNjLCBzdHJ1Y3QgYXRoX2Rlc2NkbWEgKmRkLAogI2RlZmluZSBBVEhfVFhGSUZPX0RF UFRIICAgICAgICAgICA4CiAjZGVmaW5lIEFUSF9UWF9FUlJPUiAgICAgICAgICAgICAgIDB4MDEK IAotI2RlZmluZSBBVEhfQUlSVElNRV9RVUFOVFVNICAgICAgICAzMDAgLyogdXNlYyAqLwotCiAv KiBTdG9wIHR4IHRyYWZmaWMgMW1zIGJlZm9yZSB0aGUgR08gZ29lcyBhd2F5ICovCiAjZGVmaW5l IEFUSF9QMlBfUFNfU1RPUF9USU1FICAgICAgIDEwMDAKIApAQCAtMjQ2LDEwICsyNDQsOCBAQCBz dHJ1Y3QgYXRoX2F0eF90aWQgewogCXM4IGJhcl9pbmRleDsKIAlib29sIGFjdGl2ZTsKIAlib29s IGNsZWFyX3BzX2ZpbHRlcjsKLQlib29sIGhhc19xdWV1ZWQ7CiB9OwogCi12b2lkIF9fYXRoX3R4 X3F1ZXVlX3RpZChzdHJ1Y3QgYXRoX3NvZnRjICpzYywgc3RydWN0IGF0aF9hdHhfdGlkICp0aWQp Owogdm9pZCBhdGhfdHhfcXVldWVfdGlkKHN0cnVjdCBhdGhfc29mdGMgKnNjLCBzdHJ1Y3QgYXRo X2F0eF90aWQgKnRpZCk7CiAKIHN0cnVjdCBhdGhfbm9kZSB7CkBAIC0yNjMsMTIgKzI1OSw5IEBA IHN0cnVjdCBhdGhfbm9kZSB7CiAKIAlib29sIHNsZWVwaW5nOwogCWJvb2wgbm9fcHNfZmlsdGVy OwotCXM2NCBhaXJ0aW1lX2RlZmljaXRbSUVFRTgwMjExX05VTV9BQ1NdOwotCXUzMiBhaXJ0aW1l X3J4X3N0YXJ0OwogCiAjaWZkZWYgQ09ORklHX0FUSDlLX1NUQVRJT05fU1RBVElTVElDUwogCXN0 cnVjdCBhdGhfcnhfcmF0ZV9zdGF0cyByeF9yYXRlX3N0YXRzOwotCXN0cnVjdCBhdGhfYWlydGlt ZV9zdGF0cyBhaXJ0aW1lX3N0YXRzOwogI2VuZGlmCiAJdTgga2V5X2lkeFs0XTsKIApAQCAtOTg2 LDExICs5NzksNiBAQCB2b2lkIGF0aF9hbnRfY29tYl9zY2FuKHN0cnVjdCBhdGhfc29mdGMgKnNj LCBzdHJ1Y3QgYXRoX3J4X3N0YXR1cyAqcnMpOwogCiAjZGVmaW5lIEFUSDlLX05VTV9DSEFOQ1RY ICAyIC8qIHN1cHBvcnRzIDIgb3BlcmF0aW5nIGNoYW5uZWxzICovCiAKLSNkZWZpbmUgQUlSVElN RV9VU0VfVFgJCUJJVCgwKQotI2RlZmluZSBBSVJUSU1FX1VTRV9SWAkJQklUKDEpCi0jZGVmaW5l IEFJUlRJTUVfVVNFX05FV19RVUVVRVMJQklUKDIpCi0jZGVmaW5lIEFJUlRJTUVfQUNUSVZFKGZs YWdzKSAoISEoZmxhZ3MgJiAoQUlSVElNRV9VU0VfVFh8QUlSVElNRV9VU0VfUlgpKSkKLQogc3Ry dWN0IGF0aF9zb2Z0YyB7CiAJc3RydWN0IGllZWU4MDIxMV9odyAqaHc7CiAJc3RydWN0IGRldmlj ZSAqZGV2OwpAQCAtMTAzNCw4ICsxMDIyLDYgQEAgc3RydWN0IGF0aF9zb2Z0YyB7CiAJc2hvcnQg bmJjbnZpZnM7CiAJdW5zaWduZWQgbG9uZyBwc191c2Vjb3VudDsKIAotCXUxNiBhaXJ0aW1lX2Zs YWdzOyAvKiBBSVJUSU1FXyogKi8KLQogCXN0cnVjdCBhdGhfcnggcng7CiAJc3RydWN0IGF0aF90 eCB0eDsKIAlzdHJ1Y3QgYXRoX2JlYWNvbiBiZWFjb247CmRpZmYgLS1naXQgYS9kcml2ZXJzL25l dC93aXJlbGVzcy9hdGgvYXRoOWsvZGVidWcuYyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9h dGg5ay9kZWJ1Zy5jCmluZGV4IDQzOTllOWFkMDU4Zi4uMGRmZWE1ZDZlOTQ5IDEwMDY0NAotLS0g YS9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvZGVidWcuYworKysgYi9kcml2ZXJzL25l dC93aXJlbGVzcy9hdGgvYXRoOWsvZGVidWcuYwpAQCAtMTQ0Myw5ICsxNDQzLDYgQEAgaW50IGF0 aDlrX2luaXRfZGVidWcoc3RydWN0IGF0aF9odyAqYWgpCiAjZW5kaWYKIAlkZWJ1Z2ZzX2NyZWF0 ZV9maWxlKCJ0cGMiLCAwNjAwLCBzYy0+ZGVidWcuZGVidWdmc19waHksIHNjLCAmZm9wc190cGMp OwogCi0JZGVidWdmc19jcmVhdGVfdTE2KCJhaXJ0aW1lX2ZsYWdzIiwgMDYwMCwKLQkJCSAgIHNj LT5kZWJ1Zy5kZWJ1Z2ZzX3BoeSwgJnNjLT5haXJ0aW1lX2ZsYWdzKTsKLQogCWRlYnVnZnNfY3Jl YXRlX2ZpbGUoIm5mX292ZXJyaWRlIiwgMDYwMCwKIAkJCSAgICBzYy0+ZGVidWcuZGVidWdmc19w aHksIHNjLCAmZm9wc19uZl9vdmVycmlkZSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dp cmVsZXNzL2F0aC9hdGg5ay9kZWJ1Zy5oIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlr L2RlYnVnLmgKaW5kZXggNzk2MDdkYjE0Mzg3Li4zMzgyNmFhMTM2ODcgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg5ay9kZWJ1Zy5oCisrKyBiL2RyaXZlcnMvbmV0L3dp cmVsZXNzL2F0aC9hdGg5ay9kZWJ1Zy5oCkBAIC0zMTksMjAgKzMxOSwxMiBAQCBhdGg5a19kZWJ1 Z19zeW5jX2NhdXNlKHN0cnVjdCBhdGhfc29mdGMgKnNjLCB1MzIgc3luY19jYXVzZSkKIHZvaWQg YXRoX2RlYnVnX3JhdGVfc3RhdHMoc3RydWN0IGF0aF9zb2Z0YyAqc2MsCiAJCQkgIHN0cnVjdCBh dGhfcnhfc3RhdHVzICpycywKIAkJCSAgc3RydWN0IHNrX2J1ZmYgKnNrYik7Ci12b2lkIGF0aF9k ZWJ1Z19haXJ0aW1lKHN0cnVjdCBhdGhfc29mdGMgKnNjLAotCQkgICAgICAgc3RydWN0IGF0aF9u b2RlICphbiwKLQkJICAgICAgIHUzMiByeCwgdTMyIHR4KTsKICNlbHNlCiBzdGF0aWMgaW5saW5l IHZvaWQgYXRoX2RlYnVnX3JhdGVfc3RhdHMoc3RydWN0IGF0aF9zb2Z0YyAqc2MsCiAJCQkJCXN0 cnVjdCBhdGhfcnhfc3RhdHVzICpycywKIAkJCQkJc3RydWN0IHNrX2J1ZmYgKnNrYikKIHsKIH0K LXN0YXRpYyBpbmxpbmUgdm9pZCBhdGhfZGVidWdfYWlydGltZShzdHJ1Y3QgYXRoX3NvZnRjICpz YywKLQkJCSAgICAgIHN0cnVjdCBhdGhfbm9kZSAqYW4sCi0JCQkgICAgICB1MzIgcngsIHUzMiB0 eCkKLXsKLX0KICNlbmRpZiAvKiBDT05GSUdfQVRIOUtfU1RBVElPTl9TVEFUSVNUSUNTICovCiAK ICNlbmRpZiAvKiBERUJVR19IICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9h dGgvYXRoOWsvZGVidWdfc3RhLmMgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvZGVi dWdfc3RhLmMKaW5kZXggZThmY2QzZTFjNDcwLi5kOTVjYWJkZGNlMzMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg5ay9kZWJ1Z19zdGEuYworKysgYi9kcml2ZXJzL25l dC93aXJlbGVzcy9hdGgvYXRoOWsvZGVidWdfc3RhLmMKQEAgLTI0Miw3NSArMjQyLDYgQEAgc3Rh dGljIGNvbnN0IHN0cnVjdCBmaWxlX29wZXJhdGlvbnMgZm9wc19ub2RlX3JlY3YgPSB7CiAJLmxs c2VlayA9IGRlZmF1bHRfbGxzZWVrLAogfTsKIAotdm9pZCBhdGhfZGVidWdfYWlydGltZShzdHJ1 Y3QgYXRoX3NvZnRjICpzYywKLQkJc3RydWN0IGF0aF9ub2RlICphbiwKLQkJdTMyIHJ4LAotCQl1 MzIgdHgpCi17Ci0Jc3RydWN0IGF0aF9haXJ0aW1lX3N0YXRzICphc3RhdHMgPSAmYW4tPmFpcnRp bWVfc3RhdHM7Ci0KLQlhc3RhdHMtPnJ4X2FpcnRpbWUgKz0gcng7Ci0JYXN0YXRzLT50eF9haXJ0 aW1lICs9IHR4OwotfQotCi1zdGF0aWMgc3NpemVfdCByZWFkX2FpcnRpbWUoc3RydWN0IGZpbGUg KmZpbGUsIGNoYXIgX191c2VyICp1c2VyX2J1ZiwKLQkJCXNpemVfdCBjb3VudCwgbG9mZl90ICpw cG9zKQotewotCXN0cnVjdCBhdGhfbm9kZSAqYW4gPSBmaWxlLT5wcml2YXRlX2RhdGE7Ci0Jc3Ry dWN0IGF0aF9haXJ0aW1lX3N0YXRzICphc3RhdHM7Ci0Jc3RhdGljIGNvbnN0IGNoYXIgKnFuYW1l WzRdID0gewotCQkiVk8iLCAiVkkiLCAiQkUiLCAiQksiCi0JfTsKLQl1MzIgbGVuID0gMCwgc2l6 ZSA9IDI1NjsKLQljaGFyICpidWY7Ci0Jc2l6ZV90IHJldHZhbDsKLQlpbnQgaTsKLQotCWJ1ZiA9 IGt6YWxsb2Moc2l6ZSwgR0ZQX0tFUk5FTCk7Ci0JaWYgKGJ1ZiA9PSBOVUxMKQotCQlyZXR1cm4g LUVOT01FTTsKLQotCWFzdGF0cyA9ICZhbi0+YWlydGltZV9zdGF0czsKLQotCWxlbiArPSBzY25w cmludGYoYnVmICsgbGVuLCBzaXplIC0gbGVuLCAiUlg6ICV1IHVzXG4iLCBhc3RhdHMtPnJ4X2Fp cnRpbWUpOwotCWxlbiArPSBzY25wcmludGYoYnVmICsgbGVuLCBzaXplIC0gbGVuLCAiVFg6ICV1 IHVzXG4iLCBhc3RhdHMtPnR4X2FpcnRpbWUpOwotCWxlbiArPSBzY25wcmludGYoYnVmICsgbGVu LCBzaXplIC0gbGVuLCAiRGVmaWNpdDogIik7Ci0JZm9yIChpID0gMDsgaSA8IDQ7IGkrKykKLQkJ bGVuICs9IHNjbnByaW50ZihidWYrbGVuLCBzaXplIC0gbGVuLCAiJXM6ICVsbGQgdXMgIiwgcW5h bWVbaV0sIGFuLT5haXJ0aW1lX2RlZmljaXRbaV0pOwotCWlmIChsZW4gPCBzaXplKQotCQlidWZb bGVuKytdID0gJ1xuJzsKLQotCXJldHZhbCA9IHNpbXBsZV9yZWFkX2Zyb21fYnVmZmVyKHVzZXJf YnVmLCBjb3VudCwgcHBvcywgYnVmLCBsZW4pOwotCWtmcmVlKGJ1Zik7Ci0KLQlyZXR1cm4gcmV0 dmFsOwotfQotCi1zdGF0aWMgc3NpemVfdAotd3JpdGVfYWlydGltZV9yZXNldF9zdHViKHN0cnVj dCBmaWxlICpmaWxlLCBjb25zdCBjaGFyIF9fdXNlciAqdWJ1ZiwKLQkJICAgc2l6ZV90IGNvdW50 LCBsb2ZmX3QgKnBwb3MpCi17Ci0Jc3RydWN0IGF0aF9ub2RlICphbiA9IGZpbGUtPnByaXZhdGVf ZGF0YTsKLQlzdHJ1Y3QgYXRoX2FpcnRpbWVfc3RhdHMgKmFzdGF0czsKLQlpbnQgaTsKLQotCWFz dGF0cyA9ICZhbi0+YWlydGltZV9zdGF0czsKLQlhc3RhdHMtPnJ4X2FpcnRpbWUgPSAwOwotCWFz dGF0cy0+dHhfYWlydGltZSA9IDA7Ci0JZm9yIChpID0gMDsgaSA8IDQ7IGkrKykKLQkJYW4tPmFp cnRpbWVfZGVmaWNpdFtpXSA9IEFUSF9BSVJUSU1FX1FVQU5UVU07Ci0JcmV0dXJuIGNvdW50Owot fQotCi1zdGF0aWMgY29uc3Qgc3RydWN0IGZpbGVfb3BlcmF0aW9ucyBmb3BzX2FpcnRpbWUgPSB7 Ci0JLnJlYWQgPSByZWFkX2FpcnRpbWUsCi0JLndyaXRlID0gd3JpdGVfYWlydGltZV9yZXNldF9z dHViLAotCS5vcGVuID0gc2ltcGxlX29wZW4sCi0JLm93bmVyID0gVEhJU19NT0RVTEUsCi0JLmxs c2VlayA9IGRlZmF1bHRfbGxzZWVrLAotfTsKLQotCiB2b2lkIGF0aDlrX3N0YV9hZGRfZGVidWdm cyhzdHJ1Y3QgaWVlZTgwMjExX2h3ICpodywKIAkJCSAgIHN0cnVjdCBpZWVlODAyMTFfdmlmICp2 aWYsCiAJCQkgICBzdHJ1Y3QgaWVlZTgwMjExX3N0YSAqc3RhLApAQCAtMzIwLDUgKzI1MSw0IEBA IHZvaWQgYXRoOWtfc3RhX2FkZF9kZWJ1Z2ZzKHN0cnVjdCBpZWVlODAyMTFfaHcgKmh3LAogCiAJ ZGVidWdmc19jcmVhdGVfZmlsZSgibm9kZV9hZ2dyIiwgMDQ0NCwgZGlyLCBhbiwgJmZvcHNfbm9k ZV9hZ2dyKTsKIAlkZWJ1Z2ZzX2NyZWF0ZV9maWxlKCJub2RlX3JlY3YiLCAwNDQ0LCBkaXIsIGFu LCAmZm9wc19ub2RlX3JlY3YpOwotCWRlYnVnZnNfY3JlYXRlX2ZpbGUoImFpcnRpbWUiLCAwNjQ0 LCBkaXIsIGFuLCAmZm9wc19haXJ0aW1lKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dp cmVsZXNzL2F0aC9hdGg5ay9pbml0LmMgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsv aW5pdC5jCmluZGV4IGMwNzBhOWU1MWViZi4uNDVhMzFmOGExNTE0IDEwMDY0NAotLS0gYS9kcml2 ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvaW5pdC5jCisrKyBiL2RyaXZlcnMvbmV0L3dpcmVs ZXNzL2F0aC9hdGg5ay9pbml0LmMKQEAgLTY3Niw4ICs2NzYsNiBAQCBzdGF0aWMgaW50IGF0aDlr X2luaXRfc29mdGModTE2IGRldmlkLCBzdHJ1Y3QgYXRoX3NvZnRjICpzYywKIAogCS8qIFdpbGwg YmUgY2xlYXJlZCBpbiBhdGg5a19zdGFydCgpICovCiAJc2V0X2JpdChBVEhfT1BfSU5WQUxJRCwg JmNvbW1vbi0+b3BfZmxhZ3MpOwotCXNjLT5haXJ0aW1lX2ZsYWdzID0gKEFJUlRJTUVfVVNFX1RY IHwgQUlSVElNRV9VU0VfUlggfAotCQkJICAgICBBSVJUSU1FX1VTRV9ORVdfUVVFVUVTKTsKIAog CXNjLT5zY19haCA9IGFoOwogCXNjLT5kZnNfZGV0ZWN0b3IgPSBkZnNfcGF0dGVybl9kZXRlY3Rv cl9pbml0KGNvbW1vbiwgTkw4MDIxMV9ERlNfVU5TRVQpOwpAQCAtMTAxMyw2ICsxMDExLDcgQEAg c3RhdGljIHZvaWQgYXRoOWtfc2V0X2h3X2NhcGFiKHN0cnVjdCBhdGhfc29mdGMgKnNjLCBzdHJ1 Y3QgaWVlZTgwMjExX2h3ICpodykKIAlTRVRfSUVFRTgwMjExX1BFUk1fQUREUihodywgY29tbW9u LT5tYWNhZGRyKTsKIAogCXdpcGh5X2V4dF9mZWF0dXJlX3NldChody0+d2lwaHksIE5MODAyMTFf RVhUX0ZFQVRVUkVfQ1FNX1JTU0lfTElTVCk7CisJd2lwaHlfZXh0X2ZlYXR1cmVfc2V0KGh3LT53 aXBoeSwgTkw4MDIxMV9FWFRfRkVBVFVSRV9BSVJUSU1FX0ZBSVJORVNTKTsKIH0KIAogaW50IGF0 aDlrX2luaXRfZGV2aWNlKHUxNiBkZXZpZCwgc3RydWN0IGF0aF9zb2Z0YyAqc2MsCmRpZmYgLS1n aXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvcmVjdi5jIGIvZHJpdmVycy9uZXQv d2lyZWxlc3MvYXRoL2F0aDlrL3JlY3YuYwppbmRleCAzMGQxYmQ4MzJkOTAuLjI4NWE2MmQzMDE5 ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL3JlY3YuYworKysg Yi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvcmVjdi5jCkBAIC0xMDU0LDE0ICsxMDU0 LDcgQEAgc3RhdGljIHZvaWQgYXRoX3J4X2NvdW50X2FpcnRpbWUoc3RydWN0IGF0aF9zb2Z0YyAq c2MsCiAJCQkJCQlsZW4sIHJ4cy0+cmF0ZV9pZHgsIGlzX3NwKTsKIAl9CiAKLSAJaWYgKCEhKHNj LT5haXJ0aW1lX2ZsYWdzICYgQUlSVElNRV9VU0VfUlgpKSB7Ci0JCXNwaW5fbG9ja19iaCgmYWNx LT5sb2NrKTsKLQkJYW4tPmFpcnRpbWVfZGVmaWNpdFthY25vXSAtPSBhaXJ0aW1lOwotCQlpZiAo YW4tPmFpcnRpbWVfZGVmaWNpdFthY25vXSA8PSAwKQotCQkJX19hdGhfdHhfcXVldWVfdGlkKHNj LCBBVEhfQU5fMl9USUQoYW4sIHRpZG5vKSk7Ci0JCXNwaW5fdW5sb2NrX2JoKCZhY3EtPmxvY2sp OwotCX0KLQlhdGhfZGVidWdfYWlydGltZShzYywgYW4sIGFpcnRpbWUsIDApOworCWllZWU4MDIx MV9zdGFfcmVnaXN0ZXJfYWlydGltZShzdGEsIHRpZG5vLCAwLCBhaXJ0aW1lKTsKIGV4aXQ6CiAJ cmN1X3JlYWRfdW5sb2NrKCk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9h dGgvYXRoOWsveG1pdC5jIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlrL3htaXQuYwpp bmRleCBmNDQ4ZDU3MTY2MzkuLjA2ZTBjNWE2ZmFiNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9uZXQv d2lyZWxlc3MvYXRoL2F0aDlrL3htaXQuYworKysgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgv YXRoOWsveG1pdC5jCkBAIC0xMTMsNDQgKzExMywxNCBAQCB2b2lkIGF0aF90eHFfdW5sb2NrX2Nv bXBsZXRlKHN0cnVjdCBhdGhfc29mdGMgKnNjLCBzdHJ1Y3QgYXRoX3R4cSAqdHhxKQogCQlhdGhf dHhfc3RhdHVzKGh3LCBza2IpOwogfQogCi12b2lkIF9fYXRoX3R4X3F1ZXVlX3RpZChzdHJ1Y3Qg YXRoX3NvZnRjICpzYywgc3RydWN0IGF0aF9hdHhfdGlkICp0aWQpCi17Ci0Jc3RydWN0IGF0aF92 aWYgKmF2cCA9IChzdHJ1Y3QgYXRoX3ZpZiAqKSB0aWQtPmFuLT52aWYtPmRydl9wcml2OwotCXN0 cnVjdCBhdGhfY2hhbmN0eCAqY3R4ID0gYXZwLT5jaGFuY3R4OwotCXN0cnVjdCBhdGhfYWNxICph Y3E7Ci0Jc3RydWN0IGxpc3RfaGVhZCAqdGlkX2xpc3Q7Ci0JdTggYWNubyA9IFRJRF9UT19XTUVf QUModGlkLT50aWRubyk7Ci0KLQlpZiAoIWN0eCB8fCAhbGlzdF9lbXB0eSgmdGlkLT5saXN0KSkK LQkJcmV0dXJuOwotCi0KLQlhY3EgPSAmY3R4LT5hY3FbYWNub107Ci0JaWYgKChzYy0+YWlydGlt ZV9mbGFncyAmIEFJUlRJTUVfVVNFX05FV19RVUVVRVMpICYmCi0JICAgIHRpZC0+YW4tPmFpcnRp bWVfZGVmaWNpdFthY25vXSA+IDApCi0JCXRpZF9saXN0ID0gJmFjcS0+YWNxX25ldzsKLQllbHNl Ci0JCXRpZF9saXN0ID0gJmFjcS0+YWNxX29sZDsKLQotCWxpc3RfYWRkX3RhaWwoJnRpZC0+bGlz dCwgdGlkX2xpc3QpOwotfQotCiB2b2lkIGF0aF90eF9xdWV1ZV90aWQoc3RydWN0IGF0aF9zb2Z0 YyAqc2MsIHN0cnVjdCBhdGhfYXR4X3RpZCAqdGlkKQogewotCXN0cnVjdCBhdGhfdmlmICphdnAg PSAoc3RydWN0IGF0aF92aWYgKikgdGlkLT5hbi0+dmlmLT5kcnZfcHJpdjsKLQlzdHJ1Y3QgYXRo X2NoYW5jdHggKmN0eCA9IGF2cC0+Y2hhbmN0eDsKLQlzdHJ1Y3QgYXRoX2FjcSAqYWNxOworCXN0 cnVjdCBpZWVlODAyMTFfdHhxICpxdWV1ZSA9CisJCWNvbnRhaW5lcl9vZigodm9pZCAqKXRpZCwg c3RydWN0IGllZWU4MDIxMV90eHEsIGRydl9wcml2KTsKIAotCWlmICghY3R4IHx8ICFsaXN0X2Vt cHR5KCZ0aWQtPmxpc3QpKQotCQlyZXR1cm47Ci0KLQlhY3EgPSAmY3R4LT5hY3FbVElEX1RPX1dN RV9BQyh0aWQtPnRpZG5vKV07Ci0Jc3Bpbl9sb2NrX2JoKCZhY3EtPmxvY2spOwotCV9fYXRoX3R4 X3F1ZXVlX3RpZChzYywgdGlkKTsKLQlzcGluX3VubG9ja19iaCgmYWNxLT5sb2NrKTsKKwlpZWVl ODAyMTFfc2NoZWR1bGVfdHhxKHNjLT5odywgcXVldWUpOwogfQogCi0KIHZvaWQgYXRoOWtfd2Fr ZV90eF9xdWV1ZShzdHJ1Y3QgaWVlZTgwMjExX2h3ICpodywgc3RydWN0IGllZWU4MDIxMV90eHEg KnF1ZXVlKQogewogCXN0cnVjdCBhdGhfc29mdGMgKnNjID0gaHctPnByaXY7CkBAIC0xNjMsMTEg KzEzMyw3IEBAIHZvaWQgYXRoOWtfd2FrZV90eF9xdWV1ZShzdHJ1Y3QgaWVlZTgwMjExX2h3ICpo dywgc3RydWN0IGllZWU4MDIxMV90eHEgKnF1ZXVlKQogCQl0aWQtPnRpZG5vKTsKIAogCWF0aF90 eHFfbG9jayhzYywgdHhxKTsKLQotCXRpZC0+aGFzX3F1ZXVlZCA9IHRydWU7Ci0JYXRoX3R4X3F1 ZXVlX3RpZChzYywgdGlkKTsKIAlhdGhfdHhxX3NjaGVkdWxlKHNjLCB0eHEpOwotCiAJYXRoX3R4 cV91bmxvY2soc2MsIHR4cSk7CiB9CiAKQEAgLTIxNyw4ICsxODMsOCBAQCBhdGhfZ2V0X3NrYl90 aWQoc3RydWN0IGF0aF9zb2Z0YyAqc2MsIHN0cnVjdCBhdGhfbm9kZSAqYW4sIHN0cnVjdCBza19i dWZmICpza2IpCiAJcmV0dXJuIEFUSF9BTl8yX1RJRChhbiwgdGlkbm8pOwogfQogCi1zdGF0aWMg c3RydWN0IHNrX2J1ZmYgKgotYXRoX3RpZF9wdWxsKHN0cnVjdCBhdGhfYXR4X3RpZCAqdGlkKQor c3RhdGljIGludAorYXRoX3RpZF9wdWxsKHN0cnVjdCBhdGhfYXR4X3RpZCAqdGlkLCBzdHJ1Y3Qg c2tfYnVmZiAqKnNrYnVmKQogewogCXN0cnVjdCBpZWVlODAyMTFfdHhxICp0eHEgPSBjb250YWlu ZXJfb2YoKHZvaWQqKXRpZCwgc3RydWN0IGllZWU4MDIxMV90eHEsIGRydl9wcml2KTsKIAlzdHJ1 Y3QgYXRoX3NvZnRjICpzYyA9IHRpZC0+YW4tPnNjOwpAQCAtMjI5LDIwICsxOTUsMTYgQEAgYXRo X3RpZF9wdWxsKHN0cnVjdCBhdGhfYXR4X3RpZCAqdGlkKQogCX07CiAJc3RydWN0IHNrX2J1ZmYg KnNrYjsKIAlzdHJ1Y3QgYXRoX2ZyYW1lX2luZm8gKmZpOwotCWludCBxOwotCi0JaWYgKCF0aWQt Pmhhc19xdWV1ZWQpCi0JCXJldHVybiBOVUxMOworCWludCBxLCByZXQ7CiAKIAlza2IgPSBpZWVl ODAyMTFfdHhfZGVxdWV1ZShodywgdHhxKTsKLQlpZiAoIXNrYikgewotCQl0aWQtPmhhc19xdWV1 ZWQgPSBmYWxzZTsKLQkJcmV0dXJuIE5VTEw7Ci0JfQorCWlmICghc2tiKQorCQlyZXR1cm4gLUVO T0VOVDsKIAotCWlmIChhdGhfdHhfcHJlcGFyZShodywgc2tiLCAmdHhjdGwpKSB7CisJcmV0ID0g YXRoX3R4X3ByZXBhcmUoaHcsIHNrYiwgJnR4Y3RsKTsKKwlpZiAocmV0KSB7CiAJCWllZWU4MDIx MV9mcmVlX3R4c2tiKGh3LCBza2IpOwotCQlyZXR1cm4gTlVMTDsKKwkJcmV0dXJuIHJldDsKIAl9 CiAKIAlxID0gc2tiX2dldF9xdWV1ZV9tYXBwaW5nKHNrYik7CkBAIC0yNTIsMjQgKzIxNCwxOSBA QCBhdGhfdGlkX3B1bGwoc3RydWN0IGF0aF9hdHhfdGlkICp0aWQpCiAJCSsrdGlkLT50eHEtPnBl bmRpbmdfZnJhbWVzOwogCX0KIAotCXJldHVybiBza2I7Ci19Ci0KLQotc3RhdGljIGJvb2wgYXRo X3RpZF9oYXNfYnVmZmVyZWQoc3RydWN0IGF0aF9hdHhfdGlkICp0aWQpCi17Ci0JcmV0dXJuICFz a2JfcXVldWVfZW1wdHkoJnRpZC0+cmV0cnlfcSkgfHwgdGlkLT5oYXNfcXVldWVkOworCSpza2J1 ZiA9IHNrYjsKKwlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHN0cnVjdCBza19idWZmICphdGhfdGlk X2RlcXVldWUoc3RydWN0IGF0aF9hdHhfdGlkICp0aWQpCitzdGF0aWMgaW50IGF0aF90aWRfZGVx dWV1ZShzdHJ1Y3QgYXRoX2F0eF90aWQgKnRpZCwKKwkJCSAgIHN0cnVjdCBza19idWZmICoqc2ti KQogewotCXN0cnVjdCBza19idWZmICpza2I7Ci0KLQlza2IgPSBfX3NrYl9kZXF1ZXVlKCZ0aWQt PnJldHJ5X3EpOwotCWlmICghc2tiKQotCQlza2IgPSBhdGhfdGlkX3B1bGwodGlkKTsKKwlpbnQg cmV0ID0gMDsKKwkqc2tiID0gX19za2JfZGVxdWV1ZSgmdGlkLT5yZXRyeV9xKTsKKwlpZiAoISpz a2IpCisJCXJldCA9IGF0aF90aWRfcHVsbCh0aWQsIHNrYik7CiAKLQlyZXR1cm4gc2tiOworCXJl dHVybiByZXQ7CiB9CiAKIHN0YXRpYyB2b2lkIGF0aF90eF9mbHVzaF90aWQoc3RydWN0IGF0aF9z b2Z0YyAqc2MsIHN0cnVjdCBhdGhfYXR4X3RpZCAqdGlkKQpAQCAtMzY1LDExICszMjIsMTIgQEAg c3RhdGljIHZvaWQgYXRoX3RpZF9kcmFpbihzdHJ1Y3QgYXRoX3NvZnRjICpzYywgc3RydWN0IGF0 aF90eHEgKnR4cSwKIAlzdHJ1Y3QgbGlzdF9oZWFkIGJmX2hlYWQ7CiAJc3RydWN0IGF0aF90eF9z dGF0dXMgdHM7CiAJc3RydWN0IGF0aF9mcmFtZV9pbmZvICpmaTsKKwlpbnQgcmV0OwogCiAJbWVt c2V0KCZ0cywgMCwgc2l6ZW9mKHRzKSk7CiAJSU5JVF9MSVNUX0hFQUQoJmJmX2hlYWQpOwogCi0J d2hpbGUgKChza2IgPSBhdGhfdGlkX2RlcXVldWUodGlkKSkpIHsKKwl3aGlsZSAoKHJldCA9IGF0 aF90aWRfZGVxdWV1ZSh0aWQsICZza2IpKSA9PSAwKSB7CiAJCWZpID0gZ2V0X2ZyYW1lX2luZm8o c2tiKTsKIAkJYmYgPSBmaS0+YmY7CiAKQEAgLTY4MSw3ICs2MzksNiBAQCBzdGF0aWMgdm9pZCBh dGhfdHhfY29tcGxldGVfYWdncihzdHJ1Y3QgYXRoX3NvZnRjICpzYywgc3RydWN0IGF0aF90eHEg KnR4cSwKIAkJc2tiX3F1ZXVlX3NwbGljZV90YWlsKCZiZl9wZW5kaW5nLCAmdGlkLT5yZXRyeV9x KTsKIAkJaWYgKCFhbi0+c2xlZXBpbmcpIHsKIAkJCWF0aF90eF9xdWV1ZV90aWQoc2MsIHRpZCk7 Ci0KIAkJCWlmICh0cy0+dHNfc3RhdHVzICYgKEFUSDlLX1RYRVJSX0ZJTFQgfCBBVEg5S19UWEVS Ul9YUkVUUlkpKQogCQkJCXRpZC0+Y2xlYXJfcHNfZmlsdGVyID0gdHJ1ZTsKIAkJfQpAQCAtNzA4 LDExICs2NjUsMTEgQEAgc3RhdGljIGJvb2wgYmZfaXNfYW1wZHVfbm90X3Byb2Jpbmcoc3RydWN0 IGF0aF9idWYgKmJmKQogICAgIHJldHVybiBiZl9pc2FtcGR1KGJmKSAmJiAhKGluZm8tPmZsYWdz ICYgSUVFRTgwMjExX1RYX0NUTF9SQVRFX0NUUkxfUFJPQkUpOwogfQogCi1zdGF0aWMgdm9pZCBh dGhfdHhfY291bnRfYWlydGltZShzdHJ1Y3QgYXRoX3NvZnRjICpzYywgc3RydWN0IGF0aF9ub2Rl ICphbiwKLQkJCQkgc3RydWN0IGF0aF9hdHhfdGlkICp0aWQsIHN0cnVjdCBhdGhfYnVmICpiZiwK K3N0YXRpYyB2b2lkIGF0aF90eF9jb3VudF9haXJ0aW1lKHN0cnVjdCBhdGhfc29mdGMgKnNjLAor CQkJCSBzdHJ1Y3QgaWVlZTgwMjExX3N0YSAqc3RhLAorCQkJCSBzdHJ1Y3QgYXRoX2J1ZiAqYmYs CiAJCQkJIHN0cnVjdCBhdGhfdHhfc3RhdHVzICp0cykKIHsKLQlzdHJ1Y3QgYXRoX3R4cSAqdHhx ID0gdGlkLT50eHE7CiAJdTMyIGFpcnRpbWUgPSAwOwogCWludCBpOwogCkBAIC03MjIsMTcgKzY3 OSw3IEBAIHN0YXRpYyB2b2lkIGF0aF90eF9jb3VudF9haXJ0aW1lKHN0cnVjdCBhdGhfc29mdGMg KnNjLCBzdHJ1Y3QgYXRoX25vZGUgKmFuLAogCQlhaXJ0aW1lICs9IHJhdGVfZHVyICogYmYtPnJh dGVzW2ldLmNvdW50OwogCX0KIAotCWlmIChzYy0+YWlydGltZV9mbGFncyAmIEFJUlRJTUVfVVNF X1RYKSB7Ci0JCWludCBxID0gdHhxLT5tYWM4MDIxMV9xbnVtOwotCQlzdHJ1Y3QgYXRoX2FjcSAq YWNxID0gJnNjLT5jdXJfY2hhbi0+YWNxW3FdOwotCi0JCXNwaW5fbG9ja19iaCgmYWNxLT5sb2Nr KTsKLQkJYW4tPmFpcnRpbWVfZGVmaWNpdFtxXSAtPSBhaXJ0aW1lOwotCQlpZiAoYW4tPmFpcnRp bWVfZGVmaWNpdFtxXSA8PSAwKQotCQkJX19hdGhfdHhfcXVldWVfdGlkKHNjLCB0aWQpOwotCQlz cGluX3VubG9ja19iaCgmYWNxLT5sb2NrKTsKLQl9Ci0JYXRoX2RlYnVnX2FpcnRpbWUoc2MsIGFu LCAwLCBhaXJ0aW1lKTsKKwlpZWVlODAyMTFfc3RhX3JlZ2lzdGVyX2FpcnRpbWUoc3RhLCB0cy0+ dGlkLCBhaXJ0aW1lLCAwKTsKIH0KIAogc3RhdGljIHZvaWQgYXRoX3R4X3Byb2Nlc3NfYnVmZmVy KHN0cnVjdCBhdGhfc29mdGMgKnNjLCBzdHJ1Y3QgYXRoX3R4cSAqdHhxLApAQCAtNzYyLDcgKzcw OSw3IEBAIHN0YXRpYyB2b2lkIGF0aF90eF9wcm9jZXNzX2J1ZmZlcihzdHJ1Y3QgYXRoX3NvZnRj ICpzYywgc3RydWN0IGF0aF90eHEgKnR4cSwKIAlpZiAoc3RhKSB7CiAJCXN0cnVjdCBhdGhfbm9k ZSAqYW4gPSAoc3RydWN0IGF0aF9ub2RlICopc3RhLT5kcnZfcHJpdjsKIAkJdGlkID0gYXRoX2dl dF9za2JfdGlkKHNjLCBhbiwgYmYtPmJmX21wZHUpOwotCQlhdGhfdHhfY291bnRfYWlydGltZShz YywgYW4sIHRpZCwgYmYsIHRzKTsKKwkJYXRoX3R4X2NvdW50X2FpcnRpbWUoc2MsIHN0YSwgYmYs IHRzKTsKIAkJaWYgKHRzLT50c19zdGF0dXMgJiAoQVRIOUtfVFhFUlJfRklMVCB8IEFUSDlLX1RY RVJSX1hSRVRSWSkpCiAJCQl0aWQtPmNsZWFyX3BzX2ZpbHRlciA9IHRydWU7CiAJfQpAQCAtOTQ3 LDIwICs4OTQsMjEgQEAgc3RhdGljIGludCBhdGhfY29tcHV0ZV9udW1fZGVsaW1zKHN0cnVjdCBh dGhfc29mdGMgKnNjLCBzdHJ1Y3QgYXRoX2F0eF90aWQgKnRpZCwKIAlyZXR1cm4gbmRlbGltOwog fQogCi1zdGF0aWMgc3RydWN0IGF0aF9idWYgKgorc3RhdGljIGludAogYXRoX3R4X2dldF90aWRf c3ViZnJhbWUoc3RydWN0IGF0aF9zb2Z0YyAqc2MsIHN0cnVjdCBhdGhfdHhxICp0eHEsCi0JCQlz dHJ1Y3QgYXRoX2F0eF90aWQgKnRpZCkKKwkJCXN0cnVjdCBhdGhfYXR4X3RpZCAqdGlkLCBzdHJ1 Y3QgYXRoX2J1ZiAqKmJ1ZikKIHsKIAlzdHJ1Y3QgaWVlZTgwMjExX3R4X2luZm8gKnR4X2luZm87 CiAJc3RydWN0IGF0aF9mcmFtZV9pbmZvICpmaTsKLQlzdHJ1Y3Qgc2tfYnVmZiAqc2tiLCAqZmly c3Rfc2tiID0gTlVMTDsKIAlzdHJ1Y3QgYXRoX2J1ZiAqYmY7CisJc3RydWN0IHNrX2J1ZmYgKnNr YiwgKmZpcnN0X3NrYiA9IE5VTEw7CiAJdTE2IHNlcW5vOworCWludCByZXQ7CiAKIAl3aGlsZSAo MSkgewotCQlza2IgPSBhdGhfdGlkX2RlcXVldWUodGlkKTsKLQkJaWYgKCFza2IpCi0JCQlicmVh azsKKwkJcmV0ID0gYXRoX3RpZF9kZXF1ZXVlKHRpZCwgJnNrYik7CisJCWlmIChyZXQgPCAwKQor CQkJcmV0dXJuIHJldDsKIAogCQlmaSA9IGdldF9mcmFtZV9pbmZvKHNrYik7CiAJCWJmID0gZmkt PmJmOwpAQCAtOTkyLDcgKzk0MCw3IEBAIGF0aF90eF9nZXRfdGlkX3N1YmZyYW1lKHN0cnVjdCBh dGhfc29mdGMgKnNjLCBzdHJ1Y3QgYXRoX3R4cSAqdHhxLAogCiAJCWlmICghKHR4X2luZm8tPmZs YWdzICYgSUVFRTgwMjExX1RYX0NUTF9BTVBEVSkpIHsKIAkJCWJmLT5iZl9zdGF0ZS5iZl90eXBl ID0gMDsKLQkJCXJldHVybiBiZjsKKwkJCWJyZWFrOwogCQl9CiAKIAkJYmYtPmJmX3N0YXRlLmJm X3R5cGUgPSBCVUZfQU1QRFUgfCBCVUZfQUdHUjsKQEAgLTEwMTEsNyArOTU5LDcgQEAgYXRoX3R4 X2dldF90aWRfc3ViZnJhbWUoc3RydWN0IGF0aF9zb2Z0YyAqc2MsIHN0cnVjdCBhdGhfdHhxICp0 eHEsCiAJCQkJCWZpcnN0X3NrYiA9IHNrYjsKIAkJCQljb250aW51ZTsKIAkJCX0KLQkJCWJyZWFr OworCQkJcmV0dXJuIC1FSU5QUk9HUkVTUzsKIAkJfQogCiAJCWlmICh0aWQtPmJhcl9pbmRleCA+ IEFUSF9CQV9JTkRFWCh0aWQtPnNlcV9zdGFydCwgc2Vxbm8pKSB7CkBAIC0xMDI4LDEwICs5NzYs MTEgQEAgYXRoX3R4X2dldF90aWRfc3ViZnJhbWUoc3RydWN0IGF0aF9zb2Z0YyAqc2MsIHN0cnVj dCBhdGhfdHhxICp0eHEsCiAJCWlmIChiZl9pc2FtcGR1KGJmKSkKIAkJCWF0aF90eF9hZGR0b19i YXcoc2MsIHRpZCwgYmYpOwogCi0JCXJldHVybiBiZjsKKwkJYnJlYWs7CiAJfQogCi0JcmV0dXJu IE5VTEw7CisJKmJ1ZiA9IGJmOworCXJldHVybiAwOwogfQogCiBzdGF0aWMgaW50CkBAIC0xMDQx LDcgKzk5MCw3IEBAIGF0aF90eF9mb3JtX2FnZ3Ioc3RydWN0IGF0aF9zb2Z0YyAqc2MsIHN0cnVj dCBhdGhfdHhxICp0eHEsCiB7CiAjZGVmaW5lIFBBREJZVEVTKF9sZW4pICgoNCAtICgoX2xlbikg JSA0KSkgJSA0KQogCXN0cnVjdCBhdGhfYnVmICpiZiA9IGJmX2ZpcnN0LCAqYmZfcHJldiA9IE5V TEw7Ci0JaW50IG5mcmFtZXMgPSAwLCBuZGVsaW07CisJaW50IG5mcmFtZXMgPSAwLCBuZGVsaW0s IHJldDsKIAl1MTYgYWdncl9saW1pdCA9IDAsIGFsID0gMCwgYnBhZCA9IDAsCiAJICAgIGFsX2Rl bHRhLCBoX2JhdyA9IHRpZC0+YmF3X3NpemUgLyAyOwogCXN0cnVjdCBpZWVlODAyMTFfdHhfaW5m byAqdHhfaW5mbzsKQEAgLTEwOTMsNyArMTA0Miw5IEBAIGF0aF90eF9mb3JtX2FnZ3Ioc3RydWN0 IGF0aF9zb2Z0YyAqc2MsIHN0cnVjdCBhdGhfdHhxICp0eHEsCiAKIAkJYmZfcHJldiA9IGJmOwog Ci0JCWJmID0gYXRoX3R4X2dldF90aWRfc3ViZnJhbWUoc2MsIHR4cSwgdGlkKTsKKwkJcmV0ID0g YXRoX3R4X2dldF90aWRfc3ViZnJhbWUoc2MsIHR4cSwgdGlkLCAmYmYpOworCQlpZiAocmV0IDwg MCkKKwkJCWJyZWFrOwogCX0KIAlnb3RvIGZpbmlzaDsKIHN0b3A6CkBAIC0xNDkwLDcgKzE0NDEs NyBAQCBhdGhfdHhfZm9ybV9idXJzdChzdHJ1Y3QgYXRoX3NvZnRjICpzYywgc3RydWN0IGF0aF90 eHEgKnR4cSwKIAkJICBzdHJ1Y3QgYXRoX2J1ZiAqYmZfZmlyc3QpCiB7CiAJc3RydWN0IGF0aF9i dWYgKmJmID0gYmZfZmlyc3QsICpiZl9wcmV2ID0gTlVMTDsKLQlpbnQgbmZyYW1lcyA9IDA7CisJ aW50IG5mcmFtZXMgPSAwLCByZXQ7CiAKIAlkbyB7CiAJCXN0cnVjdCBpZWVlODAyMTFfdHhfaW5m byAqdHhfaW5mbzsKQEAgLTE1MDQsOCArMTQ1NSw4IEBAIGF0aF90eF9mb3JtX2J1cnN0KHN0cnVj dCBhdGhfc29mdGMgKnNjLCBzdHJ1Y3QgYXRoX3R4cSAqdHhxLAogCQlpZiAobmZyYW1lcyA+PSAy KQogCQkJYnJlYWs7CiAKLQkJYmYgPSBhdGhfdHhfZ2V0X3RpZF9zdWJmcmFtZShzYywgdHhxLCB0 aWQpOwotCQlpZiAoIWJmKQorCQlyZXQgPSBhdGhfdHhfZ2V0X3RpZF9zdWJmcmFtZShzYywgdHhx LCB0aWQsICZiZik7CisJCWlmIChyZXQgPCAwKQogCQkJYnJlYWs7CiAKIAkJdHhfaW5mbyA9IElF RUU4MDIxMV9TS0JfQ0IoYmYtPmJmX21wZHUpOwpAQCAtMTUxOCwzMCArMTQ2OSwyNyBAQCBhdGhf dHhfZm9ybV9idXJzdChzdHJ1Y3QgYXRoX3NvZnRjICpzYywgc3RydWN0IGF0aF90eHEgKnR4cSwK IAl9IHdoaWxlICgxKTsKIH0KIAotc3RhdGljIGJvb2wgYXRoX3R4X3NjaGVkX2FnZ3Ioc3RydWN0 IGF0aF9zb2Z0YyAqc2MsIHN0cnVjdCBhdGhfdHhxICp0eHEsCi0JCQkgICAgICBzdHJ1Y3QgYXRo X2F0eF90aWQgKnRpZCkKK3N0YXRpYyBpbnQgYXRoX3R4X3NjaGVkX2FnZ3Ioc3RydWN0IGF0aF9z b2Z0YyAqc2MsIHN0cnVjdCBhdGhfdHhxICp0eHEsCisJCQkgICAgIHN0cnVjdCBhdGhfYXR4X3Rp ZCAqdGlkKQogewotCXN0cnVjdCBhdGhfYnVmICpiZjsKKwlzdHJ1Y3QgYXRoX2J1ZiAqYmYgPSBO VUxMOwogCXN0cnVjdCBpZWVlODAyMTFfdHhfaW5mbyAqdHhfaW5mbzsKIAlzdHJ1Y3QgbGlzdF9o ZWFkIGJmX3E7Ci0JaW50IGFnZ3JfbGVuID0gMDsKKwlpbnQgYWdncl9sZW4gPSAwLCByZXQ7CiAJ Ym9vbCBhZ2dyOwogCi0JaWYgKCFhdGhfdGlkX2hhc19idWZmZXJlZCh0aWQpKQotCQlyZXR1cm4g ZmFsc2U7Ci0KIAlJTklUX0xJU1RfSEVBRCgmYmZfcSk7CiAKLQliZiA9IGF0aF90eF9nZXRfdGlk X3N1YmZyYW1lKHNjLCB0eHEsIHRpZCk7Ci0JaWYgKCFiZikKLQkJcmV0dXJuIGZhbHNlOworCXJl dCA9IGF0aF90eF9nZXRfdGlkX3N1YmZyYW1lKHNjLCB0eHEsIHRpZCwgJmJmKTsKKwlpZiAocmV0 IDwgMCkKKwkJcmV0dXJuIHJldDsKIAogCXR4X2luZm8gPSBJRUVFODAyMTFfU0tCX0NCKGJmLT5i Zl9tcGR1KTsKIAlhZ2dyID0gISEodHhfaW5mby0+ZmxhZ3MgJiBJRUVFODAyMTFfVFhfQ1RMX0FN UERVKTsKIAlpZiAoKGFnZ3IgJiYgdHhxLT5heHFfYW1wZHVfZGVwdGggPj0gQVRIX0FHR1JfTUlO X1FERVBUSCkgfHwKIAkgICAgKCFhZ2dyICYmIHR4cS0+YXhxX2RlcHRoID49IEFUSF9OT05fQUdH Ul9NSU5fUURFUFRIKSkgewogCQlfX3NrYl9xdWV1ZV90YWlsKCZ0aWQtPnJldHJ5X3EsIGJmLT5i Zl9tcGR1KTsKLQkJcmV0dXJuIGZhbHNlOworCQlyZXR1cm4gLUVCVVNZOwogCX0KIAogCWF0aF9z ZXRfcmF0ZXModGlkLT5hbi0+dmlmLCB0aWQtPmFuLT5zdGEsIGJmKTsKQEAgLTE1NTEsNyArMTQ5 OSw3IEBAIHN0YXRpYyBib29sIGF0aF90eF9zY2hlZF9hZ2dyKHN0cnVjdCBhdGhfc29mdGMgKnNj LCBzdHJ1Y3QgYXRoX3R4cSAqdHhxLAogCQlhdGhfdHhfZm9ybV9idXJzdChzYywgdHhxLCB0aWQs ICZiZl9xLCBiZik7CiAKIAlpZiAobGlzdF9lbXB0eSgmYmZfcSkpCi0JCXJldHVybiBmYWxzZTsK KwkJcmV0dXJuIC1FQUdBSU47CiAKIAlpZiAodGlkLT5jbGVhcl9wc19maWx0ZXIgfHwgdGlkLT5h bi0+bm9fcHNfZmlsdGVyKSB7CiAJCXRpZC0+Y2xlYXJfcHNfZmlsdGVyID0gZmFsc2U7CkBAIC0x NTYwLDcgKzE1MDgsNyBAQCBzdGF0aWMgYm9vbCBhdGhfdHhfc2NoZWRfYWdncihzdHJ1Y3QgYXRo X3NvZnRjICpzYywgc3RydWN0IGF0aF90eHEgKnR4cSwKIAogCWF0aF90eF9maWxsX2Rlc2Moc2Ms IGJmLCB0eHEsIGFnZ3JfbGVuKTsKIAlhdGhfdHhfdHhxYWRkYnVmKHNjLCB0eHEsICZiZl9xLCBm YWxzZSk7Ci0JcmV0dXJuIHRydWU7CisJcmV0dXJuIDA7CiB9CiAKIGludCBhdGhfdHhfYWdncl9z dGFydChzdHJ1Y3QgYXRoX3NvZnRjICpzYywgc3RydWN0IGllZWU4MDIxMV9zdGEgKnN0YSwKQEAg LTE2MjMsMjggKzE1NzEsMTYgQEAgdm9pZCBhdGhfdHhfYWdncl9zbGVlcChzdHJ1Y3QgaWVlZTgw MjExX3N0YSAqc3RhLCBzdHJ1Y3QgYXRoX3NvZnRjICpzYywKIHsKIAlzdHJ1Y3QgYXRoX2NvbW1v biAqY29tbW9uID0gYXRoOWtfaHdfY29tbW9uKHNjLT5zY19haCk7CiAJc3RydWN0IGF0aF9hdHhf dGlkICp0aWQ7Ci0Jc3RydWN0IGF0aF90eHEgKnR4cTsKIAlpbnQgdGlkbm87CiAKIAlhdGhfZGJn KGNvbW1vbiwgWE1JVCwgIiVzIGNhbGxlZFxuIiwgX19mdW5jX18pOwogCiAJZm9yICh0aWRubyA9 IDA7IHRpZG5vIDwgSUVFRTgwMjExX05VTV9USURTOyB0aWRubysrKSB7CiAJCXRpZCA9IGF0aF9u b2RlX3RvX3RpZChhbiwgdGlkbm8pOwotCQl0eHEgPSB0aWQtPnR4cTsKLQotCQlhdGhfdHhxX2xv Y2soc2MsIHR4cSk7Ci0KLQkJaWYgKGxpc3RfZW1wdHkoJnRpZC0+bGlzdCkpIHsKLQkJCWF0aF90 eHFfdW5sb2NrKHNjLCB0eHEpOwotCQkJY29udGludWU7Ci0JCX0KIAogCQlpZiAoIXNrYl9xdWV1 ZV9lbXB0eSgmdGlkLT5yZXRyeV9xKSkKIAkJCWllZWU4MDIxMV9zdGFfc2V0X2J1ZmZlcmVkKHN0 YSwgdGlkLT50aWRubywgdHJ1ZSk7CiAKLQkJbGlzdF9kZWxfaW5pdCgmdGlkLT5saXN0KTsKLQot CQlhdGhfdHhxX3VubG9jayhzYywgdHhxKTsKIAl9CiB9CiAKQEAgLTE2NjMsMTEgKzE1OTksMTIg QEAgdm9pZCBhdGhfdHhfYWdncl93YWtldXAoc3RydWN0IGF0aF9zb2Z0YyAqc2MsIHN0cnVjdCBh dGhfbm9kZSAqYW4pCiAKIAkJYXRoX3R4cV9sb2NrKHNjLCB0eHEpOwogCQl0aWQtPmNsZWFyX3Bz X2ZpbHRlciA9IHRydWU7Ci0JCWlmIChhdGhfdGlkX2hhc19idWZmZXJlZCh0aWQpKSB7CisJCWlm ICghc2tiX3F1ZXVlX2VtcHR5KCZ0aWQtPnJldHJ5X3EpKSB7CiAJCQlhdGhfdHhfcXVldWVfdGlk KHNjLCB0aWQpOwogCQkJYXRoX3R4cV9zY2hlZHVsZShzYywgdHhxKTsKIAkJfQogCQlhdGhfdHhx X3VubG9ja19jb21wbGV0ZShzYywgdHhxKTsKKwogCX0KIH0KIApAQCAtMTY5OCw5ICsxNjM1LDkg QEAgdm9pZCBhdGg5a19yZWxlYXNlX2J1ZmZlcmVkX2ZyYW1lcyhzdHJ1Y3QgaWVlZTgwMjExX2h3 ICpodywKIAlzdHJ1Y3QgYXRoX3R4cSAqdHhxID0gc2MtPnR4LnVhcHNkcTsKIAlzdHJ1Y3QgaWVl ZTgwMjExX3R4X2luZm8gKmluZm87CiAJc3RydWN0IGxpc3RfaGVhZCBiZl9xOwotCXN0cnVjdCBh dGhfYnVmICpiZl90YWlsID0gTlVMTCwgKmJmOworCXN0cnVjdCBhdGhfYnVmICpiZl90YWlsID0g TlVMTCwgKmJmID0gTlVMTDsKIAlpbnQgc2VudCA9IDA7Ci0JaW50IGk7CisJaW50IGksIHJldDsK IAogCUlOSVRfTElTVF9IRUFEKCZiZl9xKTsKIAlmb3IgKGkgPSAwOyB0aWRzICYmIG5mcmFtZXM7 IGkrKywgdGlkcyA+Pj0gMSkgewpAQCAtMTcxMyw4ICsxNjUwLDkgQEAgdm9pZCBhdGg5a19yZWxl YXNlX2J1ZmZlcmVkX2ZyYW1lcyhzdHJ1Y3QgaWVlZTgwMjExX2h3ICpodywKIAogCQlhdGhfdHhx X2xvY2soc2MsIHRpZC0+dHhxKTsKIAkJd2hpbGUgKG5mcmFtZXMgPiAwKSB7Ci0JCQliZiA9IGF0 aF90eF9nZXRfdGlkX3N1YmZyYW1lKHNjLCBzYy0+dHgudWFwc2RxLCB0aWQpOwotCQkJaWYgKCFi ZikKKwkJCXJldCA9IGF0aF90eF9nZXRfdGlkX3N1YmZyYW1lKHNjLCBzYy0+dHgudWFwc2RxLAor CQkJCQkJICAgICAgdGlkLCAmYmYpOworCQkJaWYgKHJldCA8IDApCiAJCQkJYnJlYWs7CiAKIAkJ CWF0aDlrX3NldF9tb3JlZGF0YShzYywgYmYsIHRydWUpOwpAQCAtMTk4MCwxMSArMTkxOCwxMSBA QCB2b2lkIGF0aF90eF9jbGVhbnVwcShzdHJ1Y3QgYXRoX3NvZnRjICpzYywgc3RydWN0IGF0aF90 eHEgKnR4cSkKICAqLwogdm9pZCBhdGhfdHhxX3NjaGVkdWxlKHN0cnVjdCBhdGhfc29mdGMgKnNj LCBzdHJ1Y3QgYXRoX3R4cSAqdHhxKQogeworCXN0cnVjdCBpZWVlODAyMTFfaHcgKmh3ID0gc2Mt Pmh3OwogCXN0cnVjdCBhdGhfY29tbW9uICpjb21tb24gPSBhdGg5a19od19jb21tb24oc2MtPnNj X2FoKTsKKwlzdHJ1Y3QgaWVlZTgwMjExX3R4cSAqcXVldWU7CiAJc3RydWN0IGF0aF9hdHhfdGlk ICp0aWQ7Ci0Jc3RydWN0IGxpc3RfaGVhZCAqdGlkX2xpc3Q7Ci0Jc3RydWN0IGF0aF9hY3EgKmFj cTsKLQlib29sIGFjdGl2ZSA9IEFJUlRJTUVfQUNUSVZFKHNjLT5haXJ0aW1lX2ZsYWdzKTsKKwlp bnQgcmV0OwogCiAJaWYgKHR4cS0+bWFjODAyMTFfcW51bSA8IDApCiAJCXJldHVybjsKQEAgLTE5 OTIsNTggKzE5MzAsMjYgQEAgdm9pZCBhdGhfdHhxX3NjaGVkdWxlKHN0cnVjdCBhdGhfc29mdGMg KnNjLCBzdHJ1Y3QgYXRoX3R4cSAqdHhxKQogCWlmICh0ZXN0X2JpdChBVEhfT1BfSFdfUkVTRVQs ICZjb21tb24tPm9wX2ZsYWdzKSkKIAkJcmV0dXJuOwogCisJaWVlZTgwMjExX3R4cV9zY2hlZHVs ZV9zdGFydChodywgdHhxLT5tYWM4MDIxMV9xbnVtKTsKIAlzcGluX2xvY2tfYmgoJnNjLT5jaGFu X2xvY2spOwogCXJjdV9yZWFkX2xvY2soKTsKLQlhY3EgPSAmc2MtPmN1cl9jaGFuLT5hY3FbdHhx LT5tYWM4MDIxMV9xbnVtXTsKIAogCWlmIChzYy0+Y3VyX2NoYW4tPnN0b3BwZWQpCiAJCWdvdG8g b3V0OwogCi1iZWdpbjoKLQl0aWRfbGlzdCA9ICZhY3EtPmFjcV9uZXc7Ci0JaWYgKGxpc3RfZW1w dHkodGlkX2xpc3QpKSB7Ci0JCXRpZF9saXN0ID0gJmFjcS0+YWNxX29sZDsKLQkJaWYgKGxpc3Rf ZW1wdHkodGlkX2xpc3QpKQotCQkJZ290byBvdXQ7Ci0JfQotCXRpZCA9IGxpc3RfZmlyc3RfZW50 cnkodGlkX2xpc3QsIHN0cnVjdCBhdGhfYXR4X3RpZCwgbGlzdCk7Ci0KLQlpZiAoYWN0aXZlICYm IHRpZC0+YW4tPmFpcnRpbWVfZGVmaWNpdFt0eHEtPm1hYzgwMjExX3FudW1dIDw9IDApIHsKLQkJ c3Bpbl9sb2NrX2JoKCZhY3EtPmxvY2spOwotCQl0aWQtPmFuLT5haXJ0aW1lX2RlZmljaXRbdHhx LT5tYWM4MDIxMV9xbnVtXSArPSBBVEhfQUlSVElNRV9RVUFOVFVNOwotCQlsaXN0X21vdmVfdGFp bCgmdGlkLT5saXN0LCAmYWNxLT5hY3Ffb2xkKTsKLQkJc3Bpbl91bmxvY2tfYmgoJmFjcS0+bG9j ayk7Ci0JCWdvdG8gYmVnaW47Ci0JfQotCi0JaWYgKCFhdGhfdGlkX2hhc19idWZmZXJlZCh0aWQp KSB7Ci0JCXNwaW5fbG9ja19iaCgmYWNxLT5sb2NrKTsKLQkJaWYgKCh0aWRfbGlzdCA9PSAmYWNx LT5hY3FfbmV3KSAmJiAhbGlzdF9lbXB0eSgmYWNxLT5hY3Ffb2xkKSkKLQkJCWxpc3RfbW92ZV90 YWlsKCZ0aWQtPmxpc3QsICZhY3EtPmFjcV9vbGQpOwotCQllbHNlIHsKLQkJCWxpc3RfZGVsX2lu aXQoJnRpZC0+bGlzdCk7Ci0JCX0KLQkJc3Bpbl91bmxvY2tfYmgoJmFjcS0+bG9jayk7Ci0JCWdv dG8gYmVnaW47Ci0JfQorCXdoaWxlICgocXVldWUgPSBpZWVlODAyMTFfbmV4dF90eHEoaHcsIHR4 cS0+bWFjODAyMTFfcW51bSkpKSB7CisJCXRpZCA9IChzdHJ1Y3QgYXRoX2F0eF90aWQgKilxdWV1 ZS0+ZHJ2X3ByaXY7CiAKKwkJcmV0ID0gYXRoX3R4X3NjaGVkX2FnZ3Ioc2MsIHR4cSwgdGlkKTsK KwkJYXRoX2RiZyhjb21tb24sIFFVRVVFLCAiYXRoX3R4X3NjaGVkX2FnZ3IgcmV0dXJuZWQgJWRc biIsIHJldCk7CiAKLQkvKgotCSAqIElmIHdlIHN1Y2NlZWQgaW4gc2NoZWR1bGluZyBzb21ldGhp bmcsIGltbWVkaWF0ZWx5IHJlc3RhcnQgdG8gbWFrZQotCSAqIHN1cmUgd2Uga2VlcCB0aGUgSFcg YnVzeS4KLQkgKi8KLQlpZihhdGhfdHhfc2NoZWRfYWdncihzYywgdHhxLCB0aWQpKSB7Ci0JCWlm ICghYWN0aXZlKSB7Ci0JCQlzcGluX2xvY2tfYmgoJmFjcS0+bG9jayk7Ci0JCQlsaXN0X21vdmVf dGFpbCgmdGlkLT5saXN0LCAmYWNxLT5hY3Ffb2xkKTsKLQkJCXNwaW5fdW5sb2NrX2JoKCZhY3Et PmxvY2spOwotCQl9Ci0JCWdvdG8gYmVnaW47CisJCWllZWU4MDIxMV9yZXR1cm5fdHhxKGh3LCBx dWV1ZSk7CiAJfQogCiBvdXQ6CiAJcmN1X3JlYWRfdW5sb2NrKCk7CiAJc3Bpbl91bmxvY2tfYmgo JnNjLT5jaGFuX2xvY2spOworCWllZWU4MDIxMV90eHFfc2NoZWR1bGVfZW5kKGh3LCB0eHEtPm1h YzgwMjExX3FudW0pOwogfQogCiB2b2lkIGF0aF90eHFfc2NoZWR1bGVfYWxsKHN0cnVjdCBhdGhf c29mdGMgKnNjKQpAQCAtMjg4Nyw5ICsyNzkzLDYgQEAgdm9pZCBhdGhfdHhfbm9kZV9pbml0KHN0 cnVjdCBhdGhfc29mdGMgKnNjLCBzdHJ1Y3QgYXRoX25vZGUgKmFuKQogCXN0cnVjdCBhdGhfYXR4 X3RpZCAqdGlkOwogCWludCB0aWRubywgYWNubzsKIAotCWZvciAoYWNubyA9IDA7IGFjbm8gPCBJ RUVFODAyMTFfTlVNX0FDUzsgYWNubysrKQotCQlhbi0+YWlydGltZV9kZWZpY2l0W2Fjbm9dID0g QVRIX0FJUlRJTUVfUVVBTlRVTTsKLQogCWZvciAodGlkbm8gPSAwOyB0aWRubyA8IElFRUU4MDIx MV9OVU1fVElEUzsgdGlkbm8rKykgewogCQl0aWQgPSBhdGhfbm9kZV90b190aWQoYW4sIHRpZG5v KTsKIAkJdGlkLT5hbiAgICAgICAgPSBhbjsKQEAgLTI4OTksNyArMjgwMiw2IEBAIHZvaWQgYXRo X3R4X25vZGVfaW5pdChzdHJ1Y3QgYXRoX3NvZnRjICpzYywgc3RydWN0IGF0aF9ub2RlICphbikK IAkJdGlkLT5iYXdfaGVhZCAgPSB0aWQtPmJhd190YWlsID0gMDsKIAkJdGlkLT5hY3RpdmUJICAg PSBmYWxzZTsKIAkJdGlkLT5jbGVhcl9wc19maWx0ZXIgPSB0cnVlOwotCQl0aWQtPmhhc19xdWV1 ZWQgID0gZmFsc2U7CiAJCV9fc2tiX3F1ZXVlX2hlYWRfaW5pdCgmdGlkLT5yZXRyeV9xKTsKIAkJ SU5JVF9MSVNUX0hFQUQoJnRpZC0+bGlzdCk7CiAJCWFjbm8gPSBUSURfVE9fV01FX0FDKHRpZG5v KTsKLS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmF0aDEwayBtYWlsaW5nIGxpc3QKYXRoMTBrQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0 cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9hdGgxMGsK