From: Mika Kuoppala Subject: [PATCH] drm/i915: Fix context ban and hang accounting for client Date: Fri, 15 Jun 2018 13:18:28 +0300 Message-ID: <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 mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id A612B6E97E for ; Fri, 15 Jun 2018 10:18:53 +0000 (UTC) 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 dXAgKENocmlzKQoKRml4ZXM6IGIwODNhMDg3MGM3OSAoImRybS9pOTE1OiBBZGQgcGVyIGNsaWVu dCBtYXggY29udGV4dCBiYW4gbGltaXQiKQpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFA bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAg ICAgICB8IDIwICsrKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAg ICAgIHwgNTcgKysrKysrKysrKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgNTQgaW5zZXJ0aW9u cygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNzRkZDg4 ZDg1NjNlLi45M2FhOGU3ZGZhYmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzUyLDE0 ICszNTIsMjAgQEAgc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSB7CiAKIAl1bnNpZ25lZCBp bnQgYnNkX2VuZ2luZTsKIAotLyogQ2xpZW50IGNhbiBoYXZlIGEgbWF4aW11bSBvZiAzIGNvbnRl eHRzIGJhbm5lZCBiZWZvcmUKLSAqIGl0IGlzIGRlbmllZCBvZiBjcmVhdGluZyBuZXcgY29udGV4 dHMuIEFzIG9uZSBjb250ZXh0Ci0gKiBiYW4gbmVlZHMgNCBjb25zZWN1dGl2ZSBoYW5ncywgYW5k IG1vcmUgaWYgdGhlcmUgaXMKLSAqIHByb2dyZXNzIGluIGJldHdlZW4sIHRoaXMgaXMgYSBsYXN0 IHJlc29ydCBzdG9wIGdhcCBtZWFzdXJlCi0gKiB0byBsaW1pdCB0aGUgYmFkbHkgYmVoYXZpbmcg Y2xpZW50cyBhY2Nlc3MgdG8gZ3B1LgorLyogRXZlcnkgY29udGV4dCBiYW4gaW5jcmVtZW50cyBw ZXIgY2xpZW50IGJhbiBzY29yZS4gQWxzbworICogaGFuZ3MgaW4gc2hvcnQgc3VjY2Vzc2lvbiBp bmNyZW1lbnRzIGJhbiBzY29yZS4gSWYgY2xpZW50IHN1ZmZlcnMgMworICogY29udGV4dCBiYW5z LCA5IGhhbmdzIGluIHF1aWNrIHN1Y2Nlc3Npb24gb3IgY29tYmluYXRpb24gb2YgdGhvc2UsCisg KiBpdCBpcyBiYW5uZWQgYW5kIHN1Ym1pdHRpbmcgbW9yZSB3b3JrIHdpbGwgZmFpbC4gVGhpcyBp cyBhIHN0b3AgZ2FwCisgKiBtZWFzdXJlIHRvIGxpbWl0IHRoZSBiYWRseSBiZWhhdmluZyBjbGll bnRzIGFjY2VzcyB0byBncHUuCisgKiBOb3RlIHRoYXQgdW5iYW5uYWJsZSBjb250ZXh0cyBuZXZl ciBpbmNyZW1lbnQgdGhlIGNsaWVudCBiYW4gc2NvcmUuCiAgKi8KLSNkZWZpbmUgSTkxNV9NQVhf Q0xJRU5UX0NPTlRFWFRfQkFOUyAzCi0JYXRvbWljX3QgY29udGV4dF9iYW5zOworI2RlZmluZSBJ OTE1X0NMSUVOVF9TQ09SRV9IQU5HX0ZBU1QJMQorI2RlZmluZSAgIEk5MTVfQ0xJRU5UX0ZBU1Rf SEFOR19KSUZGSUVTICg2MCAqIEhaKQorI2RlZmluZSBJOTE1X0NMSUVOVF9TQ09SRV9DT05URVhU X0JBTiAgIDMKKyNkZWZpbmUgSTkxNV9DTElFTlRfU0NPUkVfQkFOTkVECTkKKwkvKiogYmFuX3Nj b3JlOiBBY2N1bXVsYXRlZCBzY29yZSBvZiBhbGwgY3R4IGJhbnMgYW5kIGZhc3QgaGFuZ3MuICov CisJYXRvbWljX3QgYmFuX3Njb3JlOworCXVuc2lnbmVkIGxvbmcgaGFuZ190aW1lc3RhbXA7CiB9 OwogCiAvKiBJbnRlcmZhY2UgaGlzdG9yeToKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDhk ZDRkMzU2NTVhZi4uZjA2ZmUxYzYzNmU1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI5 NDEsMzIgKzI5NDEsNTQgQEAgaTkxNV9nZW1fb2JqZWN0X3B3cml0ZV9ndHQoc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaiwKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGljIHZvaWQgaTkxNV9n ZW1fY2xpZW50X21hcmtfZ3VpbHR5KHN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVf cHJpdiwKKwkJCQkJY29uc3Qgc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCkKK3sKKwl1bnNp Z25lZCBpbnQgc2NvcmU7CisJdW5zaWduZWQgbG9uZyBwcmV2X2hhbmc7CisKKwlpZiAoaTkxNV9n ZW1fY29udGV4dF9pc19iYW5uZWQoY3R4KSkKKwkJc2NvcmUgPSBJOTE1X0NMSUVOVF9TQ09SRV9D T05URVhUX0JBTjsKKwllbHNlCisJCXNjb3JlID0gMDsKKworCXByZXZfaGFuZyA9IHhjaGcoJmZp bGVfcHJpdi0+aGFuZ190aW1lc3RhbXAsIGppZmZpZXMpOworCWlmICh0aW1lX2JlZm9yZShqaWZm aWVzLCBwcmV2X2hhbmcgKyBJOTE1X0NMSUVOVF9GQVNUX0hBTkdfSklGRklFUykpCisJCXNjb3Jl ICs9IEk5MTVfQ0xJRU5UX1NDT1JFX0hBTkdfRkFTVDsKKworCWlmIChzY29yZSkgeworCQlhdG9t aWNfYWRkKHNjb3JlLCAmZmlsZV9wcml2LT5iYW5fc2NvcmUpOworCisJCURSTV9ERUJVR19EUklW RVIoImNsaWVudCAlczogZ2FpbmVkICV1IGJhbiBzY29yZSwgbm93ICV1XG4iLAorCQkJCSBjdHgt Pm5hbWUsIHNjb3JlLAorCQkJCSBhdG9taWNfcmVhZCgmZmlsZV9wcml2LT5iYW5fc2NvcmUpKTsK Kwl9Cit9CisKIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfbWFya19ndWlsdHkoc3RydWN0 IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCkKIHsKLQlib29sIGJhbm5lZDsKKwl1bnNpZ25lZCBpbnQg c2NvcmU7CisJYm9vbCBiYW5uZWQsIGJhbm5hYmxlOwogCiAJYXRvbWljX2luYygmY3R4LT5ndWls dHlfY291bnQpOwogCi0JYmFubmVkID0gZmFsc2U7Ci0JaWYgKGk5MTVfZ2VtX2NvbnRleHRfaXNf YmFubmFibGUoY3R4KSkgewotCQl1bnNpZ25lZCBpbnQgc2NvcmU7CisJYmFubmFibGUgPSBpOTE1 X2dlbV9jb250ZXh0X2lzX2Jhbm5hYmxlKGN0eCk7CisJc2NvcmUgPSBhdG9taWNfYWRkX3JldHVy bihDT05URVhUX1NDT1JFX0dVSUxUWSwgJmN0eC0+YmFuX3Njb3JlKTsKKwliYW5uZWQgPSBzY29y ZSA+PSBDT05URVhUX1NDT1JFX0JBTl9USFJFU0hPTEQ7CiAKLQkJc2NvcmUgPSBhdG9taWNfYWRk X3JldHVybihDT05URVhUX1NDT1JFX0dVSUxUWSwKLQkJCQkJICAmY3R4LT5iYW5fc2NvcmUpOwot CQliYW5uZWQgPSBzY29yZSA+PSBDT05URVhUX1NDT1JFX0JBTl9USFJFU0hPTEQ7CisJRFJNX0RF QlVHX0RSSVZFUigiY29udGV4dCAlczogZ3VpbHR5ICVkLCBzY29yZSAldSwgYmFuICVzOiVzXG4i LAorCQkJIGN0eC0+bmFtZSwgYXRvbWljX3JlYWQoJmN0eC0+Z3VpbHR5X2NvdW50KSwKKwkJCSBz Y29yZSwgeWVzbm8oYmFubmFibGUpLCB5ZXNubyhiYW5uZWQpKTsKIAotCQlEUk1fREVCVUdfRFJJ VkVSKCJjb250ZXh0ICVzIG1hcmtlZCBndWlsdHkgKHNjb3JlICVkKSBiYW5uZWQ/ICVzXG4iLAot CQkJCSBjdHgtPm5hbWUsIHNjb3JlLCB5ZXNubyhiYW5uZWQpKTsKLQl9Ci0JaWYgKCFiYW5uZWQp CisJLyogQ29vbCBjb250ZXh0cyBkb24ndCBhY2N1bXVsYXRlIGNsaWVudCBiYW4gc2NvcmUgKi8K KwlpZiAoIWJhbm5hYmxlKQogCQlyZXR1cm47CiAKLQlpOTE1X2dlbV9jb250ZXh0X3NldF9iYW5u ZWQoY3R4KTsKLQlpZiAoIUlTX0VSUl9PUl9OVUxMKGN0eC0+ZmlsZV9wcml2KSkgewotCQlhdG9t aWNfaW5jKCZjdHgtPmZpbGVfcHJpdi0+Y29udGV4dF9iYW5zKTsKLQkJRFJNX0RFQlVHX0RSSVZF UigiY2xpZW50ICVzIGhhcyBoYWQgJWQgY29udGV4dCBiYW5uZWRcbiIsCi0JCQkJIGN0eC0+bmFt ZSwgYXRvbWljX3JlYWQoJmN0eC0+ZmlsZV9wcml2LT5jb250ZXh0X2JhbnMpKTsKLQl9CisJaWYg KGJhbm5lZCkKKwkJaTkxNV9nZW1fY29udGV4dF9zZXRfYmFubmVkKGN0eCk7CisKKwlpZiAoIUlT X0VSUl9PUl9OVUxMKGN0eC0+ZmlsZV9wcml2KSkKKwkJaTkxNV9nZW1fY2xpZW50X21hcmtfZ3Vp bHR5KGN0eC0+ZmlsZV9wcml2LCBjdHgpOwogfQogCiBzdGF0aWMgdm9pZCBpOTE1X2dlbV9jb250 ZXh0X21hcmtfaW5ub2NlbnQoc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCkKQEAgLTU4MjAs NiArNTg0Miw3IEBAIGludCBpOTE1X2dlbV9vcGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJSU5JVF9MSVNUX0hFQUQoJmZpbGVfcHJpdi0+ bW0ucmVxdWVzdF9saXN0KTsKIAogCWZpbGVfcHJpdi0+YnNkX2VuZ2luZSA9IC0xOworCWZpbGVf cHJpdi0+aGFuZ190aW1lc3RhbXAgPSBqaWZmaWVzOwogCiAJcmV0ID0gaTkxNV9nZW1fY29udGV4 dF9vcGVuKGk5MTUsIGZpbGUpOwogCWlmIChyZXQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9jb250ZXh0LmMKaW5kZXggZWY2ZWE0YmNkNzczLi5jY2Y0NjNhYjY1NjIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTcwOCw3ICs3MDgsNyBAQCBpbnQgaTkx NV9nZW1fc3dpdGNoX3RvX2tlcm5lbF9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1KQogCiBzdGF0aWMgYm9vbCBjbGllbnRfaXNfYmFubmVkKHN0cnVjdCBkcm1faTkxNV9maWxl X3ByaXZhdGUgKmZpbGVfcHJpdikKIHsKLQlyZXR1cm4gYXRvbWljX3JlYWQoJmZpbGVfcHJpdi0+ Y29udGV4dF9iYW5zKSA+IEk5MTVfTUFYX0NMSUVOVF9DT05URVhUX0JBTlM7CisJcmV0dXJuIGF0 b21pY19yZWFkKCZmaWxlX3ByaXYtPmJhbl9zY29yZSkgPj0gSTkxNV9DTElFTlRfU0NPUkVfQkFO TkVEOwogfQogCiBpbnQgaTkxNV9nZW1fY29udGV4dF9jcmVhdGVfaW9jdGwoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKLS0gCjIuMTcuMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==