From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 7/7] drm/amdgpu: enable huge page handling in the VM v2 Date: Tue, 23 May 2017 18:52:54 +0200 Message-ID: <1495558374-3513-8-git-send-email-deathsimple@vodafone.de> References: <1495558374-3513-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: <1495558374-3513-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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhlIGhh cmR3YXJlIGNhbiB1c2UgaHVnZSBwYWdlcyB0byBtYXAgMk1CIG9mIGFkZHJlc3Mgc3BhY2Ugd2l0 aCBvbmx5IG9uZSBQREUuCgp2MjogZmV3IGNsZWFudXBzIGFuZCByZWJhc2VkCgpTaWduZWQtb2Zm LWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMgfCA5NSArKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0u aCB8ICA0ICsrCiAyIGZpbGVzIGNoYW5nZWQsIDc1IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKaW5kZXggZjdhZmRmYS4u ZjA3YzliOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Zt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKQEAgLTMyNSw2 ICszMjUsNyBAQCBzdGF0aWMgaW50IGFtZGdwdV92bV9hbGxvY19sZXZlbHMoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYsCiAKIAkJCWVudHJ5LT5ibyA9IHB0OwogCQkJZW50cnktPmFkZHIgPSAw OworCQkJZW50cnktPmh1Z2VfcGFnZSA9IGZhbHNlOwogCQl9CiAKIAkJaWYgKGxldmVsIDwgYWRl di0+dm1fbWFuYWdlci5udW1fbGV2ZWwpIHsKQEAgLTEwMTMsNyArMTAxNCw4IEBAIHN0YXRpYyBp bnQgYW1kZ3B1X3ZtX3VwZGF0ZV9sZXZlbChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAog CQlwdCA9IGFtZGdwdV9ib19ncHVfb2Zmc2V0KGJvKTsKIAkJcHQgPSBhbWRncHVfZ2FydF9nZXRf dm1fcGRlKGFkZXYsIHB0KTsKLQkJaWYgKHBhcmVudC0+ZW50cmllc1twdF9pZHhdLmFkZHIgPT0g cHQpCisJCWlmIChwYXJlbnQtPmVudHJpZXNbcHRfaWR4XS5hZGRyID09IHB0IHx8CisJCSAgICBw YXJlbnQtPmVudHJpZXNbcHRfaWR4XS5odWdlX3BhZ2UpCiAJCQljb250aW51ZTsKIAogCQlwYXJl bnQtPmVudHJpZXNbcHRfaWR4XS5hZGRyID0gcHQ7CkBAIC0xMTQ1LDI5ICsxMTQ3LDY5IEBAIGlu dCBhbWRncHVfdm1fdXBkYXRlX2RpcmVjdG9yaWVzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LAogfQogCiAvKioKLSAqIGFtZGdwdV92bV9maW5kX3B0IC0gZmluZCB0aGUgcGFnZSB0YWJsZSBm b3IgYW4gYWRkcmVzcworICogYW1kZ3B1X3ZtX2hhbmRsZV9odWdlX3BhZ2VzIC0gaGFuZGxlIHVw ZGF0aW5nIHRoZSBQRCB3aXRoIGh1Z2UgcGFnZXMKICAqCiAgKiBAcDogc2VlIGFtZGdwdV9wdGVf dXBkYXRlX3BhcmFtcyBkZWZpbml0aW9uCiAgKiBAYWRkcjogdmlydHVhbCBhZGRyZXNzIGluIHF1 ZXN0aW9uCisgKiBAbnB0ZXM6IG51bWJlciBvZiBQVEVzIHVwZGF0ZWQgd2l0aCB0aGlzIG9wZXJh dGlvbgorICogQGRzdDogZGVzdGluYXRpb24gYWRkcmVzcyB3aGVyZSB0aGUgUFRFcyBzaG91bGQg cG9pbnQgdG8KKyAqIEBmbGFnczogYWNjZXNzIGZsYWdzIGZybyB0aGUgUFRFcworICogQGJvOiBy ZXN1bHRpbmcgcGFnZSB0YWJsZXMgQk8KICAqCi0gKiBGaW5kIHRoZSBwYWdlIHRhYmxlIEJPIGZv ciBhIHZpcnR1YWwgYWRkcmVzcywgcmV0dXJuIE5VTEwgd2hlbiBub25lIGZvdW5kLgorICogQ2hl Y2sgaWYgd2UgY2FuIHVwZGF0ZSB0aGUgUEQgd2l0aCBhIGh1Z2UgcGFnZS4gQWxzbyBmaW5kcyB0 aGUgcGFnZSB0YWJsZQorICogQk8gZm9yIGEgdmlydHVhbCBhZGRyZXNzLCByZXR1cm5zIC1FTk9F TlQgd2hlbiBub3RoaW5nIGZvdW5kLgogICovCi1zdGF0aWMgc3RydWN0IGFtZGdwdV9ibyAqYW1k Z3B1X3ZtX2dldF9wdChzdHJ1Y3QgYW1kZ3B1X3B0ZV91cGRhdGVfcGFyYW1zICpwLAotCQkJCQkg IHVpbnQ2NF90IGFkZHIpCitzdGF0aWMgaW50IGFtZGdwdV92bV9oYW5kbGVfaHVnZV9wYWdlcyhz dHJ1Y3QgYW1kZ3B1X3B0ZV91cGRhdGVfcGFyYW1zICpwLAorCQkJCSAgICAgICB1aW50NjRfdCBh ZGRyLCB1bnNpZ25lZCBucHRlcywKKwkJCQkgICAgICAgdWludDY0X3QgZHN0LCB1aW50NjRfdCBm bGFncywKKwkJCQkgICAgICAgc3RydWN0IGFtZGdwdV9ibyAqKmJvKQogewotCXN0cnVjdCBhbWRn cHVfdm1fcHQgKmVudHJ5ID0gJnAtPnZtLT5yb290OwotCXVuc2lnbmVkIGlkeCwgbGV2ZWwgPSBw LT5hZGV2LT52bV9tYW5hZ2VyLm51bV9sZXZlbDsKKwl1bnNpZ25lZCBwdF9pZHgsIGxldmVsID0g cC0+YWRldi0+dm1fbWFuYWdlci5udW1fbGV2ZWw7CisJc3RydWN0IGFtZGdwdV92bV9wdCAqZW50 cnkgPSAmcC0+dm0tPnJvb3QsICpwYXJlbnQ7CisJdWludDY0X3QgcGRfYWRkciwgcGRlOwogCi0J d2hpbGUgKGVudHJ5LT5lbnRyaWVzKSB7Ci0JCWlkeCA9IGFkZHIgPj4gKHAtPmFkZXYtPnZtX21h bmFnZXIuYmxvY2tfc2l6ZSAqIGxldmVsLS0pOwotCQlpZHggJT0gYW1kZ3B1X2JvX3NpemUoZW50 cnktPmJvKSAvIDg7Ci0JCWVudHJ5ID0gJmVudHJ5LT5lbnRyaWVzW2lkeF07Ci0JfQorCWRvIHsK KwkJcHRfaWR4ID0gYWRkciA+PiAocC0+YWRldi0+dm1fbWFuYWdlci5ibG9ja19zaXplICogbGV2 ZWwtLSk7CisJCXB0X2lkeCAlPSBhbWRncHVfYm9fc2l6ZShlbnRyeS0+Ym8pIC8gODsKKwkJcGFy ZW50ID0gZW50cnk7CisJCWVudHJ5ID0gJmVudHJ5LT5lbnRyaWVzW3B0X2lkeF07CisJfSB3aGls ZSAoZW50cnktPmVudHJpZXMpOwogCiAJaWYgKGxldmVsKQotCQlyZXR1cm4gTlVMTDsKKwkJcmV0 dXJuIC1FTk9FTlQ7CisKKwkqYm8gPSBlbnRyeS0+Ym87CisKKwkvKiBJbiB0aGUgY2FzZSBvZiBh IG1peGVkIFBUIHRoZSBQREUgbXVzdCBwb2ludCB0byBpdCovCisJaWYgKHAtPmFkZXYtPmFzaWNf dHlwZSA8IENISVBfVkVHQTEwIHx8CisJICAgIG5wdGVzICE9IEFNREdQVV9WTV9QVEVfQ09VTlQo cC0+YWRldikgfHwKKwkgICAgcC0+ZnVuYyAhPSBhbWRncHVfdm1fZG9fc2V0X3B0ZXMgfHwKKwkg ICAgIShmbGFncyAmIEFNREdQVV9QVEVfVkFMSUQpKSB7CisKKwkJZHN0ID0gYW1kZ3B1X2JvX2dw dV9vZmZzZXQoKmJvKTsKKwkJZHN0ID0gYW1kZ3B1X2dhcnRfZ2V0X3ZtX3BkZShwLT5hZGV2LCBk c3QpOworCQlmbGFncyA9IEFNREdQVV9QVEVfVkFMSUQ7CisJfSBlbHNlIHsKKwkJZmxhZ3MgfD0g QU1ER1BVX1BERV9QVEU7CisJfQogCi0JcmV0dXJuIGVudHJ5LT5ibzsKKwlpZiAoZW50cnktPmFk ZHIgPT0gZHN0ICYmCisJICAgIGVudHJ5LT5odWdlX3BhZ2UgPT0gISEoZmxhZ3MgJiBBTURHUFVf UERFX1BURSkpCisJCXJldHVybiAwOworCisJZW50cnktPmFkZHIgPSBkc3Q7CisJZW50cnktPmh1 Z2VfcGFnZSA9ICEhKGZsYWdzICYgQU1ER1BVX1BERV9QVEUpOworCisJaWYgKHBhcmVudC0+Ym8t PnNoYWRvdykgeworCQlwZF9hZGRyID0gYW1kZ3B1X2JvX2dwdV9vZmZzZXQocGFyZW50LT5iby0+ c2hhZG93KTsKKwkJcGRlID0gcGRfYWRkciArIHB0X2lkeCAqIDg7CisJCWFtZGdwdV92bV9kb19z ZXRfcHRlcyhwLCBwZGUsIGRzdCwgMSwgMCwgZmxhZ3MpOworCX0KKworCXBkX2FkZHIgPSBhbWRn cHVfYm9fZ3B1X29mZnNldChwYXJlbnQtPmJvKTsKKwlwZGUgPSBwZF9hZGRyICsgcHRfaWR4ICog ODsKKwlhbWRncHVfdm1fZG9fc2V0X3B0ZXMocCwgcGRlLCBkc3QsIDEsIDAsIGZsYWdzKTsKKwly ZXR1cm4gMDsKIH0KIAogLyoqCkBAIC0xMTkzLDE0ICsxMjM1LDIwIEBAIHN0YXRpYyBpbnQgYW1k Z3B1X3ZtX3VwZGF0ZV9wdGVzKHN0cnVjdCBhbWRncHVfcHRlX3VwZGF0ZV9wYXJhbXMgKnBhcmFt cywKIAl1aW50NjRfdCBhZGRyLCBwZV9zdGFydDsKIAlzdHJ1Y3QgYW1kZ3B1X2JvICpwdDsKIAl1 bnNpZ25lZCBucHRlczsKKwlpbnQgcjsKIAogCS8qIHdhbGsgb3ZlciB0aGUgYWRkcmVzcyBzcGFj ZSBhbmQgdXBkYXRlIHRoZSBwYWdlIHRhYmxlcyAqLwogCWZvciAoYWRkciA9IHN0YXJ0OyBhZGRy IDwgZW5kOyBhZGRyICs9IG5wdGVzKSB7Ci0JCXB0ID0gYW1kZ3B1X3ZtX2dldF9wdChwYXJhbXMs IGFkZHIpOwotCQlpZiAoIXB0KSB7Ci0JCQlwcl9lcnIoIlBUIG5vdCBmb3VuZCwgYWJvcnRpbmcg dXBkYXRlX3B0ZXNcbiIpOwotCQkJcmV0dXJuIC1FSU5WQUw7Ci0JCX0KKworCQlpZiAoKGFkZHIg JiB+bWFzaykgPT0gKGVuZCAmIH5tYXNrKSkKKwkJCW5wdGVzID0gZW5kIC0gYWRkcjsKKwkJZWxz ZQorCQkJbnB0ZXMgPSBBTURHUFVfVk1fUFRFX0NPVU5UKGFkZXYpIC0gKGFkZHIgJiBtYXNrKTsK KworCQlyID0gYW1kZ3B1X3ZtX2hhbmRsZV9odWdlX3BhZ2VzKHBhcmFtcywgYWRkciwgbnB0ZXMs CisJCQkJCQlkc3QsIGZsYWdzLCAmcHQpOworCQlpZiAocikKKwkJCXJldHVybiByOwogCiAJCWlm IChwYXJhbXMtPnNoYWRvdykgewogCQkJaWYgKCFwdC0+c2hhZG93KQpAQCAtMTIwOCwxMSArMTI1 Niw2IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3ZtX3VwZGF0ZV9wdGVzKHN0cnVjdCBhbWRncHVfcHRl X3VwZGF0ZV9wYXJhbXMgKnBhcmFtcywKIAkJCXB0ID0gcHQtPnNoYWRvdzsKIAkJfQogCi0JCWlm ICgoYWRkciAmIH5tYXNrKSA9PSAoZW5kICYgfm1hc2spKQotCQkJbnB0ZXMgPSBlbmQgLSBhZGRy OwotCQllbHNlCi0JCQlucHRlcyA9IEFNREdQVV9WTV9QVEVfQ09VTlQoYWRldikgLSAoYWRkciAm IG1hc2spOwotCiAJCXBlX3N0YXJ0ID0gYW1kZ3B1X2JvX2dwdV9vZmZzZXQocHQpOwogCQlwZV9z dGFydCArPSAoYWRkciAmIG1hc2spICogODsKIApAQCAtMTM1Myw2ICsxMzk2LDkgQEAgc3RhdGlj IGludCBhbWRncHVfdm1fYm9fdXBkYXRlX21hcHBpbmcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYsCiAJLyogcGFkZGluZywgZXRjLiAqLwogCW5kdyA9IDY0OwogCisJLyogb25lIFBERSB3cml0 ZSBmb3IgZWFjaCBodWdlIHBhZ2UgKi8KKwluZHcgKz0gKChucHRlcyA+PiBhZGV2LT52bV9tYW5h Z2VyLmJsb2NrX3NpemUpICsgMSkgKiA3OworCiAJaWYgKHNyYykgewogCQkvKiBvbmx5IGNvcHkg Y29tbWFuZHMgbmVlZGVkICovCiAJCW5kdyArPSBuY21kcyAqIDc7CkBAIC0xNDM3LDYgKzE0ODMs NyBAQCBzdGF0aWMgaW50IGFtZGdwdV92bV9ib191cGRhdGVfbWFwcGluZyhzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiwKIAogZXJyb3JfZnJlZToKIAlhbWRncHVfam9iX2ZyZWUoam9iKTsKKwlh bWRncHVfdm1faW52YWxpZGF0ZV9sZXZlbCgmdm0tPnJvb3QpOwogCXJldHVybiByOwogfQogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uaCBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5oCmluZGV4IDBmODNmZTMuLjI5NDBkNjYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5oCkBAIC03MCw2ICs3MCw5IEBA IHN0cnVjdCBhbWRncHVfYm9fbGlzdF9lbnRyeTsKIC8qIFRJTEVEIGZvciBWRUdBMTAsIHJlc2Vy dmVkIGZvciBvbGRlciBBU0lDcyAgKi8KICNkZWZpbmUgQU1ER1BVX1BURV9QUlQJCSgxVUxMIDw8 IDUxKQogCisvKiBQREUgaXMgaGFuZGxlZCBhcyBQVEUgZm9yIFZFR0ExMCAqLworI2RlZmluZSBB TURHUFVfUERFX1BURQkJKDFVTEwgPDwgNTQpCisKIC8qIFZFR0ExMCBvbmx5ICovCiAjZGVmaW5l IEFNREdQVV9QVEVfTVRZUEUoYSkgICAgKCh1aW50NjRfdClhIDw8IDU3KQogI2RlZmluZSBBTURH UFVfUFRFX01UWVBFX01BU0sJQU1ER1BVX1BURV9NVFlQRSgzVUxMKQpAQCAtOTIsNiArOTUsNyBA QCBzdHJ1Y3QgYW1kZ3B1X2JvX2xpc3RfZW50cnk7CiBzdHJ1Y3QgYW1kZ3B1X3ZtX3B0IHsKIAlz dHJ1Y3QgYW1kZ3B1X2JvCSpibzsKIAl1aW50NjRfdAkJYWRkcjsKKwlib29sCQkJaHVnZV9wYWdl OwogCiAJLyogYXJyYXkgb2YgcGFnZSB0YWJsZXMsIG9uZSBmb3IgZWFjaCBkaXJlY3RvcnkgZW50 cnkgKi8KIAlzdHJ1Y3QgYW1kZ3B1X3ZtX3B0CSplbnRyaWVzOwotLSAKMi43LjQKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBs aXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=