From: Thomas Hellstrom Subject: [PATCH -next 15/18] drm/vmwgfx: Make buffer object lookups reference-free during validation Date: Wed, 26 Sep 2018 18:18:36 +0200 Message-ID: <20180926161839.4549-15-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 1322B6E4B7 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 TWFrZSB0aGUgcHJvY2VzcyBvZiBsb29raW5nIHVwIGEgYnVmZmVyIG9iamVjdCBhbmQgYWRkaW5n IGl0IHRvIHRoZQp2YWxpZGF0aW9uIGxpc3QgcmVmZXJlbmNlLWZyZWUgdW5sZXNzIHdoZW4gaXQn cyBhY3R1YWxseSBhZGRlZCB0byB0aGUKdmFsaWRhdGlvbiBsaXN0IHdoZXJlIGEgc2luZ2xlIHJl ZmVyZW5jZSBpcyB0YWtlbi4KVGhpcyBzYXZlcyB0d28gbG9ja2VkIGF0b21pYyBvcGVyYXRpb25z IHBlciBjb21tYW5kIHN0cmVhbSBidWZmZXIgb2JqZWN0CmhhbmRsZSBsb29rdXAuCgpTaWduZWQt b2ZmLWJ5OiBUaG9tYXMgSGVsbHN0cm9tIDx0aGVsbHN0cm9tQHZtd2FyZS5jb20+ClJldmlld2Vk LWJ5OiBTaW5jbGFpciBZZWggPHN5ZWhAdm13YXJlLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v dm13Z2Z4L3Ztd2dmeF9leGVjYnVmLmMgfCA4NSArKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspLCA1NSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9leGVjYnVmLmMgYi9k cml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9leGVjYnVmLmMKaW5kZXggNjQxYjc1MTEwZGM2 Li4xNWU4M2IzOWUyNmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4 X2V4ZWNidWYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9leGVjYnVmLmMK QEAgLTExMzcsNyArMTEzNyw3IEBAIHN0YXRpYyB2b2lkIHZtd19xdWVyeV9ib19zd2l0Y2hfY29t bWl0KHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYsCiAgKiBAc3dfY29udGV4dDogVGhlIHNv ZnR3YXJlIGNvbnRleHQgdXNlZCBmb3IgdGhpcyBjb21tYW5kIGJhdGNoIHZhbGlkYXRpb24uCiAg KiBAaWQ6IFBvaW50ZXIgdG8gdGhlIHVzZXItc3BhY2UgaGFuZGxlIHRvIGJlIHRyYW5zbGF0ZWQu CiAgKiBAdm13X2JvX3A6IFBvaW50cyB0byBhIGxvY2F0aW9uIHRoYXQsIG9uIHN1Y2Nlc3NmdWwg cmV0dXJuIHdpbGwgY2FycnkKLSAqIGEgcmVmZXJlbmNlLWNvdW50ZWQgcG9pbnRlciB0byB0aGUg RE1BIGJ1ZmZlciBpZGVudGlmaWVkIGJ5IHRoZQorICogYSBub24tcmVmZXJlbmNlLWNvdW50ZWQg cG9pbnRlciB0byB0aGUgYnVmZmVyIG9iamVjdCBpZGVudGlmaWVkIGJ5IHRoZQogICogdXNlci1z cGFjZSBoYW5kbGUgaW4gQGlkLgogICoKICAqIFRoaXMgZnVuY3Rpb24gc2F2ZXMgaW5mb3JtYXRp b24gbmVlZGVkIHRvIHRyYW5zbGF0ZSBhIHVzZXItc3BhY2UgYnVmZmVyCkBAIC0xMTUyLDM4ICsx MTUyLDM0IEBAIHN0YXRpYyBpbnQgdm13X3RyYW5zbGF0ZV9tb2JfcHRyKHN0cnVjdCB2bXdfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJCQkJIFNWR0FNb2JJZCAqaWQsCiAJCQkJIHN0cnVjdCB2bXdfYnVm ZmVyX29iamVjdCAqKnZtd19ib19wKQogewotCXN0cnVjdCB2bXdfYnVmZmVyX29iamVjdCAqdm13 X2JvID0gTlVMTDsKKwlzdHJ1Y3Qgdm13X2J1ZmZlcl9vYmplY3QgKnZtd19ibzsKIAl1aW50MzJf dCBoYW5kbGUgPSAqaWQ7CiAJc3RydWN0IHZtd19yZWxvY2F0aW9uICpyZWxvYzsKIAlpbnQgcmV0 OwogCi0JcmV0ID0gdm13X3VzZXJfYm9fbG9va3VwKHN3X2NvbnRleHQtPmZwLT50ZmlsZSwgaGFu ZGxlLCAmdm13X2JvLCBOVUxMKTsKLQlpZiAodW5saWtlbHkocmV0ICE9IDApKSB7CisJdm13X3Zh bGlkYXRpb25fcHJlbG9hZF9ibyhzd19jb250ZXh0LT5jdHgpOworCXZtd19ibyA9IHZtd191c2Vy X2JvX25vcmVmX2xvb2t1cChzd19jb250ZXh0LT5mcC0+dGZpbGUsIGhhbmRsZSk7CisJaWYgKElT X0VSUih2bXdfYm8pKSB7CiAJCURSTV9FUlJPUigiQ291bGQgbm90IGZpbmQgb3IgdXNlIE1PQiBi dWZmZXIuXG4iKTsKLQkJcmV0ID0gLUVJTlZBTDsKLQkJZ290byBvdXRfbm9fcmVsb2M7CisJCXJl dHVybiBQVFJfRVJSKHZtd19ibyk7CiAJfQogCisJcmV0ID0gdm13X3ZhbGlkYXRpb25fYWRkX2Jv KHN3X2NvbnRleHQtPmN0eCwgdm13X2JvLCB0cnVlLCBmYWxzZSk7CisJdm13X3VzZXJfYm9fbm9y ZWZfcmVsZWFzZSgpOworCWlmICh1bmxpa2VseShyZXQgIT0gMCkpCisJCXJldHVybiByZXQ7CisK IAlyZWxvYyA9IHZtd192YWxpZGF0aW9uX21lbV9hbGxvYyhzd19jb250ZXh0LT5jdHgsIHNpemVv ZigqcmVsb2MpKTsKIAlpZiAoIXJlbG9jKQotCQlnb3RvIG91dF9ub19yZWxvYzsKKwkJcmV0dXJu IC1FTk9NRU07CiAKIAlyZWxvYy0+bW9iX2xvYyA9IGlkOwogCXJlbG9jLT52Ym8gPSB2bXdfYm87 CiAKLQlyZXQgPSB2bXdfdmFsaWRhdGlvbl9hZGRfYm8oc3dfY29udGV4dC0+Y3R4LCB2bXdfYm8s IHRydWUsIGZhbHNlKTsKLQlpZiAodW5saWtlbHkocmV0ICE9IDApKQotCQlnb3RvIG91dF9ub19y ZWxvYzsKLQogCSp2bXdfYm9fcCA9IHZtd19ibzsKIAlsaXN0X2FkZF90YWlsKCZyZWxvYy0+aGVh ZCwgJnN3X2NvbnRleHQtPmJvX3JlbG9jYXRpb25zKTsKIAogCXJldHVybiAwOwotCi1vdXRfbm9f cmVsb2M6Ci0Jdm13X2JvX3VucmVmZXJlbmNlKCZ2bXdfYm8pOwotCSp2bXdfYm9fcCA9IE5VTEw7 Ci0JcmV0dXJuIHJldDsKIH0KIAogLyoqCkBAIC0xMTk0LDcgKzExOTAsNyBAQCBzdGF0aWMgaW50 IHZtd190cmFuc2xhdGVfbW9iX3B0cihzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2LAogICog QHN3X2NvbnRleHQ6IFRoZSBzb2Z0d2FyZSBjb250ZXh0IHVzZWQgZm9yIHRoaXMgY29tbWFuZCBi YXRjaCB2YWxpZGF0aW9uLgogICogQHB0cjogUG9pbnRlciB0byB0aGUgdXNlci1zcGFjZSBoYW5k bGUgdG8gYmUgdHJhbnNsYXRlZC4KICAqIEB2bXdfYm9fcDogUG9pbnRzIHRvIGEgbG9jYXRpb24g dGhhdCwgb24gc3VjY2Vzc2Z1bCByZXR1cm4gd2lsbCBjYXJyeQotICogYSByZWZlcmVuY2UtY291 bnRlZCBwb2ludGVyIHRvIHRoZSBETUEgYnVmZmVyIGlkZW50aWZpZWQgYnkgdGhlCisgKiBhIG5v bi1yZWZlcmVuY2UtY291bnRlZCBwb2ludGVyIHRvIHRoZSBETUEgYnVmZmVyIGlkZW50aWZpZWQg YnkgdGhlCiAgKiB1c2VyLXNwYWNlIGhhbmRsZSBpbiBAaWQuCiAgKgogICogVGhpcyBmdW5jdGlv biBzYXZlcyBpbmZvcm1hdGlvbiBuZWVkZWQgdG8gdHJhbnNsYXRlIGEgdXNlci1zcGFjZSBidWZm ZXIKQEAgLTEyMTAsMzggKzEyMDYsMzMgQEAgc3RhdGljIGludCB2bXdfdHJhbnNsYXRlX2d1ZXN0 X3B0cihzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgIFNWR0FHdWVzdFB0ciAq cHRyLAogCQkJCSAgIHN0cnVjdCB2bXdfYnVmZmVyX29iamVjdCAqKnZtd19ib19wKQogewotCXN0 cnVjdCB2bXdfYnVmZmVyX29iamVjdCAqdm13X2JvID0gTlVMTDsKKwlzdHJ1Y3Qgdm13X2J1ZmZl cl9vYmplY3QgKnZtd19ibzsKIAl1aW50MzJfdCBoYW5kbGUgPSBwdHItPmdtcklkOwogCXN0cnVj dCB2bXdfcmVsb2NhdGlvbiAqcmVsb2M7CiAJaW50IHJldDsKIAotCXJldCA9IHZtd191c2VyX2Jv X2xvb2t1cChzd19jb250ZXh0LT5mcC0+dGZpbGUsIGhhbmRsZSwgJnZtd19ibywgTlVMTCk7Ci0J aWYgKHVubGlrZWx5KHJldCAhPSAwKSkgeworCXZtd192YWxpZGF0aW9uX3ByZWxvYWRfYm8oc3df Y29udGV4dC0+Y3R4KTsKKwl2bXdfYm8gPSB2bXdfdXNlcl9ib19ub3JlZl9sb29rdXAoc3dfY29u dGV4dC0+ZnAtPnRmaWxlLCBoYW5kbGUpOworCWlmIChJU19FUlIodm13X2JvKSkgewogCQlEUk1f RVJST1IoIkNvdWxkIG5vdCBmaW5kIG9yIHVzZSBHTVIgcmVnaW9uLlxuIik7Ci0JCXJldCA9IC1F SU5WQUw7Ci0JCWdvdG8gb3V0X25vX3JlbG9jOworCQlyZXR1cm4gUFRSX0VSUih2bXdfYm8pOwog CX0KIAorCXJldCA9IHZtd192YWxpZGF0aW9uX2FkZF9ibyhzd19jb250ZXh0LT5jdHgsIHZtd19i bywgZmFsc2UsIGZhbHNlKTsKKwl2bXdfdXNlcl9ib19ub3JlZl9yZWxlYXNlKCk7CisJaWYgKHVu bGlrZWx5KHJldCAhPSAwKSkKKwkJcmV0dXJuIHJldDsKKwogCXJlbG9jID0gdm13X3ZhbGlkYXRp b25fbWVtX2FsbG9jKHN3X2NvbnRleHQtPmN0eCwgc2l6ZW9mKCpyZWxvYykpOwogCWlmICghcmVs b2MpCi0JCWdvdG8gb3V0X25vX3JlbG9jOworCQlyZXR1cm4gLUVOT01FTTsKIAogCXJlbG9jLT5s b2NhdGlvbiA9IHB0cjsKIAlyZWxvYy0+dmJvID0gdm13X2JvOwotCi0JcmV0ID0gdm13X3ZhbGlk YXRpb25fYWRkX2JvKHN3X2NvbnRleHQtPmN0eCwgdm13X2JvLCBmYWxzZSwgZmFsc2UpOwotCWlm ICh1bmxpa2VseShyZXQgIT0gMCkpCi0JCWdvdG8gb3V0X25vX3JlbG9jOwotCiAJKnZtd19ib19w ID0gdm13X2JvOwogCWxpc3RfYWRkX3RhaWwoJnJlbG9jLT5oZWFkLCAmc3dfY29udGV4dC0+Ym9f cmVsb2NhdGlvbnMpOwogCiAJcmV0dXJuIDA7Ci0KLW91dF9ub19yZWxvYzoKLQl2bXdfYm9fdW5y ZWZlcmVuY2UoJnZtd19ibyk7Ci0JKnZtd19ib19wID0gTlVMTDsKLQlyZXR1cm4gcmV0OwogfQog CiAKQEAgLTEzMjgsMTAgKzEzMTksNyBAQCBzdGF0aWMgaW50IHZtd19jbWRfZHhfYmluZF9xdWVy eShzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2LAogCiAJc3dfY29udGV4dC0+ZHhfcXVlcnlf bW9iID0gdm13X2JvOwogCXN3X2NvbnRleHQtPmR4X3F1ZXJ5X2N0eCA9IHN3X2NvbnRleHQtPmR4 X2N0eF9ub2RlLT5jdHg7Ci0KLQl2bXdfYm9fdW5yZWZlcmVuY2UoJnZtd19ibyk7Ci0KLQlyZXR1 cm4gcmV0OworCXJldHVybiAwOwogfQogCiAKQEAgLTE0MzIsNyArMTQyMCw2IEBAIHN0YXRpYyBp bnQgdm13X2NtZF9lbmRfZ2JfcXVlcnkoc3RydWN0IHZtd19wcml2YXRlICpkZXZfcHJpdiwKIAog CXJldCA9IHZtd19xdWVyeV9ib19zd2l0Y2hfcHJlcGFyZShkZXZfcHJpdiwgdm13X2JvLCBzd19j b250ZXh0KTsKIAotCXZtd19ib191bnJlZmVyZW5jZSgmdm13X2JvKTsKIAlyZXR1cm4gcmV0Owog fQogCkBAIC0xNDg2LDcgKzE0NzMsNiBAQCBzdGF0aWMgaW50IHZtd19jbWRfZW5kX3F1ZXJ5KHN0 cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAlyZXQgPSB2bXdfcXVlcnlfYm9fc3dpdGNo X3ByZXBhcmUoZGV2X3ByaXYsIHZtd19ibywgc3dfY29udGV4dCk7CiAKLQl2bXdfYm9fdW5yZWZl cmVuY2UoJnZtd19ibyk7CiAJcmV0dXJuIHJldDsKIH0KIApAQCAtMTUxOSw3ICsxNTA1LDYgQEAg c3RhdGljIGludCB2bXdfY21kX3dhaXRfZ2JfcXVlcnkoc3RydWN0IHZtd19wcml2YXRlICpkZXZf cHJpdiwKIAlpZiAodW5saWtlbHkocmV0ICE9IDApKQogCQlyZXR1cm4gcmV0OwogCi0Jdm13X2Jv X3VucmVmZXJlbmNlKCZ2bXdfYm8pOwogCXJldHVybiAwOwogfQogCkBAIC0xNTcxLDcgKzE1NTYs NiBAQCBzdGF0aWMgaW50IHZtd19jbWRfd2FpdF9xdWVyeShzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRl dl9wcml2LAogCWlmICh1bmxpa2VseShyZXQgIT0gMCkpCiAJCXJldHVybiByZXQ7CiAKLQl2bXdf Ym9fdW5yZWZlcmVuY2UoJnZtd19ibyk7CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTE2MjIsNyArMTYw Niw3IEBAIHN0YXRpYyBpbnQgdm13X2NtZF9kbWEoc3RydWN0IHZtd19wcml2YXRlICpkZXZfcHJp diwKIAlpZiAodW5saWtlbHkocmV0ICE9IDApKSB7CiAJCWlmICh1bmxpa2VseShyZXQgIT0gLUVS RVNUQVJUU1lTKSkKIAkJCURSTV9FUlJPUigiY291bGQgbm90IGZpbmQgc3VyZmFjZSBmb3IgRE1B LlxuIik7Ci0JCWdvdG8gb3V0X25vX3N1cmZhY2U7CisJCXJldHVybiByZXQ7CiAJfQogCiAJc3Jm ID0gdm13X3Jlc190b19zcmYoc3dfY29udGV4dC0+cmVzX2NhY2hlW3Ztd19yZXNfc3VyZmFjZV0u cmVzKTsKQEAgLTE2MzAsOSArMTYxNCw3IEBAIHN0YXRpYyBpbnQgdm13X2NtZF9kbWEoc3RydWN0 IHZtd19wcml2YXRlICpkZXZfcHJpdiwKIAl2bXdfa21zX2N1cnNvcl9zbm9vcChzcmYsIHN3X2Nv bnRleHQtPmZwLT50ZmlsZSwgJnZtd19iby0+YmFzZSwKIAkJCSAgICAgaGVhZGVyKTsKIAotb3V0 X25vX3N1cmZhY2U6Ci0Jdm13X2JvX3VucmVmZXJlbmNlKCZ2bXdfYm8pOwotCXJldHVybiByZXQ7 CisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBpbnQgdm13X2NtZF9kcmF3KHN0cnVjdCB2bXdfcHJp dmF0ZSAqZGV2X3ByaXYsCkBAIC0xNzYzLDE0ICsxNzQ1LDkgQEAgc3RhdGljIGludCB2bXdfY21k X2NoZWNrX2RlZmluZV9nbXJmYihzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2LAogCQlTVkdB Rmlmb0NtZERlZmluZUdNUkZCIGJvZHk7CiAJfSAqY21kID0gYnVmOwogCi0JcmV0ID0gdm13X3Ry YW5zbGF0ZV9ndWVzdF9wdHIoZGV2X3ByaXYsIHN3X2NvbnRleHQsCi0JCQkJICAgICAgJmNtZC0+ Ym9keS5wdHIsCi0JCQkJICAgICAgJnZtd19ibyk7Ci0JaWYgKHVubGlrZWx5KHJldCAhPSAwKSkK LQkJcmV0dXJuIHJldDsKLQotCXZtd19ib191bnJlZmVyZW5jZSgmdm13X2JvKTsKLQorCXJldHVy biB2bXdfdHJhbnNsYXRlX2d1ZXN0X3B0cihkZXZfcHJpdiwgc3dfY29udGV4dCwKKwkJCQkgICAg ICAgJmNtZC0+Ym9keS5wdHIsCisJCQkJICAgICAgICZ2bXdfYm8pOwogCXJldHVybiByZXQ7CiB9 CiAKQEAgLTE4MTAsOCArMTc4Nyw2IEBAIHN0YXRpYyBpbnQgdm13X2NtZF9yZXNfc3dpdGNoX2Jh Y2t1cChzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2LAogCiAJdm13X3ZhbGlkYXRpb25fcmVz X3N3aXRjaF9iYWNrdXAoc3dfY29udGV4dC0+Y3R4LCBpbmZvLCB2Ym8sCiAJCQkJCSBiYWNrdXBf b2Zmc2V0KTsKLQl2bXdfYm9fdW5yZWZlcmVuY2UoJnZibyk7Ci0KIAlyZXR1cm4gMDsKIH0KIAot LSAKMi4xNC40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK