From: Mika Kuoppala Subject: [PATCH] drm/i915: Fix context ban and hang accounting for client Date: Fri, 15 Jun 2018 13:44:29 +0300 Message-ID: <20180615104429.31477-1-mika.kuoppala@linux.intel.com> References: <20180615101828.24195-1-mika.kuoppala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8F28E6EAD1 for ; Fri, 15 Jun 2018 10:44:53 +0000 (UTC) In-Reply-To: <20180615101828.24195-1-mika.kuoppala@linux.intel.com> 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 List-Id: intel-gfx@lists.freedesktop.org SWYgY2xpZW50IGlzIHNtYXJ0IG9yIGx1Y2t5IGVub3VnaCB0byBjcmVhdGUgYSBuZXcgY29udGV4 dAphZnRlciBlYWNoIGhhbmcsIG91ciBjb250ZXh0IGJhbm5pbmcgbWVjaGFuaXNtIHdpbGwgbmV2 ZXIKY2F0Y2ggdXAsIGFuZCBhcyBhIHJlc3VsdCBvZiB0aGF0IGl0IHdpbGwgYmUgc2F2ZWQgZnJv bQpjbGllbnQgYmFubmluZy4gVGhpcyBjYW4gcmVzdWx0IGluIGEgbmV2ZXIgZW5kaW5nIHN0cmVh ayBvZgpncHUgaGFuZ3MgY2F1c2VkIGJ5IGJhZCBvciBtYWxpY2lvdXMgY2xpZW50LCBwcmV2ZW50 aW5nCmFjY2VzcyBmcm9tIG90aGVyIGxlZ2l0IGdwdSBjbGllbnRzLgoKRml4IHRoaXMgYnkgYWx3 YXlzIGluY3JlbWVudGluZyBwZXIgY2xpZW50IGJhbiBzY29yZSBpZgppdCBoYW5ncyBpbiBzaG9y dCBzdWNjZXNzaW9ucyByZWdhcmRsZXNzIG9mIGNvbnRleHQgYmFuCnNjb3JpbmcuIFRoZSBleGNl cHRpb24gYXJlIG5vbiBiYW5uYWJsZSBjb250ZXh0cy4gVGhleSByZW1haW4KZGV0YWNoZWQgZnJv bSBjbGllbnQgYmFuIHNjb3JpbmcgbWVjaGFuaXNtLgoKdjI6IHhjaGcgdGltZXN0YW1wLCB0aWR5 dXAgKENocmlzKQp2MzogY29tbWVudCwgYmFubmFibGUgJiBiYW5uZWQgdG9nZXRoZXIgKENocmlz KQoKRml4ZXM6IGIwODNhMDg3MGM3OSAoImRybS9pOTE1OiBBZGQgcGVyIGNsaWVudCBtYXggY29u dGV4dCBiYW4gbGltaXQiKQpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+ClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50 ZWwuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgMjEgKysr KysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCA1NyArKysr KysrKysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250 ZXh0LmMgfCAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspLCAyNSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA3NGRkODhkODU2M2UuLjA4MmU4 NGZmMDg4MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zNTIsMTQgKzM1MiwyMSBAQCBz dHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlIHsKIAogCXVuc2lnbmVkIGludCBic2RfZW5naW5l OwogCi0vKiBDbGllbnQgY2FuIGhhdmUgYSBtYXhpbXVtIG9mIDMgY29udGV4dHMgYmFubmVkIGJl Zm9yZQotICogaXQgaXMgZGVuaWVkIG9mIGNyZWF0aW5nIG5ldyBjb250ZXh0cy4gQXMgb25lIGNv bnRleHQKLSAqIGJhbiBuZWVkcyA0IGNvbnNlY3V0aXZlIGhhbmdzLCBhbmQgbW9yZSBpZiB0aGVy ZSBpcwotICogcHJvZ3Jlc3MgaW4gYmV0d2VlbiwgdGhpcyBpcyBhIGxhc3QgcmVzb3J0IHN0b3Ag Z2FwIG1lYXN1cmUKLSAqIHRvIGxpbWl0IHRoZSBiYWRseSBiZWhhdmluZyBjbGllbnRzIGFjY2Vz cyB0byBncHUuCisvKgorICogRXZlcnkgY29udGV4dCBiYW4gaW5jcmVtZW50cyBwZXIgY2xpZW50 IGJhbiBzY29yZS4gQWxzbworICogaGFuZ3MgaW4gc2hvcnQgc3VjY2Vzc2lvbiBpbmNyZW1lbnRz IGJhbiBzY29yZS4gSWYgYmFuIHRocmVzaG9sZAorICogaXMgcmVhY2hlZCwgY2xpZW50IGlzIGNv bnNpZGVyZWQgYmFubmVkIGFuZCBzdWJtaXR0aW5nIG1vcmUgd29yaworICogd2lsbCBmYWlsLiBU aGlzIGlzIGEgc3RvcCBnYXAgbWVhc3VyZSB0byBsaW1pdCB0aGUgYmFkbHkgYmVoYXZpbmcKKyAq IGNsaWVudHMgYWNjZXNzIHRvIGdwdS4gTm90ZSB0aGF0IHVuYmFubmFibGUgY29udGV4dHMgbmV2 ZXIgaW5jcmVtZW50CisgKiB0aGUgY2xpZW50IGJhbiBzY29yZS4KICAqLwotI2RlZmluZSBJOTE1 X01BWF9DTElFTlRfQ09OVEVYVF9CQU5TIDMKLQlhdG9taWNfdCBjb250ZXh0X2JhbnM7CisjZGVm aW5lIEk5MTVfQ0xJRU5UX1NDT1JFX0hBTkdfRkFTVAkxCisjZGVmaW5lICAgSTkxNV9DTElFTlRf RkFTVF9IQU5HX0pJRkZJRVMgKDYwICogSFopCisjZGVmaW5lIEk5MTVfQ0xJRU5UX1NDT1JFX0NP TlRFWFRfQkFOICAgMworI2RlZmluZSBJOTE1X0NMSUVOVF9TQ09SRV9CQU5ORUQJOQorCS8qKiBi YW5fc2NvcmU6IEFjY3VtdWxhdGVkIHNjb3JlIG9mIGFsbCBjdHggYmFucyBhbmQgZmFzdCBoYW5n cy4gKi8KKwlhdG9taWNfdCBiYW5fc2NvcmU7CisJdW5zaWduZWQgbG9uZyBoYW5nX3RpbWVzdGFt cDsKIH07CiAKIC8qIEludGVyZmFjZSBoaXN0b3J5OgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5k ZXggOGRkNGQzNTY1NWFmLi45Nzc5ODJhOTg3YzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpA QCAtMjk0MSwzMiArMjk0MSw1NCBAQCBpOTE1X2dlbV9vYmplY3RfcHdyaXRlX2d0dChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCXJldHVybiAwOwogfQogCitzdGF0aWMgdm9pZCBp OTE1X2dlbV9jbGllbnRfbWFya19ndWlsdHkoc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAq ZmlsZV9wcml2LAorCQkJCQljb25zdCBzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4KQorewor CXVuc2lnbmVkIGludCBzY29yZTsKKwl1bnNpZ25lZCBsb25nIHByZXZfaGFuZzsKKworCWlmIChp OTE1X2dlbV9jb250ZXh0X2lzX2Jhbm5lZChjdHgpKQorCQlzY29yZSA9IEk5MTVfQ0xJRU5UX1ND T1JFX0NPTlRFWFRfQkFOOworCWVsc2UKKwkJc2NvcmUgPSAwOworCisJcHJldl9oYW5nID0geGNo ZygmZmlsZV9wcml2LT5oYW5nX3RpbWVzdGFtcCwgamlmZmllcyk7CisJaWYgKHRpbWVfYmVmb3Jl KGppZmZpZXMsIHByZXZfaGFuZyArIEk5MTVfQ0xJRU5UX0ZBU1RfSEFOR19KSUZGSUVTKSkKKwkJ c2NvcmUgKz0gSTkxNV9DTElFTlRfU0NPUkVfSEFOR19GQVNUOworCisJaWYgKHNjb3JlKSB7CisJ CWF0b21pY19hZGQoc2NvcmUsICZmaWxlX3ByaXYtPmJhbl9zY29yZSk7CisKKwkJRFJNX0RFQlVH X0RSSVZFUigiY2xpZW50ICVzOiBnYWluZWQgJXUgYmFuIHNjb3JlLCBub3cgJXVcbiIsCisJCQkJ IGN0eC0+bmFtZSwgc2NvcmUsCisJCQkJIGF0b21pY19yZWFkKCZmaWxlX3ByaXYtPmJhbl9zY29y ZSkpOworCX0KK30KKwogc3RhdGljIHZvaWQgaTkxNV9nZW1fY29udGV4dF9tYXJrX2d1aWx0eShz dHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4KQogewotCWJvb2wgYmFubmVkOworCXVuc2lnbmVk IGludCBzY29yZTsKKwlib29sIGJhbm5lZCwgYmFubmFibGU7CiAKIAlhdG9taWNfaW5jKCZjdHgt Pmd1aWx0eV9jb3VudCk7CiAKLQliYW5uZWQgPSBmYWxzZTsKLQlpZiAoaTkxNV9nZW1fY29udGV4 dF9pc19iYW5uYWJsZShjdHgpKSB7Ci0JCXVuc2lnbmVkIGludCBzY29yZTsKKwliYW5uYWJsZSA9 IGk5MTVfZ2VtX2NvbnRleHRfaXNfYmFubmFibGUoY3R4KTsKKwlzY29yZSA9IGF0b21pY19hZGRf cmV0dXJuKENPTlRFWFRfU0NPUkVfR1VJTFRZLCAmY3R4LT5iYW5fc2NvcmUpOworCWJhbm5lZCA9 IHNjb3JlID49IENPTlRFWFRfU0NPUkVfQkFOX1RIUkVTSE9MRDsKIAotCQlzY29yZSA9IGF0b21p Y19hZGRfcmV0dXJuKENPTlRFWFRfU0NPUkVfR1VJTFRZLAotCQkJCQkgICZjdHgtPmJhbl9zY29y ZSk7Ci0JCWJhbm5lZCA9IHNjb3JlID49IENPTlRFWFRfU0NPUkVfQkFOX1RIUkVTSE9MRDsKKwlE Uk1fREVCVUdfRFJJVkVSKCJjb250ZXh0ICVzOiBndWlsdHkgJWQsIHNjb3JlICV1LCBiYW4gJXNc biIsCisJCQkgY3R4LT5uYW1lLCBhdG9taWNfcmVhZCgmY3R4LT5ndWlsdHlfY291bnQpLAorCQkJ IHNjb3JlLCB5ZXNubyhiYW5uZWQgJiYgYmFubmFibGUpKTsKIAotCQlEUk1fREVCVUdfRFJJVkVS KCJjb250ZXh0ICVzIG1hcmtlZCBndWlsdHkgKHNjb3JlICVkKSBiYW5uZWQ/ICVzXG4iLAotCQkJ CSBjdHgtPm5hbWUsIHNjb3JlLCB5ZXNubyhiYW5uZWQpKTsKLQl9Ci0JaWYgKCFiYW5uZWQpCisJ LyogQ29vbCBjb250ZXh0cyBkb24ndCBhY2N1bXVsYXRlIGNsaWVudCBiYW4gc2NvcmUgKi8KKwlp ZiAoIWJhbm5hYmxlKQogCQlyZXR1cm47CiAKLQlpOTE1X2dlbV9jb250ZXh0X3NldF9iYW5uZWQo Y3R4KTsKLQlpZiAoIUlTX0VSUl9PUl9OVUxMKGN0eC0+ZmlsZV9wcml2KSkgewotCQlhdG9taWNf aW5jKCZjdHgtPmZpbGVfcHJpdi0+Y29udGV4dF9iYW5zKTsKLQkJRFJNX0RFQlVHX0RSSVZFUigi Y2xpZW50ICVzIGhhcyBoYWQgJWQgY29udGV4dCBiYW5uZWRcbiIsCi0JCQkJIGN0eC0+bmFtZSwg YXRvbWljX3JlYWQoJmN0eC0+ZmlsZV9wcml2LT5jb250ZXh0X2JhbnMpKTsKLQl9CisJaWYgKGJh bm5lZCkKKwkJaTkxNV9nZW1fY29udGV4dF9zZXRfYmFubmVkKGN0eCk7CisKKwlpZiAoIUlTX0VS Ul9PUl9OVUxMKGN0eC0+ZmlsZV9wcml2KSkKKwkJaTkxNV9nZW1fY2xpZW50X21hcmtfZ3VpbHR5 KGN0eC0+ZmlsZV9wcml2LCBjdHgpOwogfQogCiBzdGF0aWMgdm9pZCBpOTE1X2dlbV9jb250ZXh0 X21hcmtfaW5ub2NlbnQoc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCkKQEAgLTU4MjAsNiAr NTg0Miw3IEBAIGludCBpOTE1X2dlbV9vcGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1 LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJSU5JVF9MSVNUX0hFQUQoJmZpbGVfcHJpdi0+bW0u cmVxdWVzdF9saXN0KTsKIAogCWZpbGVfcHJpdi0+YnNkX2VuZ2luZSA9IC0xOworCWZpbGVfcHJp di0+aGFuZ190aW1lc3RhbXAgPSBqaWZmaWVzOwogCiAJcmV0ID0gaTkxNV9nZW1fY29udGV4dF9v cGVuKGk5MTUsIGZpbGUpOwogCWlmIChyZXQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9j b250ZXh0LmMKaW5kZXggZWY2ZWE0YmNkNzczLi5jY2Y0NjNhYjY1NjIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTcwOCw3ICs3MDgsNyBAQCBpbnQgaTkxNV9n ZW1fc3dpdGNoX3RvX2tlcm5lbF9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1 KQogCiBzdGF0aWMgYm9vbCBjbGllbnRfaXNfYmFubmVkKHN0cnVjdCBkcm1faTkxNV9maWxlX3By aXZhdGUgKmZpbGVfcHJpdikKIHsKLQlyZXR1cm4gYXRvbWljX3JlYWQoJmZpbGVfcHJpdi0+Y29u dGV4dF9iYW5zKSA+IEk5MTVfTUFYX0NMSUVOVF9DT05URVhUX0JBTlM7CisJcmV0dXJuIGF0b21p Y19yZWFkKCZmaWxlX3ByaXYtPmJhbl9zY29yZSkgPj0gSTkxNV9DTElFTlRfU0NPUkVfQkFOTkVE OwogfQogCiBpbnQgaTkxNV9nZW1fY29udGV4dF9jcmVhdGVfaW9jdGwoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgdm9pZCAqZGF0YSwKLS0gCjIuMTcuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==