From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleksandr Tyshchenko Subject: [PATCH v2 12/13] [RFC] iommu: VT-d: Squash map_pages/unmap_pages with map_page/unmap_page Date: Tue, 25 Jul 2017 20:26:54 +0300 Message-ID: <1501003615-15274-13-git-send-email-olekstysh@gmail.com> References: <1501003615-15274-1-git-send-email-olekstysh@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1da3cD-0000BT-Ei for xen-devel@lists.xenproject.org; Tue, 25 Jul 2017 17:27:25 +0000 Received: by mail-lf0-f65.google.com with SMTP id t128so5040549lff.3 for ; Tue, 25 Jul 2017 10:27:23 -0700 (PDT) In-Reply-To: <1501003615-15274-1-git-send-email-olekstysh@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Oleksandr Tyshchenko , Kevin Tian , Jan Beulich List-Id: xen-devel@lists.xenproject.org RnJvbTogT2xla3NhbmRyIFR5c2hjaGVua28gPG9sZWtzYW5kcl90eXNoY2hlbmtvQGVwYW0uY29t PgoKUmVkdWNlIHRoZSBzY29wZSBvZiB0aGUgVE9ETyBieSBzcXVhc2hpbmcgc2luZ2xlLXBhZ2Ug c3R1ZmYgd2l0aAptdWx0aS1wYWdlIG9uZS4gTmV4dCB0YXJnZXQgaXMgdG8gdXNlIGxhcmdlIHBh Z2VzIHdoZW5ldmVyIHBvc3NpYmxlCmluIHRoZSBjYXNlIHRoYXQgaGFyZHdhcmUgc3VwcG9ydHMg dGhlbS4KClNpZ25lZC1vZmYtYnk6IE9sZWtzYW5kciBUeXNoY2hlbmtvIDxvbGVrc2FuZHJfdHlz aGNoZW5rb0BlcGFtLmNvbT4KQ0M6IEphbiBCZXVsaWNoIDxqYmV1bGljaEBzdXNlLmNvbT4KQ0M6 IEtldmluIFRpYW4gPGtldmluLnRpYW5AaW50ZWwuY29tPgoKLS0tCiAgIENoYW5nZXMgaW4gdjE6 CiAgICAgIC0KCiAgIENoYW5nZXMgaW4gdjI6CiAgICAgIC0KLS0tCiB4ZW4vZHJpdmVycy9wYXNz dGhyb3VnaC92dGQvaW9tbXUuYyB8IDEzOCArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2NyBpbnNlcnRpb25zKCspLCA3MSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC92dGQvaW9tbXUuYyBiL3hlbi9k cml2ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC9pb21tdS5jCmluZGV4IDQ1ZDFmMzYuLmQyMGIyZjkgMTAw NjQ0Ci0tLSBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC9pb21tdS5jCisrKyBiL3hlbi9k cml2ZXJzL3Bhc3N0aHJvdWdoL3Z0ZC9pb21tdS5jCkBAIC0xNzUwLDE1ICsxNzUwLDI0IEBAIHN0 YXRpYyB2b2lkIGlvbW11X2RvbWFpbl90ZWFyZG93bihzdHJ1Y3QgZG9tYWluICpkKQogICAgIHNw aW5fdW5sb2NrKCZoZC0+YXJjaC5tYXBwaW5nX2xvY2spOwogfQogCi1zdGF0aWMgaW50IF9fbXVz dF9jaGVjayBpbnRlbF9pb21tdV9tYXBfcGFnZShzdHJ1Y3QgZG9tYWluICpkLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBnZm4sCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25n IG1mbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2ln bmVkIGludCBmbGFncykKK3N0YXRpYyBpbnQgX19tdXN0X2NoZWNrIGludGVsX2lvbW11X3VubWFw X3BhZ2VzKHN0cnVjdCBkb21haW4gKmQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGdmbiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBvcmRlcik7CisKKy8qCisg KiBUT0RPOiBPcHRpbWl6ZSBieSB1c2luZyBsYXJnZSBwYWdlcyB3aGVuZXZlciBwb3NzaWJsZSBp biB0aGUgY2FzZQorICogdGhhdCBoYXJkd2FyZSBzdXBwb3J0cyB0aGVtLgorICovCitzdGF0aWMg aW50IF9fbXVzdF9jaGVjayBpbnRlbF9pb21tdV9tYXBfcGFnZXMoc3RydWN0IGRvbWFpbiAqZCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBs b25nIGdmbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1 bnNpZ25lZCBsb25nIG1mbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB1bnNpZ25lZCBpbnQgb3JkZXIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IGZsYWdzKQogewogICAgIHN0cnVjdCBkb21h aW5faW9tbXUgKmhkID0gZG9tX2lvbW11KGQpOwotICAgIHN0cnVjdCBkbWFfcHRlICpwYWdlID0g TlVMTCwgKnB0ZSA9IE5VTEwsIG9sZCwgbmV3ID0geyAwIH07Ci0gICAgdTY0IHBnX21hZGRyOwog ICAgIGludCByYyA9IDA7CisgICAgdW5zaWduZWQgbG9uZyBvcmlnX2dmbiA9IGdmbjsKKyAgICB1 bnNpZ25lZCBsb25nIGk7CiAKICAgICAvKiBEbyBub3RoaW5nIGlmIFZULWQgc2hhcmVzIEVQVCBw YWdlIHRhYmxlICovCiAgICAgaWYgKCBpb21tdV91c2VfaGFwX3B0KGQpICkKQEAgLTE3NjgsNzgg KzE3NzcsNjAgQEAgc3RhdGljIGludCBfX211c3RfY2hlY2sgaW50ZWxfaW9tbXVfbWFwX3BhZ2Uo c3RydWN0IGRvbWFpbiAqZCwKICAgICBpZiAoIGlvbW11X3Bhc3N0aHJvdWdoICYmIGlzX2hhcmR3 YXJlX2RvbWFpbihkKSApCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgc3Bpbl9sb2NrKCZoZC0+ YXJjaC5tYXBwaW5nX2xvY2spOwotCi0gICAgcGdfbWFkZHIgPSBhZGRyX3RvX2RtYV9wYWdlX21h ZGRyKGQsIChwYWRkcl90KWdmbiA8PCBQQUdFX1NISUZUXzRLLCAxKTsKLSAgICBpZiAoIHBnX21h ZGRyID09IDAgKQorICAgIGZvciAoIGkgPSAwOyBpIDwgKDFVTCA8PCBvcmRlcik7IGkrKywgZ2Zu KyssIG1mbisrICkKICAgICB7Ci0gICAgICAgIHNwaW5fdW5sb2NrKCZoZC0+YXJjaC5tYXBwaW5n X2xvY2spOwotICAgICAgICByZXR1cm4gLUVOT01FTTsKLSAgICB9Ci0gICAgcGFnZSA9IChzdHJ1 Y3QgZG1hX3B0ZSAqKW1hcF92dGRfZG9tYWluX3BhZ2UocGdfbWFkZHIpOwotICAgIHB0ZSA9IHBh Z2UgKyAoZ2ZuICYgTEVWRUxfTUFTSyk7Ci0gICAgb2xkID0gKnB0ZTsKLSAgICBkbWFfc2V0X3B0 ZV9hZGRyKG5ldywgKHBhZGRyX3QpbWZuIDw8IFBBR0VfU0hJRlRfNEspOwotICAgIGRtYV9zZXRf cHRlX3Byb3QobmV3LAotICAgICAgICAgICAgICAgICAgICAgKChmbGFncyAmIElPTU1VRl9yZWFk YWJsZSkgPyBETUFfUFRFX1JFQUQgIDogMCkgfAotICAgICAgICAgICAgICAgICAgICAgKChmbGFn cyAmIElPTU1VRl93cml0YWJsZSkgPyBETUFfUFRFX1dSSVRFIDogMCkpOworICAgICAgICBzdHJ1 Y3QgZG1hX3B0ZSAqcGFnZSA9IE5VTEwsICpwdGUgPSBOVUxMLCBvbGQsIG5ldyA9IHsgMCB9Owor ICAgICAgICB1NjQgcGdfbWFkZHI7CiAKLSAgICAvKiBTZXQgdGhlIFNOUCBvbiBsZWFmIHBhZ2Ug dGFibGUgaWYgU25vb3AgQ29udHJvbCBhdmFpbGFibGUgKi8KLSAgICBpZiAoIGlvbW11X3Nub29w ICkKLSAgICAgICAgZG1hX3NldF9wdGVfc25wKG5ldyk7CisgICAgICAgIHNwaW5fbG9jaygmaGQt PmFyY2gubWFwcGluZ19sb2NrKTsKIAotICAgIGlmICggb2xkLnZhbCA9PSBuZXcudmFsICkKLSAg ICB7CisgICAgICAgIHBnX21hZGRyID0gYWRkcl90b19kbWFfcGFnZV9tYWRkcihkLCAocGFkZHJf dClnZm4gPDwgUEFHRV9TSElGVF80SywgMSk7CisgICAgICAgIGlmICggcGdfbWFkZHIgPT0gMCAp CisgICAgICAgIHsKKyAgICAgICAgICAgIHNwaW5fdW5sb2NrKCZoZC0+YXJjaC5tYXBwaW5nX2xv Y2spOworICAgICAgICAgICAgcmMgPSAtRU5PTUVNOworICAgICAgICAgICAgZ290byBlcnI7Cisg ICAgICAgIH0KKyAgICAgICAgcGFnZSA9IChzdHJ1Y3QgZG1hX3B0ZSAqKW1hcF92dGRfZG9tYWlu X3BhZ2UocGdfbWFkZHIpOworICAgICAgICBwdGUgPSBwYWdlICsgKGdmbiAmIExFVkVMX01BU0sp OworICAgICAgICBvbGQgPSAqcHRlOworICAgICAgICBkbWFfc2V0X3B0ZV9hZGRyKG5ldywgKHBh ZGRyX3QpbWZuIDw8IFBBR0VfU0hJRlRfNEspOworICAgICAgICBkbWFfc2V0X3B0ZV9wcm90KG5l dywKKyAgICAgICAgICAgICAgICAgICAgICAgICAoKGZsYWdzICYgSU9NTVVGX3JlYWRhYmxlKSA/ IERNQV9QVEVfUkVBRCAgOiAwKSB8CisgICAgICAgICAgICAgICAgICAgICAgICAgKChmbGFncyAm IElPTU1VRl93cml0YWJsZSkgPyBETUFfUFRFX1dSSVRFIDogMCkpOworCisgICAgICAgIC8qIFNl dCB0aGUgU05QIG9uIGxlYWYgcGFnZSB0YWJsZSBpZiBTbm9vcCBDb250cm9sIGF2YWlsYWJsZSAq LworICAgICAgICBpZiAoIGlvbW11X3Nub29wICkKKyAgICAgICAgICAgIGRtYV9zZXRfcHRlX3Nu cChuZXcpOworCisgICAgICAgIGlmICggb2xkLnZhbCA9PSBuZXcudmFsICkKKyAgICAgICAgewor ICAgICAgICAgICAgc3Bpbl91bmxvY2soJmhkLT5hcmNoLm1hcHBpbmdfbG9jayk7CisgICAgICAg ICAgICB1bm1hcF92dGRfZG9tYWluX3BhZ2UocGFnZSk7CisgICAgICAgICAgICBjb250aW51ZTsK KyAgICAgICAgfQorICAgICAgICAqcHRlID0gbmV3OworCisgICAgICAgIGlvbW11X2ZsdXNoX2Nh Y2hlX2VudHJ5KHB0ZSwgc2l6ZW9mKHN0cnVjdCBkbWFfcHRlKSk7CiAgICAgICAgIHNwaW5fdW5s b2NrKCZoZC0+YXJjaC5tYXBwaW5nX2xvY2spOwogICAgICAgICB1bm1hcF92dGRfZG9tYWluX3Bh Z2UocGFnZSk7Ci0gICAgICAgIHJldHVybiAwOwotICAgIH0KLSAgICAqcHRlID0gbmV3OwotCi0g ICAgaW9tbXVfZmx1c2hfY2FjaGVfZW50cnkocHRlLCBzaXplb2Yoc3RydWN0IGRtYV9wdGUpKTsK LSAgICBzcGluX3VubG9jaygmaGQtPmFyY2gubWFwcGluZ19sb2NrKTsKLSAgICB1bm1hcF92dGRf ZG9tYWluX3BhZ2UocGFnZSk7CiAKLSAgICBpZiAoICF0aGlzX2NwdShpb21tdV9kb250X2ZsdXNo X2lvdGxiKSApCi0gICAgICAgIHJjID0gaW9tbXVfZmx1c2hfaW90bGIoZCwgZ2ZuLCBkbWFfcHRl X3ByZXNlbnQob2xkKSwgMSk7Ci0KLSAgICByZXR1cm4gcmM7Ci19Ci0KLXN0YXRpYyBpbnQgX19t dXN0X2NoZWNrIGludGVsX2lvbW11X3VubWFwX3BhZ2Uoc3RydWN0IGRvbWFpbiAqZCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBn Zm4pCi17Ci0gICAgLyogRG8gbm90aGluZyBpZiBoYXJkd2FyZSBkb21haW4gYW5kIGlvbW11IHN1 cHBvcnRzIHBhc3MgdGhydS4gKi8KLSAgICBpZiAoIGlvbW11X3Bhc3N0aHJvdWdoICYmIGlzX2hh cmR3YXJlX2RvbWFpbihkKSApCi0gICAgICAgIHJldHVybiAwOwotCi0gICAgcmV0dXJuIGRtYV9w dGVfY2xlYXJfb25lKGQsIChwYWRkcl90KWdmbiA8PCBQQUdFX1NISUZUXzRLKTsKLX0KLQotLyog VE9ETzogT3B0aW1pemUgYnkgc3F1YXNoaW5nIG1hcF9wYWdlcy91bm1hcF9wYWdlcyB3aXRoIG1h cF9wYWdlL3VubWFwX3BhZ2UgKi8KLXN0YXRpYyBpbnQgX19tdXN0X2NoZWNrIGludGVsX2lvbW11 X21hcF9wYWdlcyhzdHJ1Y3QgZG9tYWluICpkLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgZ2ZuLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbWZuLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBvcmRlciwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBp bnQgZmxhZ3MpCi17Ci0gICAgdW5zaWduZWQgbG9uZyBpOwotICAgIGludCByYyA9IDA7Ci0KLSAg ICBmb3IgKCBpID0gMDsgaSA8ICgxVUwgPDwgb3JkZXIpOyBpKysgKQotICAgIHsKLSAgICAgICAg cmMgPSBpbnRlbF9pb21tdV9tYXBfcGFnZShkLCBnZm4gKyBpLCBtZm4gKyBpLCBmbGFncyk7Ci0g ICAgICAgIGlmICggdW5saWtlbHkocmMpICkKKyAgICAgICAgaWYgKCAhdGhpc19jcHUoaW9tbXVf ZG9udF9mbHVzaF9pb3RsYikgKQogICAgICAgICB7Ci0gICAgICAgICAgICB3aGlsZSAoIGktLSAp Ci0gICAgICAgICAgICAgICAgLyogSWYgc3RhdGVtZW50IHRvIHNhdGlzZnkgX19tdXN0X2NoZWNr LiAqLwotICAgICAgICAgICAgICAgIGlmICggaW50ZWxfaW9tbXVfdW5tYXBfcGFnZShkLCBnZm4g KyBpKSApCi0gICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgICAgICBicmVh azsKKyAgICAgICAgICAgIHJjID0gaW9tbXVfZmx1c2hfaW90bGIoZCwgZ2ZuLCBkbWFfcHRlX3By ZXNlbnQob2xkKSwgMSk7CisgICAgICAgICAgICBpZiAoIHJjICkKKyAgICAgICAgICAgICAgICBn b3RvIGVycjsKICAgICAgICAgfQogICAgIH0KIAorICAgIHJldHVybiAwOworCitlcnI6CisgICAg d2hpbGUgKCBpLS0gKQorICAgICAgICAvKiBJZiBzdGF0ZW1lbnQgdG8gc2F0aXNmeSBfX211c3Rf Y2hlY2suICovCisgICAgICAgIGlmICggaW50ZWxfaW9tbXVfdW5tYXBfcGFnZXMoZCwgb3JpZ19n Zm4gKyBpLCAwKSApCisgICAgICAgICAgICBjb250aW51ZTsKKwogICAgIHJldHVybiByYzsKIH0K IApAQCAtMTg0NywxMiArMTgzOCwxNyBAQCBzdGF0aWMgaW50IF9fbXVzdF9jaGVjayBpbnRlbF9p b21tdV91bm1hcF9wYWdlcyhzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBnZm4sCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgb3JkZXIp CiB7Ci0gICAgdW5zaWduZWQgbG9uZyBpOwogICAgIGludCByYyA9IDA7CisgICAgdW5zaWduZWQg bG9uZyBpOworCisgICAgLyogRG8gbm90aGluZyBpZiBoYXJkd2FyZSBkb21haW4gYW5kIGlvbW11 IHN1cHBvcnRzIHBhc3MgdGhydS4gKi8KKyAgICBpZiAoIGlvbW11X3Bhc3N0aHJvdWdoICYmIGlz X2hhcmR3YXJlX2RvbWFpbihkKSApCisgICAgICAgIHJldHVybiAwOwogCi0gICAgZm9yICggaSA9 IDA7IGkgPCAoMVVMIDw8IG9yZGVyKTsgaSsrICkKKyAgICBmb3IgKCBpID0gMDsgaSA8ICgxVUwg PDwgb3JkZXIpOyBpKyssIGdmbisrICkKICAgICB7Ci0gICAgICAgIGludCByZXQgPSBpbnRlbF9p b21tdV91bm1hcF9wYWdlKGQsIGdmbiArIGkpOworICAgICAgICBpbnQgcmV0ID0gZG1hX3B0ZV9j bGVhcl9vbmUoZCwgKHBhZGRyX3QpZ2ZuIDw8IFBBR0VfU0hJRlRfNEspOworCiAgICAgICAgIGlm ICggIXJjICkKICAgICAgICAgICAgIHJjID0gcmV0OwogICAgIH0KLS0gCjIuNy40CgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVu LWRldmVsCg==