From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 2/2] drm/amdgpu: enable huge page handling in the VM v4 Date: Mon, 17 Jul 2017 23:02:22 +0200 Message-ID: <1500325342-26253-2-git-send-email-deathsimple@vodafone.de> References: <1500325342-26253-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1500325342-26253-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@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: felix.kuehling-5C7GfCeVMHo@public.gmane.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhlIGhh cmR3YXJlIGNhbiB1c2UgaHVnZSBwYWdlcyB0byBtYXAgMk1CIG9mIGFkZHJlc3Mgc3BhY2Ugd2l0 aCBvbmx5IG9uZSBQREUuCgp2MjogZmV3IGNsZWFudXBzIGFuZCByZWJhc2VkCnYzOiBza2lwIFBU IHVwZGF0ZXMgaWYgd2UgYXJlIHVzaW5nIHRoZSBQREUKdjQ6IHJlYmFzZWQsIGFkZGVkIHN1cHBv cnQgZm9yIENQVSBiYXNlZCB1cGRhdGVzCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmln IDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X3ZtLmMgfCAxMTkgKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uaCB8ICAgNCArKwogMiBmaWxlcyBj aGFuZ2VkLCAxMDMgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfdm0uYwppbmRleCBhM2RiZWJlLi42MmQ5N2Y1IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwpAQCAtMzUxLDYgKzM1MSw3IEBAIHN0YXRpYyBp bnQgYW1kZ3B1X3ZtX2FsbG9jX2xldmVscyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAog CQkJZW50cnktPmJvID0gcHQ7CiAJCQllbnRyeS0+YWRkciA9IDA7CisJCQllbnRyeS0+aHVnZV9w YWdlID0gZmFsc2U7CiAJCX0KIAogCQlpZiAobGV2ZWwgPCBhZGV2LT52bV9tYW5hZ2VyLm51bV9s ZXZlbCkgewpAQCAtMTExNiw3ICsxMTE3LDggQEAgc3RhdGljIGludCBhbWRncHVfdm1fdXBkYXRl X2xldmVsKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCiAJCXB0ID0gYW1kZ3B1X2JvX2dw dV9vZmZzZXQoYm8pOwogCQlwdCA9IGFtZGdwdV9nYXJ0X2dldF92bV9wZGUoYWRldiwgcHQpOwot CQlpZiAocGFyZW50LT5lbnRyaWVzW3B0X2lkeF0uYWRkciA9PSBwdCkKKwkJaWYgKHBhcmVudC0+ ZW50cmllc1twdF9pZHhdLmFkZHIgPT0gcHQgfHwKKwkJICAgIHBhcmVudC0+ZW50cmllc1twdF9p ZHhdLmh1Z2VfcGFnZSkKIAkJCWNvbnRpbnVlOwogCiAJCXBhcmVudC0+ZW50cmllc1twdF9pZHhd LmFkZHIgPSBwdDsKQEAgLTEyNTcsMjkgKzEyNTksOTUgQEAgaW50IGFtZGdwdV92bV91cGRhdGVf ZGlyZWN0b3JpZXMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiB9CiAKIC8qKgotICogYW1k Z3B1X3ZtX2ZpbmRfcHQgLSBmaW5kIHRoZSBwYWdlIHRhYmxlIGZvciBhbiBhZGRyZXNzCisgKiBh bWRncHVfdm1fZmluZF9lbnRyeSAtIGZpbmQgdGhlIGVudHJ5IGZvciBhbiBhZGRyZXNzCiAgKgog ICogQHA6IHNlZSBhbWRncHVfcHRlX3VwZGF0ZV9wYXJhbXMgZGVmaW5pdGlvbgogICogQGFkZHI6 IHZpcnR1YWwgYWRkcmVzcyBpbiBxdWVzdGlvbgorICogQGVudHJ5OiByZXN1bHRpbmcgZW50cnkg b3IgTlVMTAorICogQHBhcmVudDogcGFyZW50IGVudHJ5CiAgKgotICogRmluZCB0aGUgcGFnZSB0 YWJsZSBCTyBmb3IgYSB2aXJ0dWFsIGFkZHJlc3MsIHJldHVybiBOVUxMIHdoZW4gbm9uZSBmb3Vu ZC4KKyAqIEZpbmQgdGhlIHZtX3B0IGVudHJ5IGFuZCBpdCdzIHBhcmVudCBmb3IgdGhlIGdpdmVu IGFkZHJlc3MuCiAgKi8KLXN0YXRpYyBzdHJ1Y3QgYW1kZ3B1X2JvICphbWRncHVfdm1fZ2V0X3B0 KHN0cnVjdCBhbWRncHVfcHRlX3VwZGF0ZV9wYXJhbXMgKnAsCi0JCQkJCSAgdWludDY0X3QgYWRk cikKK3ZvaWQgYW1kZ3B1X3ZtX2dldF9lbnRyeShzdHJ1Y3QgYW1kZ3B1X3B0ZV91cGRhdGVfcGFy YW1zICpwLCB1aW50NjRfdCBhZGRyLAorCQkJIHN0cnVjdCBhbWRncHVfdm1fcHQgKiplbnRyeSwK KwkJCSBzdHJ1Y3QgYW1kZ3B1X3ZtX3B0ICoqcGFyZW50KQogewotCXN0cnVjdCBhbWRncHVfdm1f cHQgKmVudHJ5ID0gJnAtPnZtLT5yb290OwogCXVuc2lnbmVkIGlkeCwgbGV2ZWwgPSBwLT5hZGV2 LT52bV9tYW5hZ2VyLm51bV9sZXZlbDsKIAotCXdoaWxlIChlbnRyeS0+ZW50cmllcykgeworCSpw YXJlbnQgPSBOVUxMOworCSplbnRyeSA9ICZwLT52bS0+cm9vdDsKKwl3aGlsZSAoKCplbnRyeSkt PmVudHJpZXMpIHsKIAkJaWR4ID0gYWRkciA+PiAocC0+YWRldi0+dm1fbWFuYWdlci5ibG9ja19z aXplICogbGV2ZWwtLSk7Ci0JCWlkeCAlPSBhbWRncHVfYm9fc2l6ZShlbnRyeS0+Ym8pIC8gODsK LQkJZW50cnkgPSAmZW50cnktPmVudHJpZXNbaWR4XTsKKwkJaWR4ICU9IGFtZGdwdV9ib19zaXpl KCgqZW50cnkpLT5ibykgLyA4OworCQkqcGFyZW50ID0gKmVudHJ5OworCQkqZW50cnkgPSAmKCpl bnRyeSktPmVudHJpZXNbaWR4XTsKIAl9CiAKIAlpZiAobGV2ZWwpCi0JCXJldHVybiBOVUxMOwor CQkqZW50cnkgPSBOVUxMOworfQorCisvKioKKyAqIGFtZGdwdV92bV9oYW5kbGVfaHVnZV9wYWdl cyAtIGhhbmRsZSB1cGRhdGluZyB0aGUgUEQgd2l0aCBodWdlIHBhZ2VzCisgKgorICogQHA6IHNl ZSBhbWRncHVfcHRlX3VwZGF0ZV9wYXJhbXMgZGVmaW5pdGlvbgorICogQGVudHJ5OiB2bV9wdCBl bnRyeSB0byBjaGVjaworICogQHBhcmVudDogcGFyZW50IGVudHJ5CisgKiBAbnB0ZXM6IG51bWJl ciBvZiBQVEVzIHVwZGF0ZWQgd2l0aCB0aGlzIG9wZXJhdGlvbgorICogQGRzdDogZGVzdGluYXRp b24gYWRkcmVzcyB3aGVyZSB0aGUgUFRFcyBzaG91bGQgcG9pbnQgdG8KKyAqIEBmbGFnczogYWNj ZXNzIGZsYWdzIGZybyB0aGUgUFRFcworICoKKyAqIENoZWNrIGlmIHdlIGNhbiB1cGRhdGUgdGhl IFBEIHdpdGggYSBodWdlIHBhZ2UuCisgKi8KK3N0YXRpYyBpbnQgYW1kZ3B1X3ZtX2hhbmRsZV9o dWdlX3BhZ2VzKHN0cnVjdCBhbWRncHVfcHRlX3VwZGF0ZV9wYXJhbXMgKnAsCisJCQkJICAgICAg IHN0cnVjdCBhbWRncHVfdm1fcHQgKmVudHJ5LAorCQkJCSAgICAgICBzdHJ1Y3QgYW1kZ3B1X3Zt X3B0ICpwYXJlbnQsCisJCQkJICAgICAgIHVuc2lnbmVkIG5wdGVzLCB1aW50NjRfdCBkc3QsCisJ CQkJICAgICAgIHVpbnQ2NF90IGZsYWdzKQoreworCWJvb2wgdXNlX2NwdV91cGRhdGUgPSAocC0+ ZnVuYyA9PSBhbWRncHVfdm1fY3B1X3NldF9wdGVzKTsKKwl1aW50NjRfdCBwZF9hZGRyLCBwZGU7 CisJaW50IHI7CiAKLQlyZXR1cm4gZW50cnktPmJvOworCS8qIEluIHRoZSBjYXNlIG9mIGEgbWl4 ZWQgUFQgdGhlIFBERSBtdXN0IHBvaW50IHRvIGl0Ki8KKwlpZiAocC0+YWRldi0+YXNpY190eXBl IDwgQ0hJUF9WRUdBMTAgfHwKKwkgICAgbnB0ZXMgIT0gQU1ER1BVX1ZNX1BURV9DT1VOVChwLT5h ZGV2KSB8fAorCSAgICBwLT5mdW5jICE9IGFtZGdwdV92bV9kb19zZXRfcHRlcyB8fAorCSAgICAh KGZsYWdzICYgQU1ER1BVX1BURV9WQUxJRCkpIHsKKworCQlkc3QgPSBhbWRncHVfYm9fZ3B1X29m ZnNldChlbnRyeS0+Ym8pOworCQlkc3QgPSBhbWRncHVfZ2FydF9nZXRfdm1fcGRlKHAtPmFkZXYs IGRzdCk7CisJCWZsYWdzID0gQU1ER1BVX1BURV9WQUxJRDsKKwl9IGVsc2UgeworCQlmbGFncyB8 PSBBTURHUFVfUERFX1BURTsKKwl9CisKKwlpZiAoZW50cnktPmFkZHIgPT0gZHN0ICYmCisJICAg IGVudHJ5LT5odWdlX3BhZ2UgPT0gISEoZmxhZ3MgJiBBTURHUFVfUERFX1BURSkpCisJCXJldHVy biAwOworCisJZW50cnktPmFkZHIgPSBkc3Q7CisJZW50cnktPmh1Z2VfcGFnZSA9ICEhKGZsYWdz ICYgQU1ER1BVX1BERV9QVEUpOworCisJaWYgKHVzZV9jcHVfdXBkYXRlKSB7CisJCXIgPSBhbWRn cHVfYm9fa21hcChwYXJlbnQtPmJvLCAodm9pZCAqKSZwZF9hZGRyKTsKKwkJaWYgKHIpCisJCQly ZXR1cm4gcjsKKworCQlwZGUgPSBwZF9hZGRyICsgKGVudHJ5IC0gcGFyZW50LT5lbnRyaWVzKSAq IDg7CisJCWFtZGdwdV92bV9jcHVfc2V0X3B0ZXMocCwgcGRlLCBkc3QsIDEsIDAsIGZsYWdzKTsK Kwl9IGVsc2UgeworCQlpZiAocGFyZW50LT5iby0+c2hhZG93KSB7CisJCQlwZF9hZGRyID0gYW1k Z3B1X2JvX2dwdV9vZmZzZXQocGFyZW50LT5iby0+c2hhZG93KTsKKwkJCXBkZSA9IHBkX2FkZHIg KyAoZW50cnkgLSBwYXJlbnQtPmVudHJpZXMpICogODsKKwkJCWFtZGdwdV92bV9kb19zZXRfcHRl cyhwLCBwZGUsIGRzdCwgMSwgMCwgZmxhZ3MpOworCQl9CisJCXBkX2FkZHIgPSBhbWRncHVfYm9f Z3B1X29mZnNldChwYXJlbnQtPmJvKTsKKwkJcGRlID0gcGRfYWRkciArIChlbnRyeSAtIHBhcmVu dC0+ZW50cmllcykgKiA4OworCQlhbWRncHVfdm1fZG9fc2V0X3B0ZXMocCwgcGRlLCBkc3QsIDEs IDAsIGZsYWdzKTsKKwl9CisKKwlyZXR1cm4gMDsKIH0KIAogLyoqCkBAIC0xMzA2LDIyICsxMzc0 LDMxIEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3ZtX3VwZGF0ZV9wdGVzKHN0cnVjdCBhbWRncHVfcHRl X3VwZGF0ZV9wYXJhbXMgKnBhcmFtcywKIAlzdHJ1Y3QgYW1kZ3B1X2JvICpwdDsKIAl1bnNpZ25l ZCBucHRlczsKIAlib29sIHVzZV9jcHVfdXBkYXRlID0gKHBhcmFtcy0+ZnVuYyA9PSBhbWRncHVf dm1fY3B1X3NldF9wdGVzKTsKLQorCWludCByOwogCiAJLyogd2FsayBvdmVyIHRoZSBhZGRyZXNz IHNwYWNlIGFuZCB1cGRhdGUgdGhlIHBhZ2UgdGFibGVzICovCi0JZm9yIChhZGRyID0gc3RhcnQ7 IGFkZHIgPCBlbmQ7IGFkZHIgKz0gbnB0ZXMpIHsKLQkJcHQgPSBhbWRncHVfdm1fZ2V0X3B0KHBh cmFtcywgYWRkcik7Ci0JCWlmICghcHQpIHsKLQkJCXByX2VycigiUFQgbm90IGZvdW5kLCBhYm9y dGluZyB1cGRhdGVfcHRlc1xuIik7Ci0JCQlyZXR1cm4gLUVJTlZBTDsKLQkJfQorCWZvciAoYWRk ciA9IHN0YXJ0OyBhZGRyIDwgZW5kOyBhZGRyICs9IG5wdGVzLAorCSAgICAgZHN0ICs9IG5wdGVz ICogQU1ER1BVX0dQVV9QQUdFX1NJWkUpIHsKKwkJc3RydWN0IGFtZGdwdV92bV9wdCAqZW50cnks ICpwYXJlbnQ7CisKKwkJYW1kZ3B1X3ZtX2dldF9lbnRyeShwYXJhbXMsIGFkZHIsICZlbnRyeSwg JnBhcmVudCk7CisJCWlmICghZW50cnkpCisJCQlyZXR1cm4gLUVOT0VOVDsKIAogCQlpZiAoKGFk ZHIgJiB+bWFzaykgPT0gKGVuZCAmIH5tYXNrKSkKIAkJCW5wdGVzID0gZW5kIC0gYWRkcjsKIAkJ ZWxzZQogCQkJbnB0ZXMgPSBBTURHUFVfVk1fUFRFX0NPVU5UKGFkZXYpIC0gKGFkZHIgJiBtYXNr KTsKIAorCQlyID0gYW1kZ3B1X3ZtX2hhbmRsZV9odWdlX3BhZ2VzKHBhcmFtcywgZW50cnksIHBh cmVudCwKKwkJCQkJCW5wdGVzLCBkc3QsIGZsYWdzKTsKKwkJaWYgKHIpCisJCQlyZXR1cm4gcjsK IAorCQlpZiAoZW50cnktPmh1Z2VfcGFnZSkKKwkJCWNvbnRpbnVlOworCisJCXB0ID0gZW50cnkt PmJvOwogCQlpZiAodXNlX2NwdV91cGRhdGUpIHsKIAkJCXBlX3N0YXJ0ID0gKHVuc2lnbmVkIGxv bmcpcHQtPmtwdHI7CiAJCX0gZWxzZSB7CkBAIC0xMzM3LDggKzE0MTQsNiBAQCBzdGF0aWMgaW50 IGFtZGdwdV92bV91cGRhdGVfcHRlcyhzdHJ1Y3QgYW1kZ3B1X3B0ZV91cGRhdGVfcGFyYW1zICpw YXJhbXMsCiAJCXBlX3N0YXJ0ICs9IChhZGRyICYgbWFzaykgKiA4OwogCQlwYXJhbXMtPmZ1bmMo cGFyYW1zLCBwZV9zdGFydCwgZHN0LCBucHRlcywKIAkJCSAgICAgQU1ER1BVX0dQVV9QQUdFX1NJ WkUsIGZsYWdzKTsKLQotCQlkc3QgKz0gbnB0ZXMgKiBBTURHUFVfR1BVX1BBR0VfU0laRTsKIAl9 CiAKIAlyZXR1cm4gMDsKQEAgLTE0OTAsNiArMTU2NSw5IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3Zt X2JvX3VwZGF0ZV9tYXBwaW5nKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCS8qIHBhZGRp bmcsIGV0Yy4gKi8KIAluZHcgPSA2NDsKIAorCS8qIG9uZSBQREUgd3JpdGUgZm9yIGVhY2ggaHVn ZSBwYWdlICovCisJbmR3ICs9ICgobnB0ZXMgPj4gYWRldi0+dm1fbWFuYWdlci5ibG9ja19zaXpl KSArIDEpICogNzsKKwogCWlmIChzcmMpIHsKIAkJLyogb25seSBjb3B5IGNvbW1hbmRzIG5lZWRl ZCAqLwogCQluZHcgKz0gbmNtZHMgKiA3OwpAQCAtMTU2OSw2ICsxNjQ3LDcgQEAgc3RhdGljIGlu dCBhbWRncHVfdm1fYm9fdXBkYXRlX21hcHBpbmcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYs CiAKIGVycm9yX2ZyZWU6CiAJYW1kZ3B1X2pvYl9mcmVlKGpvYik7CisJYW1kZ3B1X3ZtX2ludmFs aWRhdGVfbGV2ZWwoJnZtLT5yb290KTsKIAlyZXR1cm4gcjsKIH0KIApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfdm0uaAppbmRleCBjNGY1ZDFmLi4zNGQ5MTc0IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uaApAQCAtNzAsNiArNzAsOSBAQCBzdHJ1Y3QgYW1kZ3B1 X2JvX2xpc3RfZW50cnk7CiAvKiBUSUxFRCBmb3IgVkVHQTEwLCByZXNlcnZlZCBmb3Igb2xkZXIg QVNJQ3MgICovCiAjZGVmaW5lIEFNREdQVV9QVEVfUFJUCQkoMVVMTCA8PCA1MSkKIAorLyogUERF IGlzIGhhbmRsZWQgYXMgUFRFIGZvciBWRUdBMTAgKi8KKyNkZWZpbmUgQU1ER1BVX1BERV9QVEUJ CSgxVUxMIDw8IDU0KQorCiAvKiBWRUdBMTAgb25seSAqLwogI2RlZmluZSBBTURHUFVfUFRFX01U WVBFKGEpICAgICgodWludDY0X3QpYSA8PCA1NykKICNkZWZpbmUgQU1ER1BVX1BURV9NVFlQRV9N QVNLCUFNREdQVV9QVEVfTVRZUEUoM1VMTCkKQEAgLTEwMCw2ICsxMDMsNyBAQCBzdHJ1Y3QgYW1k Z3B1X2JvX2xpc3RfZW50cnk7CiBzdHJ1Y3QgYW1kZ3B1X3ZtX3B0IHsKIAlzdHJ1Y3QgYW1kZ3B1 X2JvCSpibzsKIAl1aW50NjRfdAkJYWRkcjsKKwlib29sCQkJaHVnZV9wYWdlOwogCiAJLyogYXJy YXkgb2YgcGFnZSB0YWJsZXMsIG9uZSBmb3IgZWFjaCBkaXJlY3RvcnkgZW50cnkgKi8KIAlzdHJ1 Y3QgYW1kZ3B1X3ZtX3B0CSplbnRyaWVzOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vYW1kLWdmeAo=