From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 3/6] drm/i915: Start returning an error from i915_vma_move_to_active() Date: Fri, 29 Jun 2018 23:54:16 +0100 Message-ID: <20180629225419.5832-3-chris@chris-wilson.co.uk> References: <20180629225419.5832-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 CB4EA6F216 for ; Fri, 29 Jun 2018 22:54:42 +0000 (UTC) In-Reply-To: <20180629225419.5832-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 SGFuZGxpbmcgc3VjaCBhIGxhdGUgZXJyb3IgaW4gcmVxdWVzdCBjb25zdHJ1Y3Rpb24gaXMgdHJp Y2t5LCBidXQgdG8KYWNjb21tb2RhdGUgZnV0dXJlIHBhdGNoZXMgd2hpY2ggbWF5IGFsbG9jYXRl IGhlcmUsIHdlIHBvdGVudGlhbGx5IGNvdWxkCmVyci4gVG8gaGFuZGxlIHRoZSBlcnJvciBhZnRl ciBhbHJlYWR5IGFkanVzdGluZyBnbG9iYWwgc3RhdGUgdG8gdHJhY2sKdGhlIG5ldyByZXF1ZXN0 LCB3ZSBtdXN0IGZpbmlzaCBhbmQgc3VibWl0IHRoZSByZXF1ZXN0LiBCdXQgd2UgZG9uJ3QKd2Fu dCB0byB1c2UgdGhlIHJlcXVlc3QgYXMgbm90IGV2ZXJ5dGhpbmcgaXMgYmVpbmcgdHJhY2tlZCBi eSBpdCwgc28gd2UKb3B0IHRvIGNhbmNlbCB0aGUgY29tbWFuZHMgaW5zaWRlIHRoZSByZXF1ZXN0 LgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3NjaGVkdWxlci5jICAgICAgICAgIHwgIDYg KysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgICAgICB8ICA2 ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgICAgfCAy NSArKysrKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5k ZXJfc3RhdGUuYyAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2h1Z2Vf cGFnZXMuYyAgIHwgIDkgKysrKystLQogLi4uL2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9j b2hlcmVuY3kuYyAgIHwgIDQgKy0tCiAuLi4vZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dl bV9jb250ZXh0LmMgfCAxMiArKysrKysrLS0KIC4uLi9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5 MTVfZ2VtX29iamVjdC5jICB8ICA3ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRl c3RzL2k5MTVfcmVxdWVzdC5jIHwgIDggKysrKy0tCiAuLi4vZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0 cy9pbnRlbF9oYW5nY2hlY2suYyAgfCAxMSArKysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv c2VsZnRlc3RzL2ludGVsX2xyYy5jICAgIHwgMTEgKysrKysrLS0KIC4uLi9kcm0vaTkxNS9zZWxm dGVzdHMvaW50ZWxfd29ya2Fyb3VuZHMuYyAgICB8ICA1ICsrKy0KIDEyIGZpbGVzIGNoYW5nZWQs IDc4IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2d2dC9zY2hlZHVsZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9z Y2hlZHVsZXIuYwppbmRleCA5Mjg4MThmMjE4ZjcuLmIwZTU2Njk1NmI4ZCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L3NjaGVkdWxlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2d2dC9zY2hlZHVsZXIuYwpAQCAtNDc2LDcgKzQ3NiwxMSBAQCBzdGF0aWMgaW50IHBy ZXBhcmVfc2hhZG93X2JhdGNoX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfdmdwdV93b3JrbG9hZCAqd29y a2xvYWQpCiAJCQlpOTE1X2dlbV9vYmpfZmluaXNoX3NobWVtX2FjY2VzcyhiYi0+b2JqKTsKIAkJ CWJiLT5hY2Nlc3NpbmcgPSBmYWxzZTsKIAotCQkJaTkxNV92bWFfbW92ZV90b19hY3RpdmUoYmIt PnZtYSwgd29ya2xvYWQtPnJlcSwgMCk7CisJCQlyZXQgPSBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2 ZShiYi0+dm1hLAorCQkJCQkJICAgICAgd29ya2xvYWQtPnJlcSwKKwkJCQkJCSAgICAgIDApOwor CQkJaWYgKHJldCkKKwkJCQlnb3RvIGVycjsKIAkJfQogCX0KIAlyZXR1cm4gMDsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCmluZGV4IGNlN2QwNjMzMjg4NC4uY2Q4ZjY5YTAwZTg2IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKQEAgLTMwOTksOSArMzA5OSw5IEBAIGk5MTVfZ2VtX29ial9maW5pc2hf c2htZW1fYWNjZXNzKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiB9CiAKIGludCBf X211c3RfY2hlY2sgaTkxNV9tdXRleF9sb2NrX2ludGVycnVwdGlibGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7Ci12b2lkIGk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKHN0cnVjdCBpOTE1X3ZtYSAq dm1hLAotCQkJICAgICBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycSwKLQkJCSAgICAgdW5zaWduZWQg aW50IGZsYWdzKTsKK2ludCBfX211c3RfY2hlY2sgaTkxNV92bWFfbW92ZV90b19hY3RpdmUoc3Ry dWN0IGk5MTVfdm1hICp2bWEsCisJCQkJCSBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycSwKKwkJCQkJ IHVuc2lnbmVkIGludCBmbGFncyk7CiBpbnQgaTkxNV9nZW1fZHVtYl9jcmVhdGUoc3RydWN0IGRy bV9maWxlICpmaWxlX3ByaXYsCiAJCQkgc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCSBzdHJ1 Y3QgZHJtX21vZGVfY3JlYXRlX2R1bWIgKmFyZ3MpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDkxZjIwNDQ1MTQ3Zi4uOTcxMzZlNGNlOTFkIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xMTY1LDEyICsx MTY1LDE2IEBAIHN0YXRpYyBpbnQgX19yZWxvY19ncHVfYWxsb2Moc3RydWN0IGk5MTVfZXhlY2J1 ZmZlciAqZWIsCiAJCWdvdG8gZXJyX3JlcXVlc3Q7CiAKIAlHRU1fQlVHX09OKCFyZXNlcnZhdGlv bl9vYmplY3RfdGVzdF9zaWduYWxlZF9yY3UoYmF0Y2gtPnJlc3YsIHRydWUpKTsKLQlpOTE1X3Zt YV9tb3ZlX3RvX2FjdGl2ZShiYXRjaCwgcnEsIDApOwotCWk5MTVfdm1hX3VucGluKGJhdGNoKTsK KwllcnIgPSBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShiYXRjaCwgcnEsIDApOworCWlmIChlcnIp CisJCWdvdG8gc2tpcF9yZXF1ZXN0OwogCi0JaTkxNV92bWFfbW92ZV90b19hY3RpdmUodm1hLCBy cSwgRVhFQ19PQkpFQ1RfV1JJVEUpOworCWVyciA9IGk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKHZt YSwgcnEsIEVYRUNfT0JKRUNUX1dSSVRFKTsKKwlpZiAoZXJyKQorCQlnb3RvIHNraXBfcmVxdWVz dDsKIAogCXJxLT5iYXRjaCA9IGJhdGNoOworCWk5MTVfdm1hX3VucGluKGJhdGNoKTsKIAogCWNh Y2hlLT5ycSA9IHJxOwogCWNhY2hlLT5ycV9jbWQgPSBjbWQ7CkBAIC0xMTc5LDYgKzExODMsOCBA QCBzdGF0aWMgaW50IF9fcmVsb2NfZ3B1X2FsbG9jKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXIgKmVi LAogCS8qIFJldHVybiB3aXRoIGJhdGNoIG1hcHBpbmcgKGNtZCkgc3RpbGwgcGlubmVkICovCiAJ cmV0dXJuIDA7CiAKK3NraXBfcmVxdWVzdDoKKwlpOTE1X3JlcXVlc3Rfc2tpcChycSwgZXJyKTsK IGVycl9yZXF1ZXN0OgogCWk5MTVfcmVxdWVzdF9hZGQocnEpOwogZXJyX3VucGluOgpAQCAtMTgx OCw3ICsxODI0LDExIEBAIHN0YXRpYyBpbnQgZWJfbW92ZV90b19ncHUoc3RydWN0IGk5MTVfZXhl Y2J1ZmZlciAqZWIpCiAJCXVuc2lnbmVkIGludCBmbGFncyA9IGViLT5mbGFnc1tpXTsKIAkJc3Ry dWN0IGk5MTVfdm1hICp2bWEgPSBlYi0+dm1hW2ldOwogCi0JCWk5MTVfdm1hX21vdmVfdG9fYWN0 aXZlKHZtYSwgZWItPnJlcXVlc3QsIGZsYWdzKTsKKwkJZXJyID0gaTkxNV92bWFfbW92ZV90b19h Y3RpdmUodm1hLCBlYi0+cmVxdWVzdCwgZmxhZ3MpOworCQlpZiAodW5saWtlbHkoZXJyKSkgewor CQkJaTkxNV9yZXF1ZXN0X3NraXAoZWItPnJlcXVlc3QsIGVycik7CisJCQlyZXR1cm4gZXJyOwor CQl9CiAKIAkJX19lYl91bnJlc2VydmVfdm1hKHZtYSwgZmxhZ3MpOwogCQl2bWEtPmV4ZWNfZmxh Z3MgPSBOVUxMOwpAQCAtMTg3Nyw5ICsxODg3LDkgQEAgc3RhdGljIHZvaWQgZXhwb3J0X2ZlbmNl KHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCXJlc2VydmF0aW9uX29iamVjdF91bmxvY2socmVzdik7 CiB9CiAKLXZvaWQgaTkxNV92bWFfbW92ZV90b19hY3RpdmUoc3RydWN0IGk5MTVfdm1hICp2bWEs Ci0JCQkgICAgIHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxLAotCQkJICAgICB1bnNpZ25lZCBpbnQg ZmxhZ3MpCitpbnQgaTkxNV92bWFfbW92ZV90b19hY3RpdmUoc3RydWN0IGk5MTVfdm1hICp2bWEs CisJCQkgICAgc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEsCisJCQkgICAgdW5zaWduZWQgaW50IGZs YWdzKQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSB2bWEtPm9iajsKIAlj b25zdCB1bnNpZ25lZCBpbnQgaWR4ID0gcnEtPmVuZ2luZS0+aWQ7CkBAIC0xOTE2LDYgKzE5MjYs NyBAQCB2b2lkIGk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAog CQlpOTE1X2dlbV9hY3RpdmVfc2V0KCZ2bWEtPmxhc3RfZmVuY2UsIHJxKTsKIAogCWV4cG9ydF9m ZW5jZSh2bWEsIHJxLCBmbGFncyk7CisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBpbnQgaTkxNV9y ZXNldF9nZW43X3NvbF9vZmZzZXRzKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxKQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwppbmRleCAzMjEwY2VkZmE0NmMu LjkwYmFmOTA4NmQwYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f cmVuZGVyX3N0YXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVy X3N0YXRlLmMKQEAgLTIyMiw3ICsyMjIsNyBAQCBpbnQgaTkxNV9nZW1fcmVuZGVyX3N0YXRlX2Vt aXQoc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEpCiAJCQlnb3RvIGVycl91bnBpbjsKIAl9CiAKLQlp OTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShzby52bWEsIHJxLCAwKTsKKwllcnIgPSBpOTE1X3ZtYV9t b3ZlX3RvX2FjdGl2ZShzby52bWEsIHJxLCAwKTsKIGVycl91bnBpbjoKIAlpOTE1X3ZtYV91bnBp bihzby52bWEpOwogZXJyX3ZtYToKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3Nl bGZ0ZXN0cy9odWdlX3BhZ2VzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaHVn ZV9wYWdlcy5jCmluZGV4IDM1OGZjODFmNmM5OS4uZDMzZTIwOTQwZTBhIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaHVnZV9wYWdlcy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9odWdlX3BhZ2VzLmMKQEAgLTk4NSw3ICs5ODUsMTAgQEAg c3RhdGljIGludCBncHVfd3JpdGUoc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJCWdvdG8gZXJyX3Jl cXVlc3Q7CiAJfQogCi0JaTkxNV92bWFfbW92ZV90b19hY3RpdmUoYmF0Y2gsIHJxLCAwKTsKKwll cnIgPSBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShiYXRjaCwgcnEsIDApOworCWlmIChlcnIpCisJ CWdvdG8gZXJyX3JlcXVlc3Q7CisKIAlpOTE1X2dlbV9vYmplY3Rfc2V0X2FjdGl2ZV9yZWZlcmVu Y2UoYmF0Y2gtPm9iaik7CiAJaTkxNV92bWFfdW5waW4oYmF0Y2gpOwogCWk5MTVfdm1hX2Nsb3Nl KGJhdGNoKTsKQEAgLTk5Niw3ICs5OTksOSBAQCBzdGF0aWMgaW50IGdwdV93cml0ZShzdHJ1Y3Qg aTkxNV92bWEgKnZtYSwKIAlpZiAoZXJyKQogCQlnb3RvIGVycl9yZXF1ZXN0OwogCi0JaTkxNV92 bWFfbW92ZV90b19hY3RpdmUodm1hLCBycSwgRVhFQ19PQkpFQ1RfV1JJVEUpOworCWVyciA9IGk5 MTVfdm1hX21vdmVfdG9fYWN0aXZlKHZtYSwgcnEsIEVYRUNfT0JKRUNUX1dSSVRFKTsKKwlpZiAo ZXJyKQorCQlpOTE1X3JlcXVlc3Rfc2tpcChycSwgZXJyKTsKIAogZXJyX3JlcXVlc3Q6CiAJaTkx NV9yZXF1ZXN0X2FkZChycSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxm dGVzdHMvaTkxNV9nZW1fY29oZXJlbmN5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVz dHMvaTkxNV9nZW1fY29oZXJlbmN5LmMKaW5kZXggMTE0MjdhYWUwODUzLi4zMjg1ODU0NTljNjcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9jb2hl cmVuY3kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fY29o ZXJlbmN5LmMKQEAgLTIyMiwxMiArMjIyLDEyIEBAIHN0YXRpYyBpbnQgZ3B1X3NldChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCX0KIAlpbnRlbF9yaW5nX2FkdmFuY2UocnEsIGNz KTsKIAotCWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKHZtYSwgcnEsIEVYRUNfT0JKRUNUX1dSSVRF KTsKKwllcnIgPSBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZSh2bWEsIHJxLCBFWEVDX09CSkVDVF9X UklURSk7CiAJaTkxNV92bWFfdW5waW4odm1hKTsKIAogCWk5MTVfcmVxdWVzdF9hZGQocnEpOwog Ci0JcmV0dXJuIDA7CisJcmV0dXJuIGVycjsKIH0KIAogc3RhdGljIGJvb2wgYWx3YXlzX3ZhbGlk KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggODFlZDg3YWEwYTRkLi5kYTQz ZjBhOTllYjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1 X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVf Z2VtX2NvbnRleHQuYwpAQCAtMTcwLDE4ICsxNzAsMjYgQEAgc3RhdGljIGludCBncHVfZmlsbChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCWlmIChlcnIpCiAJCWdvdG8gZXJyX3Jl cXVlc3Q7CiAKLQlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShiYXRjaCwgcnEsIDApOworCWVyciA9 IGk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKGJhdGNoLCBycSwgMCk7CisJaWYgKGVycikKKwkJZ290 byBza2lwX3JlcXVlc3Q7CisKKwllcnIgPSBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZSh2bWEsIHJx LCBFWEVDX09CSkVDVF9XUklURSk7CisJaWYgKGVycikKKwkJZ290byBza2lwX3JlcXVlc3Q7CisK IAlpOTE1X2dlbV9vYmplY3Rfc2V0X2FjdGl2ZV9yZWZlcmVuY2UoYmF0Y2gtPm9iaik7CiAJaTkx NV92bWFfdW5waW4oYmF0Y2gpOwogCWk5MTVfdm1hX2Nsb3NlKGJhdGNoKTsKIAotCWk5MTVfdm1h X21vdmVfdG9fYWN0aXZlKHZtYSwgcnEsIEVYRUNfT0JKRUNUX1dSSVRFKTsKIAlpOTE1X3ZtYV91 bnBpbih2bWEpOwogCiAJaTkxNV9yZXF1ZXN0X2FkZChycSk7CiAKIAlyZXR1cm4gMDsKIAorc2tp cF9yZXF1ZXN0OgorCWk5MTVfcmVxdWVzdF9za2lwKHJxLCBlcnIpOwogZXJyX3JlcXVlc3Q6CiAJ aTkxNV9yZXF1ZXN0X2FkZChycSk7CiBlcnJfYmF0Y2g6CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fb2JqZWN0LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fb2JqZWN0LmMKaW5kZXggZmE1YTA2NTQzMTRhLi43ZDBk ZGVmMTUxOWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1 X2dlbV9vYmplY3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9n ZW1fb2JqZWN0LmMKQEAgLTQ1NCwxMyArNDU0LDE0IEBAIHN0YXRpYyBpbnQgbWFrZV9vYmpfYnVz eShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCQlyZXR1cm4gUFRSX0VSUihycSk7 CiAJfQogCi0JaTkxNV92bWFfbW92ZV90b19hY3RpdmUodm1hLCBycSwgRVhFQ19PQkpFQ1RfV1JJ VEUpOworCWVyciA9IGk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKHZtYSwgcnEsIEVYRUNfT0JKRUNU X1dSSVRFKTsKIAogCWk5MTVfcmVxdWVzdF9hZGQocnEpOwogCi0JaTkxNV9nZW1fb2JqZWN0X3Nl dF9hY3RpdmVfcmVmZXJlbmNlKG9iaik7CisJX19pOTE1X2dlbV9vYmplY3RfcmVsZWFzZV91bmxl c3NfYWN0aXZlKG9iaik7CiAJaTkxNV92bWFfdW5waW4odm1hKTsKLQlyZXR1cm4gMDsKKworCXJl dHVybiBlcnI7CiB9CiAKIHN0YXRpYyBib29sIGFzc2VydF9tbWFwX29mZnNldChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqaTkxNSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3Nl bGZ0ZXN0cy9pOTE1X3JlcXVlc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9p OTE1X3JlcXVlc3QuYwppbmRleCA1MjFhZTRhOTBkZGYuLmMyN2Y3N2EyNGNlMCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfcmVxdWVzdC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X3JlcXVlc3QuYwpAQCAtNjc4LDcgKzY3 OCw5IEBAIHN0YXRpYyBpbnQgbGl2ZV9hbGxfZW5naW5lcyh2b2lkICphcmcpCiAJCQlpOTE1X2dl bV9vYmplY3Rfc2V0X2FjdGl2ZV9yZWZlcmVuY2UoYmF0Y2gtPm9iaik7CiAJCX0KIAotCQlpOTE1 X3ZtYV9tb3ZlX3RvX2FjdGl2ZShiYXRjaCwgcmVxdWVzdFtpZF0sIDApOworCQllcnIgPSBpOTE1 X3ZtYV9tb3ZlX3RvX2FjdGl2ZShiYXRjaCwgcmVxdWVzdFtpZF0sIDApOworCQlHRU1fQlVHX09O KGVycik7CisKIAkJaTkxNV9yZXF1ZXN0X2dldChyZXF1ZXN0W2lkXSk7CiAJCWk5MTVfcmVxdWVz dF9hZGQocmVxdWVzdFtpZF0pOwogCX0KQEAgLTc4OCw3ICs3OTAsOSBAQCBzdGF0aWMgaW50IGxp dmVfc2VxdWVudGlhbF9lbmdpbmVzKHZvaWQgKmFyZykKIAkJR0VNX0JVR19PTihlcnIpOwogCQly ZXF1ZXN0W2lkXS0+YmF0Y2ggPSBiYXRjaDsKIAotCQlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShi YXRjaCwgcmVxdWVzdFtpZF0sIDApOworCQllcnIgPSBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShi YXRjaCwgcmVxdWVzdFtpZF0sIDApOworCQlHRU1fQlVHX09OKGVycik7CisKIAkJaTkxNV9nZW1f b2JqZWN0X3NldF9hY3RpdmVfcmVmZXJlbmNlKGJhdGNoLT5vYmopOwogCQlpOTE1X3ZtYV9nZXQo YmF0Y2gpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaW50 ZWxfaGFuZ2NoZWNrLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaW50ZWxfaGFu Z2NoZWNrLmMKaW5kZXggZmU3ZDMxOTBlYmZlLi5lMTFkZjI3NDM3MDQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pbnRlbF9oYW5nY2hlY2suYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaW50ZWxfaGFuZ2NoZWNrLmMKQEAgLTEzMCwxMyAr MTMwLDE5IEBAIHN0YXRpYyBpbnQgZW1pdF9yZWN1cnNlX2JhdGNoKHN0cnVjdCBoYW5nICpoLAog CWlmIChlcnIpCiAJCWdvdG8gdW5waW5fdm1hOwogCi0JaTkxNV92bWFfbW92ZV90b19hY3RpdmUo dm1hLCBycSwgMCk7CisJZXJyID0gaTkxNV92bWFfbW92ZV90b19hY3RpdmUodm1hLCBycSwgMCk7 CisJaWYgKGVycikKKwkJZ290byB1bnBpbl9od3M7CisKIAlpZiAoIWk5MTVfZ2VtX29iamVjdF9o YXNfYWN0aXZlX3JlZmVyZW5jZSh2bWEtPm9iaikpIHsKIAkJaTkxNV9nZW1fb2JqZWN0X2dldCh2 bWEtPm9iaik7CiAJCWk5MTVfZ2VtX29iamVjdF9zZXRfYWN0aXZlX3JlZmVyZW5jZSh2bWEtPm9i aik7CiAJfQogCi0JaTkxNV92bWFfbW92ZV90b19hY3RpdmUoaHdzLCBycSwgMCk7CisJZXJyID0g aTkxNV92bWFfbW92ZV90b19hY3RpdmUoaHdzLCBycSwgMCk7CisJaWYgKGVycikKKwkJZ290byB1 bnBpbl9od3M7CisKIAlpZiAoIWk5MTVfZ2VtX29iamVjdF9oYXNfYWN0aXZlX3JlZmVyZW5jZSho d3MtPm9iaikpIHsKIAkJaTkxNV9nZW1fb2JqZWN0X2dldChod3MtPm9iaik7CiAJCWk5MTVfZ2Vt X29iamVjdF9zZXRfYWN0aXZlX3JlZmVyZW5jZShod3MtPm9iaik7CkBAIC0yMDUsNiArMjExLDcg QEAgc3RhdGljIGludCBlbWl0X3JlY3Vyc2VfYmF0Y2goc3RydWN0IGhhbmcgKmgsCiAKIAllcnIg PSBycS0+ZW5naW5lLT5lbWl0X2JiX3N0YXJ0KHJxLCB2bWEtPm5vZGUuc3RhcnQsIFBBR0VfU0la RSwgZmxhZ3MpOwogCit1bnBpbl9od3M6CiAJaTkxNV92bWFfdW5waW4oaHdzKTsKIHVucGluX3Zt YToKIAlpOTE1X3ZtYV91bnBpbih2bWEpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvc2VsZnRlc3RzL2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3Rz L2ludGVsX2xyYy5jCmluZGV4IGVhMjdjN2NmYmY5Ni4uYjM0ZjdhYzY2MzFlIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVsX2xyYy5jCkBAIC0xMDQsMTMgKzEwNCwxOSBA QCBzdGF0aWMgaW50IGVtaXRfcmVjdXJzZV9iYXRjaChzdHJ1Y3Qgc3Bpbm5lciAqc3BpbiwKIAlp ZiAoZXJyKQogCQlnb3RvIHVucGluX3ZtYTsKIAotCWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKHZt YSwgcnEsIDApOworCWVyciA9IGk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKHZtYSwgcnEsIDApOwor CWlmIChlcnIpCisJCWdvdG8gdW5waW5faHdzOworCiAJaWYgKCFpOTE1X2dlbV9vYmplY3RfaGFz X2FjdGl2ZV9yZWZlcmVuY2Uodm1hLT5vYmopKSB7CiAJCWk5MTVfZ2VtX29iamVjdF9nZXQodm1h LT5vYmopOwogCQlpOTE1X2dlbV9vYmplY3Rfc2V0X2FjdGl2ZV9yZWZlcmVuY2Uodm1hLT5vYmop OwogCX0KIAotCWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKGh3cywgcnEsIDApOworCWVyciA9IGk5 MTVfdm1hX21vdmVfdG9fYWN0aXZlKGh3cywgcnEsIDApOworCWlmIChlcnIpCisJCWdvdG8gdW5w aW5faHdzOworCiAJaWYgKCFpOTE1X2dlbV9vYmplY3RfaGFzX2FjdGl2ZV9yZWZlcmVuY2UoaHdz LT5vYmopKSB7CiAJCWk5MTVfZ2VtX29iamVjdF9nZXQoaHdzLT5vYmopOwogCQlpOTE1X2dlbV9v YmplY3Rfc2V0X2FjdGl2ZV9yZWZlcmVuY2UoaHdzLT5vYmopOwpAQCAtMTM0LDYgKzE0MCw3IEBA IHN0YXRpYyBpbnQgZW1pdF9yZWN1cnNlX2JhdGNoKHN0cnVjdCBzcGlubmVyICpzcGluLAogCiAJ ZXJyID0gcnEtPmVuZ2luZS0+ZW1pdF9iYl9zdGFydChycSwgdm1hLT5ub2RlLnN0YXJ0LCBQQUdF X1NJWkUsIDApOwogCit1bnBpbl9od3M6CiAJaTkxNV92bWFfdW5waW4oaHdzKTsKIHVucGluX3Zt YToKIAlpOTE1X3ZtYV91bnBpbih2bWEpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvc2VsZnRlc3RzL2ludGVsX3dvcmthcm91bmRzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9z ZWxmdGVzdHMvaW50ZWxfd29ya2Fyb3VuZHMuYwppbmRleCBlMWVhMmQyYmVkZDIuLmMxMDAxNTNj YjQ5NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVsX3dv cmthcm91bmRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2ludGVsX3dv cmthcm91bmRzLmMKQEAgLTQ5LDYgKzQ5LDEwIEBAIHJlYWRfbm9ucHJpdnMoc3RydWN0IGk5MTVf Z2VtX2NvbnRleHQgKmN0eCwgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCQlnb3Rv IGVycl9waW47CiAJfQogCisJZXJyID0gaTkxNV92bWFfbW92ZV90b19hY3RpdmUodm1hLCBycSwg RVhFQ19PQkpFQ1RfV1JJVEUpOworCWlmIChlcnIpCisJCWdvdG8gZXJyX3JlcTsKKwogCXNybSA9 IE1JX1NUT1JFX1JFR0lTVEVSX01FTSB8IE1JX1NSTV9MUk1fR0xPQkFMX0dUVDsKIAlpZiAoSU5U RUxfR0VOKGN0eC0+aTkxNSkgPj0gOCkKIAkJc3JtKys7CkBAIC02Nyw3ICs3MSw2IEBAIHJlYWRf bm9ucHJpdnMoc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwgc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQogCX0KIAlpbnRlbF9yaW5nX2FkdmFuY2UocnEsIGNzKTsKIAotCWk5MTVf dm1hX21vdmVfdG9fYWN0aXZlKHZtYSwgcnEsIEVYRUNfT0JKRUNUX1dSSVRFKTsKIAlyZXNlcnZh dGlvbl9vYmplY3RfbG9jayh2bWEtPnJlc3YsIE5VTEwpOwogCXJlc2VydmF0aW9uX29iamVjdF9h ZGRfZXhjbF9mZW5jZSh2bWEtPnJlc3YsICZycS0+ZmVuY2UpOwogCXJlc2VydmF0aW9uX29iamVj dF91bmxvY2sodm1hLT5yZXN2KTsKLS0gCjIuMTguMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==