From: Felix Kuehling Subject: [PATCH] drm/amdgpu: Optimize recursion in amdgpu_vm_update_level Date: Tue, 11 Jul 2017 23:56:09 -0400 Message-ID: <1499831769-3764-1-git-send-email-Felix.Kuehling@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: Felix Kuehling V2hlbiBsb3RzIG9mIHZpcnR1YWwgYWRkcmVzcyBzcGFjZXMgaXMgdXNlZCwgdGhlcmUgY2FuIGJl IHRob3VzYW5kcwpvZiBwYWdlIHRhYmxlIEJPcy4gYW1kZ3B1X3ZtX3VwZGF0ZV9sZXZlbCBpdGVy YXRlcyBvdmVyIGFsbCBvZiB0aGVtCnJlY3Vyc2l2ZWx5LiBJbiBtYW55IGNhc2VzIG9ubHkgYSBm ZXcgb3Igbm9uZSBhdCBhbGwgbmVlZCB0byBiZQp1cGRhdGVkLiBNaW5pbWl6ZSB1bm5lY2Vzc2Fy eSBjb2RlIGV4ZWN1dGlvbiBhbmQgbWVtb3J5IHVzYWdlIGluCnRob3NlIGNhc2VzLgoKVGhpcyBz cGVlZHMgdXAgbWVtb3J5IG1hcHBpbmcgaW4gYSBzeW50aGV0aWMgS0ZEIG1lbW9yeSBtYXBwaW5n CmJlbmNobWFyayBieSByb3VnaGx5IGEgZmFjdG9yIHR3by4KClNpZ25lZC1vZmYtYnk6IEZlbGl4 IEt1ZWhsaW5nIDxGZWxpeC5LdWVobGluZ0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV92bS5jIHwgMTA5ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDU1IGluc2VydGlvbnMoKyksIDU0IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKaW5kZXggZmY1ZGUzYS4uMjNiODk5 YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKQEAgLTEwMjUsNyArMTAy NSw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3ZtX3VwZGF0ZV9sZXZlbChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiwKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2JvICpzaGFkb3c7CiAJc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nID0gTlVMTDsKLQl1aW50NjRfdCBwZF9hZGRyLCBzaGFkb3dfYWRkciA9IDA7 CisJdWludDY0X3QgcGRfYWRkciA9IDAsIHNoYWRvd19hZGRyID0gMDsKIAl1aW50MzJfdCBpbmNy ID0gYW1kZ3B1X3ZtX2JvX3NpemUoYWRldiwgbGV2ZWwgKyAxKTsKIAl1aW50NjRfdCBsYXN0X3Bk ZSA9IH4wLCBsYXN0X3B0ID0gfjAsIGxhc3Rfc2hhZG93ID0gfjA7CiAJdW5zaWduZWQgY291bnQg PSAwLCBwdF9pZHgsIG5kdyA9IDA7CkBAIC0xMDQ0LDQ4ICsxMDQ0LDE5IEBAIHN0YXRpYyBpbnQg YW1kZ3B1X3ZtX3VwZGF0ZV9sZXZlbChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAogCVdB Uk5fT04odm0tPnVzZV9jcHVfZm9yX3VwZGF0ZSAmJiBzaGFkb3cpOwogCWlmICh2bS0+dXNlX2Nw dV9mb3JfdXBkYXRlICYmICFzaGFkb3cpIHsKLQkJciA9IGFtZGdwdV9ib19rbWFwKHBhcmVudC0+ Ym8sICh2b2lkICoqKSZwZF9hZGRyKTsKLQkJaWYgKHIpCi0JCQlyZXR1cm4gcjsKLQkJciA9IGFt ZGdwdV92bV9ib193YWl0KGFkZXYsIHBhcmVudC0+Ym8pOwotCQlpZiAodW5saWtlbHkocikpIHsK LQkJCWFtZGdwdV9ib19rdW5tYXAocGFyZW50LT5ibyk7Ci0JCQlyZXR1cm4gcjsKLQkJfQorCQkv KiBEZWZlciBrbWFwcGluZyB1bnRpbCBpdCdzIGFjdHVhbGx5IG5lZWRlZC4gU29tZQorCQkgKiBQ REJzIG1heSBuZWVkIG5vIHVwZGF0ZSBhdCBhbGwKKwkJICovCiAJCXBhcmFtcy5mdW5jID0gYW1k Z3B1X3ZtX2NwdV9zZXRfcHRlczsKKwkJcGFyYW1zLmliID0gKHZvaWQgKikobG9uZyktMTsKIAl9 IGVsc2UgewotCQlpZiAoc2hhZG93KSB7Ci0JCQlyID0gYW1kZ3B1X3R0bV9iaW5kKCZzaGFkb3ct PnRibywgJnNoYWRvdy0+dGJvLm1lbSk7Ci0JCQlpZiAocikKLQkJCQlyZXR1cm4gcjsKLQkJfQot CQlyaW5nID0gY29udGFpbmVyX29mKHZtLT5lbnRpdHkuc2NoZWQsIHN0cnVjdCBhbWRncHVfcmlu ZywKLQkJCQkgICAgc2NoZWQpOwotCi0JCS8qIHBhZGRpbmcsIGV0Yy4gKi8KLQkJbmR3ID0gNjQ7 Ci0KLQkJLyogYXNzdW1lIHRoZSB3b3JzdCBjYXNlICovCi0JCW5kdyArPSBwYXJlbnQtPmxhc3Rf ZW50cnlfdXNlZCAqIDY7Ci0KLQkJcGRfYWRkciA9IGFtZGdwdV9ib19ncHVfb2Zmc2V0KHBhcmVu dC0+Ym8pOwotCi0JCWlmIChzaGFkb3cpIHsKLQkJCXNoYWRvd19hZGRyID0gYW1kZ3B1X2JvX2dw dV9vZmZzZXQoc2hhZG93KTsKLQkJCW5kdyAqPSAyOwotCQl9IGVsc2UgewotCQkJc2hhZG93X2Fk ZHIgPSAwOwotCQl9Ci0KLQkJciA9IGFtZGdwdV9qb2JfYWxsb2Nfd2l0aF9pYihhZGV2LCBuZHcg KiA0LCAmam9iKTsKLQkJaWYgKHIpCi0JCQlyZXR1cm4gcjsKLQotCQlwYXJhbXMuaWIgPSAmam9i LT5pYnNbMF07CisJCS8qIERlZmVyIElCIGFsbG9jYXRpb24gdW50aWwgaXQncyBhY3R1YWxseQor CQkgKiBuZWVkZWQuIFNvbWUgUERCcyBtYXkgbmVlZCBubyB1cGRhdGUgYXQgYWxsCisJCSAqLwor CQlwYXJhbXMuaWIgPSBOVUxMOwogCQlwYXJhbXMuZnVuYyA9IGFtZGdwdV92bV9kb19zZXRfcHRl czsKIAl9CiAKLQogCS8qIHdhbGsgb3ZlciB0aGUgYWRkcmVzcyBzcGFjZSBhbmQgdXBkYXRlIHRo ZSBkaXJlY3RvcnkgKi8KIAlmb3IgKHB0X2lkeCA9IDA7IHB0X2lkeCA8PSBwYXJlbnQtPmxhc3Rf ZW50cnlfdXNlZDsgKytwdF9pZHgpIHsKIAkJc3RydWN0IGFtZGdwdV9ibyAqYm8gPSBwYXJlbnQt PmVudHJpZXNbcHRfaWR4XS5ibzsKQEAgLTEwOTQsMjIgKzEwNjUsNTMgQEAgc3RhdGljIGludCBh bWRncHVfdm1fdXBkYXRlX2xldmVsKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQlpZiAo Ym8gPT0gTlVMTCkKIAkJCWNvbnRpbnVlOwogCi0JCWlmIChiby0+c2hhZG93KSB7Ci0JCQlzdHJ1 Y3QgYW1kZ3B1X2JvICpwdF9zaGFkb3cgPSBiby0+c2hhZG93OwotCi0JCQlyID0gYW1kZ3B1X3R0 bV9iaW5kKCZwdF9zaGFkb3ctPnRibywKLQkJCQkJICAgICZwdF9zaGFkb3ctPnRiby5tZW0pOwot CQkJaWYgKHIpCi0JCQkJcmV0dXJuIHI7Ci0JCX0KLQotCQlwdCA9IGFtZGdwdV9ib19ncHVfb2Zm c2V0KGJvKTsKLQkJcHQgPSBhbWRncHVfZ2FydF9nZXRfdm1fcGRlKGFkZXYsIHB0KTsKKwkJcHQg PSBhbWRncHVfZ2FydF9nZXRfdm1fcGRlKGFkZXYsIGJvLT50Ym8ub2Zmc2V0KTsKIAkJaWYgKHBh cmVudC0+ZW50cmllc1twdF9pZHhdLmFkZHIgPT0gcHQpCiAJCQljb250aW51ZTsKIAogCQlwYXJl bnQtPmVudHJpZXNbcHRfaWR4XS5hZGRyID0gcHQ7CiAKKwkJaWYgKCFwYXJhbXMuaWIpIHsKKwkJ CWlmIChzaGFkb3cpIHsKKwkJCQlyID0gYW1kZ3B1X3R0bV9iaW5kKCZzaGFkb3ctPnRibywKKwkJ CQkJCSAgICAmc2hhZG93LT50Ym8ubWVtKTsKKwkJCQlpZiAocikKKwkJCQkJcmV0dXJuIHI7CisJ CQl9CisKKwkJCXJpbmcgPSBjb250YWluZXJfb2Yodm0tPmVudGl0eS5zY2hlZCwKKwkJCQkJICAg IHN0cnVjdCBhbWRncHVfcmluZywgc2NoZWQpOworCisJCQkvKiBwYWRkaW5nLCBldGMuICovCisJ CQluZHcgPSA2NDsKKworCQkJLyogYXNzdW1lIHRoZSB3b3JzdCBjYXNlICovCisJCQluZHcgKz0g KHBhcmVudC0+bGFzdF9lbnRyeV91c2VkIC0gcHRfaWR4KSAqIDY7CisKKwkJCXBkX2FkZHIgPSBw YXJlbnQtPmJvLT50Ym8ub2Zmc2V0OworCisJCQlpZiAoc2hhZG93KSB7CisJCQkJc2hhZG93X2Fk ZHIgPSBzaGFkb3ctPnRiby5vZmZzZXQ7CisJCQkJbmR3ICo9IDI7CisJCQl9IGVsc2UgeworCQkJ CXNoYWRvd19hZGRyID0gMDsKKwkJCX0KKwkJCXIgPSBhbWRncHVfam9iX2FsbG9jX3dpdGhfaWIo YWRldiwgbmR3ICogNCwgJmpvYik7CisJCQlpZiAocikKKwkJCQlyZXR1cm4gcjsKKworCQkJcGFy YW1zLmliID0gJmpvYi0+aWJzWzBdOworCQl9IGVsc2UgaWYgKCFwZF9hZGRyKSB7CisJCQlyID0g YW1kZ3B1X2JvX2ttYXAocGFyZW50LT5ibywgKHZvaWQgKiopJnBkX2FkZHIpOworCQkJaWYgKHIp CisJCQkJcmV0dXJuIHI7CisJCQlyID0gYW1kZ3B1X3ZtX2JvX3dhaXQoYWRldiwgcGFyZW50LT5i byk7CisJCQlpZiAodW5saWtlbHkocikpIHsKKwkJCQlhbWRncHVfYm9fa3VubWFwKHBhcmVudC0+ Ym8pOworCQkJCXJldHVybiByOworCQkJfQorCQl9CisKIAkJcGRlID0gcGRfYWRkciArIHB0X2lk eCAqIDg7CiAJCWlmICgoKGxhc3RfcGRlICsgOCAqIGNvdW50KSAhPSBwZGUpIHx8CiAJCSAgICAo KGxhc3RfcHQgKyBpbmNyICogY291bnQpICE9IHB0KSB8fApAQCAtMTE0OCw5ICsxMTUwLDkgQEAg c3RhdGljIGludCBhbWRncHVfdm1fdXBkYXRlX2xldmVsKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2LAogCiAJaWYgKHBhcmFtcy5mdW5jID09IGFtZGdwdV92bV9jcHVfc2V0X3B0ZXMpCiAJCWFt ZGdwdV9ib19rdW5tYXAocGFyZW50LT5ibyk7Ci0JZWxzZSBpZiAocGFyYW1zLmliLT5sZW5ndGhf ZHcgPT0gMCkgeworCWVsc2UgaWYgKHBhcmFtcy5pYiAmJiBwYXJhbXMuaWItPmxlbmd0aF9kdyA9 PSAwKSB7CiAJCWFtZGdwdV9qb2JfZnJlZShqb2IpOwotCX0gZWxzZSB7CisJfSBlbHNlIGlmIChw YXJhbXMuaWIpIHsKIAkJYW1kZ3B1X3JpbmdfcGFkX2liKHJpbmcsIHBhcmFtcy5pYik7CiAJCWFt ZGdwdV9zeW5jX3Jlc3YoYWRldiwgJmpvYi0+c3luYywgcGFyZW50LT5iby0+dGJvLnJlc3YsCiAJ CQkJIEFNREdQVV9GRU5DRV9PV05FUl9WTSk7CkBAIC0xMTY2LDggKzExNjgsNyBAQCBzdGF0aWMg aW50IGFtZGdwdV92bV91cGRhdGVfbGV2ZWwoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAK IAkJYW1kZ3B1X2JvX2ZlbmNlKHBhcmVudC0+Ym8sIGZlbmNlLCB0cnVlKTsKIAkJZG1hX2ZlbmNl X3B1dCh2bS0+bGFzdF9kaXJfdXBkYXRlKTsKLQkJdm0tPmxhc3RfZGlyX3VwZGF0ZSA9IGRtYV9m ZW5jZV9nZXQoZmVuY2UpOwotCQlkbWFfZmVuY2VfcHV0KGZlbmNlKTsKKwkJdm0tPmxhc3RfZGly X3VwZGF0ZSA9IGZlbmNlOwogCX0KIAkvKgogCSAqIFJlY3Vyc2UgaW50byB0aGUgc3ViZGlyZWN0 b3JpZXMuIFRoaXMgcmVjdXJzaW9uIGlzIGhhcm1sZXNzIGJlY2F1c2UKQEAgLTExNzYsNyArMTE3 Nyw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3ZtX3VwZGF0ZV9sZXZlbChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiwKIAlmb3IgKHB0X2lkeCA9IDA7IHB0X2lkeCA8PSBwYXJlbnQtPmxhc3RfZW50 cnlfdXNlZDsgKytwdF9pZHgpIHsKIAkJc3RydWN0IGFtZGdwdV92bV9wdCAqZW50cnkgPSAmcGFy ZW50LT5lbnRyaWVzW3B0X2lkeF07CiAKLQkJaWYgKCFlbnRyeS0+Ym8pCisJCWlmICghZW50cnkt PmJvIHx8ICFlbnRyeS0+ZW50cmllcykKIAkJCWNvbnRpbnVlOwogCiAJCXIgPSBhbWRncHVfdm1f dXBkYXRlX2xldmVsKGFkZXYsIHZtLCBlbnRyeSwgbGV2ZWwgKyAxKTsKLS0gCjEuOS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxp bmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK