From: Roger Pau Monne Subject: [PATCH 4/4] x86/iommu: add PVH support to the inclusive options Date: Fri, 27 Jul 2018 17:31:49 +0200 Message-ID: <20180727153149.25094-5-roger.pau@citrix.com> References: <20180727153149.25094-1-roger.pau@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 1fj4kE-0007YQ-AN for xen-devel@lists.xenproject.org; Fri, 27 Jul 2018 15:33:30 +0000 In-Reply-To: <20180727153149.25094-1-roger.pau@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 , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org U2V2ZXJhbCBwZW9wbGUgaGF2ZSByZXBvcnRlZCBoYXJkd2FyZSBpc3N1ZXMgKG1hbGZ1bmN0aW9u aW5nIFVTQgpjb250cm9sbGVycykgZHVlIHRvIGlvbW11IHBhZ2UgZmF1bHRzLiBUaG9zZSBmYXVs dHMgYXJlIGNhdXNlZCBieQptaXNzaW5nIFJNUlIgKFZUZCkgb3IgSVJWUyAoQU1ELVZpKSBlbnRy aWVzIGluIHRoZSBBQ1BJIHRhYmxlcy4gVGhvc2UKY2FuIGJlIHdvcmtlZCBhcm91bmQgb24gVlRk IGhhcmR3YXJlIGJ5IG1hbnVhbGx5IGFkZGluZyBSTVJSIGVudHJpZXMKb24gdGhlIGNvbW1hbmQg bGluZSwgdGhpcyBpcyBob3dldmVyIGxpbWl0ZWQgdG8gSW50ZWwgaGFyZHdhcmUgYW5kCnF1aXRl IGN1bWJlcnNvbWUgdG8gZG8uCgpJbiBvcmRlciB0byBzb2x2ZSB0aG9zZSBpc3N1ZXMgYWRkIFBW SCBzdXBwb3J0IHRvIHRoZSBpbmNsdXNpdmUgb3B0aW9uCnRoYXQgaWRlbnRpdHkgbWFwcyBhbGwg cmVnaW9ucyBtYXJrZWQgYXMgcmVzZXJ2ZWQgaW4gdGhlIG1lbW9yeSBtYXAuCk5vdGUgdGhhdCBy ZWdpb25zIHVzZWQgYnkgZGV2aWNlcyBlbXVsYXRlZCBieSBYZW4gKExBUElDLCBJTy1BUElDIG9y ClBDSWUgTUNGRyByZWdpb25zKSBhcmUgc3BlY2lmaWNhbGx5IGF2b2lkZWQuIE5vdGUgdGhhdCB0 aGlzIG9wdGlvbgpjdXJyZW50bHkgcmVsaWVzIG9uIG5vIE1TSVggTU1JTyBhcmVhcyByZXNpZGlu ZyBpbiBhIHJlc2VydmVkIHJlZ2lvbiwKb3IgZWxzZSBYZW4gd29uJ3QgYmUgYWJsZSB0byB0cmFw IHRob3NlIGFjY2Vzc2VzLgoKU2lnbmVkLW9mZi1ieTogUm9nZXIgUGF1IE1vbm7DqSA8cm9nZXIu cGF1QGNpdHJpeC5jb20+Ci0tLQpDYzogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0 cml4LmNvbT4KQ2M6IEdlb3JnZSBEdW5sYXAgPEdlb3JnZS5EdW5sYXBAZXUuY2l0cml4LmNvbT4K Q2M6IElhbiBKYWNrc29uIDxpYW4uamFja3NvbkBldS5jaXRyaXguY29tPgpDYzogSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPgpDYzogSnVsaWVuIEdyYWxsIDxqdWxpZW4uZ3JhbGxAYXJt LmNvbT4KQ2M6IEtvbnJhZCBSemVzenV0ZWsgV2lsayA8a29ucmFkLndpbGtAb3JhY2xlLmNvbT4K Q2M6IFN0ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KQ2M6IFRpbSBE ZWVnYW4gPHRpbUB4ZW4ub3JnPgpDYzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0t CiBkb2NzL21pc2MveGVuLWNvbW1hbmQtbGluZS5tYXJrZG93biB8IDE2ICsrKystLQogeGVuL2Ry aXZlcnMvcGFzc3Rocm91Z2gveDg2L2lvbW11LmMgfCA4MiArKysrKysrKysrKysrKysrKysrKysr Ky0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA3NyBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kb2NzL21pc2MveGVuLWNvbW1hbmQtbGluZS5tYXJrZG93biBiL2Rv Y3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCmluZGV4IDkxYThiZmM5YTYuLmM3Yzlh MzhjMTkgMTAwNjQ0Ci0tLSBhL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCisr KyBiL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCkBAIC0xMjAzLDExICsxMjAz LDE3IEBAIGRldGVjdGlvbiBvZiBzeXN0ZW1zIGtub3duIHRvIG1pc2JlaGF2ZSB1cG9uIGFjY2Vz c2VzIHRvIHRoYXQgcG9ydC4KID4gRGVmYXVsdDogYHRydWVgCiAKID4+IFVzZSB0aGlzIHRvIHdv cmsgYXJvdW5kIGZpcm13YXJlIGlzc3VlcyBwcm92aWRpbmcgaW5jb3JyZWN0IFJNUlIgb3IgSVZN RAotPj4gZW50cmllcy4gUmF0aGVyIHRoYW4gb25seSBtYXBwaW5nIFJBTSBwYWdlcyBmb3IgSU9N TVUgYWNjZXNzZXMgZm9yIERvbTAsCi0+PiB3aXRoIHRoaXMgb3B0aW9uIGFsbCBwYWdlcyB1cCB0 byA0R0IsIG5vdCBtYXJrZWQgYXMgdW51c2FibGUgaW4gdGhlIEU4MjAKLT4+IHRhYmxlLCB3aWxs IGdldCBhIG1hcHBpbmcgZXN0YWJsaXNoZWQuIE5vdGUgdGhhdCB0aGlzIG9wdGlvbiBpcyBvbmx5 Ci0+PiBhcHBsaWNhYmxlIHRvIGEgUFYgZG9tMC4gQWxzbyBub3RlIHRoYXQgaWYgYGRvbTAtc3Ry aWN0YCBtb2RlIGlzIGVuYWJsZWQKLT4+IHRoZW4gY29udmVudGlvbmFsIFJBTSBwYWdlcyBub3Qg YXNzaWduZWQgdG8gZG9tMCB3aWxsIG5vdCBiZSBtYXBwZWQuCis+PiBlbnRyaWVzLiBUaGUgYmVo YXZpb3VyIG9mIHRoaXMgb3B0aW9uIGlzIHNsaWdodGx5IGRpZmZlcmVudCBiZXR3ZWVuIGEgUFYg YW5kCis+PiBhIFBWSCBEb20wOgorPj4KKz4+ICogRm9yIGEgUFYgRG9tMCBhbGwgcGFnZXMgdXAg dG8gNEdCIG5vdCBtYXJrZWQgYXMgdW51c2FibGUgaW4gdGhlIG1lbW9yeQorPj4gICBtYXAgd2ls bCBnZXQgYSBtYXBwaW5nIGVzdGFibGlzaGVkLiBOb3RlIHRoYXQgaWYgYGRvbTAtc3RyaWN0YCBt b2RlIGlzCis+PiAgIGVuYWJsZWQgdGhlbiBjb252ZW50aW9uYWwgUkFNIHBhZ2VzIG5vdCBhc3Np Z25lZCB0byBkb20wIHdpbGwgbm90IGJlCis+PiAgIG1hcHBlZC4KKz4+Cis+PiAqIEZvciBhIFBW SCBEb20wIGFsbCBtZW1vcnkgcmVnaW9ucyBtYXJrZWQgYXMgcmVzZXJ2ZWQgaW4gdGhlIG1lbW9y eSBtYXAKKz4+ICAgdGhhdCBkb24ndCBvdmVybGFwIHdpdGggYW55IE1NSU8gcmVnaW9uIGZyb20g ZW11bGF0ZWQgZGV2aWNlcyB3aWxsIGJlCis+PiAgIGlkZW50aXR5IG1hcHBlZC4KIAogIyMjIGlv bW11XF9kZXZcX2lvdGxiXF90aW1lb3V0CiA+IGA9IDxpbnRlZ2VyPmAKZGlmZiAtLWdpdCBhL3hl bi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3g4Ni9pb21tdS5jIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91 Z2gveDg2L2lvbW11LmMKaW5kZXggMjRjYzU5MWFhNS4uY2ZhZmUxYjU3MiAxMDA2NDQKLS0tIGEv eGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gveDg2L2lvbW11LmMKKysrIGIveGVuL2RyaXZlcnMvcGFz c3Rocm91Z2gveDg2L2lvbW11LmMKQEAgLTIwLDYgKzIwLDggQEAKICNpbmNsdWRlIDx4ZW4vc29m dGlycS5oPgogI2luY2x1ZGUgPHhzbS94c20uaD4KIAorI2luY2x1ZGUgPGFzbS9hcGljZGVmLmg+ CisjaW5jbHVkZSA8YXNtL2lvX2FwaWMuaD4KICNpbmNsdWRlIDxhc20vc2V0dXAuaD4KIAogdm9p ZCBpb21tdV91cGRhdGVfaXJlX2Zyb21fYXBpYygKQEAgLTEzNCwxMSArMTM2LDYyIEBAIHZvaWQg YXJjaF9pb21tdV9kb21haW5fZGVzdHJveShzdHJ1Y3QgZG9tYWluICpkKQogewogfQogCitzdGF0 aWMgYm9vbCBfX2h3ZG9tX2luaXQgcHZfaW5jbHVzaXZlX21hcCh1bnNpZ25lZCBsb25nIHBmbiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcg bWF4X3BmbikKK3sKKyAgICAvKgorICAgICAqIElmIGRvbTAtc3RyaWN0IG1vZGUgaXMgZW5hYmxl ZCB0aGVuIGV4Y2x1ZGUgY29udmVudGlvbmFsIFJBTQorICAgICAqIGFuZCBsZXQgdGhlIGNvbW1v biBjb2RlIG1hcCBkb20wJ3MgcGFnZXMuCisgICAgICovCisgICAgaWYgKCBpb21tdV9kb20wX3N0 cmljdCAmJiBwYWdlX2lzX3JhbV90eXBlKHBmbiwgUkFNX1RZUEVfQ09OVkVOVElPTkFMKSApCisg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIGlvbW11X2luY2x1c2l2ZSAmJiBwZm4gPD0g bWF4X3BmbiApCisgICAgICAgIHJldHVybiAhcGFnZV9pc19yYW1fdHlwZShwZm4sIFJBTV9UWVBF X1VOVVNBQkxFKTsKKworICAgIHJldHVybiBwYWdlX2lzX3JhbV90eXBlKHBmbiwgUkFNX1RZUEVf Q09OVkVOVElPTkFMKTsKK30KKworc3RhdGljIGJvb2wgX19od2RvbV9pbml0IHB2aF9pbmNsdXNp dmVfbWFwKGNvbnN0IHN0cnVjdCBkb21haW4gKmQsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBwZm4pCit7CisgICAgdW5zaWduZWQgaW50 IGk7CisKKyAgICAvKgorICAgICAqIElnbm9yZSBhbnkgYWRkcmVzcyBiZWxvdyAxTUIsIHRoYXQn cyBhbHJlYWR5IGlkZW50aXR5IG1hcHBlZCBieSB0aGUKKyAgICAgKiBkb21haW4gYnVpbGRlci4K KyAgICAgKi8KKyAgICBpZiAoIHBmbiA8IFBGTl9ET1dOKE1CKDEpKSApCisgICAgICAgIHJldHVy biBmYWxzZTsKKworICAgIC8qIE9ubHkgYWRkIHJlc2VydmVkIHJlZ2lvbnMuICovCisgICAgaWYg KCAhcGFnZV9pc19yYW1fdHlwZShwZm4sIFJBTV9UWVBFX1JFU0VSVkVEKSApCisgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgIC8qIENoZWNrIHRoYXQgaXQgZG9lc24ndCBvdmVybGFwIHdpdGgg dGhlIExBUElDICovCisgICAgaWYgKCBwZm4gPT0gUEZOX0RPV04oQVBJQ19ERUZBVUxUX1BIWVNf QkFTRSkgKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgLyogLi4uIG9yIHRoZSBJTy1BUElD ICovCisgICAgZm9yICggaSA9IDA7IGkgPCBucl9pb2FwaWNzOyBpKysgKQorICAgICAgICBpZiAo IHBmbiA9PSBQRk5fRE9XTihkb21haW5fdmlvYXBpYyhkLCBpKS0+YmFzZV9hZGRyZXNzKSApCisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgLyogLi4uIG9yIHRoZSBQQ0llIE1DRkcgcmVn aW9ucy4gKi8KKyAgICBmb3IgKCBpID0gMDsgaSA8IHBjaV9tbWNmZ19jb25maWdfbnVtOyBpKysg KQorICAgIHsKKyAgICAgICAgdW5zaWduZWQgbG9uZyBhZGRyID0gUEZOX0RPV04ocGNpX21tY2Zn X2NvbmZpZ1tpXS5hZGRyZXNzKTsKKworICAgICAgICBpZiAoIHBmbiA+PSBhZGRyICsgKHBjaV9t bWNmZ19jb25maWdbaV0uc3RhcnRfYnVzX251bWJlciA8PCA4KSAmJgorICAgICAgICAgICAgIHBm biA8IGFkZHIgKyAocGNpX21tY2ZnX2NvbmZpZ1tpXS5lbmRfYnVzX251bWJlciA8PCA4KSApCisg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgcmV0dXJuIHRydWU7Cit9CisK IHZvaWQgX19od2RvbV9pbml0IGFyY2hfaW9tbXVfaHdkb21faW5pdChzdHJ1Y3QgZG9tYWluICpk KQogewogICAgIHVuc2lnbmVkIGxvbmcgaSwgaiwgdG1wLCB0b3AsIG1heF9wZm47CiAKLSAgICBp ZiAoIGlvbW11X3Bhc3N0aHJvdWdoIHx8ICFpc19wdl9kb21haW4oZCkgKQorICAgIGlmICggaW9t bXVfcGFzc3Rocm91Z2ggKQogICAgICAgICByZXR1cm47CiAKICAgICBCVUdfT04oIWlzX2hhcmR3 YXJlX2RvbWFpbihkKSk7CkBAIC0xNDksNyArMjAyLDYgQEAgdm9pZCBfX2h3ZG9tX2luaXQgYXJj aF9pb21tdV9od2RvbV9pbml0KHN0cnVjdCBkb21haW4gKmQpCiAgICAgZm9yICggaSA9IDA7IGkg PCB0b3A7IGkrKyApCiAgICAgewogICAgICAgICB1bnNpZ25lZCBsb25nIHBmbiA9IHBkeF90b19w Zm4oaSk7Ci0gICAgICAgIGJvb2wgbWFwOwogICAgICAgICBpbnQgcmMgPSAwOwogCiAgICAgICAg IC8qCkBAIC0xNjMsMjUgKzIxNSwyMyBAQCB2b2lkIF9faHdkb21faW5pdCBhcmNoX2lvbW11X2h3 ZG9tX2luaXQoc3RydWN0IGRvbWFpbiAqZCkKICAgICAgICAgICAgICB4ZW5faW5fcmFuZ2UocGZu KSApCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAvKgotICAgICAgICAgKiBJZiBk b20wLXN0cmljdCBtb2RlIGlzIGVuYWJsZWQgdGhlbiBleGNsdWRlIGNvbnZlbnRpb25hbCBSQU0K LSAgICAgICAgICogYW5kIGxldCB0aGUgY29tbW9uIGNvZGUgbWFwIGRvbTAncyBwYWdlcy4KLSAg ICAgICAgICovCi0gICAgICAgIGlmICggaW9tbXVfZG9tMF9zdHJpY3QgJiYKLSAgICAgICAgICAg ICBwYWdlX2lzX3JhbV90eXBlKHBmbiwgUkFNX1RZUEVfQ09OVkVOVElPTkFMKSApCi0gICAgICAg ICAgICBtYXAgPSBmYWxzZTsKLSAgICAgICAgZWxzZSBpZiAoIGlvbW11X2luY2x1c2l2ZSAmJiBw Zm4gPD0gbWF4X3BmbiApCi0gICAgICAgICAgICBtYXAgPSAhcGFnZV9pc19yYW1fdHlwZShwZm4s IFJBTV9UWVBFX1VOVVNBQkxFKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbWFwID0gcGFn ZV9pc19yYW1fdHlwZShwZm4sIFJBTV9UWVBFX0NPTlZFTlRJT05BTCk7Ci0KLSAgICAgICAgaWYg KCAhbWFwICkKKyAgICAgICAgaWYgKCBpc19wdl9kb21haW4oZCkgPyAhcHZfaW5jbHVzaXZlX21h cChwZm4sIG1heF9wZm4pCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogIXB2aF9pbmNs dXNpdmVfbWFwKGQsIHBmbikgKQogICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgdG1w ID0gMSA8PCAoUEFHRV9TSElGVCAtIFBBR0VfU0hJRlRfNEspOwogICAgICAgICBmb3IgKCBqID0g MDsgaiA8IHRtcDsgaisrICkKICAgICAgICAgewotICAgICAgICAgICAgaW50IHJldCA9IGlvbW11 X21hcF9wYWdlKGQsIHBmbiAqIHRtcCArIGosIHBmbiAqIHRtcCArIGosCisgICAgICAgICAgICBp bnQgcmV0OworCisgICAgICAgICAgICBpZiAoIGlvbW11X3VzZV9oYXBfcHQoZCkgKQorICAgICAg ICAgICAgeworICAgICAgICAgICAgICAgIEFTU0VSVChpc19odm1fZG9tYWluKGQpKTsKKyAgICAg ICAgICAgICAgICByZXQgPSBzZXRfaWRlbnRpdHlfcDJtX2VudHJ5KGQsIHBmbiAqIHRtcCArIGos IHAybV9hY2Nlc3NfcncsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAwKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAg ICByZXQgPSBpb21tdV9tYXBfcGFnZShkLCBwZm4gKiB0bXAgKyBqLCBwZm4gKiB0bXAgKyBqLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElPTU1VRl9yZWFkYWJsZXxJT01N VUZfd3JpdGFibGUpOwogCiAgICAgICAgICAgICBpZiAoICFyYyApCi0tIAoyLjE4LjAKCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFp bGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhl bnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs