From: Huang Rui Subject: Re: [PATCH 03/11] drm/amdgpu: cleanup VM handling in the CS a bit Date: Thu, 23 Aug 2018 15:54:11 +0800 Message-ID: <20180823075410.GE4908@hr-amur2> References: <20180822150517.2330-1-christian.koenig@amd.com> <20180822150517.2330-3-christian.koenig@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20180822150517.2330-3-christian.koenig-5C7GfCeVMHo@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: Christian =?iso-8859-1?Q?K=F6nig?= Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org T24gV2VkLCBBdWcgMjIsIDIwMTggYXQgMDU6MDU6MDlQTSArMDIwMCwgQ2hyaXN0aWFuIEvDtm5p ZyB3cm90ZToKPiBBZGQgYSBoZWxwZXIgZnVuY3Rpb24gZm9yIGdldHRpbmcgdGhlIHJvb3QgUEQg YWRkciBhbmQgY2xlYW51cCBqb2luIHRoZQo+IHR3byBWTSByZWxhdGVkIGZ1bmN0aW9ucyBhbmQg Y2xlYW51cCB0aGUgZnVuY3Rpb24gbmFtZS4KPiAKPiBObyBmdW5jdGlvbmFsIGNoYW5nZS4KPiAK PiBTaWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5j b20+CgpSZXZpZXdlZC1ieTogSHVhbmcgUnVpIDxyYXkuaHVhbmdAYW1kLmNvbT4KCj4gLS0tCj4g IGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jIHwgMTYwICsrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDc0IGluc2VydGlvbnMoKyksIDg2IGRl bGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCj4gaW5k ZXggZDQyZDFjOGY3OGY2Li4xN2JmNjNmOTNjOTMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfY3MuYwo+IEBAIC04MDQsOCArODA0LDkgQEAgc3RhdGljIHZvaWQgYW1kZ3B1 X2NzX3BhcnNlcl9maW5pKHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwYXJzZXIsIGludCBlcnJv ciwKPiAgCWFtZGdwdV9ib191bnJlZigmcGFyc2VyLT51Zl9lbnRyeS5yb2JqKTsKPiAgfQo+ICAK PiAtc3RhdGljIGludCBhbWRncHVfYm9fdm1fdXBkYXRlX3B0ZShzdHJ1Y3QgYW1kZ3B1X2NzX3Bh cnNlciAqcCkKPiArc3RhdGljIGludCBhbWRncHVfY3Nfdm1faGFuZGxpbmcoc3RydWN0IGFtZGdw dV9jc19wYXJzZXIgKnApCj4gIHsKPiArCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9IHRvX2Ft ZGdwdV9yaW5nKHAtPmVudGl0eS0+cnEtPnNjaGVkKTsKPiAgCXN0cnVjdCBhbWRncHVfZnByaXYg KmZwcml2ID0gcC0+ZmlscC0+ZHJpdmVyX3ByaXY7Cj4gIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiA9IHAtPmFkZXY7Cj4gIAlzdHJ1Y3QgYW1kZ3B1X3ZtICp2bSA9ICZmcHJpdi0+dm07Cj4g QEAgLTgxNCw2ICs4MTUsNzEgQEAgc3RhdGljIGludCBhbWRncHVfYm9fdm1fdXBkYXRlX3B0ZShz dHJ1Y3QgYW1kZ3B1X2NzX3BhcnNlciAqcCkKPiAgCXN0cnVjdCBhbWRncHVfYm8gKmJvOwo+ICAJ aW50IHI7Cj4gIAo+ICsJLyogT25seSBmb3IgVVZEL1ZDRSBWTSBlbXVsYXRpb24gKi8KPiArCWlm IChyaW5nLT5mdW5jcy0+cGFyc2VfY3MgfHwgcmluZy0+ZnVuY3MtPnBhdGNoX2NzX2luX3BsYWNl KSB7Cj4gKwkJdW5zaWduZWQgaSwgajsKPiArCj4gKwkJZm9yIChpID0gMCwgaiA9IDA7IGkgPCBw LT5uY2h1bmtzICYmIGogPCBwLT5qb2ItPm51bV9pYnM7IGkrKykgewo+ICsJCQlzdHJ1Y3QgZHJt X2FtZGdwdV9jc19jaHVua19pYiAqY2h1bmtfaWI7Cj4gKwkJCXN0cnVjdCBhbWRncHVfYm9fdmFf bWFwcGluZyAqbTsKPiArCQkJc3RydWN0IGFtZGdwdV9ibyAqYW9iaiA9IE5VTEw7Cj4gKwkJCXN0 cnVjdCBhbWRncHVfY3NfY2h1bmsgKmNodW5rOwo+ICsJCQl1aW50NjRfdCBvZmZzZXQsIHZhX3N0 YXJ0Owo+ICsJCQlzdHJ1Y3QgYW1kZ3B1X2liICppYjsKPiArCQkJdWludDhfdCAqa3B0cjsKPiAr Cj4gKwkJCWNodW5rID0gJnAtPmNodW5rc1tpXTsKPiArCQkJaWIgPSAmcC0+am9iLT5pYnNbal07 Cj4gKwkJCWNodW5rX2liID0gY2h1bmstPmtkYXRhOwo+ICsKPiArCQkJaWYgKGNodW5rLT5jaHVu a19pZCAhPSBBTURHUFVfQ0hVTktfSURfSUIpCj4gKwkJCQljb250aW51ZTsKPiArCj4gKwkJCXZh X3N0YXJ0ID0gY2h1bmtfaWItPnZhX3N0YXJ0ICYgQU1ER1BVX1ZBX0hPTEVfTUFTSzsKPiArCQkJ ciA9IGFtZGdwdV9jc19maW5kX21hcHBpbmcocCwgdmFfc3RhcnQsICZhb2JqLCAmbSk7Cj4gKwkJ CWlmIChyKSB7Cj4gKwkJCQlEUk1fRVJST1IoIklCIHZhX3N0YXJ0IGlzIGludmFsaWRcbiIpOwo+ ICsJCQkJcmV0dXJuIHI7Cj4gKwkJCX0KPiArCj4gKwkJCWlmICgodmFfc3RhcnQgKyBjaHVua19p Yi0+aWJfYnl0ZXMpID4KPiArCQkJICAgIChtLT5sYXN0ICsgMSkgKiBBTURHUFVfR1BVX1BBR0Vf U0laRSkgewo+ICsJCQkJRFJNX0VSUk9SKCJJQiB2YV9zdGFydCtpYl9ieXRlcyBpcyBpbnZhbGlk XG4iKTsKPiArCQkJCXJldHVybiAtRUlOVkFMOwo+ICsJCQl9Cj4gKwo+ICsJCQkvKiB0aGUgSUIg c2hvdWxkIGJlIHJlc2VydmVkIGF0IHRoaXMgcG9pbnQgKi8KPiArCQkJciA9IGFtZGdwdV9ib19r bWFwKGFvYmosICh2b2lkICoqKSZrcHRyKTsKPiArCQkJaWYgKHIpIHsKPiArCQkJCXJldHVybiBy Owo+ICsJCQl9Cj4gKwo+ICsJCQlvZmZzZXQgPSBtLT5zdGFydCAqIEFNREdQVV9HUFVfUEFHRV9T SVpFOwo+ICsJCQlrcHRyICs9IHZhX3N0YXJ0IC0gb2Zmc2V0Owo+ICsKPiArCQkJaWYgKHJpbmct PmZ1bmNzLT5wYXJzZV9jcykgewo+ICsJCQkJbWVtY3B5KGliLT5wdHIsIGtwdHIsIGNodW5rX2li LT5pYl9ieXRlcyk7Cj4gKwkJCQlhbWRncHVfYm9fa3VubWFwKGFvYmopOwo+ICsKPiArCQkJCXIg PSBhbWRncHVfcmluZ19wYXJzZV9jcyhyaW5nLCBwLCBqKTsKPiArCQkJCWlmIChyKQo+ICsJCQkJ CXJldHVybiByOwo+ICsJCQl9IGVsc2Ugewo+ICsJCQkJaWItPnB0ciA9ICh1aW50MzJfdCAqKWtw dHI7Cj4gKwkJCQlyID0gYW1kZ3B1X3JpbmdfcGF0Y2hfY3NfaW5fcGxhY2UocmluZywgcCwgaik7 Cj4gKwkJCQlhbWRncHVfYm9fa3VubWFwKGFvYmopOwo+ICsJCQkJaWYgKHIpCj4gKwkJCQkJcmV0 dXJuIHI7Cj4gKwkJCX0KPiArCj4gKwkJCWorKzsKPiArCQl9Cj4gKwl9Cj4gKwo+ICsJaWYgKCFw LT5qb2ItPnZtKQo+ICsJCXJldHVybiBhbWRncHVfY3Nfc3luY19yaW5ncyhwKTsKPiArCj4gKwo+ ICAJciA9IGFtZGdwdV92bV9jbGVhcl9mcmVlZChhZGV2LCB2bSwgTlVMTCk7Cj4gIAlpZiAocikK PiAgCQlyZXR1cm4gcjsKPiBAQCAtODc2LDYgKzk0MiwxMiBAQCBzdGF0aWMgaW50IGFtZGdwdV9i b192bV91cGRhdGVfcHRlKHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwKQo+ICAJaWYgKHIpCj4g IAkJcmV0dXJuIHI7Cj4gIAo+ICsJciA9IHJlc2VydmF0aW9uX29iamVjdF9yZXNlcnZlX3NoYXJl ZCh2bS0+cm9vdC5iYXNlLmJvLT50Ym8ucmVzdik7Cj4gKwlpZiAocikKPiArCQlyZXR1cm4gcjsK PiArCj4gKwlwLT5qb2ItPnZtX3BkX2FkZHIgPSBhbWRncHVfYm9fZ3B1X29mZnNldCh2bS0+cm9v dC5iYXNlLmJvKTsKPiArCj4gIAlpZiAoYW1kZ3B1X3ZtX2RlYnVnKSB7Cj4gIAkJLyogSW52YWxp ZGF0ZSBhbGwgQk9zIHRvIHRlc3QgZm9yIHVzZXJzcGFjZSBidWdzICovCj4gIAkJYW1kZ3B1X2Jv X2xpc3RfZm9yX2VhY2hfZW50cnkoZSwgcC0+Ym9fbGlzdCkgewo+IEBAIC04ODcsOTAgKzk1OSw2 IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2JvX3ZtX3VwZGF0ZV9wdGUoc3RydWN0IGFtZGdwdV9jc19w YXJzZXIgKnApCj4gIAkJfQo+ICAJfQo+ICAKPiAtCXJldHVybiByOwo+IC19Cj4gLQo+IC1zdGF0 aWMgaW50IGFtZGdwdV9jc19pYl92bV9jaHVuayhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwK PiAtCQkJCSBzdHJ1Y3QgYW1kZ3B1X2NzX3BhcnNlciAqcCkKPiAtewo+IC0Jc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nID0gdG9fYW1kZ3B1X3JpbmcocC0+ZW50aXR5LT5ycS0+c2NoZWQpOwo+IC0J c3RydWN0IGFtZGdwdV9mcHJpdiAqZnByaXYgPSBwLT5maWxwLT5kcml2ZXJfcHJpdjsKPiAtCXN0 cnVjdCBhbWRncHVfdm0gKnZtID0gJmZwcml2LT52bTsKPiAtCWludCByOwo+IC0KPiAtCS8qIE9u bHkgZm9yIFVWRC9WQ0UgVk0gZW11bGF0aW9uICovCj4gLQlpZiAocmluZy0+ZnVuY3MtPnBhcnNl X2NzIHx8IHJpbmctPmZ1bmNzLT5wYXRjaF9jc19pbl9wbGFjZSkgewo+IC0JCXVuc2lnbmVkIGks IGo7Cj4gLQo+IC0JCWZvciAoaSA9IDAsIGogPSAwOyBpIDwgcC0+bmNodW5rcyAmJiBqIDwgcC0+ am9iLT5udW1faWJzOyBpKyspIHsKPiAtCQkJc3RydWN0IGRybV9hbWRncHVfY3NfY2h1bmtfaWIg KmNodW5rX2liOwo+IC0JCQlzdHJ1Y3QgYW1kZ3B1X2JvX3ZhX21hcHBpbmcgKm07Cj4gLQkJCXN0 cnVjdCBhbWRncHVfYm8gKmFvYmogPSBOVUxMOwo+IC0JCQlzdHJ1Y3QgYW1kZ3B1X2NzX2NodW5r ICpjaHVuazsKPiAtCQkJdWludDY0X3Qgb2Zmc2V0LCB2YV9zdGFydDsKPiAtCQkJc3RydWN0IGFt ZGdwdV9pYiAqaWI7Cj4gLQkJCXVpbnQ4X3QgKmtwdHI7Cj4gLQo+IC0JCQljaHVuayA9ICZwLT5j aHVua3NbaV07Cj4gLQkJCWliID0gJnAtPmpvYi0+aWJzW2pdOwo+IC0JCQljaHVua19pYiA9IGNo dW5rLT5rZGF0YTsKPiAtCj4gLQkJCWlmIChjaHVuay0+Y2h1bmtfaWQgIT0gQU1ER1BVX0NIVU5L X0lEX0lCKQo+IC0JCQkJY29udGludWU7Cj4gLQo+IC0JCQl2YV9zdGFydCA9IGNodW5rX2liLT52 YV9zdGFydCAmIEFNREdQVV9WQV9IT0xFX01BU0s7Cj4gLQkJCXIgPSBhbWRncHVfY3NfZmluZF9t YXBwaW5nKHAsIHZhX3N0YXJ0LCAmYW9iaiwgJm0pOwo+IC0JCQlpZiAocikgewo+IC0JCQkJRFJN X0VSUk9SKCJJQiB2YV9zdGFydCBpcyBpbnZhbGlkXG4iKTsKPiAtCQkJCXJldHVybiByOwo+IC0J CQl9Cj4gLQo+IC0JCQlpZiAoKHZhX3N0YXJ0ICsgY2h1bmtfaWItPmliX2J5dGVzKSA+Cj4gLQkJ CSAgICAobS0+bGFzdCArIDEpICogQU1ER1BVX0dQVV9QQUdFX1NJWkUpIHsKPiAtCQkJCURSTV9F UlJPUigiSUIgdmFfc3RhcnQraWJfYnl0ZXMgaXMgaW52YWxpZFxuIik7Cj4gLQkJCQlyZXR1cm4g LUVJTlZBTDsKPiAtCQkJfQo+IC0KPiAtCQkJLyogdGhlIElCIHNob3VsZCBiZSByZXNlcnZlZCBh dCB0aGlzIHBvaW50ICovCj4gLQkJCXIgPSBhbWRncHVfYm9fa21hcChhb2JqLCAodm9pZCAqKikm a3B0cik7Cj4gLQkJCWlmIChyKSB7Cj4gLQkJCQlyZXR1cm4gcjsKPiAtCQkJfQo+IC0KPiAtCQkJ b2Zmc2V0ID0gbS0+c3RhcnQgKiBBTURHUFVfR1BVX1BBR0VfU0laRTsKPiAtCQkJa3B0ciArPSB2 YV9zdGFydCAtIG9mZnNldDsKPiAtCj4gLQkJCWlmIChyaW5nLT5mdW5jcy0+cGFyc2VfY3MpIHsK PiAtCQkJCW1lbWNweShpYi0+cHRyLCBrcHRyLCBjaHVua19pYi0+aWJfYnl0ZXMpOwo+IC0JCQkJ YW1kZ3B1X2JvX2t1bm1hcChhb2JqKTsKPiAtCj4gLQkJCQlyID0gYW1kZ3B1X3JpbmdfcGFyc2Vf Y3MocmluZywgcCwgaik7Cj4gLQkJCQlpZiAocikKPiAtCQkJCQlyZXR1cm4gcjsKPiAtCQkJfSBl bHNlIHsKPiAtCQkJCWliLT5wdHIgPSAodWludDMyX3QgKilrcHRyOwo+IC0JCQkJciA9IGFtZGdw dV9yaW5nX3BhdGNoX2NzX2luX3BsYWNlKHJpbmcsIHAsIGopOwo+IC0JCQkJYW1kZ3B1X2JvX2t1 bm1hcChhb2JqKTsKPiAtCQkJCWlmIChyKQo+IC0JCQkJCXJldHVybiByOwo+IC0JCQl9Cj4gLQo+ IC0JCQlqKys7Cj4gLQkJfQo+IC0JfQo+IC0KPiAtCWlmIChwLT5qb2ItPnZtKSB7Cj4gLQkJcC0+ am9iLT52bV9wZF9hZGRyID0gYW1kZ3B1X2JvX2dwdV9vZmZzZXQodm0tPnJvb3QuYmFzZS5ibyk7 Cj4gLQo+IC0JCXIgPSBhbWRncHVfYm9fdm1fdXBkYXRlX3B0ZShwKTsKPiAtCQlpZiAocikKPiAt CQkJcmV0dXJuIHI7Cj4gLQo+IC0JCXIgPSByZXNlcnZhdGlvbl9vYmplY3RfcmVzZXJ2ZV9zaGFy ZWQodm0tPnJvb3QuYmFzZS5iby0+dGJvLnJlc3YpOwo+IC0JCWlmIChyKQo+IC0JCQlyZXR1cm4g cjsKPiAtCX0KPiAtCj4gIAlyZXR1cm4gYW1kZ3B1X2NzX3N5bmNfcmluZ3MocCk7Cj4gIH0KPiAg Cj4gQEAgLTEzMDcsNyArMTI5NSw3IEBAIGludCBhbWRncHVfY3NfaW9jdGwoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxwKQo+ICAJZm9yIChp ID0gMDsgaSA8IHBhcnNlci5qb2ItPm51bV9pYnM7IGkrKykKPiAgCQl0cmFjZV9hbWRncHVfY3Mo JnBhcnNlciwgaSk7Cj4gIAo+IC0JciA9IGFtZGdwdV9jc19pYl92bV9jaHVuayhhZGV2LCAmcGFy c2VyKTsKPiArCXIgPSBhbWRncHVfY3Nfdm1faGFuZGxpbmcoJnBhcnNlcik7Cj4gIAlpZiAocikK PiAgCQlnb3RvIG91dDsKPiAgCj4gLS0gCj4gMi4xNy4xCj4gCj4gX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBhbWQtZ2Z4IG1haWxpbmcgbGlzdAo+IGFt ZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vYW1kLWdmeAo=