From: Roger Pau Monne Subject: [PATCH 3/4] x86/iommu: reorder conditions used in the inclusive iommu mappings Date: Fri, 27 Jul 2018 17:31:48 +0200 Message-ID: <20180727153149.25094-4-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 1fj4k9-0007Xr-V2 for xen-devel@lists.xenproject.org; Fri, 27 Jul 2018 15:33:25 +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: Jan Beulich , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org SW4gb3JkZXIgdG8gcGxhY2UgYWxsIHRoZSBtYXAgY29uZGl0aW9ucyBpbiBhIHNpbmdsZSBpZiAu Li4gZWxzZQpjb25kaXRpb25hbC4KCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoKU2lnbmVkLW9mZi1i eTogUm9nZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1QGNpdHJpeC5jb20+Ci0tLQpDYzogSmFuIEJl dWxpY2ggPGpiZXVsaWNoQHN1c2UuY29tPgotLS0KIHhlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3g4 Ni9pb21tdS5jIHwgMjMgKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx MCBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vZHJpdmVy cy9wYXNzdGhyb3VnaC94ODYvaW9tbXUuYyBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3g4Ni9p b21tdS5jCmluZGV4IGJhMGJiZDlhMTUuLjI0Y2M1OTFhYTUgMTAwNjQ0Ci0tLSBhL3hlbi9kcml2 ZXJzL3Bhc3N0aHJvdWdoL3g4Ni9pb21tdS5jCisrKyBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdo L3g4Ni9pb21tdS5jCkBAIC0xNTgsMTkgKzE1OCw5IEBAIHZvaWQgX19od2RvbV9pbml0IGFyY2hf aW9tbXVfaHdkb21faW5pdChzdHJ1Y3QgZG9tYWluICpkKQogICAgICAgICAgKiByZWdpb25zLiBX aGVuIHNldCwgdGhlIGluY2x1c2l2ZSBtYXBwaW5nIGFkZGl0aW9uYWxseSBtYXBzIGluCiAgICAg ICAgICAqIGV2ZXJ5IHBmbiB1cCB0byA0R0IgZXhjZXB0IHRob3NlIHRoYXQgZmFsbCBpbiB1bnVz YWJsZSByYW5nZXMuCiAgICAgICAgICAqLwotICAgICAgICBpZiAoIHBmbiA+IG1heF9wZm4gJiYg IW1mbl92YWxpZChfbWZuKHBmbikpICkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAg IGlmICggaW9tbXVfaW5jbHVzaXZlICYmIHBmbiA8PSBtYXhfcGZuICkKLSAgICAgICAgICAgIG1h cCA9ICFwYWdlX2lzX3JhbV90eXBlKHBmbiwgUkFNX1RZUEVfVU5VU0FCTEUpOwotICAgICAgICBl bHNlCi0gICAgICAgICAgICBtYXAgPSBwYWdlX2lzX3JhbV90eXBlKHBmbiwgUkFNX1RZUEVfQ09O VkVOVElPTkFMKTsKLQotICAgICAgICBpZiAoICFtYXAgKQotICAgICAgICAgICAgY29udGludWU7 Ci0KLSAgICAgICAgLyogRXhjbHVkZSBYZW4gYml0cyAqLwotICAgICAgICBpZiAoIHhlbl9pbl9y YW5nZShwZm4pICkKKyAgICAgICAgaWYgKCAocGZuID4gbWF4X3BmbiAmJiAhbWZuX3ZhbGlkKF9t Zm4ocGZuKSkpIHx8CisgICAgICAgICAgICAgLyogRXhjbHVkZSBYZW4gYml0cyAqLworICAgICAg ICAgICAgIHhlbl9pbl9yYW5nZShwZm4pICkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAg ICAgIC8qCkBAIC0xNzksNiArMTY5LDEzIEBAIHZvaWQgX19od2RvbV9pbml0IGFyY2hfaW9tbXVf aHdkb21faW5pdChzdHJ1Y3QgZG9tYWluICpkKQogICAgICAgICAgKi8KICAgICAgICAgaWYgKCBp b21tdV9kb20wX3N0cmljdCAmJgogICAgICAgICAgICAgIHBhZ2VfaXNfcmFtX3R5cGUocGZuLCBS QU1fVFlQRV9DT05WRU5USU9OQUwpICkKKyAgICAgICAgICAgIG1hcCA9IGZhbHNlOworICAgICAg ICBlbHNlIGlmICggaW9tbXVfaW5jbHVzaXZlICYmIHBmbiA8PSBtYXhfcGZuICkKKyAgICAgICAg ICAgIG1hcCA9ICFwYWdlX2lzX3JhbV90eXBlKHBmbiwgUkFNX1RZUEVfVU5VU0FCTEUpOworICAg ICAgICBlbHNlCisgICAgICAgICAgICBtYXAgPSBwYWdlX2lzX3JhbV90eXBlKHBmbiwgUkFNX1RZ UEVfQ09OVkVOVElPTkFMKTsKKworICAgICAgICBpZiAoICFtYXAgKQogICAgICAgICAgICAgY29u dGludWU7CiAKICAgICAgICAgdG1wID0gMSA8PCAoUEFHRV9TSElGVCAtIFBBR0VfU0hJRlRfNEsp OwotLSAKMi4xOC4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5v cmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZl bA==