From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH i-g-t v3] tests/perf_pmu: Handle CPU hotplug failures better Date: Fri, 2 Mar 2018 11:28:29 +0000 Message-ID: <20180302112829.5003-1-tvrtko.ursulin@linux.intel.com> References: <20180302111219.wjas3yhqqbafc4ju@platvala-desk.ger.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A8B46E32A for ; Fri, 2 Mar 2018 11:28:39 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id s206so2568069wme.0 for ; Fri, 02 Mar 2018 03:28:39 -0800 (PST) In-Reply-To: <20180302111219.wjas3yhqqbafc4ju@platvala-desk.ger.corp.intel.com> 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 LiAoUGV0cmkgTGF0dmFsYSkKCnYzOiBBZGQgbWlzc2lnbiBkb2NzIGFuZCB1cGRhdGUgc3RhbGUg Y29tbWVudC4gKFBldHJpIExhdHZhbGEpCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+CkNjOiBQZXRyaSBMYXR2YWxhIDxwZXRyaS5sYXR2YWxhQGludGVsLmNvbT4K Q2M6IFRvbWkgU2FydmVsYSA8dG9taS5wLnNhcnZlbGFAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTog UGV0cmkgTGF0dmFsYSA8cGV0cmkubGF0dmFsYUBpbnRlbC5jb20+Ci0tLQogbGliL01ha2VmaWxl LnNvdXJjZXMgfCAgMiArKwogbGliL2lndF9jb3JlLmMgICAgICAgfCAyMyArKysrKysrKysrKysr KysrKysrKysrKwogbGliL2lndF9jb3JlLmggICAgICAgfCAgMSArCiBsaWIvaWd0X3N5c3JxLmMg ICAgICB8IDI3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKwogbGliL2lndF9zeXNycS5oICAg ICAgfCAzMCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGxpYi9tZXNvbi5idWlsZCAg ICAgIHwgIDEgKwogdGVzdHMvcGVyZl9wbXUuYyAgICAgfCAzOCArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLQogNyBmaWxlcyBjaGFuZ2VkLCAxMTUgaW5zZXJ0aW9ucygrKSwg NyBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBsaWIvaWd0X3N5c3JxLmMKIGNyZWF0 ZSBtb2RlIDEwMDY0NCBsaWIvaWd0X3N5c3JxLmgKCmRpZmYgLS1naXQgYS9saWIvTWFrZWZpbGUu c291cmNlcyBiL2xpYi9NYWtlZmlsZS5zb3VyY2VzCmluZGV4IDViMTNlZjg4OTZjMC4uM2QzN2Vm MWQxOTg0IDEwMDY0NAotLS0gYS9saWIvTWFrZWZpbGUuc291cmNlcworKysgYi9saWIvTWFrZWZp bGUuc291cmNlcwpAQCAtMzUsNiArMzUsOCBAQCBsaWJfc291cmNlX2xpc3QgPQkgCVwKIAlpZ3Rf c3RhdHMuaAkJXAogCWlndF9zeXNmcy5jCQlcCiAJaWd0X3N5c2ZzLmgJCVwKKwlpZ3Rfc3lzcnEu YwkJXAorCWlndF9zeXNycS5oCQlcCiAJaWd0X3g4Ni5oCQlcCiAJaWd0X3g4Ni5jCQlcCiAJaWd0 X3ZnZW0uYwkJXApkaWZmIC0tZ2l0IGEvbGliL2lndF9jb3JlLmMgYi9saWIvaWd0X2NvcmUuYwpp bmRleCBjMjkyMzQzZGUwOWUuLmQ2NGMyNWUxMjE3YiAxMDA2NDQKLS0tIGEvbGliL2lndF9jb3Jl LmMKKysrIGIvbGliL2lndF9jb3JlLmMKQEAgLTcwLDYgKzcwLDcgQEAKICNpbmNsdWRlICJpZ3Rf Y29yZS5oIgogI2luY2x1ZGUgImlndF9hdXguaCIKICNpbmNsdWRlICJpZ3Rfc3lzZnMuaCIKKyNp bmNsdWRlICJpZ3Rfc3lzcnEuaCIKICNpbmNsdWRlICJpZ3RfcmMuaCIKIAogI2RlZmluZSBVTldf TE9DQUxfT05MWQpAQCAtMTEzNiw2ICsxMTM3LDI4IEBAIHZvaWQgaWd0X2ZhaWwoaW50IGV4aXRj b2RlKQogCX0KIH0KIAorLyoqCisgKiBpZ3RfZmF0YWxfZXJyb3I6IFN0b3AgdGVzdCBleGVjdXRp b24gb24gZmF0YWwgZXJyb3JzCisgKgorICogU3RvcCB0ZXN0IGV4ZWN1dGlvbiBvciBvcHRpb25h bGx5LCBpZiB0aGUgSUdUX1JFQk9PVF9PTl9GQVRBTF9FUlJPUgorICogZW52aXJvbm1lbnQgdmFy aWFibGUgaXMgc2V0LCByZWJvb3QgdGhlIG1hY2hpbmUuCisgKgorICogU2luY2Ugb3V0IHRlc3Qg cnVubmVyIChwaWdsaXQpIGRvZXMgc3VwcG9ydCBmYXRhbCB0ZXN0IGV4aXQgY29kZXMsIHdlCisg KiBpbXBsZW1lbnQgdGhlIGRlZmF1bHQgYmVoYXZpb3VyIGJ5IHdhaXRpbmcgZW5kbGVzc2x5Lgor ICovCit2b2lkICBfX2F0dHJpYnV0ZV9fKChub3JldHVybikpIGlndF9mYXRhbF9lcnJvcih2b2lk KQoreworCWlmIChpZ3RfY2hlY2tfYm9vbGVhbl9lbnZfdmFyKCJJR1RfUkVCT09UX09OX0ZBVEFM X0VSUk9SIiwgZmFsc2UpKSB7CisJCWlndF93YXJuKCJGQVRBTCBFUlJPUiAtIFJFQk9PVElORyIp OworCQlpZ3Rfc3lzcnFfcmVib290KCk7CisJfSBlbHNlIHsKKwkJaWd0X3dhcm4oIkZBVEFMIEVS Uk9SIik7CisJCWZvciAoOzspCisJCQlzbGVlcCg2MCk7CisJfQorfQorCisKIC8qKgogICogaWd0 X2Nhbl9mYWlsOgogICoKZGlmZiAtLWdpdCBhL2xpYi9pZ3RfY29yZS5oIGIvbGliL2lndF9jb3Jl LmgKaW5kZXggN2FmMmI0YzEwOWZlLi42NjUyM2EyMDhjMzEgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3Rf Y29yZS5oCisrKyBiL2xpYi9pZ3RfY29yZS5oCkBAIC0zMTEsNiArMzExLDcgQEAgdm9pZCBfX2ln dF9mYWlsX2Fzc2VydChjb25zdCBjaGFyICpkb21haW4sIGNvbnN0IGNoYXIgKmZpbGUsCiAJCSAg ICAgICBjb25zdCBjaGFyICpmb3JtYXQsIC4uLikKIAlfX2F0dHJpYnV0ZV9fKChub3JldHVybikp Owogdm9pZCBpZ3RfZXhpdCh2b2lkKSBfX2F0dHJpYnV0ZV9fKChub3JldHVybikpOwordm9pZCBp Z3RfZmF0YWxfZXJyb3Iodm9pZCkgX19hdHRyaWJ1dGVfXygobm9yZXR1cm4pKTsKIAogLyoqCiAg KiBpZ3RfaWdub3JlX3dhcm46CmRpZmYgLS1naXQgYS9saWIvaWd0X3N5c3JxLmMgYi9saWIvaWd0 X3N5c3JxLmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi4zYmRhMzIx ZjdjNWIKLS0tIC9kZXYvbnVsbAorKysgYi9saWIvaWd0X3N5c3JxLmMKQEAgLTAsMCArMSwyNyBA QAorI2luY2x1ZGUgPHVuaXN0ZC5oPgorI2luY2x1ZGUgPGZjbnRsLmg+CisjaW5jbHVkZSA8c3Rk bGliLmg+CisjaW5jbHVkZSA8c3lzL3JlYm9vdC5oPgorCisjaW5jbHVkZSAiaWd0X2NvcmUuaCIK KworI2luY2x1ZGUgImlndF9zeXNycS5oIgorCisvKioKKyAqIGlndF9zeXNycV9yZWJvb3Q6IFJl Ym9vdHMgdGhlIG1hY2hpbmUKKyAqCisgKiBTeW5jcyBmaWxlc3lzdGVtcyBhbmQgaW1tZWRpYXRl bHkgcmVib290cyB0aGUgbWFjaGluZS4KKyAqLwordm9pZCBpZ3Rfc3lzcnFfcmVib290KHZvaWQp Cit7CisJc3luYygpOworCisJLyogVHJ5IHRvIGJlIG5pY2UgYXQgZmlyc3QsIGFuZCBpZiB0aGF0 IGZhaWxzIHB1bGwgdGhlIHRyaWdnZXIgKi8KKwlpZiAocmVib290KFJCX0FVVE9CT09UKSkgewor CQlpbnQgZmQgPSBvcGVuKCIvcHJvYy9zeXNycS10cmlnZ2VyIiwgT19XUk9OTFkpOworCQlpZ3Rf aWdub3JlX3dhcm4od3JpdGUoZmQsICJiIiwgMikpOworCQljbG9zZShmZCk7CisJfQorCisJYWJv cnQoKTsKK30KZGlmZiAtLWdpdCBhL2xpYi9pZ3Rfc3lzcnEuaCBiL2xpYi9pZ3Rfc3lzcnEuaApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjQyMjQ3M2QyYTQ4MAotLS0g L2Rldi9udWxsCisrKyBiL2xpYi9pZ3Rfc3lzcnEuaApAQCAtMCwwICsxLDMwIEBACisvKgorICog Q29weXJpZ2h0IMKpIDIwMTggSW50ZWwgQ29ycG9yYXRpb24KKyAqCisgKiBQZXJtaXNzaW9uIGlz IGhlcmVieSBncmFudGVkLCBmcmVlIG9mIGNoYXJnZSwgdG8gYW55IHBlcnNvbiBvYnRhaW5pbmcg YQorICogY29weSBvZiB0aGlzIHNvZnR3YXJlIGFuZCBhc3NvY2lhdGVkIGRvY3VtZW50YXRpb24g ZmlsZXMgKHRoZSAiU29mdHdhcmUiKSwKKyAqIHRvIGRlYWwgaW4gdGhlIFNvZnR3YXJlIHdpdGhv dXQgcmVzdHJpY3Rpb24sIGluY2x1ZGluZyB3aXRob3V0IGxpbWl0YXRpb24KKyAqIHRoZSByaWdo dHMgdG8gdXNlLCBjb3B5LCBtb2RpZnksIG1lcmdlLCBwdWJsaXNoLCBkaXN0cmlidXRlLCBzdWJs aWNlbnNlLAorICogYW5kL29yIHNlbGwgY29waWVzIG9mIHRoZSBTb2Z0d2FyZSwgYW5kIHRvIHBl cm1pdCBwZXJzb25zIHRvIHdob20gdGhlCisgKiBTb2Z0d2FyZSBpcyBmdXJuaXNoZWQgdG8gZG8g c28sIHN1YmplY3QgdG8gdGhlIGZvbGxvd2luZyBjb25kaXRpb25zOgorICoKKyAqIFRoZSBhYm92 ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIChpbmNsdWRpbmcg dGhlIG5leHQKKyAqIHBhcmFncmFwaCkgc2hhbGwgYmUgaW5jbHVkZWQgaW4gYWxsIGNvcGllcyBv ciBzdWJzdGFudGlhbCBwb3J0aW9ucyBvZiB0aGUKKyAqIFNvZnR3YXJlLgorICoKKyAqIFRIRSBT T0ZUV0FSRSBJUyBQUk9WSURFRCAiQVMgSVMiLCBXSVRIT1VUIFdBUlJBTlRZIE9GIEFOWSBLSU5E LCBFWFBSRVNTIE9SCisgKiBJTVBMSUVELCBJTkNMVURJTkcgQlVUIE5PVCBMSU1JVEVEIFRPIFRI RSBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSwKKyAqIEZJVE5FU1MgRk9SIEEgUEFSVElD VUxBUiBQVVJQT1NFIEFORCBOT05JTkZSSU5HRU1FTlQuICBJTiBOTyBFVkVOVCBTSEFMTAorICog VEhFIEFVVEhPUlMgT1IgQ09QWVJJR0hUIEhPTERFUlMgQkUgTElBQkxFIEZPUiBBTlkgQ0xBSU0s IERBTUFHRVMgT1IgT1RIRVIKKyAqIExJQUJJTElUWSwgV0hFVEhFUiBJTiBBTiBBQ1RJT04gT0Yg Q09OVFJBQ1QsIFRPUlQgT1IgT1RIRVJXSVNFLCBBUklTSU5HCisgKiBGUk9NLCBPVVQgT0YgT1Ig SU4gQ09OTkVDVElPTiBXSVRIIFRIRSBTT0ZUV0FSRSBPUiBUSEUgVVNFIE9SIE9USEVSIERFQUxJ TkdTCisgKiBJTiBUSEUgU09GVFdBUkUuCisgKgorICovCisKKyNpZm5kZWYgX19JR1RfU1lTUlFf SF9fCisjZGVmaW5lIF9fSUdUX1NZU1JRX0hfXworCit2b2lkIGlndF9zeXNycV9yZWJvb3Qodm9p ZCkgX19hdHRyaWJ1dGVfXygobm9yZXR1cm4pKTsKKworI2VuZGlmIC8qIF9fSUdUX1NZU1JRX0hf XyAqLwpkaWZmIC0tZ2l0IGEvbGliL21lc29uLmJ1aWxkIGIvbGliL21lc29uLmJ1aWxkCmluZGV4 IGE5ZTUzNjg5YjM1ZC4uYjNiOGIxNGEzZjAxIDEwMDY0NAotLS0gYS9saWIvbWVzb24uYnVpbGQK KysrIGIvbGliL21lc29uLmJ1aWxkCkBAIC0xNCw2ICsxNCw3IEBAIGxpYl9zb3VyY2VzID0gWwog CSdpZ3Rfc3RhdHMuYycsCiAJJ2lndF9zeW5jb2JqLmMnLAogCSdpZ3Rfc3lzZnMuYycsCisJJ2ln dF9zeXNycS5jJywKIAknaWd0X3ZnZW0uYycsCiAJJ2lndF94ODYuYycsCiAJJ2luc3Rkb25lLmMn LApkaWZmIC0tZ2l0IGEvdGVzdHMvcGVyZl9wbXUuYyBiL3Rlc3RzL3BlcmZfcG11LmMKaW5kZXgg M2JiYjE4ZDJmMjE2Li44N2U3ZTc4MmQwNWUgMTAwNjQ0Ci0tLSBhL3Rlc3RzL3BlcmZfcG11LmMK KysrIGIvdGVzdHMvcGVyZl9wbXUuYwpAQCAtOTY1LDYgKzk2NSw3IEBAIHN0YXRpYyB2b2lkIGNw dV9ob3RwbHVnKGludCBnZW1fZmQpCiAJaW50IGxpbmtbMl07CiAJaW50IGZkLCByZXQ7CiAJaW50 IGN1ciA9IDA7CisJY2hhciBidWY7CiAKIAlpZ3Rfc2tpcF9vbihJU19CUk9YVE9OKGludGVsX2dl dF9kcm1fZGV2aWQoZ2VtX2ZkKSkpOwogCWlndF9yZXF1aXJlKGNwdTBfaG90cGx1Z19zdXBwb3J0 KCkpOwpAQCAtMTAxMSw5ICsxMDEyLDMyIEBAIHN0YXRpYyB2b2lkIGNwdV9ob3RwbHVnKGludCBn ZW1fZmQpCiAJCQl9CiAKIAkJCS8qIE9mZmxpbmUgZm9sbG93ZWQgYnkgb25saW5lIGEgQ1BVLiAq LwotCQkJaWd0X2Fzc2VydF9lcSh3cml0ZShjcHVmZCwgIjAiLCAyKSwgMik7CisKKwkJCXJldCA9 IHdyaXRlKGNwdWZkLCAiMCIsIDIpOworCQkJaWYgKHJldCA8IDApIHsKKwkJCQkvKgorCQkJCSAq IElmIHdlIGZhaWxlZCB0byBvZmZsaW5lIGEgQ1BVIHdlIGRvbid0IHdhbnQKKwkJCQkgKiB0byBw cm9jZWVkLgorCQkJCSAqLworCQkJCWlndF93YXJuKCJGYWlsZWQgdG8gb2ZmbGluZSBjcHUldSEg KCVkKVxuIiwKKwkJCQkJIGNwdSwgZXJybm8pOworCQkJCWlndF9hc3NlcnRfZXEod3JpdGUobGlu a1sxXSwgInMiLCAxKSwgMSk7CisJCQkJYnJlYWs7CisJCQl9CisKIAkJCXVzbGVlcCgxZTYpOwot CQkJaWd0X2Fzc2VydF9lcSh3cml0ZShjcHVmZCwgIjEiLCAyKSwgMik7CisKKwkJCXJldCA9IHdy aXRlKGNwdWZkLCAiMSIsIDIpOworCQkJaWYgKHJldCA8IDApIHsKKwkJCQkvKgorCQkJCSAqIEZh aWxlZCB0byBicmluZyBhIENQVSBiYWNrIG9ubGluZSBpcyBmYXRhbAorCQkJCSAqIGZvciB0aGUg c2FuaXR5IG9mIGEgdGVzdCBydW4gc28gc3RvcCBmdXJ0aGVyCisJCQkJICogdGVzdGluZy4KKwkJ CQkgKi8KKwkJCQlpZ3Rfd2FybigiRmFpbGVkIHRvIG9ubGluZSBjcHUldSEgKCVkKVxuIiwKKwkJ CQkJIGNwdSwgZXJybm8pOworCQkJCWlndF9mYXRhbF9lcnJvcigpOworCQkJfQogCiAJCQljbG9z ZShjcHVmZCk7CiAJCQljcHUrKzsKQEAgLTEwMjcsMTUgKzEwNTEsMTIgQEAgc3RhdGljIHZvaWQg Y3B1X2hvdHBsdWcoaW50IGdlbV9mZCkKIAkgKiB1bnRpbCB0aGUgQ1BVIGNvcmUgc2h1ZmZsZXIg ZmluaXNoZXMgb25lIGxvb3AuCiAJICovCiAJZm9yICg7OykgewotCQljaGFyIGJ1ZjsKLQkJaW50 IHJldDI7Ci0KIAkJdXNsZWVwKDUwMGUzKTsKIAkJZW5kX3NwaW4oZ2VtX2ZkLCBzcGluW2N1cl0s IDApOwogCiAJCS8qIENoZWNrIGlmIHRoZSBjaGlsZCBpcyBzaWduYWxpbmcgY29tcGxldGlvbi4g Ki8KLQkJcmV0MiA9IHJlYWQobGlua1swXSwgJmJ1ZiwgMSk7Ci0JCWlmICggcmV0MiA9PSAxIHx8 IChyZXQyIDwgMCAmJiBlcnJubyAhPSBFQUdBSU4pKQorCQlyZXQgPSByZWFkKGxpbmtbMF0sICZi dWYsIDEpOworCQlpZiAoIHJldCA9PSAxIHx8IChyZXQgPCAwICYmIGVycm5vICE9IEVBR0FJTikp CiAJCQlicmVhazsKIAogCQlpZ3Rfc3Bpbl9iYXRjaF9mcmVlKGdlbV9mZCwgc3BpbltjdXJdKTsK QEAgLTEwNTQsNiArMTA3NSw5IEBAIHN0YXRpYyB2b2lkIGNwdV9ob3RwbHVnKGludCBnZW1fZmQp CiAJY2xvc2UoZmQpOwogCWNsb3NlKGxpbmtbMF0pOwogCisJLyogU2tpcCBpZiBjaGlsZCBzaWdu YWxzIGEgcHJvYmxlbSB3aXRoIG9mZmxpbmluZyBhIENQVS4gKi8KKwlpZ3Rfc2tpcF9vbihidWYg PT0gJ3MnKTsKKwogCWFzc2VydF93aXRoaW5fZXBzaWxvbih2YWwsIHRzWzFdIC0gdHNbMF0sIHRv bGVyYW5jZSk7CiB9CiAKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==