From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH i-g-t v4] tests/perf_pmu: Handle CPU hotplug failures better Date: Fri, 2 Mar 2018 11:39:12 +0000 Message-ID: <20180302113912.5139-1-tvrtko.ursulin@linux.intel.com> References: <20180302112829.5003-1-tvrtko.ursulin@linux.intel.com> 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 262276EE0F for ; Fri, 2 Mar 2018 11:39:21 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id t74so2584394wme.3 for ; Fri, 02 Mar 2018 03:39:21 -0800 (PST) In-Reply-To: <20180302112829.5003-1-tvrtko.ursulin@linux.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 Y29tbWVudC4gKFBldHJpIExhdHZhbGEpCgp2NDogVXNlIHBhdXNlIGluc3RlYWQgb2Ygc2xlZXAu IChDaHJpcyBXaWxzb24pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVy c3VsaW5AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+CkNjOiBQZXRyaSBMYXR2YWxhIDxwZXRyaS5sYXR2YWxhQGludGVsLmNvbT4KQ2M6IFRvbWkg U2FydmVsYSA8dG9taS5wLnNhcnZlbGFAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogUGV0cmkgTGF0 dmFsYSA8cGV0cmkubGF0dmFsYUBpbnRlbC5jb20+Ci0tLQogbGliL01ha2VmaWxlLnNvdXJjZXMg fCAgMiArKwogbGliL2lndF9jb3JlLmMgICAgICAgfCAyMyArKysrKysrKysrKysrKysrKysrKysr KwogbGliL2lndF9jb3JlLmggICAgICAgfCAgMSArCiBsaWIvaWd0X3N5c3JxLmMgICAgICB8IDI3 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKwogbGliL2lndF9zeXNycS5oICAgICAgfCAzMCAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGxpYi9tZXNvbi5idWlsZCAgICAgIHwgIDEg KwogdGVzdHMvcGVyZl9wbXUuYyAgICAgfCAzOCArKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLQogNyBmaWxlcyBjaGFuZ2VkLCAxMTUgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlv bnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBsaWIvaWd0X3N5c3JxLmMKIGNyZWF0ZSBtb2RlIDEw MDY0NCBsaWIvaWd0X3N5c3JxLmgKCmRpZmYgLS1naXQgYS9saWIvTWFrZWZpbGUuc291cmNlcyBi L2xpYi9NYWtlZmlsZS5zb3VyY2VzCmluZGV4IDViMTNlZjg4OTZjMC4uM2QzN2VmMWQxOTg0IDEw MDY0NAotLS0gYS9saWIvTWFrZWZpbGUuc291cmNlcworKysgYi9saWIvTWFrZWZpbGUuc291cmNl cwpAQCAtMzUsNiArMzUsOCBAQCBsaWJfc291cmNlX2xpc3QgPQkgCVwKIAlpZ3Rfc3RhdHMuaAkJ XAogCWlndF9zeXNmcy5jCQlcCiAJaWd0X3N5c2ZzLmgJCVwKKwlpZ3Rfc3lzcnEuYwkJXAorCWln dF9zeXNycS5oCQlcCiAJaWd0X3g4Ni5oCQlcCiAJaWd0X3g4Ni5jCQlcCiAJaWd0X3ZnZW0uYwkJ XApkaWZmIC0tZ2l0IGEvbGliL2lndF9jb3JlLmMgYi9saWIvaWd0X2NvcmUuYwppbmRleCBjMjky MzQzZGUwOWUuLjQ2Mjg1YWMzMjQzMiAxMDA2NDQKLS0tIGEvbGliL2lndF9jb3JlLmMKKysrIGIv bGliL2lndF9jb3JlLmMKQEAgLTcwLDYgKzcwLDcgQEAKICNpbmNsdWRlICJpZ3RfY29yZS5oIgog I2luY2x1ZGUgImlndF9hdXguaCIKICNpbmNsdWRlICJpZ3Rfc3lzZnMuaCIKKyNpbmNsdWRlICJp Z3Rfc3lzcnEuaCIKICNpbmNsdWRlICJpZ3RfcmMuaCIKIAogI2RlZmluZSBVTldfTE9DQUxfT05M WQpAQCAtMTEzNiw2ICsxMTM3LDI4IEBAIHZvaWQgaWd0X2ZhaWwoaW50IGV4aXRjb2RlKQogCX0K IH0KIAorLyoqCisgKiBpZ3RfZmF0YWxfZXJyb3I6IFN0b3AgdGVzdCBleGVjdXRpb24gb24gZmF0 YWwgZXJyb3JzCisgKgorICogU3RvcCB0ZXN0IGV4ZWN1dGlvbiBvciBvcHRpb25hbGx5LCBpZiB0 aGUgSUdUX1JFQk9PVF9PTl9GQVRBTF9FUlJPUgorICogZW52aXJvbm1lbnQgdmFyaWFibGUgaXMg c2V0LCByZWJvb3QgdGhlIG1hY2hpbmUuCisgKgorICogU2luY2Ugb3V0IHRlc3QgcnVubmVyIChw aWdsaXQpIGRvZXMgc3VwcG9ydCBmYXRhbCB0ZXN0IGV4aXQgY29kZXMsIHdlCisgKiBpbXBsZW1l bnQgdGhlIGRlZmF1bHQgYmVoYXZpb3VyIGJ5IHdhaXRpbmcgZW5kbGVzc2x5LgorICovCit2b2lk ICBfX2F0dHJpYnV0ZV9fKChub3JldHVybikpIGlndF9mYXRhbF9lcnJvcih2b2lkKQoreworCWlm IChpZ3RfY2hlY2tfYm9vbGVhbl9lbnZfdmFyKCJJR1RfUkVCT09UX09OX0ZBVEFMX0VSUk9SIiwg ZmFsc2UpKSB7CisJCWlndF93YXJuKCJGQVRBTCBFUlJPUiAtIFJFQk9PVElORyIpOworCQlpZ3Rf c3lzcnFfcmVib290KCk7CisJfSBlbHNlIHsKKwkJaWd0X3dhcm4oIkZBVEFMIEVSUk9SIik7CisJ CWZvciAoOzspCisJCQlwYXVzZSgpOworCX0KK30KKworCiAvKioKICAqIGlndF9jYW5fZmFpbDoK ICAqCmRpZmYgLS1naXQgYS9saWIvaWd0X2NvcmUuaCBiL2xpYi9pZ3RfY29yZS5oCmluZGV4IDdh ZjJiNGMxMDlmZS4uNjY1MjNhMjA4YzMxIDEwMDY0NAotLS0gYS9saWIvaWd0X2NvcmUuaAorKysg Yi9saWIvaWd0X2NvcmUuaApAQCAtMzExLDYgKzMxMSw3IEBAIHZvaWQgX19pZ3RfZmFpbF9hc3Nl cnQoY29uc3QgY2hhciAqZG9tYWluLCBjb25zdCBjaGFyICpmaWxlLAogCQkgICAgICAgY29uc3Qg Y2hhciAqZm9ybWF0LCAuLi4pCiAJX19hdHRyaWJ1dGVfXygobm9yZXR1cm4pKTsKIHZvaWQgaWd0 X2V4aXQodm9pZCkgX19hdHRyaWJ1dGVfXygobm9yZXR1cm4pKTsKK3ZvaWQgaWd0X2ZhdGFsX2Vy cm9yKHZvaWQpIF9fYXR0cmlidXRlX18oKG5vcmV0dXJuKSk7CiAKIC8qKgogICogaWd0X2lnbm9y ZV93YXJuOgpkaWZmIC0tZ2l0IGEvbGliL2lndF9zeXNycS5jIGIvbGliL2lndF9zeXNycS5jCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uM2JkYTMyMWY3YzViCi0tLSAv ZGV2L251bGwKKysrIGIvbGliL2lndF9zeXNycS5jCkBAIC0wLDAgKzEsMjcgQEAKKyNpbmNsdWRl IDx1bmlzdGQuaD4KKyNpbmNsdWRlIDxmY250bC5oPgorI2luY2x1ZGUgPHN0ZGxpYi5oPgorI2lu Y2x1ZGUgPHN5cy9yZWJvb3QuaD4KKworI2luY2x1ZGUgImlndF9jb3JlLmgiCisKKyNpbmNsdWRl ICJpZ3Rfc3lzcnEuaCIKKworLyoqCisgKiBpZ3Rfc3lzcnFfcmVib290OiBSZWJvb3RzIHRoZSBt YWNoaW5lCisgKgorICogU3luY3MgZmlsZXN5c3RlbXMgYW5kIGltbWVkaWF0ZWx5IHJlYm9vdHMg dGhlIG1hY2hpbmUuCisgKi8KK3ZvaWQgaWd0X3N5c3JxX3JlYm9vdCh2b2lkKQoreworCXN5bmMo KTsKKworCS8qIFRyeSB0byBiZSBuaWNlIGF0IGZpcnN0LCBhbmQgaWYgdGhhdCBmYWlscyBwdWxs IHRoZSB0cmlnZ2VyICovCisJaWYgKHJlYm9vdChSQl9BVVRPQk9PVCkpIHsKKwkJaW50IGZkID0g b3BlbigiL3Byb2Mvc3lzcnEtdHJpZ2dlciIsIE9fV1JPTkxZKTsKKwkJaWd0X2lnbm9yZV93YXJu KHdyaXRlKGZkLCAiYiIsIDIpKTsKKwkJY2xvc2UoZmQpOworCX0KKworCWFib3J0KCk7Cit9CmRp ZmYgLS1naXQgYS9saWIvaWd0X3N5c3JxLmggYi9saWIvaWd0X3N5c3JxLmgKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi40MjI0NzNkMmE0ODAKLS0tIC9kZXYvbnVsbAor KysgYi9saWIvaWd0X3N5c3JxLmgKQEAgLTAsMCArMSwzMCBAQAorLyoKKyAqIENvcHlyaWdodCDC qSAyMDE4IEludGVsIENvcnBvcmF0aW9uCisgKgorICogUGVybWlzc2lvbiBpcyBoZXJlYnkgZ3Jh bnRlZCwgZnJlZSBvZiBjaGFyZ2UsIHRvIGFueSBwZXJzb24gb2J0YWluaW5nIGEKKyAqIGNvcHkg b2YgdGhpcyBzb2Z0d2FyZSBhbmQgYXNzb2NpYXRlZCBkb2N1bWVudGF0aW9uIGZpbGVzICh0aGUg IlNvZnR3YXJlIiksCisgKiB0byBkZWFsIGluIHRoZSBTb2Z0d2FyZSB3aXRob3V0IHJlc3RyaWN0 aW9uLCBpbmNsdWRpbmcgd2l0aG91dCBsaW1pdGF0aW9uCisgKiB0aGUgcmlnaHRzIHRvIHVzZSwg Y29weSwgbW9kaWZ5LCBtZXJnZSwgcHVibGlzaCwgZGlzdHJpYnV0ZSwgc3VibGljZW5zZSwKKyAq IGFuZC9vciBzZWxsIGNvcGllcyBvZiB0aGUgU29mdHdhcmUsIGFuZCB0byBwZXJtaXQgcGVyc29u cyB0byB3aG9tIHRoZQorICogU29mdHdhcmUgaXMgZnVybmlzaGVkIHRvIGRvIHNvLCBzdWJqZWN0 IHRvIHRoZSBmb2xsb3dpbmcgY29uZGl0aW9uczoKKyAqCisgKiBUaGUgYWJvdmUgY29weXJpZ2h0 IG5vdGljZSBhbmQgdGhpcyBwZXJtaXNzaW9uIG5vdGljZSAoaW5jbHVkaW5nIHRoZSBuZXh0Cisg KiBwYXJhZ3JhcGgpIHNoYWxsIGJlIGluY2x1ZGVkIGluIGFsbCBjb3BpZXMgb3Igc3Vic3RhbnRp YWwgcG9ydGlvbnMgb2YgdGhlCisgKiBTb2Z0d2FyZS4KKyAqCisgKiBUSEUgU09GVFdBUkUgSVMg UFJPVklERUQgIkFTIElTIiwgV0lUSE9VVCBXQVJSQU5UWSBPRiBBTlkgS0lORCwgRVhQUkVTUyBP UgorICogSU1QTElFRCwgSU5DTFVESU5HIEJVVCBOT1QgTElNSVRFRCBUTyBUSEUgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFksCisgKiBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9T RSBBTkQgTk9OSU5GUklOR0VNRU5ULiAgSU4gTk8gRVZFTlQgU0hBTEwKKyAqIFRIRSBBVVRIT1JT IE9SIENPUFlSSUdIVCBIT0xERVJTIEJFIExJQUJMRSBGT1IgQU5ZIENMQUlNLCBEQU1BR0VTIE9S IE9USEVSCisgKiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQU4gQUNUSU9OIE9GIENPTlRSQUNULCBU T1JUIE9SIE9USEVSV0lTRSwgQVJJU0lORworICogRlJPTSwgT1VUIE9GIE9SIElOIENPTk5FQ1RJ T04gV0lUSCBUSEUgU09GVFdBUkUgT1IgVEhFIFVTRSBPUiBPVEhFUiBERUFMSU5HUworICogSU4g VEhFIFNPRlRXQVJFLgorICoKKyAqLworCisjaWZuZGVmIF9fSUdUX1NZU1JRX0hfXworI2RlZmlu ZSBfX0lHVF9TWVNSUV9IX18KKwordm9pZCBpZ3Rfc3lzcnFfcmVib290KHZvaWQpIF9fYXR0cmli dXRlX18oKG5vcmV0dXJuKSk7CisKKyNlbmRpZiAvKiBfX0lHVF9TWVNSUV9IX18gKi8KZGlmZiAt LWdpdCBhL2xpYi9tZXNvbi5idWlsZCBiL2xpYi9tZXNvbi5idWlsZAppbmRleCBhOWU1MzY4OWIz NWQuLmIzYjhiMTRhM2YwMSAxMDA2NDQKLS0tIGEvbGliL21lc29uLmJ1aWxkCisrKyBiL2xpYi9t ZXNvbi5idWlsZApAQCAtMTQsNiArMTQsNyBAQCBsaWJfc291cmNlcyA9IFsKIAknaWd0X3N0YXRz LmMnLAogCSdpZ3Rfc3luY29iai5jJywKIAknaWd0X3N5c2ZzLmMnLAorCSdpZ3Rfc3lzcnEuYycs CiAJJ2lndF92Z2VtLmMnLAogCSdpZ3RfeDg2LmMnLAogCSdpbnN0ZG9uZS5jJywKZGlmZiAtLWdp dCBhL3Rlc3RzL3BlcmZfcG11LmMgYi90ZXN0cy9wZXJmX3BtdS5jCmluZGV4IDNiYmIxOGQyZjIx Ni4uODdlN2U3ODJkMDVlIDEwMDY0NAotLS0gYS90ZXN0cy9wZXJmX3BtdS5jCisrKyBiL3Rlc3Rz L3BlcmZfcG11LmMKQEAgLTk2NSw2ICs5NjUsNyBAQCBzdGF0aWMgdm9pZCBjcHVfaG90cGx1Zyhp bnQgZ2VtX2ZkKQogCWludCBsaW5rWzJdOwogCWludCBmZCwgcmV0OwogCWludCBjdXIgPSAwOwor CWNoYXIgYnVmOwogCiAJaWd0X3NraXBfb24oSVNfQlJPWFRPTihpbnRlbF9nZXRfZHJtX2Rldmlk KGdlbV9mZCkpKTsKIAlpZ3RfcmVxdWlyZShjcHUwX2hvdHBsdWdfc3VwcG9ydCgpKTsKQEAgLTEw MTEsOSArMTAxMiwzMiBAQCBzdGF0aWMgdm9pZCBjcHVfaG90cGx1ZyhpbnQgZ2VtX2ZkKQogCQkJ fQogCiAJCQkvKiBPZmZsaW5lIGZvbGxvd2VkIGJ5IG9ubGluZSBhIENQVS4gKi8KLQkJCWlndF9h c3NlcnRfZXEod3JpdGUoY3B1ZmQsICIwIiwgMiksIDIpOworCisJCQlyZXQgPSB3cml0ZShjcHVm ZCwgIjAiLCAyKTsKKwkJCWlmIChyZXQgPCAwKSB7CisJCQkJLyoKKwkJCQkgKiBJZiB3ZSBmYWls ZWQgdG8gb2ZmbGluZSBhIENQVSB3ZSBkb24ndCB3YW50CisJCQkJICogdG8gcHJvY2VlZC4KKwkJ CQkgKi8KKwkJCQlpZ3Rfd2FybigiRmFpbGVkIHRvIG9mZmxpbmUgY3B1JXUhICglZClcbiIsCisJ CQkJCSBjcHUsIGVycm5vKTsKKwkJCQlpZ3RfYXNzZXJ0X2VxKHdyaXRlKGxpbmtbMV0sICJzIiwg MSksIDEpOworCQkJCWJyZWFrOworCQkJfQorCiAJCQl1c2xlZXAoMWU2KTsKLQkJCWlndF9hc3Nl cnRfZXEod3JpdGUoY3B1ZmQsICIxIiwgMiksIDIpOworCisJCQlyZXQgPSB3cml0ZShjcHVmZCwg IjEiLCAyKTsKKwkJCWlmIChyZXQgPCAwKSB7CisJCQkJLyoKKwkJCQkgKiBGYWlsZWQgdG8gYnJp bmcgYSBDUFUgYmFjayBvbmxpbmUgaXMgZmF0YWwKKwkJCQkgKiBmb3IgdGhlIHNhbml0eSBvZiBh IHRlc3QgcnVuIHNvIHN0b3AgZnVydGhlcgorCQkJCSAqIHRlc3RpbmcuCisJCQkJICovCisJCQkJ aWd0X3dhcm4oIkZhaWxlZCB0byBvbmxpbmUgY3B1JXUhICglZClcbiIsCisJCQkJCSBjcHUsIGVy cm5vKTsKKwkJCQlpZ3RfZmF0YWxfZXJyb3IoKTsKKwkJCX0KIAogCQkJY2xvc2UoY3B1ZmQpOwog CQkJY3B1Kys7CkBAIC0xMDI3LDE1ICsxMDUxLDEyIEBAIHN0YXRpYyB2b2lkIGNwdV9ob3RwbHVn KGludCBnZW1fZmQpCiAJICogdW50aWwgdGhlIENQVSBjb3JlIHNodWZmbGVyIGZpbmlzaGVzIG9u ZSBsb29wLgogCSAqLwogCWZvciAoOzspIHsKLQkJY2hhciBidWY7Ci0JCWludCByZXQyOwotCiAJ CXVzbGVlcCg1MDBlMyk7CiAJCWVuZF9zcGluKGdlbV9mZCwgc3BpbltjdXJdLCAwKTsKIAogCQkv KiBDaGVjayBpZiB0aGUgY2hpbGQgaXMgc2lnbmFsaW5nIGNvbXBsZXRpb24uICovCi0JCXJldDIg PSByZWFkKGxpbmtbMF0sICZidWYsIDEpOwotCQlpZiAoIHJldDIgPT0gMSB8fCAocmV0MiA8IDAg JiYgZXJybm8gIT0gRUFHQUlOKSkKKwkJcmV0ID0gcmVhZChsaW5rWzBdLCAmYnVmLCAxKTsKKwkJ aWYgKCByZXQgPT0gMSB8fCAocmV0IDwgMCAmJiBlcnJubyAhPSBFQUdBSU4pKQogCQkJYnJlYWs7 CiAKIAkJaWd0X3NwaW5fYmF0Y2hfZnJlZShnZW1fZmQsIHNwaW5bY3VyXSk7CkBAIC0xMDU0LDYg KzEwNzUsOSBAQCBzdGF0aWMgdm9pZCBjcHVfaG90cGx1ZyhpbnQgZ2VtX2ZkKQogCWNsb3NlKGZk KTsKIAljbG9zZShsaW5rWzBdKTsKIAorCS8qIFNraXAgaWYgY2hpbGQgc2lnbmFscyBhIHByb2Js ZW0gd2l0aCBvZmZsaW5pbmcgYSBDUFUuICovCisJaWd0X3NraXBfb24oYnVmID09ICdzJyk7CisK IAlhc3NlcnRfd2l0aGluX2Vwc2lsb24odmFsLCB0c1sxXSAtIHRzWzBdLCB0b2xlcmFuY2UpOwog fQogCi0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=