From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH v7 12/14] xen/arm: p2m: Introduce helpers to insert and remove mapping Date: Tue, 12 Jul 2016 14:59:33 +0100 Message-ID: <1468331975-27331-13-git-send-email-julien.grall@arm.com> References: <1468331975-27331-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: <1468331975-27331-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+CgotLS0KICAgIENoYW5nZXMgaW4gdjc6CiAgICAgICAg LSBNQVRUUl9ERVYgc2hvdWxkIGJlIHVzZWQgaW4gbWFwX21taW9fcmVnaW9ucyByYXRoZXIgdGhh biBNQVRUUl9NRU0KCiAgICBDaGFuZ2VzIGluIHY1OgogICAgICAgIC0gQWRkIG1pc3NpbmcgU2ln bmVkLW9mZi1ieQoKICAgIENoYW5nZXMgaW4gdjQ6CiAgICAgICAgLSBQYXRjaCBhZGRlZAotLS0K IHhlbi9hcmNoL2FybS9wMm0uYyB8IDcwICsrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM2IGluc2VydGlvbnMoKyks IDM0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL2FybS9wMm0uYyBiL3hlbi9h cmNoL2FybS9wMm0uYwppbmRleCAyYmE5NDc3Li5kZDg5MGMyIDEwMDY0NAotLS0gYS94ZW4vYXJj aC9hcm0vcDJtLmMKKysrIGIveGVuL2FyY2gvYXJtL3AybS5jCkBAIC0xMTU4LDE3ICsxMTU4LDQw IEBAIG91dDoKICAgICByZXR1cm4gcmM7CiB9CiAKK3N0YXRpYyBpbmxpbmUgaW50IHAybV9pbnNl cnRfbWFwcGluZyhzdHJ1Y3QgZG9tYWluICpkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGdmbl90IHN0YXJ0X2dmbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB1bnNpZ25lZCBsb25nIG5yLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1mbl90IG1mbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBp bnQgbWF0dHIsIHAybV90eXBlX3QgdCkKK3sKKyAgICByZXR1cm4gYXBwbHlfcDJtX2NoYW5nZXMo ZCwgSU5TRVJULAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIoZ2Zu X3goc3RhcnRfZ2ZuKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRk cihnZm5feChzdGFydF9nZm4pICsgbnIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBw Zm5fdG9fcGFkZHIobWZuX3gobWZuKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1h dHRyLCAwLCB0LCBkLT5hcmNoLnAybS5kZWZhdWx0X2FjY2Vzcyk7Cit9CisKK3N0YXRpYyBpbmxp bmUgaW50IHAybV9yZW1vdmVfbWFwcGluZyhzdHJ1Y3QgZG9tYWluICpkLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGdmbl90IHN0YXJ0X2dmbiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIG5yLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG1mbl90IG1mbikKK3sKKyAgICByZXR1cm4gYXBwbHlfcDJt X2NoYW5nZXMoZCwgUkVNT1ZFLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9f cGFkZHIoZ2ZuX3goc3RhcnRfZ2ZuKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBm bl90b19wYWRkcihnZm5feChzdGFydF9nZm4pICsgbnIpLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBwZm5fdG9fcGFkZHIobWZuX3gobWZuKSksCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8qIGFyZ3VtZW50cyBiZWxvdyBub3QgdXNlZCB3aGVuIHJlbW92aW5nIG1hcHBpbmcg Ki8KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTUFUVFJfTUVNLCAwLCBwMm1faW52YWxp ZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZC0+YXJjaC5wMm0uZGVmYXVsdF9hY2Nl c3MpOworfQorCiBpbnQgbWFwX3JlZ2lvbnNfcndfY2FjaGUoc3RydWN0IGRvbWFpbiAqZCwKICAg ICAgICAgICAgICAgICAgICAgICAgICBnZm5fdCBnZm4sCiAgICAgICAgICAgICAgICAgICAgICAg ICAgdW5zaWduZWQgbG9uZyBuciwKICAgICAgICAgICAgICAgICAgICAgICAgICBtZm5fdCBtZm4p CiB7Ci0gICAgcmV0dXJuIGFwcGx5X3AybV9jaGFuZ2VzKGQsIElOU0VSVCwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRyKGdmbl94KGdmbikpLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIoZ2ZuX3goZ2ZuKSArIG5yKSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRyKG1mbl94KG1mbikpLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBNQVRUUl9NRU0sIDAsIHAybV9tbWlvX2RpcmVjdCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZC0+YXJjaC5wMm0uZGVmYXVsdF9hY2Nlc3MpOworICAg IHJldHVybiBwMm1faW5zZXJ0X21hcHBpbmcoZCwgZ2ZuLCBuciwgbWZuLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgTUFUVFJfTUVNLCBwMm1fbW1pb19kaXJlY3QpOwogfQogCiBpbnQg dW5tYXBfcmVnaW9uc19yd19jYWNoZShzdHJ1Y3QgZG9tYWluICpkLApAQCAtMTE3NiwxMiArMTE5 OSw3IEBAIGludCB1bm1hcF9yZWdpb25zX3J3X2NhY2hlKHN0cnVjdCBkb21haW4gKmQsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIG5yLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgbWZuX3QgbWZuKQogewotICAgIHJldHVybiBhcHBseV9wMm1fY2hhbmdlcyhk LCBSRU1PVkUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihnZm5f eChnZm4pKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRyKGdmbl94 KGdmbikgKyBuciksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkciht Zm5feChtZm4pKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTUFUVFJfTUVNLCAwLCBw Mm1faW52YWxpZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZC0+YXJjaC5wMm0uZGVm YXVsdF9hY2Nlc3MpOworICAgIHJldHVybiBwMm1fcmVtb3ZlX21hcHBpbmcoZCwgZ2ZuLCBuciwg bWZuKTsKIH0KIAogaW50IG1hcF9tbWlvX3JlZ2lvbnMoc3RydWN0IGRvbWFpbiAqZCwKQEAgLTEx ODksMTIgKzEyMDcsOCBAQCBpbnQgbWFwX21taW9fcmVnaW9ucyhzdHJ1Y3QgZG9tYWluICpkLAog ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBuciwKICAgICAgICAgICAgICAgICAg ICAgIG1mbl90IG1mbikKIHsKLSAgICByZXR1cm4gYXBwbHlfcDJtX2NoYW5nZXMoZCwgSU5TRVJU LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIoZ2ZuX3goc3RhcnRf Z2ZuKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihnZm5feChz dGFydF9nZm4pICsgbnIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFk ZHIobWZuX3gobWZuKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1BVFRSX0RFViwg MCwgcDJtX21taW9fZGlyZWN0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkLT5hcmNo LnAybS5kZWZhdWx0X2FjY2Vzcyk7CisgICAgcmV0dXJuIHAybV9pbnNlcnRfbWFwcGluZyhkLCBz dGFydF9nZm4sIG5yLCBtZm4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNQVRUUl9E RVYsIHAybV9tbWlvX2RpcmVjdCk7CiB9CiAKIGludCB1bm1hcF9tbWlvX3JlZ2lvbnMoc3RydWN0 IGRvbWFpbiAqZCwKQEAgLTEyMDIsMTIgKzEyMTYsNyBAQCBpbnQgdW5tYXBfbW1pb19yZWdpb25z KHN0cnVjdCBkb21haW4gKmQsCiAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcg bnIsCiAgICAgICAgICAgICAgICAgICAgICAgIG1mbl90IG1mbikKIHsKLSAgICByZXR1cm4gYXBw bHlfcDJtX2NoYW5nZXMoZCwgUkVNT1ZFLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBw Zm5fdG9fcGFkZHIoZ2ZuX3goc3RhcnRfZ2ZuKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHBmbl90b19wYWRkcihnZm5feChzdGFydF9nZm4pICsgbnIpLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIobWZuX3gobWZuKSksCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgIE1BVFRSX0RFViwgMCwgcDJtX2ludmFsaWQsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGQtPmFyY2gucDJtLmRlZmF1bHRfYWNjZXNzKTsKKyAgICByZXR1cm4gcDJt X3JlbW92ZV9tYXBwaW5nKGQsIHN0YXJ0X2dmbiwgbnIsIG1mbik7CiB9CiAKIGludCBtYXBfZGV2 X21taW9fcmVnaW9uKHN0cnVjdCBkb21haW4gKmQsCkBAIC0xMjM3LDIyICsxMjQ2LDE1IEBAIGlu dCBndWVzdF9waHlzbWFwX2FkZF9lbnRyeShzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgcGFnZV9vcmRlciwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBwMm1fdHlwZV90IHQpCiB7Ci0gICAgcmV0dXJuIGFwcGx5X3AybV9jaGFu Z2VzKGQsIElOU0VSVCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRy KGdmbl94KGdmbikpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIo Z2ZuX3goZ2ZuKSArICgxIDw8IHBhZ2Vfb3JkZXIpKSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcGZuX3RvX3BhZGRyKG1mbl94KG1mbikpLCBNQVRUUl9NRU0sIDAsIHQsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGQtPmFyY2gucDJtLmRlZmF1bHRfYWNjZXNzKTsKKyAgICBy ZXR1cm4gcDJtX2luc2VydF9tYXBwaW5nKGQsIGdmbiwgKDEgPDwgcGFnZV9vcmRlciksIG1mbiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1BVFRSX01FTSwgdCk7CiB9CiAKIHZvaWQg Z3Vlc3RfcGh5c21hcF9yZW1vdmVfcGFnZShzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGdmbl90IGdmbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtZm5fdCBtZm4sIHVuc2lnbmVkIGludCBwYWdlX29yZGVyKQogewotICAgIGFwcGx5X3Ay bV9jaGFuZ2VzKGQsIFJFTU9WRSwKLSAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIo Z2ZuX3goZ2ZuKSksCi0gICAgICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRyKGdmbl94KGdm bikgKyAoMTw8cGFnZV9vcmRlcikpLAotICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRk cihtZm5feChtZm4pKSwgTUFUVFJfTUVNLCAwLCBwMm1faW52YWxpZCwKLSAgICAgICAgICAgICAg ICAgICAgICBkLT5hcmNoLnAybS5kZWZhdWx0X2FjY2Vzcyk7CisgICAgcDJtX3JlbW92ZV9tYXBw aW5nKGQsIGdmbiwgKDEgPDwgcGFnZV9vcmRlciksIG1mbik7CiB9CiAKIGludCBwMm1fYWxsb2Nf dGFibGUoc3RydWN0IGRvbWFpbiAqZCkKLS0gCjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2 ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==