From: Andres Rodriguez Subject: [PATCH 16/22] drm/amdgpu: implement lru amdgpu_queue_mgr policy for compute v2 Date: Thu, 2 Mar 2017 02:03:18 -0500 Message-ID: <20170302070324.7089-17-andresx7@gmail.com> References: <20170302070324.7089-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170302070324.7089-1-andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 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: andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org VXNlIGFuIExSVSBwb2xpY3kgdG8gbWFwIHVzZXJtb2RlIHJpbmdzIHRvIEhXIGNvbXB1dGUgcXVl dWVzLgoKTW9zdCBjb21wdXRlIGNsaWVudHMgdXNlIG9uZSBxdWV1ZSwgYW5kIHVzdWFsbHkgdGhl IGZpcnN0IHF1ZXVlCmF2YWlsYWJsZS4gVGhpcyByZXN1bHRzIGluIHBvb3IgcGlwZS9xdWV1ZSB3 b3JrIGRpc3RyaWJ1dGlvbiB3aGVuCm11bHRpcGxlIGNvbXB1dGUgYXBwcyBhcmUgcnVubmluZy4g SW4gbW9zdCBjYXNlcyBwaXBlIDAgcXVldWUgMCBpcwp0aGUgb25seSBxdWV1ZSB0aGF0IGdldHMg dXNlZC4KCkluIG9yZGVyIHRvIGJldHRlciBkaXN0cmlidXRlIHdvcmsgYWNyb3NzIG11bHRpcGxl IEhXIHF1ZXVlcywgd2UgYWRvcHQKYSBwb2xpY3kgdG8gbWFwIHRoZSB1c2VybW9kZSByaW5nIGlk cyB0byB0aGUgTFJVIEhXIHF1ZXVlLgoKVGhpcyBmaXhlcyBhIGxhcmdlIG1ham9yaXR5IG9mIG11 bHRpLWFwcCBjb21wdXRlIHdvcmtsb2FkcyBzaGFyaW5nIHRoZQpzYW1lIEhXIHF1ZXVlLCBldmVu IHRob3VnaCA3IG90aGVyIHF1ZXVlcyBhcmUgYXZhaWxhYmxlLgoKdjI6IHVzZSByaW5nLT5mdW5j cy0+dHlwZSBpbnN0ZWFkIG9mIHJpbmctPmh3X2lwCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXMgUm9k cmlndWV6IDxhbmRyZXN4N0BnbWFpbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1LmggICAgICAgICAgIHwgIDMgKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9kZXZpY2UuYyAgICB8ICAzICsrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfcXVldWVfbWdyLmMgfCA1MiArKysrKysrKysrKysrKysrKysrKysrKy0KIGRyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmMgICAgICB8IDU3ICsrKysrKysrKysrKysr KysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3JpbmcuaCAg ICAgIHwgIDQgKysKIDUgZmlsZXMgY2hhbmdlZCwgMTE3IGluc2VydGlvbnMoKyksIDIgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCA2N2IzM2FhLi5lMzBj NDdlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaApAQCAtMTUxNyw2ICsxNTE3LDkg QEAgc3RydWN0IGFtZGdwdV9kZXZpY2UgewogCS8qIGxpbmsgYWxsIGd0dCAqLwogCXNwaW5sb2Nr X3QJCQlndHRfbGlzdF9sb2NrOwogCXN0cnVjdCBsaXN0X2hlYWQgICAgICAgICAgICAgICAgZ3R0 X2xpc3Q7CisJLyoga2VlcCBhbiBscnUgbGlzdCBvZiByaW5ncyBieSBIVyBJUCAqLworCXN0cnVj dCBsaXN0X2hlYWQgICAgICAgICAgICAgICAgcmluZ19scnVfbGlzdDsKKwlzdHJ1Y3QgbXV0ZXgg ICAgICAgICAgICAgICAgICAgIHJpbmdfbHJ1X2xpc3RfbG9jazsKIAogfTsKIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCmluZGV4IDk0NGJhMGQuLjFmYjEzMDMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKQEAgLTE3MTUs NiArMTcxNSw5IEBAIGludCBhbWRncHVfZGV2aWNlX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsCiAJSU5JVF9MSVNUX0hFQUQoJmFkZXYtPmd0dF9saXN0KTsKIAlzcGluX2xvY2tfaW5p dCgmYWRldi0+Z3R0X2xpc3RfbG9jayk7CiAKKwlJTklUX0xJU1RfSEVBRCgmYWRldi0+cmluZ19s cnVfbGlzdCk7CisJbXV0ZXhfaW5pdCgmYWRldi0+cmluZ19scnVfbGlzdF9sb2NrKTsKKwogCWlm IChhZGV2LT5hc2ljX3R5cGUgPj0gQ0hJUF9CT05BSVJFKSB7CiAJCWFkZXYtPnJtbWlvX2Jhc2Ug PSBwY2lfcmVzb3VyY2Vfc3RhcnQoYWRldi0+cGRldiwgNSk7CiAJCWFkZXYtPnJtbWlvX3NpemUg PSBwY2lfcmVzb3VyY2VfbGVuKGFkZXYtPnBkZXYsIDUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3F1ZXVlX21nci5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X3F1ZXVlX21nci5jCmluZGV4IDM5MThiZGIuLjBjZjVkMjQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9xdWV1ZV9tZ3IuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcXVldWVfbWdyLmMKQEAgLTk3LDYg Kzk3LDQ0IEBAIHN0YXRpYyBzdHJ1Y3QgYW1kZ3B1X3F1ZXVlX21hcHBlcl9mdW5jcyBpZGVudGl0 eV9tYXBwZXIgPSB7CiAJLm1hcCA9IGFtZGdwdV9pZGVudGl0eV9tYXAKIH07CiAKK3N0YXRpYyBl bnVtIGFtZGdwdV9yaW5nX3R5cGUgYW1kZ3B1X2h3X2lwX3RvX3JpbmdfdHlwZShpbnQgaHdfaXAp Cit7CisJc3dpdGNoIChod19pcCkgeworCWNhc2UgQU1ER1BVX0hXX0lQX0dGWDoKKwkJcmV0dXJu IEFNREdQVV9SSU5HX1RZUEVfR0ZYOworCWNhc2UgQU1ER1BVX0hXX0lQX0NPTVBVVEU6CisJCXJl dHVybiBBTURHUFVfUklOR19UWVBFX0NPTVBVVEU7CisJY2FzZSBBTURHUFVfSFdfSVBfRE1BOgor CQlyZXR1cm4gQU1ER1BVX1JJTkdfVFlQRV9TRE1BOworCWNhc2UgQU1ER1BVX0hXX0lQX1VWRDoK KwkJcmV0dXJuIEFNREdQVV9SSU5HX1RZUEVfVVZEOworCWNhc2UgQU1ER1BVX0hXX0lQX1ZDRToK KwkJcmV0dXJuIEFNREdQVV9SSU5HX1RZUEVfVkNFOworCWRlZmF1bHQ6CisJCURSTV9FUlJPUigi SW52YWxpZCBIVyBJUCBzcGVjaWZpZWQgJWRcbiIsIGh3X2lwKTsKKwkJcmV0dXJuIC0xOworCX0K K30KKworc3RhdGljIGludCBhbWRncHVfbHJ1X21hcChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diwKKwkJCSAgc3RydWN0IGFtZGdwdV9xdWV1ZV9tYXBwZXIgKm1hcHBlciwKKwkJCSAgaW50IHVz ZXJfcmluZywKKwkJCSAgc3RydWN0IGFtZGdwdV9yaW5nICoqb3V0X3JpbmcpCit7CisJaW50IHI7 CisJaW50IHJpbmdfdHlwZSA9IGFtZGdwdV9od19pcF90b19yaW5nX3R5cGUobWFwcGVyLT5od19p cCk7CisKKwlyID0gYW1kZ3B1X3JpbmdfbHJ1X2dldChhZGV2LCByaW5nX3R5cGUsIG91dF9yaW5n KTsKKwlpZiAocikKKwkJcmV0dXJuIHI7CisKKwlyZXR1cm4gdXBkYXRlX2NhY2hlZF9tYXAobWFw cGVyLCB1c2VyX3JpbmcsICpvdXRfcmluZyk7Cit9CisKK3N0YXRpYyBzdHJ1Y3QgYW1kZ3B1X3F1 ZXVlX21hcHBlcl9mdW5jcyBscnVfbWFwcGVyID0geworCS5tYXAgPSBhbWRncHVfbHJ1X21hcAor fTsKKwogaW50IGFtZGdwdV9xdWV1ZV9tZ3JfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diwKIAkJCSAgc3RydWN0IGFtZGdwdV9xdWV1ZV9tZ3IgKm1ncikKIHsKQEAgLTEwNyw4ICsxNDUs MTggQEAgaW50IGFtZGdwdV9xdWV1ZV9tZ3JfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diwKIAogCW1lbXNldChtZ3IsIDAsIHNpemVvZigqbWdyKSk7CiAKLQlmb3IgKGkgPSAwOyBpIDwg QU1ER1BVX01BWF9JUF9OVU07ICsraSkKLQkJYW1kZ3B1X3F1ZXVlX21hcHBlcl9pbml0KCZtZ3It Pm1hcHBlcltpXSwgaSwgJmlkZW50aXR5X21hcHBlcik7CisJZm9yIChpID0gMDsgaSA8IEFNREdQ VV9NQVhfSVBfTlVNOyArK2kpIHsKKwkJc3dpdGNoIChpKSB7CisJCWNhc2UgQU1ER1BVX0hXX0lQ X0NPTVBVVEU6CisJCQlhbWRncHVfcXVldWVfbWFwcGVyX2luaXQoJm1nci0+bWFwcGVyW2ldLCBp LAorCQkJCQkJICZscnVfbWFwcGVyKTsKKwkJCWJyZWFrOworCQlkZWZhdWx0OgorCQkJYW1kZ3B1 X3F1ZXVlX21hcHBlcl9pbml0KCZtZ3ItPm1hcHBlcltpXSwgaSwKKwkJCQkJCSAmaWRlbnRpdHlf bWFwcGVyKTsKKwkJCWJyZWFrOworCQl9CisJfQogCiAJcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmluZy5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3JpbmcuYwppbmRleCA0M2NkNTM5Li4zMWM2Mjc0IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmluZy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yaW5nLmMKQEAgLTE4MCw2ICsxODAsOCBA QCB2b2lkIGFtZGdwdV9yaW5nX2NvbW1pdChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAKIAlp ZiAocmluZy0+ZnVuY3MtPmVuZF91c2UpCiAJCXJpbmctPmZ1bmNzLT5lbmRfdXNlKHJpbmcpOwor CisJYW1kZ3B1X3JpbmdfbHJ1X3RvdWNoKHJpbmctPmFkZXYsIHJpbmcpOwogfQogCiAvKioKQEAg LTI3OSw2ICsyODEsOCBAQCBpbnQgYW1kZ3B1X3JpbmdfaW5pdChzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwgc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCX0KIAlyaW5nLT5wdHJfbWFzayA9 IChyaW5nLT5yaW5nX3NpemUgLyA0KSAtIDE7CiAJcmluZy0+bWF4X2R3ID0gbWF4X2R3OworCUlO SVRfTElTVF9IRUFEKCZyaW5nLT5scnVfbGlzdCk7CisJYW1kZ3B1X3JpbmdfbHJ1X3RvdWNoKGFk ZXYsIHJpbmcpOwogCiAJaWYgKGFtZGdwdV9kZWJ1Z2ZzX3JpbmdfaW5pdChhZGV2LCByaW5nKSkg ewogCQlEUk1fRVJST1IoIkZhaWxlZCB0byByZWdpc3RlciBkZWJ1Z2ZzIGZpbGUgZm9yIHJpbmdz ICFcbiIpOwpAQCAtMzEyLDYgKzMxNiw1OSBAQCB2b2lkIGFtZGdwdV9yaW5nX2Zpbmkoc3RydWN0 IGFtZGdwdV9yaW5nICpyaW5nKQogCXJpbmctPmFkZXYtPnJpbmdzW3JpbmctPmlkeF0gPSBOVUxM OwogfQogCisvKioKKyAqIGFtZGdwdV9yaW5nX2xydV9nZXQgLSBnZXQgdGhlIGxlYXN0IHJlY2Vu dGx5IHVzZWQgcmluZyBmb3IgYSBIVyBJUCBibG9jaworICoKKyAqIEBhZGV2OiBhbWRncHVfZGV2 aWNlIHBvaW50ZXIKKyAqIEB0eXBlOiBhbWRncHVfcmluZ190eXBlIGVudW0KKyAqIEByaW5nOiBv dXRwdXQgcmluZworICoKKyAqIFJldHJlaXZlIHRoZSBhbWRncHVfcmluZyBzdHJ1Y3R1cmUgZm9y IHRoZSBsZWFzdCByZWNlbnRseSB1c2VkIHJpbmcgb2YKKyAqIGEgc3BlY2lmaWMgSVAgYmxvY2sg KGFsbCBhc2ljcykuCisgKiBSZXR1cm5zIDAgb24gc3VjY2VzcywgZXJyb3Igb24gZmFpbHVyZS4K KyAqLworaW50IGFtZGdwdV9yaW5nX2xydV9nZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYs IGludCB0eXBlLAorCQkJc3RydWN0IGFtZGdwdV9yaW5nICoqcmluZykKK3sKKwlzdHJ1Y3QgYW1k Z3B1X3JpbmcgKmVudHJ5OworCisJLyogTGlzdCBpcyBzb3J0ZWQgaW4gTFJVIG9yZGVyLCBmaW5k IGZpcnN0IGVudHJ5IGNvcnJlc3BvbmRpbmcKKwkgKiB0byB0aGUgZGVzaXJlZCBIVyBJUCAqLwor CSpyaW5nID0gTlVMTDsKKwltdXRleF9sb2NrKCZhZGV2LT5yaW5nX2xydV9saXN0X2xvY2spOwor CWxpc3RfZm9yX2VhY2hfZW50cnkoZW50cnksICZhZGV2LT5yaW5nX2xydV9saXN0LCBscnVfbGlz dCkgeworCQlpZiAoZW50cnktPmZ1bmNzLT50eXBlID09IHR5cGUpIHsKKwkJCSpyaW5nID0gZW50 cnk7CisJCQlicmVhazsKKwkJfQorCX0KKwltdXRleF91bmxvY2soJmFkZXYtPnJpbmdfbHJ1X2xp c3RfbG9jayk7CisKKwlpZiAoISpyaW5nKSB7CisJCURSTV9FUlJPUigiUmluZyBMUlUgY29udGFp bnMgbm8gZW50cmllcyBmb3IgcmluZyB0eXBlOiVkXG4iLCB0eXBlKTsKKwkJcmV0dXJuIC1FSU5W QUw7CisJfQorCisJYW1kZ3B1X3JpbmdfbHJ1X3RvdWNoKGFkZXYsIGVudHJ5KTsKKwlyZXR1cm4g MDsKK30KKworLyoqCisgKiBhbWRncHVfcmluZ19scnVfdG91Y2ggLSBtYXJrIGEgcmluZyBhcyBy ZWNlbnRseSBiZWluZyB1c2VkCisgKgorICogQGFkZXY6IGFtZGdwdV9kZXZpY2UgcG9pbnRlcgor ICogQHJpbmc6IHJpbmcgdG8gdG91Y2gKKyAqCisgKiBNb3ZlIEByaW5nIHRvIHRoZSB0aGUgdGFp bCBvZiB0aGUgbHJ1IGxpc3QKKyAqLwordm9pZCBhbWRncHVfcmluZ19scnVfdG91Y2goc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKK3sKKwkvKiBs aXN0X21vdmVfdGFpbCBoYW5kbGVzIHRoZSBjYXNlIHdoZXJlIHJpbmcgaXNuJ3QgcGFydCBvZiB0 aGUgbGlzdCAqLworCW11dGV4X2xvY2soJmFkZXYtPnJpbmdfbHJ1X2xpc3RfbG9jayk7CisJbGlz dF9tb3ZlX3RhaWwoJnJpbmctPmxydV9saXN0LCAmYWRldi0+cmluZ19scnVfbGlzdCk7CisJbXV0 ZXhfdW5sb2NrKCZhZGV2LT5yaW5nX2xydV9saXN0X2xvY2spOworfQorCiAvKgogICogRGVidWdm cyBpbmZvCiAgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9yaW5nLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmluZy5oCmluZGV4 IDM1ZGE1YzUuLmI1MWJkY2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9yaW5nLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Jp bmcuaApAQCAtMTQ0LDYgKzE0NCw3IEBAIHN0cnVjdCBhbWRncHVfcmluZyB7CiAJY29uc3Qgc3Ry dWN0IGFtZGdwdV9yaW5nX2Z1bmNzCSpmdW5jczsKIAlzdHJ1Y3QgYW1kZ3B1X2ZlbmNlX2RyaXZl cglmZW5jZV9kcnY7CiAJc3RydWN0IGFtZF9ncHVfc2NoZWR1bGVyCXNjaGVkOworCXN0cnVjdCBs aXN0X2hlYWQJCWxydV9saXN0OwogCiAJc3RydWN0IGFtZGdwdV9ibwkqcmluZ19vYmo7CiAJdm9s YXRpbGUgdWludDMyX3QJKnJpbmc7CkBAIC0xODYsNSArMTg3LDggQEAgaW50IGFtZGdwdV9yaW5n X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHN0cnVjdCBhbWRncHVfcmluZyAqcmlu ZywKIAkJICAgICB1bnNpZ25lZCByaW5nX3NpemUsIHN0cnVjdCBhbWRncHVfaXJxX3NyYyAqaXJx X3NyYywKIAkJICAgICB1bnNpZ25lZCBpcnFfdHlwZSk7CiB2b2lkIGFtZGdwdV9yaW5nX2Zpbmko c3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKTsKK2ludCBhbWRncHVfcmluZ19scnVfZ2V0KHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2LCBpbnQgaHdfaXAsCisJCQlzdHJ1Y3QgYW1kZ3B1X3Jpbmcg KipyaW5nKTsKK3ZvaWQgYW1kZ3B1X3JpbmdfbHJ1X3RvdWNoKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2LCBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpOwogCiAjZW5kaWYKLS0gCjIuOS4zCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1h aWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK