From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 7/7] drm/amdgpu: enable huge page handling in the VM Date: Wed, 17 May 2017 11:22:52 +0200 Message-ID: <1495012972-20698-7-git-send-email-deathsimple@vodafone.de> References: <1495012972-20698-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: <1495012972-20698-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 aCBvbmx5IG9uZSBQREUuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3Rp YW4ua29lbmlnQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3ZtLmMgfCA5NiArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uaCB8ICA0ICsrCiAyIGZpbGVzIGNoYW5nZWQsIDc2 IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X3ZtLmMKaW5kZXggODYwYTY2OS4uOGJlMWQ3YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X3ZtLmMKQEAgLTMyNSw2ICszMjUsNyBAQCBzdGF0aWMgaW50IGFtZGdwdV92 bV9hbGxvY19sZXZlbHMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAKIAkJCWVudHJ5LT5i byA9IHB0OwogCQkJZW50cnktPmFkZHIgPSAwOworCQkJZW50cnktPmh1Z2VfcGFnZSA9IGZhbHNl OwogCQl9CiAKIAkJaWYgKGxldmVsIDwgYWRldi0+dm1fbWFuYWdlci5udW1fbGV2ZWwpIHsKQEAg LTEwMTQsNyArMTAxNSw4IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3ZtX3VwZGF0ZV9sZXZlbChzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAogCQlwdCA9IGJvLT50Ym8ubWVtLnN0YXJ0IDw8IFBB R0VfU0hJRlQ7CiAJCXB0ID0gYW1kZ3B1X2dhcnRfZ2V0X3ZtX3BkZShhZGV2LCBwdCk7Ci0JCWlm IChwYXJlbnQtPmVudHJpZXNbcHRfaWR4XS5hZGRyID09IHB0KQorCQlpZiAocGFyZW50LT5lbnRy aWVzW3B0X2lkeF0uYWRkciA9PSBwdCB8fAorCQkgICAgcGFyZW50LT5lbnRyaWVzW3B0X2lkeF0u aHVnZV9wYWdlKQogCQkJY29udGludWU7CiAKIAkJcGFyZW50LT5lbnRyaWVzW3B0X2lkeF0uYWRk ciA9IHB0OwpAQCAtMTE0NiwyOSArMTE0OCw3MCBAQCBpbnQgYW1kZ3B1X3ZtX3VwZGF0ZV9kaXJl Y3RvcmllcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIH0KIAogLyoqCi0gKiBhbWRncHVf dm1fZmluZF9wdCAtIGZpbmQgdGhlIHBhZ2UgdGFibGUgZm9yIGFuIGFkZHJlc3MKKyAqIGFtZGdw dV92bV9oYW5kbGVfaHVnZV9wYWdlcyAtIGhhbmRsZSB1cGRhdGluZyB0aGUgUEQgd2l0aCBodWdl IHBhZ2VzCiAgKgogICogQHA6IHNlZSBhbWRncHVfcHRlX3VwZGF0ZV9wYXJhbXMgZGVmaW5pdGlv bgogICogQGFkZHI6IHZpcnR1YWwgYWRkcmVzcyBpbiBxdWVzdGlvbgorICogQG5wdGVzOiBudW1i ZXIgb2YgUFRFcyB1cGRhdGVkIHdpdGggdGhpcyBvcGVyYXRpb24KKyAqIEBkc3Q6IGRlc3RpbmF0 aW9uIGFkZHJlc3Mgd2hlcmUgdGhlIFBURXMgc2hvdWxkIHBvaW50IHRvCisgKiBAZmxhZ3M6IGFj Y2VzcyBmbGFncyBmcm8gdGhlIFBURXMKKyAqIEBibzogcmVzdWx0aW5nIHBhZ2UgdGFibGVzIEJP CiAgKgotICogRmluZCB0aGUgcGFnZSB0YWJsZSBCTyBmb3IgYSB2aXJ0dWFsIGFkZHJlc3MsIHJl dHVybiBOVUxMIHdoZW4gbm9uZSBmb3VuZC4KKyAqIENoZWNrIGlmIHdlIGNhbiB1cGRhdGUgdGhl IFBEIHdpdGggYSBodWdlIHBhZ2UuIEFsc28gZmluZHMgdGhlIHBhZ2UgdGFibGUKKyAqIEJPIGZv ciBhIHZpcnR1YWwgYWRkcmVzcywgcmV0dXJucyAtRU5PRU5UIHdoZW4gbm90aGluZyBmb3VuZC4K ICAqLwotc3RhdGljIHN0cnVjdCBhbWRncHVfYm8gKmFtZGdwdV92bV9nZXRfcHQoc3RydWN0IGFt ZGdwdV9wdGVfdXBkYXRlX3BhcmFtcyAqcCwKLQkJCQkJICB1aW50NjRfdCBhZGRyKQorc3RhdGlj IGludCBhbWRncHVfdm1faGFuZGxlX2h1Z2VfcGFnZXMoc3RydWN0IGFtZGdwdV9wdGVfdXBkYXRl X3BhcmFtcyAqcCwKKwkJCQkgICAgICAgdWludDY0X3QgYWRkciwgdW5zaWduZWQgbnB0ZXMsCisJ CQkJICAgICAgIHVpbnQ2NF90IGRzdCwgdWludDY0X3QgZmxhZ3MsCisJCQkJICAgICAgIHN0cnVj dCBhbWRncHVfYm8gKipibykKIHsKLQlzdHJ1Y3QgYW1kZ3B1X3ZtX3B0ICplbnRyeSA9ICZwLT52 bS0+cm9vdDsKLQl1bnNpZ25lZCBpZHgsIGxldmVsID0gcC0+YWRldi0+dm1fbWFuYWdlci5udW1f bGV2ZWw7CisJdW5zaWduZWQgcHRfaWR4LCBsZXZlbCA9IHAtPmFkZXYtPnZtX21hbmFnZXIubnVt X2xldmVsOworCXN0cnVjdCBhbWRncHVfdm1fcHQgKmVudHJ5ID0gJnAtPnZtLT5yb290LCAqcGFy ZW50OworCXVpbnQ2NF90IHBkX2FkZHIsIHBkZSwgcHQ7CiAKLQl3aGlsZSAoZW50cnktPmVudHJp ZXMpIHsKLQkJaWR4ID0gYWRkciA+PiAocC0+YWRldi0+dm1fbWFuYWdlci5ibG9ja19zaXplICog bGV2ZWwtLSk7Ci0JCWlkeCAlPSBhbWRncHVfYm9fc2l6ZShlbnRyeS0+Ym8pIC8gODsKLQkJZW50 cnkgPSAmZW50cnktPmVudHJpZXNbaWR4XTsKLQl9CisJZG8geworCQlwdF9pZHggPSBhZGRyID4+ IChwLT5hZGV2LT52bV9tYW5hZ2VyLmJsb2NrX3NpemUgKiBsZXZlbC0tKTsKKwkJcHRfaWR4ICU9 IGFtZGdwdV9ib19zaXplKGVudHJ5LT5ibykgLyA4OworCQlwYXJlbnQgPSBlbnRyeTsKKwkJZW50 cnkgPSAmZW50cnktPmVudHJpZXNbcHRfaWR4XTsKKwl9IHdoaWxlIChlbnRyeS0+ZW50cmllcyk7 CiAKIAlpZiAobGV2ZWwpCi0JCXJldHVybiBOVUxMOworCQlyZXR1cm4gLUVOT0VOVDsKKworCSpi byA9IGVudHJ5LT5ibzsKKworCS8qIEluIHRoZSBjYXNlIG9mIGEgbWl4ZWQgUFQgdGhlIFBERSBt dXN0IHBvaW50IHRvIGl0Ki8KKwlpZiAocC0+YWRldi0+YXNpY190eXBlIDwgQ0hJUF9WRUdBMTAg fHwKKwkgICAgbnB0ZXMgIT0gQU1ER1BVX1ZNX1BURV9DT1VOVChwLT5hZGV2KSB8fAorCSAgICBw LT5mdW5jICE9IGFtZGdwdV92bV9kb19zZXRfcHRlcyB8fAorCSAgICAhKGZsYWdzICYgQU1ER1BV X1BURV9WQUxJRCkpIHsKKworCQlwdCA9ICgqYm8pLT50Ym8ubWVtLnN0YXJ0IDw8IFBBR0VfU0hJ RlQ7CisJCXB0ID0gYW1kZ3B1X2dhcnRfZ2V0X3ZtX3BkZShwLT5hZGV2LCBwdCk7CisJCWZsYWdz ID0gQU1ER1BVX1BURV9WQUxJRDsKKwl9IGVsc2UgeworCQlwdCA9IGFtZGdwdV9nYXJ0X2dldF92 bV9wZGUocC0+YWRldiwgZHN0KTsKKwkJZmxhZ3MgfD0gQU1ER1BVX1BERV9QVEU7CisJfQogCi0J cmV0dXJuIGVudHJ5LT5ibzsKKwlpZiAoZW50cnktPmFkZHIgPT0gcHQgJiYKKwkgICAgZW50cnkt Pmh1Z2VfcGFnZSA9PSAhIShmbGFncyAmIEFNREdQVV9QREVfUFRFKSkKKwkJcmV0dXJuIDA7CisK KwllbnRyeS0+YWRkciA9IHB0OworCWVudHJ5LT5odWdlX3BhZ2UgPSAhIShmbGFncyAmIEFNREdQ VV9QREVfUFRFKTsKKworCWlmIChwYXJlbnQtPmJvLT5zaGFkb3cpIHsKKwkJcGRfYWRkciA9IGFt ZGdwdV9ib19ncHVfb2Zmc2V0KHBhcmVudC0+Ym8tPnNoYWRvdyk7CisJCXBkZSA9IHBkX2FkZHIg KyBwdF9pZHggKiA4OworCQlhbWRncHVfdm1fZG9fc2V0X3B0ZXMocCwgcGRlLCBwdCwgMSwgMCwg ZmxhZ3MpOworCX0KKworCXBkX2FkZHIgPSBhbWRncHVfYm9fZ3B1X29mZnNldChwYXJlbnQtPmJv KTsKKwlwZGUgPSBwZF9hZGRyICsgcHRfaWR4ICogODsKKwlhbWRncHVfdm1fZG9fc2V0X3B0ZXMo cCwgcGRlLCBwdCwgMSwgMCwgZmxhZ3MpOworCXJldHVybiAwOwogfQogCiAvKioKQEAgLTExOTQs MTQgKzEyMzcsMjAgQEAgc3RhdGljIGludCBhbWRncHVfdm1fdXBkYXRlX3B0ZXMoc3RydWN0IGFt ZGdwdV9wdGVfdXBkYXRlX3BhcmFtcyAqcGFyYW1zLAogCXVpbnQ2NF90IGFkZHIsIHBlX3N0YXJ0 OwogCXN0cnVjdCBhbWRncHVfYm8gKnB0OwogCXVuc2lnbmVkIG5wdGVzOworCWludCByOwogCiAJ Lyogd2FsayBvdmVyIHRoZSBhZGRyZXNzIHNwYWNlIGFuZCB1cGRhdGUgdGhlIHBhZ2UgdGFibGVz ICovCiAJZm9yIChhZGRyID0gc3RhcnQ7IGFkZHIgPCBlbmQ7IGFkZHIgKz0gbnB0ZXMpIHsKLQkJ cHQgPSBhbWRncHVfdm1fZ2V0X3B0KHBhcmFtcywgYWRkcik7Ci0JCWlmICghcHQpIHsKLQkJCXBy X2VycigiUFQgbm90IGZvdW5kLCBhYm9ydGluZyB1cGRhdGVfcHRlc1xuIik7Ci0JCQlyZXR1cm4g LUVJTlZBTDsKLQkJfQorCisJCWlmICgoYWRkciAmIH5tYXNrKSA9PSAoZW5kICYgfm1hc2spKQor CQkJbnB0ZXMgPSBlbmQgLSBhZGRyOworCQllbHNlCisJCQlucHRlcyA9IEFNREdQVV9WTV9QVEVf Q09VTlQoYWRldikgLSAoYWRkciAmIG1hc2spOworCisJCXIgPSBhbWRncHVfdm1faGFuZGxlX2h1 Z2VfcGFnZXMocGFyYW1zLCBhZGRyLCBucHRlcywKKwkJCQkJCWRzdCwgZmxhZ3MsICZwdCk7CisJ CWlmIChyKQorCQkJcmV0dXJuIHI7CiAKIAkJaWYgKHBhcmFtcy0+c2hhZG93KSB7CiAJCQlpZiAo IXB0LT5zaGFkb3cpCkBAIC0xMjA5LDExICsxMjU4LDYgQEAgc3RhdGljIGludCBhbWRncHVfdm1f dXBkYXRlX3B0ZXMoc3RydWN0IGFtZGdwdV9wdGVfdXBkYXRlX3BhcmFtcyAqcGFyYW1zLAogCQkJ cHQgPSBwdC0+c2hhZG93OwogCQl9CiAKLQkJaWYgKChhZGRyICYgfm1hc2spID09IChlbmQgJiB+ bWFzaykpCi0JCQlucHRlcyA9IGVuZCAtIGFkZHI7Ci0JCWVsc2UKLQkJCW5wdGVzID0gQU1ER1BV X1ZNX1BURV9DT1VOVChhZGV2KSAtIChhZGRyICYgbWFzayk7Ci0KIAkJcGVfc3RhcnQgPSBhbWRn cHVfYm9fZ3B1X29mZnNldChwdCk7CiAJCXBlX3N0YXJ0ICs9IChhZGRyICYgbWFzaykgKiA4Owog CkBAIC0xMzUzLDYgKzEzOTcsOSBAQCBzdGF0aWMgaW50IGFtZGdwdV92bV9ib191cGRhdGVfbWFw cGluZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkvKiBwYWRkaW5nLCBldGMuICovCiAJ bmR3ID0gNjQ7CiAKKwkvKiBvbmUgUERFIHdyaXRlIGZvciBlYWNoIGh1Z2UgcGFnZSAqLworCW5k dyArPSAoKG5wdGVzID4+IGFkZXYtPnZtX21hbmFnZXIuYmxvY2tfc2l6ZSkgKyAxKSAqIDc7CisK IAlpZiAoc3JjKSB7CiAJCS8qIG9ubHkgY29weSBjb21tYW5kcyBuZWVkZWQgKi8KIAkJbmR3ICs9 IG5jbWRzICogNzsKQEAgLTE0MzcsNiArMTQ4NCw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3ZtX2Jv X3VwZGF0ZV9tYXBwaW5nKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCiBlcnJvcl9mcmVl OgogCWFtZGdwdV9qb2JfZnJlZShqb2IpOworCWFtZGdwdV92bV9pbnZhbGlkYXRlX2xldmVsKCZ2 bS0+cm9vdCk7CiAJcmV0dXJuIHI7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV92bS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3ZtLmgKaW5kZXggYWZlOTA3My4uMWM1ZTBjZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X3ZtLmgKQEAgLTY4LDYgKzY4LDkgQEAgc3RydWN0IGFtZGdwdV9ib19saXN0X2VudHJ5 OwogLyogVElMRUQgZm9yIFZFR0ExMCwgcmVzZXJ2ZWQgZm9yIG9sZGVyIEFTSUNzICAqLwogI2Rl ZmluZSBBTURHUFVfUFRFX1BSVAkJKDFVTEwgPDwgNTEpCiAKKy8qIFBERSBpcyBoYW5kbGVkIGFz IFBURSBmb3IgVkVHQTEwICovCisjZGVmaW5lIEFNREdQVV9QREVfUFRFCQkoMVVMTCA8PCA1NCkK KwogLyogVkVHQTEwIG9ubHkgKi8KICNkZWZpbmUgQU1ER1BVX1BURV9NVFlQRShhKSAgICAoKHVp bnQ2NF90KWEgPDwgNTcpCiAjZGVmaW5lIEFNREdQVV9QVEVfTVRZUEVfTUFTSwlBTURHUFVfUFRF X01UWVBFKDNVTEwpCkBAIC05MCw2ICs5Myw3IEBAIHN0cnVjdCBhbWRncHVfYm9fbGlzdF9lbnRy eTsKIHN0cnVjdCBhbWRncHVfdm1fcHQgewogCXN0cnVjdCBhbWRncHVfYm8JKmJvOwogCXVpbnQ2 NF90CQlhZGRyOworCWJvb2wJCQlodWdlX3BhZ2U7CiAKIAkvKiBhcnJheSBvZiBwYWdlIHRhYmxl cywgb25lIGZvciBlYWNoIGRpcmVjdG9yeSBlbnRyeSAqLwogCXN0cnVjdCBhbWRncHVfdm1fcHQJ KmVudHJpZXM7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQt Z2Z4Cg==