From: Felix Kuehling Subject: [PATCH 10/16] drm/amdkfd: Simplify events page allocator Date: Fri, 20 Oct 2017 20:23:14 -0400 Message-ID: <1508545400-24338-11-git-send-email-Felix.Kuehling@amd.com> References: <1508545400-24338-1-git-send-email-Felix.Kuehling@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1508545400-24338-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, oded.gabbay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Cc: Yong Zhao , Felix Kuehling VGhlIGZpcnN0IGV2ZW50IHBhZ2UgaXMgYWx3YXlzIGJpZyBlbm91Z2ggdG8gaGFuZGxlIGFsbCBl dmVudHMuCkhhbmRsaW5nIG9mIG11bHRpcGxlIGV2ZW50cyBwYWdlcyBpcyBub3Qgc3VwcG9ydGVk IGJ5IHVzZXIgbW9kZSwgYW5kCm5vdCBuZWNlc3NhcnkuCgpTaWduZWQtb2ZmLWJ5OiBZb25nIFpo YW8gPHlvbmcuemhhb0BhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBGZWxpeCBLdWVobGluZyA8RmVs aXguS3VlaGxpbmdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRf ZXZlbnRzLmMgfCAxOTcgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9ldmVudHMuaCB8ICAgMSAtCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGtmZC9rZmRfcHJpdi5oICAgfCAgIDQgKy0KIDMgZmlsZXMgY2hhbmdlZCwgNzAgaW5z ZXJ0aW9ucygrKSwgMTMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1ka2ZkL2tmZF9ldmVudHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tm ZF9ldmVudHMuYwppbmRleCBmMTc4MjQ4Li5mODAwZTQ4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGtmZC9rZmRfZXZlbnRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRrZmQva2ZkX2V2ZW50cy5jCkBAIC00MSw2ICs0MSw5IEBAIHN0cnVjdCBrZmRfZXZlbnRfd2Fp dGVyIHsKIAlib29sIGFjdGl2YXRlZDsJCSAvKiBCZWNvbWVzIHRydWUgd2hlbiBldmVudCBpcyBz aWduYWxlZCAqLwogfTsKIAorI2RlZmluZSBTTE9UU19QRVJfUEFHRSBLRkRfU0lHTkFMX0VWRU5U X0xJTUlUCisjZGVmaW5lIFNMT1RfQklUTUFQX0xPTkdTIEJJVFNfVE9fTE9OR1MoU0xPVFNfUEVS X1BBR0UpCisKIC8qCiAgKiBPdmVyLWNvbXBsaWNhdGVkIHBvb2xlZCBhbGxvY2F0b3IgZm9yIGV2 ZW50IG5vdGlmaWNhdGlvbiBzbG90cy4KICAqCkBAIC01MSwxMzIgKzU0LDk4IEBAIHN0cnVjdCBr ZmRfZXZlbnRfd2FpdGVyIHsKICAqIEluZGl2aWR1YWwgc2lnbmFsIGV2ZW50cyBhcmUgdGhlbiBh bGxvY2F0ZWQgYSBzbG90IGluIGEgcGFnZS4KICAqLwogCi1zdHJ1Y3Qgc2lnbmFsX3BhZ2Ugewot CXN0cnVjdCBsaXN0X2hlYWQgZXZlbnRfcGFnZXM7CS8qIGtmZF9wcm9jZXNzLnNpZ25hbF9ldmVu dF9wYWdlcyAqLworc3RydWN0IGtmZF9zaWduYWxfcGFnZSB7CiAJdWludDY0X3QgKmtlcm5lbF9h ZGRyZXNzOwogCXVpbnQ2NF90IF9fdXNlciAqdXNlcl9hZGRyZXNzOwotCXVpbnQzMl90IHBhZ2Vf aW5kZXg7CQkvKiBJbmRleCBpbnRvIHRoZSBtbWFwIGFwZXJ0dXJlLiAqLwogCXVuc2lnbmVkIGlu dCBmcmVlX3Nsb3RzOwotCXVuc2lnbmVkIGxvbmcgdXNlZF9zbG90X2JpdG1hcFswXTsKKwl1bnNp Z25lZCBsb25nIHVzZWRfc2xvdF9iaXRtYXBbU0xPVF9CSVRNQVBfTE9OR1NdOwogfTsKIAotI2Rl ZmluZSBTTE9UU19QRVJfUEFHRSBLRkRfU0lHTkFMX0VWRU5UX0xJTUlUCi0jZGVmaW5lIFNMT1Rf QklUTUFQX1NJWkUgQklUU19UT19MT05HUyhTTE9UU19QRVJfUEFHRSkKLSNkZWZpbmUgQklUU19Q RVJfUEFHRSAoaWxvZzIoU0xPVFNfUEVSX1BBR0UpKzEpCi0jZGVmaW5lIFNJR05BTF9QQUdFX1NJ WkUgKHNpemVvZihzdHJ1Y3Qgc2lnbmFsX3BhZ2UpICsgXAotCQkJCVNMT1RfQklUTUFQX1NJWkUg KiBzaXplb2YobG9uZykpCi0KIC8qCiAgKiBGb3Igc2lnbmFsIGV2ZW50cywgdGhlIGV2ZW50IElE IGlzIHVzZWQgYXMgdGhlIGludGVycnVwdCB1c2VyIGRhdGEuCiAgKiBGb3IgU1Egc19zZW5kbXNn IGludGVycnVwdHMsIHRoaXMgaXMgbGltaXRlZCB0byA4IGJpdHMuCiAgKi8KIAogI2RlZmluZSBJ TlRFUlJVUFRfREFUQV9CSVRTIDEyCi0jZGVmaW5lIFNJR05BTF9FVkVOVF9JRF9TTE9UX1NISUZU IDAKIAotc3RhdGljIHVpbnQ2NF90ICpwYWdlX3Nsb3RzKHN0cnVjdCBzaWduYWxfcGFnZSAqcGFn ZSkKK3N0YXRpYyB1aW50NjRfdCAqcGFnZV9zbG90cyhzdHJ1Y3Qga2ZkX3NpZ25hbF9wYWdlICpw YWdlKQogewogCXJldHVybiBwYWdlLT5rZXJuZWxfYWRkcmVzczsKIH0KIAogc3RhdGljIGJvb2wg YWxsb2NhdGVfZnJlZV9zbG90KHN0cnVjdCBrZmRfcHJvY2VzcyAqcHJvY2VzcywKLQkJCQlzdHJ1 Y3Qgc2lnbmFsX3BhZ2UgKipvdXRfcGFnZSwKLQkJCQl1bnNpZ25lZCBpbnQgKm91dF9zbG90X2lu ZGV4KQorCQkJICAgICAgIHVuc2lnbmVkIGludCAqb3V0X3Nsb3RfaW5kZXgpCiB7Ci0Jc3RydWN0 IHNpZ25hbF9wYWdlICpwYWdlOworCXN0cnVjdCBrZmRfc2lnbmFsX3BhZ2UgKnBhZ2UgPSBwcm9j ZXNzLT5zaWduYWxfcGFnZTsKKwl1bnNpZ25lZCBpbnQgc2xvdDsKIAotCWxpc3RfZm9yX2VhY2hf ZW50cnkocGFnZSwgJnByb2Nlc3MtPnNpZ25hbF9ldmVudF9wYWdlcywgZXZlbnRfcGFnZXMpIHsK LQkJaWYgKHBhZ2UtPmZyZWVfc2xvdHMgPiAwKSB7Ci0JCQl1bnNpZ25lZCBpbnQgc2xvdCA9Ci0J CQkJZmluZF9maXJzdF96ZXJvX2JpdChwYWdlLT51c2VkX3Nsb3RfYml0bWFwLAotCQkJCQkJCVNM T1RTX1BFUl9QQUdFKTsKKwlpZiAoIXBhZ2UgfHwgcGFnZS0+ZnJlZV9zbG90cyA9PSAwKSB7CisJ CXByX2RlYnVnKCJObyBmcmVlIGV2ZW50IHNpZ25hbCBzbG90cyB3ZXJlIGZvdW5kIGZvciBwcm9j ZXNzICVwXG4iLAorCQkJIHByb2Nlc3MpOwogCi0JCQlfX3NldF9iaXQoc2xvdCwgcGFnZS0+dXNl ZF9zbG90X2JpdG1hcCk7Ci0JCQlwYWdlLT5mcmVlX3Nsb3RzLS07CisJCXJldHVybiBmYWxzZTsK Kwl9CiAKLQkJCXBhZ2Vfc2xvdHMocGFnZSlbc2xvdF0gPSBVTlNJR05BTEVEX0VWRU5UX1NMT1Q7 CisJc2xvdCA9IGZpbmRfZmlyc3RfemVyb19iaXQocGFnZS0+dXNlZF9zbG90X2JpdG1hcCwgU0xP VFNfUEVSX1BBR0UpOwogCi0JCQkqb3V0X3BhZ2UgPSBwYWdlOwotCQkJKm91dF9zbG90X2luZGV4 ID0gc2xvdDsKKwlfX3NldF9iaXQoc2xvdCwgcGFnZS0+dXNlZF9zbG90X2JpdG1hcCk7CisJcGFn ZS0+ZnJlZV9zbG90cy0tOwogCi0JCQlwcl9kZWJ1ZygiQWxsb2NhdGVkIGV2ZW50IHNpZ25hbCBz bG90IGluIHBhZ2UgJXAsIHNsb3QgJWRcbiIsCi0JCQkJCXBhZ2UsIHNsb3QpOworCXBhZ2Vfc2xv dHMocGFnZSlbc2xvdF0gPSBVTlNJR05BTEVEX0VWRU5UX1NMT1Q7CiAKLQkJCXJldHVybiB0cnVl OwotCQl9Ci0JfQorCSpvdXRfc2xvdF9pbmRleCA9IHNsb3Q7CiAKLQlwcl9kZWJ1ZygiTm8gZnJl ZSBldmVudCBzaWduYWwgc2xvdHMgd2VyZSBmb3VuZCBmb3IgcHJvY2VzcyAlcFxuIiwKLQkJCXBy b2Nlc3MpOworCXByX2RlYnVnKCJBbGxvY2F0ZWQgZXZlbnQgc2lnbmFsIHNsb3QgaW4gcGFnZSAl cCwgc2xvdCAlZFxuIiwKKwkJIHBhZ2UsIHNsb3QpOwogCi0JcmV0dXJuIGZhbHNlOworCXJldHVy biB0cnVlOwogfQogCi0jZGVmaW5lIGxpc3RfdGFpbF9lbnRyeShoZWFkLCB0eXBlLCBtZW1iZXIp IFwKLQlsaXN0X2VudHJ5KChoZWFkKS0+cHJldiwgdHlwZSwgbWVtYmVyKQotCi1zdGF0aWMgYm9v bCBhbGxvY2F0ZV9zaWduYWxfcGFnZShzdHJ1Y3QgZmlsZSAqZGV2a2ZkLCBzdHJ1Y3Qga2ZkX3By b2Nlc3MgKnApCitzdGF0aWMgc3RydWN0IGtmZF9zaWduYWxfcGFnZSAqYWxsb2NhdGVfc2lnbmFs X3BhZ2Uoc3RydWN0IGtmZF9wcm9jZXNzICpwKQogewogCXZvaWQgKmJhY2tpbmdfc3RvcmU7Ci0J c3RydWN0IHNpZ25hbF9wYWdlICpwYWdlOworCXN0cnVjdCBrZmRfc2lnbmFsX3BhZ2UgKnBhZ2U7 CiAKLQlwYWdlID0ga3phbGxvYyhTSUdOQUxfUEFHRV9TSVpFLCBHRlBfS0VSTkVMKTsKKwlwYWdl ID0ga3phbGxvYyhzaXplb2YoKnBhZ2UpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIXBhZ2UpCi0JCWdv dG8gZmFpbF9hbGxvY19zaWduYWxfcGFnZTsKKwkJcmV0dXJuIE5VTEw7CiAKIAlwYWdlLT5mcmVl X3Nsb3RzID0gU0xPVFNfUEVSX1BBR0U7CiAKLQliYWNraW5nX3N0b3JlID0gKHZvaWQgKikgX19n ZXRfZnJlZV9wYWdlcyhHRlBfS0VSTkVMIHwgX19HRlBfWkVSTywKKwliYWNraW5nX3N0b3JlID0g KHZvaWQgKikgX19nZXRfZnJlZV9wYWdlcyhHRlBfS0VSTkVMLAogCQkJCQlnZXRfb3JkZXIoS0ZE X1NJR05BTF9FVkVOVF9MSU1JVCAqIDgpKTsKIAlpZiAoIWJhY2tpbmdfc3RvcmUpCiAJCWdvdG8g ZmFpbF9hbGxvY19zaWduYWxfc3RvcmU7CiAKLQkvKiBwcmV2ZW50IHVzZXItbW9kZSBpbmZvIGxl YWtzICovCisJLyogSW5pdGlhbGl6ZSBhbGwgZXZlbnRzIHRvIHVuc2lnbmFsZWQgKi8KIAltZW1z ZXQoYmFja2luZ19zdG9yZSwgKHVpbnQ4X3QpIFVOU0lHTkFMRURfRVZFTlRfU0xPVCwKLQkJS0ZE X1NJR05BTF9FVkVOVF9MSU1JVCAqIDgpOworCSAgICAgICBLRkRfU0lHTkFMX0VWRU5UX0xJTUlU ICogOCk7CiAKIAlwYWdlLT5rZXJuZWxfYWRkcmVzcyA9IGJhY2tpbmdfc3RvcmU7Ci0KLQlpZiAo bGlzdF9lbXB0eSgmcC0+c2lnbmFsX2V2ZW50X3BhZ2VzKSkKLQkJcGFnZS0+cGFnZV9pbmRleCA9 IDA7Ci0JZWxzZQotCQlwYWdlLT5wYWdlX2luZGV4ID0gbGlzdF90YWlsX2VudHJ5KCZwLT5zaWdu YWxfZXZlbnRfcGFnZXMsCi0JCQkJCQkgICBzdHJ1Y3Qgc2lnbmFsX3BhZ2UsCi0JCQkJCQkgICBl dmVudF9wYWdlcyktPnBhZ2VfaW5kZXggKyAxOwotCiAJcHJfZGVidWcoIkFsbG9jYXRlZCBuZXcg ZXZlbnQgc2lnbmFsIHBhZ2UgYXQgJXAsIGZvciBwcm9jZXNzICVwXG4iLAogCQkJcGFnZSwgcCk7 Ci0JcHJfZGVidWcoIlBhZ2UgaW5kZXggaXMgJWRcbiIsIHBhZ2UtPnBhZ2VfaW5kZXgpOwotCi0J bGlzdF9hZGQoJnBhZ2UtPmV2ZW50X3BhZ2VzLCAmcC0+c2lnbmFsX2V2ZW50X3BhZ2VzKTsKIAot CXJldHVybiB0cnVlOworCXJldHVybiBwYWdlOwogCiBmYWlsX2FsbG9jX3NpZ25hbF9zdG9yZToK IAlrZnJlZShwYWdlKTsKLWZhaWxfYWxsb2Nfc2lnbmFsX3BhZ2U6Ci0JcmV0dXJuIGZhbHNlOwor CXJldHVybiBOVUxMOwogfQogCi1zdGF0aWMgYm9vbCBhbGxvY2F0ZV9ldmVudF9ub3RpZmljYXRp b25fc2xvdChzdHJ1Y3QgZmlsZSAqZGV2a2ZkLAotCQkJCQlzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnAs Ci0JCQkJCXN0cnVjdCBzaWduYWxfcGFnZSAqKnBhZ2UsCi0JCQkJCXVuc2lnbmVkIGludCAqc2ln bmFsX3Nsb3RfaW5kZXgpCitzdGF0aWMgYm9vbCBhbGxvY2F0ZV9ldmVudF9ub3RpZmljYXRpb25f c2xvdChzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnAsCisJCQkJCSAgICAgdW5zaWduZWQgaW50ICpzaWdu YWxfc2xvdF9pbmRleCkKIHsKLQlib29sIHJldDsKLQotCXJldCA9IGFsbG9jYXRlX2ZyZWVfc2xv dChwLCBwYWdlLCBzaWduYWxfc2xvdF9pbmRleCk7Ci0JaWYgKCFyZXQpIHsKLQkJcmV0ID0gYWxs b2NhdGVfc2lnbmFsX3BhZ2UoZGV2a2ZkLCBwKTsKLQkJaWYgKHJldCkKLQkJCXJldCA9IGFsbG9j YXRlX2ZyZWVfc2xvdChwLCBwYWdlLCBzaWduYWxfc2xvdF9pbmRleCk7CisJaWYgKCFwLT5zaWdu YWxfcGFnZSkgeworCQlwLT5zaWduYWxfcGFnZSA9IGFsbG9jYXRlX3NpZ25hbF9wYWdlKHApOwor CQlpZiAoIXAtPnNpZ25hbF9wYWdlKQorCQkJcmV0dXJuIGZhbHNlOwogCX0KIAotCXJldHVybiBy ZXQ7CisJcmV0dXJuIGFsbG9jYXRlX2ZyZWVfc2xvdChwLCBzaWduYWxfc2xvdF9pbmRleCk7CiB9 CiAKIC8qIEFzc3VtZXMgdGhhdCB0aGUgcHJvY2VzcydzIGV2ZW50X211dGV4IGlzIGxvY2tlZC4g Ki8KLXN0YXRpYyB2b2lkIHJlbGVhc2VfZXZlbnRfbm90aWZpY2F0aW9uX3Nsb3Qoc3RydWN0IHNp Z25hbF9wYWdlICpwYWdlLAorc3RhdGljIHZvaWQgcmVsZWFzZV9ldmVudF9ub3RpZmljYXRpb25f c2xvdChzdHJ1Y3Qga2ZkX3NpZ25hbF9wYWdlICpwYWdlLAogCQkJCQkJc2l6ZV90IHNsb3RfaW5k ZXgpCiB7CiAJX19jbGVhcl9iaXQoc2xvdF9pbmRleCwgcGFnZS0+dXNlZF9zbG90X2JpdG1hcCk7 CkBAIC0xODcsMjIgKzE1Niw2IEBAIHN0YXRpYyB2b2lkIHJlbGVhc2VfZXZlbnRfbm90aWZpY2F0 aW9uX3Nsb3Qoc3RydWN0IHNpZ25hbF9wYWdlICpwYWdlLAogCSAqLwogfQogCi1zdGF0aWMgc3Ry dWN0IHNpZ25hbF9wYWdlICpsb29rdXBfc2lnbmFsX3BhZ2VfYnlfaW5kZXgoc3RydWN0IGtmZF9w cm9jZXNzICpwLAotCQkJCQkJdW5zaWduZWQgaW50IHBhZ2VfaW5kZXgpCi17Ci0Jc3RydWN0IHNp Z25hbF9wYWdlICpwYWdlOwotCi0JLyoKLQkgKiBUaGlzIGlzIHNhZmUgYmVjYXVzZSB3ZSBkb24n dCBkZWxldGUgc2lnbmFsIHBhZ2VzIHVudGlsIHRoZQotCSAqIHByb2Nlc3MgZXhpdHMuCi0JICov Ci0JbGlzdF9mb3JfZWFjaF9lbnRyeShwYWdlLCAmcC0+c2lnbmFsX2V2ZW50X3BhZ2VzLCBldmVu dF9wYWdlcykKLQkJaWYgKHBhZ2UtPnBhZ2VfaW5kZXggPT0gcGFnZV9pbmRleCkKLQkJCXJldHVy biBwYWdlOwotCi0JcmV0dXJuIE5VTEw7Ci19Ci0KIC8qCiAgKiBBc3N1bWVzIHRoYXQgcC0+ZXZl bnRfbXV0ZXggaXMgaGVsZCBhbmQgb2YgY291cnNlIHRoYXQgcCBpcyBub3QgZ29pbmcKICAqIGF3 YXkgKGN1cnJlbnQgb3IgbG9ja2VkKS4KQEAgLTIxOCwxMyArMTcxLDYgQEAgc3RhdGljIHN0cnVj dCBrZmRfZXZlbnQgKmxvb2t1cF9ldmVudF9ieV9pZChzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnAsIHVp bnQzMl90IGlkKQogCXJldHVybiBOVUxMOwogfQogCi1zdGF0aWMgdTMyIG1ha2Vfc2lnbmFsX2V2 ZW50X2lkKHN0cnVjdCBzaWduYWxfcGFnZSAqcGFnZSwKLQkJCQkJIHVuc2lnbmVkIGludCBzaWdu YWxfc2xvdF9pbmRleCkKLXsKLQlyZXR1cm4gcGFnZS0+cGFnZV9pbmRleCB8Ci0JCQkoc2lnbmFs X3Nsb3RfaW5kZXggPDwgU0lHTkFMX0VWRU5UX0lEX1NMT1RfU0hJRlQpOwotfQotCiAvKgogICog UHJvZHVjZSBhIGtmZCBldmVudCBpZCBmb3IgYSBub25zaWduYWwgZXZlbnQuCiAgKiBUaGVzZSBh cmUgYXJiaXRyYXJ5IG51bWJlcnMsIHNvIHdlIGRvIGEgc2VxdWVudGlhbCBzZWFyY2ggdGhyb3Vn aApAQCAtMjcwLDEwICsyMTYsOSBAQCBzdGF0aWMgdTMyIG1ha2Vfbm9uc2lnbmFsX2V2ZW50X2lk KHN0cnVjdCBrZmRfcHJvY2VzcyAqcCkKIH0KIAogc3RhdGljIHN0cnVjdCBrZmRfZXZlbnQgKmxv b2t1cF9ldmVudF9ieV9wYWdlX3Nsb3Qoc3RydWN0IGtmZF9wcm9jZXNzICpwLAotCQkJCQkJc3Ry dWN0IHNpZ25hbF9wYWdlICpwYWdlLAogCQkJCQkJdW5zaWduZWQgaW50IHNpZ25hbF9zbG90KQog ewotCXJldHVybiBsb29rdXBfZXZlbnRfYnlfaWQocCwgbWFrZV9zaWduYWxfZXZlbnRfaWQocGFn ZSwgc2lnbmFsX3Nsb3QpKTsKKwlyZXR1cm4gbG9va3VwX2V2ZW50X2J5X2lkKHAsIHNpZ25hbF9z bG90KTsKIH0KIAogc3RhdGljIGludCBjcmVhdGVfc2lnbmFsX2V2ZW50KHN0cnVjdCBmaWxlICpk ZXZrZmQsCkBAIC0yODgsOCArMjMzLDcgQEAgc3RhdGljIGludCBjcmVhdGVfc2lnbmFsX2V2ZW50 KHN0cnVjdCBmaWxlICpkZXZrZmQsCiAJCXJldHVybiAtRU5PTUVNOwogCX0KIAotCWlmICghYWxs b2NhdGVfZXZlbnRfbm90aWZpY2F0aW9uX3Nsb3QoZGV2a2ZkLCBwLCAmZXYtPnNpZ25hbF9wYWdl LAotCQkJCQkJJmV2LT5zaWduYWxfc2xvdF9pbmRleCkpIHsKKwlpZiAoIWFsbG9jYXRlX2V2ZW50 X25vdGlmaWNhdGlvbl9zbG90KHAsICZldi0+c2lnbmFsX3Nsb3RfaW5kZXgpKSB7CiAJCXByX3dh cm4oIlNpZ25hbCBldmVudCB3YXNuJ3QgY3JlYXRlZCBiZWNhdXNlIG91dCBvZiBrZXJuZWwgbWVt b3J5XG4iKTsKIAkJcmV0dXJuIC1FTk9NRU07CiAJfQpAQCAtMjk3LDEwICsyNDEsOSBAQCBzdGF0 aWMgaW50IGNyZWF0ZV9zaWduYWxfZXZlbnQoc3RydWN0IGZpbGUgKmRldmtmZCwKIAlwLT5zaWdu YWxfZXZlbnRfY291bnQrKzsKIAogCWV2LT51c2VyX3NpZ25hbF9hZGRyZXNzID0KLQkJCSZldi0+ c2lnbmFsX3BhZ2UtPnVzZXJfYWRkcmVzc1tldi0+c2lnbmFsX3Nsb3RfaW5kZXhdOworCQkJJnAt PnNpZ25hbF9wYWdlLT51c2VyX2FkZHJlc3NbZXYtPnNpZ25hbF9zbG90X2luZGV4XTsKIAotCWV2 LT5ldmVudF9pZCA9IG1ha2Vfc2lnbmFsX2V2ZW50X2lkKGV2LT5zaWduYWxfcGFnZSwKLQkJCQkJ CWV2LT5zaWduYWxfc2xvdF9pbmRleCk7CisJZXYtPmV2ZW50X2lkID0gZXYtPnNpZ25hbF9zbG90 X2luZGV4OwogCiAJcHJfZGVidWcoIlNpZ25hbCBldmVudCBudW1iZXIgJXp1IGNyZWF0ZWQgd2l0 aCBpZCAlZCwgYWRkcmVzcyAlcFxuIiwKIAkJCXAtPnNpZ25hbF9ldmVudF9jb3VudCwgZXYtPmV2 ZW50X2lkLApAQCAtMzI3LDcgKzI3MCw3IEBAIHZvaWQga2ZkX2V2ZW50X2luaXRfcHJvY2Vzcyhz dHJ1Y3Qga2ZkX3Byb2Nlc3MgKnApCiB7CiAJbXV0ZXhfaW5pdCgmcC0+ZXZlbnRfbXV0ZXgpOwog CWhhc2hfaW5pdChwLT5ldmVudHMpOwotCUlOSVRfTElTVF9IRUFEKCZwLT5zaWduYWxfZXZlbnRf cGFnZXMpOworCXAtPnNpZ25hbF9wYWdlID0gTlVMTDsKIAlwLT5uZXh0X25vbnNpZ25hbF9ldmVu dF9pZCA9IEtGRF9GSVJTVF9OT05TSUdOQUxfRVZFTlRfSUQ7CiAJcC0+c2lnbmFsX2V2ZW50X2Nv dW50ID0gMDsKIH0KQEAgLTM0MSw4ICsyODQsOSBAQCBzdGF0aWMgdm9pZCBkZXN0cm95X2V2ZW50 KHN0cnVjdCBrZmRfcHJvY2VzcyAqcCwgc3RydWN0IGtmZF9ldmVudCAqZXYpCiAJCXdhaXRlci0+ ZXZlbnQgPSBOVUxMOwogCXdha2VfdXBfYWxsKCZldi0+d3EpOwogCi0JaWYgKGV2LT5zaWduYWxf cGFnZSkgewotCQlyZWxlYXNlX2V2ZW50X25vdGlmaWNhdGlvbl9zbG90KGV2LT5zaWduYWxfcGFn ZSwKKwlpZiAoKGV2LT50eXBlID09IEtGRF9FVkVOVF9UWVBFX1NJR05BTCB8fAorCSAgICAgZXYt PnR5cGUgPT0gS0ZEX0VWRU5UX1RZUEVfREVCVUcpICYmIHAtPnNpZ25hbF9wYWdlKSB7CisJCXJl bGVhc2VfZXZlbnRfbm90aWZpY2F0aW9uX3Nsb3QocC0+c2lnbmFsX3BhZ2UsCiAJCQkJCQlldi0+ c2lnbmFsX3Nsb3RfaW5kZXgpOwogCQlwLT5zaWduYWxfZXZlbnRfY291bnQtLTsKIAl9CkBAIC0z NjUsMTIgKzMwOSwxMSBAQCBzdGF0aWMgdm9pZCBkZXN0cm95X2V2ZW50cyhzdHJ1Y3Qga2ZkX3By b2Nlc3MgKnApCiAgKiBXZSBhc3N1bWUgdGhhdCB0aGUgcHJvY2VzcyBpcyBiZWluZyBkZXN0cm95 ZWQgYW5kIHRoZXJlIGlzIG5vIG5lZWQgdG8KICAqIHVubWFwIHRoZSBwYWdlcyBvciBrZWVwIGJv b2trZWVwaW5nIGRhdGEgaW4gb3JkZXIuCiAgKi8KLXN0YXRpYyB2b2lkIHNodXRkb3duX3NpZ25h bF9wYWdlcyhzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnApCitzdGF0aWMgdm9pZCBzaHV0ZG93bl9zaWdu YWxfcGFnZShzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnApCiB7Ci0Jc3RydWN0IHNpZ25hbF9wYWdlICpw YWdlLCAqdG1wOworCXN0cnVjdCBrZmRfc2lnbmFsX3BhZ2UgKnBhZ2UgPSBwLT5zaWduYWxfcGFn ZTsKIAotCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShwYWdlLCB0bXAsICZwLT5zaWduYWxfZXZl bnRfcGFnZXMsCi0JCQkJCWV2ZW50X3BhZ2VzKSB7CisJaWYgKHBhZ2UpIHsKIAkJZnJlZV9wYWdl cygodW5zaWduZWQgbG9uZylwYWdlLT5rZXJuZWxfYWRkcmVzcywKIAkJCQlnZXRfb3JkZXIoS0ZE X1NJR05BTF9FVkVOVF9MSU1JVCAqIDgpKTsKIAkJa2ZyZWUocGFnZSk7CkBAIC0zODAsNyArMzIz LDcgQEAgc3RhdGljIHZvaWQgc2h1dGRvd25fc2lnbmFsX3BhZ2VzKHN0cnVjdCBrZmRfcHJvY2Vz cyAqcCkKIHZvaWQga2ZkX2V2ZW50X2ZyZWVfcHJvY2VzcyhzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnAp CiB7CiAJZGVzdHJveV9ldmVudHMocCk7Ci0Jc2h1dGRvd25fc2lnbmFsX3BhZ2VzKHApOworCXNo dXRkb3duX3NpZ25hbF9wYWdlKHApOwogfQogCiBzdGF0aWMgYm9vbCBldmVudF9jYW5fYmVfZ3B1 X3NpZ25hbGVkKGNvbnN0IHN0cnVjdCBrZmRfZXZlbnQgKmV2KQpAQCAtNDIwLDggKzM2Myw3IEBA IGludCBrZmRfZXZlbnRfY3JlYXRlKHN0cnVjdCBmaWxlICpkZXZrZmQsIHN0cnVjdCBrZmRfcHJv Y2VzcyAqcCwKIAljYXNlIEtGRF9FVkVOVF9UWVBFX0RFQlVHOgogCQlyZXQgPSBjcmVhdGVfc2ln bmFsX2V2ZW50KGRldmtmZCwgcCwgZXYpOwogCQlpZiAoIXJldCkgewotCQkJKmV2ZW50X3BhZ2Vf b2Zmc2V0ID0gKGV2LT5zaWduYWxfcGFnZS0+cGFnZV9pbmRleCB8Ci0JCQkJCUtGRF9NTUFQX0VW RU5UU19NQVNLKTsKKwkJCSpldmVudF9wYWdlX29mZnNldCA9IEtGRF9NTUFQX0VWRU5UU19NQVNL OwogCQkJKmV2ZW50X3BhZ2Vfb2Zmc2V0IDw8PSBQQUdFX1NISUZUOwogCQkJKmV2ZW50X3Nsb3Rf aW5kZXggPSBldi0+c2lnbmFsX3Nsb3RfaW5kZXg7CiAJCX0KQEAgLTUyMywxMyArNDY1LDE3IEBA IGludCBrZmRfcmVzZXRfZXZlbnQoc3RydWN0IGtmZF9wcm9jZXNzICpwLCB1aW50MzJfdCBldmVu dF9pZCkKIAogc3RhdGljIHZvaWQgYWNrbm93bGVkZ2Vfc2lnbmFsKHN0cnVjdCBrZmRfcHJvY2Vz cyAqcCwgc3RydWN0IGtmZF9ldmVudCAqZXYpCiB7Ci0JcGFnZV9zbG90cyhldi0+c2lnbmFsX3Bh Z2UpW2V2LT5zaWduYWxfc2xvdF9pbmRleF0gPQorCXBhZ2Vfc2xvdHMocC0+c2lnbmFsX3BhZ2Up W2V2LT5zaWduYWxfc2xvdF9pbmRleF0gPQogCQkJCQkJVU5TSUdOQUxFRF9FVkVOVF9TTE9UOwog fQogCi1zdGF0aWMgYm9vbCBpc19zbG90X3NpZ25hbGVkKHN0cnVjdCBzaWduYWxfcGFnZSAqcGFn ZSwgdW5zaWduZWQgaW50IGluZGV4KQorc3RhdGljIGJvb2wgaXNfc2xvdF9zaWduYWxlZChzdHJ1 Y3Qga2ZkX3Byb2Nlc3MgKnAsIHVuc2lnbmVkIGludCBpbmRleCkKIHsKLQlyZXR1cm4gcGFnZV9z bG90cyhwYWdlKVtpbmRleF0gIT0gVU5TSUdOQUxFRF9FVkVOVF9TTE9UOworCWlmICghcC0+c2ln bmFsX3BhZ2UpCisJCXJldHVybiBmYWxzZTsKKwllbHNlCisJCXJldHVybiBwYWdlX3Nsb3RzKHAt PnNpZ25hbF9wYWdlKVtpbmRleF0gIT0KKwkJCVVOU0lHTkFMRURfRVZFTlRfU0xPVDsKIH0KIAog c3RhdGljIHZvaWQgc2V0X2V2ZW50X2Zyb21faW50ZXJydXB0KHN0cnVjdCBrZmRfcHJvY2VzcyAq cCwKQEAgLTU2MiwyMiArNTA4LDE5IEBAIHZvaWQga2ZkX3NpZ25hbF9ldmVudF9pbnRlcnJ1cHQo dW5zaWduZWQgaW50IHBhc2lkLCB1aW50MzJfdCBwYXJ0aWFsX2lkLAogCQkvKiBQYXJ0aWFsIElE IGlzIGEgZnVsbCBJRC4gKi8KIAkJZXYgPSBsb29rdXBfZXZlbnRfYnlfaWQocCwgcGFydGlhbF9p ZCk7CiAJCXNldF9ldmVudF9mcm9tX2ludGVycnVwdChwLCBldik7Ci0JfSBlbHNlIHsKKwl9IGVs c2UgaWYgKHAtPnNpZ25hbF9wYWdlKSB7CiAJCS8qCiAJCSAqIFBhcnRpYWwgSUQgaXMgaW4gZmFj dCBwYXJ0aWFsLiBGb3Igbm93IHdlIGNvbXBsZXRlbHkKIAkJICogaWdub3JlIGl0LCBidXQgd2Ug Y291bGQgdXNlIGFueSBiaXRzIHdlIGRpZCByZWNlaXZlIHRvCiAJCSAqIHNlYXJjaCBmYXN0ZXIu CiAJCSAqLwotCQlzdHJ1Y3Qgc2lnbmFsX3BhZ2UgKnBhZ2U7CiAJCXVuc2lnbmVkIGludCBpOwog Ci0JCWxpc3RfZm9yX2VhY2hfZW50cnkocGFnZSwgJnAtPnNpZ25hbF9ldmVudF9wYWdlcywgZXZl bnRfcGFnZXMpCi0JCQlmb3IgKGkgPSAwOyBpIDwgU0xPVFNfUEVSX1BBR0U7IGkrKykKLQkJCQlp ZiAoaXNfc2xvdF9zaWduYWxlZChwYWdlLCBpKSkgewotCQkJCQlldiA9IGxvb2t1cF9ldmVudF9i eV9wYWdlX3Nsb3QocCwKLQkJCQkJCQkJcGFnZSwgaSk7Ci0JCQkJCXNldF9ldmVudF9mcm9tX2lu dGVycnVwdChwLCBldik7Ci0JCQkJfQorCQlmb3IgKGkgPSAwOyBpIDwgU0xPVFNfUEVSX1BBR0U7 IGkrKykKKwkJCWlmIChpc19zbG90X3NpZ25hbGVkKHAsIGkpKSB7CisJCQkJZXYgPSBsb29rdXBf ZXZlbnRfYnlfcGFnZV9zbG90KHAsIGkpOworCQkJCXNldF9ldmVudF9mcm9tX2ludGVycnVwdChw LCBldik7CisJCQl9CiAJfQogCiAJbXV0ZXhfdW5sb2NrKCZwLT5ldmVudF9tdXRleCk7CkBAIC04 NDIsOSArNzg1LDggQEAgaW50IGtmZF93YWl0X29uX2V2ZW50cyhzdHJ1Y3Qga2ZkX3Byb2Nlc3Mg KnAsCiBpbnQga2ZkX2V2ZW50X21tYXAoc3RydWN0IGtmZF9wcm9jZXNzICpwLCBzdHJ1Y3Qgdm1f YXJlYV9zdHJ1Y3QgKnZtYSkKIHsKIAotCXVuc2lnbmVkIGludCBwYWdlX2luZGV4OwogCXVuc2ln bmVkIGxvbmcgcGZuOwotCXN0cnVjdCBzaWduYWxfcGFnZSAqcGFnZTsKKwlzdHJ1Y3Qga2ZkX3Np Z25hbF9wYWdlICpwYWdlOwogCiAJLyogY2hlY2sgcmVxdWlyZWQgc2l6ZSBpcyBsb2dpY2FsICov CiAJaWYgKGdldF9vcmRlcihLRkRfU0lHTkFMX0VWRU5UX0xJTUlUICogOCkgIT0KQEAgLTg1Mywx MyArNzk1LDEwIEBAIGludCBrZmRfZXZlbnRfbW1hcChzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnAsIHN0 cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hKQogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlwYWdl X2luZGV4ID0gdm1hLT52bV9wZ29mZjsKLQotCXBhZ2UgPSBsb29rdXBfc2lnbmFsX3BhZ2VfYnlf aW5kZXgocCwgcGFnZV9pbmRleCk7CisJcGFnZSA9IHAtPnNpZ25hbF9wYWdlOwogCWlmICghcGFn ZSkgewogCQkvKiBQcm9iYWJseSBLRkQgYnVnLCBidXQgbW1hcCBpcyB1c2VyLWFjY2Vzc2libGUu ICovCi0JCXByX2RlYnVnKCJTaWduYWwgcGFnZSBjb3VsZCBub3QgYmUgZm91bmQgZm9yIHBhZ2Vf aW5kZXggJXVcbiIsCi0JCQkJcGFnZV9pbmRleCk7CisJCXByX2RlYnVnKCJTaWduYWwgcGFnZSBj b3VsZCBub3QgYmUgZm91bmRcbiIpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9ldmVudHMuaCBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1ka2ZkL2tmZF9ldmVudHMuaAppbmRleCA5NmY5MTIyLi5mODVmY2VlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfZXZlbnRzLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2V2ZW50cy5oCkBAIC02MCw3ICs2MCw2IEBAIHN0 cnVjdCBrZmRfZXZlbnQgewogCXdhaXRfcXVldWVfaGVhZF90IHdxOyAvKiBMaXN0IG9mIGV2ZW50 IHdhaXRlcnMuICovCiAKIAkvKiBPbmx5IGZvciBzaWduYWwgZXZlbnRzLiAqLwotCXN0cnVjdCBz aWduYWxfcGFnZSAqc2lnbmFsX3BhZ2U7CiAJdW5zaWduZWQgaW50IHNpZ25hbF9zbG90X2luZGV4 OwogCXVpbnQ2NF90IF9fdXNlciAqdXNlcl9zaWduYWxfYWRkcmVzczsKIApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX3ByaXYuaCBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1ka2ZkL2tmZF9wcml2LmgKaW5kZXggZDNjZjUzYS4uYzFiM2VlMiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX3ByaXYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGtmZC9rZmRfcHJpdi5oCkBAIC01NDAsOCArNTQwLDggQEAgc3RydWN0IGtmZF9w cm9jZXNzIHsKIAlzdHJ1Y3QgbXV0ZXggZXZlbnRfbXV0ZXg7CiAJLyogQWxsIGV2ZW50cyBpbiBw cm9jZXNzIGhhc2hlZCBieSBJRCwgbGlua2VkIG9uIGtmZF9ldmVudC5ldmVudHMuICovCiAJREVD TEFSRV9IQVNIVEFCTEUoZXZlbnRzLCA0KTsKLQkvKiBzdHJ1Y3Qgc2xvdF9wYWdlX2hlYWRlci5l dmVudF9wYWdlcyAqLwotCXN0cnVjdCBsaXN0X2hlYWQgc2lnbmFsX2V2ZW50X3BhZ2VzOworCS8q IEV2ZW50IHBhZ2UgKi8KKwlzdHJ1Y3Qga2ZkX3NpZ25hbF9wYWdlICpzaWduYWxfcGFnZTsKIAl1 MzIgbmV4dF9ub25zaWduYWxfZXZlbnRfaWQ7CiAJc2l6ZV90IHNpZ25hbF9ldmVudF9jb3VudDsK IAlib29sIHNpZ25hbF9ldmVudF9saW1pdF9yZWFjaGVkOwotLSAKMi43LjQKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0 CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=