From: Paul Durrant Subject: [PATCH v7 7/7] x86: extend the map and unmap xen_iommu_ops to support grant references Date: Mon, 15 Oct 2018 11:35:59 +0100 Message-ID: <20181015103559.22075-8-paul.durrant@citrix.com> References: <20181015103559.22075-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gC0Ew-0005k9-Jn for xen-devel@lists.xenproject.org; Mon, 15 Oct 2018 10:36:46 +0000 In-Reply-To: <20181015103559.22075-1-paul.durrant@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Paul Durrant , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCBhbGxvd3MgYSBkb21haW4gdG8gYWRkIG9yIHJlbW92ZSBmb3JlaWduIGZyYW1l cyBmcm9tIGl0cwpJT01NVSBtYXBwaW5ncyBieSBncmFudCByZWZlcmVuY2UgYXMgd2VsbCBhcyBH Rk4uIFRoaXMgaXMgbmVjZXNzYXJ5LApmb3IgZXhhbXBsZSwgdG8gc3VwcG9ydCBhIFBWIG5ldHdv cmsgYmFja2VuZCB0aGF0IG5lZWRzIHRvIGNvbnN0cnVjdCBhCnBhY2tldCBidWZmZXIgdGhhdCBj YW4gYmUgZGlyZWN0bHkgYWNjZXNzZWQgYnkgYSBOSUMuCgpTaWduZWQtb2ZmLWJ5OiBQYXVsIER1 cnJhbnQgPHBhdWwuZHVycmFudEBjaXRyaXguY29tPgotLS0KQ2M6IEphbiBCZXVsaWNoIDxqYmV1 bGljaEBzdXNlLmNvbT4KQ2M6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5j b20+CkNjOiBHZW9yZ2UgRHVubGFwIDxHZW9yZ2UuRHVubGFwQGV1LmNpdHJpeC5jb20+CkNjOiBJ YW4gSmFja3NvbiA8aWFuLmphY2tzb25AZXUuY2l0cml4LmNvbT4KQ2M6IEp1bGllbiBHcmFsbCA8 anVsaWVuLmdyYWxsQGFybS5jb20+CkNjOiBLb25yYWQgUnplc3p1dGVrIFdpbGsgPGtvbnJhZC53 aWxrQG9yYWNsZS5jb20+CkNjOiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtlcm5l bC5vcmc+CkNjOiBUaW0gRGVlZ2FuIDx0aW1AeGVuLm9yZz4KQ2M6IFdlaSBMaXUgPHdlaS5saXUy QGNpdHJpeC5jb20+Cgp2NzoKIC0gUmUtYmFzZS4KCnY2OgogLSBSZS1iYXNlLgoKdjI6CiAtIE5l dyBpbiB2Mi4KLS0tCiB4ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMgICAgICB8IDE1MSArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIHhlbi9jb21tb24vaW9tbXVfb3Au YyAgICAgICAgIHwgMTAwICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIHhlbi9pbmNsdWRl L3B1YmxpYy9pb21tdV9vcC5oIHwgIDI5ICsrKysrKy0tCiB4ZW4vaW5jbHVkZS94ZW4vZ3JhbnRf dGFibGUuaCB8ICAgNSArKwogNCBmaWxlcyBjaGFuZ2VkLCAyNDggaW5zZXJ0aW9ucygrKSwgMzcg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2NvbW1vbi9ncmFudF90YWJsZS5jIGIveGVu L2NvbW1vbi9ncmFudF90YWJsZS5jCmluZGV4IDg3OGU2NjhiZjUuLmY3YzkzMzNmNjAgMTAwNjQ0 Ci0tLSBhL3hlbi9jb21tb24vZ3JhbnRfdGFibGUuYworKysgYi94ZW4vY29tbW9uL2dyYW50X3Rh YmxlLmMKQEAgLTM5MjcsNiArMzkyNywxNTcgQEAgaW50IGdudHRhYl9nZXRfc3RhdHVzX2ZyYW1l KHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgaWR4LAogICAgIHJldHVybiByYzsKIH0K IAoraW50CithY3F1aXJlX2dyZWZfZm9yX2lvbW11KHN0cnVjdCBkb21haW4gKmQsIGdyYW50X3Jl Zl90IGdyZWYsCisgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcmVhZG9ubHksIG1mbl90ICpt Zm4pCit7CisgICAgc3RydWN0IGRvbWFpbiAqY3VycmQgPSBjdXJyZW50LT5kb21haW47CisgICAg c3RydWN0IGdyYW50X3RhYmxlICpndCA9IGQtPmdyYW50X3RhYmxlOworICAgIGdyYW50X2VudHJ5 X2hlYWRlcl90ICpzaGFoOworICAgIHN0cnVjdCBhY3RpdmVfZ3JhbnRfZW50cnkgKmFjdDsKKyAg ICB1aW50MTZfdCAqc3RhdHVzOworICAgIGludCByYzsKKworICAgIGdyYW50X3JlYWRfbG9jayhn dCk7CisKKyAgICByYyA9IC1FTk9FTlQ7CisgICAgaWYgKCBncmVmID4gbnJfZ3JhbnRfZW50cmll cyhndCkgKQorICAgICAgICBnb3RvIHVubG9jazsKKworICAgIGFjdCA9IGFjdGl2ZV9lbnRyeV9h Y3F1aXJlKGd0LCBncmVmKTsKKyAgICBzaGFoID0gc2hhcmVkX2VudHJ5X2hlYWRlcihndCwgZ3Jl Zik7CisgICAgc3RhdHVzID0gKCBndC0+Z3RfdmVyc2lvbiA9PSAyICkgPworICAgICAgICAmc3Rh dHVzX2VudHJ5KGd0LCBncmVmKSA6CisgICAgICAgICZzaGFoLT5mbGFnczsKKworICAgIHJjID0g LUVBQ0NFUzsKKyAgICBpZiAoIChzaGFoLT5mbGFncyAmIEdURl90eXBlX21hc2spICE9IEdURl9w ZXJtaXRfYWNjZXNzIHx8CisgICAgICAgICAoc2hhaC0+ZmxhZ3MgJiBHVEZfc3ViX3BhZ2UpICkK KyAgICAgICAgZ290byByZWxlYXNlOworCisgICAgcmMgPSAtRVJBTkdFOworICAgIGlmICggYWN0 LT5waW4gJiYgKChhY3QtPmRvbWlkICE9IGN1cnJkLT5kb21haW5faWQpIHx8CisgICAgICAgICAg ICAgICAgICAgICAgKGFjdC0+cGluICYgMHg4MDgwODA4MFUpICE9IDApICkKKyAgICAgICAgZ290 byByZWxlYXNlOworCisgICAgcmMgPSAtRUlOVkFMOworICAgIGlmICggIWFjdC0+cGluIHx8Cisg ICAgICAgICAoIXJlYWRvbmx5ICYmICEoYWN0LT5waW4gJiBHTlRQSU5fZGV2d19tYXNrKSkgKSB7 CisgICAgICAgIGlmICggX3NldF9zdGF0dXMoZ3QtPmd0X3ZlcnNpb24sIGN1cnJkLT5kb21haW5f aWQsIHJlYWRvbmx5LAorICAgICAgICAgICAgICAgICAgICAgICAgIDAsIHNoYWgsIGFjdCwgc3Rh dHVzKSAhPSBHTlRTVF9va2F5ICkKKyAgICAgICAgICAgIGdvdG8gcmVsZWFzZTsKKyAgICB9CisK KyAgICBpZiAoICFhY3QtPnBpbiApCisgICAgeworICAgICAgICBnZm5fdCBnZm4gPSBndC0+Z3Rf dmVyc2lvbiA9PSAxID8KKyAgICAgICAgICAgIF9nZm4oc2hhcmVkX2VudHJ5X3YxKGd0LCBncmVm KS5mcmFtZSkgOgorICAgICAgICAgICAgX2dmbihzaGFyZWRfZW50cnlfdjIoZ3QsIGdyZWYpLmZ1 bGxfcGFnZS5mcmFtZSk7CisgICAgICAgIHAybV90eXBlX3QgcDJtdDsKKyAgICAgICAgc3RydWN0 IHBhZ2VfaW5mbyAqcGFnZTsKKworICAgICAgICByYyA9IGNoZWNrX2dldF9wYWdlX2Zyb21fZ2Zu KGQsIGdmbiwgcmVhZG9ubHksICZwMm10LCAmcGFnZSk7CisgICAgICAgIGlmICggcmMgKQorICAg ICAgICAgICAgZ290byBjbGVhcjsKKworICAgICAgICByYyA9IC1FSU5WQUw7CisgICAgICAgIGlm ICggcDJtX2lzX2ZvcmVpZ24ocDJtdCkgKQorICAgICAgICB7CisgICAgICAgICAgICBwdXRfcGFn ZShwYWdlKTsKKyAgICAgICAgICAgIGdvdG8gY2xlYXI7CisgICAgICAgIH0KKworICAgICAgICBh Y3Rfc2V0X2dmbihhY3QsIGdmbik7CisgICAgICAgIGFjdC0+bWZuID0gcGFnZV90b19tZm4ocGFn ZSk7CisgICAgICAgIGFjdC0+ZG9taWQgPSBjdXJyZC0+ZG9tYWluX2lkOworICAgICAgICBhY3Qt PnN0YXJ0ID0gMDsKKyAgICAgICAgYWN0LT5sZW5ndGggPSBQQUdFX1NJWkU7CisgICAgICAgIGFj dC0+aXNfc3ViX3BhZ2UgPSBmYWxzZTsKKyAgICAgICAgYWN0LT50cmFuc19kb21haW4gPSBkOwor ICAgICAgICBhY3QtPnRyYW5zX2dyZWYgPSBncmVmOworICAgIH0KKyAgICBlbHNlCisgICAgewor ICAgICAgICBBU1NFUlQobWZuX3ZhbGlkKGFjdC0+bWZuKSk7CisgICAgICAgIGlmICggIWdldF9w YWdlKG1mbl90b19wYWdlKGFjdC0+bWZuKSwgZCkgKQorICAgICAgICAgICAgZ290byBjbGVhcjsK KyAgICB9CisKKyAgICByYyA9IDA7CisgICAgYWN0LT5waW4gKz0gcmVhZG9ubHkgPyBHTlRQSU5f ZGV2cl9pbmMgOiBHTlRQSU5fZGV2d19pbmM7CisgICAgKm1mbiA9IGFjdC0+bWZuOworICAgIGdv dG8gcmVsZWFzZTsKKworIGNsZWFyOgorICAgIGlmICggIXJlYWRvbmx5ICYmICEoYWN0LT5waW4g JiBHTlRQSU5fZGV2d19tYXNrKSApCisgICAgICAgIGdudHRhYl9jbGVhcl9mbGFnKF9HVEZfd3Jp dGluZywgc3RhdHVzKTsKKworICAgIGlmICggIWFjdC0+cGluICkKKyAgICAgICAgZ250dGFiX2Ns ZWFyX2ZsYWcoX0dURl9yZWFkaW5nLCBzdGF0dXMpOworCisgcmVsZWFzZToKKyAgICBhY3RpdmVf ZW50cnlfcmVsZWFzZShhY3QpOworCisgdW5sb2NrOgorICAgIGdyYW50X3JlYWRfdW5sb2NrKGd0 KTsKKworICAgIHJldHVybiByYzsKK30KKworaW50CityZWxlYXNlX2dyZWZfZm9yX2lvbW11KHN0 cnVjdCBkb21haW4gKmQsIGdyYW50X3JlZl90IGdyZWYsCisgICAgICAgICAgICAgICAgICAgICAg IGJvb2wgcmVhZG9ubHksIG1mbl90IG1mbikKK3sKKyAgICBzdHJ1Y3QgZG9tYWluICpjdXJyZCA9 IGN1cnJlbnQtPmRvbWFpbjsKKyAgICBzdHJ1Y3QgZ3JhbnRfdGFibGUgKmd0ID0gZC0+Z3JhbnRf dGFibGU7CisgICAgZ3JhbnRfZW50cnlfaGVhZGVyX3QgKnNoYWg7CisgICAgc3RydWN0IGFjdGl2 ZV9ncmFudF9lbnRyeSAqYWN0OworICAgIHVpbnQxNl90ICpzdGF0dXM7CisgICAgaW50IHJjOwor CisgICAgZ3JhbnRfcmVhZF9sb2NrKGd0KTsKKworICAgIHJjID0gLUVOT0VOVDsKKyAgICBpZiAo IGdyZWYgPiBucl9ncmFudF9lbnRyaWVzKGd0KSApCisgICAgICAgIGdvdG8gdW5sb2NrOworCisg ICAgYWN0ID0gYWN0aXZlX2VudHJ5X2FjcXVpcmUoZ3QsIGdyZWYpOworICAgIHNoYWggPSBzaGFy ZWRfZW50cnlfaGVhZGVyKGd0LCBncmVmKTsKKyAgICBzdGF0dXMgPSAoIGd0LT5ndF92ZXJzaW9u ID09IDIgKSA/CisgICAgICAgICZzdGF0dXNfZW50cnkoZ3QsIGdyZWYpIDoKKyAgICAgICAgJnNo YWgtPmZsYWdzOworCisgICAgcmMgPSAtRUlOVkFMOworICAgIGlmICggIWFjdC0+cGluIHx8IChh Y3QtPmRvbWlkICE9IGN1cnJkLT5kb21haW5faWQpIHx8CisgICAgICAgICAhbWZuX2VxKGFjdC0+ bWZuLCBtZm4pICkKKyAgICAgICAgZ290byByZWxlYXNlOworCisgICAgcmMgPSAwOworICAgIGlm ICggcmVhZG9ubHkgKQorICAgICAgICBhY3QtPnBpbiAtPSBHTlRQSU5fZGV2cl9pbmM7CisgICAg ZWxzZQorICAgIHsKKyAgICAgICAgZ250dGFiX21hcmtfZGlydHkoZCwgbWZuKTsKKworICAgICAg ICBhY3QtPnBpbiAtPSBHTlRQSU5fZGV2d19pbmM7CisgICAgICAgIGlmICggIShhY3QtPnBpbiAm IEdOVFBJTl9kZXZ3X21hc2spICkKKyAgICAgICAgICAgIGdudHRhYl9jbGVhcl9mbGFnKF9HVEZf d3JpdGluZywgc3RhdHVzKTsKKyAgICB9CisKKyAgICBpZiAoICFhY3QtPnBpbiApCisgICAgICAg IGdudHRhYl9jbGVhcl9mbGFnKF9HVEZfcmVhZGluZywgc3RhdHVzKTsKKworICAgIHB1dF9wYWdl KG1mbl90b19wYWdlKG1mbikpOworCisgcmVsZWFzZToKKyAgICBhY3RpdmVfZW50cnlfcmVsZWFz ZShhY3QpOworCisgdW5sb2NrOgorICAgIGdyYW50X3JlYWRfdW5sb2NrKGd0KTsKKworICAgIHJl dHVybiByYzsKK30KKwogc3RhdGljIHZvaWQgZ250dGFiX3VzYWdlX3ByaW50KHN0cnVjdCBkb21h aW4gKnJkKQogewogICAgIGludCBmaXJzdCA9IDE7CmRpZmYgLS1naXQgYS94ZW4vY29tbW9uL2lv bW11X29wLmMgYi94ZW4vY29tbW9uL2lvbW11X29wLmMKaW5kZXggMDg3NjQxNGRmNS4uNWU4ZDhj MmU3YSAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9pb21tdV9vcC5jCisrKyBiL3hlbi9jb21tb24v aW9tbXVfb3AuYwpAQCAtMjEsNiArMjEsNyBAQAogCiAjaW5jbHVkZSA8eGVuL2V2ZW50Lmg+CiAj aW5jbHVkZSA8eGVuL2d1ZXN0X2FjY2Vzcy5oPgorI2luY2x1ZGUgPHhlbi9ncmFudF90YWJsZS5o PgogI2luY2x1ZGUgPHhlbi9oeXBlcmNhbGwuaD4KICNpbmNsdWRlIDx4ZW4vbm9zcGVjLmg+CiAK QEAgLTEzNCwxNCArMTM1LDEzIEBAIHN0YXRpYyBpbnQgaW9tbXVvcF9tYXAoc3RydWN0IHhlbl9p b21tdV9vcF9tYXAgKm9wKQogICAgIHN0cnVjdCBkb21haW5faW9tbXUgKmlvbW11ID0gZG9tX2lv bW11KGN1cnJkKTsKICAgICBib29sIHJlYWRvbmx5ID0gb3AtPmZsYWdzICYgWEVOX0lPTU1VT1Bf bWFwX3JlYWRvbmx5OwogICAgIGRmbl90IGRmbiA9IF9kZm4ob3AtPmRmbik7Ci0gICAgcDJtX3R5 cGVfdCBwMm10OwotICAgIHN0cnVjdCBwYWdlX2luZm8gKnBhZ2U7Ci0gICAgbWZuX3QgaWdub3Jl OworICAgIG1mbl90IG1mbiwgaWdub3JlOwogICAgIHVuc2lnbmVkIGludCBmbGFnczsKICAgICBp bnQgcmM7CiAKICAgICBpZiAoIG9wLT5wYWQgfHwgKG9wLT5mbGFncyAmIH4oWEVOX0lPTU1VT1Bf bWFwX2FsbCB8Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFhFTl9JT01NVU9Q X21hcF9yZWFkb25seSkpICkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgWEVO X0lPTU1VT1BfbWFwX3JlYWRvbmx5IHwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgWEVOX0lPTU1VT1BfbWFwX2dyZWYpKSApCiAgICAgICAgIHJldHVybiAtRUlOVkFMOwogCiAg ICAgaWYgKCAhaW9tbXUtPmRvbWFpbl9jb250cm9sICkKQEAgLTE1OSwxNiArMTU5LDMxIEBAIHN0 YXRpYyBpbnQgaW9tbXVvcF9tYXAoc3RydWN0IHhlbl9pb21tdV9vcF9tYXAgKm9wKQogICAgIGlm ICggIWQgKQogICAgICAgICByZXR1cm4gLUVTUkNIOwogCi0gICAgcmMgPSBjaGVja19nZXRfcGFn ZV9mcm9tX2dmbihkLCBfZ2ZuKG9wLT5nZm4pLCByZWFkb25seSwgJnAybXQsICZwYWdlKTsKLSAg ICBpZiAoIHJjICkKLSAgICAgICAgZ290byB1bmxvY2tfZG9tYWluOwotCi0gICAgcmMgPSAtRUlO VkFMOwotICAgIGlmICggcDJtdCAhPSBwMm1fcmFtX3J3IHx8Ci0gICAgICAgICAoIXJlYWRvbmx5 ICYmICFnZXRfcGFnZV90eXBlKHBhZ2UsIFBHVF93cml0YWJsZV9wYWdlKSkgKQorICAgIGlmICgg b3AtPmZsYWdzICYgWEVOX0lPTU1VT1BfbWFwX2dyZWYgKQogICAgIHsKLSAgICAgICAgcHV0X3Bh Z2UocGFnZSk7Ci0gICAgICAgIGdvdG8gdW5sb2NrX2RvbWFpbjsKKyAgICAgICAgcmMgPSBhY3F1 aXJlX2dyZWZfZm9yX2lvbW11KGQsIG9wLT51LmdyZWYsIHJlYWRvbmx5LCAmbWZuKTsKKyAgICAg ICAgaWYgKCByYyApCisgICAgICAgICAgICBnb3RvIHVubG9ja19kb21haW47CisgICAgfQorICAg IGVsc2UKKyAgICB7CisgICAgICAgIHAybV90eXBlX3QgcDJtdDsKKyAgICAgICAgc3RydWN0IHBh Z2VfaW5mbyAqcGFnZTsKKworICAgICAgICByYyA9IGNoZWNrX2dldF9wYWdlX2Zyb21fZ2ZuKGQs IF9nZm4ob3AtPnUuZ2ZuKSwgcmVhZG9ubHksICZwMm10LAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICZwYWdlKTsKKyAgICAgICAgaWYgKCByYyApCisgICAgICAgICAgICBn b3RvIHVubG9ja19kb21haW47CisKKyAgICAgICAgcmMgPSAtRUlOVkFMOworICAgICAgICBpZiAo IHAybXQgIT0gcDJtX3JhbV9ydyB8fAorICAgICAgICAgICAgICghcmVhZG9ubHkgJiYgIWdldF9w YWdlX3R5cGUocGFnZSwgUEdUX3dyaXRhYmxlX3BhZ2UpKSApCisgICAgICAgIHsKKyAgICAgICAg ICAgIHB1dF9wYWdlKHBhZ2UpOworICAgICAgICAgICAgZ290byB1bmxvY2tfZG9tYWluOworICAg ICAgICB9CisKKyAgICAgICAgbWZuID0gcGFnZV90b19tZm4ocGFnZSk7CiAgICAgfQogCiAgICAg c3Bpbl9sb2NrKCZpb21tdS0+bG9jayk7CkBAIC0xODYsMTYgKzIwMSwyMyBAQCBzdGF0aWMgaW50 IGlvbW11b3BfbWFwKHN0cnVjdCB4ZW5faW9tbXVfb3BfbWFwICpvcCkKICAgICBpZiAoICFyZWFk b25seSApCiAgICAgICAgIGZsYWdzIHw9IElPTU1VRl93cml0YWJsZTsKIAotICAgIHJjID0gaW9t bXVfbWFwX3BhZ2Vfbm9jcmFzaChjdXJyZCwgZGZuLCBwYWdlX3RvX21mbihwYWdlKSwgZmxhZ3Mp OworICAgIHJjID0gaW9tbXVfbWFwX3BhZ2Vfbm9jcmFzaChjdXJyZCwgZGZuLCBtZm4sIGZsYWdz KTsKIAogIHVubG9ja19pb21tdToKICAgICBzcGluX3VubG9jaygmaW9tbXUtPmxvY2spOwogCiAg ICAgaWYgKCByYyApIC8qIHJldGFpbiByZWZlcmVuY2VzIGlmIG1hcHBpbmcgaXMgc3VjY2Vzc2Z1 bCAqLwogICAgIHsKLSAgICAgICAgaWYgKCAhcmVhZG9ubHkgKQotICAgICAgICAgICAgcHV0X3Bh Z2VfdHlwZShwYWdlKTsKLSAgICAgICAgcHV0X3BhZ2UocGFnZSk7CisgICAgICAgIGlmICggb3At PmZsYWdzICYgWEVOX0lPTU1VT1BfbWFwX2dyZWYgKQorICAgICAgICAgICAgcmVsZWFzZV9ncmVm X2Zvcl9pb21tdShkLCBvcC0+dS5ncmVmLCByZWFkb25seSwgbWZuKTsKKyAgICAgICAgZWxzZQor ICAgICAgICB7CisgICAgICAgICAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlID0gbWZuX3RvX3Bh Z2UobWZuKTsKKworICAgICAgICAgICAgaWYgKCAhcmVhZG9ubHkgKQorICAgICAgICAgICAgICAg IHB1dF9wYWdlX3R5cGUocGFnZSk7CisgICAgICAgICAgICBwdXRfcGFnZShwYWdlKTsKKyAgICAg ICAgfQogICAgIH0KIAogIHVubG9ja19kb21haW46CkBAIC0yMTEsMTIgKzIzMywxMSBAQCBzdGF0 aWMgaW50IGlvbW11b3BfdW5tYXAoc3RydWN0IHhlbl9pb21tdV9vcF91bm1hcCAqb3ApCiAgICAg bWZuX3QgbWZuOwogICAgIHVuc2lnbmVkIGludCBmbGFnczsKICAgICBib29sIHJlYWRvbmx5Owot ICAgIHAybV90eXBlX3QgcDJtdDsKLSAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlOwogICAgIGlu dCByYzsKIAogICAgIGlmICggb3AtPnBhZCB8fAotICAgICAgICAgKG9wLT5mbGFncyAmIH5YRU5f SU9NTVVPUF91bm1hcF9hbGwpICkKKyAgICAgICAgIChvcC0+ZmxhZ3MgJiB+KFhFTl9JT01NVU9Q X3VubWFwX2FsbCB8CisgICAgICAgICAgICAgICAgICAgICAgICBYRU5fSU9NTVVPUF91bm1hcF9n cmVmKSkgKQogICAgICAgICByZXR1cm4gLUVJTlZBTDsKIAogICAgIGlmICggIWlvbW11LT5kb21h aW5fY29udHJvbCApCkBAIC0yNDMsMjMgKzI2NCwzNiBAQCBzdGF0aWMgaW50IGlvbW11b3BfdW5t YXAoc3RydWN0IHhlbl9pb21tdV9vcF91bm1hcCAqb3ApCiAKICAgICByZWFkb25seSA9ICEoZmxh Z3MgJiBJT01NVUZfd3JpdGFibGUpOwogCi0gICAgLyogTWFrZSBzdXJlIHRoZSBtYXBwZWQgZnJh bWUgbWF0Y2hlcyAqLwotICAgIHJjID0gY2hlY2tfZ2V0X3BhZ2VfZnJvbV9nZm4oZCwgX2dmbihv cC0+Z2ZuKSwgcmVhZG9ubHksICZwMm10LCAmcGFnZSk7Ci0gICAgaWYgKCByYyApCi0gICAgICAg IGdvdG8gdW5sb2NrOworICAgIGlmICggb3AtPmZsYWdzICYgWEVOX0lPTU1VT1BfbWFwX2dyZWYg KQorICAgIHsKKyAgICAgICAgcmMgPSByZWxlYXNlX2dyZWZfZm9yX2lvbW11KGQsIG9wLT51Lmdy ZWYsIHJlYWRvbmx5LCBtZm4pOworICAgICAgICBpZiAoIHJjICkKKyAgICAgICAgICAgIGdvdG8g dW5sb2NrOworICAgIH0KKyAgICBlbHNlCisgICAgeworICAgICAgICBwMm1fdHlwZV90IHAybXQ7 CisgICAgICAgIHN0cnVjdCBwYWdlX2luZm8gKnBhZ2U7CiAKLSAgICByYyA9ICFtZm5fZXEobWZu LCBwYWdlX3RvX21mbihwYWdlKSkgPyAtRUlOVkFMIDogMDsKKyAgICAgICAgLyogTWFrZSBzdXJl IHRoZSBtYXBwZWQgZnJhbWUgbWF0Y2hlcyAqLworICAgICAgICByYyA9IGNoZWNrX2dldF9wYWdl X2Zyb21fZ2ZuKGQsIF9nZm4ob3AtPnUuZ2ZuKSwgcmVhZG9ubHksICZwMm10LAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICZwYWdlKTsKKyAgICAgICAgaWYgKCByYyApCisg ICAgICAgICAgICBnb3RvIHVubG9jazsKIAotICAgIC8qIFJlbGVhc2UgcmVmZXJlbmNlIHRha2Vu IGFib3ZlICovCi0gICAgcHV0X3BhZ2UocGFnZSk7CisgICAgICAgIHJjID0gIW1mbl9lcShtZm4s IHBhZ2VfdG9fbWZuKHBhZ2UpKSA/IC1FSU5WQUwgOiAwOwogCi0gICAgaWYgKCByYyApCi0gICAg ICAgIGdvdG8gdW5sb2NrOworICAgICAgICAvKiBSZWxlYXNlIHJlZmVyZW5jZSB0YWtlbiBhYm92 ZSAqLworICAgICAgICBwdXRfcGFnZShwYWdlKTsKIAotICAgIC8qIFJlbGVhc2UgcmVmZXJlbmNl cyB0YWtlbiBpbiBtYXAgKi8KLSAgICBpZiAoICFyZWFkb25seSApCi0gICAgICAgIHB1dF9wYWdl X3R5cGUocGFnZSk7Ci0gICAgcHV0X3BhZ2UocGFnZSk7CisgICAgICAgIGlmICggcmMgKQorICAg ICAgICAgICAgZ290byB1bmxvY2s7CisKKyAgICAgICAgLyogUmVsZWFzZSByZWZlcmVuY2VzIHRh a2VuIGluIG1hcCAqLworICAgICAgICBpZiAoICFyZWFkb25seSApCisgICAgICAgICAgICBwdXRf cGFnZV90eXBlKHBhZ2UpOworICAgICAgICBwdXRfcGFnZShwYWdlKTsKKyAgICB9CiAKICAgICAv KgogICAgICAqIFRoaXMgcmVhbGx5IHNob3VsZCBub3QgZmFpbC4gSWYgaXQgZG9lcywgdGhlcmUg aXMgYW4gaW1wbGljaXQKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL3B1YmxpYy9pb21tdV9vcC5o IGIveGVuL2luY2x1ZGUvcHVibGljL2lvbW11X29wLmgKaW5kZXggZmNjYTQ3ZThkMi4uYjQ5ZDNl ZTJiNiAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvcHVibGljL2lvbW11X29wLmgKKysrIGIveGVu L2luY2x1ZGUvcHVibGljL2lvbW11X29wLmgKQEAgLTI0LDYgKzI0LDcgQEAKICNkZWZpbmUgWEVO X1BVQkxJQ19JT01NVV9PUF9ICiAKICNpbmNsdWRlICJ4ZW4uaCIKKyNpbmNsdWRlICJncmFudF90 YWJsZS5oIgogCiB0eXBlZGVmIHVpbnQ2NF90IHhlbl9kZm5fdDsKIApAQCAtMTA3LDYgKzEwOCwx MCBAQCBzdHJ1Y3QgeGVuX2lvbW11X29wX21hcCB7CiAjZGVmaW5lIF9YRU5fSU9NTVVPUF9tYXBf cmVhZG9ubHkgMQogI2RlZmluZSBYRU5fSU9NTVVPUF9tYXBfcmVhZG9ubHkgKDEgPDwgKF9YRU5f SU9NTVVPUF9tYXBfcmVhZG9ubHkpKQogCisgICAgLyogSXMgdGhlIG1lbW9yeSBzcGVjaWZpZWQg YnkgZ2ZuIG9yIGdyYW50IHJlZmVyZW5jZT8gKi8KKyNkZWZpbmUgX1hFTl9JT01NVU9QX21hcF9n cmVmIDIKKyNkZWZpbmUgWEVOX0lPTU1VT1BfbWFwX2dyZWYgKDEgPDwgKF9YRU5fSU9NTVVPUF9t YXBfZ3JlZikpCisKICAgICB1aW50MzJfdCBwYWQ7CiAgICAgLyoKICAgICAgKiBJTiAtIFNlZ21l bnQvQnVzL0RldmljZS9GdW5jdGlvbiBvZiB0aGUgaW5pdGlhdG9yLgpAQCAtMTE2LDggKzEyMSwx NCBAQCBzdHJ1Y3QgeGVuX2lvbW11X29wX21hcCB7CiAgICAgdWludDY0X3Qgc2JkZjsKICAgICAv KiBJTiAtIFRoZSBJT01NVSBmcmFtZSBudW1iZXIgd2hpY2ggd2lsbCBob2xkIHRoZSBuZXcgbWFw cGluZyAqLwogICAgIHhlbl9kZm5fdCBkZm47Ci0gICAgLyogSU4gLSBUaGUgZ3Vlc3QgZnJhbWUg bnVtYmVyIG9mIHRoZSBwYWdlIHRvIGJlIG1hcHBlZCAqLwotICAgIHhlbl9wZm5fdCBnZm47Cisg ICAgLyoKKyAgICAgKiBJTiAtIFRoZSBndWVzdCBmcmFtZSBudW1iZXIgb3IgZ3JhbnQgcmVmZXJl bmNlIG9mIHRoZSBwYWdlIHRvCisgICAgICogYmUgbWFwcGVkLgorICAgICAqLworICAgIHVuaW9u IHsKKyAgICAgICAgeGVuX3Bmbl90IGdmbjsKKyAgICAgICAgZ3JhbnRfcmVmX3QgZ3JlZjsKKyAg ICB9IHU7CiB9OwogCiAvKgpAQCAtMTQzLDYgKzE1NCwxMCBAQCBzdHJ1Y3QgeGVuX2lvbW11X29w X3VubWFwIHsKICNkZWZpbmUgX1hFTl9JT01NVU9QX3VubWFwX2FsbCAwCiAjZGVmaW5lIFhFTl9J T01NVU9QX3VubWFwX2FsbCAoMSA8PCAoX1hFTl9JT01NVU9QX3VubWFwX2FsbCkpCiAKKyAgICAv KiBJcyB0aGUgbWVtb3J5IHNwZWNpZmllZCBieSBnZm4gb3IgZ3JhbnQgcmVmZXJlbmNlPyAqLwor I2RlZmluZSBfWEVOX0lPTU1VT1BfdW5tYXBfZ3JlZiAxCisjZGVmaW5lIFhFTl9JT01NVU9QX3Vu bWFwX2dyZWYgKDEgPDwgKF9YRU5fSU9NTVVPUF91bm1hcF9ncmVmKSkKKwogICAgIHVpbnQzMl90 IHBhZDsKICAgICAvKgogICAgICAqIElOIC0gU2VnbWVudC9CdXMvRGV2aWNlL0Z1bmN0aW9uIG9m IHRoZSBpbml0aWF0b3IuCkBAIC0xNTIsOCArMTY3LDE0IEBAIHN0cnVjdCB4ZW5faW9tbXVfb3Bf dW5tYXAgewogICAgIHVpbnQ2NF90IHNiZGY7CiAgICAgLyogSU4gLSBUaGUgSU9NTVUgZnJhbWUg bnVtYmVyIHdoaWNoIGhvbGRzIHRoZSBtYXBwaW5nIHRvIGJlIHJlbW92ZWQgKi8KICAgICB4ZW5f ZGZuX3QgZGZuOwotICAgIC8qIElOIC0gVGhlIGd1ZXN0IGZyYW1lIG51bWJlciBvZiB0aGUgcGFn ZSB0aGF0IGlzIG1hcHBlZCAqLwotICAgIHhlbl9wZm5fdCBnZm47CisgICAgLyoKKyAgICAgKiBJ TiAtIFRoZSBndWVzdCBmcmFtZSBudW1iZXIgb3IgZ3JhbnQgcmVmZXJlbmNlIG9mIHRoZSBwYWdl IHRoYXQKKyAgICAgKiBpcyBtYXBwZWQuCisgICAgICovCisgICAgdW5pb24geworICAgICAgICB4 ZW5fcGZuX3QgZ2ZuOworICAgICAgICBncmFudF9yZWZfdCBncmVmOworICAgIH0gdTsKIH07CiAK IHN0cnVjdCB4ZW5faW9tbXVfb3AgewpkaWZmIC0tZ2l0IGEveGVuL2luY2x1ZGUveGVuL2dyYW50 X3RhYmxlLmggYi94ZW4vaW5jbHVkZS94ZW4vZ3JhbnRfdGFibGUuaAppbmRleCAxMmU4YTRiODBi Li40YTI2ZjVkYmU0IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS94ZW4vZ3JhbnRfdGFibGUuaAor KysgYi94ZW4vaW5jbHVkZS94ZW4vZ3JhbnRfdGFibGUuaApAQCAtNjEsNCArNjEsOSBAQCBpbnQg Z250dGFiX2dldF9zaGFyZWRfZnJhbWUoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBp ZHgsCiBpbnQgZ250dGFiX2dldF9zdGF0dXNfZnJhbWUoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWdu ZWQgbG9uZyBpZHgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWZuX3QgKm1mbik7CiAK K2ludCBhY3F1aXJlX2dyZWZfZm9yX2lvbW11KHN0cnVjdCBkb21haW4gKmQsIGdyYW50X3JlZl90 IGdyZWYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHJlYWRvbmx5LCBtZm5fdCAq bWZuKTsKK2ludCByZWxlYXNlX2dyZWZfZm9yX2lvbW11KHN0cnVjdCBkb21haW4gKmQsIGdyYW50 X3JlZl90IGdyZWYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHJlYWRvbmx5LCBt Zm5fdCBtZm4pOworCiAjZW5kaWYgLyogX19YRU5fR1JBTlRfVEFCTEVfSF9fICovCi0tIAoyLjEx LjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczov L2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs