From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Do not leak VMAs (and PPGTT VMs) of imported flinked objects Date: Mon, 20 Apr 2015 13:14:34 +0100 Message-ID: <1429532074-30022-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id C11366E37C for ; Mon, 20 Apr 2015 05:14:37 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCklmIGEgY2xp ZW50IGluc3RhbnRpYXRlcyBhIFZNQSBhZ2FpbnN0IGFuIGltcG9ydGVkIG9iamVjdCAoZmxpbmsp IHRoaXMgVk1BCndpbGwgbm90IGdldCB1bmJvdW5kIHdoZW4gdGhlIG9iamVjdCBpcyBjbG9zZWQu CgpUaGlzIGhhcHBlbnMgYmVjYXVzZSB0aGUgZXhwb3J0ZXIgaG9sZHMgYSByZWZlcmVuY2UgY291 bnQgb24gdGhlIG9iamVjdCBhbmQKd2lsbCBhbHNvIGtlZXAgYSByZWZlcmVuY2UgdG8gdGhlIFBQ R1RUIFZNLgoKSW4gcmVhbCBsaWZlIHRoaXMgaGFwcGVucyB3aXRoIHhvcmctZHJpdmVyLWludGVs IGFuZCBmYmNvbiB0YWtlb3Zlci4gTGF0dGVyCmlzIGNvcGllZCBmcm9tIHZpYSB0aGUgZmxpbmsg bmFtZSBhbmQgd2hlbiBYb3JnIHByb2Nlc3MgZXhpc3RzIG9uZSBWTUEKcmVtYWlucyBkYW5nbGlu ZyB3aXRoIGEgbm93IHVucmVhY2hhYmxlIFZNLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3Vs aW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgpUZXN0Y2FzZTogaWd0L2dlbV9wcGd0dC9mbGluay12cy1jdHgtdm0t bGVhawotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCAgMSArCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgfCA2MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQog MyBmaWxlcyBjaGFuZ2VkLCA1MyBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYwppbmRleCBmOTc1NGMzLi4xNmEwYjM0IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMKQEAgLTE2MzAsNiArMTYzMCw3IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2RyaXZlciBk cml2ZXIgPSB7CiAJLmRlYnVnZnNfaW5pdCA9IGk5MTVfZGVidWdmc19pbml0LAogCS5kZWJ1Z2Zz X2NsZWFudXAgPSBpOTE1X2RlYnVnZnNfY2xlYW51cCwKICNlbmRpZgorCS5nZW1fY2xvc2Vfb2Jq ZWN0ID0gaTkxNV9nZW1fY2xvc2Vfb2JqZWN0LAogCS5nZW1fZnJlZV9vYmplY3QgPSBpOTE1X2dl bV9mcmVlX29iamVjdCwKIAkuZ2VtX3ZtX29wcyA9ICZpOTE1X2dlbV92bV9vcHMsCiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCmluZGV4IDZhMjUyOGMuLmU4Mjc5MGIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaApAQCAtMjYzNSw2ICsyNjM1LDggQEAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Kmk5MTVfZ2VtX2FsbG9jX29iamVjdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCQkJICBz aXplX3Qgc2l6ZSk7CiB2b2lkIGk5MTVfaW5pdF92bShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCSAgc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pOwordm9pZCBpOTE1 X2dlbV9jbG9zZV9vYmplY3Qoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpnZW1fb2JqLAorCQkJICAg c3RydWN0IGRybV9maWxlICpmaWxlKTsKIHZvaWQgaTkxNV9nZW1fZnJlZV9vYmplY3Qoc3RydWN0 IGRybV9nZW1fb2JqZWN0ICpvYmopOwogdm9pZCBpOTE1X2dlbV92bWFfZGVzdHJveShzdHJ1Y3Qg aTkxNV92bWEgKnZtYSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGY3Yjg3NjYuLmE3 MjAxNTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDUyMyw2ICs0NTIzLDU1IEBAIHN0 YXRpYyBib29sIGRpc2NhcmRfYmFja2luZ19zdG9yYWdlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmopCiAJcmV0dXJuIGF0b21pY19sb25nX3JlYWQoJm9iai0+YmFzZS5maWxwLT5mX2Nv dW50KSA9PSAxOwogfQogCitzdGF0aWMgdm9pZCBpOTE1X2dlbV91bmJpbmRfdm1hKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQlzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKK3sK KwlpZiAoV0FSTl9PTihpOTE1X3ZtYV91bmJpbmQodm1hKSA9PSAtRVJFU1RBUlRTWVMpKSB7CisJ CWJvb2wgd2FzX2ludGVycnVwdGlibGU7CisKKwkJd2FzX2ludGVycnVwdGlibGUgPSBkZXZfcHJp di0+bW0uaW50ZXJydXB0aWJsZTsKKwkJZGV2X3ByaXYtPm1tLmludGVycnVwdGlibGUgPSBmYWxz ZTsKKworCQlXQVJOX09OKGk5MTVfdm1hX3VuYmluZCh2bWEpKTsKKworCQlkZXZfcHJpdi0+bW0u aW50ZXJydXB0aWJsZSA9IHdhc19pbnRlcnJ1cHRpYmxlOworCX0KK30KKwordm9pZCBpOTE1X2dl bV9jbG9zZV9vYmplY3Qoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpnZW1fb2JqLAorCQkJICAgc3Ry dWN0IGRybV9maWxlICpmaWxlKQoreworCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmog PSB0b19pbnRlbF9ibyhnZW1fb2JqKTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gb2JqLT5i YXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXYgPSBmaWxl LT5kcml2ZXJfcHJpdjsKKwlzdHJ1Y3QgaTkxNV92bWEgKnZtYSwgKm5leHQ7CisJc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0OworCisJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwor CisJLyoKKwkgKiBSZWxlYXNlIGFsbCBWTUFzIGFzc29jaWF0ZWQgd2l0aCB0aGlzIGNsaWVudCdz IFBQR1RULgorCSAqCisJICogVGhpcyBpcyB0byBhdm9pZCBwb3RlbnRpYWxseSB1bnJlYWNoYWJs ZSBWTUFzIHNpbmNlIGNvbnRleHRzIGNhbiBoYXZlCisJICogc2hvcnRlciBsaWZldGltZSB0aGFu IG9iamVjdHMuIE1lYW5pbmcgaWYgYSBjbGllbnQgaGFzIGEgcmVmZXJlbmNlIHRvCisJICogYW4g b2JqZWN0IChmbGluaykgYW5kIGFuIGluc3RhbnRpYXRlZCBWTUEsIHdoZW4gaXQgZXhpc3RzIG5l aXRoZXIgVk1BCisJICogd2lsbCBiZSB1bmJvdW5kIChzaW5jZSBvYmplY3QgZnJlZSB3b24ndCBy dW4pLCBub3IgdGhlIFBQR1RUIFZNCisJICogZnJlZWQgKHNpbmNlIFZNQSBob2xkcyBhIHJlZmVy ZW5jZSB0byBpdCkuCisJICovCisJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHZtYSwgbmV4dCwg Jm9iai0+dm1hX2xpc3QsIHZtYV9saW5rKSB7CisJCWlmIChpOTE1X2lzX2dndHQodm1hLT52bSkp CisJCQljb250aW51ZTsKKworCQlwcGd0dCA9IChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqKXZtYS0+ dm07CisJCWlmIChwcGd0dC0+ZmlsZV9wcml2ICE9IGZpbGVfcHJpdikKKwkJCWNvbnRpbnVlOwor CisJCWk5MTVfZ2VtX3VuYmluZF92bWEoZGV2LT5kZXZfcHJpdmF0ZSwgdm1hKTsKKwl9CisKKwlt dXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKK30KKwogdm9pZCBpOTE1X2dlbV9mcmVl X29iamVjdChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmdlbV9vYmopCiB7CiAJc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaiA9IHRvX2ludGVsX2JvKGdlbV9vYmopOwpAQCAtNDUzNSwyMCAr NDU4NCw4IEBAIHZvaWQgaTkxNV9nZW1fZnJlZV9vYmplY3Qoc3RydWN0IGRybV9nZW1fb2JqZWN0 ICpnZW1fb2JqKQogCXRyYWNlX2k5MTVfZ2VtX29iamVjdF9kZXN0cm95KG9iaik7CiAKIAlsaXN0 X2Zvcl9lYWNoX2VudHJ5X3NhZmUodm1hLCBuZXh0LCAmb2JqLT52bWFfbGlzdCwgdm1hX2xpbmsp IHsKLQkJaW50IHJldDsKLQogCQl2bWEtPnBpbl9jb3VudCA9IDA7Ci0JCXJldCA9IGk5MTVfdm1h X3VuYmluZCh2bWEpOwotCQlpZiAoV0FSTl9PTihyZXQgPT0gLUVSRVNUQVJUU1lTKSkgewotCQkJ Ym9vbCB3YXNfaW50ZXJydXB0aWJsZTsKLQotCQkJd2FzX2ludGVycnVwdGlibGUgPSBkZXZfcHJp di0+bW0uaW50ZXJydXB0aWJsZTsKLQkJCWRldl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlID0gZmFs c2U7Ci0KLQkJCVdBUk5fT04oaTkxNV92bWFfdW5iaW5kKHZtYSkpOwotCi0JCQlkZXZfcHJpdi0+ bW0uaW50ZXJydXB0aWJsZSA9IHdhc19pbnRlcnJ1cHRpYmxlOwotCQl9CisJCWk5MTVfZ2VtX3Vu YmluZF92bWEoZGV2X3ByaXYsIHZtYSk7CiAJfQogCiAJLyogU3RvbGVuIG9iamVjdHMgZG9uJ3Qg aG9sZCBhIHJlZiwgYnV0IGRvIGhvbGQgcGluIGNvdW50LiBGaXggdGhhdCB1cAotLSAKMi4zLjUK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==