From: changbin.du@intel.com Subject: [PATCH v6 10/14] drm/i915/kvmgt: Support setting dma map for huge pages Date: Tue, 8 May 2018 17:05:12 +0800 Message-ID: <1525770316-5287-11-git-send-email-changbin.du@intel.com> References: <1525770316-5287-1-git-send-email-changbin.du@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1525770316-5287-1-git-send-email-changbin.du@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gvt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hhbmdiaW4gRHUgPGNoYW5nYmluLmR1QGludGVsLmNvbT4KClRvIHN1cHBvcnQgaHVn ZSBndHQsIHdlIG5lZWQgdG8gc3VwcG9ydCBodWdlIHBhZ2VzIGluIGt2bWd0IGZpcnN0LgpUaGlz IHBhdGNoIGFkZHMgYSAnc2l6ZScgcGFyYW0gdG8gdGhlIGludGVsX2d2dF9tcHQ6OmRtYV9tYXBf Z3Vlc3RfcGFnZQpBUEkgYW5kIGltcGxlbWVudHMgaXQgaW4ga3ZtZ3QuCgp2MjogcmViYXNlLgoK U2lnbmVkLW9mZi1ieTogQ2hhbmdiaW4gRHUgPGNoYW5nYmluLmR1QGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0LmMgICAgICAgfCAgIDYgKy0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2d2dC9oeXBlcmNhbGwuaCB8ICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv Z3Z0L2t2bWd0LmMgICAgIHwgMTMwICsrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvbXB0LmggICAgICAgfCAgIDcgKy0KIDQgZmlsZXMg Y2hhbmdlZCwgMTAxIGluc2VydGlvbnMoKyksIDQ0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2 dC9ndHQuYwppbmRleCAyZjEzNDY0Li5mZmVlY2RhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9ndnQvZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5jCkBA IC0xMTA0LDcgKzExMDQsNyBAQCBzdGF0aWMgaW50IHNwbGl0XzY0S0JfZ3R0X2VudHJ5KHN0cnVj dCBpbnRlbF92Z3B1ICp2Z3B1LAogCiAJZm9yIChpID0gMDsgaSA8IEdUVF82NEtfUFRFX1NUUklE RTsgaSsrKSB7CiAJCXJldCA9IGludGVsX2d2dF9oeXBlcnZpc29yX2RtYV9tYXBfZ3Vlc3RfcGFn ZSh2Z3B1LAotCQkJCQkJc3RhcnRfZ2ZuICsgaSwgJmRtYV9hZGRyKTsKKwkJCQkJc3RhcnRfZ2Zu ICsgaSwgUEFHRV9TSVpFLCAmZG1hX2FkZHIpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsK IApAQCAtMTE1MCw3ICsxMTUwLDcgQEAgc3RhdGljIGludCBwcGd0dF9wb3B1bGF0ZV9zaGFkb3df ZW50cnkoc3RydWN0IGludGVsX3ZncHUgKnZncHUsCiAJfTsKIAogCS8qIGRpcmVjdCBzaGFkb3cg Ki8KLQlyZXQgPSBpbnRlbF9ndnRfaHlwZXJ2aXNvcl9kbWFfbWFwX2d1ZXN0X3BhZ2UodmdwdSwg Z2ZuLCAmZG1hX2FkZHIpOworCXJldCA9IGludGVsX2d2dF9oeXBlcnZpc29yX2RtYV9tYXBfZ3Vl c3RfcGFnZSh2Z3B1LCBnZm4sIFBBR0VfU0laRSwgJmRtYV9hZGRyKTsKIAlpZiAocmV0KQogCQly ZXR1cm4gLUVOWElPOwogCkBAIC0yMDc4LDcgKzIwNzgsNyBAQCBzdGF0aWMgaW50IGVtdWxhdGVf Z2d0dF9tbWlvX3dyaXRlKHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LCB1bnNpZ25lZCBpbnQgb2Zm LAogCQl9CiAKIAkJcmV0ID0gaW50ZWxfZ3Z0X2h5cGVydmlzb3JfZG1hX21hcF9ndWVzdF9wYWdl KHZncHUsIGdmbiwKLQkJCQkJCQkgICAgICAmZG1hX2FkZHIpOworCQkJCQkJCVBBR0VfU0laRSwg JmRtYV9hZGRyKTsKIAkJaWYgKHJldCkgewogCQkJZ3Z0X3ZncHVfZXJyKCJmYWlsIHRvIHBvcHVs YXRlIGd1ZXN0IGdndHQgZW50cnlcbiIpOwogCQkJLyogZ3Vlc3QgZHJpdmVyIG1heSByZWFkL3dy aXRlIHRoZSBlbnRyeSB3aGVuIHBhcnRpYWwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2d2dC9oeXBlcmNhbGwuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9oeXBlcmNhbGwu aAppbmRleCBmNmRkOWY3Li41YWYxMWNmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9ndnQvaHlwZXJjYWxsLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2h5cGVyY2Fs bC5oCkBAIC01Myw3ICs1Myw3IEBAIHN0cnVjdCBpbnRlbF9ndnRfbXB0IHsKIAl1bnNpZ25lZCBs b25nICgqZ2ZuX3RvX21mbikodW5zaWduZWQgbG9uZyBoYW5kbGUsIHVuc2lnbmVkIGxvbmcgZ2Zu KTsKIAogCWludCAoKmRtYV9tYXBfZ3Vlc3RfcGFnZSkodW5zaWduZWQgbG9uZyBoYW5kbGUsIHVu c2lnbmVkIGxvbmcgZ2ZuLAotCQkJCSAgZG1hX2FkZHJfdCAqZG1hX2FkZHIpOworCQkJCSAgdW5z aWduZWQgbG9uZyBzaXplLCBkbWFfYWRkcl90ICpkbWFfYWRkcik7CiAJdm9pZCAoKmRtYV91bm1h cF9ndWVzdF9wYWdlKSh1bnNpZ25lZCBsb25nIGhhbmRsZSwgZG1hX2FkZHJfdCBkbWFfYWRkcik7 CiAKIAlpbnQgKCptYXBfZ2ZuX3RvX21mbikodW5zaWduZWQgbG9uZyBoYW5kbGUsIHVuc2lnbmVk IGxvbmcgZ2ZuLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2t2bWd0LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQva3ZtZ3QuYwppbmRleCBkZjRlNGEwLi40ZDJmNTNh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQva3ZtZ3QuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9ndnQva3ZtZ3QuYwpAQCAtOTQsNiArOTQsNyBAQCBzdHJ1Y3QgZ3Z0 X2RtYSB7CiAJc3RydWN0IHJiX25vZGUgZG1hX2FkZHJfbm9kZTsKIAlnZm5fdCBnZm47CiAJZG1h X2FkZHJfdCBkbWFfYWRkcjsKKwl1bnNpZ25lZCBsb25nIHNpemU7CiAJc3RydWN0IGtyZWYgcmVm OwogfTsKIApAQCAtMTA2LDUxICsxMDcsMTAzIEBAIHN0YXRpYyBpbnQga3ZtZ3RfZ3Vlc3RfaW5p dChzdHJ1Y3QgbWRldl9kZXZpY2UgKm1kZXYpOwogc3RhdGljIHZvaWQgaW50ZWxfdmdwdV9yZWxl YXNlX3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKTsKIHN0YXRpYyBib29sIGt2bWd0X2d1 ZXN0X2V4aXQoc3RydWN0IGt2bWd0X2d1ZXN0X2luZm8gKmluZm8pOwogCi1zdGF0aWMgaW50IGd2 dF9kbWFfbWFwX3BhZ2Uoc3RydWN0IGludGVsX3ZncHUgKnZncHUsIHVuc2lnbmVkIGxvbmcgZ2Zu LAotCQlkbWFfYWRkcl90ICpkbWFfYWRkcikKK3N0YXRpYyB2b2lkIGd2dF91bnBpbl9ndWVzdF9w YWdlKHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LCB1bnNpZ25lZCBsb25nIGdmbiwKKwkJdW5zaWdu ZWQgbG9uZyBzaXplKQogewotCXN0cnVjdCBkZXZpY2UgKmRldiA9ICZ2Z3B1LT5ndnQtPmRldl9w cml2LT5kcm0ucGRldi0+ZGV2OwotCXN0cnVjdCBwYWdlICpwYWdlOwotCXVuc2lnbmVkIGxvbmcg cGZuOworCWludCB0b3RhbF9wYWdlczsKKwlpbnQgbnBhZ2U7CiAJaW50IHJldDsKIAotCS8qIFBp biB0aGUgcGFnZSBmaXJzdC4gKi8KLQlyZXQgPSB2ZmlvX3Bpbl9wYWdlcyhtZGV2X2Rldih2Z3B1 LT52ZGV2Lm1kZXYpLCAmZ2ZuLCAxLAotCQkJICAgICBJT01NVV9SRUFEIHwgSU9NTVVfV1JJVEUs ICZwZm4pOwotCWlmIChyZXQgIT0gMSkgewotCQlndnRfdmdwdV9lcnIoInZmaW9fcGluX3BhZ2Vz IGZhaWxlZCBmb3IgZ2ZuIDB4JWx4OiAlZFxuIiwKLQkJCSAgICAgZ2ZuLCByZXQpOwotCQlyZXR1 cm4gLUVJTlZBTDsKKwl0b3RhbF9wYWdlcyA9IHJvdW5kdXAoc2l6ZSwgUEFHRV9TSVpFKSAvIFBB R0VfU0laRTsKKworCWZvciAobnBhZ2UgPSAwOyBucGFnZSA8IHRvdGFsX3BhZ2VzOyBucGFnZSsr KSB7CisJCXVuc2lnbmVkIGxvbmcgY3VyX2dmbiA9IGdmbiArIG5wYWdlOworCisJCXJldCA9IHZm aW9fdW5waW5fcGFnZXMobWRldl9kZXYodmdwdS0+dmRldi5tZGV2KSwgJmN1cl9nZm4sIDEpOwor CQlXQVJOX09OKHJldCAhPSAxKTsKIAl9Cit9CiAKLQlpZiAoIXBmbl92YWxpZChwZm4pKSB7Ci0J CWd2dF92Z3B1X2VycigicGZuIDB4JWx4IGlzIG5vdCBtZW0gYmFja2VkXG4iLCBwZm4pOwotCQl2 ZmlvX3VucGluX3BhZ2VzKG1kZXZfZGV2KHZncHUtPnZkZXYubWRldiksICZnZm4sIDEpOwotCQly ZXR1cm4gLUVJTlZBTDsKKy8qIFBpbiBhIG5vcm1hbCBvciBjb21wb3VuZCBndWVzdCBwYWdlIGZv ciBkbWEuICovCitzdGF0aWMgaW50IGd2dF9waW5fZ3Vlc3RfcGFnZShzdHJ1Y3QgaW50ZWxfdmdw dSAqdmdwdSwgdW5zaWduZWQgbG9uZyBnZm4sCisJCXVuc2lnbmVkIGxvbmcgc2l6ZSwgc3RydWN0 IHBhZ2UgKipwYWdlKQoreworCXVuc2lnbmVkIGxvbmcgYmFzZV9wZm4gPSAwOworCWludCB0b3Rh bF9wYWdlczsKKwlpbnQgbnBhZ2U7CisJaW50IHJldDsKKworCXRvdGFsX3BhZ2VzID0gcm91bmR1 cChzaXplLCBQQUdFX1NJWkUpIC8gUEFHRV9TSVpFOworCS8qCisJICogV2UgcGluIHRoZSBwYWdl cyBvbmUtYnktb25lIHRvIGF2b2lkIGFsbG9jYXRpbmcgYSBiaWcgYXJyYXJ5CisJICogb24gc3Rh Y2sgdG8gaG9sZCBwZm5zLgorCSAqLworCWZvciAobnBhZ2UgPSAwOyBucGFnZSA8IHRvdGFsX3Bh Z2VzOyBucGFnZSsrKSB7CisJCXVuc2lnbmVkIGxvbmcgY3VyX2dmbiA9IGdmbiArIG5wYWdlOwor CQl1bnNpZ25lZCBsb25nIHBmbjsKKworCQlyZXQgPSB2ZmlvX3Bpbl9wYWdlcyhtZGV2X2Rldih2 Z3B1LT52ZGV2Lm1kZXYpLCAmY3VyX2dmbiwgMSwKKwkJCQkgICAgIElPTU1VX1JFQUQgfCBJT01N VV9XUklURSwgJnBmbik7CisJCWlmIChyZXQgIT0gMSkgeworCQkJZ3Z0X3ZncHVfZXJyKCJ2Zmlv X3Bpbl9wYWdlcyBmYWlsZWQgZm9yIGdmbiAweCVseCwgcmV0ICVkXG4iLAorCQkJCSAgICAgY3Vy X2dmbiwgcmV0KTsKKwkJCWdvdG8gZXJyOworCQl9CisKKwkJaWYgKCFwZm5fdmFsaWQocGZuKSkg eworCQkJZ3Z0X3ZncHVfZXJyKCJwZm4gMHglbHggaXMgbm90IG1lbSBiYWNrZWRcbiIsIHBmbik7 CisJCQlucGFnZSsrOworCQkJcmV0ID0gLUVGQVVMVDsKKwkJCWdvdG8gZXJyOworCQl9CisKKwkJ aWYgKG5wYWdlID09IDApCisJCQliYXNlX3BmbiA9IHBmbjsKKwkJZWxzZSBpZiAoYmFzZV9wZm4g KyBucGFnZSAhPSBwZm4pIHsKKwkJCWd2dF92Z3B1X2VycigiVGhlIHBhZ2VzIGFyZSBub3QgY29u dGludW91c1xuIik7CisJCQlyZXQgPSAtRUlOVkFMOworCQkJbnBhZ2UrKzsKKwkJCWdvdG8gZXJy OworCQl9CiAJfQogCisJKnBhZ2UgPSBwZm5fdG9fcGFnZShiYXNlX3Bmbik7CisJcmV0dXJuIDA7 CitlcnI6CisJZ3Z0X3VucGluX2d1ZXN0X3BhZ2UodmdwdSwgZ2ZuLCBucGFnZSAqIFBBR0VfU0la RSk7CisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIGludCBndnRfZG1hX21hcF9wYWdlKHN0cnVj dCBpbnRlbF92Z3B1ICp2Z3B1LCB1bnNpZ25lZCBsb25nIGdmbiwKKwkJZG1hX2FkZHJfdCAqZG1h X2FkZHIsIHVuc2lnbmVkIGxvbmcgc2l6ZSkKK3sKKwlzdHJ1Y3QgZGV2aWNlICpkZXYgPSAmdmdw dS0+Z3Z0LT5kZXZfcHJpdi0+ZHJtLnBkZXYtPmRldjsKKwlzdHJ1Y3QgcGFnZSAqcGFnZSA9IE5V TEw7CisJaW50IHJldDsKKworCXJldCA9IGd2dF9waW5fZ3Vlc3RfcGFnZSh2Z3B1LCBnZm4sIHNp emUsICZwYWdlKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCiAJLyogU2V0dXAgRE1BIG1h cHBpbmcuICovCi0JcGFnZSA9IHBmbl90b19wYWdlKHBmbik7Ci0JKmRtYV9hZGRyID0gZG1hX21h cF9wYWdlKGRldiwgcGFnZSwgMCwgUEFHRV9TSVpFLAotCQkJCSBQQ0lfRE1BX0JJRElSRUNUSU9O QUwpOwotCWlmIChkbWFfbWFwcGluZ19lcnJvcihkZXYsICpkbWFfYWRkcikpIHsKLQkJZ3Z0X3Zn cHVfZXJyKCJETUEgbWFwcGluZyBmYWlsZWQgZm9yIGdmbiAweCVseFxuIiwgZ2ZuKTsKLQkJdmZp b191bnBpbl9wYWdlcyhtZGV2X2Rldih2Z3B1LT52ZGV2Lm1kZXYpLCAmZ2ZuLCAxKTsKLQkJcmV0 dXJuIC1FTk9NRU07CisJKmRtYV9hZGRyID0gZG1hX21hcF9wYWdlKGRldiwgcGFnZSwgMCwgc2l6 ZSwgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKKwlyZXQgPSBkbWFfbWFwcGluZ19lcnJvcihkZXYs ICpkbWFfYWRkcik7CisJaWYgKHJldCkgeworCQlndnRfdmdwdV9lcnIoIkRNQSBtYXBwaW5nIGZh aWxlZCBmb3IgcGZuIDB4JWx4LCByZXQgJWRcbiIsCisJCQkgICAgIHBhZ2VfdG9fcGZuKHBhZ2Up LCByZXQpOworCQlndnRfdW5waW5fZ3Vlc3RfcGFnZSh2Z3B1LCBnZm4sIHNpemUpOwogCX0KIAot CXJldHVybiAwOworCXJldHVybiByZXQ7CiB9CiAKIHN0YXRpYyB2b2lkIGd2dF9kbWFfdW5tYXBf cGFnZShzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwgdW5zaWduZWQgbG9uZyBnZm4sCi0JCWRtYV9h ZGRyX3QgZG1hX2FkZHIpCisJCWRtYV9hZGRyX3QgZG1hX2FkZHIsIHVuc2lnbmVkIGxvbmcgc2l6 ZSkKIHsKIAlzdHJ1Y3QgZGV2aWNlICpkZXYgPSAmdmdwdS0+Z3Z0LT5kZXZfcHJpdi0+ZHJtLnBk ZXYtPmRldjsKLQlpbnQgcmV0OwogCi0JZG1hX3VubWFwX3BhZ2UoZGV2LCBkbWFfYWRkciwgUEFH RV9TSVpFLCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwotCXJldCA9IHZmaW9fdW5waW5fcGFnZXMo bWRldl9kZXYodmdwdS0+dmRldi5tZGV2KSwgJmdmbiwgMSk7Ci0JV0FSTl9PTihyZXQgIT0gMSk7 CisJZG1hX3VubWFwX3BhZ2UoZGV2LCBkbWFfYWRkciwgc2l6ZSwgUENJX0RNQV9CSURJUkVDVElP TkFMKTsKKwlndnRfdW5waW5fZ3Vlc3RfcGFnZSh2Z3B1LCBnZm4sIHNpemUpOwogfQogCiBzdGF0 aWMgc3RydWN0IGd2dF9kbWEgKl9fZ3Z0X2NhY2hlX2ZpbmRfZG1hX2FkZHIoc3RydWN0IGludGVs X3ZncHUgKnZncHUsCkBAIC0xOTEsNyArMjQ0LDcgQEAgc3RhdGljIHN0cnVjdCBndnRfZG1hICpf X2d2dF9jYWNoZV9maW5kX2dmbihzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwgZ2ZuX3QgZ2ZuKQog fQogCiBzdGF0aWMgaW50IF9fZ3Z0X2NhY2hlX2FkZChzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwg Z2ZuX3QgZ2ZuLAotCQlkbWFfYWRkcl90IGRtYV9hZGRyKQorCQlkbWFfYWRkcl90IGRtYV9hZGRy LCB1bnNpZ25lZCBsb25nIHNpemUpCiB7CiAJc3RydWN0IGd2dF9kbWEgKm5ldywgKml0cjsKIAlz dHJ1Y3QgcmJfbm9kZSAqKmxpbmssICpwYXJlbnQgPSBOVUxMOwpAQCAtMjAzLDYgKzI1Niw3IEBA IHN0YXRpYyBpbnQgX19ndnRfY2FjaGVfYWRkKHN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LCBnZm5f dCBnZm4sCiAJbmV3LT52Z3B1ID0gdmdwdTsKIAluZXctPmdmbiA9IGdmbjsKIAluZXctPmRtYV9h ZGRyID0gZG1hX2FkZHI7CisJbmV3LT5zaXplID0gc2l6ZTsKIAlrcmVmX2luaXQoJm5ldy0+cmVm KTsKIAogCS8qIGdmbl9jYWNoZSBtYXBzIGdmbiB0byBzdHJ1Y3QgZ3Z0X2RtYS4gKi8KQEAgLTI2 MCw3ICszMTQsNyBAQCBzdGF0aWMgdm9pZCBndnRfY2FjaGVfZGVzdHJveShzdHJ1Y3QgaW50ZWxf dmdwdSAqdmdwdSkKIAkJCWJyZWFrOwogCQl9CiAJCWRtYSA9IHJiX2VudHJ5KG5vZGUsIHN0cnVj dCBndnRfZG1hLCBnZm5fbm9kZSk7Ci0JCWd2dF9kbWFfdW5tYXBfcGFnZSh2Z3B1LCBkbWEtPmdm biwgZG1hLT5kbWFfYWRkcik7CisJCWd2dF9kbWFfdW5tYXBfcGFnZSh2Z3B1LCBkbWEtPmdmbiwg ZG1hLT5kbWFfYWRkciwgZG1hLT5zaXplKTsKIAkJX19ndnRfY2FjaGVfcmVtb3ZlX2VudHJ5KHZn cHUsIGRtYSk7CiAJCW11dGV4X3VubG9jaygmdmdwdS0+dmRldi5jYWNoZV9sb2NrKTsKIAl9CkBA IC01MTUsNyArNTY5LDggQEAgc3RhdGljIGludCBpbnRlbF92Z3B1X2lvbW11X25vdGlmaWVyKHN0 cnVjdCBub3RpZmllcl9ibG9jayAqbmIsCiAJCQlpZiAoIWVudHJ5KQogCQkJCWNvbnRpbnVlOwog Ci0JCQlndnRfZG1hX3VubWFwX3BhZ2UodmdwdSwgZW50cnktPmdmbiwgZW50cnktPmRtYV9hZGRy KTsKKwkJCWd2dF9kbWFfdW5tYXBfcGFnZSh2Z3B1LCBlbnRyeS0+Z2ZuLCBlbnRyeS0+ZG1hX2Fk ZHIsCisJCQkJCSAgIGVudHJ5LT5zaXplKTsKIAkJCV9fZ3Z0X2NhY2hlX3JlbW92ZV9lbnRyeSh2 Z3B1LCBlbnRyeSk7CiAJCX0KIAkJbXV0ZXhfdW5sb2NrKCZ2Z3B1LT52ZGV2LmNhY2hlX2xvY2sp OwpAQCAtMTY0OCw3ICsxNzAzLDcgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcga3ZtZ3RfZ2ZuX3Rv X3Bmbih1bnNpZ25lZCBsb25nIGhhbmRsZSwgdW5zaWduZWQgbG9uZyBnZm4pCiB9CiAKIGludCBr dm1ndF9kbWFfbWFwX2d1ZXN0X3BhZ2UodW5zaWduZWQgbG9uZyBoYW5kbGUsIHVuc2lnbmVkIGxv bmcgZ2ZuLAotCQlkbWFfYWRkcl90ICpkbWFfYWRkcikKKwkJdW5zaWduZWQgbG9uZyBzaXplLCBk bWFfYWRkcl90ICpkbWFfYWRkcikKIHsKIAlzdHJ1Y3Qga3ZtZ3RfZ3Vlc3RfaW5mbyAqaW5mbzsK IAlzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdTsKQEAgLTE2NjUsMTEgKzE3MjAsMTEgQEAgaW50IGt2 bWd0X2RtYV9tYXBfZ3Vlc3RfcGFnZSh1bnNpZ25lZCBsb25nIGhhbmRsZSwgdW5zaWduZWQgbG9u ZyBnZm4sCiAKIAllbnRyeSA9IF9fZ3Z0X2NhY2hlX2ZpbmRfZ2ZuKGluZm8tPnZncHUsIGdmbik7 CiAJaWYgKCFlbnRyeSkgewotCQlyZXQgPSBndnRfZG1hX21hcF9wYWdlKHZncHUsIGdmbiwgZG1h X2FkZHIpOworCQlyZXQgPSBndnRfZG1hX21hcF9wYWdlKHZncHUsIGdmbiwgZG1hX2FkZHIsIHNp emUpOwogCQlpZiAocmV0KQogCQkJZ290byBlcnJfdW5sb2NrOwogCi0JCXJldCA9IF9fZ3Z0X2Nh Y2hlX2FkZChpbmZvLT52Z3B1LCBnZm4sICpkbWFfYWRkcik7CisJCXJldCA9IF9fZ3Z0X2NhY2hl X2FkZChpbmZvLT52Z3B1LCBnZm4sICpkbWFfYWRkciwgc2l6ZSk7CiAJCWlmIChyZXQpCiAJCQln b3RvIGVycl91bm1hcDsKIAl9IGVsc2UgewpAQCAtMTY4MSw3ICsxNzM2LDcgQEAgaW50IGt2bWd0 X2RtYV9tYXBfZ3Vlc3RfcGFnZSh1bnNpZ25lZCBsb25nIGhhbmRsZSwgdW5zaWduZWQgbG9uZyBn Zm4sCiAJcmV0dXJuIDA7CiAKIGVycl91bm1hcDoKLQlndnRfZG1hX3VubWFwX3BhZ2UodmdwdSwg Z2ZuLCAqZG1hX2FkZHIpOworCWd2dF9kbWFfdW5tYXBfcGFnZSh2Z3B1LCBnZm4sICpkbWFfYWRk ciwgc2l6ZSk7CiBlcnJfdW5sb2NrOgogCW11dGV4X3VubG9jaygmaW5mby0+dmdwdS0+dmRldi5j YWNoZV9sb2NrKTsKIAlyZXR1cm4gcmV0OwpAQCAtMTY5MSw3ICsxNzQ2LDggQEAgc3RhdGljIHZv aWQgX19ndnRfZG1hX3JlbGVhc2Uoc3RydWN0IGtyZWYgKnJlZikKIHsKIAlzdHJ1Y3QgZ3Z0X2Rt YSAqZW50cnkgPSBjb250YWluZXJfb2YocmVmLCB0eXBlb2YoKmVudHJ5KSwgcmVmKTsKIAotCWd2 dF9kbWFfdW5tYXBfcGFnZShlbnRyeS0+dmdwdSwgZW50cnktPmdmbiwgZW50cnktPmRtYV9hZGRy KTsKKwlndnRfZG1hX3VubWFwX3BhZ2UoZW50cnktPnZncHUsIGVudHJ5LT5nZm4sIGVudHJ5LT5k bWFfYWRkciwKKwkJCSAgIGVudHJ5LT5zaXplKTsKIAlfX2d2dF9jYWNoZV9yZW1vdmVfZW50cnko ZW50cnktPnZncHUsIGVudHJ5KTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZ3Z0L21wdC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L21wdC5oCmluZGV4IDMyZmZj ZDUuLjY3ZjE5OTkyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvbXB0LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L21wdC5oCkBAIC0yMzAsMTcgKzIzMCwxOCBA QCBzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGxvbmcgaW50ZWxfZ3Z0X2h5cGVydmlzb3JfZ2ZuX3Rv X21mbigKIC8qKgogICogaW50ZWxfZ3Z0X2h5cGVydmlzb3JfZG1hX21hcF9ndWVzdF9wYWdlIC0g c2V0dXAgZG1hIG1hcCBmb3IgZ3Vlc3QgcGFnZQogICogQHZncHU6IGEgdkdQVQotICogQGdwZm46 IGd1ZXN0IHBmbgorICogQGdmbjogZ3Vlc3QgcGZuCisgKiBAc2l6ZTogcGFnZSBzaXplCiAgKiBA ZG1hX2FkZHI6IHJldHJpZXZlIGFsbG9jYXRlZCBkbWEgYWRkcgogICoKICAqIFJldHVybnM6CiAg KiAwIG9uIHN1Y2Nlc3MsIG5lZ2F0aXZlIGVycm9yIGNvZGUgaWYgZmFpbGVkLgogICovCiBzdGF0 aWMgaW5saW5lIGludCBpbnRlbF9ndnRfaHlwZXJ2aXNvcl9kbWFfbWFwX2d1ZXN0X3BhZ2UoCi0J CXN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LCB1bnNpZ25lZCBsb25nIGdmbiwKKwkJc3RydWN0IGlu dGVsX3ZncHUgKnZncHUsIHVuc2lnbmVkIGxvbmcgZ2ZuLCB1bnNpZ25lZCBsb25nIHNpemUsCiAJ CWRtYV9hZGRyX3QgKmRtYV9hZGRyKQogewotCXJldHVybiBpbnRlbF9ndnRfaG9zdC5tcHQtPmRt YV9tYXBfZ3Vlc3RfcGFnZSh2Z3B1LT5oYW5kbGUsIGdmbiwKKwlyZXR1cm4gaW50ZWxfZ3Z0X2hv c3QubXB0LT5kbWFfbWFwX2d1ZXN0X3BhZ2UodmdwdS0+aGFuZGxlLCBnZm4sIHNpemUsCiAJCQkJ CQkgICAgICBkbWFfYWRkcik7CiB9CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK