From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH v2 5/7] drm/i915/selftests: extend coverage to include LMEM huge-pages Date: Mon, 21 Oct 2019 20:27:45 +0100 Message-ID: <20191021192747.24804-5-matthew.auld@intel.com> References: <20191021192747.24804-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id C7D696E22B for ; Mon, 21 Oct 2019 19:27:54 +0000 (UTC) In-Reply-To: <20191021192747.24804-1-matthew.auld@intel.com> 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 QWRkIExNRU0gb2JqZWN0cyB0byBsaXN0IG9mIGJhY2tlbmRzIHdlIHRlc3QgZm9yIGh1Z2UtR1RU LXBhZ2VzLgoKU2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwu Y29tPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ Ci0tLQogLi4uL2dwdS9kcm0vaTkxNS9nZW0vc2VsZnRlc3RzL2h1Z2VfcGFnZXMuYyAgIHwgMTIx ICsrKysrKysrKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDEyMCBpbnNlcnRpb25zKCspLCAx IGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL3NlbGZ0 ZXN0cy9odWdlX3BhZ2VzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vc2VsZnRlc3RzL2h1 Z2VfcGFnZXMuYwppbmRleCBmMjc3NzJmNjc3OWEuLmQ0ODkyNzY5YjczOSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL3NlbGZ0ZXN0cy9odWdlX3BhZ2VzLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvZ2VtL3NlbGZ0ZXN0cy9odWdlX3BhZ2VzLmMKQEAgLTksNiArOSw3 IEBACiAjaW5jbHVkZSAiaTkxNV9zZWxmdGVzdC5oIgogCiAjaW5jbHVkZSAiZ2VtL2k5MTVfZ2Vt X3JlZ2lvbi5oIgorI2luY2x1ZGUgImdlbS9pOTE1X2dlbV9sbWVtLmgiCiAjaW5jbHVkZSAiZ2Vt L2k5MTVfZ2VtX3BtLmgiCiAKICNpbmNsdWRlICJndC9pbnRlbF9ndC5oIgpAQCAtOTgxLDcgKzk4 Miw3IEBAIHN0YXRpYyBpbnQgZ3B1X3dyaXRlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSwKIAkJ CSAgICAgICB2bWEtPnNpemUgPj4gUEFHRV9TSElGVCwgdmFsKTsKIH0KIAotc3RhdGljIGludCBj cHVfY2hlY2soc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwgdTMyIGR3b3JkLCB1MzIg dmFsKQorc3RhdGljIGludCBfX2NwdV9jaGVja19zaG1lbShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2JqLCB1MzIgZHdvcmQsIHUzMiB2YWwpCiB7CiAJdW5zaWduZWQgaW50IG5lZWRzX2Zs dXNoOwogCXVuc2lnbmVkIGxvbmcgbjsKQEAgLTEwMTMsNiArMTAxNCw1MSBAQCBzdGF0aWMgaW50 IGNwdV9jaGVjayhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLCB1MzIgZHdvcmQsIHUz MiB2YWwpCiAJcmV0dXJuIGVycjsKIH0KIAorc3RhdGljIGludCBfX2NwdV9jaGVja19sbWVtKHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosIHUzMiBkd29yZCwgdTMyIHZhbCkKK3sKKwl1 bnNpZ25lZCBsb25nIG47CisJaW50IGVycjsKKworCWk5MTVfZ2VtX29iamVjdF9sb2NrKG9iaik7 CisJZXJyID0gaTkxNV9nZW1fb2JqZWN0X3NldF90b193Y19kb21haW4ob2JqLCBmYWxzZSk7CisJ aTkxNV9nZW1fb2JqZWN0X3VubG9jayhvYmopOworCWlmIChlcnIpCisJCXJldHVybiBlcnI7CisK KwllcnIgPSBpOTE1X2dlbV9vYmplY3RfcGluX3BhZ2VzKG9iaik7CisJaWYgKGVycikKKwkJcmV0 dXJuIGVycjsKKworCWZvciAobiA9IDA7IG4gPCBvYmotPmJhc2Uuc2l6ZSA+PiBQQUdFX1NISUZU OyArK24pIHsKKwkJdTMyIF9faW9tZW0gKmJhc2U7CisJCXUzMiByZWFkX3ZhbDsKKworCQliYXNl ID0gaTkxNV9nZW1fb2JqZWN0X2xtZW1faW9fbWFwX3BhZ2VfYXRvbWljKG9iaiwgbik7CisKKwkJ cmVhZF92YWwgPSBpb3JlYWQzMihiYXNlICsgZHdvcmQpOworCQlpb19tYXBwaW5nX3VubWFwX2F0 b21pYyhiYXNlKTsKKwkJaWYgKHJlYWRfdmFsICE9IHZhbCkgeworCQkJcHJfZXJyKCJuPSVsdSBi YXNlWyV1XT0ldSwgdmFsPSV1XG4iLAorCQkJICAgICAgIG4sIGR3b3JkLCByZWFkX3ZhbCwgdmFs KTsKKwkJCWVyciA9IC1FSU5WQUw7CisJCQlicmVhazsKKwkJfQorCX0KKworCWk5MTVfZ2VtX29i amVjdF91bnBpbl9wYWdlcyhvYmopOworCXJldHVybiBlcnI7Cit9CisKK3N0YXRpYyBpbnQgY3B1 X2NoZWNrKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosIHUzMiBkd29yZCwgdTMyIHZh bCkKK3sKKwlpZiAoaTkxNV9nZW1fb2JqZWN0X2hhc19zdHJ1Y3RfcGFnZShvYmopKQorCQlyZXR1 cm4gX19jcHVfY2hlY2tfc2htZW0ob2JqLCBkd29yZCwgdmFsKTsKKwllbHNlIGlmIChpOTE1X2dl bV9vYmplY3RfaXNfbG1lbShvYmopKQorCQlyZXR1cm4gX19jcHVfY2hlY2tfbG1lbShvYmosIGR3 b3JkLCB2YWwpOworCisJcmV0dXJuIC1FTk9ERVY7Cit9CisKIHN0YXRpYyBpbnQgX19pZ3Rfd3Jp dGVfaHVnZShzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY2UsCiAJCQkgICAgc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm9iaiwKIAkJCSAgICB1NjQgc2l6ZSwgdTY0IG9mZnNldCwKQEAgLTEzOTcs NiArMTQ0Myw3OCBAQCBzdGF0aWMgaW50IGlndF9wcGd0dF9nZW1mc19odWdlKHZvaWQgKmFyZykK IAlyZXR1cm4gZXJyOwogfQogCitzdGF0aWMgaW50IGlndF9wcGd0dF9sbWVtX2h1Z2Uodm9pZCAq YXJnKQoreworCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHggPSBhcmc7CisJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmk5MTUgPSBjdHgtPmk5MTU7CisJc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iajsKKwlzdGF0aWMgY29uc3QgdW5zaWduZWQgaW50IHNpemVzW10gPSB7CisJCVNa XzY0SywKKwkJU1pfNTEySywKKwkJU1pfMU0sCisJCVNaXzJNLAorCX07CisJaW50IGk7CisJaW50 IGVycjsKKworCWlmICghSEFTX0xNRU0oaTkxNSkpIHsKKwkJcHJfaW5mbygiZGV2aWNlIGxhY2tz IExNRU0gc3VwcG9ydCwgc2tpcHBpbmdcbiIpOworCQlyZXR1cm4gMDsKKwl9CisKKwkvKgorCSAq IFNhbml0eSBjaGVjayB0aGF0IHRoZSBIVyB1c2VzIGh1Z2UgcGFnZXMgY29ycmVjdGx5IHRocm91 Z2ggTE1FTQorCSAqIC0tIGVuc3VyZSB0aGF0IG91ciB3cml0ZXMgbGFuZCBpbiB0aGUgcmlnaHQg cGxhY2UuCisJICovCisKKwlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShzaXplcyk7ICsraSkg eworCQl1bnNpZ25lZCBpbnQgc2l6ZSA9IHNpemVzW2ldOworCisJCW9iaiA9IGk5MTVfZ2VtX29i amVjdF9jcmVhdGVfbG1lbShpOTE1LCBzaXplLCBJOTE1X0JPX0FMTE9DX0NPTlRJR1VPVVMpOwor CQlpZiAoSVNfRVJSKG9iaikpIHsKKwkJCWVyciA9IFBUUl9FUlIob2JqKTsKKwkJCWlmIChlcnIg PT0gLUUyQklHKSB7CisJCQkJcHJfaW5mbygib2JqZWN0IHRvbyBiaWcgZm9yIHJlZ2lvbiFcbiIp OworCQkJCXJldHVybiAwOworCQkJfQorCisJCQlyZXR1cm4gZXJyOworCQl9CisKKwkJZXJyID0g aTkxNV9nZW1fb2JqZWN0X3Bpbl9wYWdlcyhvYmopOworCQlpZiAoZXJyKQorCQkJZ290byBvdXRf cHV0OworCisJCWlmIChvYmotPm1tLnBhZ2Vfc2l6ZXMucGh5cyA8IEk5MTVfR1RUX1BBR0VfU0la RV82NEspIHsKKwkJCXByX2luZm8oIkxNRU0gdW5hYmxlIHRvIGFsbG9jYXRlIGh1Z2UtcGFnZShz KSB3aXRoIHNpemU9JXVcbiIsCisJCQkJc2l6ZSk7CisJCQlnb3RvIG91dF91bnBpbjsKKwkJfQor CisJCWVyciA9IGlndF93cml0ZV9odWdlKGN0eCwgb2JqKTsKKwkJaWYgKGVycikgeworCQkJcHJf ZXJyKCJMTUVNIHdyaXRlLWh1Z2UgZmFpbGVkIHdpdGggc2l6ZT0ldVxuIiwgc2l6ZSk7CisJCQln b3RvIG91dF91bnBpbjsKKwkJfQorCisJCWk5MTVfZ2VtX29iamVjdF91bnBpbl9wYWdlcyhvYmop OworCQlfX2k5MTVfZ2VtX29iamVjdF9wdXRfcGFnZXMob2JqLCBJOTE1X01NX05PUk1BTCk7CisJ CWk5MTVfZ2VtX29iamVjdF9wdXQob2JqKTsKKwl9CisKKwlyZXR1cm4gMDsKKworb3V0X3VucGlu OgorCWk5MTVfZ2VtX29iamVjdF91bnBpbl9wYWdlcyhvYmopOworb3V0X3B1dDoKKwlpOTE1X2dl bV9vYmplY3RfcHV0KG9iaik7CisKKwlpZiAoZXJyID09IC1FTk9NRU0pCisJCWVyciA9IDA7CisK KwlyZXR1cm4gZXJyOworfQorCiBzdGF0aWMgaW50IGlndF9wcGd0dF9waW5fdXBkYXRlKHZvaWQg KmFyZykKIHsKIAlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4ID0gYXJnOwpAQCAtMTc1OCw2 ICsxODc2LDcgQEAgaW50IGk5MTVfZ2VtX2h1Z2VfcGFnZV9saXZlX3NlbGZ0ZXN0cyhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAkJU1VCVEVTVChpZ3RfcHBndHRfZXhoYXVzdF9odWdl KSwKIAkJU1VCVEVTVChpZ3RfcHBndHRfZ2VtZnNfaHVnZSksCiAJCVNVQlRFU1QoaWd0X3BwZ3R0 X2ludGVybmFsX2h1Z2UpLAorCQlTVUJURVNUKGlndF9wcGd0dF9sbWVtX2h1Z2UpLAogCX07CiAJ c3RydWN0IGRybV9maWxlICpmaWxlOwogCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHg7Ci0t IAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==