From: Chunming Zhou Subject: [PATCH] drm: fix deadlock of syncobj v5 Date: Tue, 23 Oct 2018 15:57:54 +0800 Message-ID: <20181023075754.13826-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: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: dri-devel@lists.freedesktop.org djI6CmFkZCBhIG11dGV4IGJldHdlZW4gc3luY19jYiBleGVjdXRpb24gYW5kIGZyZWUuCnYzOgpj bGVhcmx5IHNlcGFyYXRpbmcgdGhlIHJvbGVzIGZvciBwdF9sb2NrIGFuZCBjYl9tdXRleCAoQ2hy aXMpCnY0Ogp0aGUgY2JfbXV0ZXggc2hvdWxkIGJlIHRha2VuIG91dHNpZGUgb2YgdGhlIHB0X2xv Y2sgYXJvdW5kIHRoaXMgaWYoKSBibG9jay4gKENocmlzKQp2NToKZml4IGEgY29ybmVyIGNhc2UK ClRlc3RlZCBieSBzeW5jb2JqX2Jhc2ljIGFuZCBzeW5jb2JqX3dhaXQgb2YgaWd0LgoKU2lnbmVk LW9mZi1ieTogQ2h1bm1pbmcgWmhvdSA8ZGF2aWQxLnpob3VAYW1kLmNvbT4KQ2M6IERhbmllbCBW ZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2ls c29uLmNvLnVrPgpDYzogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29t PgpDYzogaW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpSZXZpZXdlZC1ieTogQ2hyaXMg V2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2Ry bV9zeW5jb2JqLmMgfCA1NSArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogaW5j bHVkZS9kcm0vZHJtX3N5bmNvYmouaCAgICAgfCAgOCArKystLQogMiBmaWxlcyBjaGFuZ2VkLCAz NiBpbnNlcnRpb25zKCspLCAyNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vZHJtX3N5bmNvYmouYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fc3luY29iai5jCmluZGV4 IDU3YmY2MDA2Mzk0ZC4uNjc5YTU2NzkxZTM0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX3N5bmNvYmouYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3N5bmNvYmouYwpAQCAtMTI1 LDIzICsxMjUsMjYgQEAgc3RhdGljIGludCBkcm1fc3luY29ial9mZW5jZV9nZXRfb3JfYWRkX2Nh bGxiYWNrKHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiwKIAlpZiAoIXJldCkKIAkJcmV0dXJu IDE7CiAKLQlzcGluX2xvY2soJnN5bmNvYmotPmxvY2spOworCW11dGV4X2xvY2soJnN5bmNvYmot PmNiX211dGV4KTsKIAkvKiBXZSd2ZSBhbHJlYWR5IHRyaWVkIG9uY2UgdG8gZ2V0IGEgZmVuY2Ug YW5kIGZhaWxlZC4gIE5vdyB0aGF0IHdlCiAJICogaGF2ZSB0aGUgbG9jaywgdHJ5IG9uZSBtb3Jl IHRpbWUganVzdCB0byBiZSBzdXJlIHdlIGRvbid0IGFkZCBhCiAJICogY2FsbGJhY2sgd2hlbiBh IGZlbmNlIGhhcyBhbHJlYWR5IGJlZW4gc2V0LgogCSAqLworCXNwaW5fbG9jaygmc3luY29iai0+ cHRfbG9jayk7CiAJaWYgKCFsaXN0X2VtcHR5KCZzeW5jb2JqLT5zaWduYWxfcHRfbGlzdCkpIHsK LQkJc3Bpbl91bmxvY2soJnN5bmNvYmotPmxvY2spOworCQlzcGluX3VubG9jaygmc3luY29iai0+ cHRfbG9jayk7CiAJCWRybV9zeW5jb2JqX3NlYXJjaF9mZW5jZShzeW5jb2JqLCAwLCAwLCBmZW5j ZSk7Ci0JCWlmICgqZmVuY2UpCisJCWlmICgqZmVuY2UpIHsKKwkJCW11dGV4X3VubG9jaygmc3lu Y29iai0+Y2JfbXV0ZXgpOwogCQkJcmV0dXJuIDE7Ci0JCXNwaW5fbG9jaygmc3luY29iai0+bG9j ayk7CisJCX0KIAl9IGVsc2UgeworCQlzcGluX3VubG9jaygmc3luY29iai0+cHRfbG9jayk7CiAJ CSpmZW5jZSA9IE5VTEw7CiAJCWRybV9zeW5jb2JqX2FkZF9jYWxsYmFja19sb2NrZWQoc3luY29i aiwgY2IsIGZ1bmMpOwogCQlyZXQgPSAwOwogCX0KLQlzcGluX3VubG9jaygmc3luY29iai0+bG9j ayk7CisJbXV0ZXhfdW5sb2NrKCZzeW5jb2JqLT5jYl9tdXRleCk7CiAKIAlyZXR1cm4gcmV0Owog fQpAQCAtMTUwLDQzICsxNTMsNDMgQEAgdm9pZCBkcm1fc3luY29ial9hZGRfY2FsbGJhY2soc3Ry dWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLAogCQkJICAgICAgc3RydWN0IGRybV9zeW5jb2JqX2Ni ICpjYiwKIAkJCSAgICAgIGRybV9zeW5jb2JqX2Z1bmNfdCBmdW5jKQogewotCXNwaW5fbG9jaygm c3luY29iai0+bG9jayk7CisJbXV0ZXhfbG9jaygmc3luY29iai0+Y2JfbXV0ZXgpOwogCWRybV9z eW5jb2JqX2FkZF9jYWxsYmFja19sb2NrZWQoc3luY29iaiwgY2IsIGZ1bmMpOwotCXNwaW5fdW5s b2NrKCZzeW5jb2JqLT5sb2NrKTsKKwltdXRleF91bmxvY2soJnN5bmNvYmotPmNiX211dGV4KTsK IH0KIAogdm9pZCBkcm1fc3luY29ial9yZW1vdmVfY2FsbGJhY2soc3RydWN0IGRybV9zeW5jb2Jq ICpzeW5jb2JqLAogCQkJCSBzdHJ1Y3QgZHJtX3N5bmNvYmpfY2IgKmNiKQogewotCXNwaW5fbG9j aygmc3luY29iai0+bG9jayk7CisJbXV0ZXhfbG9jaygmc3luY29iai0+Y2JfbXV0ZXgpOwogCWxp c3RfZGVsX2luaXQoJmNiLT5ub2RlKTsKLQlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7CisJ bXV0ZXhfdW5sb2NrKCZzeW5jb2JqLT5jYl9tdXRleCk7CiB9CiAKIHN0YXRpYyB2b2lkIGRybV9z eW5jb2JqX2luaXQoc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqKQogewotCXNwaW5fbG9jaygm c3luY29iai0+bG9jayk7CisJc3Bpbl9sb2NrKCZzeW5jb2JqLT5wdF9sb2NrKTsKIAlzeW5jb2Jq LT50aW1lbGluZV9jb250ZXh0ID0gZG1hX2ZlbmNlX2NvbnRleHRfYWxsb2MoMSk7CiAJc3luY29i ai0+dGltZWxpbmUgPSAwOwogCXN5bmNvYmotPnNpZ25hbF9wb2ludCA9IDA7CiAJaW5pdF93YWl0 cXVldWVfaGVhZCgmc3luY29iai0+d3EpOwogCiAJSU5JVF9MSVNUX0hFQUQoJnN5bmNvYmotPnNp Z25hbF9wdF9saXN0KTsKLQlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7CisJc3Bpbl91bmxv Y2soJnN5bmNvYmotPnB0X2xvY2spOwogfQogCiBzdGF0aWMgdm9pZCBkcm1fc3luY29ial9maW5p KHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaikKIHsKIAlzdHJ1Y3QgZHJtX3N5bmNvYmpfc2ln bmFsX3B0ICpzaWduYWxfcHQgPSBOVUxMLCAqdG1wOwogCi0Jc3Bpbl9sb2NrKCZzeW5jb2JqLT5s b2NrKTsKKwlzcGluX2xvY2soJnN5bmNvYmotPnB0X2xvY2spOwogCWxpc3RfZm9yX2VhY2hfZW50 cnlfc2FmZShzaWduYWxfcHQsIHRtcCwKIAkJCQkgJnN5bmNvYmotPnNpZ25hbF9wdF9saXN0LCBs aXN0KSB7CiAJCWxpc3RfZGVsKCZzaWduYWxfcHQtPmxpc3QpOwogCQlkbWFfZmVuY2VfcHV0KCZz aWduYWxfcHQtPmZlbmNlX2FycmF5LT5iYXNlKTsKIAkJa2ZyZWUoc2lnbmFsX3B0KTsKIAl9Ci0J c3Bpbl91bmxvY2soJnN5bmNvYmotPmxvY2spOworCXNwaW5fdW5sb2NrKCZzeW5jb2JqLT5wdF9s b2NrKTsKIH0KIAogc3RhdGljIHN0cnVjdCBkbWFfZmVuY2UKQEAgLTI0OSwxNCArMjUyLDE0IEBA IHN0YXRpYyBpbnQgZHJtX3N5bmNvYmpfY3JlYXRlX3NpZ25hbF9wdChzdHJ1Y3QgZHJtX3N5bmNv YmogKnN5bmNvYmosCiAJZmVuY2VzW251bV9mZW5jZXMrK10gPSBkbWFfZmVuY2VfZ2V0KGZlbmNl KTsKIAkvKiB0aW1lbGluZSBzeW5jb2JqIG11c3QgdGFrZSB0aGlzIGRlcGVuZGVuY3kgKi8KIAlp ZiAoc3luY29iai0+dHlwZSA9PSBEUk1fU1lOQ09CSl9UWVBFX1RJTUVMSU5FKSB7Ci0JCXNwaW5f bG9jaygmc3luY29iai0+bG9jayk7CisJCXNwaW5fbG9jaygmc3luY29iai0+cHRfbG9jayk7CiAJ CWlmICghbGlzdF9lbXB0eSgmc3luY29iai0+c2lnbmFsX3B0X2xpc3QpKSB7CiAJCQl0YWlsX3B0 ID0gbGlzdF9sYXN0X2VudHJ5KCZzeW5jb2JqLT5zaWduYWxfcHRfbGlzdCwKIAkJCQkJCSAgc3Ry dWN0IGRybV9zeW5jb2JqX3NpZ25hbF9wdCwgbGlzdCk7CiAJCQlmZW5jZXNbbnVtX2ZlbmNlcysr XSA9CiAJCQkJZG1hX2ZlbmNlX2dldCgmdGFpbF9wdC0+ZmVuY2VfYXJyYXktPmJhc2UpOwogCQl9 Ci0JCXNwaW5fdW5sb2NrKCZzeW5jb2JqLT5sb2NrKTsKKwkJc3Bpbl91bmxvY2soJnN5bmNvYmot PnB0X2xvY2spOwogCX0KIAlzaWduYWxfcHQtPmZlbmNlX2FycmF5ID0gZG1hX2ZlbmNlX2FycmF5 X2NyZWF0ZShudW1fZmVuY2VzLCBmZW5jZXMsCiAJCQkJCQkJc3luY29iai0+dGltZWxpbmVfY29u dGV4dCwKQEAgLTI2NiwxNiArMjY5LDE2IEBAIHN0YXRpYyBpbnQgZHJtX3N5bmNvYmpfY3JlYXRl X3NpZ25hbF9wdChzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCiAJCWdvdG8gZmFpbDsKIAl9 CiAKLQlzcGluX2xvY2soJnN5bmNvYmotPmxvY2spOworCXNwaW5fbG9jaygmc3luY29iai0+cHRf bG9jayk7CiAJaWYgKHN5bmNvYmotPnNpZ25hbF9wb2ludCA+PSBwb2ludCkgewogCQlEUk1fV0FS TigiQSBsYXRlciBzaWduYWwgaXMgcmVhZHkhIik7Ci0JCXNwaW5fdW5sb2NrKCZzeW5jb2JqLT5s b2NrKTsKKwkJc3Bpbl91bmxvY2soJnN5bmNvYmotPnB0X2xvY2spOwogCQlnb3RvIGV4aXN0Owog CX0KIAlzaWduYWxfcHQtPnZhbHVlID0gcG9pbnQ7CiAJbGlzdF9hZGRfdGFpbCgmc2lnbmFsX3B0 LT5saXN0LCAmc3luY29iai0+c2lnbmFsX3B0X2xpc3QpOwogCXN5bmNvYmotPnNpZ25hbF9wb2lu dCA9IHBvaW50OwotCXNwaW5fdW5sb2NrKCZzeW5jb2JqLT5sb2NrKTsKKwlzcGluX3VubG9jaygm c3luY29iai0+cHRfbG9jayk7CiAJd2FrZV91cF9hbGwoJnN5bmNvYmotPndxKTsKIAogCXJldHVy biAwOwpAQCAtMjk0LDcgKzI5Nyw3IEBAIHN0YXRpYyB2b2lkIGRybV9zeW5jb2JqX2dhcmJhZ2Vf Y29sbGVjdGlvbihzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmopCiB7CiAJc3RydWN0IGRybV9z eW5jb2JqX3NpZ25hbF9wdCAqc2lnbmFsX3B0LCAqdG1wLCAqdGFpbF9wdDsKIAotCXNwaW5fbG9j aygmc3luY29iai0+bG9jayk7CisJc3Bpbl9sb2NrKCZzeW5jb2JqLT5wdF9sb2NrKTsKIAl0YWls X3B0ID0gbGlzdF9sYXN0X2VudHJ5KCZzeW5jb2JqLT5zaWduYWxfcHRfbGlzdCwKIAkJCQkgIHN0 cnVjdCBkcm1fc3luY29ial9zaWduYWxfcHQsCiAJCQkJICBsaXN0KTsKQEAgLTMxNSw3ICszMTgs NyBAQCBzdGF0aWMgdm9pZCBkcm1fc3luY29ial9nYXJiYWdlX2NvbGxlY3Rpb24oc3RydWN0IGRy bV9zeW5jb2JqICpzeW5jb2JqKQogCQl9CiAJfQogCi0Jc3Bpbl91bmxvY2soJnN5bmNvYmotPmxv Y2spOworCXNwaW5fdW5sb2NrKCZzeW5jb2JqLT5wdF9sb2NrKTsKIH0KIC8qKgogICogZHJtX3N5 bmNvYmpfcmVwbGFjZV9mZW5jZSAtIHJlcGxhY2UgZmVuY2UgaW4gYSBzeW5jIG9iamVjdC4KQEAg LTM0NCwxMyArMzQ3LDE0IEBAIHZvaWQgZHJtX3N5bmNvYmpfcmVwbGFjZV9mZW5jZShzdHJ1Y3Qg ZHJtX3N5bmNvYmogKnN5bmNvYmosCiAJZHJtX3N5bmNvYmpfY3JlYXRlX3NpZ25hbF9wdChzeW5j b2JqLCBmZW5jZSwgcHRfdmFsdWUpOwogCWlmIChmZW5jZSkgewogCQlzdHJ1Y3QgZHJtX3N5bmNv YmpfY2IgKmN1ciwgKnRtcDsKKwkJTElTVF9IRUFEKGNiX2xpc3QpOwogCi0JCXNwaW5fbG9jaygm c3luY29iai0+bG9jayk7CisJCW11dGV4X2xvY2soJnN5bmNvYmotPmNiX211dGV4KTsKIAkJbGlz dF9mb3JfZWFjaF9lbnRyeV9zYWZlKGN1ciwgdG1wLCAmc3luY29iai0+Y2JfbGlzdCwgbm9kZSkg ewogCQkJbGlzdF9kZWxfaW5pdCgmY3VyLT5ub2RlKTsKIAkJCWN1ci0+ZnVuYyhzeW5jb2JqLCBj dXIpOwogCQl9Ci0JCXNwaW5fdW5sb2NrKCZzeW5jb2JqLT5sb2NrKTsKKwkJbXV0ZXhfdW5sb2Nr KCZzeW5jb2JqLT5jYl9tdXRleCk7CiAJfQogfQogRVhQT1JUX1NZTUJPTChkcm1fc3luY29ial9y ZXBsYWNlX2ZlbmNlKTsKQEAgLTM4NiwxMSArMzkwLDExIEBAIGRybV9zeW5jb2JqX3BvaW50X2dl dChzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosIHU2NCBwb2ludCwgdTY0IGZsYWdzLAogCQlp ZiAocmV0IDwgMCkKIAkJCXJldHVybiByZXQ7CiAJfQotCXNwaW5fbG9jaygmc3luY29iai0+bG9j ayk7CisJc3Bpbl9sb2NrKCZzeW5jb2JqLT5wdF9sb2NrKTsKIAkqZmVuY2UgPSBkcm1fc3luY29i al9maW5kX3NpZ25hbF9wdF9mb3JfcG9pbnQoc3luY29iaiwgcG9pbnQpOwogCWlmICghKmZlbmNl KQogCQlyZXQgPSAtRUlOVkFMOwotCXNwaW5fdW5sb2NrKCZzeW5jb2JqLT5sb2NrKTsKKwlzcGlu X3VubG9jaygmc3luY29iai0+cHRfbG9jayk7CiAJcmV0dXJuIHJldDsKIH0KIApAQCAtNTAwLDcg KzUwNCw4IEBAIGludCBkcm1fc3luY29ial9jcmVhdGUoc3RydWN0IGRybV9zeW5jb2JqICoqb3V0 X3N5bmNvYmosIHVpbnQzMl90IGZsYWdzLAogCiAJa3JlZl9pbml0KCZzeW5jb2JqLT5yZWZjb3Vu dCk7CiAJSU5JVF9MSVNUX0hFQUQoJnN5bmNvYmotPmNiX2xpc3QpOwotCXNwaW5fbG9ja19pbml0 KCZzeW5jb2JqLT5sb2NrKTsKKwlzcGluX2xvY2tfaW5pdCgmc3luY29iai0+cHRfbG9jayk7CisJ bXV0ZXhfaW5pdCgmc3luY29iai0+Y2JfbXV0ZXgpOwogCWlmIChmbGFncyAmIERSTV9TWU5DT0JK X0NSRUFURV9UWVBFX1RJTUVMSU5FKQogCQlzeW5jb2JqLT50eXBlID0gRFJNX1NZTkNPQkpfVFlQ RV9USU1FTElORTsKIAllbHNlCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fc3luY29iai5o IGIvaW5jbHVkZS9kcm0vZHJtX3N5bmNvYmouaAppbmRleCA1ZThjNWMwMjdlMDkuLjI5MjQ0Y2Jj ZDA1ZSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJtX3N5bmNvYmouaAorKysgYi9pbmNsdWRl L2RybS9kcm1fc3luY29iai5oCkBAIC03NSw5ICs3NSwxMyBAQCBzdHJ1Y3QgZHJtX3N5bmNvYmog ewogICAgICAgICAgKi8KIAlzdHJ1Y3QgbGlzdF9oZWFkIGNiX2xpc3Q7CiAJLyoqCi0JICogQGxv Y2s6IFByb3RlY3RzIHN5bmNvYmogbGlzdCBhbmQgd3JpdGUtbG9ja3MgJmZlbmNlLgorCSAqIEBw dF9sb2NrOiBQcm90ZWN0cyBwdCBsaXN0LgogCSAqLwotCXNwaW5sb2NrX3QgbG9jazsKKwlzcGlu bG9ja190IHB0X2xvY2s7CisJLyoqCisJICogQGNiX211dGV4OiBQcm90ZWN0cyBzeW5jb2JqIGNi IGxpc3QuCisJICovCisJc3RydWN0IG11dGV4IGNiX211dGV4OwogCS8qKgogCSAqIEBmaWxlOiBB IGZpbGUgYmFja2luZyBmb3IgdGhpcyBzeW5jb2JqLgogCSAqLwotLSAKMi4xNy4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGlu ZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK