From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH v6 12/14] xen/arm: p2m: Introduce helpers to insert and remove mapping Date: Wed, 6 Jul 2016 14:01:11 +0100 Message-ID: <1467810073-27971-13-git-send-email-julien.grall@arm.com> References: <1467810073-27971-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: <1467810073-27971-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 List-Id: xen-devel@lists.xenproject.org TW9yZSB0aGUgaGFsZiBvZiB0aGUgYXJndW1lbnRzIG9mIElOU0VSVCBhbmQgUkVNT1ZFIGFyZSB0 aGUgc2FtZSBmb3IKZWFjaCBjYWxsZXJzLiBTaW1wbGlmeSB0aGUgY2FsbGVycyBvZiBhcHBseV9w Mm1fY2hhbmdlcyBieSBhZGRpbmcgbmV3CmhlbHBlcnMgd2hpY2ggd2lsbCBmaWxsIGNvbW1vbiBh cmd1bWVudHMgd2l0aCBkZWZhdWx0IHZhbHVlcy4KClNpZ25lZC1vZmYtYnk6IEp1bGllbiBHcmFs bCA8anVsaWVuLmdyYWxsQGFybS5jb20+CgotLS0KICAgIENoYW5nZXMgaW4gdjU6CiAgICAgICAg LSBBZGQgbWlzc2luZyBTaWduZWQtb2ZmLWJ5CgogICAgQ2hhbmdlcyBpbiB2NDoKICAgICAgICAt IFBhdGNoIGFkZGVkCi0tLQogeGVuL2FyY2gvYXJtL3AybS5jIHwgNzAgKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MzYgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gv YXJtL3AybS5jIGIveGVuL2FyY2gvYXJtL3AybS5jCmluZGV4IDJiYTk0NzcuLmI5OGVmZjQgMTAw NjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9wMm0uYworKysgYi94ZW4vYXJjaC9hcm0vcDJtLmMKQEAg LTExNTgsMTcgKzExNTgsNDAgQEAgb3V0OgogICAgIHJldHVybiByYzsKIH0KIAorc3RhdGljIGlu bGluZSBpbnQgcDJtX2luc2VydF9tYXBwaW5nKHN0cnVjdCBkb21haW4gKmQsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2ZuX3Qgc3RhcnRfZ2ZuLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbnIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbWZuX3QgbWZuLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGludCBtYXR0ciwgcDJtX3R5cGVfdCB0KQoreworICAgIHJldHVybiBh cHBseV9wMm1fY2hhbmdlcyhkLCBJTlNFUlQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHBmbl90b19wYWRkcihnZm5feChzdGFydF9nZm4pKSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcGZuX3RvX3BhZGRyKGdmbl94KHN0YXJ0X2dmbikgKyBuciksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihtZm5feChtZm4pKSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbWF0dHIsIDAsIHQsIGQtPmFyY2gucDJtLmRlZmF1bHRfYWNjZXNzKTsK K30KKworc3RhdGljIGlubGluZSBpbnQgcDJtX3JlbW92ZV9tYXBwaW5nKHN0cnVjdCBkb21haW4g KmQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2ZuX3Qgc3RhcnRfZ2Zu LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbnIs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWZuX3QgbWZuKQoreworICAg IHJldHVybiBhcHBseV9wMm1fY2hhbmdlcyhkLCBSRU1PVkUsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHBmbl90b19wYWRkcihnZm5feChzdGFydF9nZm4pKSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRyKGdmbl94KHN0YXJ0X2dmbikgKyBuciksCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihtZm5feChtZm4pKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgLyogYXJndW1lbnRzIGJlbG93IG5vdCB1c2VkIHdoZW4g cmVtb3ZpbmcgbWFwcGluZyAqLworICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNQVRUUl9N RU0sIDAsIHAybV9pbnZhbGlkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkLT5hcmNo LnAybS5kZWZhdWx0X2FjY2Vzcyk7Cit9CisKIGludCBtYXBfcmVnaW9uc19yd19jYWNoZShzdHJ1 Y3QgZG9tYWluICpkLAogICAgICAgICAgICAgICAgICAgICAgICAgIGdmbl90IGdmbiwKICAgICAg ICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIG5yLAogICAgICAgICAgICAgICAgICAg ICAgICAgIG1mbl90IG1mbikKIHsKLSAgICByZXR1cm4gYXBwbHlfcDJtX2NoYW5nZXMoZCwgSU5T RVJULAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIoZ2ZuX3goZ2Zu KSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihnZm5feChnZm4p ICsgbnIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIobWZuX3go bWZuKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1BVFRSX01FTSwgMCwgcDJtX21t aW9fZGlyZWN0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkLT5hcmNoLnAybS5kZWZh dWx0X2FjY2Vzcyk7CisgICAgcmV0dXJuIHAybV9pbnNlcnRfbWFwcGluZyhkLCBnZm4sIG5yLCBt Zm4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNQVRUUl9NRU0sIHAybV9tbWlvX2Rp cmVjdCk7CiB9CiAKIGludCB1bm1hcF9yZWdpb25zX3J3X2NhY2hlKHN0cnVjdCBkb21haW4gKmQs CkBAIC0xMTc2LDEyICsxMTk5LDcgQEAgaW50IHVubWFwX3JlZ2lvbnNfcndfY2FjaGUoc3RydWN0 IGRvbWFpbiAqZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgbnIs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZm5fdCBtZm4pCiB7Ci0gICAgcmV0dXJuIGFw cGx5X3AybV9jaGFuZ2VzKGQsIFJFTU9WRSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cGZuX3RvX3BhZGRyKGdmbl94KGdmbikpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBw Zm5fdG9fcGFkZHIoZ2ZuX3goZ2ZuKSArIG5yKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcGZuX3RvX3BhZGRyKG1mbl94KG1mbikpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBNQVRUUl9NRU0sIDAsIHAybV9pbnZhbGlkLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBkLT5hcmNoLnAybS5kZWZhdWx0X2FjY2Vzcyk7CisgICAgcmV0dXJuIHAybV9yZW1vdmVfbWFw cGluZyhkLCBnZm4sIG5yLCBtZm4pOwogfQogCiBpbnQgbWFwX21taW9fcmVnaW9ucyhzdHJ1Y3Qg ZG9tYWluICpkLApAQCAtMTE4OSwxMiArMTIwNyw4IEBAIGludCBtYXBfbW1pb19yZWdpb25zKHN0 cnVjdCBkb21haW4gKmQsCiAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIG5yLAog ICAgICAgICAgICAgICAgICAgICAgbWZuX3QgbWZuKQogewotICAgIHJldHVybiBhcHBseV9wMm1f Y2hhbmdlcyhkLCBJTlNFUlQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19w YWRkcihnZm5feChzdGFydF9nZm4pKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGZu X3RvX3BhZGRyKGdmbl94KHN0YXJ0X2dmbikgKyBuciksCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHBmbl90b19wYWRkcihtZm5feChtZm4pKSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgTUFUVFJfREVWLCAwLCBwMm1fbW1pb19kaXJlY3QsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGQtPmFyY2gucDJtLmRlZmF1bHRfYWNjZXNzKTsKKyAgICByZXR1cm4gcDJtX2lu c2VydF9tYXBwaW5nKGQsIHN0YXJ0X2dmbiwgbnIsIG1mbiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIE1BVFRSX01FTSwgcDJtX21taW9fZGlyZWN0KTsKIH0KIAogaW50IHVubWFwX21t aW9fcmVnaW9ucyhzdHJ1Y3QgZG9tYWluICpkLApAQCAtMTIwMiwxMiArMTIxNiw3IEBAIGludCB1 bm1hcF9tbWlvX3JlZ2lvbnMoc3RydWN0IGRvbWFpbiAqZCwKICAgICAgICAgICAgICAgICAgICAg ICAgdW5zaWduZWQgbG9uZyBuciwKICAgICAgICAgICAgICAgICAgICAgICAgbWZuX3QgbWZuKQog ewotICAgIHJldHVybiBhcHBseV9wMm1fY2hhbmdlcyhkLCBSRU1PVkUsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihnZm5feChzdGFydF9nZm4pKSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRyKGdmbl94KHN0YXJ0X2dmbikgKyBuciks Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihtZm5feChtZm4pKSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTUFUVFJfREVWLCAwLCBwMm1faW52YWxpZCwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZC0+YXJjaC5wMm0uZGVmYXVsdF9hY2Nlc3Mp OworICAgIHJldHVybiBwMm1fcmVtb3ZlX21hcHBpbmcoZCwgc3RhcnRfZ2ZuLCBuciwgbWZuKTsK IH0KIAogaW50IG1hcF9kZXZfbW1pb19yZWdpb24oc3RydWN0IGRvbWFpbiAqZCwKQEAgLTEyMzcs MjIgKzEyNDYsMTUgQEAgaW50IGd1ZXN0X3BoeXNtYXBfYWRkX2VudHJ5KHN0cnVjdCBkb21haW4g KmQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBwYWdlX29yZGVy LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAybV90eXBlX3QgdCkKIHsKLSAgICByZXR1 cm4gYXBwbHlfcDJtX2NoYW5nZXMoZCwgSU5TRVJULAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwZm5fdG9fcGFkZHIoZ2ZuX3goZ2ZuKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHBmbl90b19wYWRkcihnZm5feChnZm4pICsgKDEgPDwgcGFnZV9vcmRlcikpLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIobWZuX3gobWZuKSksIE1BVFRSX01F TSwgMCwgdCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZC0+YXJjaC5wMm0uZGVmYXVs dF9hY2Nlc3MpOworICAgIHJldHVybiBwMm1faW5zZXJ0X21hcHBpbmcoZCwgZ2ZuLCAoMSA8PCBw YWdlX29yZGVyKSwgbWZuLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTUFUVFJfTUVN LCB0KTsKIH0KIAogdm9pZCBndWVzdF9waHlzbWFwX3JlbW92ZV9wYWdlKHN0cnVjdCBkb21haW4g KmQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2ZuX3QgZ2ZuLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG1mbl90IG1mbiwgdW5zaWduZWQgaW50IHBhZ2Vfb3JkZXIp CiB7Ci0gICAgYXBwbHlfcDJtX2NoYW5nZXMoZCwgUkVNT1ZFLAotICAgICAgICAgICAgICAgICAg ICAgIHBmbl90b19wYWRkcihnZm5feChnZm4pKSwKLSAgICAgICAgICAgICAgICAgICAgICBwZm5f dG9fcGFkZHIoZ2ZuX3goZ2ZuKSArICgxPDxwYWdlX29yZGVyKSksCi0gICAgICAgICAgICAgICAg ICAgICAgcGZuX3RvX3BhZGRyKG1mbl94KG1mbikpLCBNQVRUUl9NRU0sIDAsIHAybV9pbnZhbGlk LAotICAgICAgICAgICAgICAgICAgICAgIGQtPmFyY2gucDJtLmRlZmF1bHRfYWNjZXNzKTsKKyAg ICBwMm1fcmVtb3ZlX21hcHBpbmcoZCwgZ2ZuLCAoMSA8PCBwYWdlX29yZGVyKSwgbWZuKTsKIH0K IAogaW50IHAybV9hbGxvY190YWJsZShzdHJ1Y3QgZG9tYWluICpkKQotLSAKMS45LjEKCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFp bGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94 ZW4tZGV2ZWwK