From: Felix Kuehling Subject: [PATCH 07/16] drm/amdkfd: Fix event destruction with pending waiters Date: Fri, 20 Oct 2017 20:23:11 -0400 Message-ID: <1508545400-24338-8-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: Felix Kuehling V2hlbiBhbiBldmVudCB3aXRoIHBlbmRpbmcgd2FpdGVycyBpcyBkZXN0cm95ZWQsIHRob3NlIHdh aXRlcnMgbWF5CmVuZCB1cCBzbGVlcGluZyBmb3JldmVyIHVubGVzcyB0aGV5IGFyZSBub3RpZmll ZCBhbmQgd29rZW4gdXAuCkltcGxlbWVudCB0aGUgbm90aWZpY2F0aW9uIGJ5IGNsZWFyaW5nIHRo ZSB3YWl0ZXItPmV2ZW50IHBvaW50ZXIsCndoaWNoIGJlY29tZXMgaW52YWxpZCBhbnl3YXksIHdo ZW4gdGhlIGV2ZW50IGlzIGZyZWVkLCBhbmQgd2FraW5nCnVwIHRoZSB3YWl0aW5nIHRhc2tzLgoK V2FpdGVycyBvbiBhbiBldmVudCB0aGF0J3MgZGVzdHJveWVkIHJldHVybiBmYWlsdXJlLgoKU2ln bmVkLW9mZi1ieTogRmVsaXggS3VlaGxpbmcgPEZlbGl4Lkt1ZWhsaW5nQGFtZC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2V2ZW50cy5jIHwgNzIgKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygrKSwg MjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQv a2ZkX2V2ZW50cy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2V2ZW50cy5jCmlu ZGV4IDViYjg4Yjc0Li42MDUwZTg4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGtmZC9rZmRfZXZlbnRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2V2 ZW50cy5jCkBAIC0zNDUsMTggKzM0NSwyNCBAQCB2b2lkIGtmZF9ldmVudF9pbml0X3Byb2Nlc3Mo c3RydWN0IGtmZF9wcm9jZXNzICpwKQogCiBzdGF0aWMgdm9pZCBkZXN0cm95X2V2ZW50KHN0cnVj dCBrZmRfcHJvY2VzcyAqcCwgc3RydWN0IGtmZF9ldmVudCAqZXYpCiB7CisJLyogV2FrZSB1cCBw ZW5kaW5nIHdhaXRlcnMuIFRoZXkgd2lsbCByZXR1cm4gZmFpbHVyZSAqLworCXdoaWxlICghbGlz dF9lbXB0eSgmZXYtPndhaXRlcnMpKSB7CisJCXN0cnVjdCBrZmRfZXZlbnRfd2FpdGVyICp3YWl0 ZXIgPQorCQkJbGlzdF9maXJzdF9lbnRyeSgmZXYtPndhaXRlcnMsIHN0cnVjdCBrZmRfZXZlbnRf d2FpdGVyLAorCQkJCQkgd2FpdGVycyk7CisKKwkJd2FpdGVyLT5ldmVudCA9IE5VTEw7CisJCS8q IF9pbml0IGJlY2F1c2UgZnJlZV93YWl0ZXJzIHdpbGwgY2FsbCBsaXN0X2RlbCAqLworCQlsaXN0 X2RlbF9pbml0KCZ3YWl0ZXItPndhaXRlcnMpOworCQl3YWtlX3VwX3Byb2Nlc3Mod2FpdGVyLT5z bGVlcGluZ190YXNrKTsKKwl9CisKIAlpZiAoZXYtPnNpZ25hbF9wYWdlKSB7CiAJCXJlbGVhc2Vf ZXZlbnRfbm90aWZpY2F0aW9uX3Nsb3QoZXYtPnNpZ25hbF9wYWdlLAogCQkJCQkJZXYtPnNpZ25h bF9zbG90X2luZGV4KTsKIAkJcC0+c2lnbmFsX2V2ZW50X2NvdW50LS07CiAJfQogCi0JLyoKLQkg KiBBYmFuZG9uIHRoZSBsaXN0IG9mIHdhaXRlcnMuIEluZGl2aWR1YWwgd2FpdGluZyB0aHJlYWRz IHdpbGwKLQkgKiBjbGVhbiB1cCB0aGVpciBvd24gZGF0YS4KLQkgKi8KLQlsaXN0X2RlbCgmZXYt PndhaXRlcnMpOwotCiAJaGFzaF9kZWwoJmV2LT5ldmVudHMpOwogCWtmcmVlKGV2KTsKIH0KQEAg LTY0NiwyMiArNjUyLDM2IEBAIHN0YXRpYyB2b2lkIGluaXRfZXZlbnRfd2FpdGVyX2FkZF90b193 YWl0bGlzdChzdHJ1Y3Qga2ZkX2V2ZW50X3dhaXRlciAqd2FpdGVyKQogCQlsaXN0X2FkZCgmd2Fp dGVyLT53YWl0ZXJzLCAmZXYtPndhaXRlcnMpOwogfQogCi1zdGF0aWMgYm9vbCB0ZXN0X2V2ZW50 X2NvbmRpdGlvbihib29sIGFsbCwgdWludDMyX3QgbnVtX2V2ZW50cywKKy8qIHRlc3RfZXZlbnRf Y29uZGl0aW9uIC0gVGVzdCBjb25kaXRpb24gb2YgZXZlbnRzIGJlaW5nIHdhaXRlZCBmb3IKKyAq IEBhbGw6ICAgICAgICAgICBSZXR1cm4gY29tcGxldGlvbiBvbmx5IGlmIGFsbCBldmVudHMgaGF2 ZSBzaWduYWxlZAorICogQG51bV9ldmVudHM6ICAgIE51bWJlciBvZiBldmVudHMgdG8gd2FpdCBm b3IKKyAqIEBldmVudF93YWl0ZXJzOiBBcnJheSBvZiBldmVudCB3YWl0ZXJzLCBvbmUgcGVyIGV2 ZW50CisgKgorICogUmV0dXJucyBLRkRfSU9DX1dBSVRfUkVTVUxUX0NPTVBMRVRFIGlmIGFsbCAo b3Igb25lKSBldmVudChzKSBoYXZlCisgKiBzaWduYWxlZC4gUmV0dXJucyBLRkRfSU9DX1dBSVRf UkVTVUxUX1RJTUVPVVQgaWYgbm8gKG9yIG5vdCBhbGwpCisgKiBldmVudHMgaGF2ZSBzaWduYWxl ZC4gUmV0dXJucyBLRkRfSU9DX1dBSVRfUkVTVUxUX0ZBSUwgaWYgYW55IG9mCisgKiB0aGUgZXZl bnRzIGhhdmUgYmVlbiBkZXN0cm95ZWQuCisgKi8KK3N0YXRpYyB1aW50MzJfdCB0ZXN0X2V2ZW50 X2NvbmRpdGlvbihib29sIGFsbCwgdWludDMyX3QgbnVtX2V2ZW50cywKIAkJCQlzdHJ1Y3Qga2Zk X2V2ZW50X3dhaXRlciAqZXZlbnRfd2FpdGVycykKIHsKIAl1aW50MzJfdCBpOwogCXVpbnQzMl90 IGFjdGl2YXRlZF9jb3VudCA9IDA7CiAKIAlmb3IgKGkgPSAwOyBpIDwgbnVtX2V2ZW50czsgaSsr KSB7CisJCWlmICghZXZlbnRfd2FpdGVyc1tpXS5ldmVudCkKKwkJCXJldHVybiBLRkRfSU9DX1dB SVRfUkVTVUxUX0ZBSUw7CisKIAkJaWYgKGV2ZW50X3dhaXRlcnNbaV0uYWN0aXZhdGVkKSB7CiAJ CQlpZiAoIWFsbCkKLQkJCQlyZXR1cm4gdHJ1ZTsKKwkJCQlyZXR1cm4gS0ZEX0lPQ19XQUlUX1JF U1VMVF9DT01QTEVURTsKIAogCQkJYWN0aXZhdGVkX2NvdW50Kys7CiAJCX0KIAl9CiAKLQlyZXR1 cm4gYWN0aXZhdGVkX2NvdW50ID09IG51bV9ldmVudHM7CisJcmV0dXJuIGFjdGl2YXRlZF9jb3Vu dCA9PSBudW1fZXZlbnRzID8KKwkJS0ZEX0lPQ19XQUlUX1JFU1VMVF9DT01QTEVURSA6IEtGRF9J T0NfV0FJVF9SRVNVTFRfVElNRU9VVDsKIH0KIAogLyoKQEAgLTc0NSwxMSArNzY1LDYgQEAgaW50 IGtmZF93YWl0X29uX2V2ZW50cyhzdHJ1Y3Qga2ZkX3Byb2Nlc3MgKnAsCiAKIAltdXRleF9sb2Nr KCZwLT5ldmVudF9tdXRleCk7CiAKLQkvKiBTZXQgdG8gc29tZXRoaW5nIHVucmVhc29uYWJsZSAt IHRoaXMgaXMgcmVhbGx5Ci0JICoganVzdCBhIGJvb2wgZm9yIG5vdy4KLQkgKi8KLQkqd2FpdF9y ZXN1bHQgPSBLRkRfSU9DX1dBSVRfUkVTVUxUX1RJTUVPVVQ7Ci0KIAlmb3IgKGkgPSAwOyBpIDwg bnVtX2V2ZW50czsgaSsrKSB7CiAJCXN0cnVjdCBrZmRfZXZlbnRfZGF0YSBldmVudF9kYXRhOwog CkBAIC03NjYsMTcgKzc4MSwyMiBAQCBpbnQga2ZkX3dhaXRfb25fZXZlbnRzKHN0cnVjdCBrZmRf cHJvY2VzcyAqcCwKIAl9CiAKIAkvKiBDaGVjayBjb25kaXRpb24gb25jZS4gKi8KLQlpZiAodGVz dF9ldmVudF9jb25kaXRpb24oYWxsLCBudW1fZXZlbnRzLCBldmVudF93YWl0ZXJzKSkgewotCQkq d2FpdF9yZXN1bHQgPSBLRkRfSU9DX1dBSVRfUkVTVUxUX0NPTVBMRVRFOworCSp3YWl0X3Jlc3Vs dCA9IHRlc3RfZXZlbnRfY29uZGl0aW9uKGFsbCwgbnVtX2V2ZW50cywgZXZlbnRfd2FpdGVycyk7 CisJaWYgKCp3YWl0X3Jlc3VsdCA9PSBLRkRfSU9DX1dBSVRfUkVTVUxUX0NPTVBMRVRFKSB7CiAJ CXJldCA9IGNvcHlfc2lnbmFsZWRfZXZlbnRfZGF0YShudW1fZXZlbnRzLAogCQkJCQkgICAgICAg ZXZlbnRfd2FpdGVycywgZXZlbnRzKTsKIAkJZ290byBvdXRfdW5sb2NrOwotCX0gZWxzZSB7Ci0J CS8qIEFkZCB0byB3YWl0IGxpc3RzIGlmIHdlIG5lZWQgdG8gd2FpdC4gKi8KLQkJZm9yIChpID0g MDsgaSA8IG51bV9ldmVudHM7IGkrKykKLQkJCWluaXRfZXZlbnRfd2FpdGVyX2FkZF90b193YWl0 bGlzdCgmZXZlbnRfd2FpdGVyc1tpXSk7CisJfSBlbHNlIGlmIChXQVJOX09OKCp3YWl0X3Jlc3Vs dCA9PSBLRkRfSU9DX1dBSVRfUkVTVUxUX0ZBSUwpKSB7CisJCS8qIFRoaXMgc2hvdWxkIG5vdCBo YXBwZW4uIEV2ZW50cyBzaG91bGRuJ3QgYmUKKwkJICogZGVzdHJveWVkIHdoaWxlIHdlJ3JlIGhv bGRpbmcgdGhlIGV2ZW50X211dGV4CisJCSAqLworCQlnb3RvIG91dF91bmxvY2s7CiAJfQogCisJ LyogQWRkIHRvIHdhaXQgbGlzdHMgaWYgd2UgbmVlZCB0byB3YWl0LiAqLworCWZvciAoaSA9IDA7 IGkgPCBudW1fZXZlbnRzOyBpKyspCisJCWluaXRfZXZlbnRfd2FpdGVyX2FkZF90b193YWl0bGlz dCgmZXZlbnRfd2FpdGVyc1tpXSk7CisKIAltdXRleF91bmxvY2soJnAtPmV2ZW50X211dGV4KTsK IAogCXdoaWxlICh0cnVlKSB7CkBAIC04MDksMTUgKzgyOSwxMyBAQCBpbnQga2ZkX3dhaXRfb25f ZXZlbnRzKHN0cnVjdCBrZmRfcHJvY2VzcyAqcCwKIAkJICovCiAJCXNldF9jdXJyZW50X3N0YXRl KFRBU0tfSU5URVJSVVBUSUJMRSk7CiAKLQkJaWYgKHRlc3RfZXZlbnRfY29uZGl0aW9uKGFsbCwg bnVtX2V2ZW50cywgZXZlbnRfd2FpdGVycykpIHsKLQkJCSp3YWl0X3Jlc3VsdCA9IEtGRF9JT0Nf V0FJVF9SRVNVTFRfQ09NUExFVEU7CisJCSp3YWl0X3Jlc3VsdCA9IHRlc3RfZXZlbnRfY29uZGl0 aW9uKGFsbCwgbnVtX2V2ZW50cywKKwkJCQkJCSAgICBldmVudF93YWl0ZXJzKTsKKwkJaWYgKCp3 YWl0X3Jlc3VsdCAhPSBLRkRfSU9DX1dBSVRfUkVTVUxUX1RJTUVPVVQpCiAJCQlicmVhazsKLQkJ fQogCi0JCWlmICh0aW1lb3V0IDw9IDApIHsKLQkJCSp3YWl0X3Jlc3VsdCA9IEtGRF9JT0NfV0FJ VF9SRVNVTFRfVElNRU9VVDsKKwkJaWYgKHRpbWVvdXQgPD0gMCkKIAkJCWJyZWFrOwotCQl9CiAK IAkJdGltZW91dCA9IHNjaGVkdWxlX3RpbWVvdXQodGltZW91dCk7CiAJfQpAQCAtODM3LDYgKzg1 NSw4IEBAIGludCBrZmRfd2FpdF9vbl9ldmVudHMoc3RydWN0IGtmZF9wcm9jZXNzICpwLAogb3V0 OgogCWlmIChyZXQpCiAJCSp3YWl0X3Jlc3VsdCA9IEtGRF9JT0NfV0FJVF9SRVNVTFRfRkFJTDsK KwllbHNlIGlmICgqd2FpdF9yZXN1bHQgPT0gS0ZEX0lPQ19XQUlUX1JFU1VMVF9GQUlMKQorCQly ZXQgPSAtRUlPOwogCiAJcmV0dXJuIHJldDsKIH0KLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK