From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 2/2] drm/selftests/mm: Add callsite indicator to common asserts Date: Thu, 9 Nov 2017 21:24:35 +0000 Message-ID: <20171109212435.9265-2-chris@chris-wilson.co.uk> References: <20171109212435.9265-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171109212435.9265-1-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhlIG1ham9yaXR5IG9mIHRoZSBhc3NlcnRzICh2YWxpZGF0aW5nIG5vZGVzIGFuZCByYW5nZXMp IGFyZSBzaGFyZWQKYW1vbmdzdCBzZXZlcmFsIHN1YnRlc3RzLiBUaGlzIG1ha2VzIGlkZW50aWZp Y2F0aW9uIG9mIHdoaWNoIGNhbGxlcgpmYWlsZWQgaGFyZDsgYnV0IHdlIHVuaXF1ZWx5IGlkZW50 aWZ5IHRoZW0gaWYgd2UgaW5jbHVkZSB0aGUgY2FsbHNpdGUKaW50byB0aGUgYXNzZXJ0aW9uIGVy cm9yIG1lc3NhZ2UgKGEgc2luZ2xlIGZyYW1lIHN0YWNrdHJhY2UpLgoKU2lnbmVkLW9mZi1ieTog Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBKb29uYXMgTGFodGlu ZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBEYW5pZWwgVmV0dGVyIDxk YW5pZWwudmV0dGVyQGZmd2xsLmNoPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9zZWxmdGVzdHMvdGVz dC1kcm1fbW0uYyB8IDQ2ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9zZWxmdGVzdHMvdGVzdC1kcm1fbW0uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9zZWxmdGVzdHMvdGVzdC1kcm1fbW0uYwppbmRleCA3Y2M5MzVkN2I3YWEuLjVmMTQ3NzMyOWJl ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3NlbGZ0ZXN0cy90ZXN0LWRybV9tbS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9zZWxmdGVzdHMvdGVzdC1kcm1fbW0uYwpAQCAtNTksMTMgKzU5 LDE2IEBAIHN0YXRpYyBib29sIGFzc2VydF9ub19ob2xlcyhjb25zdCBzdHJ1Y3QgZHJtX21tICpt bSkKIAlkcm1fbW1fZm9yX2VhY2hfaG9sZShob2xlLCBtbSwgaG9sZV9zdGFydCwgaG9sZV9lbmQp CiAJCWNvdW50Kys7CiAJaWYgKGNvdW50KSB7Ci0JCXByX2VycigiRXhwZWN0ZWQgdG8gZmluZCBu byBob2xlcyAoYWZ0ZXIgcmVzZXJ2ZSksIGZvdW5kICVsdSBpbnN0ZWFkXG4iLCBjb3VudCk7CisJ CXByX2VycigiJXBTOiBFeHBlY3RlZCB0byBmaW5kIG5vIGhvbGVzIChhZnRlciByZXNlcnZlKSwg Zm91bmQgJWx1IGluc3RlYWRcbiIsCisJCSAgICAgICBfX2J1aWx0aW5fcmV0dXJuX2FkZHJlc3Mo MCksCisJCSAgICAgICBjb3VudCk7CiAJCXJldHVybiBmYWxzZTsKIAl9CiAKIAlkcm1fbW1fZm9y X2VhY2hfbm9kZShob2xlLCBtbSkgewogCQlpZiAoZHJtX21tX2hvbGVfZm9sbG93cyhob2xlKSkg ewotCQkJcHJfZXJyKCJIb2xlIGZvbGxvd3Mgbm9kZSwgZXhwZWN0ZWQgbm9uZSFcbiIpOworCQkJ cHJfZXJyKCIlcFM6IEhvbGUgZm9sbG93cyBub2RlLCBleHBlY3RlZCBub25lIVxuIiwKKwkJCSAg ICAgICBfX2J1aWx0aW5fcmV0dXJuX2FkZHJlc3MoMCkpOwogCQkJcmV0dXJuIGZhbHNlOwogCQl9 CiAJfQpAQCAtODcsNyArOTAsOCBAQCBzdGF0aWMgYm9vbCBhc3NlcnRfb25lX2hvbGUoY29uc3Qg c3RydWN0IGRybV9tbSAqbW0sIHU2NCBzdGFydCwgdTY0IGVuZCkKIAlkcm1fbW1fZm9yX2VhY2hf aG9sZShob2xlLCBtbSwgaG9sZV9zdGFydCwgaG9sZV9lbmQpIHsKIAkJaWYgKHN0YXJ0ICE9IGhv bGVfc3RhcnQgfHwgZW5kICE9IGhvbGVfZW5kKSB7CiAJCQlpZiAob2spCi0JCQkJcHJfZXJyKCJl bXB0eSBtbSBoYXMgaW5jb3JyZWN0IGhvbGUsIGZvdW5kICglbGx4LCAlbGx4KSwgZXhwZWN0ICgl bGx4LCAlbGx4KVxuIiwKKwkJCQlwcl9lcnIoIiVwUzogZW1wdHkgbW0gaGFzIGluY29ycmVjdCBo b2xlLCBmb3VuZCAoJWxseCwgJWxseCksIGV4cGVjdCAoJWxseCwgJWxseClcbiIsCisJCQkJICAg ICAgIF9fYnVpbHRpbl9yZXR1cm5fYWRkcmVzcygwKSwKIAkJCQkgICAgICAgaG9sZV9zdGFydCwg aG9sZV9lbmQsCiAJCQkJICAgICAgIHN0YXJ0LCBlbmQpOwogCQkJb2sgPSBmYWxzZTsKQEAgLTk1 LDcgKzk5LDkgQEAgc3RhdGljIGJvb2wgYXNzZXJ0X29uZV9ob2xlKGNvbnN0IHN0cnVjdCBkcm1f bW0gKm1tLCB1NjQgc3RhcnQsIHU2NCBlbmQpCiAJCWNvdW50Kys7CiAJfQogCWlmIChjb3VudCAh PSAxKSB7Ci0JCXByX2VycigiRXhwZWN0ZWQgdG8gZmluZCBvbmUgaG9sZSwgZm91bmQgJWx1IGlu c3RlYWRcbiIsIGNvdW50KTsKKwkJcHJfZXJyKCIlcFM6IEV4cGVjdGVkIHRvIGZpbmQgb25lIGhv bGUsIGZvdW5kICVsdSBpbnN0ZWFkXG4iLAorCQkgICAgICAgX19idWlsdGluX3JldHVybl9hZGRy ZXNzKDApLAorCQkgICAgICAgY291bnQpOwogCQlvayA9IGZhbHNlOwogCX0KIApAQCAtMTA4LDQw ICsxMTQsNDggQEAgc3RhdGljIGJvb2wgYXNzZXJ0X2NvbnRpbnVvdXMoY29uc3Qgc3RydWN0IGRy bV9tbSAqbW0sIHU2NCBzaXplKQogCXVuc2lnbmVkIGxvbmcgbjsKIAl1NjQgYWRkcjsKIAotCWlm ICghYXNzZXJ0X25vX2hvbGVzKG1tKSkKKwlpZiAoIWFzc2VydF9ub19ob2xlcyhtbSkpIHsKKwkJ cHJfZXJyKCIlcFM6IGV4cGVjdGVkIG5vIGhvbGVzIVxuIiwKKwkJICAgICAgIF9fYnVpbHRpbl9y ZXR1cm5fYWRkcmVzcygwKSk7CiAJCXJldHVybiBmYWxzZTsKKwl9CiAKIAluID0gMDsKIAlhZGRy ID0gMDsKIAlkcm1fbW1fZm9yX2VhY2hfbm9kZShub2RlLCBtbSkgewogCQlpZiAobm9kZS0+c3Rh cnQgIT0gYWRkcikgewotCQkJcHJfZXJyKCJub2RlWyVsZF0gbGlzdCBvdXQgb2Ygb3JkZXIsIGV4 cGVjdGVkICVsbHggZm91bmQgJWxseFxuIiwKKwkJCXByX2VycigiJXBTOiBub2RlWyVsZF0gbGlz dCBvdXQgb2Ygb3JkZXIsIGV4cGVjdGVkICVsbHggZm91bmQgJWxseFxuIiwKKwkJCSAgICAgICBf X2J1aWx0aW5fcmV0dXJuX2FkZHJlc3MoMCksCiAJCQkgICAgICAgbiwgYWRkciwgbm9kZS0+c3Rh cnQpOwogCQkJcmV0dXJuIGZhbHNlOwogCQl9CiAKIAkJaWYgKG5vZGUtPnNpemUgIT0gc2l6ZSkg ewotCQkJcHJfZXJyKCJub2RlWyVsZF0uc2l6ZSBpbmNvcnJlY3QsIGV4cGVjdGVkICVsbHgsIGZv dW5kICVsbHhcbiIsCisJCQlwcl9lcnIoIiVwUzogbm9kZVslbGRdLnNpemUgaW5jb3JyZWN0LCBl eHBlY3RlZCAlbGx4LCBmb3VuZCAlbGx4XG4iLAorCQkJICAgICAgIF9fYnVpbHRpbl9yZXR1cm5f YWRkcmVzcygwKSwKIAkJCSAgICAgICBuLCBzaXplLCBub2RlLT5zaXplKTsKIAkJCXJldHVybiBm YWxzZTsKIAkJfQogCiAJCWlmIChkcm1fbW1faG9sZV9mb2xsb3dzKG5vZGUpKSB7Ci0JCQlwcl9l cnIoIm5vZGVbJWxkXSBpcyBmb2xsb3dlZCBieSBhIGhvbGUhXG4iLCBuKTsKKwkJCXByX2Vycigi JXBTOiBub2RlWyVsZF0gaXMgZm9sbG93ZWQgYnkgYSBob2xlIVxuIiwKKwkJCSAgICAgICBfX2J1 aWx0aW5fcmV0dXJuX2FkZHJlc3MoMCksIG4pOwogCQkJcmV0dXJuIGZhbHNlOwogCQl9CiAKIAkJ Zm91bmQgPSBOVUxMOwogCQlkcm1fbW1fZm9yX2VhY2hfbm9kZV9pbl9yYW5nZShjaGVjaywgbW0s IGFkZHIsIGFkZHIgKyBzaXplKSB7CiAJCQlpZiAobm9kZSAhPSBjaGVjaykgewotCQkJCXByX2Vy cigibG9va3VwIHJldHVybiB3cm9uZyBub2RlLCBleHBlY3RlZCBzdGFydCAlbGx4LCBmb3VuZCAl bGx4XG4iLAorCQkJCXByX2VycigiJXBTOiBsb29rdXAgcmV0dXJuIHdyb25nIG5vZGUsIGV4cGVj dGVkIHN0YXJ0ICVsbHgsIGZvdW5kICVsbHhcbiIsCisJCQkJICAgICAgIF9fYnVpbHRpbl9yZXR1 cm5fYWRkcmVzcygwKSwKIAkJCQkgICAgICAgbm9kZS0+c3RhcnQsIGNoZWNrLT5zdGFydCk7CiAJ CQkJcmV0dXJuIGZhbHNlOwogCQkJfQogCQkJZm91bmQgPSBjaGVjazsKIAkJfQogCQlpZiAoIWZv dW5kKSB7Ci0JCQlwcl9lcnIoImxvb2t1cCBmYWlsZWQgZm9yIG5vZGUgJWxseCArICVsbHhcbiIs CisJCQlwcl9lcnIoIiVwUzogbG9va3VwIGZhaWxlZCBmb3Igbm9kZSAlbGx4ICsgJWxseFxuIiwK KwkJCSAgICAgICBfX2J1aWx0aW5fcmV0dXJuX2FkZHJlc3MoMCksCiAJCQkgICAgICAgYWRkciwg c2l6ZSk7CiAJCQlyZXR1cm4gZmFsc2U7CiAJCX0KQEAgLTE3MCwyNCArMTg0LDI4IEBAIHN0YXRp YyBib29sIGFzc2VydF9ub2RlKHN0cnVjdCBkcm1fbW1fbm9kZSAqbm9kZSwgc3RydWN0IGRybV9t bSAqbW0sCiAJYm9vbCBvayA9IHRydWU7CiAKIAlpZiAoIWRybV9tbV9ub2RlX2FsbG9jYXRlZChu b2RlKSB8fCBub2RlLT5tbSAhPSBtbSkgewotCQlwcl9lcnIoIm5vZGUgbm90IGFsbG9jYXRlZFxu Iik7CisJCXByX2VycigiJXBTOiBub2RlIG5vdCBhbGxvY2F0ZWRcbiIsCisJCSAgICAgICBfX2J1 aWx0aW5fcmV0dXJuX2FkZHJlc3MoMCkpOwogCQlvayA9IGZhbHNlOwogCX0KIAogCWlmIChub2Rl LT5zaXplICE9IHNpemUpIHsKLQkJcHJfZXJyKCJub2RlIGhhcyB3cm9uZyBzaXplLCBmb3VuZCAl bGx1LCBleHBlY3RlZCAlbGx1XG4iLAorCQlwcl9lcnIoIiVwUzogbm9kZSBoYXMgd3Jvbmcgc2l6 ZSwgZm91bmQgJWxsdSwgZXhwZWN0ZWQgJWxsdVxuIiwKKwkJICAgICAgIF9fYnVpbHRpbl9yZXR1 cm5fYWRkcmVzcygwKSwKIAkJICAgICAgIG5vZGUtPnNpemUsIHNpemUpOwogCQlvayA9IGZhbHNl OwogCX0KIAogCWlmIChtaXNhbGlnbm1lbnQobm9kZSwgYWxpZ25tZW50KSkgewotCQlwcl9lcnIo Im5vZGUgaXMgbWlzYWxpZ25lZCwgc3RhcnQgJWxseCByZW0gJWxsdSwgZXhwZWN0ZWQgYWxpZ25t ZW50ICVsbHVcbiIsCisJCXByX2VycigiJXBTOiBub2RlIGlzIG1pc2FsaWduZWQsIHN0YXJ0ICVs bHggcmVtICVsbHUsIGV4cGVjdGVkIGFsaWdubWVudCAlbGx1XG4iLAorCQkgICAgICAgX19idWls dGluX3JldHVybl9hZGRyZXNzKDApLAogCQkgICAgICAgbm9kZS0+c3RhcnQsIG1pc2FsaWdubWVu dChub2RlLCBhbGlnbm1lbnQpLCBhbGlnbm1lbnQpOwogCQlvayA9IGZhbHNlOwogCX0KIAogCWlm IChub2RlLT5jb2xvciAhPSBjb2xvcikgewotCQlwcl9lcnIoIm5vZGUgaGFzIHdyb25nIGNvbG9y LCBmb3VuZCAlbHUsIGV4cGVjdGVkICVsdVxuIiwKKwkJcHJfZXJyKCIlcFM6IG5vZGUgaGFzIHdy b25nIGNvbG9yLCBmb3VuZCAlbHUsIGV4cGVjdGVkICVsdVxuIiwKKwkJICAgICAgIF9fYnVpbHRp bl9yZXR1cm5fYWRkcmVzcygwKSwKIAkJICAgICAgIG5vZGUtPmNvbG9yLCBjb2xvcik7CiAJCW9r ID0gZmFsc2U7CiAJfQotLSAKMi4xNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK