From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C60B9C11F68 for ; Tue, 29 Jun 2021 15:12:42 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9510C61D5E for ; Tue, 29 Jun 2021 15:12:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9510C61D5E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F20826E8AC; Tue, 29 Jun 2021 15:12:37 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF96E6E8A9; Tue, 29 Jun 2021 15:12:31 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10030"; a="195318931" X-IronPort-AV: E=Sophos;i="5.83,309,1616482800"; d="scan'208";a="195318931" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2021 08:12:31 -0700 X-IronPort-AV: E=Sophos;i="5.83,309,1616482800"; d="scan'208";a="408203436" Received: from ettammin-mobl1.ger.corp.intel.com (HELO thellst-mobl1.intel.com) ([10.249.254.141]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2021 08:12:29 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Date: Tue, 29 Jun 2021 17:12:02 +0200 Message-Id: <20210629151203.209465-3-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210629151203.209465-1-thomas.hellstrom@linux.intel.com> References: <20210629151203.209465-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v5 2/3] drm/i915/gem: Introduce a selftest for the gem object migrate functionality X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , matthew.auld@intel.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" RnJvbTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgoKQSBzZWxmdGVzdCBm b3IgdGhlIGdlbSBvYmplY3QgbWlncmF0ZSBmdW5jdGlvbmFsaXR5LiBTbGlnaHRseSBhZGFwdGVk CmZyb20gdGhlIG9yaWdpbmFsIGJ5IE1hdHRoZXcgdG8gdGhlIG5ldyBpbnRlcmZhY2UgYW5kIG5l dyBmaWxsIGJsaXQKY29kZS4KCnY0OgotIEluaXRpYWxpemUgYnVmZmVycyBhbmQgY2hlY2sgY29u dGVudHMgYWZ0ZXIgbWlncmF0aW9uCiAgKFN1Z2dlc3RlZCBieSBNYXR0aGV3IEF1bGQpCi0gUGVy Zm9ybSBhc3luYyBtaWdyYXRpb24gKGlmIGltcGxlbWVudGVkKSBpbiB0aGUgaWd0X2xtZW1fcGFn ZXNfbWlncmF0ZQogIHRlc3QKLSBUZXN0IGFsc28gbWlncmF0aW9uIHRvIHRoZSBjdXJyZW50IHJl Z2lvbi4KCkNvLWRldmVsb3BlZC1ieTogVGhvbWFzIEhlbGxzdHLDtm0gPHRob21hcy5oZWxsc3Ry b21AbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBUaG9tYXMgSGVsbHN0csO2bSA8dGhv bWFzLmhlbGxzdHJvbUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hdHRoZXcgQXVs ZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IE1pY2hhZWwgSi4gUnVobCA8 bWljaGFlbC5qLnJ1aGxAaW50ZWwuY29tPiAjdjMKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9n ZW0vaTkxNV9nZW1fb2JqZWN0LmMgICAgfCAgIDEgKwogLi4uL2RybS9pOTE1L2dlbS9zZWxmdGVz dHMvaTkxNV9nZW1fbWlncmF0ZS5jIHwgMjU4ICsrKysrKysrKysrKysrKysrKwogLi4uL2RybS9p OTE1L3NlbGZ0ZXN0cy9pOTE1X2xpdmVfc2VsZnRlc3RzLmggIHwgICAxICsKIDMgZmlsZXMgY2hh bmdlZCwgMjYwIGluc2VydGlvbnMoKykKIGNyZWF0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL2dwdS9k cm0vaTkxNS9nZW0vc2VsZnRlc3RzL2k5MTVfZ2VtX21pZ3JhdGUuYwoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9vYmplY3QuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2dlbS9pOTE1X2dlbV9vYmplY3QuYwppbmRleCAyMjViNzdmYjQzMTQuLjU0N2NjOWRh ZDkwZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX29iamVj dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9vYmplY3QuYwpAQCAt NjY1LDYgKzY2NSw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2dlbV9vYmplY3RfZnVuY3Mg aTkxNV9nZW1fb2JqZWN0X2Z1bmNzID0gewogI2lmIElTX0VOQUJMRUQoQ09ORklHX0RSTV9JOTE1 X1NFTEZURVNUKQogI2luY2x1ZGUgInNlbGZ0ZXN0cy9odWdlX2dlbV9vYmplY3QuYyIKICNpbmNs dWRlICJzZWxmdGVzdHMvaHVnZV9wYWdlcy5jIgorI2luY2x1ZGUgInNlbGZ0ZXN0cy9pOTE1X2dl bV9taWdyYXRlLmMiCiAjaW5jbHVkZSAic2VsZnRlc3RzL2k5MTVfZ2VtX29iamVjdC5jIgogI2lu Y2x1ZGUgInNlbGZ0ZXN0cy9pOTE1X2dlbV9jb2hlcmVuY3kuYyIKICNlbmRpZgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL3NlbGZ0ZXN0cy9pOTE1X2dlbV9taWdyYXRlLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vc2VsZnRlc3RzL2k5MTVfZ2VtX21pZ3JhdGUuYwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmNlZDZlM2E4MTRhMgotLS0g L2Rldi9udWxsCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9zZWxmdGVzdHMvaTkxNV9n ZW1fbWlncmF0ZS5jCkBAIC0wLDAgKzEsMjU4IEBACisvLyBTUERYLUxpY2Vuc2UtSWRlbnRpZmll cjogTUlUCisvKgorICogQ29weXJpZ2h0IMKpIDIwMjAtMjAyMSBJbnRlbCBDb3Jwb3JhdGlvbgor ICovCisKKyNpbmNsdWRlICJndC9pbnRlbF9taWdyYXRlLmgiCisKK3N0YXRpYyBpbnQgaWd0X2Zp bGxfY2hlY2tfYnVmZmVyKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCisJCQkJIGJv b2wgZmlsbCkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IHRvX2k5MTUob2Jq LT5iYXNlLmRldik7CisJdW5zaWduZWQgaW50IGksIGNvdW50ID0gb2JqLT5iYXNlLnNpemUgLyBz aXplb2YodTMyKTsKKwllbnVtIGk5MTVfbWFwX3R5cGUgbWFwX3R5cGUgPQorCQlpOTE1X2NvaGVy ZW50X21hcF90eXBlKGk5MTUsIG9iaiwgZmFsc2UpOworCXUzMiAqY3VyOworCWludCBlcnIgPSAw OworCisJYXNzZXJ0X29iamVjdF9oZWxkKG9iaik7CisJY3VyID0gaTkxNV9nZW1fb2JqZWN0X3Bp bl9tYXAob2JqLCBtYXBfdHlwZSk7CisJaWYgKElTX0VSUihjdXIpKQorCQlyZXR1cm4gUFRSX0VS UihjdXIpOworCisJaWYgKGZpbGwpCisJCWZvciAoaSA9IDA7IGkgPCBjb3VudDsgKytpKQorCQkJ KmN1cisrID0gaTsKKwllbHNlCisJCWZvciAoaSA9IDA7IGkgPCBjb3VudDsgKytpKQorCQkJaWYg KCpjdXIrKyAhPSBpKSB7CisJCQkJcHJfZXJyKCJPYmplY3QgY29udGVudCBtaXNtYXRjaCBhdCBs b2NhdGlvbiAlZCBvZiAlZFxuIiwgaSwgY291bnQpOworCQkJCWVyciA9IC1FSU5WQUw7CisJCQkJ YnJlYWs7CisJCQl9CisKKwlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKG9iaik7CisKKwlyZXR1 cm4gZXJyOworfQorCitzdGF0aWMgaW50IGlndF9jcmVhdGVfbWlncmF0ZShzdHJ1Y3QgaW50ZWxf Z3QgKmd0LCBlbnVtIGludGVsX3JlZ2lvbl9pZCBzcmMsCisJCQkgICAgICBlbnVtIGludGVsX3Jl Z2lvbl9pZCBkc3QpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSBndC0+aTkx NTsKKwlzdHJ1Y3QgaW50ZWxfbWVtb3J5X3JlZ2lvbiAqc3JjX21yID0gaTkxNS0+bW0ucmVnaW9u c1tzcmNdOworCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CisJc3RydWN0IGk5MTVf Z2VtX3d3X2N0eCB3dzsKKwlpbnQgZXJyID0gMDsKKworCUdFTV9CVUdfT04oIXNyY19tcik7CisK KwkvKiBTd2l0Y2ggb2JqZWN0IGJhY2tpbmctc3RvcmUgb24gY3JlYXRlICovCisJb2JqID0gaTkx NV9nZW1fb2JqZWN0X2NyZWF0ZV9yZWdpb24oc3JjX21yLCBQQUdFX1NJWkUsIDApOworCWlmIChJ U19FUlIob2JqKSkKKwkJcmV0dXJuIFBUUl9FUlIob2JqKTsKKworCWZvcl9pOTE1X2dlbV93dygm d3csIGVyciwgdHJ1ZSkgeworCQllcnIgPSBpOTE1X2dlbV9vYmplY3RfbG9jayhvYmosICZ3dyk7 CisJCWlmIChlcnIpCisJCQljb250aW51ZTsKKworCQllcnIgPSBpZ3RfZmlsbF9jaGVja19idWZm ZXIob2JqLCB0cnVlKTsKKwkJaWYgKGVycikKKwkJCWNvbnRpbnVlOworCisJCWlmICghaTkxNV9n ZW1fb2JqZWN0X2Nhbl9taWdyYXRlKG9iaiwgZHN0KSkgeworCQkJZXJyID0gLUVJTlZBTDsKKwkJ CWNvbnRpbnVlOworCQl9CisKKwkJZXJyID0gaTkxNV9nZW1fb2JqZWN0X21pZ3JhdGUob2JqLCAm d3csIGRzdCk7CisJCWlmIChlcnIpCisJCQljb250aW51ZTsKKworCQllcnIgPSBpOTE1X2dlbV9v YmplY3RfcGluX3BhZ2VzKG9iaik7CisJCWlmIChlcnIpCisJCQljb250aW51ZTsKKworCQlpZiAo aTkxNV9nZW1fb2JqZWN0X2Nhbl9taWdyYXRlKG9iaiwgc3JjKSkKKwkJCWVyciA9IC1FSU5WQUw7 CisKKwkJaTkxNV9nZW1fb2JqZWN0X3VucGluX3BhZ2VzKG9iaik7CisJCWVyciA9IGk5MTVfZ2Vt X29iamVjdF93YWl0X21pZ3JhdGlvbihvYmosIHRydWUpOworCQlpZiAoZXJyKQorCQkJY29udGlu dWU7CisKKwkJZXJyID0gaWd0X2ZpbGxfY2hlY2tfYnVmZmVyKG9iaiwgZmFsc2UpOworCX0KKwlp OTE1X2dlbV9vYmplY3RfcHV0KG9iaik7CisKKwlyZXR1cm4gZXJyOworfQorCitzdGF0aWMgaW50 IGlndF9zbWVtX2NyZWF0ZV9taWdyYXRlKHZvaWQgKmFyZykKK3sKKwlyZXR1cm4gaWd0X2NyZWF0 ZV9taWdyYXRlKGFyZywgSU5URUxfUkVHSU9OX0xNRU0sIElOVEVMX1JFR0lPTl9TTUVNKTsKK30K Kworc3RhdGljIGludCBpZ3RfbG1lbV9jcmVhdGVfbWlncmF0ZSh2b2lkICphcmcpCit7CisJcmV0 dXJuIGlndF9jcmVhdGVfbWlncmF0ZShhcmcsIElOVEVMX1JFR0lPTl9TTUVNLCBJTlRFTF9SRUdJ T05fTE1FTSk7Cit9CisKK3N0YXRpYyBpbnQgaWd0X3NhbWVfY3JlYXRlX21pZ3JhdGUodm9pZCAq YXJnKQoreworCXJldHVybiBpZ3RfY3JlYXRlX21pZ3JhdGUoYXJnLCBJTlRFTF9SRUdJT05fTE1F TSwgSU5URUxfUkVHSU9OX0xNRU0pOworfQorCitzdGF0aWMgaW50IGxtZW1fcGFnZXNfbWlncmF0 ZV9vbmUoc3RydWN0IGk5MTVfZ2VtX3d3X2N0eCAqd3csCisJCQkJICBzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqKQoreworCWludCBlcnI7CisKKwllcnIgPSBpOTE1X2dlbV9vYmplY3Rf bG9jayhvYmosIHd3KTsKKwlpZiAoZXJyKQorCQlyZXR1cm4gZXJyOworCisJaWYgKGk5MTVfZ2Vt X29iamVjdF9pc19sbWVtKG9iaikpIHsKKwkJaWYgKCFpOTE1X2dlbV9vYmplY3RfY2FuX21pZ3Jh dGUob2JqLCBJTlRFTF9SRUdJT05fU01FTSkpIHsKKwkJCXByX2Vycigib2JqZWN0IGNhbid0IG1p Z3JhdGUgdG8gc21lbS5cbiIpOworCQkJcmV0dXJuIC1FSU5WQUw7CisJCX0KKworCQllcnIgPSBp OTE1X2dlbV9vYmplY3RfbWlncmF0ZShvYmosIHd3LCBJTlRFTF9SRUdJT05fU01FTSk7CisJCWlm IChlcnIpIHsKKwkJCXByX2VycigiT2JqZWN0IGZhaWxlZCBtaWdyYXRpb24gdG8gc21lbVxuIik7 CisJCQlpZiAoZXJyKQorCQkJCXJldHVybiBlcnI7CisJCX0KKworCQlpZiAoaTkxNV9nZW1fb2Jq ZWN0X2lzX2xtZW0ob2JqKSkgeworCQkJcHJfZXJyKCJvYmplY3Qgc3RpbGwgYmFja2VkIGJ5IGxt ZW1cbiIpOworCQkJZXJyID0gLUVJTlZBTDsKKwkJfQorCisJCWlmICghaTkxNV9nZW1fb2JqZWN0 X2hhc19zdHJ1Y3RfcGFnZShvYmopKSB7CisJCQlwcl9lcnIoIm9iamVjdCBub3QgYmFja2VkIGJ5 IHN0cnVjdCBwYWdlXG4iKTsKKwkJCWVyciA9IC1FSU5WQUw7CisJCX0KKworCX0gZWxzZSB7CisJ CWlmICghaTkxNV9nZW1fb2JqZWN0X2Nhbl9taWdyYXRlKG9iaiwgSU5URUxfUkVHSU9OX0xNRU0p KSB7CisJCQlwcl9lcnIoIm9iamVjdCBjYW4ndCBtaWdyYXRlIHRvIGxtZW0uXG4iKTsKKwkJCXJl dHVybiAtRUlOVkFMOworCQl9CisKKwkJZXJyID0gaTkxNV9nZW1fb2JqZWN0X21pZ3JhdGUob2Jq LCB3dywgSU5URUxfUkVHSU9OX0xNRU0pOworCQlpZiAoZXJyKSB7CisJCQlwcl9lcnIoIk9iamVj dCBmYWlsZWQgbWlncmF0aW9uIHRvIGxtZW1cbiIpOworCQkJaWYgKGVycikKKwkJCQlyZXR1cm4g ZXJyOworCQl9CisKKwkJaWYgKGk5MTVfZ2VtX29iamVjdF9oYXNfc3RydWN0X3BhZ2Uob2JqKSkg eworCQkJcHJfZXJyKCJvYmplY3Qgc3RpbGwgYmFja2VkIGJ5IHN0cnVjdCBwYWdlXG4iKTsKKwkJ CWVyciA9IC1FSU5WQUw7CisJCX0KKworCQlpZiAoIWk5MTVfZ2VtX29iamVjdF9pc19sbWVtKG9i aikpIHsKKwkJCXByX2Vycigib2JqZWN0IG5vdCBiYWNrZWQgYnkgbG1lbVxuIik7CisJCQllcnIg PSAtRUlOVkFMOworCQl9CisJfQorCisJcmV0dXJuIGVycjsKK30KKworc3RhdGljIGludCBpZ3Rf bG1lbV9wYWdlc19taWdyYXRlKHZvaWQgKmFyZykKK3sKKwlzdHJ1Y3QgaW50ZWxfZ3QgKmd0ID0g YXJnOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0gZ3QtPmk5MTU7CisJc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKKwlzdHJ1Y3QgaTkxNV9nZW1fd3dfY3R4IHd3Owor CXN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxOworCWludCBlcnI7CisJaW50IGk7CisKKwkvKiBGcm9t IExNRU0gdG8gc2htZW0gYW5kIGJhY2sgYWdhaW4gKi8KKworCW9iaiA9IGk5MTVfZ2VtX29iamVj dF9jcmVhdGVfbG1lbShpOTE1LCBTWl8yTSwgMCk7CisJaWYgKElTX0VSUihvYmopKQorCQlyZXR1 cm4gUFRSX0VSUihvYmopOworCisJLyogSW5pdGlhbCBHUFUgZmlsbCwgc3luYywgQ1BVIGluaXRp YWxpemF0aW9uLiAqLworCWZvcl9pOTE1X2dlbV93dygmd3csIGVyciwgdHJ1ZSkgeworCQllcnIg PSBpOTE1X2dlbV9vYmplY3RfbG9jayhvYmosICZ3dyk7CisJCWlmIChlcnIpCisJCQljb250aW51 ZTsKKworCQllcnIgPSBfX19faTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhvYmopOworCQlpZiAo ZXJyKQorCQkJY29udGludWU7CisKKwkJZXJyID0gaW50ZWxfbWlncmF0ZV9jbGVhcigmZ3QtPm1p Z3JhdGUsICZ3dywgTlVMTCwKKwkJCQkJICBvYmotPm1tLnBhZ2VzLT5zZ2wsIG9iai0+Y2FjaGVf bGV2ZWwsCisJCQkJCSAgaTkxNV9nZW1fb2JqZWN0X2lzX2xtZW0ob2JqKSwKKwkJCQkJICAweGRl YWRiZWFmLCAmcnEpOworCQlpZiAocnEpIHsKKwkJCWRtYV9yZXN2X2FkZF9leGNsX2ZlbmNlKG9i ai0+YmFzZS5yZXN2LCAmcnEtPmZlbmNlKTsKKwkJCWk5MTVfcmVxdWVzdF9wdXQocnEpOworCQl9 CisJCWlmIChlcnIpCisJCQljb250aW51ZTsKKworCQllcnIgPSBpOTE1X2dlbV9vYmplY3Rfd2Fp dChvYmosIEk5MTVfV0FJVF9JTlRFUlJVUFRJQkxFLAorCQkJCQkgICA1ICogSFopOworCQlpZiAo ZXJyKQorCQkJY29udGludWU7CisKKwkJZXJyID0gaWd0X2ZpbGxfY2hlY2tfYnVmZmVyKG9iaiwg dHJ1ZSk7CisJCWlmIChlcnIpCisJCQljb250aW51ZTsKKwl9CisJaWYgKGVycikKKwkJZ290byBv dXRfcHV0OworCisJLyoKKwkgKiBNaWdyYXRlIHRvIGFuZCBmcm9tIHNtZW0gd2l0aG91dCBleHBs aWNpdGx5IHN5bmNpbmcuCisJICogRmluYWxpemUgd2l0aCBkYXRhIGluIHNtZW0gZm9yIGZhc3Qg cmVhZG91dC4KKwkgKi8KKwlmb3IgKGkgPSAxOyBpIDw9IDU7ICsraSkgeworCQlmb3JfaTkxNV9n ZW1fd3coJnd3LCBlcnIsIHRydWUpCisJCQllcnIgPSBsbWVtX3BhZ2VzX21pZ3JhdGVfb25lKCZ3 dywgb2JqKTsKKwkJaWYgKGVycikKKwkJCWdvdG8gb3V0X3B1dDsKKwl9CisKKwllcnIgPSBpOTE1 X2dlbV9vYmplY3RfbG9ja19pbnRlcnJ1cHRpYmxlKG9iaiwgTlVMTCk7CisJaWYgKGVycikKKwkJ Z290byBvdXRfcHV0OworCisJLyogRmluYWxseSBzeW5jIG1pZ3JhdGlvbiBhbmQgY2hlY2sgY29u dGVudC4gKi8KKwllcnIgPSBpOTE1X2dlbV9vYmplY3Rfd2FpdF9taWdyYXRpb24ob2JqLCB0cnVl KTsKKwlpZiAoZXJyKQorCQlnb3RvIG91dF91bmxvY2s7CisKKwllcnIgPSBpZ3RfZmlsbF9jaGVj a19idWZmZXIob2JqLCBmYWxzZSk7CisKK291dF91bmxvY2s6CisJaTkxNV9nZW1fb2JqZWN0X3Vu bG9jayhvYmopOworb3V0X3B1dDoKKwlpOTE1X2dlbV9vYmplY3RfcHV0KG9iaik7CisKKwlyZXR1 cm4gZXJyOworfQorCitpbnQgaTkxNV9nZW1fbWlncmF0ZV9saXZlX3NlbGZ0ZXN0cyhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKK3sKKwlzdGF0aWMgY29uc3Qgc3RydWN0IGk5MTVfc3Vi dGVzdCB0ZXN0c1tdID0geworCQlTVUJURVNUKGlndF9zbWVtX2NyZWF0ZV9taWdyYXRlKSwKKwkJ U1VCVEVTVChpZ3RfbG1lbV9jcmVhdGVfbWlncmF0ZSksCisJCVNVQlRFU1QoaWd0X3NhbWVfY3Jl YXRlX21pZ3JhdGUpLAorCQlTVUJURVNUKGlndF9sbWVtX3BhZ2VzX21pZ3JhdGUpLAorCX07CisK KwlpZiAoIUhBU19MTUVNKGk5MTUpKQorCQlyZXR1cm4gMDsKKworCXJldHVybiBpbnRlbF9ndF9s aXZlX3N1YnRlc3RzKHRlc3RzLCAmaTkxNS0+Z3QpOworfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfbGl2ZV9zZWxmdGVzdHMuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2xpdmVfc2VsZnRlc3RzLmgKaW5kZXggYTY4MTk3Y2Yx MDQ0Li5lMmZkMWI2MWFmNzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0 ZXN0cy9pOTE1X2xpdmVfc2VsZnRlc3RzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2Vs ZnRlc3RzL2k5MTVfbGl2ZV9zZWxmdGVzdHMuaApAQCAtNDAsNiArNDAsNyBAQCBzZWxmdGVzdCho dWdlcGFnZXMsIGk5MTVfZ2VtX2h1Z2VfcGFnZV9saXZlX3NlbGZ0ZXN0cykKIHNlbGZ0ZXN0KGdl bV9jb250ZXh0cywgaTkxNV9nZW1fY29udGV4dF9saXZlX3NlbGZ0ZXN0cykKIHNlbGZ0ZXN0KGdl bV9leGVjYnVmLCBpOTE1X2dlbV9leGVjYnVmZmVyX2xpdmVfc2VsZnRlc3RzKQogc2VsZnRlc3Qo Y2xpZW50LCBpOTE1X2dlbV9jbGllbnRfYmx0X2xpdmVfc2VsZnRlc3RzKQorc2VsZnRlc3QoZ2Vt X21pZ3JhdGUsIGk5MTVfZ2VtX21pZ3JhdGVfbGl2ZV9zZWxmdGVzdHMpCiBzZWxmdGVzdChyZXNl dCwgaW50ZWxfcmVzZXRfbGl2ZV9zZWxmdGVzdHMpCiBzZWxmdGVzdChtZW1vcnlfcmVnaW9uLCBp bnRlbF9tZW1vcnlfcmVnaW9uX2xpdmVfc2VsZnRlc3RzKQogc2VsZnRlc3QoaGFuZ2NoZWNrLCBp bnRlbF9oYW5nY2hlY2tfbGl2ZV9zZWxmdGVzdHMpCi0tIAoyLjMxLjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49376C11F69 for ; Tue, 29 Jun 2021 15:12:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1943961D5E for ; Tue, 29 Jun 2021 15:12:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1943961D5E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 89E626E8A9; Tue, 29 Jun 2021 15:12:32 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF96E6E8A9; Tue, 29 Jun 2021 15:12:31 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10030"; a="195318931" X-IronPort-AV: E=Sophos;i="5.83,309,1616482800"; d="scan'208";a="195318931" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2021 08:12:31 -0700 X-IronPort-AV: E=Sophos;i="5.83,309,1616482800"; d="scan'208";a="408203436" Received: from ettammin-mobl1.ger.corp.intel.com (HELO thellst-mobl1.intel.com) ([10.249.254.141]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2021 08:12:29 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH v5 2/3] drm/i915/gem: Introduce a selftest for the gem object migrate functionality Date: Tue, 29 Jun 2021 17:12:02 +0200 Message-Id: <20210629151203.209465-3-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210629151203.209465-1-thomas.hellstrom@linux.intel.com> References: <20210629151203.209465-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , matthew.auld@intel.com, "Michael J . Ruhl" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Matthew Auld A selftest for the gem object migrate functionality. Slightly adapted from the original by Matthew to the new interface and new fill blit code. v4: - Initialize buffers and check contents after migration (Suggested by Matthew Auld) - Perform async migration (if implemented) in the igt_lmem_pages_migrate test - Test also migration to the current region. Co-developed-by: Thomas Hellström Signed-off-by: Thomas Hellström Signed-off-by: Matthew Auld Reviewed-by: Michael J. Ruhl #v3 --- drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + .../drm/i915/gem/selftests/i915_gem_migrate.c | 258 ++++++++++++++++++ .../drm/i915/selftests/i915_live_selftests.h | 1 + 3 files changed, 260 insertions(+) create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 225b77fb4314..547cc9dad90d 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -665,6 +665,7 @@ static const struct drm_gem_object_funcs i915_gem_object_funcs = { #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) #include "selftests/huge_gem_object.c" #include "selftests/huge_pages.c" +#include "selftests/i915_gem_migrate.c" #include "selftests/i915_gem_object.c" #include "selftests/i915_gem_coherency.c" #endif diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c new file mode 100644 index 000000000000..ced6e3a814a2 --- /dev/null +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c @@ -0,0 +1,258 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright © 2020-2021 Intel Corporation + */ + +#include "gt/intel_migrate.h" + +static int igt_fill_check_buffer(struct drm_i915_gem_object *obj, + bool fill) +{ + struct drm_i915_private *i915 = to_i915(obj->base.dev); + unsigned int i, count = obj->base.size / sizeof(u32); + enum i915_map_type map_type = + i915_coherent_map_type(i915, obj, false); + u32 *cur; + int err = 0; + + assert_object_held(obj); + cur = i915_gem_object_pin_map(obj, map_type); + if (IS_ERR(cur)) + return PTR_ERR(cur); + + if (fill) + for (i = 0; i < count; ++i) + *cur++ = i; + else + for (i = 0; i < count; ++i) + if (*cur++ != i) { + pr_err("Object content mismatch at location %d of %d\n", i, count); + err = -EINVAL; + break; + } + + i915_gem_object_unpin_map(obj); + + return err; +} + +static int igt_create_migrate(struct intel_gt *gt, enum intel_region_id src, + enum intel_region_id dst) +{ + struct drm_i915_private *i915 = gt->i915; + struct intel_memory_region *src_mr = i915->mm.regions[src]; + struct drm_i915_gem_object *obj; + struct i915_gem_ww_ctx ww; + int err = 0; + + GEM_BUG_ON(!src_mr); + + /* Switch object backing-store on create */ + obj = i915_gem_object_create_region(src_mr, PAGE_SIZE, 0); + if (IS_ERR(obj)) + return PTR_ERR(obj); + + for_i915_gem_ww(&ww, err, true) { + err = i915_gem_object_lock(obj, &ww); + if (err) + continue; + + err = igt_fill_check_buffer(obj, true); + if (err) + continue; + + if (!i915_gem_object_can_migrate(obj, dst)) { + err = -EINVAL; + continue; + } + + err = i915_gem_object_migrate(obj, &ww, dst); + if (err) + continue; + + err = i915_gem_object_pin_pages(obj); + if (err) + continue; + + if (i915_gem_object_can_migrate(obj, src)) + err = -EINVAL; + + i915_gem_object_unpin_pages(obj); + err = i915_gem_object_wait_migration(obj, true); + if (err) + continue; + + err = igt_fill_check_buffer(obj, false); + } + i915_gem_object_put(obj); + + return err; +} + +static int igt_smem_create_migrate(void *arg) +{ + return igt_create_migrate(arg, INTEL_REGION_LMEM, INTEL_REGION_SMEM); +} + +static int igt_lmem_create_migrate(void *arg) +{ + return igt_create_migrate(arg, INTEL_REGION_SMEM, INTEL_REGION_LMEM); +} + +static int igt_same_create_migrate(void *arg) +{ + return igt_create_migrate(arg, INTEL_REGION_LMEM, INTEL_REGION_LMEM); +} + +static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww, + struct drm_i915_gem_object *obj) +{ + int err; + + err = i915_gem_object_lock(obj, ww); + if (err) + return err; + + if (i915_gem_object_is_lmem(obj)) { + if (!i915_gem_object_can_migrate(obj, INTEL_REGION_SMEM)) { + pr_err("object can't migrate to smem.\n"); + return -EINVAL; + } + + err = i915_gem_object_migrate(obj, ww, INTEL_REGION_SMEM); + if (err) { + pr_err("Object failed migration to smem\n"); + if (err) + return err; + } + + if (i915_gem_object_is_lmem(obj)) { + pr_err("object still backed by lmem\n"); + err = -EINVAL; + } + + if (!i915_gem_object_has_struct_page(obj)) { + pr_err("object not backed by struct page\n"); + err = -EINVAL; + } + + } else { + if (!i915_gem_object_can_migrate(obj, INTEL_REGION_LMEM)) { + pr_err("object can't migrate to lmem.\n"); + return -EINVAL; + } + + err = i915_gem_object_migrate(obj, ww, INTEL_REGION_LMEM); + if (err) { + pr_err("Object failed migration to lmem\n"); + if (err) + return err; + } + + if (i915_gem_object_has_struct_page(obj)) { + pr_err("object still backed by struct page\n"); + err = -EINVAL; + } + + if (!i915_gem_object_is_lmem(obj)) { + pr_err("object not backed by lmem\n"); + err = -EINVAL; + } + } + + return err; +} + +static int igt_lmem_pages_migrate(void *arg) +{ + struct intel_gt *gt = arg; + struct drm_i915_private *i915 = gt->i915; + struct drm_i915_gem_object *obj; + struct i915_gem_ww_ctx ww; + struct i915_request *rq; + int err; + int i; + + /* From LMEM to shmem and back again */ + + obj = i915_gem_object_create_lmem(i915, SZ_2M, 0); + if (IS_ERR(obj)) + return PTR_ERR(obj); + + /* Initial GPU fill, sync, CPU initialization. */ + for_i915_gem_ww(&ww, err, true) { + err = i915_gem_object_lock(obj, &ww); + if (err) + continue; + + err = ____i915_gem_object_get_pages(obj); + if (err) + continue; + + err = intel_migrate_clear(>->migrate, &ww, NULL, + obj->mm.pages->sgl, obj->cache_level, + i915_gem_object_is_lmem(obj), + 0xdeadbeaf, &rq); + if (rq) { + dma_resv_add_excl_fence(obj->base.resv, &rq->fence); + i915_request_put(rq); + } + if (err) + continue; + + err = i915_gem_object_wait(obj, I915_WAIT_INTERRUPTIBLE, + 5 * HZ); + if (err) + continue; + + err = igt_fill_check_buffer(obj, true); + if (err) + continue; + } + if (err) + goto out_put; + + /* + * Migrate to and from smem without explicitly syncing. + * Finalize with data in smem for fast readout. + */ + for (i = 1; i <= 5; ++i) { + for_i915_gem_ww(&ww, err, true) + err = lmem_pages_migrate_one(&ww, obj); + if (err) + goto out_put; + } + + err = i915_gem_object_lock_interruptible(obj, NULL); + if (err) + goto out_put; + + /* Finally sync migration and check content. */ + err = i915_gem_object_wait_migration(obj, true); + if (err) + goto out_unlock; + + err = igt_fill_check_buffer(obj, false); + +out_unlock: + i915_gem_object_unlock(obj); +out_put: + i915_gem_object_put(obj); + + return err; +} + +int i915_gem_migrate_live_selftests(struct drm_i915_private *i915) +{ + static const struct i915_subtest tests[] = { + SUBTEST(igt_smem_create_migrate), + SUBTEST(igt_lmem_create_migrate), + SUBTEST(igt_same_create_migrate), + SUBTEST(igt_lmem_pages_migrate), + }; + + if (!HAS_LMEM(i915)) + return 0; + + return intel_gt_live_subtests(tests, &i915->gt); +} diff --git a/drivers/gpu/drm/i915/selftests/i915_live_selftests.h b/drivers/gpu/drm/i915/selftests/i915_live_selftests.h index a68197cf1044..e2fd1b61af71 100644 --- a/drivers/gpu/drm/i915/selftests/i915_live_selftests.h +++ b/drivers/gpu/drm/i915/selftests/i915_live_selftests.h @@ -40,6 +40,7 @@ selftest(hugepages, i915_gem_huge_page_live_selftests) selftest(gem_contexts, i915_gem_context_live_selftests) selftest(gem_execbuf, i915_gem_execbuffer_live_selftests) selftest(client, i915_gem_client_blt_live_selftests) +selftest(gem_migrate, i915_gem_migrate_live_selftests) selftest(reset, intel_reset_live_selftests) selftest(memory_region, intel_memory_region_live_selftests) selftest(hangcheck, intel_hangcheck_live_selftests) -- 2.31.1