From: Paul Durrant Subject: [PATCH v11 8/9] mm / iommu: include need_iommu() test in iommu_use_hap_pt() Date: Fri, 21 Sep 2018 11:56:25 +0100 Message-ID: <20180921105626.26776-9-paul.durrant@citrix.com> References: <20180921105626.26776-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1g3J6z-0005qx-4n for xen-devel@lists.xenproject.org; Fri, 21 Sep 2018 10:56:37 +0000 In-Reply-To: <20180921105626.26776-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 , Jun Nakajima , George Dunlap , Andrew Cooper , Julien Grall , Paul Durrant , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhlIG5hbWUgJ2lvbW11X3VzZV9oYXBfcHQnIHN1Z2dlc3RzIHRoYXQgdGhhdCBQMk0gdGFibGUg aXMgaW4gdXNlIGFzIHRoZQpkb21haW4ncyBJT01NVSBwYWdldGFibGUgd2hpY2gsIHByaW9yIHRv IHRoaXMgcGF0Y2gsIGlzIG5vdCBzdHJpY3RseSB0cnVlCnNpbmNlIHRoZSBtYWNybyBkaWQgbm90 IHRlc3Qgd2hldGhlciB0aGUgZG9tYWluIGFjdHVhbGx5IGhhcyBJT01NVQptYXBwaW5ncy4KClNp Z25lZC1vZmYtYnk6IFBhdWwgRHVycmFudCA8cGF1bC5kdXJyYW50QGNpdHJpeC5jb20+ClJldmll d2VkLWJ5OiBLZXZpbiBUaWFuIDxrZXZpbi50aWFuQGludGVsLmNvbT4KLS0tCkNjOiBKdW4gTmFr YWppbWEgPGp1bi5uYWthamltYUBpbnRlbC5jb20+CkNjOiBHZW9yZ2UgRHVubGFwIDxnZW9yZ2Uu ZHVubGFwQGV1LmNpdHJpeC5jb20+CkNjOiBKYW4gQmV1bGljaCA8amJldWxpY2hAc3VzZS5jb20+ CkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgpDYzogU3RlZmFu byBTdGFiZWxsaW5pIDxzc3RhYmVsbGluaUBrZXJuZWwub3JnPgpDYzogSnVsaWVuIEdyYWxsIDxq dWxpZW4uZ3JhbGxAYXJtLmNvbT4KCnYxMToKIC0gUHVsbGVkIGluIGZyb20gdjYgb2YgdGhlIGZ1 bGwgUFYtSU9NTVUgc2VyaWVzLgoKdjQ6CiAtIE5ldyBpbiB2NC4KLS0tCiB4ZW4vYXJjaC94ODYv bW0vcDJtLWVwdC5jICAgICAgIHwgNiArKystLS0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYyAg ICAgICAgfCA2ICsrKy0tLQogeGVuL2FyY2gveDg2L21tL3AybS5jICAgICAgICAgICB8IDIgKy0K IHhlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2lvbW11LmMgfCAyICstCiB4ZW4vaW5jbHVkZS9hc20t YXJtL2lvbW11LmggICAgIHwgMiArLQogeGVuL2luY2x1ZGUvYXNtLXg4Ni9pb21tdS5oICAgICB8 IDUgKysrLS0KIDYgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYyBiL3hlbi9hcmNoL3g4 Ni9tbS9wMm0tZXB0LmMKaW5kZXggYWY3Njc0ZjdlMS4uZjBkOTM4NTZmMiAxMDA2NDQKLS0tIGEv eGVuL2FyY2gveDg2L21tL3AybS1lcHQuYworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLWVwdC5j CkBAIC04NjMsMTIgKzg2MywxMiBAQCBvdXQ6CiAgICAgICAgIGVwdF9zeW5jX2RvbWFpbihwMm0p OwogCiAgICAgLyogRm9yIGhvc3QgcDJtLCBtYXkgbmVlZCB0byBjaGFuZ2UgVlQtZCBwYWdlIHRh YmxlLiovCi0gICAgaWYgKCByYyA9PSAwICYmIHAybV9pc19ob3N0cDJtKHAybSkgJiYgbmVlZF9p b21tdShkKSAmJgorICAgIGlmICggcmMgPT0gMCAmJiBwMm1faXNfaG9zdHAybShwMm0pICYmCiAg ICAgICAgICBuZWVkX21vZGlmeV92dGRfdGFibGUgKQogICAgIHsKLSAgICAgICAgaWYgKCBpb21t dV9oYXBfcHRfc2hhcmUgKQorICAgICAgICBpZiAoIGlvbW11X3VzZV9oYXBfcHQoZCkgKQogICAg ICAgICAgICAgcmMgPSBpb21tdV9wdGVfZmx1c2goZCwgZ2ZuLCAmZXB0X2VudHJ5LT5lcHRlLCBv cmRlciwgdnRkX3B0ZV9wcmVzZW50KTsKLSAgICAgICAgZWxzZQorICAgICAgICBlbHNlIGlmICgg bmVlZF9pb21tdShkKSApCiAgICAgICAgIHsKICAgICAgICAgICAgIGRmbl90IGRmbiA9IF9kZm4o Z2ZuKTsKIApkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3AybS1wdC5jIGIveGVuL2FyY2gv eDg2L21tL3AybS1wdC5jCmluZGV4IDYwNzA0NmYzMWIuLjZiMzAzMzdmNjIgMTAwNjQ0Ci0tLSBh L3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMK QEAgLTY3Nyw4ICs2NzcsOCBAQCBwMm1fcHRfc2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpw Mm0sIGdmbl90IGdmbl8sIG1mbl90IG1mbiwKICAgICAgICAgICYmIChnZm4gKyAoMVVMIDw8IHBh Z2Vfb3JkZXIpIC0gMSA+IHAybS0+bWF4X21hcHBlZF9wZm4pICkKICAgICAgICAgcDJtLT5tYXhf bWFwcGVkX3BmbiA9IGdmbiArICgxVUwgPDwgcGFnZV9vcmRlcikgLSAxOwogCi0gICAgaWYgKCBp b21tdV9lbmFibGVkICYmIG5lZWRfaW9tbXUocDJtLT5kb21haW4pICYmCi0gICAgICAgICAoaW9t bXVfb2xkX2ZsYWdzICE9IGlvbW11X3B0ZV9mbGFncyB8fCBvbGRfbWZuICE9IG1mbl94KG1mbikp ICkKKyAgICBpZiAoIGlvbW11X2VuYWJsZWQgJiYgKGlvbW11X29sZF9mbGFncyAhPSBpb21tdV9w dGVfZmxhZ3MgfHwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIG9sZF9tZm4gIT0gbWZuX3go bWZuKSkgKQogICAgIHsKICAgICAgICAgQVNTRVJUKHJjID09IDApOwogCkBAIC02ODcsNyArNjg3 LDcgQEAgcDJtX3B0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCBnZm5fdCBnZm5f LCBtZm5fdCBtZm4sCiAgICAgICAgICAgICBpZiAoIGlvbW11X29sZF9mbGFncyApCiAgICAgICAg ICAgICAgICAgYW1kX2lvbW11X2ZsdXNoX3BhZ2VzKHAybS0+ZG9tYWluLCBnZm4sIHBhZ2Vfb3Jk ZXIpOwogICAgICAgICB9Ci0gICAgICAgIGVsc2UKKyAgICAgICAgZWxzZSBpZiAoIG5lZWRfaW9t bXUocDJtLT5kb21haW4pICkKICAgICAgICAgewogICAgICAgICAgICAgZGZuX3QgZGZuID0gX2Rm bihnZm4pOwogCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vcDJtLmMgYi94ZW4vYXJjaC94 ODYvbW0vcDJtLmMKaW5kZXggNTM3YWRkNjViYi4uOTdiYjNmZWFjYyAxMDA2NDQKLS0tIGEveGVu L2FyY2gveDg2L21tL3AybS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0uYwpAQCAtMjA5MSw3 ICsyMDkxLDcgQEAgc3RhdGljIHVuc2lnbmVkIGludCBtbWlvX29yZGVyKGNvbnN0IHN0cnVjdCBk b21haW4gKmQsCiAgICAgICogLSBleGNsdWRlIFBWIGd1ZXN0cywgc2hvdWxkIGV4ZWN1dGlvbiBy ZWFjaCB0aGlzIGNvZGUgZm9yIHN1Y2guCiAgICAgICogU28gYmUgY2FyZWZ1bCB3aGVuIGFsdGVy aW5nIHRoaXMuCiAgICAgICovCi0gICAgaWYgKCAhbmVlZF9pb21tdShkKSB8fCAhaW9tbXVfdXNl X2hhcF9wdChkKSB8fAorICAgIGlmICggIWlvbW11X3VzZV9oYXBfcHQoZCkgfHwKICAgICAgICAg IChzdGFydF9mbiAmICgoMVVMIDw8IFBBR0VfT1JERVJfMk0pIC0gMSkpIHx8ICEobnIgPj4gUEFH RV9PUkRFUl8yTSkgKQogICAgICAgICByZXR1cm4gUEFHRV9PUkRFUl80SzsKIApkaWZmIC0tZ2l0 IGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvaW9tbXUuYyBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJv dWdoL2lvbW11LmMKaW5kZXggOWNiMTc5MzE0NC4uZWE3Y2NiYWNlNyAxMDA2NDQKLS0tIGEveGVu L2RyaXZlcnMvcGFzc3Rocm91Z2gvaW9tbXUuYworKysgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3Vn aC9pb21tdS5jCkBAIC00NzUsNyArNDc1LDcgQEAgaW50IGlvbW11X2RvX2RvbWN0bCgKIAogdm9p ZCBpb21tdV9zaGFyZV9wMm1fdGFibGUoc3RydWN0IGRvbWFpbiogZCkKIHsKLSAgICBpZiAoIGlv bW11X2VuYWJsZWQgJiYgaW9tbXVfdXNlX2hhcF9wdChkKSApCisgICAgaWYgKCBpb21tdV91c2Vf aGFwX3B0KGQpICkKICAgICAgICAgaW9tbXVfZ2V0X29wcygpLT5zaGFyZV9wMm0oZCk7CiB9CiAK ZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS1hcm0vaW9tbXUuaCBiL3hlbi9pbmNsdWRlL2Fz bS1hcm0vaW9tbXUuaAppbmRleCA1N2Q5YjFlMTRhLi44ZDE1MDZjNmY3IDEwMDY0NAotLS0gYS94 ZW4vaW5jbHVkZS9hc20tYXJtL2lvbW11LmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLWFybS9pb21t dS5oCkBAIC0yMSw3ICsyMSw3IEBAIHN0cnVjdCBhcmNoX2lvbW11CiB9OwogCiAvKiBBbHdheXMg c2hhcmUgUDJNIFRhYmxlIGJldHdlZW4gdGhlIENQVSBhbmQgdGhlIElPTU1VICovCi0jZGVmaW5l IGlvbW11X3VzZV9oYXBfcHQoZCkgKDEpCisjZGVmaW5lIGlvbW11X3VzZV9oYXBfcHQoZCkgKG5l ZWRfaW9tbXUoZCkpCiAKIGNvbnN0IHN0cnVjdCBpb21tdV9vcHMgKmlvbW11X2dldF9vcHModm9p ZCk7CiB2b2lkIF9faW5pdCBpb21tdV9zZXRfb3BzKGNvbnN0IHN0cnVjdCBpb21tdV9vcHMgKm9w cyk7CmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L2lvbW11LmggYi94ZW4vaW5jbHVk ZS9hc20teDg2L2lvbW11LmgKaW5kZXggMGVkNGE5ZTg2ZC4uN2MzMTg3YzhlYyAxMDA2NDQKLS0t IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9pb21tdS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYv aW9tbXUuaApAQCAtODksOCArODksOSBAQCBzdGF0aWMgaW5saW5lIGludCBpb21tdV9oYXJkd2Fy ZV9zZXR1cCh2b2lkKQogICAgIHJldHVybiAtRU5PREVWOwogfQogCi0vKiBEb2VzIHRoaXMgZG9t YWluIGhhdmUgYSBQMk0gdGFibGUgd2UgY2FuIHVzZSBhcyBpdHMgSU9NTVUgcGFnZXRhYmxlPyAq LwotI2RlZmluZSBpb21tdV91c2VfaGFwX3B0KGQpIChoYXBfZW5hYmxlZChkKSAmJiBpb21tdV9o YXBfcHRfc2hhcmUpCisvKiBBcmUgd2UgdXNpbmcgdGhlIGRvbWFpbiBQMk0gdGFibGUgYXMgaXRz IElPTU1VIHBhZ2V0YWJsZT8gKi8KKyNkZWZpbmUgaW9tbXVfdXNlX2hhcF9wdChkKSBcCisgICAg KGhhcF9lbmFibGVkKGQpICYmIG5lZWRfaW9tbXUoZCkgJiYgaW9tbXVfaGFwX3B0X3NoYXJlKQog CiB2b2lkIGlvbW11X3VwZGF0ZV9pcmVfZnJvbV9hcGljKHVuc2lnbmVkIGludCBhcGljLCB1bnNp Z25lZCBpbnQgcmVnLCB1bnNpZ25lZCBpbnQgdmFsdWUpOwogdW5zaWduZWQgaW50IGlvbW11X3Jl YWRfYXBpY19mcm9tX2lyZSh1bnNpZ25lZCBpbnQgYXBpYywgdW5zaWduZWQgaW50IHJlZyk7Ci0t IAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpo dHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs