From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH i-g-t v2] tests/perf_pmu: Handle CPU hotplug failures better Date: Wed, 28 Feb 2018 10:05:55 +0000 Message-ID: <20180228100555.11734-1-tvrtko.ursulin@linux.intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id B90036E91A for ; Wed, 28 Feb 2018 10:06:05 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id x7so3906877wmc.0 for ; Wed, 28 Feb 2018 02:06:05 -0800 (PST) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: igt-dev@lists.freedesktop.org Cc: Tomi Sarvela , Intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpDUFUgaG90cGx1 ZywgZXNwZWNpYWxseSBDUFUwLCBjYW4gYmUgZmxha3kgb24gY29tbW9kaXR5IGhhcmR3YXJlLgoK VG8gaW1wcm92ZSB0ZXN0IHJlbGlhYmlsaXR5IGFuZCByZXBvbnNlIHRpbWVzIHdoZW4gdGVzdGlu ZyBsYXJnZXIgcnVucyB3ZQpuZWVkIHRvIGhhbmRsZSB0aG9zZSBjYXNlcyBiZXR0ZXIuCgpIYW5k bGUgZmFpbHVyZXMgdG8gb2ZmLWxpbmUgYSBDUFUgYnkgaW1tZWRpYXRlbHkgc2tpcHBpbmcgdGhl IHRlc3QsIGFuZApmYWlsdXJlcyB0byBvbi1saW5lIGEgQ1BVIGJ5IGltbWVkaWF0ZWx5IHJlYm9v dGluZyB0aGUgbWFjaGluZS4KClRoaXMgcGF0Y2ggaW5jbHVkZXMgaWd0X3N5c3JxX3JlYm9vdCBp bXBsZW1lbnRhdGlvbiBmcm9tIENocmlzIFdpbHNvbi4KCnYyOiBIYWx0IGJ5IGRlZmF1bHQsIHJl Ym9vdCBpZiBlbnYgdmFyaWFibGUgSUdUX1JFQk9PVF9PTl9GQVRBTF9FUlJPUiBpcwogICAgc2V0 LiAoUGV0cmkgTGF0dmFsYSkKClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28u dXJzdWxpbkBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5j by51az4KQ2M6IFBldHJpIExhdHZhbGEgPHBldHJpLmxhdHZhbGFAaW50ZWwuY29tPgpDYzogVG9t aSBTYXJ2ZWxhIDx0b21pLnAuc2FydmVsYUBpbnRlbC5jb20+Ci0tLQogbGliL01ha2VmaWxlLnNv dXJjZXMgfCAgMiArKwogbGliL2lndF9jb3JlLmMgICAgICAgfCAyMyArKysrKysrKysrKysrKysr KysrKysrKwogbGliL2lndF9jb3JlLmggICAgICAgfCAgMSArCiBsaWIvaWd0X3N5c3JxLmMgICAg ICB8IDIyICsrKysrKysrKysrKysrKysrKysrKysKIGxpYi9pZ3Rfc3lzcnEuaCAgICAgIHwgMzAg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBsaWIvbWVzb24uYnVpbGQgICAgICB8ICAx ICsKIHRlc3RzL3BlcmZfcG11LmMgICAgIHwgMzggKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0tLS0tLS0KIDcgZmlsZXMgY2hhbmdlZCwgMTEwIGluc2VydGlvbnMoKyksIDcgZGVsZXRp b25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgbGliL2lndF9zeXNycS5jCiBjcmVhdGUgbW9kZSAx MDA2NDQgbGliL2lndF9zeXNycS5oCgpkaWZmIC0tZ2l0IGEvbGliL01ha2VmaWxlLnNvdXJjZXMg Yi9saWIvTWFrZWZpbGUuc291cmNlcwppbmRleCA1YjEzZWY4ODk2YzAuLjNkMzdlZjFkMTk4NCAx MDA2NDQKLS0tIGEvbGliL01ha2VmaWxlLnNvdXJjZXMKKysrIGIvbGliL01ha2VmaWxlLnNvdXJj ZXMKQEAgLTM1LDYgKzM1LDggQEAgbGliX3NvdXJjZV9saXN0ID0JIAlcCiAJaWd0X3N0YXRzLmgJ CVwKIAlpZ3Rfc3lzZnMuYwkJXAogCWlndF9zeXNmcy5oCQlcCisJaWd0X3N5c3JxLmMJCVwKKwlp Z3Rfc3lzcnEuaAkJXAogCWlndF94ODYuaAkJXAogCWlndF94ODYuYwkJXAogCWlndF92Z2VtLmMJ CVwKZGlmZiAtLWdpdCBhL2xpYi9pZ3RfY29yZS5jIGIvbGliL2lndF9jb3JlLmMKaW5kZXggYzI5 MjM0M2RlMDllLi4zZmQ5ZjUyOWYwOWYgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfY29yZS5jCisrKyBi L2xpYi9pZ3RfY29yZS5jCkBAIC03MCw2ICs3MCw3IEBACiAjaW5jbHVkZSAiaWd0X2NvcmUuaCIK ICNpbmNsdWRlICJpZ3RfYXV4LmgiCiAjaW5jbHVkZSAiaWd0X3N5c2ZzLmgiCisjaW5jbHVkZSAi aWd0X3N5c3JxLmgiCiAjaW5jbHVkZSAiaWd0X3JjLmgiCiAKICNkZWZpbmUgVU5XX0xPQ0FMX09O TFkKQEAgLTExMzYsNiArMTEzNywyOCBAQCB2b2lkIGlndF9mYWlsKGludCBleGl0Y29kZSkKIAl9 CiB9CiAKKy8qKgorICogaWd0X2ZhdGFsX2Vycm9yOgorICoKKyAqIFN0b3AgdGVzdCBleGVjdXRp b24gb3Igb3B0aW9uYWxseSwgaWYgdGhlIElHVF9SRUJPT1RfT05fRkFUQUxfRVJST1IKKyAqIGVu dmlyb25tZW50IHZhcmlhYmxlIGlzIHNldCwgcmVib290IHRoZSBtYWNoaW5lLgorICoKKyAqIFNp bmNlIG91dCB0ZXN0IHJ1bm5lciAocGlnbGl0KSBkb2VzIHN1cHBvcnQgZmF0YWwgdGVzdCBleGl0 IGNvZGVzLCB3ZQorICogaW1wbGVtZW50IHRoZSBkZWZhdWx0IGJlaGF2aW91ciBieSB3YWl0aW5n IGVuZGxlc3NseS4KKyAqLwordm9pZCAgX19hdHRyaWJ1dGVfXygobm9yZXR1cm4pKSBpZ3RfZmF0 YWxfZXJyb3Iodm9pZCkKK3sKKwlpZiAoaWd0X2NoZWNrX2Jvb2xlYW5fZW52X3ZhcigiSUdUX1JF Qk9PVF9PTl9GQVRBTF9FUlJPUiIsIGZhbHNlKSkgeworCQlpZ3Rfd2FybigiRkFUQUwgRVJST1Ig LSBSRUJPT1RJTkciKTsKKwkJaWd0X3N5c3JxX3JlYm9vdCgpOworCX0gZWxzZSB7CisJCWlndF93 YXJuKCJGQVRBTCBFUlJPUiIpOworCQlmb3IgKDs7KQorCQkJc2xlZXAoNjApOworCX0KK30KKwor CiAvKioKICAqIGlndF9jYW5fZmFpbDoKICAqCmRpZmYgLS1naXQgYS9saWIvaWd0X2NvcmUuaCBi L2xpYi9pZ3RfY29yZS5oCmluZGV4IDdhZjJiNGMxMDlmZS4uNjY1MjNhMjA4YzMxIDEwMDY0NAot LS0gYS9saWIvaWd0X2NvcmUuaAorKysgYi9saWIvaWd0X2NvcmUuaApAQCAtMzExLDYgKzMxMSw3 IEBAIHZvaWQgX19pZ3RfZmFpbF9hc3NlcnQoY29uc3QgY2hhciAqZG9tYWluLCBjb25zdCBjaGFy ICpmaWxlLAogCQkgICAgICAgY29uc3QgY2hhciAqZm9ybWF0LCAuLi4pCiAJX19hdHRyaWJ1dGVf Xygobm9yZXR1cm4pKTsKIHZvaWQgaWd0X2V4aXQodm9pZCkgX19hdHRyaWJ1dGVfXygobm9yZXR1 cm4pKTsKK3ZvaWQgaWd0X2ZhdGFsX2Vycm9yKHZvaWQpIF9fYXR0cmlidXRlX18oKG5vcmV0dXJu KSk7CiAKIC8qKgogICogaWd0X2lnbm9yZV93YXJuOgpkaWZmIC0tZ2l0IGEvbGliL2lndF9zeXNy cS5jIGIvbGliL2lndF9zeXNycS5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMC4uZmUzZDJlMzQ0ZmYxCi0tLSAvZGV2L251bGwKKysrIGIvbGliL2lndF9zeXNycS5jCkBA IC0wLDAgKzEsMjIgQEAKKyNpbmNsdWRlIDx1bmlzdGQuaD4KKyNpbmNsdWRlIDxmY250bC5oPgor I2luY2x1ZGUgPHN0ZGxpYi5oPgorI2luY2x1ZGUgPHN5cy9yZWJvb3QuaD4KKworI2luY2x1ZGUg ImlndF9jb3JlLmgiCisKKyNpbmNsdWRlICJpZ3Rfc3lzcnEuaCIKKwordm9pZCBpZ3Rfc3lzcnFf cmVib290KHZvaWQpCit7CisJc3luYygpOworCisJLyogVHJ5IHRvIGJlIG5pY2UgYXQgZmlyc3Qs IGFuZCBpZiB0aGF0IGZhaWxzIHB1bGwgdGhlIHRyaWdnZXIgKi8KKwlpZiAocmVib290KFJCX0FV VE9CT09UKSkgeworCQlpbnQgZmQgPSBvcGVuKCIvcHJvYy9zeXNycS10cmlnZ2VyIiwgT19XUk9O TFkpOworCQlpZ3RfaWdub3JlX3dhcm4od3JpdGUoZmQsICJiIiwgMikpOworCQljbG9zZShmZCk7 CisJfQorCisJYWJvcnQoKTsKK30KZGlmZiAtLWdpdCBhL2xpYi9pZ3Rfc3lzcnEuaCBiL2xpYi9p Z3Rfc3lzcnEuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjQyMjQ3 M2QyYTQ4MAotLS0gL2Rldi9udWxsCisrKyBiL2xpYi9pZ3Rfc3lzcnEuaApAQCAtMCwwICsxLDMw IEBACisvKgorICogQ29weXJpZ2h0IMKpIDIwMTggSW50ZWwgQ29ycG9yYXRpb24KKyAqCisgKiBQ ZXJtaXNzaW9uIGlzIGhlcmVieSBncmFudGVkLCBmcmVlIG9mIGNoYXJnZSwgdG8gYW55IHBlcnNv biBvYnRhaW5pbmcgYQorICogY29weSBvZiB0aGlzIHNvZnR3YXJlIGFuZCBhc3NvY2lhdGVkIGRv Y3VtZW50YXRpb24gZmlsZXMgKHRoZSAiU29mdHdhcmUiKSwKKyAqIHRvIGRlYWwgaW4gdGhlIFNv ZnR3YXJlIHdpdGhvdXQgcmVzdHJpY3Rpb24sIGluY2x1ZGluZyB3aXRob3V0IGxpbWl0YXRpb24K KyAqIHRoZSByaWdodHMgdG8gdXNlLCBjb3B5LCBtb2RpZnksIG1lcmdlLCBwdWJsaXNoLCBkaXN0 cmlidXRlLCBzdWJsaWNlbnNlLAorICogYW5kL29yIHNlbGwgY29waWVzIG9mIHRoZSBTb2Z0d2Fy ZSwgYW5kIHRvIHBlcm1pdCBwZXJzb25zIHRvIHdob20gdGhlCisgKiBTb2Z0d2FyZSBpcyBmdXJu aXNoZWQgdG8gZG8gc28sIHN1YmplY3QgdG8gdGhlIGZvbGxvd2luZyBjb25kaXRpb25zOgorICoK KyAqIFRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNl IChpbmNsdWRpbmcgdGhlIG5leHQKKyAqIHBhcmFncmFwaCkgc2hhbGwgYmUgaW5jbHVkZWQgaW4g YWxsIGNvcGllcyBvciBzdWJzdGFudGlhbCBwb3J0aW9ucyBvZiB0aGUKKyAqIFNvZnR3YXJlLgor ICoKKyAqIFRIRSBTT0ZUV0FSRSBJUyBQUk9WSURFRCAiQVMgSVMiLCBXSVRIT1VUIFdBUlJBTlRZ IE9GIEFOWSBLSU5ELCBFWFBSRVNTIE9SCisgKiBJTVBMSUVELCBJTkNMVURJTkcgQlVUIE5PVCBM SU1JVEVEIFRPIFRIRSBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSwKKyAqIEZJVE5FU1Mg Rk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFORCBOT05JTkZSSU5HRU1FTlQuICBJTiBOTyBFVkVO VCBTSEFMTAorICogVEhFIEFVVEhPUlMgT1IgQ09QWVJJR0hUIEhPTERFUlMgQkUgTElBQkxFIEZP UiBBTlkgQ0xBSU0sIERBTUFHRVMgT1IgT1RIRVIKKyAqIExJQUJJTElUWSwgV0hFVEhFUiBJTiBB TiBBQ1RJT04gT0YgQ09OVFJBQ1QsIFRPUlQgT1IgT1RIRVJXSVNFLCBBUklTSU5HCisgKiBGUk9N LCBPVVQgT0YgT1IgSU4gQ09OTkVDVElPTiBXSVRIIFRIRSBTT0ZUV0FSRSBPUiBUSEUgVVNFIE9S IE9USEVSIERFQUxJTkdTCisgKiBJTiBUSEUgU09GVFdBUkUuCisgKgorICovCisKKyNpZm5kZWYg X19JR1RfU1lTUlFfSF9fCisjZGVmaW5lIF9fSUdUX1NZU1JRX0hfXworCit2b2lkIGlndF9zeXNy cV9yZWJvb3Qodm9pZCkgX19hdHRyaWJ1dGVfXygobm9yZXR1cm4pKTsKKworI2VuZGlmIC8qIF9f SUdUX1NZU1JRX0hfXyAqLwpkaWZmIC0tZ2l0IGEvbGliL21lc29uLmJ1aWxkIGIvbGliL21lc29u LmJ1aWxkCmluZGV4IGE5ZTUzNjg5YjM1ZC4uYjNiOGIxNGEzZjAxIDEwMDY0NAotLS0gYS9saWIv bWVzb24uYnVpbGQKKysrIGIvbGliL21lc29uLmJ1aWxkCkBAIC0xNCw2ICsxNCw3IEBAIGxpYl9z b3VyY2VzID0gWwogCSdpZ3Rfc3RhdHMuYycsCiAJJ2lndF9zeW5jb2JqLmMnLAogCSdpZ3Rfc3lz ZnMuYycsCisJJ2lndF9zeXNycS5jJywKIAknaWd0X3ZnZW0uYycsCiAJJ2lndF94ODYuYycsCiAJ J2luc3Rkb25lLmMnLApkaWZmIC0tZ2l0IGEvdGVzdHMvcGVyZl9wbXUuYyBiL3Rlc3RzL3BlcmZf cG11LmMKaW5kZXggM2JiYjE4ZDJmMjE2Li44Yzc1YjA2NDE3ODUgMTAwNjQ0Ci0tLSBhL3Rlc3Rz L3BlcmZfcG11LmMKKysrIGIvdGVzdHMvcGVyZl9wbXUuYwpAQCAtOTY1LDYgKzk2NSw3IEBAIHN0 YXRpYyB2b2lkIGNwdV9ob3RwbHVnKGludCBnZW1fZmQpCiAJaW50IGxpbmtbMl07CiAJaW50IGZk LCByZXQ7CiAJaW50IGN1ciA9IDA7CisJY2hhciBidWY7CiAKIAlpZ3Rfc2tpcF9vbihJU19CUk9Y VE9OKGludGVsX2dldF9kcm1fZGV2aWQoZ2VtX2ZkKSkpOwogCWlndF9yZXF1aXJlKGNwdTBfaG90 cGx1Z19zdXBwb3J0KCkpOwpAQCAtMTAxMSw5ICsxMDEyLDMyIEBAIHN0YXRpYyB2b2lkIGNwdV9o b3RwbHVnKGludCBnZW1fZmQpCiAJCQl9CiAKIAkJCS8qIE9mZmxpbmUgZm9sbG93ZWQgYnkgb25s aW5lIGEgQ1BVLiAqLwotCQkJaWd0X2Fzc2VydF9lcSh3cml0ZShjcHVmZCwgIjAiLCAyKSwgMik7 CisKKwkJCXJldCA9IHdyaXRlKGNwdWZkLCAiMCIsIDIpOworCQkJaWYgKHJldCA8IDApIHsKKwkJ CQkvKgorCQkJCSAqIElmIHdlIGZhaWxlZCB0byBvZmZsaW5lIGEgQ1BVIHdlIGRvbid0IHdhbnQK KwkJCQkgKiB0byBwcm9jZWVkLgorCQkJCSAqLworCQkJCWlndF93YXJuKCJGYWlsZWQgdG8gb2Zm bGluZSBjcHUldSEgKCVkKVxuIiwKKwkJCQkJIGNwdSwgZXJybm8pOworCQkJCWlndF9hc3NlcnRf ZXEod3JpdGUobGlua1sxXSwgInMiLCAxKSwgMSk7CisJCQkJYnJlYWs7CisJCQl9CisKIAkJCXVz bGVlcCgxZTYpOwotCQkJaWd0X2Fzc2VydF9lcSh3cml0ZShjcHVmZCwgIjEiLCAyKSwgMik7CisK KwkJCXJldCA9IHdyaXRlKGNwdWZkLCAiMSIsIDIpOworCQkJaWYgKHJldCA8IDApIHsKKwkJCQkv KgorCQkJCSAqIEZhaWxlZCB0byBicmluZyBhIENQVSBiYWNrIG9ubGluZSBpcyBmYXRhbAorCQkJ CSAqIGZvciB0aGUgc2FuaXR5IG9mIGEgdGVzdCBydW4gc28gcmVib290CisJCQkJICogaW1tZWRp YXRlbHkuCisJCQkJICovCisJCQkJaWd0X3dhcm4oIkZhaWxlZCB0byBvbmxpbmUgY3B1JXUhICgl ZClcbiIsCisJCQkJCSBjcHUsIGVycm5vKTsKKwkJCQlpZ3RfZmF0YWxfZXJyb3IoKTsKKwkJCX0K IAogCQkJY2xvc2UoY3B1ZmQpOwogCQkJY3B1Kys7CkBAIC0xMDI3LDE1ICsxMDUxLDEyIEBAIHN0 YXRpYyB2b2lkIGNwdV9ob3RwbHVnKGludCBnZW1fZmQpCiAJICogdW50aWwgdGhlIENQVSBjb3Jl IHNodWZmbGVyIGZpbmlzaGVzIG9uZSBsb29wLgogCSAqLwogCWZvciAoOzspIHsKLQkJY2hhciBi dWY7Ci0JCWludCByZXQyOwotCiAJCXVzbGVlcCg1MDBlMyk7CiAJCWVuZF9zcGluKGdlbV9mZCwg c3BpbltjdXJdLCAwKTsKIAogCQkvKiBDaGVjayBpZiB0aGUgY2hpbGQgaXMgc2lnbmFsaW5nIGNv bXBsZXRpb24uICovCi0JCXJldDIgPSByZWFkKGxpbmtbMF0sICZidWYsIDEpOwotCQlpZiAoIHJl dDIgPT0gMSB8fCAocmV0MiA8IDAgJiYgZXJybm8gIT0gRUFHQUlOKSkKKwkJcmV0ID0gcmVhZChs aW5rWzBdLCAmYnVmLCAxKTsKKwkJaWYgKCByZXQgPT0gMSB8fCAocmV0IDwgMCAmJiBlcnJubyAh PSBFQUdBSU4pKQogCQkJYnJlYWs7CiAKIAkJaWd0X3NwaW5fYmF0Y2hfZnJlZShnZW1fZmQsIHNw aW5bY3VyXSk7CkBAIC0xMDU0LDYgKzEwNzUsOSBAQCBzdGF0aWMgdm9pZCBjcHVfaG90cGx1Zyhp bnQgZ2VtX2ZkKQogCWNsb3NlKGZkKTsKIAljbG9zZShsaW5rWzBdKTsKIAorCS8qIFNraXAgaWYg Y2hpbGQgc2lnbmFscyBhIHByb2JsZW0gd2l0aCBvZmZsaW5pbmcgYSBDUFUuICovCisJaWd0X3Nr aXBfb24oYnVmID09ICdzJyk7CisKIAlhc3NlcnRfd2l0aGluX2Vwc2lsb24odmFsLCB0c1sxXSAt IHRzWzBdLCB0b2xlcmFuY2UpOwogfQogCi0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=