From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH] drm/i915: Record more information about the hanging contexts Date: Fri, 27 Jan 2017 10:10:35 +0000 Message-ID: <20170127101035.17221-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id CCFEB6ECD7 for ; Fri, 27 Jan 2017 10:10:39 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id d140so57344255wmd.2 for ; Fri, 27 Jan 2017 02:10:39 -0800 (PST) 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: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org SW5jbHVkZSBleHRyYSBpbmZvcm1hdGlvbiBzdWNoIGFzIHRoZSB1c2VyX2hhbmRsZSBhbmQgaHdf aWQgc28gdGhhdAp1c2Vyc3BhY2UgY2FuIGlkZW50aWZ5IHdoaWNoIG9mIHRoZWlyIGNvbnRleHRz IGh1bmcsIHVzZWZ1bCBpZiB0aGV5IGFyZQpwZXJmb3JtaW5nIHNlbGYtZGlhZ25vc2l0aWNzLgoK U2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNj OiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgIHwgMTQgKysrKystLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ncHVfZXJyb3IuYyB8IDc3ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDU5IGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDFjNTE0NWQwZTUzZC4uZDBhNDhjY2ViMTVi IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTk3MCw2ICs5NzAsMTYgQEAgc3RydWN0IGRy bV9pOTE1X2Vycm9yX3N0YXRlIHsKIAkJdTMyIHNlbWFwaG9yZV9tYm94ZXNbSTkxNV9OVU1fRU5H SU5FUyAtIDFdOwogCQlzdHJ1Y3QgaW50ZWxfaW5zdGRvbmUgaW5zdGRvbmU7CiAKKwkJc3RydWN0 IGRybV9pOTE1X2Vycm9yX2NvbnRleHQgeworCQkJY2hhciBjb21tW1RBU0tfQ09NTV9MRU5dOwor CQkJaW50IHBpZDsKKwkJCXUzMiBoYW5kbGU7CisJCQl1MzIgaHdfaWQ7CisJCQlpbnQgYmFuX3Nj b3JlOworCQkJaW50IGFjdGl2ZTsKKwkJCWludCBndWlsdHk7CisJCX0gY29udGV4dDsKKwogCQlz dHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfb2JqZWN0IHsKIAkJCXU2NCBndHRfb2Zmc2V0OwogCQkJdTY0 IGd0dF9zaXplOwpAQCAtMTAwNiwxMCArMTAxNiw2IEBAIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9z dGF0ZSB7CiAJCQkJdTMyIHBwX2Rpcl9iYXNlOwogCQkJfTsKIAkJfSB2bV9pbmZvOwotCi0JCXBp ZF90IHBpZDsKLQkJY2hhciBjb21tW1RBU0tfQ09NTV9MRU5dOwotCQlpbnQgY29udGV4dF9iYW5z OwogCX0gZW5naW5lW0k5MTVfTlVNX0VOR0lORVNdOwogCiAJc3RydWN0IGRybV9pOTE1X2Vycm9y X2J1ZmZlciB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJv ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCA1Yzg1MzFi YWViMzQuLjNiODIzMzljMjMxNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5j CkBAIC0zODQsNiArMzg0LDE1IEBAIHN0YXRpYyB2b2lkIGVycm9yX3ByaW50X3JlcXVlc3Qoc3Ry dWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAkJICAgZXJxLT5oZWFkLCBlcnEtPnRh aWwpOwogfQogCitzdGF0aWMgdm9pZCBlcnJvcl9wcmludF9jb250ZXh0KHN0cnVjdCBkcm1faTkx NV9lcnJvcl9zdGF0ZV9idWYgKm0sCisJCQkJY29uc3QgY2hhciAqaGVhZGVyLAorCQkJCXN0cnVj dCBkcm1faTkxNV9lcnJvcl9jb250ZXh0ICpjdHgpCit7CisJZXJyX3ByaW50ZihtLCAiJXMlc1sl ZF0gdXNlcl9oYW5kbGUgJWQgaHdfaWQgJWQsIGJhbiBzY29yZSAlZCBndWlsdHkgJWQgYWN0aXZl ICVkXG4iLAorCQkgICBoZWFkZXIsIGN0eC0+Y29tbSwgY3R4LT5waWQsIGN0eC0+aGFuZGxlLCBj dHgtPmh3X2lkLAorCQkgICBjdHgtPmJhbl9zY29yZSwgY3R4LT5ndWlsdHksIGN0eC0+YWN0aXZl KTsKK30KKwogc3RhdGljIHZvaWQgZXJyb3JfcHJpbnRfZW5naW5lKHN0cnVjdCBkcm1faTkxNV9l cnJvcl9zdGF0ZV9idWYgKm0sCiAJCQkgICAgICAgc3RydWN0IGRybV9pOTE1X2Vycm9yX2VuZ2lu ZSAqZWUpCiB7CkBAIC00NTcsNiArNDY2LDcgQEAgc3RhdGljIHZvaWQgZXJyb3JfcHJpbnRfZW5n aW5lKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAKIAllcnJvcl9wcmludF9y ZXF1ZXN0KG0sICIgIEVMU1BbMF06ICIsICZlZS0+ZXhlY2xpc3RbMF0pOwogCWVycm9yX3ByaW50 X3JlcXVlc3QobSwgIiAgRUxTUFsxXTogIiwgJmVlLT5leGVjbGlzdFsxXSk7CisJZXJyb3JfcHJp bnRfY29udGV4dChtLCAiICBBY3RpdmUgY29udGV4dDogIiwgJmVlLT5jb250ZXh0KTsKIH0KIAog dm9pZCBpOTE1X2Vycm9yX3ByaW50ZihzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICpl LCBjb25zdCBjaGFyICpmLCAuLi4pCkBAIC01NjIsMTIgKzU3MiwxMiBAQCBpbnQgaTkxNV9lcnJv cl9zdGF0ZV90b19zdHIoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAogCWZv ciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGVycm9yLT5lbmdpbmUpOyBpKyspIHsKIAkJaWYgKGVy cm9yLT5lbmdpbmVbaV0uaGFuZ2NoZWNrX3N0YWxsZWQgJiYKLQkJICAgIGVycm9yLT5lbmdpbmVb aV0ucGlkICE9IC0xKSB7Ci0JCQllcnJfcHJpbnRmKG0sICJBY3RpdmUgcHJvY2VzcyAob24gcmlu ZyAlcyk6ICVzIFslZF0sIGNvbnRleHQgYmFucyAlZFxuIiwKKwkJICAgIGVycm9yLT5lbmdpbmVb aV0uY29udGV4dC5waWQpIHsKKwkJCWVycl9wcmludGYobSwgIkFjdGl2ZSBwcm9jZXNzIChvbiBy aW5nICVzKTogJXMgWyVkXSwgc2NvcmUgJWRcbiIsCiAJCQkJICAgZW5naW5lX3N0cihpKSwKLQkJ CQkgICBlcnJvci0+ZW5naW5lW2ldLmNvbW0sCi0JCQkJICAgZXJyb3ItPmVuZ2luZVtpXS5waWQs Ci0JCQkJICAgZXJyb3ItPmVuZ2luZVtpXS5jb250ZXh0X2JhbnMpOworCQkJCSAgIGVycm9yLT5l bmdpbmVbaV0uY29udGV4dC5jb21tLAorCQkJCSAgIGVycm9yLT5lbmdpbmVbaV0uY29udGV4dC5w aWQsCisJCQkJICAgZXJyb3ItPmVuZ2luZVtpXS5jb250ZXh0LmJhbl9zY29yZSk7CiAJCX0KIAl9 CiAJZXJyX3ByaW50ZihtLCAiUmVzZXQgY291bnQ6ICV1XG4iLCBlcnJvci0+cmVzZXRfY291bnQp OwpAQCAtNjU4LDExICs2NjgsMTMgQEAgaW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3RyKHN0cnVj dCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJCW9iaiA9IGVlLT5iYXRjaGJ1ZmZlcjsK IAkJaWYgKG9iaikgewogCQkJZXJyX3B1dHMobSwgZGV2X3ByaXYtPmVuZ2luZVtpXS0+bmFtZSk7 Ci0JCQlpZiAoZWUtPnBpZCAhPSAtMSkKLQkJCQllcnJfcHJpbnRmKG0sICIgKHN1Ym1pdHRlZCBi eSAlcyBbJWRdLCBiYW5zICVkKSIsCi0JCQkJCSAgIGVlLT5jb21tLAotCQkJCQkgICBlZS0+cGlk LAotCQkJCQkgICBlZS0+Y29udGV4dF9iYW5zKTsKKwkJCWlmIChlZS0+Y29udGV4dC5waWQpCisJ CQkJZXJyX3ByaW50ZihtLCAiIChzdWJtaXR0ZWQgYnkgJXMgWyVkXSwgY3R4ICVkIFslZF0sIHNj b3JlICVkKSIsCisJCQkJCSAgIGVlLT5jb250ZXh0LmNvbW0sCisJCQkJCSAgIGVlLT5jb250ZXh0 LnBpZCwKKwkJCQkJICAgZWUtPmNvbnRleHQuaGFuZGxlLAorCQkJCQkgICBlZS0+Y29udGV4dC5o d19pZCwKKwkJCQkJICAgZWUtPmNvbnRleHQuYmFuX3Njb3JlKTsKIAkJCWVycl9wcmludGYobSwg IiAtLS0gZ3R0X29mZnNldCA9IDB4JTA4eCAlMDh4XG4iLAogCQkJCSAgIHVwcGVyXzMyX2JpdHMo b2JqLT5ndHRfb2Zmc2V0KSwKIAkJCQkgICBsb3dlcl8zMl9iaXRzKG9iai0+Z3R0X29mZnNldCkp OwpAQCAtMTMwNCw2ICsxMzE2LDI4IEBAIHN0YXRpYyB2b2lkIHJlcXVlc3RfcmVjb3JkX3VzZXJf Ym8oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LAogCWVlLT51c2VyX2JvX2Nv dW50ID0gY291bnQ7CiB9CiAKK3N0YXRpYyB2b2lkIHJlY29yZF9jb250ZXh0KHN0cnVjdCBkcm1f aTkxNV9lcnJvcl9jb250ZXh0ICplLAorCQkJICAgc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0 eCkKK3sKKwlpZiAoY3R4LT5waWQpIHsKKwkJc3RydWN0IHRhc2tfc3RydWN0ICp0YXNrOworCisJ CXJjdV9yZWFkX2xvY2soKTsKKwkJdGFzayA9IHBpZF90YXNrKGN0eC0+cGlkLCBQSURUWVBFX1BJ RCk7CisJCWlmICh0YXNrKSB7CisJCQlzdHJjcHkoZS0+Y29tbSwgdGFzay0+Y29tbSk7CisJCQll LT5waWQgPSB0YXNrLT5waWQ7CisJCX0KKwkJcmN1X3JlYWRfdW5sb2NrKCk7CisJfQorCisJZS0+ aGFuZGxlID0gY3R4LT51c2VyX2hhbmRsZTsKKwllLT5od19pZCA9IGN0eC0+aHdfaWQ7CisJZS0+ YmFuX3Njb3JlID0gY3R4LT5iYW5fc2NvcmU7CisJZS0+Z3VpbHR5ID0gY3R4LT5ndWlsdHlfY291 bnQ7CisJZS0+YWN0aXZlID0gY3R4LT5hY3RpdmVfY291bnQ7Cit9CisKIHN0YXRpYyB2b2lkIGk5 MTVfZ2VtX3JlY29yZF9yaW5ncyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ CQkJICBzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGUgKmVycm9yKQogewpAQCAtMTMxOCw3ICsx MzUyLDYgQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVjb3JkX3JpbmdzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJc3RydWN0IGRybV9pOTE1X2Vycm9yX2VuZ2luZSAqZWUg PSAmZXJyb3ItPmVuZ2luZVtpXTsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1 ZXN0OwogCi0JCWVlLT5waWQgPSAtMTsKIAkJZWUtPmVuZ2luZV9pZCA9IC0xOwogCiAJCWlmICgh ZW5naW5lKQpAQCAtMTMzMywxMSArMTM2NiwxMiBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZWNv cmRfcmluZ3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQlyZXF1ZXN0ID0g aTkxNV9nZW1fZmluZF9hY3RpdmVfcmVxdWVzdChlbmdpbmUpOwogCQlpZiAocmVxdWVzdCkgewog CQkJc3RydWN0IGludGVsX3JpbmcgKnJpbmc7Ci0JCQlzdHJ1Y3QgcGlkICpwaWQ7CiAKIAkJCWVl LT52bSA9IHJlcXVlc3QtPmN0eC0+cHBndHQgPwogCQkJCSZyZXF1ZXN0LT5jdHgtPnBwZ3R0LT5i YXNlIDogJmdndHQtPmJhc2U7CiAKKwkJCXJlY29yZF9jb250ZXh0KCZlZS0+Y29udGV4dCwgcmVx dWVzdC0+Y3R4KTsKKwogCQkJLyogV2UgbmVlZCB0byBjb3B5IHRoZXNlIHRvIGFuIGFub255bW91 cyBidWZmZXIKIAkJCSAqIGFzIHRoZSBzaW1wbGVzdCBtZXRob2QgdG8gYXZvaWQgYmVpbmcgb3Zl cndyaXR0ZW4KIAkJCSAqIGJ5IHVzZXJzcGFjZS4KQEAgLTEzNTYsMTkgKzEzOTAsNiBAQCBzdGF0 aWMgdm9pZCBpOTE1X2dlbV9yZWNvcmRfcmluZ3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCQkJCWk5MTVfZXJyb3Jfb2JqZWN0X2NyZWF0ZShkZXZfcHJpdiwKIAkJCQkJCQkg cmVxdWVzdC0+Y3R4LT5lbmdpbmVbaV0uc3RhdGUpOwogCi0JCQlwaWQgPSByZXF1ZXN0LT5jdHgt PnBpZDsKLQkJCWlmIChwaWQpIHsKLQkJCQlzdHJ1Y3QgdGFza19zdHJ1Y3QgKnRhc2s7Ci0KLQkJ CQlyY3VfcmVhZF9sb2NrKCk7Ci0JCQkJdGFzayA9IHBpZF90YXNrKHBpZCwgUElEVFlQRV9QSUQp OwotCQkJCWlmICh0YXNrKSB7Ci0JCQkJCXN0cmNweShlZS0+Y29tbSwgdGFzay0+Y29tbSk7Ci0J CQkJCWVlLT5waWQgPSB0YXNrLT5waWQ7Ci0JCQkJfQotCQkJCXJjdV9yZWFkX3VubG9jaygpOwot CQkJfQotCiAJCQllcnJvci0+c2ltdWxhdGVkIHw9CiAJCQkJaTkxNV9nZW1fY29udGV4dF9ub19l cnJvcl9jYXB0dXJlKHJlcXVlc3QtPmN0eCk7CiAKQEAgLTE1NzIsMTIgKzE1OTMsMTIgQEAgc3Rh dGljIHZvaWQgaTkxNV9lcnJvcl9jYXB0dXJlX21zZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCQkiR1BVIEhBTkc6IGVjb2RlICVkOiVkOjB4JTA4eCIsCiAJCQlJTlRFTF9H RU4oZGV2X3ByaXYpLCBlbmdpbmVfaWQsIGVjb2RlKTsKIAotCWlmIChlbmdpbmVfaWQgIT0gLTEg JiYgZXJyb3ItPmVuZ2luZVtlbmdpbmVfaWRdLnBpZCAhPSAtMSkKKwlpZiAoZW5naW5lX2lkICE9 IC0xICYmIGVycm9yLT5lbmdpbmVbZW5naW5lX2lkXS5jb250ZXh0LnBpZCkKIAkJbGVuICs9IHNj bnByaW50ZihlcnJvci0+ZXJyb3JfbXNnICsgbGVuLAogCQkJCSBzaXplb2YoZXJyb3ItPmVycm9y X21zZykgLSBsZW4sCiAJCQkJICIsIGluICVzIFslZF0iLAotCQkJCSBlcnJvci0+ZW5naW5lW2Vu Z2luZV9pZF0uY29tbSwKLQkJCQkgZXJyb3ItPmVuZ2luZVtlbmdpbmVfaWRdLnBpZCk7CisJCQkJ IGVycm9yLT5lbmdpbmVbZW5naW5lX2lkXS5jb250ZXh0LmNvbW0sCisJCQkJIGVycm9yLT5lbmdp bmVbZW5naW5lX2lkXS5jb250ZXh0LnBpZCk7CiAKIAlzY25wcmludGYoZXJyb3ItPmVycm9yX21z ZyArIGxlbiwgc2l6ZW9mKGVycm9yLT5lcnJvcl9tc2cpIC0gbGVuLAogCQkgICIsIHJlYXNvbjog JXMsIGFjdGlvbjogJXMiLAotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK