From: Chunming Zhou Subject: [PATCH] drm: fix deadlock of syncobj v6 Date: Tue, 23 Oct 2018 17:37:45 +0800 Message-ID: <20181023093745.19060-1-david1.zhou@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org Cc: Chunming Zhou , intel-gfx@lists.freedesktop.org, =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: dri-devel@lists.freedesktop.org djI6CmFkZCBhIG11dGV4IGJldHdlZW4gc3luY19jYiBleGVjdXRpb24gYW5kIGZyZWUuCnYzOgpj bGVhcmx5IHNlcGFyYXRpbmcgdGhlIHJvbGVzIGZvciBwdF9sb2NrIGFuZCBjYl9tdXRleCAoQ2hy aXMpCnY0Ogp0aGUgY2JfbXV0ZXggc2hvdWxkIGJlIHRha2VuIG91dHNpZGUgb2YgdGhlIHB0X2xv Y2sgYXJvdW5kCnRoaXMgaWYoKSBibG9jay4gKENocmlzKQp2NToKZml4IGEgY29ybmVyIGNhc2UK djY6CnRpZHkgZHJtX3N5bmNvYmpfZmVuY2VfZ2V0X29yX2FkZF9jYWxsYmFjayB1cC4gKENocmlz KQoKVGVzdGVkIGJ5IHN5bmNvYmpfYmFzaWMgYW5kIHN5bmNvYmpfd2FpdCBvZiBpZ3QuCgpTaWdu ZWQtb2ZmLWJ5OiBDaHVubWluZyBaaG91IDxkYXZpZDEuemhvdUBhbWQuY29tPgpDYzogRGFuaWVs IFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+CkNjOiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5j b20+CkNjOiBpbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnClJldmlld2VkLWJ5OiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v ZHJtX3N5bmNvYmouYyB8IDE1NiArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBp bmNsdWRlL2RybS9kcm1fc3luY29iai5oICAgICB8ICAgOCArLQogMiBmaWxlcyBjaGFuZ2VkLCA4 MSBpbnNlcnRpb25zKCspLCA4MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vZHJtX3N5bmNvYmouYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fc3luY29iai5jCmluZGV4 IDU3YmY2MDA2Mzk0ZC4uYjdlYWE2MDNmMzY4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX3N5bmNvYmouYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3N5bmNvYmouYwpAQCAtMTA2 LDYgKzEwNiw0MiBAQCBzdHJ1Y3QgZHJtX3N5bmNvYmogKmRybV9zeW5jb2JqX2ZpbmQoc3RydWN0 IGRybV9maWxlICpmaWxlX3ByaXZhdGUsCiB9CiBFWFBPUlRfU1lNQk9MKGRybV9zeW5jb2JqX2Zp bmQpOwogCitzdGF0aWMgc3RydWN0IGRtYV9mZW5jZQorKmRybV9zeW5jb2JqX2ZpbmRfc2lnbmFs X3B0X2Zvcl9wb2ludChzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCisJCQkJICAgICAgdWlu dDY0X3QgcG9pbnQpCit7CisJc3RydWN0IGRybV9zeW5jb2JqX3NpZ25hbF9wdCAqc2lnbmFsX3B0 OworCisJaWYgKChzeW5jb2JqLT50eXBlID09IERSTV9TWU5DT0JKX1RZUEVfVElNRUxJTkUpICYm CisJICAgIChwb2ludCA8PSBzeW5jb2JqLT50aW1lbGluZSkpIHsKKwkJc3RydWN0IGRybV9zeW5j b2JqX3N0dWJfZmVuY2UgKmZlbmNlID0KKwkJCWt6YWxsb2Moc2l6ZW9mKHN0cnVjdCBkcm1fc3lu Y29ial9zdHViX2ZlbmNlKSwKKwkJCQlHRlBfS0VSTkVMKTsKKworCQlpZiAoIWZlbmNlKQorCQkJ cmV0dXJuIE5VTEw7CisJCXNwaW5fbG9ja19pbml0KCZmZW5jZS0+bG9jayk7CisJCWRtYV9mZW5j ZV9pbml0KCZmZW5jZS0+YmFzZSwKKwkJCSAgICAgICAmZHJtX3N5bmNvYmpfc3R1Yl9mZW5jZV9v cHMsCisJCQkgICAgICAgJmZlbmNlLT5sb2NrLAorCQkJICAgICAgIHN5bmNvYmotPnRpbWVsaW5l X2NvbnRleHQsCisJCQkgICAgICAgcG9pbnQpOworCisJCWRtYV9mZW5jZV9zaWduYWwoJmZlbmNl LT5iYXNlKTsKKwkJcmV0dXJuICZmZW5jZS0+YmFzZTsKKwl9CisKKwlsaXN0X2Zvcl9lYWNoX2Vu dHJ5KHNpZ25hbF9wdCwgJnN5bmNvYmotPnNpZ25hbF9wdF9saXN0LCBsaXN0KSB7CisJCWlmIChw b2ludCA+IHNpZ25hbF9wdC0+dmFsdWUpCisJCQljb250aW51ZTsKKwkJaWYgKChzeW5jb2JqLT50 eXBlID09IERSTV9TWU5DT0JKX1RZUEVfQklOQVJZKSAmJgorCQkgICAgKHBvaW50ICE9IHNpZ25h bF9wdC0+dmFsdWUpKQorCQkJY29udGludWU7CisJCXJldHVybiBkbWFfZmVuY2VfZ2V0KCZzaWdu YWxfcHQtPmZlbmNlX2FycmF5LT5iYXNlKTsKKwl9CisJcmV0dXJuIE5VTEw7Cit9CisKIHN0YXRp YyB2b2lkIGRybV9zeW5jb2JqX2FkZF9jYWxsYmFja19sb2NrZWQoc3RydWN0IGRybV9zeW5jb2Jq ICpzeW5jb2JqLAogCQkJCQkgICAgc3RydWN0IGRybV9zeW5jb2JqX2NiICpjYiwKIAkJCQkJICAg IGRybV9zeW5jb2JqX2Z1bmNfdCBmdW5jKQpAQCAtMTE0LDExNSArMTUwLDcxIEBAIHN0YXRpYyB2 b2lkIGRybV9zeW5jb2JqX2FkZF9jYWxsYmFja19sb2NrZWQoc3RydWN0IGRybV9zeW5jb2JqICpz eW5jb2JqLAogCWxpc3RfYWRkX3RhaWwoJmNiLT5ub2RlLCAmc3luY29iai0+Y2JfbGlzdCk7CiB9 CiAKLXN0YXRpYyBpbnQgZHJtX3N5bmNvYmpfZmVuY2VfZ2V0X29yX2FkZF9jYWxsYmFjayhzdHJ1 Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCi0JCQkJCQkgc3RydWN0IGRtYV9mZW5jZSAqKmZlbmNl LAotCQkJCQkJIHN0cnVjdCBkcm1fc3luY29ial9jYiAqY2IsCi0JCQkJCQkgZHJtX3N5bmNvYmpf ZnVuY190IGZ1bmMpCitzdGF0aWMgdm9pZCBkcm1fc3luY29ial9mZW5jZV9nZXRfb3JfYWRkX2Nh bGxiYWNrKHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiwKKwkJCQkJCSAgc3RydWN0IGRtYV9m ZW5jZSAqKmZlbmNlLAorCQkJCQkJICBzdHJ1Y3QgZHJtX3N5bmNvYmpfY2IgKmNiLAorCQkJCQkJ ICBkcm1fc3luY29ial9mdW5jX3QgZnVuYykKIHsKLQlpbnQgcmV0OworCXU2NCBwdF92YWx1ZSA9 IDA7CiAKLQlyZXQgPSBkcm1fc3luY29ial9zZWFyY2hfZmVuY2Uoc3luY29iaiwgMCwgMCwgZmVu Y2UpOwotCWlmICghcmV0KQotCQlyZXR1cm4gMTsKKwlpZiAoc3luY29iai0+dHlwZSA9PSBEUk1f U1lOQ09CSl9UWVBFX0JJTkFSWSkgeworCQkvKkJJTkFSWSBzeW5jb2JqIGFsd2F5cyB3YWl0IG9u IGxhc3QgcHQgKi8KKwkJcHRfdmFsdWUgPSBzeW5jb2JqLT5zaWduYWxfcG9pbnQ7CiAKLQlzcGlu X2xvY2soJnN5bmNvYmotPmxvY2spOwotCS8qIFdlJ3ZlIGFscmVhZHkgdHJpZWQgb25jZSB0byBn ZXQgYSBmZW5jZSBhbmQgZmFpbGVkLiAgTm93IHRoYXQgd2UKLQkgKiBoYXZlIHRoZSBsb2NrLCB0 cnkgb25lIG1vcmUgdGltZSBqdXN0IHRvIGJlIHN1cmUgd2UgZG9uJ3QgYWRkIGEKLQkgKiBjYWxs YmFjayB3aGVuIGEgZmVuY2UgaGFzIGFscmVhZHkgYmVlbiBzZXQuCi0JICovCi0JaWYgKCFsaXN0 X2VtcHR5KCZzeW5jb2JqLT5zaWduYWxfcHRfbGlzdCkpIHsKLQkJc3Bpbl91bmxvY2soJnN5bmNv YmotPmxvY2spOwotCQlkcm1fc3luY29ial9zZWFyY2hfZmVuY2Uoc3luY29iaiwgMCwgMCwgZmVu Y2UpOwotCQlpZiAoKmZlbmNlKQotCQkJcmV0dXJuIDE7Ci0JCXNwaW5fbG9jaygmc3luY29iai0+ bG9jayk7Ci0JfSBlbHNlIHsKLQkJKmZlbmNlID0gTlVMTDsKLQkJZHJtX3N5bmNvYmpfYWRkX2Nh bGxiYWNrX2xvY2tlZChzeW5jb2JqLCBjYiwgZnVuYyk7Ci0JCXJldCA9IDA7CisJCWlmIChwdF92 YWx1ZSA9PSAwKQorCQkJcHRfdmFsdWUgKz0gRFJNX1NZTkNPQkpfQklOQVJZX1BPSU5UOwogCX0K LQlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7CiAKLQlyZXR1cm4gcmV0OworCW11dGV4X2xv Y2soJnN5bmNvYmotPmNiX211dGV4KTsKKwlzcGluX2xvY2soJnN5bmNvYmotPnB0X2xvY2spOwor CSpmZW5jZSA9IGRybV9zeW5jb2JqX2ZpbmRfc2lnbmFsX3B0X2Zvcl9wb2ludChzeW5jb2JqLCBw dF92YWx1ZSk7CisJc3Bpbl91bmxvY2soJnN5bmNvYmotPnB0X2xvY2spOworCWlmICghKmZlbmNl KQorCQlkcm1fc3luY29ial9hZGRfY2FsbGJhY2tfbG9ja2VkKHN5bmNvYmosIGNiLCBmdW5jKTsK KwltdXRleF91bmxvY2soJnN5bmNvYmotPmNiX211dGV4KTsKIH0KIAogdm9pZCBkcm1fc3luY29i al9hZGRfY2FsbGJhY2soc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLAogCQkJICAgICAgc3Ry dWN0IGRybV9zeW5jb2JqX2NiICpjYiwKIAkJCSAgICAgIGRybV9zeW5jb2JqX2Z1bmNfdCBmdW5j KQogewotCXNwaW5fbG9jaygmc3luY29iai0+bG9jayk7CisJbXV0ZXhfbG9jaygmc3luY29iai0+ Y2JfbXV0ZXgpOwogCWRybV9zeW5jb2JqX2FkZF9jYWxsYmFja19sb2NrZWQoc3luY29iaiwgY2Is IGZ1bmMpOwotCXNwaW5fdW5sb2NrKCZzeW5jb2JqLT5sb2NrKTsKKwltdXRleF91bmxvY2soJnN5 bmNvYmotPmNiX211dGV4KTsKIH0KIAogdm9pZCBkcm1fc3luY29ial9yZW1vdmVfY2FsbGJhY2so c3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLAogCQkJCSBzdHJ1Y3QgZHJtX3N5bmNvYmpfY2Ig KmNiKQogewotCXNwaW5fbG9jaygmc3luY29iai0+bG9jayk7CisJbXV0ZXhfbG9jaygmc3luY29i ai0+Y2JfbXV0ZXgpOwogCWxpc3RfZGVsX2luaXQoJmNiLT5ub2RlKTsKLQlzcGluX3VubG9jaygm c3luY29iai0+bG9jayk7CisJbXV0ZXhfdW5sb2NrKCZzeW5jb2JqLT5jYl9tdXRleCk7CiB9CiAK IHN0YXRpYyB2b2lkIGRybV9zeW5jb2JqX2luaXQoc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2Jq KQogewotCXNwaW5fbG9jaygmc3luY29iai0+bG9jayk7CisJc3Bpbl9sb2NrKCZzeW5jb2JqLT5w dF9sb2NrKTsKIAlzeW5jb2JqLT50aW1lbGluZV9jb250ZXh0ID0gZG1hX2ZlbmNlX2NvbnRleHRf YWxsb2MoMSk7CiAJc3luY29iai0+dGltZWxpbmUgPSAwOwogCXN5bmNvYmotPnNpZ25hbF9wb2lu dCA9IDA7CiAJaW5pdF93YWl0cXVldWVfaGVhZCgmc3luY29iai0+d3EpOwogCiAJSU5JVF9MSVNU X0hFQUQoJnN5bmNvYmotPnNpZ25hbF9wdF9saXN0KTsKLQlzcGluX3VubG9jaygmc3luY29iai0+ bG9jayk7CisJc3Bpbl91bmxvY2soJnN5bmNvYmotPnB0X2xvY2spOwogfQogCiBzdGF0aWMgdm9p ZCBkcm1fc3luY29ial9maW5pKHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaikKIHsKIAlzdHJ1 Y3QgZHJtX3N5bmNvYmpfc2lnbmFsX3B0ICpzaWduYWxfcHQgPSBOVUxMLCAqdG1wOwogCi0Jc3Bp bl9sb2NrKCZzeW5jb2JqLT5sb2NrKTsKKwlzcGluX2xvY2soJnN5bmNvYmotPnB0X2xvY2spOwog CWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShzaWduYWxfcHQsIHRtcCwKIAkJCQkgJnN5bmNvYmot PnNpZ25hbF9wdF9saXN0LCBsaXN0KSB7CiAJCWxpc3RfZGVsKCZzaWduYWxfcHQtPmxpc3QpOwog CQlkbWFfZmVuY2VfcHV0KCZzaWduYWxfcHQtPmZlbmNlX2FycmF5LT5iYXNlKTsKIAkJa2ZyZWUo c2lnbmFsX3B0KTsKIAl9Ci0Jc3Bpbl91bmxvY2soJnN5bmNvYmotPmxvY2spOwotfQotCi1zdGF0 aWMgc3RydWN0IGRtYV9mZW5jZQotKmRybV9zeW5jb2JqX2ZpbmRfc2lnbmFsX3B0X2Zvcl9wb2lu dChzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCi0JCQkJICAgICAgdWludDY0X3QgcG9pbnQp Ci17Ci0Jc3RydWN0IGRybV9zeW5jb2JqX3NpZ25hbF9wdCAqc2lnbmFsX3B0OwotCi0JaWYgKChz eW5jb2JqLT50eXBlID09IERSTV9TWU5DT0JKX1RZUEVfVElNRUxJTkUpICYmCi0JICAgIChwb2lu dCA8PSBzeW5jb2JqLT50aW1lbGluZSkpIHsKLQkJc3RydWN0IGRybV9zeW5jb2JqX3N0dWJfZmVu Y2UgKmZlbmNlID0KLQkJCWt6YWxsb2Moc2l6ZW9mKHN0cnVjdCBkcm1fc3luY29ial9zdHViX2Zl bmNlKSwKLQkJCQlHRlBfS0VSTkVMKTsKLQotCQlpZiAoIWZlbmNlKQotCQkJcmV0dXJuIE5VTEw7 Ci0JCXNwaW5fbG9ja19pbml0KCZmZW5jZS0+bG9jayk7Ci0JCWRtYV9mZW5jZV9pbml0KCZmZW5j ZS0+YmFzZSwKLQkJCSAgICAgICAmZHJtX3N5bmNvYmpfc3R1Yl9mZW5jZV9vcHMsCi0JCQkgICAg ICAgJmZlbmNlLT5sb2NrLAotCQkJICAgICAgIHN5bmNvYmotPnRpbWVsaW5lX2NvbnRleHQsCi0J CQkgICAgICAgcG9pbnQpOwotCi0JCWRtYV9mZW5jZV9zaWduYWwoJmZlbmNlLT5iYXNlKTsKLQkJ cmV0dXJuICZmZW5jZS0+YmFzZTsKLQl9Ci0KLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHNpZ25hbF9w dCwgJnN5bmNvYmotPnNpZ25hbF9wdF9saXN0LCBsaXN0KSB7Ci0JCWlmIChwb2ludCA+IHNpZ25h bF9wdC0+dmFsdWUpCi0JCQljb250aW51ZTsKLQkJaWYgKChzeW5jb2JqLT50eXBlID09IERSTV9T WU5DT0JKX1RZUEVfQklOQVJZKSAmJgotCQkgICAgKHBvaW50ICE9IHNpZ25hbF9wdC0+dmFsdWUp KQotCQkJY29udGludWU7Ci0JCXJldHVybiBkbWFfZmVuY2VfZ2V0KCZzaWduYWxfcHQtPmZlbmNl X2FycmF5LT5iYXNlKTsKLQl9Ci0JcmV0dXJuIE5VTEw7CisJc3Bpbl91bmxvY2soJnN5bmNvYmot PnB0X2xvY2spOwogfQogCiBzdGF0aWMgaW50IGRybV9zeW5jb2JqX2NyZWF0ZV9zaWduYWxfcHQo c3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLApAQCAtMjQ5LDE0ICsyNDEsMTQgQEAgc3RhdGlj IGludCBkcm1fc3luY29ial9jcmVhdGVfc2lnbmFsX3B0KHN0cnVjdCBkcm1fc3luY29iaiAqc3lu Y29iaiwKIAlmZW5jZXNbbnVtX2ZlbmNlcysrXSA9IGRtYV9mZW5jZV9nZXQoZmVuY2UpOwogCS8q IHRpbWVsaW5lIHN5bmNvYmogbXVzdCB0YWtlIHRoaXMgZGVwZW5kZW5jeSAqLwogCWlmIChzeW5j b2JqLT50eXBlID09IERSTV9TWU5DT0JKX1RZUEVfVElNRUxJTkUpIHsKLQkJc3Bpbl9sb2NrKCZz eW5jb2JqLT5sb2NrKTsKKwkJc3Bpbl9sb2NrKCZzeW5jb2JqLT5wdF9sb2NrKTsKIAkJaWYgKCFs aXN0X2VtcHR5KCZzeW5jb2JqLT5zaWduYWxfcHRfbGlzdCkpIHsKIAkJCXRhaWxfcHQgPSBsaXN0 X2xhc3RfZW50cnkoJnN5bmNvYmotPnNpZ25hbF9wdF9saXN0LAogCQkJCQkJICBzdHJ1Y3QgZHJt X3N5bmNvYmpfc2lnbmFsX3B0LCBsaXN0KTsKIAkJCWZlbmNlc1tudW1fZmVuY2VzKytdID0KIAkJ CQlkbWFfZmVuY2VfZ2V0KCZ0YWlsX3B0LT5mZW5jZV9hcnJheS0+YmFzZSk7CiAJCX0KLQkJc3Bp bl91bmxvY2soJnN5bmNvYmotPmxvY2spOworCQlzcGluX3VubG9jaygmc3luY29iai0+cHRfbG9j ayk7CiAJfQogCXNpZ25hbF9wdC0+ZmVuY2VfYXJyYXkgPSBkbWFfZmVuY2VfYXJyYXlfY3JlYXRl KG51bV9mZW5jZXMsIGZlbmNlcywKIAkJCQkJCQlzeW5jb2JqLT50aW1lbGluZV9jb250ZXh0LApA QCAtMjY2LDE2ICsyNTgsMTYgQEAgc3RhdGljIGludCBkcm1fc3luY29ial9jcmVhdGVfc2lnbmFs X3B0KHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiwKIAkJZ290byBmYWlsOwogCX0KIAotCXNw aW5fbG9jaygmc3luY29iai0+bG9jayk7CisJc3Bpbl9sb2NrKCZzeW5jb2JqLT5wdF9sb2NrKTsK IAlpZiAoc3luY29iai0+c2lnbmFsX3BvaW50ID49IHBvaW50KSB7CiAJCURSTV9XQVJOKCJBIGxh dGVyIHNpZ25hbCBpcyByZWFkeSEiKTsKLQkJc3Bpbl91bmxvY2soJnN5bmNvYmotPmxvY2spOwor CQlzcGluX3VubG9jaygmc3luY29iai0+cHRfbG9jayk7CiAJCWdvdG8gZXhpc3Q7CiAJfQogCXNp Z25hbF9wdC0+dmFsdWUgPSBwb2ludDsKIAlsaXN0X2FkZF90YWlsKCZzaWduYWxfcHQtPmxpc3Qs ICZzeW5jb2JqLT5zaWduYWxfcHRfbGlzdCk7CiAJc3luY29iai0+c2lnbmFsX3BvaW50ID0gcG9p bnQ7Ci0Jc3Bpbl91bmxvY2soJnN5bmNvYmotPmxvY2spOworCXNwaW5fdW5sb2NrKCZzeW5jb2Jq LT5wdF9sb2NrKTsKIAl3YWtlX3VwX2FsbCgmc3luY29iai0+d3EpOwogCiAJcmV0dXJuIDA7CkBA IC0yOTQsNyArMjg2LDcgQEAgc3RhdGljIHZvaWQgZHJtX3N5bmNvYmpfZ2FyYmFnZV9jb2xsZWN0 aW9uKHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaikKIHsKIAlzdHJ1Y3QgZHJtX3N5bmNvYmpf c2lnbmFsX3B0ICpzaWduYWxfcHQsICp0bXAsICp0YWlsX3B0OwogCi0Jc3Bpbl9sb2NrKCZzeW5j b2JqLT5sb2NrKTsKKwlzcGluX2xvY2soJnN5bmNvYmotPnB0X2xvY2spOwogCXRhaWxfcHQgPSBs aXN0X2xhc3RfZW50cnkoJnN5bmNvYmotPnNpZ25hbF9wdF9saXN0LAogCQkJCSAgc3RydWN0IGRy bV9zeW5jb2JqX3NpZ25hbF9wdCwKIAkJCQkgIGxpc3QpOwpAQCAtMzE1LDcgKzMwNyw3IEBAIHN0 YXRpYyB2b2lkIGRybV9zeW5jb2JqX2dhcmJhZ2VfY29sbGVjdGlvbihzdHJ1Y3QgZHJtX3N5bmNv YmogKnN5bmNvYmopCiAJCX0KIAl9CiAKLQlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7CisJ c3Bpbl91bmxvY2soJnN5bmNvYmotPnB0X2xvY2spOwogfQogLyoqCiAgKiBkcm1fc3luY29ial9y ZXBsYWNlX2ZlbmNlIC0gcmVwbGFjZSBmZW5jZSBpbiBhIHN5bmMgb2JqZWN0LgpAQCAtMzQ0LDEz ICszMzYsMTQgQEAgdm9pZCBkcm1fc3luY29ial9yZXBsYWNlX2ZlbmNlKHN0cnVjdCBkcm1fc3lu Y29iaiAqc3luY29iaiwKIAlkcm1fc3luY29ial9jcmVhdGVfc2lnbmFsX3B0KHN5bmNvYmosIGZl bmNlLCBwdF92YWx1ZSk7CiAJaWYgKGZlbmNlKSB7CiAJCXN0cnVjdCBkcm1fc3luY29ial9jYiAq Y3VyLCAqdG1wOworCQlMSVNUX0hFQUQoY2JfbGlzdCk7CiAKLQkJc3Bpbl9sb2NrKCZzeW5jb2Jq LT5sb2NrKTsKKwkJbXV0ZXhfbG9jaygmc3luY29iai0+Y2JfbXV0ZXgpOwogCQlsaXN0X2Zvcl9l YWNoX2VudHJ5X3NhZmUoY3VyLCB0bXAsICZzeW5jb2JqLT5jYl9saXN0LCBub2RlKSB7CiAJCQls aXN0X2RlbF9pbml0KCZjdXItPm5vZGUpOwogCQkJY3VyLT5mdW5jKHN5bmNvYmosIGN1cik7CiAJ CX0KLQkJc3Bpbl91bmxvY2soJnN5bmNvYmotPmxvY2spOworCQltdXRleF91bmxvY2soJnN5bmNv YmotPmNiX211dGV4KTsKIAl9CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9zeW5jb2JqX3JlcGxhY2Vf ZmVuY2UpOwpAQCAtMzg2LDExICszNzksMTEgQEAgZHJtX3N5bmNvYmpfcG9pbnRfZ2V0KHN0cnVj dCBkcm1fc3luY29iaiAqc3luY29iaiwgdTY0IHBvaW50LCB1NjQgZmxhZ3MsCiAJCWlmIChyZXQg PCAwKQogCQkJcmV0dXJuIHJldDsKIAl9Ci0Jc3Bpbl9sb2NrKCZzeW5jb2JqLT5sb2NrKTsKKwlz cGluX2xvY2soJnN5bmNvYmotPnB0X2xvY2spOwogCSpmZW5jZSA9IGRybV9zeW5jb2JqX2ZpbmRf c2lnbmFsX3B0X2Zvcl9wb2ludChzeW5jb2JqLCBwb2ludCk7CiAJaWYgKCEqZmVuY2UpCiAJCXJl dCA9IC1FSU5WQUw7Ci0Jc3Bpbl91bmxvY2soJnN5bmNvYmotPmxvY2spOworCXNwaW5fdW5sb2Nr KCZzeW5jb2JqLT5wdF9sb2NrKTsKIAlyZXR1cm4gcmV0OwogfQogCkBAIC01MDAsNyArNDkzLDgg QEAgaW50IGRybV9zeW5jb2JqX2NyZWF0ZShzdHJ1Y3QgZHJtX3N5bmNvYmogKipvdXRfc3luY29i aiwgdWludDMyX3QgZmxhZ3MsCiAKIAlrcmVmX2luaXQoJnN5bmNvYmotPnJlZmNvdW50KTsKIAlJ TklUX0xJU1RfSEVBRCgmc3luY29iai0+Y2JfbGlzdCk7Ci0Jc3Bpbl9sb2NrX2luaXQoJnN5bmNv YmotPmxvY2spOworCXNwaW5fbG9ja19pbml0KCZzeW5jb2JqLT5wdF9sb2NrKTsKKwltdXRleF9p bml0KCZzeW5jb2JqLT5jYl9tdXRleCk7CiAJaWYgKGZsYWdzICYgRFJNX1NZTkNPQkpfQ1JFQVRF X1RZUEVfVElNRUxJTkUpCiAJCXN5bmNvYmotPnR5cGUgPSBEUk1fU1lOQ09CSl9UWVBFX1RJTUVM SU5FOwogCWVsc2UKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9zeW5jb2JqLmggYi9pbmNs dWRlL2RybS9kcm1fc3luY29iai5oCmluZGV4IDVlOGM1YzAyN2UwOS4uMjkyNDRjYmNkMDVlIDEw MDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fc3luY29iai5oCisrKyBiL2luY2x1ZGUvZHJtL2Ry bV9zeW5jb2JqLmgKQEAgLTc1LDkgKzc1LDEzIEBAIHN0cnVjdCBkcm1fc3luY29iaiB7CiAgICAg ICAgICAqLwogCXN0cnVjdCBsaXN0X2hlYWQgY2JfbGlzdDsKIAkvKioKLQkgKiBAbG9jazogUHJv dGVjdHMgc3luY29iaiBsaXN0IGFuZCB3cml0ZS1sb2NrcyAmZmVuY2UuCisJICogQHB0X2xvY2s6 IFByb3RlY3RzIHB0IGxpc3QuCiAJICovCi0Jc3BpbmxvY2tfdCBsb2NrOworCXNwaW5sb2NrX3Qg cHRfbG9jazsKKwkvKioKKwkgKiBAY2JfbXV0ZXg6IFByb3RlY3RzIHN5bmNvYmogY2IgbGlzdC4K KwkgKi8KKwlzdHJ1Y3QgbXV0ZXggY2JfbXV0ZXg7CiAJLyoqCiAJICogQGZpbGU6IEEgZmlsZSBi YWNraW5nIGZvciB0aGlzIHN5bmNvYmouCiAJICovCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=