From: "Yang, Philip" Subject: [PATCH 2/3] drm/amdgpu: support userptr cross VMAs case with HMM v3 Date: Wed, 13 Mar 2019 01:17:38 +0000 Message-ID: <20190313011711.2040-1-Philip.Yang@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Language: en-US 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: "Yang, Philip" dXNlcnB0ciBtYXkgY3Jvc3MgdHdvIFZNQXMgaWYgdGhlIGZvcmtlZCBjaGlsZCBwcm9jZXNzIChu b3QgY2FsbCBleGVjCmFmdGVyIGZvcmspIG1hbGxvYyBidWZmZXIsIHRoZW4gZnJlZSBpdCwgYW5k IHRoZW4gbWFsbG9jIGxhcmdlciBzaXplCmJ1Ziwga2VyZW5sIHdpbGwgY3JlYXRlIG5ldyBWTUEg YWRqYWNlbnQgdG8gb2xkIFZNQSB3aGljaCB3YXMgY2xvbmVkCmZyb20gcGFyZW50IHByb2Nlc3Ms IHNvbWUgcGFnZXMgb2YgdXNlcnB0ciBhcmUgaW4gdGhlIGZpcnN0IFZNQSwgdGhlCnJlc3QgcGFn ZXMgYXJlIGluIHRoZSBzZWNvbmQgVk1BLgoKSE1NIGV4cGVjdHMgcmFuZ2Ugb25seSBoYXZlIG9u ZSBWTUEsIGxvb3Agb3ZlciBhbGwgVk1BcyBpbiB0aGUgYWRkcmVzcwpyYW5nZSwgY3JlYXRlIG11 bHRpcGxlIHJhbmdlcyB0byBoYW5kbGUgdGhpcyBjYXNlLiBTZWUKaXNfbWVyZ2VhYmxlX2Fub25f dm1hIGluIG1tL21tYXAuYyBmb3IgZGV0YWlscy4KCkNoYW5nZS1JZDogSTBjYThjNzdlMjhkZWFi Y2NjMTM5OTA2ZjlmZmVlMDRiN2UzODMzMTQKU2lnbmVkLW9mZi1ieTogUGhpbGlwIFlhbmcgPFBo aWxpcC5ZYW5nQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3R0bS5jIHwgMTI2ICsrKysrKysrKysrKysrKysrLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkx IGluc2VydGlvbnMoKyksIDM1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV90dG0uYwppbmRleCBjMTI0MGJmMjQzYmEuLmMxNDE5ODczN2RjZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYwpAQCAtNzExLDcgKzcxMSw4IEBAIHN0cnVj dCBhbWRncHVfdHRtX3R0IHsKIAlzdHJ1Y3QgdGFza19zdHJ1Y3QJKnVzZXJ0YXNrOwogCXVpbnQz Ml90CQl1c2VyZmxhZ3M7CiAjaWYgSVNfRU5BQkxFRChDT05GSUdfRFJNX0FNREdQVV9VU0VSUFRS KQotCXN0cnVjdCBobW1fcmFuZ2UJcmFuZ2U7CisJc3RydWN0IGhtbV9yYW5nZQkqcmFuZ2VzOwor CWludAkJCW5yX3JhbmdlczsKICNlbmRpZgogfTsKIApAQCAtNzIzLDYyICs3MjQsMTA4IEBAIHN0 cnVjdCBhbWRncHVfdHRtX3R0IHsKICAqIG9uY2UgYWZ0ZXJ3YXJkcyB0byBzdG9wIEhNTSB0cmFj a2luZwogICovCiAjaWYgSVNfRU5BQkxFRChDT05GSUdfRFJNX0FNREdQVV9VU0VSUFRSKQorCisv KiBTdXBwb3J0IFVzZXJwdHIgcGFnZXMgY3Jvc3MgbWF4IDE2IHZtYXMgKi8KKyNkZWZpbmUgTUFY X05SX1ZNQVMJKDE2KQorCiBpbnQgYW1kZ3B1X3R0bV90dF9nZXRfdXNlcl9wYWdlcyhzdHJ1Y3Qg dHRtX3R0ICp0dG0sIHN0cnVjdCBwYWdlICoqcGFnZXMpCiB7CiAJc3RydWN0IGFtZGdwdV90dG1f dHQgKmd0dCA9ICh2b2lkICopdHRtOwogCXN0cnVjdCBtbV9zdHJ1Y3QgKm1tID0gZ3R0LT51c2Vy dGFzay0+bW07Ci0JdW5zaWduZWQgbG9uZyBlbmQgPSBndHQtPnVzZXJwdHIgKyB0dG0tPm51bV9w YWdlcyAqIFBBR0VfU0laRTsKLQlzdHJ1Y3QgaG1tX3JhbmdlICpyYW5nZSA9ICZndHQtPnJhbmdl OwotCWludCByID0gMCwgaTsKKwl1bnNpZ25lZCBsb25nIHN0YXJ0ID0gZ3R0LT51c2VycHRyOwor CXVuc2lnbmVkIGxvbmcgZW5kID0gc3RhcnQgKyB0dG0tPm51bV9wYWdlcyAqIFBBR0VfU0laRTsK KwlzdHJ1Y3QgaG1tX3JhbmdlICpyYW5nZXM7CisJc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEg PSBOVUxMLCAqdm1hc1tNQVhfTlJfVk1BU107CisJdWludDY0X3QgKnBmbnMsIGY7CisJaW50IHIg PSAwLCBpLCBucl9wYWdlczsKIAogCWlmICghbW0pIC8qIEhhcHBlbnMgZHVyaW5nIHByb2Nlc3Mg c2h1dGRvd24gKi8KIAkJcmV0dXJuIC1FU1JDSDsKIAotCWFtZGdwdV9obW1faW5pdF9yYW5nZShy YW5nZSk7Ci0KIAlkb3duX3JlYWQoJm1tLT5tbWFwX3NlbSk7CiAKLQlyYW5nZS0+dm1hID0gZmlu ZF92bWEobW0sIGd0dC0+dXNlcnB0cik7Ci0JaWYgKCFyYW5nZV9pbl92bWEocmFuZ2UtPnZtYSwg Z3R0LT51c2VycHRyLCBlbmQpKQotCQlyID0gLUVGQVVMVDsKLQllbHNlIGlmICgoZ3R0LT51c2Vy ZmxhZ3MgJiBBTURHUFVfR0VNX1VTRVJQVFJfQU5PTk9OTFkpICYmCi0JCXJhbmdlLT52bWEtPnZt X2ZpbGUpCisJLyogdXNlciBwYWdlcyBtYXkgY3Jvc3MgbXVsdGlwbGUgVk1BcyAqLworCWd0dC0+ bnJfcmFuZ2VzID0gMDsKKwlkbyB7CisJCXVuc2lnbmVkIGxvbmcgdm1fc3RhcnQ7CisKKwkJaWYg KGd0dC0+bnJfcmFuZ2VzID49IE1BWF9OUl9WTUFTKSB7CisJCQlEUk1fRVJST1IoIlRvbyBtYW55 IFZNQXMgaW4gdXNlcnB0ciByYW5nZVxuIik7CisJCQlyID0gLUVGQVVMVDsKKwkJCWdvdG8gb3V0 OworCQl9CisKKwkJdm1fc3RhcnQgPSB2bWEgPyB2bWEtPnZtX2VuZCA6IHN0YXJ0OworCQl2bWEg PSBmaW5kX3ZtYShtbSwgdm1fc3RhcnQpOworCQlpZiAodW5saWtlbHkoIXZtYSB8fCB2bV9zdGFy dCA8IHZtYS0+dm1fc3RhcnQpKSB7CisJCQlyID0gLUVGQVVMVDsKKwkJCWdvdG8gb3V0OworCQl9 CisJCXZtYXNbZ3R0LT5ucl9yYW5nZXMrK10gPSB2bWE7CisJfSB3aGlsZSAoZW5kID4gdm1hLT52 bV9lbmQpOworCisJRFJNX0RFQlVHX0RSSVZFUigiMHglbHggbnJfcmFuZ2VzICVkIHBhZ2VzIDB4 JWx4XG4iLAorCQlzdGFydCwgZ3R0LT5ucl9yYW5nZXMsIHR0bS0+bnVtX3BhZ2VzKTsKKworCWlm ICh1bmxpa2VseSgoZ3R0LT51c2VyZmxhZ3MgJiBBTURHUFVfR0VNX1VTRVJQVFJfQU5PTk9OTFkp ICYmCisJCXZtYXNbMF0tPnZtX2ZpbGUpKSB7CiAJCXIgPSAtRVBFUk07Ci0JaWYgKHIpCiAJCWdv dG8gb3V0OworCX0KIAotCXJhbmdlLT5wZm5zID0ga3ZtYWxsb2NfYXJyYXkodHRtLT5udW1fcGFn ZXMsIHNpemVvZih1aW50NjRfdCksCi0JCQkJICAgICBHRlBfS0VSTkVMKTsKLQlpZiAocmFuZ2Ut PnBmbnMgPT0gTlVMTCkgeworCXJhbmdlcyA9IGt2bWFsbG9jX2FycmF5KGd0dC0+bnJfcmFuZ2Vz LCBzaXplb2YoKnJhbmdlcyksIEdGUF9LRVJORUwpOworCWlmICh1bmxpa2VseSghcmFuZ2VzKSkg ewogCQlyID0gLUVOT01FTTsKIAkJZ290byBvdXQ7CiAJfQotCXJhbmdlLT5zdGFydCA9IGd0dC0+ dXNlcnB0cjsKLQlyYW5nZS0+ZW5kID0gZW5kOwogCi0JcmFuZ2UtPnBmbnNbMF0gPSByYW5nZS0+ ZmxhZ3NbSE1NX1BGTl9WQUxJRF07Ci0JcmFuZ2UtPnBmbnNbMF0gfD0gYW1kZ3B1X3R0bV90dF9p c19yZWFkb25seSh0dG0pID8KLQkJCQkwIDogcmFuZ2UtPmZsYWdzW0hNTV9QRk5fV1JJVEVdOwot CWZvciAoaSA9IDE7IGkgPCB0dG0tPm51bV9wYWdlczsgaSsrKQotCQlyYW5nZS0+cGZuc1tpXSA9 IHJhbmdlLT5wZm5zWzBdOworCXBmbnMgPSBrdm1hbGxvY19hcnJheSh0dG0tPm51bV9wYWdlcywg c2l6ZW9mKCpwZm5zKSwgR0ZQX0tFUk5FTCk7CisJaWYgKHVubGlrZWx5KCFwZm5zKSkgeworCQly ID0gLUVOT01FTTsKKwkJZ290byBvdXRfZnJlZV9yYW5nZXM7CisJfQorCisJZm9yIChpID0gMDsg aSA8IGd0dC0+bnJfcmFuZ2VzOyBpKyspCisJCWFtZGdwdV9obW1faW5pdF9yYW5nZSgmcmFuZ2Vz W2ldKTsKKworCWYgPSByYW5nZXNbMF0uZmxhZ3NbSE1NX1BGTl9WQUxJRF07CisJZiB8PSBhbWRn cHVfdHRtX3R0X2lzX3JlYWRvbmx5KHR0bSkgPworCQkJCTAgOiByYW5nZXNbMF0uZmxhZ3NbSE1N X1BGTl9XUklURV07CisJbWVtc2V0NjQocGZucywgZiwgdHRtLT5udW1fcGFnZXMpOworCisJZm9y IChucl9wYWdlcyA9IDAsIGkgPSAwOyBpIDwgZ3R0LT5ucl9yYW5nZXM7IGkrKykgeworCQlyYW5n ZXNbaV0udm1hID0gdm1hc1tpXTsKKwkJcmFuZ2VzW2ldLnN0YXJ0ID0gbWF4KHN0YXJ0LCB2bWFz W2ldLT52bV9zdGFydCk7CisJCXJhbmdlc1tpXS5lbmQgPSBtaW4oZW5kLCB2bWFzW2ldLT52bV9l bmQpOworCQlyYW5nZXNbaV0ucGZucyA9IHBmbnMgKyBucl9wYWdlczsKKwkJbnJfcGFnZXMgKz0g KHJhbmdlc1tpXS5lbmQgLSByYW5nZXNbaV0uc3RhcnQpIC8gUEFHRV9TSVpFOworCisJCXIgPSBo bW1fdm1hX2ZhdWx0KCZyYW5nZXNbaV0sIHRydWUpOworCQlpZiAodW5saWtlbHkocikpCisJCQli cmVhazsKKwl9CisJaWYgKHVubGlrZWx5KHIpKSB7CisJCXdoaWxlIChpLS0pCisJCQlobW1fdm1h X3JhbmdlX2RvbmUoJnJhbmdlc1tpXSk7CiAKLQkvKiBUaGlzIG1heSB0cmlnZ2VyIHBhZ2UgdGFi bGUgdXBkYXRlICovCi0JciA9IGhtbV92bWFfZmF1bHQocmFuZ2UsIHRydWUpOwotCWlmIChyKQog CQlnb3RvIG91dF9mcmVlX3BmbnM7CisJfQogCiAJdXBfcmVhZCgmbW0tPm1tYXBfc2VtKTsKIAog CWZvciAoaSA9IDA7IGkgPCB0dG0tPm51bV9wYWdlczsgaSsrKQotCQlwYWdlc1tpXSA9IGhtbV9w Zm5fdG9fcGFnZShyYW5nZSwgcmFuZ2UtPnBmbnNbaV0pOworCQlwYWdlc1tpXSA9IGhtbV9wZm5f dG9fcGFnZSgmcmFuZ2VzWzBdLCBwZm5zW2ldKTsKKwlndHQtPnJhbmdlcyA9IHJhbmdlczsKIAog CXJldHVybiAwOwogCiBvdXRfZnJlZV9wZm5zOgotCWt2ZnJlZShyYW5nZS0+cGZucyk7Ci0JcmFu Z2UtPnBmbnMgPSBOVUxMOworCWt2ZnJlZShwZm5zKTsKK291dF9mcmVlX3JhbmdlczoKKwlrdmZy ZWUocmFuZ2VzKTsKIG91dDoKIAl1cF9yZWFkKCZtbS0+bW1hcF9zZW0pOworCiAJcmV0dXJuIHI7 CiB9CiAKQEAgLTc5MiwxNSArODM5LDIzIEBAIGJvb2wgYW1kZ3B1X3R0bV90dF9nZXRfdXNlcl9w YWdlc19kb25lKHN0cnVjdCB0dG1fdHQgKnR0bSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X3R0bV90dCAq Z3R0ID0gKHZvaWQgKil0dG07CiAJYm9vbCByID0gZmFsc2U7CisJaW50IGk7CiAKIAlpZiAoIWd0 dCB8fCAhZ3R0LT51c2VycHRyKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlXQVJOX09OQ0UoIWd0dC0+ cmFuZ2UucGZucywgIk5vIHVzZXIgcGFnZXMgdG8gY2hlY2tcbiIpOwotCWlmIChndHQtPnJhbmdl LnBmbnMpIHsKLQkJciA9IGhtbV92bWFfcmFuZ2VfZG9uZSgmZ3R0LT5yYW5nZSk7Ci0JCWt2ZnJl ZShndHQtPnJhbmdlLnBmbnMpOwotCQlndHQtPnJhbmdlLnBmbnMgPSBOVUxMOworCURSTV9ERUJV R19EUklWRVIoInVzZXJfcGFnZXNfZG9uZSAweCVsbHggbnJfcmFuZ2VzICVkIHBhZ2VzIDB4JWx4 XG4iLAorCQlndHQtPnVzZXJwdHIsIGd0dC0+bnJfcmFuZ2VzLCB0dG0tPm51bV9wYWdlcyk7CisK KwlXQVJOX09OQ0UoIWd0dC0+cmFuZ2VzIHx8ICFndHQtPnJhbmdlc1swXS5wZm5zLAorCQkiTm8g dXNlciBwYWdlcyB0byBjaGVja1xuIik7CisKKwlpZiAoZ3R0LT5yYW5nZXMpIHsKKwkJZm9yIChp ID0gMDsgaSA8IGd0dC0+bnJfcmFuZ2VzOyBpKyspCisJCQlyIHw9IGhtbV92bWFfcmFuZ2VfZG9u ZSgmZ3R0LT5yYW5nZXNbaV0pOworCQlrdmZyZWUoZ3R0LT5yYW5nZXNbMF0ucGZucyk7CisJCWt2 ZnJlZShndHQtPnJhbmdlcyk7CisJCWd0dC0+cmFuZ2VzID0gTlVMTDsKIAl9CiAKIAlyZXR1cm4g cjsKQEAgLTg4NCw4ICs5MzksOSBAQCBzdGF0aWMgdm9pZCBhbWRncHVfdHRtX3R0X3VucGluX3Vz ZXJwdHIoc3RydWN0IHR0bV90dCAqdHRtKQogCXNnX2ZyZWVfdGFibGUodHRtLT5zZyk7CiAKICNp ZiBJU19FTkFCTEVEKENPTkZJR19EUk1fQU1ER1BVX1VTRVJQVFIpCi0JaWYgKGd0dC0+cmFuZ2Uu cGZucyAmJgotCSAgICB0dG0tPnBhZ2VzWzBdID09IGhtbV9wZm5fdG9fcGFnZSgmZ3R0LT5yYW5n ZSwgZ3R0LT5yYW5nZS5wZm5zWzBdKSkKKwlpZiAoZ3R0LT5yYW5nZXMgJiYKKwkgICAgdHRtLT5w YWdlc1swXSA9PSBobW1fcGZuX3RvX3BhZ2UoJmd0dC0+cmFuZ2VzWzBdLAorCQkJCQkgICAgIGd0 dC0+cmFuZ2VzWzBdLnBmbnNbMF0pKQogCQlXQVJOX09OQ0UoMSwgIk1pc3NpbmcgZ2V0X3VzZXJf cGFnZV9kb25lXG4iKTsKICNlbmRpZgogfQotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2FtZC1nZng=