From: Mahesh Kumar Subject: [PATCH v2] drm/i915/skl+: ddb allocation algorithm optimization Date: Fri, 29 Jun 2018 15:13:35 +0530 Message-ID: <20180629094335.15242-1-mahesh1.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 659CD6EFA9 for ; Fri, 29 Jun 2018 09:42:06 +0000 (UTC) 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: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org VGhpcyBwYXRjaCBpbXBsZW1lbnRzIG5ldyBEREIgYWxsb2NhdGlvbiBhbGdvcml0aG0gYXMgcGVy IEhXIHRlYW0KcmVjb21tZW5kYXRpb24uIFRoaXMgYWxnbyB0YWtlY2FyZSBvZiBzY2VuYXJpbyB3 aGVyZSB3ZSBhbGxvY2F0ZSBsZXNzIEREQgpmb3IgdGhlIHBsYW5lcyB3aXRoIGxvd2VyIHJlbGF0 aXZlIHBpeGVsIHJhdGUsIGJ1dCB0aGV5IHJlcXVpcmUgbW9yZSBEREIKdG8gd29yay4KSXQgYWxz byB0YWtlcyBjYXJlIG9mIGVuYWJsaW5nIHNhbWUgd2F0ZXJtYXJrIGxldmVsIGZvciBlYWNoCnBs YW5lIGluIGNydGMsIGZvciBlZmZpY2llbnQgcG93ZXIgc2F2aW5nLgpUaGlzIGFsZ29yaXRobSB1 c2VzIGZpeGVkIGRkYiBhbGxvY2F0aW9uIGZvciBjdXJzb3IgcGxhbmVzLgoKRWFsaWVyIHZlcnNp b24gb2YgdGhpcyBwYXRjaCByZXZlcnRlZCBkdWUgdG8gcmVncmVzc2lvbi4gQW5kIGl0IHdhcyBy b290CmNhdXNlZCB0byBmb2xsb3dpbmc6Ck5ldyBhbGdvcml0aG0gcmVxdWlyZWQgbW9yZSBEREIg Zm9yIGN1cnNvciBwbGFuZSBidXQgYXMgY3Vyc29yIHBsYW5lIGhhcwpmaXhlZCBhbGxvY2F0aW9u IGl0J3MgRERCIHdhcyBub3Qgc3VmZmljaWVudCBhbmQgV00gbGV2ZWwtMCB3YXMgZ2V0dGluZwpk aXNhYmxlZCwgcmVzdWx0aW5nIGluIGJsYW5rIHNjcmVlbi4gTm93IHdlIHVzZSBvbGQgRERCIGFs bG9jYXRpb24gbG9naWMKb25seSBmb3IgY3Vyc29yIHBsYW5lLgoKQ2hhbmdlczoKIC0gYWRkIHJl YXNvbiBmb3IgcmV2ZXJ0IGluIGNvbW1pdCBtc2cgKE1hYXJ0ZW4pCiAtIEZpeCBjaGVja3BhdGNo IGNoZWNrcwoKVGVzdGNhc2U6IGlndC9rbXNfcGxhbmVfbXVsdGlwbGUKU2lnbmVkLW9mZi1ieTog TWFoZXNoIEt1bWFyIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KQ2M6IFJvZHJpZ28gVml2aSA8 cm9kcmlnby52aXZpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIHwgICA1ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMzc2ICsrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjE5 IGluc2VydGlvbnMoKyksIDE2MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApp bmRleCAyYjY4NGY0MzFjNjAuLmY1ZDYzNmE2ZDEyMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CkBAIC0xMjEyLDggKzEyMTIsOSBAQCBzdHJ1Y3Qgc2tsX2RkYl92YWx1ZXMgewogCiBzdHJ1Y3Qg c2tsX3dtX2xldmVsIHsKIAlib29sIHBsYW5lX2VuOwotCXVpbnQxNl90IHBsYW5lX3Jlc19iOwot CXVpbnQ4X3QgcGxhbmVfcmVzX2w7CisJdTE2IHBsYW5lX3Jlc19iOworCXU4IHBsYW5lX3Jlc19s OworCXUxNiBtaW5fZGJ1Zl9yZXE7CiB9OwogCiAvKiBTdG9yZXMgcGxhbmUgc3BlY2lmaWMgV00g cGFyYW1ldGVycyAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggNTNhYWFhM2U2ODg2Li5k MTU2NGEwOGEyMDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMzgwMiwxNyArMzgwMiwz NyBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGludGVsX2dldF9kZGJfc2l6ZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJcmV0dXJuIGRkYl9zaXplOwogfQogCitzdGF0aWMgaW50 Citza2xfZ2V0X251bV9waXBlc19hY3RpdmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAorCQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCit7CisJc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gY3N0YXRlLT5iYXNlLnN0YXRlOworCWNvbnN0 IHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0YXRlOworCWludCBudW1fYWN0aXZl OworCisJaWYgKFdBUk5fT04oIXN0YXRlKSB8fCAhY3N0YXRlLT5iYXNlLmFjdGl2ZSkKKwkJcmV0 dXJuIGh3ZWlnaHQzMihkZXZfcHJpdi0+YWN0aXZlX2NydGNzKTsKKworCWludGVsX3N0YXRlID0g dG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKTsKKworCWlmIChpbnRlbF9zdGF0ZS0+YWN0aXZl X3BpcGVfY2hhbmdlcykKKwkJbnVtX2FjdGl2ZSA9IGh3ZWlnaHQzMihpbnRlbF9zdGF0ZS0+YWN0 aXZlX2NydGNzKTsKKwllbHNlCisJCW51bV9hY3RpdmUgPSBod2VpZ2h0MzIoZGV2X3ByaXYtPmFj dGl2ZV9jcnRjcyk7CisKKwlyZXR1cm4gbnVtX2FjdGl2ZTsKK30KKwogc3RhdGljIHZvaWQKLXNr bF9kZGJfZ2V0X3BpcGVfYWxsb2NhdGlvbl9saW1pdHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK K3NrbF9kZGJfZ2V0X3BpcGVfYWxsb2NhdGlvbl9saW1pdHMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCQkJCSAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3Rh dGUsCiAJCQkJICAgY29uc3QgdW5zaWduZWQgaW50IHRvdGFsX2RhdGFfcmF0ZSwKIAkJCQkgICBz dHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpkZGIsCi0JCQkJICAgc3RydWN0IHNrbF9kZGJfZW50 cnkgKmFsbG9jLCAvKiBvdXQgKi8KLQkJCQkgICBpbnQgKm51bV9hY3RpdmUgLyogb3V0ICovKQor CQkJCSAgIGludCBudW1fYWN0aXZlLAorCQkJCSAgIHN0cnVjdCBza2xfZGRiX2VudHJ5ICphbGxv YyAvKiBvdXQgKi8pCiB7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gY3N0YXRl LT5iYXNlLnN0YXRlOwogCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0YXRlID0g dG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGRybV9jcnRjICpmb3JfY3J0YyA9IGNz dGF0ZS0+YmFzZS5jcnRjOwogCXVuc2lnbmVkIGludCBwaXBlX3NpemUsIGRkYl9zaXplOwogCWlu dCBudGhfYWN0aXZlX3BpcGU7CkBAIC0zODIwLDE3ICszODQwLDExIEBAIHNrbF9kZGJfZ2V0X3Bp cGVfYWxsb2NhdGlvbl9saW1pdHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpZiAoV0FSTl9P Tighc3RhdGUpIHx8ICFjc3RhdGUtPmJhc2UuYWN0aXZlKSB7CiAJCWFsbG9jLT5zdGFydCA9IDA7 CiAJCWFsbG9jLT5lbmQgPSAwOwotCQkqbnVtX2FjdGl2ZSA9IGh3ZWlnaHQzMihkZXZfcHJpdi0+ YWN0aXZlX2NydGNzKTsKIAkJcmV0dXJuOwogCX0KIAotCWlmIChpbnRlbF9zdGF0ZS0+YWN0aXZl X3BpcGVfY2hhbmdlcykKLQkJKm51bV9hY3RpdmUgPSBod2VpZ2h0MzIoaW50ZWxfc3RhdGUtPmFj dGl2ZV9jcnRjcyk7Ci0JZWxzZQotCQkqbnVtX2FjdGl2ZSA9IGh3ZWlnaHQzMihkZXZfcHJpdi0+ YWN0aXZlX2NydGNzKTsKLQogCWRkYl9zaXplID0gaW50ZWxfZ2V0X2RkYl9zaXplKGRldl9wcml2 LCBjc3RhdGUsIHRvdGFsX2RhdGFfcmF0ZSwKLQkJCQkgICAgICAqbnVtX2FjdGl2ZSwgZGRiKTsK KwkJCQkgICAgICBudW1fYWN0aXZlLCBkZGIpOwogCiAJLyoKIAkgKiBJZiB0aGUgc3RhdGUgZG9l c24ndCBjaGFuZ2UgdGhlIGFjdGl2ZSBDUlRDJ3MsIHRoZW4gdGhlcmUncwpAQCAtMzg1Miw3ICsz ODY2LDcgQEAgc2tsX2RkYl9nZXRfcGlwZV9hbGxvY2F0aW9uX2xpbWl0cyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCW50aF9hY3RpdmVfcGlwZSA9IGh3ZWlnaHQzMihpbnRlbF9zdGF0ZS0+YWN0 aXZlX2NydGNzICYKIAkJCQkgICAgKGRybV9jcnRjX21hc2soZm9yX2NydGMpIC0gMSkpOwogCXBp cGVfc2l6ZSA9IGRkYl9zaXplIC8gaHdlaWdodDMyKGludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3Mp OwotCWFsbG9jLT5zdGFydCA9IG50aF9hY3RpdmVfcGlwZSAqIGRkYl9zaXplIC8gKm51bV9hY3Rp dmU7CisJYWxsb2MtPnN0YXJ0ID0gbnRoX2FjdGl2ZV9waXBlICogZGRiX3NpemUgLyBudW1fYWN0 aXZlOwogCWFsbG9jLT5lbmQgPSBhbGxvYy0+c3RhcnQgKyBwaXBlX3NpemU7CiB9CiAKQEAgLTQy NzEsMTMgKzQyODUsNTggQEAgc2tsX2RkYl9jYWxjX21pbihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3N0YXRlLCBpbnQgbnVtX2FjdGl2ZSwKIAltaW5pbXVtW1BMQU5FX0NVUlNPUl0g PSBza2xfY3Vyc29yX2FsbG9jYXRpb24obnVtX2FjdGl2ZSk7CiB9CiAKK3N0YXRpYyB2b2lkCitz a2xfZW5hYmxlX3BsYW5lX3dtX2xldmVscyhjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCisJCQkgICB1MTYgcGxhbmVfZGRiLAorCQkJICAgdTE2IG1heF9sZXZlbCwKKwkJ CSAgIHN0cnVjdCBza2xfcGxhbmVfd20gKndtKQoreworCWludCBsZXZlbDsKKwkvKgorCSAqIE5v dyBlbmFibGUgYWxsIGxldmVscyBpbiBXTSBzdHJ1Y3R1cmUgd2hpY2ggY2FuIGJlIGVuYWJsZWQK KwkgKiB1c2luZyBjdXJyZW50IEREQiBhbGxvY2F0aW9uCisJICovCisJZm9yIChsZXZlbCA9IGls a193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpOyBsZXZlbCA+PSAwOyBsZXZlbC0tKSB7CisJCXN0cnVj dCBza2xfd21fbGV2ZWwgKmxldmVsX3dtID0gJndtLT53bVtsZXZlbF07CisKKwkJaWYgKGxldmVs X3dtLT5taW5fZGJ1Zl9yZXEgPiBwbGFuZV9kZGIgfHwgbGV2ZWwgPiBtYXhfbGV2ZWwgfHwKKwkJ ICAgIChsZXZlbCAmJiBsZXZlbF93bS0+cGxhbmVfcmVzX2wgPj0gMzEpIHx8CisJCSAgICBsZXZl bF93bS0+cGxhbmVfcmVzX2IgPT0gMCkgeworCQkJbGV2ZWxfd20tPnBsYW5lX2VuID0gZmFsc2U7 CisJCQlsZXZlbF93bS0+cGxhbmVfcmVzX2IgPSAwOworCQkJbGV2ZWxfd20tPnBsYW5lX3Jlc19s ID0gMDsKKwkJfSBlbHNlIHsKKwkJCWxldmVsX3dtLT5wbGFuZV9lbiA9IHRydWU7CisJCX0KKwor CQkvKgorCQkgKiBEaXNwbGF5IFdBICM4MjYgKFNLTDpBTEwsIEJYVDpBTEwpICYgIzEwNTkgKENO TDpBKQorCQkgKiBkaXNhYmxlIHdtIGxldmVsIDEtNyBvbiBOVjEyIHBsYW5lcworCQkgKi8KKwkJ aWYgKHdtLT5pc19wbGFuYXIgJiYgbGV2ZWwgPj0gMSAmJgorCQkgICAgKElTX1NLWUxBS0UoZGV2 X3ByaXYpIHx8IElTX0JST1hUT04oZGV2X3ByaXYpIHx8CisJCSAgICAgSVNfQ05MX1JFVklEKGRl dl9wcml2LCBDTkxfUkVWSURfQTAsIENOTF9SRVZJRF9BMCkpKSB7CisJCQlsZXZlbF93bS0+cGxh bmVfZW4gPSBmYWxzZTsKKwkJCWxldmVsX3dtLT5wbGFuZV9yZXNfYiA9IDA7CisJCQlsZXZlbF93 bS0+cGxhbmVfcmVzX2wgPSAwOworCQl9CisJfQorCisJaWYgKHdtLT50cmFuc193bS5wbGFuZV9y ZXNfYiAmJiB3bS0+dHJhbnNfd20ucGxhbmVfcmVzX2IgPCBwbGFuZV9kZGIpCisJCXdtLT50cmFu c193bS5wbGFuZV9lbiA9IHRydWU7CisJZWxzZQorCQl3bS0+dHJhbnNfd20ucGxhbmVfZW4gPSBm YWxzZTsKK30KKwogc3RhdGljIGludAogc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjc3RhdGUsCisJCSAgICAgIHN0cnVjdCBza2xfcGlwZV93bSAqcGlwZV93 bSwKIAkJICAgICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiIC8qIG91dCAqLykKIHsK IAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBjc3RhdGUtPmJhc2Uuc3RhdGU7CiAJ c3RydWN0IGRybV9jcnRjICpjcnRjID0gY3N0YXRlLT5iYXNlLmNydGM7CiAJc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19p bnRlbF9jcnRjKGNydGMpOwogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAlz dHJ1Y3Qgc2tsX2RkYl9lbnRyeSAqYWxsb2MgPSAmY3N0YXRlLT53bS5za2wuZGRiOwpAQCAtNDI5 MCw2ICs0MzQ5LDggQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjc3RhdGUsCiAJdW5zaWduZWQgaW50IHBsYW5lX2RhdGFfcmF0ZVtJOTE1X01BWF9QTEFO RVNdID0ge307CiAJdW5zaWduZWQgaW50IHV2X3BsYW5lX2RhdGFfcmF0ZVtJOTE1X01BWF9QTEFO RVNdID0ge307CiAJdWludDE2X3QgdG90YWxfbWluX2Jsb2NrcyA9IDA7CisJdTE2IHRvdGFsX2xl dmVsX2RkYiwgcGxhbmVfYmxvY2tzID0gMDsKKwlpbnQgbWF4X2xldmVsLCBsZXZlbDsKIAogCS8q IENsZWFyIHRoZSBwYXJ0aXRpb25pbmcgZm9yIGRpc2FibGVkIHBsYW5lcy4gKi8KIAltZW1zZXQo ZGRiLT5wbGFuZVtwaXBlXSwgMCwgc2l6ZW9mKGRkYi0+cGxhbmVbcGlwZV0pKTsKQEAgLTQzMDYs MTQgKzQzNjcsMTYgQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjc3RhdGUsCiAJdG90YWxfZGF0YV9yYXRlID0gc2tsX2dldF90b3RhbF9yZWxhdGl2ZV9k YXRhX3JhdGUoY3N0YXRlLAogCQkJCQkJCSAgIHBsYW5lX2RhdGFfcmF0ZSwKIAkJCQkJCQkgICB1 dl9wbGFuZV9kYXRhX3JhdGUpOwotCXNrbF9kZGJfZ2V0X3BpcGVfYWxsb2NhdGlvbl9saW1pdHMo ZGV2LCBjc3RhdGUsIHRvdGFsX2RhdGFfcmF0ZSwgZGRiLAotCQkJCQkgICBhbGxvYywgJm51bV9h Y3RpdmUpOworCisJbnVtX2FjdGl2ZSA9IHNrbF9nZXRfbnVtX3BpcGVzX2FjdGl2ZShkZXZfcHJp diwgY3N0YXRlKTsKKwlza2xfZGRiX2NhbGNfbWluKGNzdGF0ZSwgbnVtX2FjdGl2ZSwgbWluaW11 bSwgdXZfbWluaW11bSk7CisKKwlza2xfZGRiX2dldF9waXBlX2FsbG9jYXRpb25fbGltaXRzKGRl dl9wcml2LCBjc3RhdGUsIHRvdGFsX2RhdGFfcmF0ZSwKKwkJCQkJICAgZGRiLCBudW1fYWN0aXZl LCBhbGxvYyk7CiAJYWxsb2Nfc2l6ZSA9IHNrbF9kZGJfZW50cnlfc2l6ZShhbGxvYyk7CiAJaWYg KGFsbG9jX3NpemUgPT0gMCkKIAkJcmV0dXJuIDA7CiAKLQlza2xfZGRiX2NhbGNfbWluKGNzdGF0 ZSwgbnVtX2FjdGl2ZSwgbWluaW11bSwgdXZfbWluaW11bSk7Ci0KIAkvKgogCSAqIDEuIEFsbG9j YXRlIHRoZSBtaW5pbnVtIHJlcXVpcmVkIGJsb2NrcyBmb3IgZWFjaCBhY3RpdmUgcGxhbmUKIAkg KiBhbmQgYWxsb2NhdGUgdGhlIGN1cnNvciwgaXQgZG9lc24ndCByZXF1aXJlIGV4dHJhIGFsbG9j YXRpb24KQEAgLTQzMjUsMTYgKzQzODgsNTIgQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCXRvdGFsX21pbl9ibG9ja3MgKz0gdXZfbWlu aW11bVtwbGFuZV9pZF07CiAJfQogCi0JaWYgKHRvdGFsX21pbl9ibG9ja3MgPiBhbGxvY19zaXpl KSB7CisJYWxsb2Nfc2l6ZSAtPSBtaW5pbXVtW1BMQU5FX0NVUlNPUl07CisJZGRiLT5wbGFuZVtw aXBlXVtQTEFORV9DVVJTT1JdLnN0YXJ0ID0gYWxsb2MtPmVuZCAtCisJCQkJCQkJbWluaW11bVtQ TEFORV9DVVJTT1JdOworCWRkYi0+cGxhbmVbcGlwZV1bUExBTkVfQ1VSU09SXS5lbmQgPSBhbGxv Yy0+ZW5kOworCisJZm9yIChsZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpOyBsZXZl bCA+PSAwOyBsZXZlbC0tKSB7CisJCXRvdGFsX2xldmVsX2RkYiA9IDA7CisJCWZvcl9lYWNoX3Bs YW5lX2lkX29uX2NydGMoaW50ZWxfY3J0YywgcGxhbmVfaWQpIHsKKwkJCXN0cnVjdCBza2xfcGxh bmVfd20gKndtID0gJnBpcGVfd20tPnBsYW5lc1twbGFuZV9pZF07CisJCQl1MTYgcGxhbmVfcmVz X2IgPSB3bS0+d21bbGV2ZWxdLm1pbl9kYnVmX3JlcSArCisJCQkJCQl3bS0+dXZfd21bbGV2ZWxd Lm1pbl9kYnVmX3JlcTsKKwkJCXUxNiBtaW4gPSBtaW5pbXVtW3BsYW5lX2lkXSArIHV2X21pbmlt dW1bcGxhbmVfaWRdOworCisJCQlpZiAocGxhbmVfaWQgPT0gUExBTkVfQ1VSU09SKQorCQkJCWNv bnRpbnVlOworCisJCQl0b3RhbF9sZXZlbF9kZGIgKz0gbWF4KHBsYW5lX3Jlc19iLCBtaW4pOwor CQl9CisKKwkJLyoKKwkJICogSWYgVGhpcyBsZXZlbCBjYW4gc3VjY2Vzc2Z1bGx5IGJlIGVuYWJs ZWQgd2l0aCB0aGUKKwkJICogcGlwZSdzIGN1cnJlbnQgRERCIGFsbG9jYXRpb24sIHRoZW4gYWxs IGxvd2VyIGxldmVscyBhcmUKKwkJICogZ3VhcmFudGVlZCB0byBzdWNjZWVkIGFzIHdlbGwuCisJ CSAqLworCQlpZiAodG90YWxfbGV2ZWxfZGRiIDw9IGFsbG9jX3NpemUpCisJCQlicmVhazsKKwl9 CisKKwlpZiAobGV2ZWwgPCAwIHx8IHRvdGFsX21pbl9ibG9ja3MgPiBhbGxvY19zaXplKSB7CiAJ CURSTV9ERUJVR19LTVMoIlJlcXVlc3RlZCBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZXhjZWVkcyBz eXN0ZW0gRERCIGxpbWl0YXRpb25zIik7Ci0JCURSTV9ERUJVR19LTVMoIm1pbmltdW0gcmVxdWly ZWQgJWQvJWRcbiIsIHRvdGFsX21pbl9ibG9ja3MsCi0JCQkJCQkJYWxsb2Nfc2l6ZSk7CisJCURS TV9ERUJVR19LTVMoIm1pbmltdW0gcmVxdWlyZWQgJWQvJWRcbiIsIChsZXZlbCA8IDApID8KKwkJ CQl0b3RhbF9sZXZlbF9kZGIgOiB0b3RhbF9taW5fYmxvY2tzLCBhbGxvY19zaXplKTsKIAkJcmV0 dXJuIC1FSU5WQUw7CiAJfQorCW1heF9sZXZlbCA9IGxldmVsOworCWFsbG9jX3NpemUgLT0gdG90 YWxfbGV2ZWxfZGRiOwogCi0JYWxsb2Nfc2l6ZSAtPSB0b3RhbF9taW5fYmxvY2tzOwotCWRkYi0+ cGxhbmVbcGlwZV1bUExBTkVfQ1VSU09SXS5zdGFydCA9IGFsbG9jLT5lbmQgLSBtaW5pbXVtW1BM QU5FX0NVUlNPUl07Ci0JZGRiLT5wbGFuZVtwaXBlXVtQTEFORV9DVVJTT1JdLmVuZCA9IGFsbG9j LT5lbmQ7CisJLyoKKwkgKiBQTEFORV9DVVJTT1IgZGF0YSByYXRlIGlzIG5vdCBpbmNsdWRlZCBp biB0b3RhbF9kYXRhX3JhdGUuCisJICogSWYgb25seSBjdXJzb3IgcGxhbmUgaXMgZW5hYmxlZCB3 ZSBoYXZlIHRvIGVuYWJsZSBpdHMgV00gbGV2ZWxzCisJICogZXhwbGljaXRseSBiZWZvcmUgcmV0 dXJuaW5nLiBDdXJzb3IgaGFzIGZpeGVkIGRkYiBhbGxvY2F0aW9uLAorCSAqIFNvIGl0J3Mgb2sg dG8gYWx3YXlzIGNoZWNrIGN1cnNvciBXTSBlbmFibGluZyBiZWZvcmUgcmV0dXJuLgorCSAqLwor CXBsYW5lX2Jsb2NrcyA9IHNrbF9kZGJfZW50cnlfc2l6ZSgmZGRiLT5wbGFuZVtwaXBlXVtQTEFO RV9DVVJTT1JdKTsKKwlza2xfZW5hYmxlX3BsYW5lX3dtX2xldmVscyhkZXZfcHJpdiwgcGxhbmVf YmxvY2tzLCBtYXhfbGV2ZWwsCisJCQkJICAgJnBpcGVfd20tPnBsYW5lc1tQTEFORV9DVVJTT1Jd KTsKIAogCS8qCiAJICogMi4gRGlzdHJpYnV0ZSB0aGUgcmVtYWluaW5nIHNwYWNlIGluIHByb3Bv cnRpb24gdG8gdGhlIGFtb3VudCBvZgpAQCAtNDM0OCw0NCArNDQ0Nyw0OSBAQCBza2xfYWxsb2Nh dGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAlzdGFydCA9IGFs bG9jLT5zdGFydDsKIAlmb3JfZWFjaF9wbGFuZV9pZF9vbl9jcnRjKGludGVsX2NydGMsIHBsYW5l X2lkKSB7CiAJCXVuc2lnbmVkIGludCBkYXRhX3JhdGUsIHV2X2RhdGFfcmF0ZTsKLQkJdWludDE2 X3QgcGxhbmVfYmxvY2tzLCB1dl9wbGFuZV9ibG9ja3M7CisJCXUxNiBwbGFuZV9ibG9ja3MgPSAw LCB1dl9wbGFuZV9ibG9ja3MgPSAwOworCQlzdHJ1Y3Qgc2tsX3BsYW5lX3dtICp3bSA9ICZwaXBl X3dtLT5wbGFuZXNbcGxhbmVfaWRdOworCQl1MTYgbWluX3JlcV9ibGsgPSB3bS0+d21bbWF4X2xl dmVsXS5taW5fZGJ1Zl9yZXE7CisJCXUxNiB1dl9taW5fcmVxX2JsayA9IHdtLT51dl93bVttYXhf bGV2ZWxdLm1pbl9kYnVmX3JlcTsKIAogCQlpZiAocGxhbmVfaWQgPT0gUExBTkVfQ1VSU09SKQog CQkJY29udGludWU7CiAKIAkJZGF0YV9yYXRlID0gcGxhbmVfZGF0YV9yYXRlW3BsYW5lX2lkXTsK IAotCQkvKgotCQkgKiBhbGxvY2F0aW9uIGZvciAocGFja2VkIGZvcm1hdHMpIG9yICh1di1wbGFu ZSBwYXJ0IG9mIHBsYW5hciBmb3JtYXQpOgotCQkgKiBwcm9tb3RlIHRoZSBleHByZXNzaW9uIHRv IDY0IGJpdHMgdG8gYXZvaWQgb3ZlcmZsb3dpbmcsIHRoZQotCQkgKiByZXN1bHQgaXMgPCBhdmFp bGFibGUgYXMgZGF0YV9yYXRlIC8gdG90YWxfZGF0YV9yYXRlIDwgMQotCQkgKi8KLQkJcGxhbmVf YmxvY2tzID0gbWluaW11bVtwbGFuZV9pZF07Ci0JCXBsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1 aW50NjRfdClhbGxvY19zaXplICogZGF0YV9yYXRlLAotCQkJCQl0b3RhbF9kYXRhX3JhdGUpOwot CiAJCS8qIExlYXZlIGRpc2FibGVkIHBsYW5lcyBhdCAoMCwwKSAqLwogCQlpZiAoZGF0YV9yYXRl KSB7CisJCQkvKgorCQkJICogYWxsb2NhdGlvbiBmb3IgKHBhY2tlZCBmb3JtYXRzKSBvciAodXYt cGxhbmUgcGFydCBvZgorCQkJICogcGxhbmFyIGZvcm1hdCk6IHByb21vdGUgdGhlIGV4cHJlc3Np b24gdG8gNjQgYml0cyB0bworCQkJICogYXZvaWQgb3ZlcmZsb3dpbmcsIHRoZSByZXN1bHQgaXMg PCBhdmFpbGFibGUgYXMKKwkJCSAqIGRhdGFfcmF0ZSAvIHRvdGFsX2RhdGFfcmF0ZSA8IDEKKwkJ CSAqLworCisJCQlwbGFuZV9ibG9ja3MgPSBtYXgobWluaW11bVtwbGFuZV9pZF0sIG1pbl9yZXFf YmxrKTsKKwkJCXBsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1NjQpYWxsb2Nfc2l6ZSAqCisJCQkJ CQlkYXRhX3JhdGUsIHRvdGFsX2RhdGFfcmF0ZSk7CiAJCQlkZGItPnBsYW5lW3BpcGVdW3BsYW5l X2lkXS5zdGFydCA9IHN0YXJ0OwogCQkJZGRiLT5wbGFuZVtwaXBlXVtwbGFuZV9pZF0uZW5kID0g c3RhcnQgKyBwbGFuZV9ibG9ja3M7CisJCQlzdGFydCArPSBwbGFuZV9ibG9ja3M7CiAJCX0KIAot CQlzdGFydCArPSBwbGFuZV9ibG9ja3M7Ci0KIAkJLyogQWxsb2NhdGUgRERCIGZvciBVViBwbGFu ZSBmb3IgcGxhbmFyIGZvcm1hdC9OVjEyICovCiAJCXV2X2RhdGFfcmF0ZSA9IHV2X3BsYW5lX2Rh dGFfcmF0ZVtwbGFuZV9pZF07CiAKLQkJdXZfcGxhbmVfYmxvY2tzID0gdXZfbWluaW11bVtwbGFu ZV9pZF07Ci0JCXV2X3BsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClhbGxvY19zaXpl ICogdXZfZGF0YV9yYXRlLAotCQkJCQkgICB0b3RhbF9kYXRhX3JhdGUpOwotCiAJCWlmICh1dl9k YXRhX3JhdGUpIHsKKwkJCXV2X3BsYW5lX2Jsb2NrcyA9IG1heCh1dl9taW5pbXVtW3BsYW5lX2lk XSwKKwkJCQkJICAgICAgdXZfbWluX3JlcV9ibGspOworCQkJdXZfcGxhbmVfYmxvY2tzICs9IGRp dl91NjQoKHU2NClhbGxvY19zaXplICoKKwkJCQkJCXV2X2RhdGFfcmF0ZSwgdG90YWxfZGF0YV9y YXRlKTsKIAkJCWRkYi0+dXZfcGxhbmVbcGlwZV1bcGxhbmVfaWRdLnN0YXJ0ID0gc3RhcnQ7Ci0J CQlkZGItPnV2X3BsYW5lW3BpcGVdW3BsYW5lX2lkXS5lbmQgPQotCQkJCXN0YXJ0ICsgdXZfcGxh bmVfYmxvY2tzOworCQkJZGRiLT51dl9wbGFuZVtwaXBlXVtwbGFuZV9pZF0uZW5kID0gc3RhcnQg KworCQkJCQkJCSAgICB1dl9wbGFuZV9ibG9ja3M7CisJCQlzdGFydCArPSB1dl9wbGFuZV9ibG9j a3M7CiAJCX0KIAotCQlzdGFydCArPSB1dl9wbGFuZV9ibG9ja3M7CisJCXNrbF9lbmFibGVfcGxh bmVfd21fbGV2ZWxzKGRldl9wcml2LCBwbGFuZV9ibG9ja3MsCisJCQkJCSAgIG1heF9sZXZlbCwg d20pOwogCX0KIAogCXJldHVybiAwOwpAQCAtNDU5NCw3ICs0Njk4LDYgQEAgc3RhdGljIGludCBz a2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAJCQkJY29uc3Qgc3RydWN0IHNrbF93bV9sZXZlbCAqcmVzdWx0X3ByZXYsCiAJCQkJc3Ry dWN0IHNrbF93bV9sZXZlbCAqcmVzdWx0IC8qIG91dCAqLykKIHsKLQljb25zdCBzdHJ1Y3QgZHJt X3BsYW5lX3N0YXRlICpwc3RhdGUgPSAmaW50ZWxfcHN0YXRlLT5iYXNlOwogCXVpbnQzMl90IGxh dGVuY3kgPSBkZXZfcHJpdi0+d20uc2tsX2xhdGVuY3lbbGV2ZWxdOwogCXVpbnRfZml4ZWRfMTZf MTZfdCBtZXRob2QxLCBtZXRob2QyOwogCXVpbnRfZml4ZWRfMTZfMTZfdCBzZWxlY3RlZF9yZXN1 bHQ7CkBAIC00NjkzLDYxICs0Nzk2LDI3IEBAIHN0YXRpYyBpbnQgc2tsX2NvbXB1dGVfcGxhbmVf d20oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQltaW5fZGlzcF9i dWZfbmVlZGVkID0gcmVzX2Jsb2NrczsKIAl9CiAKLQlpZiAoKGxldmVsID4gMCAmJiByZXNfbGlu ZXMgPiAzMSkgfHwKLQkgICAgcmVzX2Jsb2NrcyA+PSBkZGJfYWxsb2NhdGlvbiB8fAotCSAgICBt aW5fZGlzcF9idWZfbmVlZGVkID49IGRkYl9hbGxvY2F0aW9uKSB7Ci0JCXJlc3VsdC0+cGxhbmVf ZW4gPSBmYWxzZTsKLQotCQkvKgotCQkgKiBJZiB0aGVyZSBhcmUgbm8gdmFsaWQgbGV2ZWwgMCB3 YXRlcm1hcmtzLCB0aGVuIHdlIGNhbid0Ci0JCSAqIHN1cHBvcnQgdGhpcyBkaXNwbGF5IGNvbmZp Z3VyYXRpb24uCi0JCSAqLwotCQlpZiAobGV2ZWwpIHsKLQkJCXJldHVybiAwOwotCQl9IGVsc2Ug ewotCQkJc3RydWN0IGRybV9wbGFuZSAqcGxhbmUgPSBwc3RhdGUtPnBsYW5lOwotCi0JCQlEUk1f REVCVUdfS01TKCJSZXF1ZXN0ZWQgZGlzcGxheSBjb25maWd1cmF0aW9uIGV4Y2VlZHMgc3lzdGVt IHdhdGVybWFyayBsaW1pdGF0aW9uc1xuIik7Ci0JCQlEUk1fREVCVUdfS01TKCJbUExBTkU6JWQ6 JXNdIGJsb2NrcyByZXF1aXJlZCA9ICV1LyV1LCBsaW5lcyByZXF1aXJlZCA9ICV1LzMxXG4iLAot CQkJCSAgICAgIHBsYW5lLT5iYXNlLmlkLCBwbGFuZS0+bmFtZSwKLQkJCQkgICAgICByZXNfYmxv Y2tzLCBkZGJfYWxsb2NhdGlvbiwgcmVzX2xpbmVzKTsKLQkJCXJldHVybiAtRUlOVkFMOwotCQl9 Ci0JfQotCi0JLyoKLQkgKiBEaXNwbGF5IFdBICM4MjYgKFNLTDpBTEwsIEJYVDpBTEwpICYgIzEw NTkgKENOTDpBKQotCSAqIGRpc2FibGUgd20gbGV2ZWwgMS03IG9uIE5WMTIgcGxhbmVzCi0JICov Ci0JaWYgKHdwLT5pc19wbGFuYXIgJiYgbGV2ZWwgPj0gMSAmJgotCSAgICAoSVNfU0tZTEFLRShk ZXZfcHJpdikgfHwgSVNfQlJPWFRPTihkZXZfcHJpdikgfHwKLQkgICAgIElTX0NOTF9SRVZJRChk ZXZfcHJpdiwgQ05MX1JFVklEX0EwLCBDTkxfUkVWSURfQTApKSkgewotCQlyZXN1bHQtPnBsYW5l X2VuID0gZmFsc2U7Ci0JCXJldHVybiAwOwotCX0KLQogCS8qIFRoZSBudW1iZXIgb2YgbGluZXMg YXJlIGlnbm9yZWQgZm9yIHRoZSBsZXZlbCAwIHdhdGVybWFyay4gKi8KIAlyZXN1bHQtPnBsYW5l X3Jlc19iID0gcmVzX2Jsb2NrczsKKwlyZXN1bHQtPm1pbl9kYnVmX3JlcSA9IG1pbl9kaXNwX2J1 Zl9uZWVkZWQgKyAxOwogCXJlc3VsdC0+cGxhbmVfcmVzX2wgPSByZXNfbGluZXM7Ci0JcmVzdWx0 LT5wbGFuZV9lbiA9IHRydWU7CiAKIAlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGludAogc2tsX2Nv bXB1dGVfd21fbGV2ZWxzKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK LQkJICAgICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiLAogCQkgICAgICBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKIAkJICAgICAgY29uc3Qgc3RydWN0IHNrbF93bV9wYXJh bXMgKndtX3BhcmFtcywKIAkJICAgICAgc3RydWN0IHNrbF9wbGFuZV93bSAqd20sCiAJCSAgICAg IGludCBwbGFuZV9pZCkKIHsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2lu dGVsX2NydGMoY3N0YXRlLT5iYXNlLmNydGMpOwogCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0g aW50ZWxfcHN0YXRlLT5iYXNlLnBsYW5lOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxh bmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Ci0JdWludDE2X3QgZGRiX2Jsb2NrczsKLQllbnVt IHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CisJc3RydWN0IGludGVsX2F0b21pY19zdGF0 ZSAqaW50ZWxfc3RhdGUgPQorCQkJdG9faW50ZWxfYXRvbWljX3N0YXRlKGNzdGF0ZS0+YmFzZS5z dGF0ZSk7CisJdTE2IGRkYl9ibG9ja3MgPSAwOwogCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxr X3dtX21heF9sZXZlbChkZXZfcHJpdik7CiAJZW51bSBwbGFuZV9pZCBpbnRlbF9wbGFuZV9pZCA9 IGludGVsX3BsYW5lLT5pZDsKIAlpbnQgcmV0OwpAQCAtNDc1NSw5ICs0ODI0LDE3IEBAIHNrbF9j b21wdXRlX3dtX2xldmVscyhjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAJaWYgKFdBUk5fT04oIWludGVsX3BzdGF0ZS0+YmFzZS5mYikpCiAJCXJldHVybiAtRUlOVkFM OwogCi0JZGRiX2Jsb2NrcyA9IHBsYW5lX2lkID8KLQkJICAgICBza2xfZGRiX2VudHJ5X3NpemUo JmRkYi0+dXZfcGxhbmVbcGlwZV1baW50ZWxfcGxhbmVfaWRdKSA6Ci0JCSAgICAgc2tsX2RkYl9l bnRyeV9zaXplKCZkZGItPnBsYW5lW3BpcGVdW2ludGVsX3BsYW5lX2lkXSk7CisJLyogRml4IERE QiBhbGxvY2F0aW9uIGlzIGF2YWlsYWJsZSBvbmx5IGZvciBjdXJzb3IgcGxhbmUgKi8KKwlpZiAo aW50ZWxfcGxhbmVfaWQgPT0gUExBTkVfQ1VSU09SKSB7CisJCWludCBudW1fYWN0aXZlOworCisJ CWlmIChpbnRlbF9zdGF0ZS0+YWN0aXZlX3BpcGVfY2hhbmdlcykKKwkJCW51bV9hY3RpdmUgPSBo d2VpZ2h0MzIoaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjcyk7CisJCWVsc2UKKwkJCW51bV9hY3Rp dmUgPSBod2VpZ2h0MzIoZGV2X3ByaXYtPmFjdGl2ZV9jcnRjcyk7CisKKwkJZGRiX2Jsb2NrcyA9 IHNrbF9jdXJzb3JfYWxsb2NhdGlvbihudW1fYWN0aXZlKTsKKwl9CiAKIAlmb3IgKGxldmVsID0g MDsgbGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZlbCsrKSB7CiAJCXN0cnVjdCBza2xfd21fbGV2ZWwg KnJlc3VsdCA9IHBsYW5lX2lkID8gJndtLT51dl93bVtsZXZlbF0gOgpAQCAtNDgxNCw3ICs0ODkx LDYgQEAgc2tsX2NvbXB1dGVfbGluZXRpbWVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNz dGF0ZSkKIHN0YXRpYyB2b2lkIHNrbF9jb21wdXRlX3RyYW5zaXRpb25fd20oc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQkgICAgICBzdHJ1Y3Qgc2tsX3dtX3BhcmFtcyAqd3As CiAJCQkJICAgICAgc3RydWN0IHNrbF93bV9sZXZlbCAqd21fbDAsCi0JCQkJICAgICAgdWludDE2 X3QgZGRiX2FsbG9jYXRpb24sCiAJCQkJICAgICAgc3RydWN0IHNrbF93bV9sZXZlbCAqdHJhbnNf d20gLyogb3V0ICovKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjc3RhdGUtPmJhc2Uu Y3J0Yy0+ZGV2OwpAQCAtNDg1MSwyMyArNDkyNywxNiBAQCBzdGF0aWMgdm9pZCBza2xfY29tcHV0 ZV90cmFuc2l0aW9uX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCS8qIFdB IEJVRzoxOTM4NDY2IGFkZCBvbmUgYmxvY2sgZm9yIG5vbiB5LXRpbGUgcGxhbmVzICovCiAJCWlm IChJU19DTkxfUkVWSUQoZGV2X3ByaXYsIENOTF9SRVZJRF9BMCwgQ05MX1JFVklEX0EwKSkKIAkJ CXJlc19ibG9ja3MgKz0gMTsKLQogCX0KIAotCXJlc19ibG9ja3MgKz0gMTsKLQotCWlmIChyZXNf YmxvY2tzIDwgZGRiX2FsbG9jYXRpb24pIHsKLQkJdHJhbnNfd20tPnBsYW5lX3Jlc19iID0gcmVz X2Jsb2NrczsKLQkJdHJhbnNfd20tPnBsYW5lX2VuID0gdHJ1ZTsKLQkJcmV0dXJuOwotCX0KKwl0 cmFuc193bS0+cGxhbmVfcmVzX2IgPSByZXNfYmxvY2tzICsgMTsKKwlyZXR1cm47CiAKIGV4aXQ6 Ci0JdHJhbnNfd20tPnBsYW5lX2VuID0gZmFsc2U7CisJdHJhbnNfd20tPnBsYW5lX3Jlc19iID0g MDsKIH0KIAogc3RhdGljIGludCBza2xfYnVpbGRfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3N0YXRlLAotCQkJICAgICBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpkZGIsCiAJ CQkgICAgIHN0cnVjdCBza2xfcGlwZV93bSAqcGlwZV93bSkKIHsKIAlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gY3N0YXRlLT5iYXNlLmNydGMtPmRldjsKQEAgLTQ4ODksMjQgKzQ5NTgsMjEgQEAg c3RhdGljIGludCBza2xfYnVpbGRfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0 YXRlLAogCQkJCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocHN0YXRlKTsKIAkJZW51bSBwbGFuZV9p ZCBwbGFuZV9pZCA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+aWQ7CiAJCXN0cnVjdCBza2xfd21f cGFyYW1zIHdtX3BhcmFtczsKLQkJZW51bSBwaXBlIHBpcGUgPSB0b19pbnRlbF9jcnRjKGNzdGF0 ZS0+YmFzZS5jcnRjKS0+cGlwZTsKLQkJdWludDE2X3QgZGRiX2Jsb2NrczsKIAogCQl3bSA9ICZw aXBlX3dtLT5wbGFuZXNbcGxhbmVfaWRdOwotCQlkZGJfYmxvY2tzID0gc2tsX2RkYl9lbnRyeV9z aXplKCZkZGItPnBsYW5lW3BpcGVdW3BsYW5lX2lkXSk7CiAKIAkJcmV0ID0gc2tsX2NvbXB1dGVf cGxhbmVfd21fcGFyYW1zKGRldl9wcml2LCBjc3RhdGUsCiAJCQkJCQkgIGludGVsX3BzdGF0ZSwg JndtX3BhcmFtcywgMCk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCi0JCXJldCA9IHNr bF9jb21wdXRlX3dtX2xldmVscyhkZXZfcHJpdiwgZGRiLCBjc3RhdGUsCi0JCQkJCSAgICBpbnRl bF9wc3RhdGUsICZ3bV9wYXJhbXMsIHdtLCAwKTsKKwkJcmV0ID0gc2tsX2NvbXB1dGVfd21fbGV2 ZWxzKGRldl9wcml2LCBjc3RhdGUsIGludGVsX3BzdGF0ZSwKKwkJCQkJICAgICZ3bV9wYXJhbXMs IHdtLCAwKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAKIAkJc2tsX2NvbXB1dGVfdHJh bnNpdGlvbl93bShjc3RhdGUsICZ3bV9wYXJhbXMsICZ3bS0+d21bMF0sCi0JCQkJCSAgZGRiX2Js b2NrcywgJndtLT50cmFuc193bSk7CisJCQkJCSAgJndtLT50cmFuc193bSk7CiAKIAkJLyogdXYg cGxhbmUgd2F0ZXJtYXJrcyBtdXN0IGFsc28gYmUgdmFsaWRhdGVkIGZvciBOVjEyL1BsYW5hciAq LwogCQlpZiAod21fcGFyYW1zLmlzX3BsYW5hcikgewpAQCAtNDkxOSw3ICs0OTg1LDcgQEAgc3Rh dGljIGludCBza2xfYnVpbGRfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRl LAogCQkJaWYgKHJldCkKIAkJCQlyZXR1cm4gcmV0OwogCi0JCQlyZXQgPSBza2xfY29tcHV0ZV93 bV9sZXZlbHMoZGV2X3ByaXYsIGRkYiwgY3N0YXRlLAorCQkJcmV0ID0gc2tsX2NvbXB1dGVfd21f bGV2ZWxzKGRldl9wcml2LCBjc3RhdGUsCiAJCQkJCQkgICAgaW50ZWxfcHN0YXRlLCAmd21fcGFy YW1zLAogCQkJCQkJICAgIHdtLCAxKTsKIAkJCWlmIChyZXQpCkBAIC01MDUwLDQyICs1MTE2LDEw IEBAIGJvb2wgc2tsX2RkYl9hbGxvY2F0aW9uX292ZXJsYXBzKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAlyZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyBpbnQgc2tsX3VwZGF0 ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3N0YXRlLAotCQkJICAgICAgY29uc3Qg c3RydWN0IHNrbF9waXBlX3dtICpvbGRfcGlwZV93bSwKLQkJCSAgICAgIHN0cnVjdCBza2xfcGlw ZV93bSAqcGlwZV93bSwgLyogb3V0ICovCi0JCQkgICAgICBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0 aW9uICpkZGIsIC8qIG91dCAqLwotCQkJICAgICAgYm9vbCAqY2hhbmdlZCAvKiBvdXQgKi8pCi17 Ci0Jc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0ZSA9IHRvX2ludGVsX2NydGNf c3RhdGUoY3N0YXRlKTsKLQlpbnQgcmV0OwotCi0JcmV0ID0gc2tsX2J1aWxkX3BpcGVfd20oaW50 ZWxfY3N0YXRlLCBkZGIsIHBpcGVfd20pOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7Ci0KLQlp ZiAoIW1lbWNtcChvbGRfcGlwZV93bSwgcGlwZV93bSwgc2l6ZW9mKCpwaXBlX3dtKSkpCi0JCSpj aGFuZ2VkID0gZmFsc2U7Ci0JZWxzZQotCQkqY2hhbmdlZCA9IHRydWU7Ci0KLQlyZXR1cm4gMDsK LX0KLQotc3RhdGljIHVpbnQzMl90Ci1waXBlc19tb2RpZmllZChzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqc3RhdGUpCi17Ci0Jc3RydWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0 Y19zdGF0ZSAqY3N0YXRlOwotCXVpbnQzMl90IGksIHJldCA9IDA7Ci0KLQlmb3JfZWFjaF9uZXdf Y3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3N0YXRlLCBpKQotCQlyZXQgfD0gZHJtX2NydGNf bWFzayhjcnRjKTsKLQotCXJldHVybiByZXQ7Ci19Ci0KIHN0YXRpYyBpbnQKLXNrbF9kZGJfYWRk X2FmZmVjdGVkX3BsYW5lcyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQorc2tsX2Rk Yl9hZGRfYWZmZWN0ZWRfcGxhbmVzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCisJ CQkgICAgY29uc3Qgc3RydWN0IHNrbF9waXBlX3dtICpvbGRfcGlwZV93bSwKKwkJCSAgICBjb25z dCBzdHJ1Y3Qgc2tsX3BpcGVfd20gKnBpcGVfd20pCiB7CiAJc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlID0gY3N0YXRlLT5iYXNlLnN0YXRlOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBzdGF0ZS0+ZGV2OwpAQCAtNTEwMSwxMSArNTEzNSwxNSBAQCBza2xfZGRiX2FkZF9hZmZlY3Rl ZF9wbGFuZXMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKIAogCWRybV9mb3JfZWFj aF9wbGFuZV9tYXNrKHBsYW5lLCBkZXYsIGNzdGF0ZS0+YmFzZS5wbGFuZV9tYXNrKSB7CiAJCWVu dW0gcGxhbmVfaWQgcGxhbmVfaWQgPSB0b19pbnRlbF9wbGFuZShwbGFuZSktPmlkOworCQljb25z dCBzdHJ1Y3Qgc2tsX3BsYW5lX3dtICp3bSA9ICZwaXBlX3dtLT5wbGFuZXNbcGxhbmVfaWRdOwor CQljb25zdCBzdHJ1Y3Qgc2tsX3BsYW5lX3dtICpvbGRfd20gPQorCQkJCQkJJm9sZF9waXBlX3dt LT5wbGFuZXNbcGxhbmVfaWRdOwogCi0JCWlmIChza2xfZGRiX2VudHJ5X2VxdWFsKCZjdXJfZGRi LT5wbGFuZVtwaXBlXVtwbGFuZV9pZF0sCi0JCQkJCSZuZXdfZGRiLT5wbGFuZVtwaXBlXVtwbGFu ZV9pZF0pICYmCisJCWlmICgoc2tsX2RkYl9lbnRyeV9lcXVhbCgmY3VyX2RkYi0+cGxhbmVbcGlw ZV1bcGxhbmVfaWRdLAorCQkJCQkgJm5ld19kZGItPnBsYW5lW3BpcGVdW3BsYW5lX2lkXSkgJiYK IAkJICAgIHNrbF9kZGJfZW50cnlfZXF1YWwoJmN1cl9kZGItPnV2X3BsYW5lW3BpcGVdW3BsYW5l X2lkXSwKLQkJCQkJJm5ld19kZGItPnV2X3BsYW5lW3BpcGVdW3BsYW5lX2lkXSkpCisJCQkJCSZu ZXdfZGRiLT51dl9wbGFuZVtwaXBlXVtwbGFuZV9pZF0pKSAmJgorCQkgICAgIW1lbWNtcCh3bSwg b2xkX3dtLCBzaXplb2Yoc3RydWN0IHNrbF9wbGFuZV93bSkpKQogCQkJY29udGludWU7CiAKIAkJ cGxhbmVfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9wbGFuZV9zdGF0ZShzdGF0ZSwgcGxhbmUpOwpA QCAtNTExNiwzMSArNTE1NCw1MSBAQCBza2xfZGRiX2FkZF9hZmZlY3RlZF9wbGFuZXMoc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludAot c2tsX2NvbXB1dGVfZGRiKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKK3N0YXRpYyBp bnQgc2tsX3VwZGF0ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3N0YXRlLAorCQkJ ICAgICAgY29uc3Qgc3RydWN0IHNrbF9waXBlX3dtICpvbGRfcGlwZV93bSwKKwkJCSAgICAgIHN0 cnVjdCBza2xfcGlwZV93bSAqcGlwZV93bSwgLyogb3V0ICovCisJCQkgICAgICBzdHJ1Y3Qgc2ts X2RkYl9hbGxvY2F0aW9uICpkZGIsIC8qIG91dCAqLworCQkJICAgICAgYm9vbCAqY2hhbmdlZCAv KiBvdXQgKi8pCiB7Ci0JY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShzdGF0ZS0+ZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICppbnRlbF9z dGF0ZSA9IHRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSk7Ci0Jc3RydWN0IHNrbF9kZGJfYWxs b2NhdGlvbiAqZGRiID0gJmludGVsX3N0YXRlLT53bV9yZXN1bHRzLmRkYjsKLQlzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlOwotCWludCBy ZXQsIGk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0ZSA9IHRvX2ludGVs X2NydGNfc3RhdGUoY3N0YXRlKTsKKwlpbnQgcmV0OwogCi0JbWVtY3B5KGRkYiwgJmRldl9wcml2 LT53bS5za2xfaHcuZGRiLCBzaXplb2YoKmRkYikpOworCXJldCA9IHNrbF9idWlsZF9waXBlX3dt KGludGVsX2NzdGF0ZSwgcGlwZV93bSk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKIAotCWZv cl9lYWNoX25ld19pbnRlbF9jcnRjX2luX3N0YXRlKGludGVsX3N0YXRlLCBjcnRjLCBjc3RhdGUs IGkpIHsKLQkJcmV0ID0gc2tsX2FsbG9jYXRlX3BpcGVfZGRiKGNzdGF0ZSwgZGRiKTsKLQkJaWYg KHJldCkKLQkJCXJldHVybiByZXQ7CisJcmV0ID0gc2tsX2FsbG9jYXRlX3BpcGVfZGRiKGludGVs X2NzdGF0ZSwgcGlwZV93bSwgZGRiKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCS8qCisJ ICogVE9ETzogUGxhbmVzIGFyZSBpbmNsdWRlZCBpbiBzdGF0ZSB0byBhcm0gV00gcmVnaXN0ZXJz LgorCSAqIFNjb3BlIHRvIG9wdGltaXplIGZ1cnRoZXIsIGJ5IGp1c3QgcmV3cml0aW5nIHBsYW5l IHN1cmYgcmVnaXN0ZXIuCisJICovCisJcmV0ID0gc2tsX2RkYl9hZGRfYWZmZWN0ZWRfcGxhbmVz KGludGVsX2NzdGF0ZSwgb2xkX3BpcGVfd20sIHBpcGVfd20pOworCWlmIChyZXQpCisJCXJldHVy biByZXQ7CiAKLQkJcmV0ID0gc2tsX2RkYl9hZGRfYWZmZWN0ZWRfcGxhbmVzKGNzdGF0ZSk7Ci0J CWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCX0KKwlpZiAoIW1lbWNtcChvbGRfcGlwZV93bSwg cGlwZV93bSwgc2l6ZW9mKCpwaXBlX3dtKSkpCisJCSpjaGFuZ2VkID0gZmFsc2U7CisJZWxzZQor CQkqY2hhbmdlZCA9IHRydWU7CiAKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGljIHVpbnQzMl90Citw aXBlc19tb2RpZmllZChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCit7CisJc3RydWN0 IGRybV9jcnRjICpjcnRjOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3N0YXRlOworCXUzMiBp LCByZXQgPSAwOworCisJZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNz dGF0ZSwgaSkKKwkJcmV0IHw9IGRybV9jcnRjX21hc2soY3J0Yyk7CisKKwlyZXR1cm4gcmV0Owor fQorCiBzdGF0aWMgdm9pZAogc2tsX2NvcHlfZGRiX2Zvcl9waXBlKHN0cnVjdCBza2xfZGRiX3Zh bHVlcyAqZHN0LAogCQkgICAgICBzdHJ1Y3Qgc2tsX2RkYl92YWx1ZXMgKnNyYywKQEAgLTUyODUs NiArNTM0Myw3IEBAIHNrbF9jb21wdXRlX3dtKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjc3Rh dGU7CiAJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqaW50ZWxfc3RhdGUgPSB0b19pbnRlbF9h dG9taWNfc3RhdGUoc3RhdGUpOworCWNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoc3RhdGUtPmRldik7CiAJc3RydWN0IHNrbF9kZGJfdmFsdWVzICpyZXN1 bHRzID0gJmludGVsX3N0YXRlLT53bV9yZXN1bHRzOwogCXN0cnVjdCBza2xfcGlwZV93bSAqcGlw ZV93bTsKIAlib29sIGNoYW5nZWQgPSBmYWxzZTsKQEAgLTUyOTcsMTAgKzUzNTYsNyBAQCBza2xf Y29tcHV0ZV93bShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJaWYgKHJldCB8fCAh Y2hhbmdlZCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IHNrbF9jb21wdXRlX2RkYihzdGF0ZSk7 Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQorCW1lbWNweSgmcmVzdWx0cy0+ZGRiLCAmZGV2 X3ByaXYtPndtLnNrbF9ody5kZGIsIHNpemVvZihyZXN1bHRzLT5kZGIpKTsKIAkvKgogCSAqIENh bGN1bGF0ZSBXTSdzIGZvciBhbGwgcGlwZXMgdGhhdCBhcmUgcGFydCBvZiB0aGlzIHRyYW5zYWN0 aW9uLgogCSAqIE5vdGUgdGhhdCB0aGUgRERCIGFsbG9jYXRpb24gYWJvdmUgbWF5IGhhdmUgYWRk ZWQgbW9yZSBDUlRDJ3MgdGhhdAotLSAKMi4xNi4yCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK