From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH v4 14/16] xen/arm: p2m: Introduce helpers to insert and remove mapping Date: Mon, 27 Jun 2016 17:54:10 +0100 Message-ID: <1467046452-1261-15-git-send-email-julien.grall@arm.com> References: <1467046452-1261-1-git-send-email-julien.grall@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1467046452-1261-1-git-send-email-julien.grall@arm.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Julien Grall , sstabellini@kernel.org, wei.chen@linaro.org List-Id: xen-devel@lists.xenproject.org TW9yZSB0aGUgaGFsZiBvZiB0aGUgYXJndW1lbnRzIG9mIElOU0VSVCBhbmQgUkVNT1ZFIGFyZSB0 aGUgc2FtZSBmb3IKZWFjaCBjYWxsZXJzLiBTaW1wbGlmeSB0aGUgY2FsbGVycyBvZiBhcHBseV9w Mm1fY2hhbmdlcyBieSBhZGRpbmcgbmV3CmhlbHBlcnMgd2hpY2ggd2lsbCBmaWxsIGNvbW1vbiBh cmd1bWVudHMgd2l0aCBkZWZhdWx0IHZhbHVlcy4KCkFja2VkLWJ5OiBKdWxpZW4gR3JhbGwgPGp1 bGllbi5ncmFsbEBhcm0uY29tPgoKLS0tCiAgICBDaGFuZ2VzIGluIHY0OgogICAgICAgIC0gUGF0 Y2ggYWRkZWQKLS0tCiB4ZW4vYXJjaC9hcm0vcDJtLmMgfCA3MCArKysrKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNiBp bnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC9hcm0v cDJtLmMgYi94ZW4vYXJjaC9hcm0vcDJtLmMKaW5kZXggMzZlZTBmZS4uM2E1MDc4NyAxMDA2NDQK LS0tIGEveGVuL2FyY2gvYXJtL3AybS5jCisrKyBiL3hlbi9hcmNoL2FybS9wMm0uYwpAQCAtMTE1 OCwxNyArMTE1OCw0MCBAQCBvdXQ6CiAgICAgcmV0dXJuIHJjOwogfQogCitzdGF0aWMgaW5saW5l IGludCBwMm1faW5zZXJ0X21hcHBpbmcoc3RydWN0IGRvbWFpbiAqZCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBnZm5fdCBzdGFydF9nZm4sCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBuciwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBtZm5fdCBtZm4sCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgaW50IG1hdHRyLCBwMm1fdHlwZV90IHQpCit7CisgICAgcmV0dXJuIGFwcGx5 X3AybV9jaGFuZ2VzKGQsIElOU0VSVCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGZu X3RvX3BhZGRyKGdmbl94KHN0YXJ0X2dmbikpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBwZm5fdG9fcGFkZHIoZ2ZuX3goc3RhcnRfZ2ZuKSArIG5yKSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcGZuX3RvX3BhZGRyKG1mbl94KG1mbikpLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBtYXR0ciwgMCwgdCwgZC0+YXJjaC5wMm0uZGVmYXVsdF9hY2Nlc3MpOworfQor CitzdGF0aWMgaW5saW5lIGludCBwMm1fcmVtb3ZlX21hcHBpbmcoc3RydWN0IGRvbWFpbiAqZCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnZm5fdCBzdGFydF9nZm4sCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBuciwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZm5fdCBtZm4pCit7CisgICAgcmV0 dXJuIGFwcGx5X3AybV9jaGFuZ2VzKGQsIFJFTU9WRSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcGZuX3RvX3BhZGRyKGdmbl94KHN0YXJ0X2dmbikpLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBwZm5fdG9fcGFkZHIoZ2ZuX3goc3RhcnRfZ2ZuKSArIG5yKSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRyKG1mbl94KG1mbikpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAvKiBhcmd1bWVudHMgYmVsb3cgbm90IHVzZWQgd2hlbiByZW1v dmluZyBtYXBwaW5nICovCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1BVFRSX01FTSwg MCwgcDJtX2ludmFsaWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGQtPmFyY2gucDJt LmRlZmF1bHRfYWNjZXNzKTsKK30KKwogaW50IG1hcF9yZWdpb25zX3J3X2NhY2hlKHN0cnVjdCBk b21haW4gKmQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgZ2ZuX3QgZ2ZuLAogICAgICAgICAg ICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbnIsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgbWZuX3QgbWZuKQogewotICAgIHJldHVybiBhcHBseV9wMm1fY2hhbmdlcyhkLCBJTlNFUlQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihnZm5feChnZm4pKSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRyKGdmbl94KGdmbikgKyBu ciksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihtZm5feChtZm4p KSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTUFUVFJfTUVNLCAwLCBwMm1fbW1pb19k aXJlY3QsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGQtPmFyY2gucDJtLmRlZmF1bHRf YWNjZXNzKTsKKyAgICByZXR1cm4gcDJtX2luc2VydF9tYXBwaW5nKGQsIGdmbiwgbnIsIG1mbiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1BVFRSX01FTSwgcDJtX21taW9fZGlyZWN0 KTsKIH0KIAogaW50IHVubWFwX3JlZ2lvbnNfcndfY2FjaGUoc3RydWN0IGRvbWFpbiAqZCwKQEAg LTExNzYsMTIgKzExOTksNyBAQCBpbnQgdW5tYXBfcmVnaW9uc19yd19jYWNoZShzdHJ1Y3QgZG9t YWluICpkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBuciwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG1mbl90IG1mbikKIHsKLSAgICByZXR1cm4gYXBwbHlf cDJtX2NoYW5nZXMoZCwgUkVNT1ZFLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5f dG9fcGFkZHIoZ2ZuX3goZ2ZuKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90 b19wYWRkcihnZm5feChnZm4pICsgbnIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBw Zm5fdG9fcGFkZHIobWZuX3gobWZuKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1B VFRSX01FTSwgMCwgcDJtX2ludmFsaWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGQt PmFyY2gucDJtLmRlZmF1bHRfYWNjZXNzKTsKKyAgICByZXR1cm4gcDJtX3JlbW92ZV9tYXBwaW5n KGQsIGdmbiwgbnIsIG1mbik7CiB9CiAKIGludCBtYXBfbW1pb19yZWdpb25zKHN0cnVjdCBkb21h aW4gKmQsCkBAIC0xMTg5LDEyICsxMjA3LDggQEAgaW50IG1hcF9tbWlvX3JlZ2lvbnMoc3RydWN0 IGRvbWFpbiAqZCwKICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbnIsCiAgICAg ICAgICAgICAgICAgICAgICBtZm5fdCBtZm4pCiB7Ci0gICAgcmV0dXJuIGFwcGx5X3AybV9jaGFu Z2VzKGQsIElOU0VSVCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRy KGdmbl94KHN0YXJ0X2dmbikpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9f cGFkZHIoZ2ZuX3goc3RhcnRfZ2ZuKSArIG5yKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcGZuX3RvX3BhZGRyKG1mbl94KG1mbikpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBNQVRUUl9ERVYsIDAsIHAybV9tbWlvX2RpcmVjdCwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZC0+YXJjaC5wMm0uZGVmYXVsdF9hY2Nlc3MpOworICAgIHJldHVybiBwMm1faW5zZXJ0 X21hcHBpbmcoZCwgc3RhcnRfZ2ZuLCBuciwgbWZuLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgTUFUVFJfTUVNLCBwMm1fbW1pb19kaXJlY3QpOwogfQogCiBpbnQgdW5tYXBfbW1pb19y ZWdpb25zKHN0cnVjdCBkb21haW4gKmQsCkBAIC0xMjAyLDEyICsxMjE2LDcgQEAgaW50IHVubWFw X21taW9fcmVnaW9ucyhzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAgICAgICAgICAgICB1 bnNpZ25lZCBsb25nIG5yLAogICAgICAgICAgICAgICAgICAgICAgICBtZm5fdCBtZm4pCiB7Ci0g ICAgcmV0dXJuIGFwcGx5X3AybV9jaGFuZ2VzKGQsIFJFTU9WRSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcGZuX3RvX3BhZGRyKGdmbl94KHN0YXJ0X2dmbikpLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIoZ2ZuX3goc3RhcnRfZ2ZuKSArIG5yKSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRyKG1mbl94KG1mbikpLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBNQVRUUl9ERVYsIDAsIHAybV9pbnZhbGlkLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBkLT5hcmNoLnAybS5kZWZhdWx0X2FjY2Vzcyk7Cisg ICAgcmV0dXJuIHAybV9yZW1vdmVfbWFwcGluZyhkLCBzdGFydF9nZm4sIG5yLCBtZm4pOwogfQog CiBpbnQgbWFwX2Rldl9tbWlvX3JlZ2lvbihzdHJ1Y3QgZG9tYWluICpkLApAQCAtMTIzNywyMiAr MTI0NiwxNSBAQCBpbnQgZ3Vlc3RfcGh5c21hcF9hZGRfZW50cnkoc3RydWN0IGRvbWFpbiAqZCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIHBhZ2Vfb3JkZXIsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcDJtX3R5cGVfdCB0KQogewotICAgIHJldHVybiBh cHBseV9wMm1fY2hhbmdlcyhkLCBJTlNFUlQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg IHBmbl90b19wYWRkcihnZm5feChnZm4pKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cGZuX3RvX3BhZGRyKGdmbl94KGdmbikgKyAoMSA8PCBwYWdlX29yZGVyKSksCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihtZm5feChtZm4pKSwgTUFUVFJfTUVNLCAw LCB0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkLT5hcmNoLnAybS5kZWZhdWx0X2Fj Y2Vzcyk7CisgICAgcmV0dXJuIHAybV9pbnNlcnRfbWFwcGluZyhkLCBnZm4sICgxIDw8IHBhZ2Vf b3JkZXIpLCBtZm4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNQVRUUl9NRU0sIHQp OwogfQogCiB2b2lkIGd1ZXN0X3BoeXNtYXBfcmVtb3ZlX3BhZ2Uoc3RydWN0IGRvbWFpbiAqZCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnZm5fdCBnZm4sCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbWZuX3QgbWZuLCB1bnNpZ25lZCBpbnQgcGFnZV9vcmRlcikKIHsK LSAgICBhcHBseV9wMm1fY2hhbmdlcyhkLCBSRU1PVkUsCi0gICAgICAgICAgICAgICAgICAgICAg cGZuX3RvX3BhZGRyKGdmbl94KGdmbikpLAotICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19w YWRkcihnZm5feChnZm4pICsgKDE8PHBhZ2Vfb3JkZXIpKSwKLSAgICAgICAgICAgICAgICAgICAg ICBwZm5fdG9fcGFkZHIobWZuX3gobWZuKSksIE1BVFRSX01FTSwgMCwgcDJtX2ludmFsaWQsCi0g ICAgICAgICAgICAgICAgICAgICAgZC0+YXJjaC5wMm0uZGVmYXVsdF9hY2Nlc3MpOworICAgIHAy bV9yZW1vdmVfbWFwcGluZyhkLCBnZm4sICgxIDw8IHBhZ2Vfb3JkZXIpLCBtZm4pOwogfQogCiBp bnQgcDJtX2FsbG9jX3RhYmxlKHN0cnVjdCBkb21haW4gKmQpCi0tIAoxLjkuMQoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5n IGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRl dmVsCg==