From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id C9ABB89467 for ; Tue, 9 Jul 2019 12:23:58 +0000 (UTC) From: Arkadiusz Hiler Date: Tue, 9 Jul 2019 15:23:45 +0300 Message-Id: <20190709122345.29180-3-arkadiusz.hiler@intel.com> In-Reply-To: <20190709122345.29180-1-arkadiusz.hiler@intel.com> References: <20190709122345.29180-1-arkadiusz.hiler@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH 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 cyBjb2RlIGlzIHJldHVybmVkLgoKQ2M6IFBldHJpIExhdHZhbGEgPHBldHJpLmxhdHZhbGFAaW50 ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBcmthZGl1c3ogSGlsZXIgPGFya2FkaXVzei5oaWxlckBp bnRlbC5jb20+Ci0tLQogcnVubmVyL2V4ZWN1dG9yLmMgfCAxMDAgKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDczIGluc2VydGlv bnMoKyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3J1bm5lci9leGVjdXRvci5jIGIv cnVubmVyL2V4ZWN1dG9yLmMKaW5kZXggNjQ2M2FiOTYuLjYyMzAzZmY4IDEwMDY0NAotLS0gYS9y dW5uZXIvZXhlY3V0b3IuYworKysgYi9ydW5uZXIvZXhlY3V0b3IuYwpAQCAtNyw2ICs3LDcgQEAK ICNpbmNsdWRlIDxzdHJpbmcuaD4KICNpbmNsdWRlIDxzeXMvaW9jdGwuaD4KICNpbmNsdWRlIDxz eXMvc2VsZWN0Lmg+CisjaW5jbHVkZSA8c3lzL3BvbGwuaD4KICNpbmNsdWRlIDxzeXMvc2lnbmFs ZmQuaD4KICNpbmNsdWRlIDxzeXMvc3RhdC5oPgogI2luY2x1ZGUgPHN5cy90aW1lLmg+CkBAIC02 MDQsNyArNjA1LDYgQEAgc3RhdGljIGludCBtb25pdG9yX291dHB1dChwaWRfdCBjaGlsZCwKIAkJ CQljbG9zZShvdXRmZCk7CiAJCQkJY2xvc2UoZXJyZmQpOwogCQkJCWNsb3NlKGttc2dmZCk7Ci0J CQkJY2xvc2Uoc2lnZmQpOwogCQkJCXJldHVybiAtMTsKIAkJCX0KIApAQCAtNzc2LDkgKzc3Niw4 IEBAIHN0YXRpYyBpbnQgbW9uaXRvcl9vdXRwdXQocGlkX3QgY2hpbGQsCiAJCQkJCSp0aW1lX3Nw ZW50ID0gdGltZTsKIAkJCX0KIAotCQkJY2xvc2Uoc2lnZmQpOwotCQkJc2lnZmQgPSAtMTsKIAkJ CWNoaWxkID0gMDsKKwkJCXNpZ2ZkID0gLTE7IC8qIHdlIGFyZSBkeWluZywgbm8gc2lnbmFsIGhh bmRsaW5nIGZvciBub3cgKi8KIAkJfQogCX0KIApAQCAtNzkwLDcgKzc4OSw2IEBAIHN0YXRpYyBp bnQgbW9uaXRvcl9vdXRwdXQocGlkX3QgY2hpbGQsCiAJY2xvc2Uob3V0ZmQpOwogCWNsb3NlKGVy cmZkKTsKIAljbG9zZShrbXNnZmQpOwotCWNsb3NlKHNpZ2ZkKTsKIAogCWlmIChhYm9ydGluZykK IAkJcmV0dXJuIC0xOwpAQCAtOTA4LDEzICs5MDYsMTIgQEAgc3RhdGljIGludCBleGVjdXRlX25l eHRfZW50cnkoc3RydWN0IGV4ZWN1dGVfc3RhdGUgKnN0YXRlLAogCQkJICAgICAgZG91YmxlICp0 aW1lX3NwZW50LAogCQkJICAgICAgc3RydWN0IHNldHRpbmdzICpzZXR0aW5ncywKIAkJCSAgICAg IHN0cnVjdCBqb2JfbGlzdF9lbnRyeSAqZW50cnksCi0JCQkgICAgICBpbnQgdGVzdGRpcmZkLCBp bnQgcmVzZGlyZmQpCisJCQkgICAgICBpbnQgdGVzdGRpcmZkLCBpbnQgcmVzZGlyZmQsCisJCQkg ICAgICBpbnQgc2lnZmQsIHNpZ3NldF90ICpzaWdtYXNrKQogewogCWludCBkaXJmZDsKIAlpbnQg b3V0cHV0c1tfRl9MQVNUXTsKIAlpbnQga21zZ2ZkOwotCWludCBzaWdmZDsKLQlzaWdzZXRfdCBt YXNrOwogCWludCBvdXRwaXBlWzJdID0geyAtMSwgLTEgfTsKIAlpbnQgZXJycGlwZVsyXSA9IHsg LTEsIC0xIH07CiAJaW50IG91dGZkLCBlcnJmZDsKQEAgLTk1NCwyMSArOTUxLDYgQEAgc3RhdGlj IGludCBleGVjdXRlX25leHRfZW50cnkoc3RydWN0IGV4ZWN1dGVfc3RhdGUgKnN0YXRlLAogCQls c2VlayhrbXNnZmQsIDAsIFNFRUtfRU5EKTsKIAl9CiAKLQlzaWdlbXB0eXNldCgmbWFzayk7Ci0J c2lnYWRkc2V0KCZtYXNrLCBTSUdDSExEKTsKLQlzaWdhZGRzZXQoJm1hc2ssIFNJR0lOVCk7Ci0J c2lnYWRkc2V0KCZtYXNrLCBTSUdURVJNKTsKLQlzaWdhZGRzZXQoJm1hc2ssIFNJR1FVSVQpOwot CXNpZ2FkZHNldCgmbWFzaywgU0lHSFVQKTsKLQlzaWdwcm9jbWFzayhTSUdfQkxPQ0ssICZtYXNr LCBOVUxMKTsKLQlzaWdmZCA9IHNpZ25hbGZkKC0xLCAmbWFzaywgT19DTE9FWEVDKTsKLQotCWlm IChzaWdmZCA8IDApIHsKLQkJLyogVE9ETzogSGFuZGxlIGJldHRlciAqLwotCQlmcHJpbnRmKHN0 ZGVyciwgIkNhbm5vdCBtb25pdG9yIGNoaWxkIHByb2Nlc3Mgd2l0aCBzaWduYWxmZFxuIik7Ci0J CXJlc3VsdCA9IC0xOwotCQlnb3RvIG91dF9rbXNnZmQ7Ci0JfQogCiAJaWYgKHNldHRpbmdzLT5s b2dfbGV2ZWwgPj0gTE9HX0xFVkVMX05PUk1BTCkgewogCQljaGFyICpkaXNwbGF5bmFtZTsKQEAg LTEwMDIsNyArOTg0LDcgQEAgc3RhdGljIGludCBleGVjdXRlX25leHRfZW50cnkoc3RydWN0IGV4 ZWN1dGVfc3RhdGUgKnN0YXRlLAogCQljbG9zZShvdXRwaXBlWzBdKTsKIAkJY2xvc2UoZXJycGlw ZVswXSk7CiAKLQkJc2lncHJvY21hc2soU0lHX1VOQkxPQ0ssICZtYXNrLCBOVUxMKTsKKwkJc2ln cHJvY21hc2soU0lHX1VOQkxPQ0ssIHNpZ21hc2ssIE5VTEwpOwogCiAJCXNldGVudigiSUdUX1NF TlRJTkVMX09OX1NUREVSUiIsICIxIiwgMSk7CiAKQEAgLTEyNjEsMTIgKzEyNDMsNDEgQEAgc3Rh dGljIHZvaWQgb29tX2ltbW9ydGFsKHZvaWQpCiAJY2xvc2UoZmQpOwogfQogCitzdGF0aWMgYm9v bCBzaG91bGRfZGllX2JlY2F1c2Vfc2lnbmFsKGludCBzaWdmZCkKK3sKKwlzdHJ1Y3Qgc2lnbmFs ZmRfc2lnaW5mbyBzaWdpbmZvOworCWludCByZXQ7CisKKwlzdHJ1Y3QgcG9sbGZkIHNpZ3BvbGwg PSB7IC5mZCA9IHNpZ2ZkLCAuZXZlbnRzID0gUE9MTElOIHwgUE9MTFJEQkFORCB9OworCisJaWYg KChyZXQgPSBwb2xsKCZzaWdwb2xsLCAxLCAwKSkgIT0gMCkgeworCQlpZiAocmV0ID09IC0xKSB7 CisJCX0KKworCQlyZXQgPSByZWFkKHNpZ2ZkLCAmc2lnaW5mbywgc2l6ZW9mKHNpZ2luZm8pKTsK KworCQlpZiAoc2lnaW5mby5zc2lfc2lnbm8gPT0gU0lHQ0hMRCkgeworCQkJZnByaW50ZihzdGRl cnIsICJSdW5uZXIgZ290IHN0cmF5IFNJR0NITEQgd2hpbGUgbm90IGV4ZWN1dGluZyBhbnkgdGVz dHMuXG4iKTsKKworCQl9IGVsc2UgeworCQkJZnByaW50ZihzdGRlcnIsICJSdW5uZXIgaXMgYmVp bmcga2lsbGVkIGJ5ICVzXG4iLAorCQkJCXN0cnNpZ25hbChzaWdpbmZvLnNzaV9zaWdubykpOwor CQkJcmV0dXJuIHRydWU7CisJCX0KKworCX0KKworCXJldHVybiBmYWxzZTsKK30KKwogYm9vbCBl eGVjdXRlKHN0cnVjdCBleGVjdXRlX3N0YXRlICpzdGF0ZSwKIAkgICAgIHN0cnVjdCBzZXR0aW5n cyAqc2V0dGluZ3MsCiAJICAgICBzdHJ1Y3Qgam9iX2xpc3QgKmpvYl9saXN0KQogewogCXN0cnVj dCB1dHNuYW1lIHVuYW1lYnVmOwogCWludCByZXNkaXJmZCwgdGVzdGRpcmZkLCB1bmFtZWZkLCB0 aW1lZmQ7CisJc2lnc2V0X3Qgc2lnbWFzazsKKwlpbnQgc2lnZmQ7CiAJZG91YmxlIHRpbWVfc3Bl bnQgPSAwLjA7CiAJYm9vbCBzdGF0dXMgPSB0cnVlOwogCkBAIC0xMzEwLDYgKzEzMjEsMjIgQEAg Ym9vbCBleGVjdXRlKHN0cnVjdCBleGVjdXRlX3N0YXRlICpzdGF0ZSwKIAogCW9vbV9pbW1vcnRh bCgpOwogCisJc2lnZW1wdHlzZXQoJnNpZ21hc2spOworCXNpZ2FkZHNldCgmc2lnbWFzaywgU0lH Q0hMRCk7CisJc2lnYWRkc2V0KCZzaWdtYXNrLCBTSUdJTlQpOworCXNpZ2FkZHNldCgmc2lnbWFz aywgU0lHVEVSTSk7CisJc2lnYWRkc2V0KCZzaWdtYXNrLCBTSUdRVUlUKTsKKwlzaWdhZGRzZXQo JnNpZ21hc2ssIFNJR0hVUCk7CisJc2lnZmQgPSBzaWduYWxmZCgtMSwgJnNpZ21hc2ssIE9fQ0xP RVhFQyk7CisJc2lncHJvY21hc2soU0lHX0JMT0NLLCAmc2lnbWFzaywgTlVMTCk7CisKKwlpZiAo c2lnZmQgPCAwKSB7CisJCS8qIFRPRE86IEhhbmRsZSBiZXR0ZXIgKi8KKwkJZnByaW50ZihzdGRl cnIsICJDYW5ub3QgbWFzayBzaWduYWxzXG4iKTsKKwkJc3RhdHVzID0gLTE7CisJCWdvdG8gZW5k OworCX0KKwogCWluaXRfd2F0Y2hkb2dzKHNldHRpbmdzKTsKIAogCWlmICghdW5hbWUoJnVuYW1l YnVmKSkgewpAQCAtMTM0NSwxMiArMTM3MiwxOCBAQCBib29sIGV4ZWN1dGUoc3RydWN0IGV4ZWN1 dGVfc3RhdGUgKnN0YXRlLAogCQljaGFyICpyZWFzb247CiAJCWludCByZXN1bHQ7CiAKKwkJaWYg KHNob3VsZF9kaWVfYmVjYXVzZV9zaWduYWwoc2lnZmQpKSB7CisJCQlzdGF0dXMgPSBmYWxzZTsK KwkJCWdvdG8gZW5kOworCQl9CisKIAkJcmVzdWx0ID0gZXhlY3V0ZV9uZXh0X2VudHJ5KHN0YXRl LAogCQkJCQkgICAgam9iX2xpc3QtPnNpemUsCiAJCQkJCSAgICAmdGltZV9zcGVudCwKIAkJCQkJ ICAgIHNldHRpbmdzLAogCQkJCQkgICAgJmpvYl9saXN0LT5lbnRyaWVzW3N0YXRlLT5uZXh0XSwK LQkJCQkJICAgIHRlc3RkaXJmZCwgcmVzZGlyZmQpOworCQkJCQkgICAgdGVzdGRpcmZkLCByZXNk aXJmZCwKKwkJCQkJICAgIHNpZ2ZkLCAmc2lnbWFzayk7CiAKIAkJaWYgKHJlc3VsdCA8IDApIHsK IAkJCXN0YXR1cyA9IGZhbHNlOwpAQCAtMTM4Myw4ICsxNDE2LDE1IEBAIGJvb2wgZXhlY3V0ZShz dHJ1Y3QgZXhlY3V0ZV9zdGF0ZSAqc3RhdGUsCiAJCWlmIChyZXN1bHQgPiAwKSB7CiAJCQlkb3Vi bGUgdGltZV9sZWZ0ID0gc3RhdGUtPnRpbWVfbGVmdDsKIAotCQkJY2xvc2UodGVzdGRpcmZkKTsK IAkJCWNsb3NlX3dhdGNoZG9ncyhzZXR0aW5ncyk7CisJCQlzaWdwcm9jbWFzayhTSUdfVU5CTE9D SywgJnNpZ21hc2ssIE5VTEwpOworCQkJLyogbWFrZSBzdXJlIHRoYXQgd2UgZG8gbm90IGxlYXZl IGFueSBzaWduYWxzIHVuaGFuZGxlZCAqLworCQkJaWYgKHNob3VsZF9kaWVfYmVjYXVzZV9zaWdu YWwoc2lnZmQpKXsKKwkJCQlzdGF0dXMgPSBmYWxzZTsKKwkJCQlnb3RvIGVuZF9wb3N0X3NpZ25h bF9yZXN0b3JlOworCQkJfQorCQkJY2xvc2Uoc2lnZmQpOworCQkJY2xvc2UodGVzdGRpcmZkKTsK IAkJCWluaXRpYWxpemVfZXhlY3V0ZV9zdGF0ZV9mcm9tX3Jlc3VtZShyZXNkaXJmZCwgc3RhdGUs IHNldHRpbmdzLCBqb2JfbGlzdCk7CiAJCQlzdGF0ZS0+dGltZV9sZWZ0ID0gdGltZV9sZWZ0Owog CQkJcmV0dXJuIGV4ZWN1dGUoc3RhdGUsIHNldHRpbmdzLCBqb2JfbGlzdCk7CkBAIC0xMzk3LDgg KzE0MzcsMTQgQEAgYm9vbCBleGVjdXRlKHN0cnVjdCBleGVjdXRlX3N0YXRlICpzdGF0ZSwKIAl9 CiAKICBlbmQ6Ci0JY2xvc2UodGVzdGRpcmZkKTsKLQljbG9zZShyZXNkaXJmZCk7CiAJY2xvc2Vf d2F0Y2hkb2dzKHNldHRpbmdzKTsKKwlzaWdwcm9jbWFzayhTSUdfVU5CTE9DSywgJnNpZ21hc2ss IE5VTEwpOworCS8qIG1ha2Ugc3VyZSB0aGF0IHdlIGRvIG5vdCBsZWF2ZSBhbnkgc2lnbmFscyB1 bmhhbmRsZWQgKi8KKwlpZiAoc2hvdWxkX2RpZV9iZWNhdXNlX3NpZ25hbChzaWdmZCkpCisJCXN0 YXR1cyA9IGZhbHNlOworIGVuZF9wb3N0X3NpZ25hbF9yZXN0b3JlOgorCWNsb3NlKHNpZ2ZkKTsK KwljbG9zZSh0ZXN0ZGlyZmQpOworCWNsb3NlKHJlc2RpcmZkKTsKIAlyZXR1cm4gc3RhdHVzOwog fQotLSAKMi4yMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXY=