From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 2/3] drm/i915/selftests: Disable heartbeat around context barrier tests Date: Fri, 15 Nov 2019 15:08:40 +0000 Message-ID: <20191115150841.880349-2-chris@chris-wilson.co.uk> References: <20191115150841.880349-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 08E606E03B for ; Fri, 15 Nov 2019 15:08:54 +0000 (UTC) In-Reply-To: <20191115150841.880349-1-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QXMgdGhlIGhlYXJ0YmVhdCBoYXMgdGhlIGVmZmVjdCBvZiBmbHVzaGluZyBjb250ZXh0IGJhcnJp ZXJzLCB0aGlzCmludGVyZmVyZXMgd2l0aCB0aGUgY29udGV4dCBiYXJyaWVyIHRlc3RzIHRoYXQg YXJlIHRyeWluZyB0byBvYnNlcnZlCnRoZW0gZGlyZWN0bHkuIERpc2FibGUgdGhlIGhlYXJ0YmVh dCBzbyB0aGF0IHRoZSBiYXJyaWVycyBhcmUgYXMKcHJlZGljdGFibGUgYXMgdGhlIHRlc3QgZGVt YW5kcy4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9zZWxmdGVzdF9jb250ZXh0LmMgfCA0NCArKysrKysrKysr KysrKysrKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9zZWxmdGVzdF9jb250 ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9zZWxmdGVzdF9jb250ZXh0LmMKaW5kZXgg MTRiYTZjZWI5MTc3Li4zNTg2YWY2MzYzMDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2d0L3NlbGZ0ZXN0X2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9z ZWxmdGVzdF9jb250ZXh0LmMKQEAgLTUsNiArNSw3IEBACiAgKi8KIAogI2luY2x1ZGUgImk5MTVf c2VsZnRlc3QuaCIKKyNpbmNsdWRlICJpbnRlbF9lbmdpbmVfaGVhcnRiZWF0LmgiCiAjaW5jbHVk ZSAiaW50ZWxfZW5naW5lX3BtLmgiCiAjaW5jbHVkZSAiaW50ZWxfZ3QuaCIKIApAQCAtMjAwLDYg KzIwMSw3IEBAIHN0YXRpYyBpbnQgbGl2ZV9jb250ZXh0X3NpemUodm9pZCAqYXJnKQogc3RhdGlj IGludCBfX2xpdmVfYWN0aXZlX2NvbnRleHQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l LAogCQkJCSBzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqZml4bWUpCiB7CisJdW5zaWduZWQgbG9u ZyBzYXZlZF9oZWFydGJlYXQ7CiAJc3RydWN0IGludGVsX2NvbnRleHQgKmNlOwogCWludCBwYXNz OwogCWludCBlcnI7CkBAIC0yMjcsMzYgKzIyOSw1MCBAQCBzdGF0aWMgaW50IF9fbGl2ZV9hY3Rp dmVfY29udGV4dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJaWYgKElTX0VSUihj ZSkpCiAJCXJldHVybiBQVFJfRVJSKGNlKTsKIAorCXNhdmVkX2hlYXJ0YmVhdCA9IGVuZ2luZS0+ cHJvcHMuaGVhcnRiZWF0X2ludGVydmFsX21zOworCWVuZ2luZS0+cHJvcHMuaGVhcnRiZWF0X2lu dGVydmFsX21zID0gMDsKKwogCWZvciAocGFzcyA9IDA7IHBhc3MgPD0gMjsgcGFzcysrKSB7CiAJ CXN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxOwogCisJCWludGVsX2VuZ2luZV9wbV9nZXQoZW5naW5l KTsKKwogCQlycSA9IGludGVsX2NvbnRleHRfY3JlYXRlX3JlcXVlc3QoY2UpOwogCQlpZiAoSVNf RVJSKHJxKSkgewogCQkJZXJyID0gUFRSX0VSUihycSk7Ci0JCQlnb3RvIGVycjsKKwkJCWdvdG8g b3V0X2VuZ2luZTsKIAkJfQogCiAJCWVyciA9IHJlcXVlc3Rfc3luYyhycSk7CiAJCWlmIChlcnIp Ci0JCQlnb3RvIGVycjsKKwkJCWdvdG8gb3V0X2VuZ2luZTsKIAogCQkvKiBDb250ZXh0IHdpbGwg YmUga2VwdCBhY3RpdmUgdW50aWwgYWZ0ZXIgYW4gaWRsZS1iYXJyaWVyLiAqLwogCQlpZiAoaTkx NV9hY3RpdmVfaXNfaWRsZSgmY2UtPmFjdGl2ZSkpIHsKIAkJCXByX2VycigiY29udGV4dCBpcyBu b3QgYWN0aXZlOyBleHBlY3RlZCBpZGxlLWJhcnJpZXIgKCVzIHBhc3MgJWQpXG4iLAogCQkJICAg ICAgIGVuZ2luZS0+bmFtZSwgcGFzcyk7CiAJCQllcnIgPSAtRUlOVkFMOwotCQkJZ290byBlcnI7 CisJCQlnb3RvIG91dF9lbmdpbmU7CiAJCX0KIAogCQlpZiAoIWludGVsX2VuZ2luZV9wbV9pc19h d2FrZShlbmdpbmUpKSB7CiAJCQlwcl9lcnIoIiVzIGlzIGFzbGVlcCBiZWZvcmUgaWRsZS1iYXJy aWVyXG4iLAogCQkJICAgICAgIGVuZ2luZS0+bmFtZSk7CiAJCQllcnIgPSAtRUlOVkFMOwotCQkJ Z290byBlcnI7CisJCQlnb3RvIG91dF9lbmdpbmU7CiAJCX0KKworb3V0X2VuZ2luZToKKwkJaW50 ZWxfZW5naW5lX3BtX3B1dChlbmdpbmUpOworCQlpZiAoZXJyKQorCQkJZ290byBlcnI7CiAJfQog CiAJLyogTm93IG1ha2Ugc3VyZSBvdXIgaWRsZS1iYXJyaWVycyBhcmUgZmx1c2hlZCAqLworCWVy ciA9IGludGVsX2VuZ2luZV9mbHVzaF9iYXJyaWVycyhlbmdpbmUpOworCWlmIChlcnIpCisJCWdv dG8gZXJyOworCiAJZXJyID0gY29udGV4dF9zeW5jKGVuZ2luZS0+a2VybmVsX2NvbnRleHQpOwog CWlmIChlcnIpCiAJCWdvdG8gZXJyOwpAQCAtMjcwLDggKzI4Niw5IEBAIHN0YXRpYyBpbnQgX19s aXZlX2FjdGl2ZV9jb250ZXh0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJc3Ry dWN0IGRybV9wcmludGVyIHAgPSBkcm1fZGVidWdfcHJpbnRlcihfX2Z1bmNfXyk7CiAKIAkJaW50 ZWxfZW5naW5lX2R1bXAoZW5naW5lLCAmcCwKLQkJCQkgICIlcyBpcyBzdGlsbCBhd2FrZSBhZnRl ciBpZGxlLWJhcnJpZXJzXG4iLAotCQkJCSAgZW5naW5lLT5uYW1lKTsKKwkJCQkgICIlcyBpcyBz dGlsbCBhd2FrZTolZCBhZnRlciBpZGxlLWJhcnJpZXJzXG4iLAorCQkJCSAgZW5naW5lLT5uYW1l LAorCQkJCSAgYXRvbWljX3JlYWQoJmVuZ2luZS0+d2FrZXJlZi5jb3VudCkpOwogCQlHRU1fVFJB Q0VfRFVNUCgpOwogCiAJCWVyciA9IC1FSU5WQUw7CkBAIC0yNzksNiArMjk2LDcgQEAgc3RhdGlj IGludCBfX2xpdmVfYWN0aXZlX2NvbnRleHQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l LAogCX0KIAogZXJyOgorCWVuZ2luZS0+cHJvcHMuaGVhcnRiZWF0X2ludGVydmFsX21zID0gc2F2 ZWRfaGVhcnRiZWF0OwogCWludGVsX2NvbnRleHRfcHV0KGNlKTsKIAlyZXR1cm4gZXJyOwogfQpA QCAtMzQ5LDYgKzM2Nyw3IEBAIHN0YXRpYyBpbnQgX19saXZlX3JlbW90ZV9jb250ZXh0KHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJCQkgc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQg KmZpeG1lKQogewogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpsb2NhbCwgKnJlbW90ZTsKKwl1bnNp Z25lZCBsb25nIHNhdmVkX2hlYXJ0YmVhdDsKIAlpbnQgcGFzczsKIAlpbnQgZXJyOwogCkBAIC0z NjAsNiArMzc5LDEyIEBAIHN0YXRpYyBpbnQgX19saXZlX3JlbW90ZV9jb250ZXh0KHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkgKiBjbG9iYmVyIHRoZSBpZGxlLWJhcnJpZXIuCiAJ ICovCiAKKwlpZiAoaW50ZWxfZW5naW5lX3BtX2lzX2F3YWtlKGVuZ2luZSkpIHsKKwkJcHJfZXJy KCIlcyBpcyBhd2FrZSBiZWZvcmUgc3RhcnRpbmcgJXMhXG4iLAorCQkgICAgICAgZW5naW5lLT5u YW1lLCBfX2Z1bmNfXyk7CisJCXJldHVybiAtRUlOVkFMOworCX0KKwogCXJlbW90ZSA9IGludGVs X2NvbnRleHRfY3JlYXRlKGZpeG1lLCBlbmdpbmUpOwogCWlmIChJU19FUlIocmVtb3RlKSkKIAkJ cmV0dXJuIFBUUl9FUlIocmVtb3RlKTsKQEAgLTM3MCw2ICszOTUsMTAgQEAgc3RhdGljIGludCBf X2xpdmVfcmVtb3RlX2NvbnRleHQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQln b3RvIGVycl9yZW1vdGU7CiAJfQogCisJc2F2ZWRfaGVhcnRiZWF0ID0gZW5naW5lLT5wcm9wcy5o ZWFydGJlYXRfaW50ZXJ2YWxfbXM7CisJZW5naW5lLT5wcm9wcy5oZWFydGJlYXRfaW50ZXJ2YWxf bXMgPSAwOworCWludGVsX2VuZ2luZV9wbV9nZXQoZW5naW5lKTsKKwogCWZvciAocGFzcyA9IDA7 IHBhc3MgPD0gMjsgcGFzcysrKSB7CiAJCWVyciA9IF9fcmVtb3RlX3N5bmMobG9jYWwsIHJlbW90 ZSk7CiAJCWlmIChlcnIpCkBAIC0zODcsNiArNDE2LDkgQEAgc3RhdGljIGludCBfX2xpdmVfcmVt b3RlX2NvbnRleHQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQl9CiAJfQogCisJ aW50ZWxfZW5naW5lX3BtX3B1dChlbmdpbmUpOworCWVuZ2luZS0+cHJvcHMuaGVhcnRiZWF0X2lu dGVydmFsX21zID0gc2F2ZWRfaGVhcnRiZWF0OworCiAJaW50ZWxfY29udGV4dF9wdXQobG9jYWwp OwogZXJyX3JlbW90ZToKIAlpbnRlbF9jb250ZXh0X3B1dChyZW1vdGUpOwotLSAKMi4yNC4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89FB4C432C3 for ; Fri, 15 Nov 2019 15:08:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A60720733 for ; Fri, 15 Nov 2019 15:08:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A60720733 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chris-wilson.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C8DF36E7DD; Fri, 15 Nov 2019 15:08:56 +0000 (UTC) Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 08E606E03B for ; Fri, 15 Nov 2019 15:08:54 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 19214698-1500050 for multiple; Fri, 15 Nov 2019 15:08:43 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 15 Nov 2019 15:08:40 +0000 Message-Id: <20191115150841.880349-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191115150841.880349-1-chris@chris-wilson.co.uk> References: <20191115150841.880349-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/3] drm/i915/selftests: Disable heartbeat around context barrier tests X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Message-ID: <20191115150840.HbuNFTHfEGT--Yv1MtzJ6Fd8u4BYLw0oGe5HAu2kIHc@z> QXMgdGhlIGhlYXJ0YmVhdCBoYXMgdGhlIGVmZmVjdCBvZiBmbHVzaGluZyBjb250ZXh0IGJhcnJp ZXJzLCB0aGlzCmludGVyZmVyZXMgd2l0aCB0aGUgY29udGV4dCBiYXJyaWVyIHRlc3RzIHRoYXQg YXJlIHRyeWluZyB0byBvYnNlcnZlCnRoZW0gZGlyZWN0bHkuIERpc2FibGUgdGhlIGhlYXJ0YmVh dCBzbyB0aGF0IHRoZSBiYXJyaWVycyBhcmUgYXMKcHJlZGljdGFibGUgYXMgdGhlIHRlc3QgZGVt YW5kcy4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9zZWxmdGVzdF9jb250ZXh0LmMgfCA0NCArKysrKysrKysr KysrKysrKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9zZWxmdGVzdF9jb250 ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9zZWxmdGVzdF9jb250ZXh0LmMKaW5kZXgg MTRiYTZjZWI5MTc3Li4zNTg2YWY2MzYzMDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2d0L3NlbGZ0ZXN0X2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9z ZWxmdGVzdF9jb250ZXh0LmMKQEAgLTUsNiArNSw3IEBACiAgKi8KIAogI2luY2x1ZGUgImk5MTVf c2VsZnRlc3QuaCIKKyNpbmNsdWRlICJpbnRlbF9lbmdpbmVfaGVhcnRiZWF0LmgiCiAjaW5jbHVk ZSAiaW50ZWxfZW5naW5lX3BtLmgiCiAjaW5jbHVkZSAiaW50ZWxfZ3QuaCIKIApAQCAtMjAwLDYg KzIwMSw3IEBAIHN0YXRpYyBpbnQgbGl2ZV9jb250ZXh0X3NpemUodm9pZCAqYXJnKQogc3RhdGlj IGludCBfX2xpdmVfYWN0aXZlX2NvbnRleHQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l LAogCQkJCSBzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqZml4bWUpCiB7CisJdW5zaWduZWQgbG9u ZyBzYXZlZF9oZWFydGJlYXQ7CiAJc3RydWN0IGludGVsX2NvbnRleHQgKmNlOwogCWludCBwYXNz OwogCWludCBlcnI7CkBAIC0yMjcsMzYgKzIyOSw1MCBAQCBzdGF0aWMgaW50IF9fbGl2ZV9hY3Rp dmVfY29udGV4dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJaWYgKElTX0VSUihj ZSkpCiAJCXJldHVybiBQVFJfRVJSKGNlKTsKIAorCXNhdmVkX2hlYXJ0YmVhdCA9IGVuZ2luZS0+ cHJvcHMuaGVhcnRiZWF0X2ludGVydmFsX21zOworCWVuZ2luZS0+cHJvcHMuaGVhcnRiZWF0X2lu dGVydmFsX21zID0gMDsKKwogCWZvciAocGFzcyA9IDA7IHBhc3MgPD0gMjsgcGFzcysrKSB7CiAJ CXN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxOwogCisJCWludGVsX2VuZ2luZV9wbV9nZXQoZW5naW5l KTsKKwogCQlycSA9IGludGVsX2NvbnRleHRfY3JlYXRlX3JlcXVlc3QoY2UpOwogCQlpZiAoSVNf RVJSKHJxKSkgewogCQkJZXJyID0gUFRSX0VSUihycSk7Ci0JCQlnb3RvIGVycjsKKwkJCWdvdG8g b3V0X2VuZ2luZTsKIAkJfQogCiAJCWVyciA9IHJlcXVlc3Rfc3luYyhycSk7CiAJCWlmIChlcnIp Ci0JCQlnb3RvIGVycjsKKwkJCWdvdG8gb3V0X2VuZ2luZTsKIAogCQkvKiBDb250ZXh0IHdpbGwg YmUga2VwdCBhY3RpdmUgdW50aWwgYWZ0ZXIgYW4gaWRsZS1iYXJyaWVyLiAqLwogCQlpZiAoaTkx NV9hY3RpdmVfaXNfaWRsZSgmY2UtPmFjdGl2ZSkpIHsKIAkJCXByX2VycigiY29udGV4dCBpcyBu b3QgYWN0aXZlOyBleHBlY3RlZCBpZGxlLWJhcnJpZXIgKCVzIHBhc3MgJWQpXG4iLAogCQkJICAg ICAgIGVuZ2luZS0+bmFtZSwgcGFzcyk7CiAJCQllcnIgPSAtRUlOVkFMOwotCQkJZ290byBlcnI7 CisJCQlnb3RvIG91dF9lbmdpbmU7CiAJCX0KIAogCQlpZiAoIWludGVsX2VuZ2luZV9wbV9pc19h d2FrZShlbmdpbmUpKSB7CiAJCQlwcl9lcnIoIiVzIGlzIGFzbGVlcCBiZWZvcmUgaWRsZS1iYXJy aWVyXG4iLAogCQkJICAgICAgIGVuZ2luZS0+bmFtZSk7CiAJCQllcnIgPSAtRUlOVkFMOwotCQkJ Z290byBlcnI7CisJCQlnb3RvIG91dF9lbmdpbmU7CiAJCX0KKworb3V0X2VuZ2luZToKKwkJaW50 ZWxfZW5naW5lX3BtX3B1dChlbmdpbmUpOworCQlpZiAoZXJyKQorCQkJZ290byBlcnI7CiAJfQog CiAJLyogTm93IG1ha2Ugc3VyZSBvdXIgaWRsZS1iYXJyaWVycyBhcmUgZmx1c2hlZCAqLworCWVy ciA9IGludGVsX2VuZ2luZV9mbHVzaF9iYXJyaWVycyhlbmdpbmUpOworCWlmIChlcnIpCisJCWdv dG8gZXJyOworCiAJZXJyID0gY29udGV4dF9zeW5jKGVuZ2luZS0+a2VybmVsX2NvbnRleHQpOwog CWlmIChlcnIpCiAJCWdvdG8gZXJyOwpAQCAtMjcwLDggKzI4Niw5IEBAIHN0YXRpYyBpbnQgX19s aXZlX2FjdGl2ZV9jb250ZXh0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJc3Ry dWN0IGRybV9wcmludGVyIHAgPSBkcm1fZGVidWdfcHJpbnRlcihfX2Z1bmNfXyk7CiAKIAkJaW50 ZWxfZW5naW5lX2R1bXAoZW5naW5lLCAmcCwKLQkJCQkgICIlcyBpcyBzdGlsbCBhd2FrZSBhZnRl ciBpZGxlLWJhcnJpZXJzXG4iLAotCQkJCSAgZW5naW5lLT5uYW1lKTsKKwkJCQkgICIlcyBpcyBz dGlsbCBhd2FrZTolZCBhZnRlciBpZGxlLWJhcnJpZXJzXG4iLAorCQkJCSAgZW5naW5lLT5uYW1l LAorCQkJCSAgYXRvbWljX3JlYWQoJmVuZ2luZS0+d2FrZXJlZi5jb3VudCkpOwogCQlHRU1fVFJB Q0VfRFVNUCgpOwogCiAJCWVyciA9IC1FSU5WQUw7CkBAIC0yNzksNiArMjk2LDcgQEAgc3RhdGlj IGludCBfX2xpdmVfYWN0aXZlX2NvbnRleHQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l LAogCX0KIAogZXJyOgorCWVuZ2luZS0+cHJvcHMuaGVhcnRiZWF0X2ludGVydmFsX21zID0gc2F2 ZWRfaGVhcnRiZWF0OwogCWludGVsX2NvbnRleHRfcHV0KGNlKTsKIAlyZXR1cm4gZXJyOwogfQpA QCAtMzQ5LDYgKzM2Nyw3IEBAIHN0YXRpYyBpbnQgX19saXZlX3JlbW90ZV9jb250ZXh0KHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJCQkgc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQg KmZpeG1lKQogewogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpsb2NhbCwgKnJlbW90ZTsKKwl1bnNp Z25lZCBsb25nIHNhdmVkX2hlYXJ0YmVhdDsKIAlpbnQgcGFzczsKIAlpbnQgZXJyOwogCkBAIC0z NjAsNiArMzc5LDEyIEBAIHN0YXRpYyBpbnQgX19saXZlX3JlbW90ZV9jb250ZXh0KHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkgKiBjbG9iYmVyIHRoZSBpZGxlLWJhcnJpZXIuCiAJ ICovCiAKKwlpZiAoaW50ZWxfZW5naW5lX3BtX2lzX2F3YWtlKGVuZ2luZSkpIHsKKwkJcHJfZXJy KCIlcyBpcyBhd2FrZSBiZWZvcmUgc3RhcnRpbmcgJXMhXG4iLAorCQkgICAgICAgZW5naW5lLT5u YW1lLCBfX2Z1bmNfXyk7CisJCXJldHVybiAtRUlOVkFMOworCX0KKwogCXJlbW90ZSA9IGludGVs X2NvbnRleHRfY3JlYXRlKGZpeG1lLCBlbmdpbmUpOwogCWlmIChJU19FUlIocmVtb3RlKSkKIAkJ cmV0dXJuIFBUUl9FUlIocmVtb3RlKTsKQEAgLTM3MCw2ICszOTUsMTAgQEAgc3RhdGljIGludCBf X2xpdmVfcmVtb3RlX2NvbnRleHQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQln b3RvIGVycl9yZW1vdGU7CiAJfQogCisJc2F2ZWRfaGVhcnRiZWF0ID0gZW5naW5lLT5wcm9wcy5o ZWFydGJlYXRfaW50ZXJ2YWxfbXM7CisJZW5naW5lLT5wcm9wcy5oZWFydGJlYXRfaW50ZXJ2YWxf bXMgPSAwOworCWludGVsX2VuZ2luZV9wbV9nZXQoZW5naW5lKTsKKwogCWZvciAocGFzcyA9IDA7 IHBhc3MgPD0gMjsgcGFzcysrKSB7CiAJCWVyciA9IF9fcmVtb3RlX3N5bmMobG9jYWwsIHJlbW90 ZSk7CiAJCWlmIChlcnIpCkBAIC0zODcsNiArNDE2LDkgQEAgc3RhdGljIGludCBfX2xpdmVfcmVt b3RlX2NvbnRleHQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQl9CiAJfQogCisJ aW50ZWxfZW5naW5lX3BtX3B1dChlbmdpbmUpOworCWVuZ2luZS0+cHJvcHMuaGVhcnRiZWF0X2lu dGVydmFsX21zID0gc2F2ZWRfaGVhcnRiZWF0OworCiAJaW50ZWxfY29udGV4dF9wdXQobG9jYWwp OwogZXJyX3JlbW90ZToKIAlpbnRlbF9jb250ZXh0X3B1dChyZW1vdGUpOwotLSAKMi4yNC4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=