From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF7496E817 for ; Fri, 19 Jul 2019 12:02:01 +0000 (UTC) From: Arkadiusz Hiler Date: Fri, 19 Jul 2019 15:01:52 +0300 Message-Id: <20190719120152.31193-1-arkadiusz.hiler@intel.com> In-Reply-To: <20190709122345.29180-3-arkadiusz.hiler@intel.com> References: <20190709122345.29180-3-arkadiusz.hiler@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH v2 i-g-t 3/3] runner: Make sure that we are closing watchdogs on signals List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Petri Latvala List-ID: VGhlcmUgYXJlIGZldyBzaG9ydCB3aW5kb3dzIG9mIG9wcG9ydHVuaXR5IHdoZW4gd2F0Y2hkb2dz IGFyZSBwcmltZWQgYnV0CnRoZXJlIGlzIG5vIHNpZ25hbCBoYW5kbGluZyBpbiBwbGFjZSwgc28g dGhlIHByb2Nlc3MgbWF5IGV4aXQgd2l0aG91dApwcm9wZXIgc2h1dGRvd24gc2VxdWVuY2UuCgpU aGlzIHBhdGNoIHJlYXJyYW5nZXMgdGhlIGV4aXN0aW5nIGNvZGUgc28gdGhhdCB3ZSBzZXQgdXAg dGhlIHNpZ25hbGZkCmFuZCBCTE9DSyB0aGUgc2lnbmFscyBiZWZvcmUgc2V0dGluZyB1cCB3YXRj aGRvZ3MgYW5kIFVOQkxPQ0sgb25seSBhZnRlcgp0aGUgd2F0Y2hkb2dzIGFyZSBjbG9zZWQgcHJv cGVybHkuCgpJZiBpZ3RfcnVubmVyIGV4aXRzIGR1ZSB0byBzaWduYWwsIG5vbi16ZXJvIHN0YXR1 cyBjb2RlIGlzIHJldHVybmVkLgoKdjI6IG1vcmUgZXJyb3IgaGFuZGxpbmcgYW5kIG1pbm9yIHRv dWNoIHVwcyAoU2ltb24pCgpDYzogUGV0cmkgTGF0dmFsYSA8cGV0cmkubGF0dmFsYUBpbnRlbC5j b20+CkNjOiBTaW1vbiBTZXIgPHNpbW9uLnNlckBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFy a2FkaXVzeiBIaWxlciA8YXJrYWRpdXN6LmhpbGVyQGludGVsLmNvbT4KLS0tCgogZGVsdGEgd2l0 aCB2MTogaHR0cHM6Ly9oaWxlci5ldS9wLzlkNzlmNzMwLnR4dAoKIHJ1bm5lci9leGVjdXRvci5j IHwgMTA3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA4MCBpbnNlcnRpb25zKCspLCAyNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9ydW5uZXIvZXhlY3V0b3IuYyBiL3J1bm5lci9leGVjdXRvci5jCmluZGV4IDY0NjNhYjk2 Li41MmZlZTdkMSAxMDA2NDQKLS0tIGEvcnVubmVyL2V4ZWN1dG9yLmMKKysrIGIvcnVubmVyL2V4 ZWN1dG9yLmMKQEAgLTcsNiArNyw3IEBACiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAjaW5jbHVkZSA8 c3lzL2lvY3RsLmg+CiAjaW5jbHVkZSA8c3lzL3NlbGVjdC5oPgorI2luY2x1ZGUgPHN5cy9wb2xs Lmg+CiAjaW5jbHVkZSA8c3lzL3NpZ25hbGZkLmg+CiAjaW5jbHVkZSA8c3lzL3N0YXQuaD4KICNp bmNsdWRlIDxzeXMvdGltZS5oPgpAQCAtNjA0LDcgKzYwNSw2IEBAIHN0YXRpYyBpbnQgbW9uaXRv cl9vdXRwdXQocGlkX3QgY2hpbGQsCiAJCQkJY2xvc2Uob3V0ZmQpOwogCQkJCWNsb3NlKGVycmZk KTsKIAkJCQljbG9zZShrbXNnZmQpOwotCQkJCWNsb3NlKHNpZ2ZkKTsKIAkJCQlyZXR1cm4gLTE7 CiAJCQl9CiAKQEAgLTc3Niw5ICs3NzYsOCBAQCBzdGF0aWMgaW50IG1vbml0b3Jfb3V0cHV0KHBp ZF90IGNoaWxkLAogCQkJCQkqdGltZV9zcGVudCA9IHRpbWU7CiAJCQl9CiAKLQkJCWNsb3NlKHNp Z2ZkKTsKLQkJCXNpZ2ZkID0gLTE7CiAJCQljaGlsZCA9IDA7CisJCQlzaWdmZCA9IC0xOyAvKiB3 ZSBhcmUgZHlpbmcsIG5vIHNpZ25hbCBoYW5kbGluZyBmb3Igbm93ICovCiAJCX0KIAl9CiAKQEAg LTc5MCw3ICs3ODksNiBAQCBzdGF0aWMgaW50IG1vbml0b3Jfb3V0cHV0KHBpZF90IGNoaWxkLAog CWNsb3NlKG91dGZkKTsKIAljbG9zZShlcnJmZCk7CiAJY2xvc2Uoa21zZ2ZkKTsKLQljbG9zZShz aWdmZCk7CiAKIAlpZiAoYWJvcnRpbmcpCiAJCXJldHVybiAtMTsKQEAgLTkwOCwxMyArOTA2LDEy IEBAIHN0YXRpYyBpbnQgZXhlY3V0ZV9uZXh0X2VudHJ5KHN0cnVjdCBleGVjdXRlX3N0YXRlICpz dGF0ZSwKIAkJCSAgICAgIGRvdWJsZSAqdGltZV9zcGVudCwKIAkJCSAgICAgIHN0cnVjdCBzZXR0 aW5ncyAqc2V0dGluZ3MsCiAJCQkgICAgICBzdHJ1Y3Qgam9iX2xpc3RfZW50cnkgKmVudHJ5LAot CQkJICAgICAgaW50IHRlc3RkaXJmZCwgaW50IHJlc2RpcmZkKQorCQkJICAgICAgaW50IHRlc3Rk aXJmZCwgaW50IHJlc2RpcmZkLAorCQkJICAgICAgaW50IHNpZ2ZkLCBzaWdzZXRfdCAqc2lnbWFz aykKIHsKIAlpbnQgZGlyZmQ7CiAJaW50IG91dHB1dHNbX0ZfTEFTVF07CiAJaW50IGttc2dmZDsK LQlpbnQgc2lnZmQ7Ci0Jc2lnc2V0X3QgbWFzazsKIAlpbnQgb3V0cGlwZVsyXSA9IHsgLTEsIC0x IH07CiAJaW50IGVycnBpcGVbMl0gPSB7IC0xLCAtMSB9OwogCWludCBvdXRmZCwgZXJyZmQ7CkBA IC05NTQsMjEgKzk1MSw2IEBAIHN0YXRpYyBpbnQgZXhlY3V0ZV9uZXh0X2VudHJ5KHN0cnVjdCBl eGVjdXRlX3N0YXRlICpzdGF0ZSwKIAkJbHNlZWsoa21zZ2ZkLCAwLCBTRUVLX0VORCk7CiAJfQog Ci0Jc2lnZW1wdHlzZXQoJm1hc2spOwotCXNpZ2FkZHNldCgmbWFzaywgU0lHQ0hMRCk7Ci0Jc2ln YWRkc2V0KCZtYXNrLCBTSUdJTlQpOwotCXNpZ2FkZHNldCgmbWFzaywgU0lHVEVSTSk7Ci0Jc2ln YWRkc2V0KCZtYXNrLCBTSUdRVUlUKTsKLQlzaWdhZGRzZXQoJm1hc2ssIFNJR0hVUCk7Ci0Jc2ln cHJvY21hc2soU0lHX0JMT0NLLCAmbWFzaywgTlVMTCk7Ci0Jc2lnZmQgPSBzaWduYWxmZCgtMSwg Jm1hc2ssIE9fQ0xPRVhFQyk7Ci0KLQlpZiAoc2lnZmQgPCAwKSB7Ci0JCS8qIFRPRE86IEhhbmRs ZSBiZXR0ZXIgKi8KLQkJZnByaW50ZihzdGRlcnIsICJDYW5ub3QgbW9uaXRvciBjaGlsZCBwcm9j ZXNzIHdpdGggc2lnbmFsZmRcbiIpOwotCQlyZXN1bHQgPSAtMTsKLQkJZ290byBvdXRfa21zZ2Zk OwotCX0KIAogCWlmIChzZXR0aW5ncy0+bG9nX2xldmVsID49IExPR19MRVZFTF9OT1JNQUwpIHsK IAkJY2hhciAqZGlzcGxheW5hbWU7CkBAIC0xMDAyLDcgKzk4NCw3IEBAIHN0YXRpYyBpbnQgZXhl Y3V0ZV9uZXh0X2VudHJ5KHN0cnVjdCBleGVjdXRlX3N0YXRlICpzdGF0ZSwKIAkJY2xvc2Uob3V0 cGlwZVswXSk7CiAJCWNsb3NlKGVycnBpcGVbMF0pOwogCi0JCXNpZ3Byb2NtYXNrKFNJR19VTkJM T0NLLCAmbWFzaywgTlVMTCk7CisJCXNpZ3Byb2NtYXNrKFNJR19VTkJMT0NLLCBzaWdtYXNrLCBO VUxMKTsKIAogCQlzZXRlbnYoIklHVF9TRU5USU5FTF9PTl9TVERFUlIiLCAiMSIsIDEpOwogCkBA IC0xMjYxLDEyICsxMjQzLDQ4IEBAIHN0YXRpYyB2b2lkIG9vbV9pbW1vcnRhbCh2b2lkKQogCWNs b3NlKGZkKTsKIH0KIAorc3RhdGljIGJvb2wgc2hvdWxkX2RpZV9iZWNhdXNlX3NpZ25hbChpbnQg c2lnZmQpCit7CisJc3RydWN0IHNpZ25hbGZkX3NpZ2luZm8gc2lnaW5mbzsKKwlpbnQgcmV0Owor CXN0cnVjdCBwb2xsZmQgc2lncG9sbCA9IHsgLmZkID0gc2lnZmQsIC5ldmVudHMgPSBQT0xMSU4g fCBQT0xMUkRCQU5EIH07CisKKwlyZXQgPSBwb2xsKCZzaWdwb2xsLCAxLCAwKTsKKworCWlmIChy ZXQgIT0gMCkgeworCQlpZiAocmV0ID09IC0xKSB7CisJCQlmcHJpbnRmKHN0ZGVyciwgIlBvbGwg b24gc2lnbmFsZmQgZmFpbGVkIHdpdGggJXNcbiIsIHN0cmVycm9yKGVycm5vKSk7CisJCQlyZXR1 cm4gdHJ1ZTsgLyogc29tZXRoaW5nIGlzIHdyb25nLCBsZXQncyBkaWUgKi8KKwkJfQorCisJCXJl dCA9IHJlYWQoc2lnZmQsICZzaWdpbmZvLCBzaXplb2Yoc2lnaW5mbykpOworCisJCWlmIChyZXQg PT0gLTEpIHsKKwkJCWZwcmludGYoc3RkZXJyLCAiRXJyb3IgcmVhZGluZyBmcm9tIHNpZ25hbGZk OiAlc1xuIiwgc3RyZXJyb3IoZXJybm8pKTsKKwkJCXJldHVybiBmYWxzZTsgLyogd2UgbWF5IHdh bnQgdG8gcmV0cnkgbGF0ZXIgKi8KKwkJfQorCisJCWlmIChzaWdpbmZvLnNzaV9zaWdubyA9PSBT SUdDSExEKSB7CisJCQlmcHJpbnRmKHN0ZGVyciwgIlJ1bm5lciBnb3Qgc3RyYXkgU0lHQ0hMRCB3 aGlsZSBub3QgZXhlY3V0aW5nIGFueSB0ZXN0cy5cbiIpOworCQl9IGVsc2UgeworCQkJZnByaW50 ZihzdGRlcnIsICJSdW5uZXIgaXMgYmVpbmcga2lsbGVkIGJ5ICVzXG4iLAorCQkJCXN0cnNpZ25h bChzaWdpbmZvLnNzaV9zaWdubykpOworCQkJcmV0dXJuIHRydWU7CisJCX0KKworCX0KKworCXJl dHVybiBmYWxzZTsKK30KKwogYm9vbCBleGVjdXRlKHN0cnVjdCBleGVjdXRlX3N0YXRlICpzdGF0 ZSwKIAkgICAgIHN0cnVjdCBzZXR0aW5ncyAqc2V0dGluZ3MsCiAJICAgICBzdHJ1Y3Qgam9iX2xp c3QgKmpvYl9saXN0KQogewogCXN0cnVjdCB1dHNuYW1lIHVuYW1lYnVmOwogCWludCByZXNkaXJm ZCwgdGVzdGRpcmZkLCB1bmFtZWZkLCB0aW1lZmQ7CisJc2lnc2V0X3Qgc2lnbWFzazsKKwlpbnQg c2lnZmQ7CiAJZG91YmxlIHRpbWVfc3BlbnQgPSAwLjA7CiAJYm9vbCBzdGF0dXMgPSB0cnVlOwog CkBAIC0xMzEwLDYgKzEzMjgsMjIgQEAgYm9vbCBleGVjdXRlKHN0cnVjdCBleGVjdXRlX3N0YXRl ICpzdGF0ZSwKIAogCW9vbV9pbW1vcnRhbCgpOwogCisJc2lnZW1wdHlzZXQoJnNpZ21hc2spOwor CXNpZ2FkZHNldCgmc2lnbWFzaywgU0lHQ0hMRCk7CisJc2lnYWRkc2V0KCZzaWdtYXNrLCBTSUdJ TlQpOworCXNpZ2FkZHNldCgmc2lnbWFzaywgU0lHVEVSTSk7CisJc2lnYWRkc2V0KCZzaWdtYXNr LCBTSUdRVUlUKTsKKwlzaWdhZGRzZXQoJnNpZ21hc2ssIFNJR0hVUCk7CisJc2lnZmQgPSBzaWdu YWxmZCgtMSwgJnNpZ21hc2ssIE9fQ0xPRVhFQyk7CisJc2lncHJvY21hc2soU0lHX0JMT0NLLCAm c2lnbWFzaywgTlVMTCk7CisKKwlpZiAoc2lnZmQgPCAwKSB7CisJCS8qIFRPRE86IEhhbmRsZSBi ZXR0ZXIgKi8KKwkJZnByaW50ZihzdGRlcnIsICJDYW5ub3QgbWFzayBzaWduYWxzXG4iKTsKKwkJ c3RhdHVzID0gZmFsc2U7CisJCWdvdG8gZW5kOworCX0KKwogCWluaXRfd2F0Y2hkb2dzKHNldHRp bmdzKTsKIAogCWlmICghdW5hbWUoJnVuYW1lYnVmKSkgewpAQCAtMTM0NSwxMiArMTM3OSwxOCBA QCBib29sIGV4ZWN1dGUoc3RydWN0IGV4ZWN1dGVfc3RhdGUgKnN0YXRlLAogCQljaGFyICpyZWFz b247CiAJCWludCByZXN1bHQ7CiAKKwkJaWYgKHNob3VsZF9kaWVfYmVjYXVzZV9zaWduYWwoc2ln ZmQpKSB7CisJCQlzdGF0dXMgPSBmYWxzZTsKKwkJCWdvdG8gZW5kOworCQl9CisKIAkJcmVzdWx0 ID0gZXhlY3V0ZV9uZXh0X2VudHJ5KHN0YXRlLAogCQkJCQkgICAgam9iX2xpc3QtPnNpemUsCiAJ CQkJCSAgICAmdGltZV9zcGVudCwKIAkJCQkJICAgIHNldHRpbmdzLAogCQkJCQkgICAgJmpvYl9s aXN0LT5lbnRyaWVzW3N0YXRlLT5uZXh0XSwKLQkJCQkJICAgIHRlc3RkaXJmZCwgcmVzZGlyZmQp OworCQkJCQkgICAgdGVzdGRpcmZkLCByZXNkaXJmZCwKKwkJCQkJICAgIHNpZ2ZkLCAmc2lnbWFz ayk7CiAKIAkJaWYgKHJlc3VsdCA8IDApIHsKIAkJCXN0YXR1cyA9IGZhbHNlOwpAQCAtMTM4Myw4 ICsxNDIzLDE1IEBAIGJvb2wgZXhlY3V0ZShzdHJ1Y3QgZXhlY3V0ZV9zdGF0ZSAqc3RhdGUsCiAJ CWlmIChyZXN1bHQgPiAwKSB7CiAJCQlkb3VibGUgdGltZV9sZWZ0ID0gc3RhdGUtPnRpbWVfbGVm dDsKIAotCQkJY2xvc2UodGVzdGRpcmZkKTsKIAkJCWNsb3NlX3dhdGNoZG9ncyhzZXR0aW5ncyk7 CisJCQlzaWdwcm9jbWFzayhTSUdfVU5CTE9DSywgJnNpZ21hc2ssIE5VTEwpOworCQkJLyogbWFr ZSBzdXJlIHRoYXQgd2UgZG8gbm90IGxlYXZlIGFueSBzaWduYWxzIHVuaGFuZGxlZCAqLworCQkJ aWYgKHNob3VsZF9kaWVfYmVjYXVzZV9zaWduYWwoc2lnZmQpKSB7CisJCQkJc3RhdHVzID0gZmFs c2U7CisJCQkJZ290byBlbmRfcG9zdF9zaWduYWxfcmVzdG9yZTsKKwkJCX0KKwkJCWNsb3NlKHNp Z2ZkKTsKKwkJCWNsb3NlKHRlc3RkaXJmZCk7CiAJCQlpbml0aWFsaXplX2V4ZWN1dGVfc3RhdGVf ZnJvbV9yZXN1bWUocmVzZGlyZmQsIHN0YXRlLCBzZXR0aW5ncywgam9iX2xpc3QpOwogCQkJc3Rh dGUtPnRpbWVfbGVmdCA9IHRpbWVfbGVmdDsKIAkJCXJldHVybiBleGVjdXRlKHN0YXRlLCBzZXR0 aW5ncywgam9iX2xpc3QpOwpAQCAtMTM5Nyw4ICsxNDQ0LDE0IEBAIGJvb2wgZXhlY3V0ZShzdHJ1 Y3QgZXhlY3V0ZV9zdGF0ZSAqc3RhdGUsCiAJfQogCiAgZW5kOgotCWNsb3NlKHRlc3RkaXJmZCk7 Ci0JY2xvc2UocmVzZGlyZmQpOwogCWNsb3NlX3dhdGNoZG9ncyhzZXR0aW5ncyk7CisJc2lncHJv Y21hc2soU0lHX1VOQkxPQ0ssICZzaWdtYXNrLCBOVUxMKTsKKwkvKiBtYWtlIHN1cmUgdGhhdCB3 ZSBkbyBub3QgbGVhdmUgYW55IHNpZ25hbHMgdW5oYW5kbGVkICovCisJaWYgKHNob3VsZF9kaWVf YmVjYXVzZV9zaWduYWwoc2lnZmQpKQorCQlzdGF0dXMgPSBmYWxzZTsKKyBlbmRfcG9zdF9zaWdu YWxfcmVzdG9yZToKKwljbG9zZShzaWdmZCk7CisJY2xvc2UodGVzdGRpcmZkKTsKKwljbG9zZShy ZXNkaXJmZCk7CiAJcmV0dXJuIHN0YXR1czsKIH0KLS0gCjIuMjEuMAoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0 LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2