From: Thomas Hellstrom Subject: [PATCH -next 16/18] drm/vmwgfx: Don't refcount command-buffer managed resource lookups during command buffer validation Date: Wed, 26 Sep 2018 18:18:37 +0200 Message-ID: <20180926161839.4549-16-thellstrom@vmware.com> References: <20180926161839.4549-1-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on061b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::61b]) by gabe.freedesktop.org (Postfix) with ESMTPS id AE2746E4B8 for ; Wed, 26 Sep 2018 16:19:27 +0000 (UTC) In-Reply-To: <20180926161839.4549-1-thellstrom@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Thomas Hellstrom , linux-graphics-maintainer@vmware.com List-Id: dri-devel@lists.freedesktop.org VGhlIHR5cGljYWwgcGF0dGVybiBvZiB0aGVzZSBsb29rdXBzIGFyZQotTG9va3VwCi1QdXQgb24g dmFsaWRhdGUgbGlzdCBpZiBub3QgYWxyZWFkeSB0aGVyZS4KLVVucmVmZXJlbmNlCkFuZCBzaW5j ZSB3ZSBhcmUgdGhlIGV4Y2x1c2l2ZSB1c2VyIG9mIHRoZSBjb250ZXh0IGR1cmluZyBsb29rdXAg dGltZSwKd2UgY2FuIGJlIHN1cmUgdGhhdCB0aGUgcmVzb3VyY2Ugd2lsbCBzdGF5IGFsaXZlIGR1 cmluZyB0aGUgc2VxdWVuY2UuClNvIGF2b2lkIHRha2luZyBhIHJlZmVyZW5jZSBkdXJpbmcgbG9v a3VwLCBhbmQgYWxzbyBhdm9pZCB1bnJlZmVyZW5jaW5nCndoZW4gZG9uZS4KClNpZ25lZC1vZmYt Ynk6IFRob21hcyBIZWxsc3Ryb20gPHRoZWxsc3Ryb21Adm13YXJlLmNvbT4KUmV2aWV3ZWQtYnk6 IFNpbmNsYWlyIFllaCA8c3llaEB2bXdhcmUuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS92bXdn Zngvdm13Z2Z4X2NtZGJ1Zl9yZXMuYyB8ICAzICstCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Zt d2dmeF9leGVjYnVmLmMgICAgfCA2OSArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDIg ZmlsZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgNDUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfY21kYnVmX3Jlcy5jIGIvZHJpdmVy cy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfY21kYnVmX3Jlcy5jCmluZGV4IDNiNzVhZjliZjg1Zi4u NGFjNTVmYzJiZjk3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9j bWRidWZfcmVzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfY21kYnVmX3Jl cy5jCkBAIC04OSw4ICs4OSw3IEBAIHZtd19jbWRidWZfcmVzX2xvb2t1cChzdHJ1Y3Qgdm13X2Nt ZGJ1Zl9yZXNfbWFuYWdlciAqbWFuLAogCWlmICh1bmxpa2VseShyZXQgIT0gMCkpCiAJCXJldHVy biBFUlJfUFRSKHJldCk7CiAKLQlyZXR1cm4gdm13X3Jlc291cmNlX3JlZmVyZW5jZQotCQkoZHJt X2hhc2hfZW50cnkoaGFzaCwgc3RydWN0IHZtd19jbWRidWZfcmVzLCBoYXNoKS0+cmVzKTsKKwly ZXR1cm4gZHJtX2hhc2hfZW50cnkoaGFzaCwgc3RydWN0IHZtd19jbWRidWZfcmVzLCBoYXNoKS0+ cmVzOwogfQogCiAvKioKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4 X2V4ZWNidWYuYyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2V4ZWNidWYuYwppbmRl eCAxNWU4M2IzOWUyNmQuLjEzZGI3ZWZjYjg5YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L3Ztd2dmeC92bXdnZnhfZXhlY2J1Zi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13 Z2Z4X2V4ZWNidWYuYwpAQCAtMzE0LDEwICszMTQsMTQgQEAgc3RhdGljIGludCB2bXdfdmlld19y ZXNfdmFsX2FkZChzdHJ1Y3Qgdm13X3N3X2NvbnRleHQgKnN3X2NvbnRleHQsCiAgKgogICogVGhl IHZpZXcgaXMgcmVwcmVzZW50ZWQgYnkgYSB2aWV3IGlkIGFuZCB0aGUgRFggY29udGV4dCBpdCdz IGNyZWF0ZWQgb24sCiAgKiBvciBzY2hlZHVsZWQgZm9yIGNyZWF0aW9uIG9uLiBJZiB0aGVyZSBp cyBubyBEWCBjb250ZXh0IHNldCwgdGhlIGZ1bmN0aW9uCi0gKiB3aWxsIHJldHVybiAtRUlOVkFM LiBPdGhlcndpc2UgcmV0dXJucyAwIG9uIHN1Y2Nlc3MgYW5kIC1FSU5WQUwgb24gZmFpbHVyZS4K KyAqIHdpbGwgcmV0dXJuIGFuIC1FSU5WQUwgZXJyb3IgcG9pbnRlci4KKyAqCisgKiBSZXR1cm5z OiBVbnJlZmVyZW5jZWQgcG9pbnRlciB0byB0aGUgcmVzb3VyY2Ugb24gc3VjY2VzcywgbmVnYXRp dmUgZXJyb3IKKyAqIHBvaW50ZXIgb24gZmFpbHVyZS4KICAqLwotc3RhdGljIGludCB2bXdfdmll d19pZF92YWxfYWRkKHN0cnVjdCB2bXdfc3dfY29udGV4dCAqc3dfY29udGV4dCwKLQkJCSAgICAg ICBlbnVtIHZtd192aWV3X3R5cGUgdmlld190eXBlLCB1MzIgaWQpCitzdGF0aWMgc3RydWN0IHZt d19yZXNvdXJjZSAqCit2bXdfdmlld19pZF92YWxfYWRkKHN0cnVjdCB2bXdfc3dfY29udGV4dCAq c3dfY29udGV4dCwKKwkJICAgIGVudW0gdm13X3ZpZXdfdHlwZSB2aWV3X3R5cGUsIHUzMiBpZCkK IHsKIAlzdHJ1Y3Qgdm13X2N0eF92YWxpZGF0aW9uX2luZm8gKmN0eF9ub2RlID0gc3dfY29udGV4 dC0+ZHhfY3R4X25vZGU7CiAJc3RydWN0IHZtd19yZXNvdXJjZSAqdmlldzsKQEAgLTMyNSwxNyAr MzI5LDE4IEBAIHN0YXRpYyBpbnQgdm13X3ZpZXdfaWRfdmFsX2FkZChzdHJ1Y3Qgdm13X3N3X2Nv bnRleHQgKnN3X2NvbnRleHQsCiAKIAlpZiAoIWN0eF9ub2RlKSB7CiAJCURSTV9FUlJPUigiRFgg Q29udGV4dCBub3Qgc2V0LlxuIik7Ci0JCXJldHVybiAtRUlOVkFMOworCQlyZXR1cm4gRVJSX1BU UigtRUlOVkFMKTsKIAl9CiAKIAl2aWV3ID0gdm13X3ZpZXdfbG9va3VwKHN3X2NvbnRleHQtPm1h biwgdmlld190eXBlLCBpZCk7CiAJaWYgKElTX0VSUih2aWV3KSkKLQkJcmV0dXJuIFBUUl9FUlIo dmlldyk7CisJCXJldHVybiB2aWV3OwogCiAJcmV0ID0gdm13X3ZpZXdfcmVzX3ZhbF9hZGQoc3df Y29udGV4dCwgdmlldyk7Ci0Jdm13X3Jlc291cmNlX3VucmVmZXJlbmNlKCZ2aWV3KTsKKwlpZiAo cmV0KQorCQlyZXR1cm4gRVJSX1BUUihyZXQpOwogCi0JcmV0dXJuIHJldDsKKwlyZXR1cm4gdmll dzsKIH0KIAogLyoqCkBAIC03NDAsMzQgKzc0NSwyNCBAQCBzdGF0aWMgaW50IHZtd192aWV3X2Jp bmRpbmdzX2FkZChzdHJ1Y3Qgdm13X3N3X2NvbnRleHQgKnN3X2NvbnRleHQsCiAJCQkJIHUzMiBm aXJzdF9zbG90KQogewogCXN0cnVjdCB2bXdfY3R4X3ZhbGlkYXRpb25faW5mbyAqY3R4X25vZGUg PSBzd19jb250ZXh0LT5keF9jdHhfbm9kZTsKLQlzdHJ1Y3Qgdm13X2NtZGJ1Zl9yZXNfbWFuYWdl ciAqbWFuOwogCXUzMiBpOwotCWludCByZXQ7CiAKIAlpZiAoIWN0eF9ub2RlKSB7CiAJCURSTV9F UlJPUigiRFggQ29udGV4dCBub3Qgc2V0LlxuIik7CiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAot CW1hbiA9IHN3X2NvbnRleHQtPm1hbjsKIAlmb3IgKGkgPSAwOyBpIDwgbnVtX3ZpZXdzOyArK2kp IHsKIAkJc3RydWN0IHZtd19jdHhfYmluZGluZm9fdmlldyBiaW5kaW5nOwogCQlzdHJ1Y3Qgdm13 X3Jlc291cmNlICp2aWV3ID0gTlVMTDsKIAogCQlpZiAodmlld19pZHNbaV0gIT0gU1ZHQTNEX0lO VkFMSURfSUQpIHsKLQkJCXZpZXcgPSB2bXdfdmlld19sb29rdXAobWFuLCB2aWV3X3R5cGUsIHZp ZXdfaWRzW2ldKTsKKwkJCXZpZXcgPSB2bXdfdmlld19pZF92YWxfYWRkKHN3X2NvbnRleHQsIHZp ZXdfdHlwZSwKKwkJCQkJCSAgIHZpZXdfaWRzW2ldKTsKIAkJCWlmIChJU19FUlIodmlldykpIHsK IAkJCQlEUk1fRVJST1IoIlZpZXcgbm90IGZvdW5kLlxuIik7CiAJCQkJcmV0dXJuIFBUUl9FUlIo dmlldyk7CiAJCQl9Ci0KLQkJCXJldCA9IHZtd192aWV3X3Jlc192YWxfYWRkKHN3X2NvbnRleHQs IHZpZXcpOwotCQkJaWYgKHJldCkgewotCQkJCURSTV9FUlJPUigiQ291bGQgbm90IGFkZCB2aWV3 IHRvICIKLQkJCQkJICAidmFsaWRhdGlvbiBsaXN0LlxuIik7Ci0JCQkJdm13X3Jlc291cmNlX3Vu cmVmZXJlbmNlKCZ2aWV3KTsKLQkJCQlyZXR1cm4gcmV0OwotCQkJfQogCQl9CiAJCWJpbmRpbmcu YmkuY3R4ID0gY3R4X25vZGUtPmN0eDsKIAkJYmluZGluZy5iaS5yZXMgPSB2aWV3OwpAQCAtNzc2 LDggKzc3MSw2IEBAIHN0YXRpYyBpbnQgdm13X3ZpZXdfYmluZGluZ3NfYWRkKHN0cnVjdCB2bXdf c3dfY29udGV4dCAqc3dfY29udGV4dCwKIAkJYmluZGluZy5zbG90ID0gZmlyc3Rfc2xvdCArIGk7 CiAJCXZtd19iaW5kaW5nX2FkZChjdHhfbm9kZS0+c3RhZ2VkLCAmYmluZGluZy5iaSwKIAkJCQlz aGFkZXJfc2xvdCwgYmluZGluZy5zbG90KTsKLQkJaWYgKHZpZXcpCi0JCQl2bXdfcmVzb3VyY2Vf dW5yZWZlcmVuY2UoJnZpZXcpOwogCX0KIAogCXJldHVybiAwOwpAQCAtMjEzNiwxMSArMjEyOSw4 IEBAIHN0YXRpYyBpbnQgdm13X2NtZF9zZXRfc2hhZGVyKHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCQkJCWNtZC0+Ym9keS50eXBlKTsKIAogCQlpZiAoIUlTX0VSUihyZXMpKSB7Ci0J CQlzdHJ1Y3Qgdm13X3Jlc291cmNlICp0bXBfcmVzID0gcmVzOwotCiAJCQlyZXQgPSB2bXdfY21k X3Jlc19yZWxvY19hZGQoZGV2X3ByaXYsIHN3X2NvbnRleHQsCiAJCQkJCQkgICAgJmNtZC0+Ym9k eS5zaGlkLCByZXMpOwotCQkJdm13X3Jlc291cmNlX3VucmVmZXJlbmNlKCZ0bXBfcmVzKTsKIAkJ CWlmICh1bmxpa2VseShyZXQgIT0gMCkpCiAJCQkJcmV0dXJuIHJldDsKIAkJfQpAQCAtMjM1OSw3 ICsyMzQ5LDcgQEAgc3RhdGljIGludCB2bXdfY21kX2R4X3NldF9zaGFkZXIoc3RydWN0IHZtd19w cml2YXRlICpkZXZfcHJpdiwKIAogCQlyZXQgPSB2bXdfcmVzb3VyY2VfdmFsX2FkZChzd19jb250 ZXh0LCByZXMpOwogCQlpZiAocmV0KQotCQkJZ290byBvdXRfdW5yZWY7CisJCQlyZXR1cm4gcmV0 OwogCX0KIAogCWJpbmRpbmcuYmkuY3R4ID0gY3R4X25vZGUtPmN0eDsKQEAgLTIzNjksMTEgKzIz NTksOCBAQCBzdGF0aWMgaW50IHZtd19jbWRfZHhfc2V0X3NoYWRlcihzdHJ1Y3Qgdm13X3ByaXZh dGUgKmRldl9wcml2LAogCiAJdm13X2JpbmRpbmdfYWRkKGN0eF9ub2RlLT5zdGFnZWQsICZiaW5k aW5nLmJpLAogCQkJYmluZGluZy5zaGFkZXJfc2xvdCwgMCk7Ci1vdXRfdW5yZWY6Ci0JaWYgKHJl cykKLQkJdm13X3Jlc291cmNlX3VucmVmZXJlbmNlKCZyZXMpOwogCi0JcmV0dXJuIHJldDsKKwly ZXR1cm4gMDsKIH0KIAogLyoqCkBAIC0yNTMwLDggKzI1MTcsOCBAQCBzdGF0aWMgaW50IHZtd19j bWRfZHhfY2xlYXJfcmVuZGVydGFyZ2V0X3ZpZXcoc3RydWN0IHZtd19wcml2YXRlICpkZXZfcHJp diwKIAkJU1ZHQTNkQ21kRFhDbGVhclJlbmRlclRhcmdldFZpZXcgYm9keTsKIAl9ICpjbWQgPSBj b250YWluZXJfb2YoaGVhZGVyLCB0eXBlb2YoKmNtZCksIGhlYWRlcik7CiAKLQlyZXR1cm4gdm13 X3ZpZXdfaWRfdmFsX2FkZChzd19jb250ZXh0LCB2bXdfdmlld19ydCwKLQkJCQkgICBjbWQtPmJv ZHkucmVuZGVyVGFyZ2V0Vmlld0lkKTsKKwlyZXR1cm4gUFRSX1JFVCh2bXdfdmlld19pZF92YWxf YWRkKHN3X2NvbnRleHQsIHZtd192aWV3X3J0LAorCQkJCQkgICBjbWQtPmJvZHkucmVuZGVyVGFy Z2V0Vmlld0lkKSk7CiB9CiAKIC8qKgpAQCAtMjU1MSw4ICsyNTM4LDggQEAgc3RhdGljIGludCB2 bXdfY21kX2R4X2NsZWFyX2RlcHRoc3RlbmNpbF92aWV3KHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCVNWR0EzZENtZERYQ2xlYXJEZXB0aFN0ZW5jaWxWaWV3IGJvZHk7CiAJfSAqY21k ID0gY29udGFpbmVyX29mKGhlYWRlciwgdHlwZW9mKCpjbWQpLCBoZWFkZXIpOwogCi0JcmV0dXJu IHZtd192aWV3X2lkX3ZhbF9hZGQoc3dfY29udGV4dCwgdm13X3ZpZXdfZHMsCi0JCQkJICAgY21k LT5ib2R5LmRlcHRoU3RlbmNpbFZpZXdJZCk7CisJcmV0dXJuIFBUUl9SRVQodm13X3ZpZXdfaWRf dmFsX2FkZChzd19jb250ZXh0LCB2bXdfdmlld19kcywKKwkJCQkJICAgY21kLT5ib2R5LmRlcHRo U3RlbmNpbFZpZXdJZCkpOwogfQogCiBzdGF0aWMgaW50IHZtd19jbWRfZHhfdmlld19kZWZpbmUo c3RydWN0IHZtd19wcml2YXRlICpkZXZfcHJpdiwKQEAgLTI5MDQsMTcgKzI4OTEsMTMgQEAgc3Rh dGljIGludCB2bXdfY21kX2R4X2JpbmRfc2hhZGVyKHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3By aXYsCiAJcmV0ID0gdm13X3Jlc291cmNlX3ZhbF9hZGQoc3dfY29udGV4dCwgcmVzKTsKIAlpZiAo cmV0KSB7CiAJCURSTV9FUlJPUigiRXJyb3IgY3JlYXRpbmcgcmVzb3VyY2UgdmFsaWRhdGlvbiBu b2RlLlxuIik7Ci0JCWdvdG8gb3V0X3VucmVmOworCQlyZXR1cm4gcmV0OwogCX0KIAogCi0JcmV0 ID0gdm13X2NtZF9yZXNfc3dpdGNoX2JhY2t1cChkZXZfcHJpdiwgc3dfY29udGV4dCwgcmVzLAot CQkJCQkmY21kLT5ib2R5Lm1vYmlkLAotCQkJCQljbWQtPmJvZHkub2Zmc2V0SW5CeXRlcyk7Ci1v dXRfdW5yZWY6Ci0Jdm13X3Jlc291cmNlX3VucmVmZXJlbmNlKCZyZXMpOwotCi0JcmV0dXJuIHJl dDsKKwlyZXR1cm4gdm13X2NtZF9yZXNfc3dpdGNoX2JhY2t1cChkZXZfcHJpdiwgc3dfY29udGV4 dCwgcmVzLAorCQkJCQkgJmNtZC0+Ym9keS5tb2JpZCwKKwkJCQkJIGNtZC0+Ym9keS5vZmZzZXRJ bkJ5dGVzKTsKIH0KIAogLyoqCkBAIC0yOTMzLDggKzI5MTYsOCBAQCBzdGF0aWMgaW50IHZtd19j bWRfZHhfZ2VubWlwcyhzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2LAogCQlTVkdBM2RDbWRE WEdlbk1pcHMgYm9keTsKIAl9ICpjbWQgPSBjb250YWluZXJfb2YoaGVhZGVyLCB0eXBlb2YoKmNt ZCksIGhlYWRlcik7CiAKLQlyZXR1cm4gdm13X3ZpZXdfaWRfdmFsX2FkZChzd19jb250ZXh0LCB2 bXdfdmlld19zciwKLQkJCQkgICBjbWQtPmJvZHkuc2hhZGVyUmVzb3VyY2VWaWV3SWQpOworCXJl dHVybiBQVFJfUkVUKHZtd192aWV3X2lkX3ZhbF9hZGQoc3dfY29udGV4dCwgdm13X3ZpZXdfc3Is CisJCQkJCSAgIGNtZC0+Ym9keS5zaGFkZXJSZXNvdXJjZVZpZXdJZCkpOwogfQogCiAvKioKLS0g CjIuMTQuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==