From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.20 021/117] drm/scheduler: Fix bad job be re-processed in TDR Date: Tue, 8 Jan 2019 14:24:49 -0500 Message-ID: <20190108192628.121270-21-sashal@kernel.org> References: <20190108192628.121270-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC6066F021 for ; Tue, 8 Jan 2019 19:27:07 +0000 (UTC) In-Reply-To: <20190108192628.121270-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , Sasha Levin , dri-devel@lists.freedesktop.org, Trigger Huang List-Id: dri-devel@lists.freedesktop.org RnJvbTogVHJpZ2dlciBIdWFuZyA8VHJpZ2dlci5IdWFuZ0BhbWQuY29tPgoKWyBVcHN0cmVhbSBj b21taXQgODU3NDRlOWMxMDA2OTZkM2YyMTBlODBiODVmZDU2ZGQxOTc2N2M4MSBdCgpBIGJhZCBq b2IgaXMgdGhlIG9uZSB0cmlnZ2VyZWQgVERSKEluIHRoZSBjdXJyZW50IGFtZGdwdSdzCmltcGxl bWVudGF0aW9uLCBhY3R1YWxseSBhbGwgdGhlIGpvYnMgaW4gdGhlIGN1cnJlbnQgam9xLXF1ZXVl IHdpbGwKYmUgdHJlYXRlZCBhcyBiYWQgam9icykuIEluIHRoZSByZWNvdmVyeSBwcm9jZXNzLCBp dHMgZmVuY2UKd2lsbCBiZSBmYWtlIHNpZ25hbGVkIGFuZCBhcyBhIHJlc3VsdCwgdGhlIHdvcmsg YmVoaW5kIHdpbGwgYmUgc2NoZWR1bGVkCnRvIGRlbGV0ZSBpdCBmcm9tIHRoZSBtaXJyb3IgbGlz dCwgYnV0IGlmIHRoZSBURFIgcHJvY2VzcyBpcyBpbnZva2VkCmJlZm9yZSB0aGUgd29yaydzIGV4 ZWN1dGlvbiwgdGhlbiB0aGlzIGJhZCBqb2IgbWlnaHQgYmUgcHJvY2Vzc2VkIGFnYWluCmFuZCB0 aGUgY2FsbCBkbWFfZmVuY2Vfc2V0X2Vycm9yIHRvIGl0cyBmZW5jZSBpbiBURFIgcHJvY2VzcyB3 aWxsIGxlYWQgdG8Ka2VybmVsIHdhcm5pbmcgdHJhY2U6CgpbICAxNDMuMDMzNjA1XSBXQVJOSU5H OiBDUFU6IDIgUElEOiA1MyBhdCAuL2luY2x1ZGUvbGludXgvZG1hLWZlbmNlLmg6NDM3IGFtZGRy bV9zY2hlZF9qb2JfcmVjb3ZlcnkrMHgxYWYvMHgxYzAgW2FtZF9zY2hlZF0Ka2VybmVsOiBbICAx NDMuMDMzNjA2XSBNb2R1bGVzIGxpbmtlZCBpbjogYW1kZ3B1KE9FKSBhbWRjaGFzaChPRSkgYW1k dHRtKE9FKSBhbWRfc2NoZWQoT0UpIGFtZGtjbChPRSkgYW1kX2lvbW11X3YyIGRybV9rbXNfaGVs cGVyIGRybSBpMmNfYWxnb19iaXQgZmJfc3lzX2ZvcHMgc3lzY29weWFyZWEgc3lzZmlsbHJlY3Qg c3lzaW1nYmx0IGt2bV9pbnRlbCBrdm0gaXJxYnlwYXNzIGNyY3QxMGRpZl9wY2xtdWwgY3JjMzJf cGNsbXVsIGdoYXNoX2NsbXVsbmlfaW50ZWwgcGNiYyBhZXNuaV9pbnRlbCBhZXNfeDg2XzY0IHNu ZF9oZGFfY29kZWNfZ2VuZXJpYyBjcnlwdG9fc2ltZCBnbHVlX2hlbHBlciBjcnlwdGQgc25kX2hk YV9pbnRlbCBzbmRfaGRhX2NvZGVjIHNuZF9oZGFfY29yZSBzbmRfaHdkZXAgc25kX3BjbSBzbmRf c2VxX21pZGkgc25kX3NlcV9taWRpX2V2ZW50IHNuZF9yYXdtaWRpIHNuZF9zZXEgam95ZGV2IHNu ZF9zZXFfZGV2aWNlIHNuZF90aW1lciBzbmQgc291bmRjb3JlIGJpbmZtdF9taXNjIGlucHV0X2xl ZHMgbWFjX2hpZCBzZXJpb19yYXcgbmZzZCBhdXRoX3JwY2dzcyBuZnNfYWNsIGxvY2tkIGdyYWNl IHN1bnJwYyBzY2hfZnFfY29kZWwgcGFycG9ydF9wYyBwcGRldiBscCBwYXJwb3J0IGlwX3RhYmxl cyB4X3RhYmxlcyBhdXRvZnM0IDgxMzl0b28gZmxvcHB5IHBzbW91c2UgODEzOWNwIG1paSBpMmNf cGlpeDQgcGF0YV9hY3BpClsgIDE0My4wMzM2NDldIENQVTogMiBQSUQ6IDUzIENvbW06IGt3b3Jr ZXIvMjoxIFRhaW50ZWQ6IEcgICAgICAgICAgIE9FICAgIDQuMTUuMC0yMC1nZW5lcmljICMyMS1V YnVudHUKWyAgMTQzLjAzMzY1MF0gSGFyZHdhcmUgbmFtZTogUUVNVSBTdGFuZGFyZCBQQyAoaTQ0 MEZYICsgUElJWCwgMTk5NiksIEJJT1MgVWJ1bnR1LTEuOC4yLTF1YnVudHUxIDA0LzAxLzIwMTQK WyAgMTQzLjAzMzY1M10gV29ya3F1ZXVlOiBldmVudHMgZHJtX3NjaGVkX2pvYl90aW1lZG91dCBb YW1kX3NjaGVkXQpbICAxNDMuMDMzNjU2XSBSSVA6IDAwMTA6YW1kZHJtX3NjaGVkX2pvYl9yZWNv dmVyeSsweDFhZi8weDFjMCBbYW1kX3NjaGVkXQpbICAxNDMuMDMzNjU3XSBSU1A6IDAwMTg6ZmZm ZmE5Zjg4MGZlN2Q0OCBFRkxBR1M6IDAwMDEwMjAyClsgIDE0My4wMzM2NTldIFJBWDogMDAwMDAw MDAwMDAwMDAwNyBSQlg6IGZmZmY5Yjk4ZjJiMjRjMDAgUkNYOiBmZmZmOWI5OGVmZWY0ZjA4Clsg IDE0My4wMzM2NjBdIFJEWDogZmZmZjliOThmMmIyNzQwMCBSU0k6IGZmZmY5Yjk4ZjJiMjRjNTAg UkRJOiBmZmZmOWI5OGVmZWY0ZjE4ClsgIDE0My4wMzM2NjBdIFJCUDogZmZmZmE5Zjg4MGZlN2Q5 OCBSMDg6IDAwMDAwMDAwMDAwMDAwMDEgUjA5OiAwMDAwMDAwMDAwMDAwMmI2ClsgIDE0My4wMzM2 NjFdIFIxMDogMDAwMDAwMDAwMDAwMDAwMCBSMTE6IDAwMDAwMDAwMDAwMDAwMDAgUjEyOiBmZmZm OWI5OGVmZWYzNDMwClsgIDE0My4wMzM2NjJdIFIxMzogZmZmZjliOThlZmVmNGQ4MCBSMTQ6IGZm ZmY5Yjk4ZWZlZjRlOTggUjE1OiBmZmZmOWI5OGVhZjkxYzAwClsgIDE0My4wMzM2NjNdIEZTOiAg MDAwMDAwMDAwMDAwMDAwMCgwMDAwKSBHUzpmZmZmOWI5OGZmZDAwMDAwKDAwMDApIGtubEdTOjAw MDAwMDAwMDAwMDAwMDAKWyAgMTQzLjAzMzY2NF0gQ1M6ICAwMDEwIERTOiAwMDAwIEVTOiAwMDAw IENSMDogMDAwMDAwMDA4MDA1MDAzMwpbICAxNDMuMDMzNjY1XSBDUjI6IDAwMDA3ZmM0OWM5NmQ0 NzAgQ1IzOiAwMDAwMDAwMDE0MDBhMDA1IENSNDogMDAwMDAwMDAwMDM2MDZlMApbICAxNDMuMDMz NjY5XSBEUjA6IDAwMDAwMDAwMDAwMDAwMDAgRFIxOiAwMDAwMDAwMDAwMDAwMDAwIERSMjogMDAw MDAwMDAwMDAwMDAwMApbICAxNDMuMDMzNjY5XSBEUjM6IDAwMDAwMDAwMDAwMDAwMDAgRFI2OiAw MDAwMDAwMGZmZmUwZmYwIERSNzogMDAwMDAwMDAwMDAwMDQwMApbICAxNDMuMDMzNjcwXSBDYWxs IFRyYWNlOgpbICAxNDMuMDMzNzQ0XSAgYW1kZ3B1X2RldmljZV9ncHVfcmVjb3ZlcisweDE0NC8w eDgyMCBbYW1kZ3B1XQpbICAxNDMuMDMzNzg4XSAgYW1kZ3B1X2pvYl90aW1lZG91dCsweDliLzB4 YTAgW2FtZGdwdV0KWyAgMTQzLjAzMzc5MV0gIGRybV9zY2hlZF9qb2JfdGltZWRvdXQrMHhjYy8w eDE1MCBbYW1kX3NjaGVkXQpbICAxNDMuMDMzNzk1XSAgcHJvY2Vzc19vbmVfd29yaysweDFkZS8w eDQxMApbICAxNDMuMDMzNzk3XSAgd29ya2VyX3RocmVhZCsweDMyLzB4NDEwClsgIDE0My4wMzM3 OTldICBrdGhyZWFkKzB4MTIxLzB4MTQwClsgIDE0My4wMzM4MDFdICA/IHByb2Nlc3Nfb25lX3dv cmsrMHg0MTAvMHg0MTAKWyAgMTQzLjAzMzgwM10gID8ga3RocmVhZF9jcmVhdGVfd29ya2VyX29u X2NwdSsweDcwLzB4NzAKWyAgMTQzLjAzMzgwNl0gIHJldF9mcm9tX2ZvcmsrMHgzNS8weDQwCgpT byBqdXN0IGRlbGV0ZSB0aGUgYmFkIGpvYiBmcm9tIG1pcnJvciBsaXN0IGRpcmVjdGx5CgpDaGFu Z2VzIGluIHYzOgoJLSBBZGQgYSBoZWxwZXIgZnVuY3Rpb24gdG8gZGVsZXRlIHRoZSBiYWQgam9i cyBmcm9tIG1pcnJvciBsaXN0IGFuZCBjYWxsCgkJaXQgZGlyZWN0bHkgKmJlZm9yZSogdGhlIGpv YidzIGZlbmNlIGlzIHNpZ25hbGVkCgpDaGFuZ2VzIGluIHYyOgoJLSBkZWxldGUgdGhlIHVzZWxl c3MgbGlzdCBub2RlIGNoZWNrCgktIGFsc28gZGVsZXRlIGJhZCBqb2JzIGluIGRybV9zY2hlZF9t YWluIGJlY2F1c2U6CgkJa3RocmVhZF91bnBhcmsocmluZy0+c2NoZWQudGhyZWFkKSB3aWxsIGJl IGludm9rZWQgdmVyeSBlYXJseSBiZWZvcmUKCQlhbWRncHVfZGV2aWNlX2dwdV9yZWNvdmVyJ3Mg cmV0dXJuLCB0aGVuIGRybV9zY2hlZF9tYWluIHdpbGwgaGF2ZQoJCWNoYW5jZSB0byBwaWNrIHVw IGEgbmV3IGpvYiBmcm9tIHRoZSBqb2IgcXVldWUuIFRoaXMgbmV3IGpvYiB3aWxsIGJlCgkJYWRk ZWQgaW50byB0aGUgbWlycm9yIGxpc3QgYW5kIHByb2Nlc3NlZCBieSBhbWRncHVfam9iX3J1biwg YnV0IG1heQoJCW5vdCBiZSBkZWxldGVkIGZyb20gdGhlIG1pcnJvciBsaXN0IG9uIHRpbWUgZHVl IHRvIHRoZSBzYW1lIHJlYXNvbi4KCQlBbmQgZmluYWxseSByZS1wcm9jZXNzZWQgYnkgZHJtX3Nj aGVkX2pvYl9yZWNvdmVyeQoKU2lnbmVkLW9mZi1ieTogVHJpZ2dlciBIdWFuZyA8VHJpZ2dlci5I dWFuZ0BhbWQuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyc3RpYW4ua29l bmlnQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNo ZXJAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3Jn PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9zY2hlZHVsZXIvc2NoZWRfbWFpbi5jIHwgMTcgKysrKysr KysrKysrKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9u KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3NjaGVkdWxlci9zY2hlZF9tYWluLmMg Yi9kcml2ZXJzL2dwdS9kcm0vc2NoZWR1bGVyL3NjaGVkX21haW4uYwppbmRleCA0NGZlNTg3YWFl ZjkuLmM1YmJiZDdjYjJkZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3NjaGVkdWxlci9z Y2hlZF9tYWluLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3NjaGVkdWxlci9zY2hlZF9tYWluLmMK QEAgLTYwLDYgKzYwLDggQEAKIAogc3RhdGljIHZvaWQgZHJtX3NjaGVkX3Byb2Nlc3Nfam9iKHN0 cnVjdCBkbWFfZmVuY2UgKmYsIHN0cnVjdCBkbWFfZmVuY2VfY2IgKmNiKTsKIAorc3RhdGljIHZv aWQgZHJtX3NjaGVkX2V4cGVsX2pvYl91bmxvY2tlZChzdHJ1Y3QgZHJtX3NjaGVkX2pvYiAqc19q b2IpOworCiAvKioKICAqIGRybV9zY2hlZF9ycV9pbml0IC0gaW5pdGlhbGl6ZSBhIGdpdmVuIHJ1 biBxdWV1ZSBzdHJ1Y3QKICAqCkBAIC0yMTUsNyArMjE3LDcgQEAgc3RhdGljIHZvaWQgZHJtX3Nj aGVkX2pvYl9maW5pc2goc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCiAJc3Bpbl9sb2NrKCZz Y2hlZC0+am9iX2xpc3RfbG9jayk7CiAJLyogcmVtb3ZlIGpvYiBmcm9tIHJpbmdfbWlycm9yX2xp c3QgKi8KLQlsaXN0X2RlbCgmc19qb2ItPm5vZGUpOworCWxpc3RfZGVsX2luaXQoJnNfam9iLT5u b2RlKTsKIAkvKiBxdWV1ZSBURFIgZm9yIG5leHQgam9iICovCiAJZHJtX3NjaGVkX3N0YXJ0X3Rp bWVvdXQoc2NoZWQpOwogCXNwaW5fdW5sb2NrKCZzY2hlZC0+am9iX2xpc3RfbG9jayk7CkBAIC0z NzgsNiArMzgwLDggQEAgdm9pZCBkcm1fc2NoZWRfam9iX3JlY292ZXJ5KHN0cnVjdCBkcm1fZ3B1 X3NjaGVkdWxlciAqc2NoZWQpCiAJCQkJCSAgcik7CiAJCQlkbWFfZmVuY2VfcHV0KGZlbmNlKTsK IAkJfSBlbHNlIHsKKwkJCWlmIChzX2ZlbmNlLT5maW5pc2hlZC5lcnJvciA8IDApCisJCQkJZHJt X3NjaGVkX2V4cGVsX2pvYl91bmxvY2tlZChzX2pvYik7CiAJCQlkcm1fc2NoZWRfcHJvY2Vzc19q b2IoTlVMTCwgJnNfZmVuY2UtPmNiKTsKIAkJfQogCQlzcGluX2xvY2soJnNjaGVkLT5qb2JfbGlz dF9sb2NrKTsKQEAgLTU2Nyw2ICs1NzEsOCBAQCBzdGF0aWMgaW50IGRybV9zY2hlZF9tYWluKHZv aWQgKnBhcmFtKQogCQkJCQkgIHIpOwogCQkJZG1hX2ZlbmNlX3B1dChmZW5jZSk7CiAJCX0gZWxz ZSB7CisJCQlpZiAoc19mZW5jZS0+ZmluaXNoZWQuZXJyb3IgPCAwKQorCQkJCWRybV9zY2hlZF9l eHBlbF9qb2JfdW5sb2NrZWQoc2NoZWRfam9iKTsKIAkJCWRybV9zY2hlZF9wcm9jZXNzX2pvYihO VUxMLCAmc19mZW5jZS0+Y2IpOwogCQl9CiAKQEAgLTU3NSw2ICs1ODEsMTUgQEAgc3RhdGljIGlu dCBkcm1fc2NoZWRfbWFpbih2b2lkICpwYXJhbSkKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGljIHZv aWQgZHJtX3NjaGVkX2V4cGVsX2pvYl91bmxvY2tlZChzdHJ1Y3QgZHJtX3NjaGVkX2pvYiAqc19q b2IpCit7CisJc3RydWN0IGRybV9ncHVfc2NoZWR1bGVyICpzY2hlZCA9IHNfam9iLT5zY2hlZDsK KworCXNwaW5fbG9jaygmc2NoZWQtPmpvYl9saXN0X2xvY2spOworCWxpc3RfZGVsX2luaXQoJnNf am9iLT5ub2RlKTsKKwlzcGluX3VubG9jaygmc2NoZWQtPmpvYl9saXN0X2xvY2spOworfQorCiAv KioKICAqIGRybV9zY2hlZF9pbml0IC0gSW5pdCBhIGdwdSBzY2hlZHVsZXIgaW5zdGFuY2UKICAq Ci0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAo=