From: Jay Cornwall Subject: [PATCH v2] drm/amdgpu: Fix KFD oversubscription by tracking queues correctly Date: Thu, 13 Jul 2017 15:23:39 -0500 Message-ID: <1499977419-19065-1-git-send-email-Jay.Cornwall@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 Cc: Jay Cornwall VGhlIG51bWJlciBvZiBjb21wdXRlIHF1ZXVlcyBhdmFpbGFibGUgdG8gdGhlIEtGRCB3YXMgZXJy b25lb3VzbHkKY2FsY3VsYXRlZCBhcyA2NC4gT25seSB0aGUgZmlyc3QgTUVDIGNhbiBleGVjdXRl IGNvbXB1dGUgcXVldWVzIGFuZAppdCBoYXMgMzIgcXVldWUgc2xvdHMuCgpUaGlzIGNhdXNlZCB0 aGUgb3ZlcnN1YnNjcmlwdGlvbiBsaW1pdCB0byBiZSBjYWxjdWxhdGVkIGluY29ycmVjdGx5LAps ZWFkaW5nIHRvIGEgbWlzc2luZyBjaGFpbmVkIHJ1bmxpc3QgY29tbWFuZCBhdCB0aGUgZW5kIG9m IGFuCm92ZXJzdWJzY3JpYmVkIHJ1bmxpc3QuCgp2MjogUmVtb3ZlIHVudXNlZCBudW1fbWVjIGZp ZWxkIHRvIGF2b2lkIGR1cGxpY2F0ZSBsb2dpYwoKQ2hhbmdlLUlkOiBJYzRhMTM5YzA0YjhhNmQw MjVmYmI4MzFhMGE2N2U5ODcyOGJmZTQ2MQpTaWduZWQtb2ZmLWJ5OiBKYXkgQ29ybndhbGwgPEph eS5Db3Jud2FsbEBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9hbWRrZmQuYyAgICAgICAgICAgIHwgMyArLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2Zk L2tmZF9kZXZpY2UuYyAgICAgICAgICAgICAgIHwgNCAtLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGtmZC9rZmRfZGV2aWNlX3F1ZXVlX21hbmFnZXIuYyB8IDcgLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9pbmNsdWRlL2tnZF9rZmRfaW50ZXJmYWNlLmggICAgICAgfCAzIC0tLQogZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fa2ZkLmMgICAgICAgICAgICAgICAgICAgfCAxIC0K IDUgZmlsZXMgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hbWRrZmQuYyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hbWRrZmQuYwppbmRleCA3MDYwZGFmLi44Yzcx MGY3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYW1ka2Zk LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2FtZGtmZC5jCkBAIC0x MTYsNyArMTE2LDYgQEAgdm9pZCBhbWRncHVfYW1ka2ZkX2RldmljZV9pbml0KHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2KQogCWlmIChhZGV2LT5rZmQpIHsKIAkJc3RydWN0IGtnZDJrZmRfc2hh cmVkX3Jlc291cmNlcyBncHVfcmVzb3VyY2VzID0gewogCQkJLmNvbXB1dGVfdm1pZF9iaXRtYXAg PSBnbG9iYWxfY29tcHV0ZV92bWlkX2JpdG1hcCwKLQkJCS5udW1fbWVjID0gYWRldi0+Z2Z4Lm1l Yy5udW1fbWVjLAogCQkJLm51bV9waXBlX3Blcl9tZWMgPSBhZGV2LT5nZngubWVjLm51bV9waXBl X3Blcl9tZWMsCiAJCQkubnVtX3F1ZXVlX3Blcl9waXBlID0gYWRldi0+Z2Z4Lm1lYy5udW1fcXVl dWVfcGVyX3BpcGUsCiAJCQkuZ3B1dm1fc2l6ZSA9ICh1aW50NjRfdClhbWRncHVfdm1fc2l6ZSA8 PCAzMApAQCAtMTQwLDcgKzEzOSw3IEBAIHZvaWQgYW1kZ3B1X2FtZGtmZF9kZXZpY2VfaW5pdChz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJLyogQWNjb3JkaW5nIHRvIGxpbnV4L2JpdG1h cC5oIHdlIHNob3VsZG4ndCB1c2UgYml0bWFwX2NsZWFyIGlmCiAJCSAqIG5iaXRzIGlzIG5vdCBj b21waWxlIHRpbWUgY29uc3RhbnQKIAkJICovCi0JCWxhc3RfdmFsaWRfYml0ID0gYWRldi0+Z2Z4 Lm1lYy5udW1fbWVjCisJCWxhc3RfdmFsaWRfYml0ID0gMSAvKiBvbmx5IGZpcnN0IE1FQyBjYW4g aGF2ZSBjb21wdXRlIHF1ZXVlcyAqLwogCQkJCSogYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJf bWVjCiAJCQkJKiBhZGV2LT5nZngubWVjLm51bV9xdWV1ZV9wZXJfcGlwZTsKIAkJZm9yIChpID0g bGFzdF92YWxpZF9iaXQ7IGkgPCBLR0RfTUFYX1FVRVVFUzsgKytpKQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2RldmljZS5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRrZmQva2ZkX2RldmljZS5jCmluZGV4IDFjZjAwZDQuLjk1ZjkzOTYgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGtmZC9rZmRfZGV2aWNlLmMKQEAgLTQ5NCwxMCArNDk0LDYgQEAgYm9vbCBr Z2Qya2ZkX2RldmljZV9pbml0KHN0cnVjdCBrZmRfZGV2ICprZmQsCiAJfSBlbHNlCiAJCWtmZC0+ bWF4X3Byb2NfcGVyX3F1YW50dW0gPSBod3NfbWF4X2NvbmNfcHJvYzsKIAotCS8qIFdlIG9ubHkg dXNlIHRoZSBmaXJzdCBNRUMgKi8KLQlpZiAoa2ZkLT5zaGFyZWRfcmVzb3VyY2VzLm51bV9tZWMg PiAxKQotCQlrZmQtPnNoYXJlZF9yZXNvdXJjZXMubnVtX21lYyA9IDE7Ci0KIAkvKiBjYWxjdWxh dGUgbWF4IHNpemUgb2YgbXFkcyBuZWVkZWQgZm9yIHF1ZXVlcyAqLwogCXNpemUgPSBtYXhfbnVt X29mX3F1ZXVlc19wZXJfZGV2aWNlICoKIAkJCWtmZC0+ZGV2aWNlX2luZm8tPm1xZF9zaXplX2Fs aWduZWQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfZGV2aWNl X3F1ZXVlX21hbmFnZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2Vf cXVldWVfbWFuYWdlci5jCmluZGV4IDc2MDc5ODkuLjMwNjE0NGYgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2VfcXVldWVfbWFuYWdlci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2VfcXVldWVfbWFuYWdlci5jCkBAIC04 MiwxMyArODIsNiBAQCBzdGF0aWMgYm9vbCBpc19waXBlX2VuYWJsZWQoc3RydWN0IGRldmljZV9x dWV1ZV9tYW5hZ2VyICpkcW0sIGludCBtZWMsIGludCBwaXBlKQogCXJldHVybiBmYWxzZTsKIH0K IAotdW5zaWduZWQgaW50IGdldF9tZWNfbnVtKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAq ZHFtKQotewotCUJVR19PTighZHFtIHx8ICFkcW0tPmRldik7Ci0KLQlyZXR1cm4gZHFtLT5kZXYt PnNoYXJlZF9yZXNvdXJjZXMubnVtX21lYzsKLX0KLQogdW5zaWduZWQgaW50IGdldF9xdWV1ZXNf bnVtKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtKQogewogCUJVR19PTighZHFtIHx8 ICFkcW0tPmRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2luY2x1ZGUva2dk X2tmZF9pbnRlcmZhY2UuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvaW5jbHVkZS9rZ2Rfa2ZkX2lu dGVyZmFjZS5oCmluZGV4IGE0ZDJmZWUuLjEwNzk0YjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvaW5jbHVkZS9rZ2Rfa2ZkX2ludGVyZmFjZS5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvaW5jbHVkZS9rZ2Rfa2ZkX2ludGVyZmFjZS5oCkBAIC0xMDcsOSArMTA3LDYgQEAgc3Ry dWN0IGtnZDJrZmRfc2hhcmVkX3Jlc291cmNlcyB7CiAJLyogQml0IG4gPT0gMSBtZWFucyBWTUlE IG4gaXMgYXZhaWxhYmxlIGZvciBLRkQuICovCiAJdW5zaWduZWQgaW50IGNvbXB1dGVfdm1pZF9i aXRtYXA7CiAKLQkvKiBudW1iZXIgb2YgbWVjIGF2YWlsYWJsZSBmcm9tIHRoZSBoYXJkd2FyZSAq LwotCXVpbnQzMl90IG51bV9tZWM7Ci0KIAkvKiBudW1iZXIgb2YgcGlwZXMgcGVyIG1lYyAqLwog CXVpbnQzMl90IG51bV9waXBlX3Blcl9tZWM7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vcmFkZW9uX2tmZC5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fa2Zk LmMKaW5kZXggNzE5ZWE1MS4uOGY4YzdjMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9yYWRlb25fa2ZkLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fa2Zk LmMKQEAgLTI1MSw3ICsyNTEsNiBAQCB2b2lkIHJhZGVvbl9rZmRfZGV2aWNlX2luaXQoc3RydWN0 IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJaWYgKHJkZXYtPmtmZCkgewogCQlzdHJ1Y3Qga2dkMmtm ZF9zaGFyZWRfcmVzb3VyY2VzIGdwdV9yZXNvdXJjZXMgPSB7CiAJCQkuY29tcHV0ZV92bWlkX2Jp dG1hcCA9IDB4RkYwMCwKLQkJCS5udW1fbWVjID0gMSwKIAkJCS5udW1fcGlwZV9wZXJfbWVjID0g NCwKIAkJCS5udW1fcXVldWVfcGVyX3BpcGUgPSA4LAogCQkJLmdwdXZtX3NpemUgPSAodWludDY0 X3QpcmFkZW9uX3ZtX3NpemUgPDwgMzAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2FtZC1nZngK