From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753546AbdLSTjB (ORCPT ); Tue, 19 Dec 2017 14:39:01 -0500 Received: from mga11.intel.com ([192.55.52.93]:27379 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753301AbdLSThI (ORCPT ); Tue, 19 Dec 2017 14:37:08 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,428,1508828400"; d="scan'208";a="4018675" From: Dongwon Kim To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, xen-devel@lists.xenproject.org, mateuszx.potrola@intel.com, dongwon.kim@intel.com Subject: [RFC PATCH 53/60] hyper_dmabuf: define fastpath_export for exporting existing buffer Date: Tue, 19 Dec 2017 11:30:09 -0800 Message-Id: <1513711816-2618-53-git-send-email-dongwon.kim@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513711816-2618-1-git-send-email-dongwon.kim@intel.com> References: <1513711816-2618-1-git-send-email-dongwon.kim@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To make hyper_dmabuf_export_remote_ioctl more compact and readable, a new function call, 'fastpath_export' is created to replace a routine in hyper_dmabuf_export_remote_ioctl for the case requested buffer for exporting is already in the LIST (exported previously). Signed-off-by: Dongwon Kim --- drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c | 153 +++++++++++++++----------- 1 file changed, 87 insertions(+), 66 deletions(-) diff --git a/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c b/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c index b40cf89..d11f609 100644 --- a/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c +++ b/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c @@ -122,6 +122,82 @@ static int send_export_msg(struct exported_sgt_info *exported, return ret; } +/* Fast path exporting routine in case same buffer is already exported. + * In this function, we skip normal exporting process and just update + * private data on both VMs (importer and exporter) + * + * return '1' if reexport is needed, return '0' if succeeds, return + * Kernel error code if something goes wrong + */ +static int fastpath_export(hyper_dmabuf_id_t hid, int sz_priv, char *priv) +{ + int reexport = 1; + int ret = 0; + struct exported_sgt_info *exported; + + exported = hyper_dmabuf_find_exported(hid); + + if (!exported) + return reexport; + + if (exported->valid == false) + return reexport; + + /* + * Check if unexport is already scheduled for that buffer, + * if so try to cancel it. If that will fail, buffer needs + * to be reexport once again. + */ + if (exported->unexport_sched) { + if (!cancel_delayed_work_sync(&exported->unexport)) + return reexport; + + exported->unexport_sched = false; + } + + /* if there's any change in size of private data. + * we reallocate space for private data with new size + */ + if (sz_priv != exported->sz_priv) { + kfree(exported->priv); + + /* truncating size */ + if (sz_priv > MAX_SIZE_PRIV_DATA) + exported->sz_priv = MAX_SIZE_PRIV_DATA; + else + exported->sz_priv = sz_priv; + + exported->priv = kcalloc(1, exported->sz_priv, + GFP_KERNEL); + + if (!exported->priv) { + hyper_dmabuf_remove_exported(exported->hid); + hyper_dmabuf_cleanup_sgt_info(exported, true); + kfree(exported); + return -ENOMEM; + } + } + + /* update private data in sgt_info with new ones */ + ret = copy_from_user(exported->priv, priv, exported->sz_priv); + if (ret) { + dev_err(hy_drv_priv->dev, + "Failed to load a new private data\n"); + ret = -EINVAL; + } else { + /* send an export msg for updating priv in importer */ + ret = send_export_msg(exported, NULL); + + if (ret < 0) { + dev_err(hy_drv_priv->dev, + "Failed to send a new private data\n"); + ret = -EBUSY; + } + } + + return ret; +} + static int hyper_dmabuf_export_remote_ioctl(struct file *filp, void *data) { struct ioctl_hyper_dmabuf_export_remote *export_remote_attr = @@ -153,79 +229,24 @@ static int hyper_dmabuf_export_remote_ioctl(struct file *filp, void *data) */ hid = hyper_dmabuf_find_hid_exported(dma_buf, export_remote_attr->remote_domain); - if (hid.id != -1) { - exported = hyper_dmabuf_find_exported(hid); - if (!exported) - goto reexport; - - if (exported->valid == false) - goto reexport; + if (hid.id != -1) { + ret = fastpath_export(hid, export_remote_attr->sz_priv, + export_remote_attr->priv); - /* - * Check if unexport is already scheduled for that buffer, - * if so try to cancel it. If that will fail, buffer needs - * to be reexport once again. + /* return if fastpath_export succeeds or + * gets some fatal error */ - if (exported->unexport_sched) { - if (!cancel_delayed_work_sync(&exported->unexport)) { - dma_buf_put(dma_buf); - goto reexport; - } - exported->unexport_sched = false; + if (ret <= 0) { + dma_buf_put(dma_buf); + export_remote_attr->hid = hid; + return ret; } - - /* if there's any change in size of private data. - * we reallocate space for private data with new size - */ - if (export_remote_attr->sz_priv != exported->sz_priv) { - kfree(exported->priv); - - /* truncating size */ - if (export_remote_attr->sz_priv > MAX_SIZE_PRIV_DATA) - exported->sz_priv = MAX_SIZE_PRIV_DATA; - else - exported->sz_priv = export_remote_attr->sz_priv; - - exported->priv = kcalloc(1, exported->sz_priv, - GFP_KERNEL); - - if (!exported->priv) { - hyper_dmabuf_remove_exported(exported->hid); - hyper_dmabuf_cleanup_sgt_info(exported, true); - kfree(exported); - dma_buf_put(dma_buf); - return -ENOMEM; - } - } - - /* update private data in sgt_info with new ones */ - ret = copy_from_user(exported->priv, export_remote_attr->priv, - exported->sz_priv); - if (ret) { - dev_err(hy_drv_priv->dev, - "Failed to load a new private data\n"); - ret = -EINVAL; - } else { - /* send an export msg for updating priv in importer */ - ret = send_export_msg(exported, NULL); - - if (ret < 0) { - dev_err(hy_drv_priv->dev, - "Failed to send a new private data\n"); - ret = -EBUSY; - } - } - - dma_buf_put(dma_buf); - export_remote_attr->hid = hid; - return ret; } -reexport: attachment = dma_buf_attach(dma_buf, hy_drv_priv->dev); if (IS_ERR(attachment)) { - dev_err(hy_drv_priv->dev, "Cannot get attachment\n"); + dev_err(hy_drv_priv->dev, "cannot get attachment\n"); ret = PTR_ERR(attachment); goto fail_attach; } @@ -233,7 +254,7 @@ static int hyper_dmabuf_export_remote_ioctl(struct file *filp, void *data) sgt = dma_buf_map_attachment(attachment, DMA_BIDIRECTIONAL); if (IS_ERR(sgt)) { - dev_err(hy_drv_priv->dev, "Cannot map attachment\n"); + dev_err(hy_drv_priv->dev, "cannot map attachment\n"); ret = PTR_ERR(sgt); goto fail_map_attachment; } -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dongwon Kim Subject: [RFC PATCH 53/60] hyper_dmabuf: define fastpath_export for exporting existing buffer Date: Tue, 19 Dec 2017 11:30:09 -0800 Message-ID: <1513711816-2618-53-git-send-email-dongwon.kim@intel.com> References: <1513711816-2618-1-git-send-email-dongwon.kim@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1513711816-2618-1-git-send-email-dongwon.kim@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org Cc: xen-devel@lists.xenproject.org, mateuszx.potrola@intel.com, dri-devel@lists.freedesktop.org, dongwon.kim@intel.com List-Id: dri-devel@lists.freedesktop.org VG8gbWFrZSBoeXBlcl9kbWFidWZfZXhwb3J0X3JlbW90ZV9pb2N0bCBtb3JlIGNvbXBhY3QgYW5k IHJlYWRhYmxlLAphIG5ldyBmdW5jdGlvbiBjYWxsLCAnZmFzdHBhdGhfZXhwb3J0JyBpcyBjcmVh dGVkIHRvIHJlcGxhY2UgYSByb3V0aW5lCmluIGh5cGVyX2RtYWJ1Zl9leHBvcnRfcmVtb3RlX2lv Y3RsIGZvciB0aGUgY2FzZSByZXF1ZXN0ZWQgYnVmZmVyIGZvcgpleHBvcnRpbmcgaXMgYWxyZWFk eSBpbiB0aGUgTElTVCAoZXhwb3J0ZWQgcHJldmlvdXNseSkuCgpTaWduZWQtb2ZmLWJ5OiBEb25n d29uIEtpbSA8ZG9uZ3dvbi5raW1AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMveGVuL2h5cGVyX2Rt YWJ1Zi9oeXBlcl9kbWFidWZfaW9jdGwuYyB8IDE1MyArKysrKysrKysrKysrKystLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDg3IGluc2VydGlvbnMoKyksIDY2IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMveGVuL2h5cGVyX2RtYWJ1Zi9oeXBlcl9kbWFidWZfaW9jdGwuYyBi L2RyaXZlcnMveGVuL2h5cGVyX2RtYWJ1Zi9oeXBlcl9kbWFidWZfaW9jdGwuYwppbmRleCBiNDBj Zjg5Li5kMTFmNjA5IDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi9oeXBlcl9kbWFidWYvaHlwZXJf ZG1hYnVmX2lvY3RsLmMKKysrIGIvZHJpdmVycy94ZW4vaHlwZXJfZG1hYnVmL2h5cGVyX2RtYWJ1 Zl9pb2N0bC5jCkBAIC0xMjIsNiArMTIyLDgyIEBAIHN0YXRpYyBpbnQgc2VuZF9leHBvcnRfbXNn KHN0cnVjdCBleHBvcnRlZF9zZ3RfaW5mbyAqZXhwb3J0ZWQsCiAJcmV0dXJuIHJldDsKIH0KIAor LyogRmFzdCBwYXRoIGV4cG9ydGluZyByb3V0aW5lIGluIGNhc2Ugc2FtZSBidWZmZXIgaXMgYWxy ZWFkeSBleHBvcnRlZC4KKyAqIEluIHRoaXMgZnVuY3Rpb24sIHdlIHNraXAgbm9ybWFsIGV4cG9y dGluZyBwcm9jZXNzIGFuZCBqdXN0IHVwZGF0ZQorICogcHJpdmF0ZSBkYXRhIG9uIGJvdGggVk1z IChpbXBvcnRlciBhbmQgZXhwb3J0ZXIpCisgKgorICogcmV0dXJuICcxJyBpZiByZWV4cG9ydCBp cyBuZWVkZWQsIHJldHVybiAnMCcgaWYgc3VjY2VlZHMsIHJldHVybgorICogS2VybmVsIGVycm9y IGNvZGUgaWYgc29tZXRoaW5nIGdvZXMgd3JvbmcKKyAqLworc3RhdGljIGludCBmYXN0cGF0aF9l eHBvcnQoaHlwZXJfZG1hYnVmX2lkX3QgaGlkLCBpbnQgc3pfcHJpdiwgY2hhciAqcHJpdikKK3sK KwlpbnQgcmVleHBvcnQgPSAxOworCWludCByZXQgPSAwOworCXN0cnVjdCBleHBvcnRlZF9zZ3Rf aW5mbyAqZXhwb3J0ZWQ7CisKKwlleHBvcnRlZCA9IGh5cGVyX2RtYWJ1Zl9maW5kX2V4cG9ydGVk KGhpZCk7CisKKwlpZiAoIWV4cG9ydGVkKQorCQlyZXR1cm4gcmVleHBvcnQ7CisKKwlpZiAoZXhw b3J0ZWQtPnZhbGlkID09IGZhbHNlKQorCQlyZXR1cm4gcmVleHBvcnQ7CisKKwkvKgorCSAqIENo ZWNrIGlmIHVuZXhwb3J0IGlzIGFscmVhZHkgc2NoZWR1bGVkIGZvciB0aGF0IGJ1ZmZlciwKKwkg KiBpZiBzbyB0cnkgdG8gY2FuY2VsIGl0LiBJZiB0aGF0IHdpbGwgZmFpbCwgYnVmZmVyIG5lZWRz CisJICogdG8gYmUgcmVleHBvcnQgb25jZSBhZ2Fpbi4KKwkgKi8KKwlpZiAoZXhwb3J0ZWQtPnVu ZXhwb3J0X3NjaGVkKSB7CisJCWlmICghY2FuY2VsX2RlbGF5ZWRfd29ya19zeW5jKCZleHBvcnRl ZC0+dW5leHBvcnQpKQorCQkJcmV0dXJuIHJlZXhwb3J0OworCisJCWV4cG9ydGVkLT51bmV4cG9y dF9zY2hlZCA9IGZhbHNlOworCX0KKworCS8qIGlmIHRoZXJlJ3MgYW55IGNoYW5nZSBpbiBzaXpl IG9mIHByaXZhdGUgZGF0YS4KKwkgKiB3ZSByZWFsbG9jYXRlIHNwYWNlIGZvciBwcml2YXRlIGRh dGEgd2l0aCBuZXcgc2l6ZQorCSAqLworCWlmIChzel9wcml2ICE9IGV4cG9ydGVkLT5zel9wcml2 KSB7CisJCWtmcmVlKGV4cG9ydGVkLT5wcml2KTsKKworCQkvKiB0cnVuY2F0aW5nIHNpemUgKi8K KwkJaWYgKHN6X3ByaXYgPiBNQVhfU0laRV9QUklWX0RBVEEpCisJCQlleHBvcnRlZC0+c3pfcHJp diA9IE1BWF9TSVpFX1BSSVZfREFUQTsKKwkJZWxzZQorCQkJZXhwb3J0ZWQtPnN6X3ByaXYgPSBz el9wcml2OworCisJCWV4cG9ydGVkLT5wcml2ID0ga2NhbGxvYygxLCBleHBvcnRlZC0+c3pfcHJp diwKKwkJCQkJIEdGUF9LRVJORUwpOworCisJCWlmICghZXhwb3J0ZWQtPnByaXYpIHsKKwkJCWh5 cGVyX2RtYWJ1Zl9yZW1vdmVfZXhwb3J0ZWQoZXhwb3J0ZWQtPmhpZCk7CisJCQloeXBlcl9kbWFi dWZfY2xlYW51cF9zZ3RfaW5mbyhleHBvcnRlZCwgdHJ1ZSk7CisJCQlrZnJlZShleHBvcnRlZCk7 CisJCQlyZXR1cm4gLUVOT01FTTsKKwkJfQorCX0KKworCS8qIHVwZGF0ZSBwcml2YXRlIGRhdGEg aW4gc2d0X2luZm8gd2l0aCBuZXcgb25lcyAqLworCXJldCA9IGNvcHlfZnJvbV91c2VyKGV4cG9y dGVkLT5wcml2LCBwcml2LCBleHBvcnRlZC0+c3pfcHJpdik7CisJaWYgKHJldCkgeworCQlkZXZf ZXJyKGh5X2Rydl9wcml2LT5kZXYsCisJCQkiRmFpbGVkIHRvIGxvYWQgYSBuZXcgcHJpdmF0ZSBk YXRhXG4iKTsKKwkJcmV0ID0gLUVJTlZBTDsKKwl9IGVsc2UgeworCQkvKiBzZW5kIGFuIGV4cG9y dCBtc2cgZm9yIHVwZGF0aW5nIHByaXYgaW4gaW1wb3J0ZXIgKi8KKwkJcmV0ID0gc2VuZF9leHBv cnRfbXNnKGV4cG9ydGVkLCBOVUxMKTsKKworCQlpZiAocmV0IDwgMCkgeworCQkJZGV2X2Vyciho eV9kcnZfcHJpdi0+ZGV2LAorCQkJCSJGYWlsZWQgdG8gc2VuZCBhIG5ldyBwcml2YXRlIGRhdGFc biIpOworCQkJcmV0ID0gLUVCVVNZOworCQl9CisJfQorCisJcmV0dXJuIHJldDsKK30KKwogc3Rh dGljIGludCBoeXBlcl9kbWFidWZfZXhwb3J0X3JlbW90ZV9pb2N0bChzdHJ1Y3QgZmlsZSAqZmls cCwgdm9pZCAqZGF0YSkKIHsKIAlzdHJ1Y3QgaW9jdGxfaHlwZXJfZG1hYnVmX2V4cG9ydF9yZW1v dGUgKmV4cG9ydF9yZW1vdGVfYXR0ciA9CkBAIC0xNTMsNzkgKzIyOSwyNCBAQCBzdGF0aWMgaW50 IGh5cGVyX2RtYWJ1Zl9leHBvcnRfcmVtb3RlX2lvY3RsKHN0cnVjdCBmaWxlICpmaWxwLCB2b2lk ICpkYXRhKQogCSAqLwogCWhpZCA9IGh5cGVyX2RtYWJ1Zl9maW5kX2hpZF9leHBvcnRlZChkbWFf YnVmLAogCQkJCQkgICAgIGV4cG9ydF9yZW1vdGVfYXR0ci0+cmVtb3RlX2RvbWFpbik7Ci0JaWYg KGhpZC5pZCAhPSAtMSkgewotCQlleHBvcnRlZCA9IGh5cGVyX2RtYWJ1Zl9maW5kX2V4cG9ydGVk KGhpZCk7CiAKLQkJaWYgKCFleHBvcnRlZCkKLQkJCWdvdG8gcmVleHBvcnQ7Ci0KLQkJaWYgKGV4 cG9ydGVkLT52YWxpZCA9PSBmYWxzZSkKLQkJCWdvdG8gcmVleHBvcnQ7CisJaWYgKGhpZC5pZCAh PSAtMSkgeworCQlyZXQgPSBmYXN0cGF0aF9leHBvcnQoaGlkLCBleHBvcnRfcmVtb3RlX2F0dHIt PnN6X3ByaXYsCisJCQkJICAgICAgZXhwb3J0X3JlbW90ZV9hdHRyLT5wcml2KTsKIAotCQkvKgot CQkgKiBDaGVjayBpZiB1bmV4cG9ydCBpcyBhbHJlYWR5IHNjaGVkdWxlZCBmb3IgdGhhdCBidWZm ZXIsCi0JCSAqIGlmIHNvIHRyeSB0byBjYW5jZWwgaXQuIElmIHRoYXQgd2lsbCBmYWlsLCBidWZm ZXIgbmVlZHMKLQkJICogdG8gYmUgcmVleHBvcnQgb25jZSBhZ2Fpbi4KKwkJLyogcmV0dXJuIGlm IGZhc3RwYXRoX2V4cG9ydCBzdWNjZWVkcyBvcgorCQkgKiBnZXRzIHNvbWUgZmF0YWwgZXJyb3IK IAkJICovCi0JCWlmIChleHBvcnRlZC0+dW5leHBvcnRfc2NoZWQpIHsKLQkJCWlmICghY2FuY2Vs X2RlbGF5ZWRfd29ya19zeW5jKCZleHBvcnRlZC0+dW5leHBvcnQpKSB7Ci0JCQkJZG1hX2J1Zl9w dXQoZG1hX2J1Zik7Ci0JCQkJZ290byByZWV4cG9ydDsKLQkJCX0KLQkJCWV4cG9ydGVkLT51bmV4 cG9ydF9zY2hlZCA9IGZhbHNlOworCQlpZiAocmV0IDw9IDApIHsKKwkJCWRtYV9idWZfcHV0KGRt YV9idWYpOworCQkJZXhwb3J0X3JlbW90ZV9hdHRyLT5oaWQgPSBoaWQ7CisJCQlyZXR1cm4gcmV0 OwogCQl9Ci0KLQkJLyogaWYgdGhlcmUncyBhbnkgY2hhbmdlIGluIHNpemUgb2YgcHJpdmF0ZSBk YXRhLgotCQkgKiB3ZSByZWFsbG9jYXRlIHNwYWNlIGZvciBwcml2YXRlIGRhdGEgd2l0aCBuZXcg c2l6ZQotCQkgKi8KLQkJaWYgKGV4cG9ydF9yZW1vdGVfYXR0ci0+c3pfcHJpdiAhPSBleHBvcnRl ZC0+c3pfcHJpdikgewotCQkJa2ZyZWUoZXhwb3J0ZWQtPnByaXYpOwotCi0JCQkvKiB0cnVuY2F0 aW5nIHNpemUgKi8KLQkJCWlmIChleHBvcnRfcmVtb3RlX2F0dHItPnN6X3ByaXYgPiBNQVhfU0la RV9QUklWX0RBVEEpCi0JCQkJZXhwb3J0ZWQtPnN6X3ByaXYgPSBNQVhfU0laRV9QUklWX0RBVEE7 Ci0JCQllbHNlCi0JCQkJZXhwb3J0ZWQtPnN6X3ByaXYgPSBleHBvcnRfcmVtb3RlX2F0dHItPnN6 X3ByaXY7Ci0KLQkJCWV4cG9ydGVkLT5wcml2ID0ga2NhbGxvYygxLCBleHBvcnRlZC0+c3pfcHJp diwKLQkJCQkJCSBHRlBfS0VSTkVMKTsKLQotCQkJaWYgKCFleHBvcnRlZC0+cHJpdikgewotCQkJ CWh5cGVyX2RtYWJ1Zl9yZW1vdmVfZXhwb3J0ZWQoZXhwb3J0ZWQtPmhpZCk7Ci0JCQkJaHlwZXJf ZG1hYnVmX2NsZWFudXBfc2d0X2luZm8oZXhwb3J0ZWQsIHRydWUpOwotCQkJCWtmcmVlKGV4cG9y dGVkKTsKLQkJCQlkbWFfYnVmX3B1dChkbWFfYnVmKTsKLQkJCQlyZXR1cm4gLUVOT01FTTsKLQkJ CX0KLQkJfQotCi0JCS8qIHVwZGF0ZSBwcml2YXRlIGRhdGEgaW4gc2d0X2luZm8gd2l0aCBuZXcg b25lcyAqLwotCQlyZXQgPSBjb3B5X2Zyb21fdXNlcihleHBvcnRlZC0+cHJpdiwgZXhwb3J0X3Jl bW90ZV9hdHRyLT5wcml2LAotCQkJCSAgICAgZXhwb3J0ZWQtPnN6X3ByaXYpOwotCQlpZiAocmV0 KSB7Ci0JCQlkZXZfZXJyKGh5X2Rydl9wcml2LT5kZXYsCi0JCQkJIkZhaWxlZCB0byBsb2FkIGEg bmV3IHByaXZhdGUgZGF0YVxuIik7Ci0JCQlyZXQgPSAtRUlOVkFMOwotCQl9IGVsc2UgewotCQkJ Lyogc2VuZCBhbiBleHBvcnQgbXNnIGZvciB1cGRhdGluZyBwcml2IGluIGltcG9ydGVyICovCi0J CQlyZXQgPSBzZW5kX2V4cG9ydF9tc2coZXhwb3J0ZWQsIE5VTEwpOwotCi0JCQlpZiAocmV0IDwg MCkgewotCQkJCWRldl9lcnIoaHlfZHJ2X3ByaXYtPmRldiwKLQkJCQkJIkZhaWxlZCB0byBzZW5k IGEgbmV3IHByaXZhdGUgZGF0YVxuIik7Ci0JCQkJcmV0ID0gLUVCVVNZOwotCQkJfQotCQl9Ci0K LQkJZG1hX2J1Zl9wdXQoZG1hX2J1Zik7Ci0JCWV4cG9ydF9yZW1vdGVfYXR0ci0+aGlkID0gaGlk OwotCQlyZXR1cm4gcmV0OwogCX0KIAotcmVleHBvcnQ6CiAJYXR0YWNobWVudCA9IGRtYV9idWZf YXR0YWNoKGRtYV9idWYsIGh5X2Rydl9wcml2LT5kZXYpOwogCWlmIChJU19FUlIoYXR0YWNobWVu dCkpIHsKLQkJZGV2X2VycihoeV9kcnZfcHJpdi0+ZGV2LCAiQ2Fubm90IGdldCBhdHRhY2htZW50 XG4iKTsKKwkJZGV2X2VycihoeV9kcnZfcHJpdi0+ZGV2LCAiY2Fubm90IGdldCBhdHRhY2htZW50 XG4iKTsKIAkJcmV0ID0gUFRSX0VSUihhdHRhY2htZW50KTsKIAkJZ290byBmYWlsX2F0dGFjaDsK IAl9CkBAIC0yMzMsNyArMjU0LDcgQEAgc3RhdGljIGludCBoeXBlcl9kbWFidWZfZXhwb3J0X3Jl bW90ZV9pb2N0bChzdHJ1Y3QgZmlsZSAqZmlscCwgdm9pZCAqZGF0YSkKIAlzZ3QgPSBkbWFfYnVm X21hcF9hdHRhY2htZW50KGF0dGFjaG1lbnQsIERNQV9CSURJUkVDVElPTkFMKTsKIAogCWlmIChJ U19FUlIoc2d0KSkgewotCQlkZXZfZXJyKGh5X2Rydl9wcml2LT5kZXYsICJDYW5ub3QgbWFwIGF0 dGFjaG1lbnRcbiIpOworCQlkZXZfZXJyKGh5X2Rydl9wcml2LT5kZXYsICJjYW5ub3QgbWFwIGF0 dGFjaG1lbnRcbiIpOwogCQlyZXQgPSBQVFJfRVJSKHNndCk7CiAJCWdvdG8gZmFpbF9tYXBfYXR0 YWNobWVudDsKIAl9Ci0tIAoyLjcuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhl bnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5m by94ZW4tZGV2ZWw=