From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH v5 17/17] xen/arm: p2m: Rework the interface of apply_p2m_changes and use typesafe Date: Tue, 28 Jun 2016 17:17:23 +0100 Message-ID: <1467130643-23868-18-git-send-email-julien.grall@arm.com> References: <1467130643-23868-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: <1467130643-23868-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 TW9zdCBvZiB0aGUgY2FsbGVycyBvZiBhcHBseV9wMm1fY2hhbmdlcyBoYXZlIGEgR0ZOLCBhIE1G TiBhbmQgdGhlCm51bWJlciBvZiBmcmFtZSB0byBjaGFuZ2UgaW4gaGFuZC4KClJhdGhlciB0aGFu IGFza2luZyBlYWNoIGNhbGxlciB0byBjb252ZXJ0IHRoZSBmcmFtZSB0byBhbiBhZGRyZXNzLApy ZXdvcmsgdGhlIGludGVyZmFjZXMgdG8gcGFzcyB0aGUgR0ZOLCBNRk4gYW5kIHRoZSBudW1iZXIg b2YgZnJhbWUuCgpOb3RlIHRoYXQgaXQgd291bGQgYmUgcG9zc2libGUgdG8gZG8gbW9yZSBjbGVh bi11cCBpbiBhcHBseV9wMm1fY2hhbmdlcywKYnV0IHRoaXMgd2lsbCBiZSBkb25lIGluIGEgZm9s bG93LXVwIHNlcmllcy4KClNpZ25lZC1vZmYtYnk6IEp1bGllbiBHcmFsbCA8anVsaWVuLmdyYWxs QGFybS5jb20+CgotLS0KICAgIENoYW5nZXMgaW4gdjQ6CiAgICAgICAgLSBQYXRjaCBhZGRlZAot LS0KIHhlbi9hcmNoL2FybS9wMm0uYyB8IDYyICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI4IGluc2VydGlvbnMo KyksIDM0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL2FybS9wMm0uYyBiL3hl bi9hcmNoL2FybS9wMm0uYwppbmRleCA5ZmRjNDE3Li5iYjMzYTcyIDEwMDY0NAotLS0gYS94ZW4v YXJjaC9hcm0vcDJtLmMKKysrIGIveGVuL2FyY2gvYXJtL3AybS5jCkBAIC05MDYsMjUgKzkwNiwy NiBAQCBzdGF0aWMgdm9pZCB1cGRhdGVfcmVmZXJlbmNlX21hcHBpbmcoc3RydWN0IHBhZ2VfaW5m byAqcGFnZSwKIAogc3RhdGljIGludCBhcHBseV9wMm1fY2hhbmdlcyhzdHJ1Y3QgZG9tYWluICpk LAogICAgICAgICAgICAgICAgICAgICAgZW51bSBwMm1fb3BlcmF0aW9uIG9wLAotICAgICAgICAg ICAgICAgICAgICAgcGFkZHJfdCBzdGFydF9ncGFkZHIsCi0gICAgICAgICAgICAgICAgICAgICBw YWRkcl90IGVuZF9ncGFkZHIsCi0gICAgICAgICAgICAgICAgICAgICBwYWRkcl90IG1hZGRyLAor ICAgICAgICAgICAgICAgICAgICAgZ2ZuX3Qgc2dmbiwKKyAgICAgICAgICAgICAgICAgICAgIHVu c2lnbmVkIGxvbmcgbnIsCisgICAgICAgICAgICAgICAgICAgICBtZm5fdCBzbWZuLAogICAgICAg ICAgICAgICAgICAgICAgaW50IG1hdHRyLAogICAgICAgICAgICAgICAgICAgICAgdWludDMyX3Qg bWFzaywKICAgICAgICAgICAgICAgICAgICAgIHAybV90eXBlX3QgdCwKICAgICAgICAgICAgICAg ICAgICAgIHAybV9hY2Nlc3NfdCBhKQogeworICAgIHBhZGRyX3Qgc3RhcnRfZ3BhZGRyID0gcGZu X3RvX3BhZGRyKGdmbl94KHNnZm4pKTsKKyAgICBwYWRkcl90IGVuZF9ncGFkZHIgPSBwZm5fdG9f cGFkZHIoZ2ZuX3goc2dmbikgKyBucik7CisgICAgcGFkZHJfdCBtYWRkciA9IHBmbl90b19wYWRk cihtZm5feChzbWZuKSk7CiAgICAgaW50IHJjLCByZXQ7CiAgICAgc3RydWN0IHAybV9kb21haW4g KnAybSA9ICZkLT5hcmNoLnAybTsKICAgICBscGFlX3QgKm1hcHBpbmdzWzRdID0geyBOVUxMLCBO VUxMLCBOVUxMLCBOVUxMIH07CiAgICAgc3RydWN0IHBhZ2VfaW5mbyAqcGFnZXNbNF0gPSB7IE5V TEwsIE5VTEwsIE5VTEwsIE5VTEwgfTsKLSAgICBwYWRkcl90IGFkZHIsIG9yaWdfbWFkZHIgPSBt YWRkcjsKKyAgICBwYWRkcl90IGFkZHI7CiAgICAgdW5zaWduZWQgaW50IGxldmVsID0gMDsKICAg ICB1bnNpZ25lZCBpbnQgY3VyX3Jvb3RfdGFibGUgPSB+MDsKICAgICB1bnNpZ25lZCBpbnQgY3Vy X29mZnNldFs0XSA9IHsgfjAsIH4wLCB+MCwgfjAgfTsKICAgICB1bnNpZ25lZCBpbnQgY291bnQg PSAwOwotICAgIGNvbnN0IHVuc2lnbmVkIGxvbmcgc2dmbiA9IHBhZGRyX3RvX3BmbihzdGFydF9n cGFkZHIpLAotICAgICAgICAgICAgICAgICAgICAgICAgZWdmbiA9IHBhZGRyX3RvX3BmbihlbmRf Z3BhZGRyKTsKICAgICBjb25zdCB1bnNpZ25lZCBpbnQgcHJlZW1wdF9jb3VudF9saW1pdCA9IChv cCA9PSBNRU1BQ0NFU1MpID8gMSA6IDB4MjAwMDsKICAgICBjb25zdCBib29sX3QgcHJlZW1wdCA9 ICFpc19pZGxlX3ZjcHUoY3VycmVudCk7CiAgICAgYm9vbF90IGZsdXNoID0gZmFsc2U7CkBAIC05 ODYsOSArOTg3LDkgQEAgc3RhdGljIGludCBhcHBseV9wMm1fY2hhbmdlcyhzdHJ1Y3QgZG9tYWlu ICpkLAogICAgICAgICAgICAgICAgICAqIFByZWVtcHQgc2V0dGluZyBtZW1fYWNjZXNzIHBlcm1p c3Npb25zIGFzIHJlcXVpcmVkIGJ5IFhTQS04OSwKICAgICAgICAgICAgICAgICAgKiBpZiBpdCdz IG5vdCB0aGUgbGFzdCBpdGVyYXRpb24uCiAgICAgICAgICAgICAgICAgICovCi0gICAgICAgICAg ICAgICAgdWludDMyX3QgcHJvZ3Jlc3MgPSBwYWRkcl90b19wZm4oYWRkcikgLSBzZ2ZuICsgMTsK KyAgICAgICAgICAgICAgICB1aW50MzJfdCBwcm9ncmVzcyA9IHBhZGRyX3RvX3BmbihhZGRyKSAt IGdmbl94KHNnZm4pICsgMTsKIAotICAgICAgICAgICAgICAgIGlmICggKGVnZm4gLSBzZ2ZuKSA+ IHByb2dyZXNzICYmICEocHJvZ3Jlc3MgJiBtYXNrKSApCisgICAgICAgICAgICAgICAgaWYgKCBu ciA+IHByb2dyZXNzICYmICEocHJvZ3Jlc3MgJiBtYXNrKSApCiAgICAgICAgICAgICAgICAgewog ICAgICAgICAgICAgICAgICAgICByYyA9IHByb2dyZXNzOwogICAgICAgICAgICAgICAgICAgICBn b3RvIG91dDsKQEAgLTExMTcsOCArMTExOCw5IEBAIHN0YXRpYyBpbnQgYXBwbHlfcDJtX2NoYW5n ZXMoc3RydWN0IGRvbWFpbiAqZCwKIAogICAgIGlmICggb3AgPT0gSU5TRVJUICkKICAgICB7Ci0g ICAgICAgIHAybS0+bWF4X21hcHBlZF9nZm4gPSBnZm5fbWF4KHAybS0+bWF4X21hcHBlZF9nZm4s IF9nZm4oZWdmbikpOwotICAgICAgICBwMm0tPmxvd2VzdF9tYXBwZWRfZ2ZuID0gZ2ZuX21pbihw Mm0tPmxvd2VzdF9tYXBwZWRfZ2ZuLCBfZ2ZuKHNnZm4pKTsKKyAgICAgICAgcDJtLT5tYXhfbWFw cGVkX2dmbiA9IGdmbl9tYXgocDJtLT5tYXhfbWFwcGVkX2dmbiwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZ2ZuX2FkZChzZ2ZuLCBucikpOworICAgICAgICBwMm0tPmxv d2VzdF9tYXBwZWRfZ2ZuID0gZ2ZuX21pbihwMm0tPmxvd2VzdF9tYXBwZWRfZ2ZuLCBzZ2ZuKTsK ICAgICB9CiAKICAgICByYyA9IDA7CkBAIC0xMTI3LDcgKzExMjksNyBAQCBvdXQ6CiAgICAgaWYg KCBmbHVzaCApCiAgICAgewogICAgICAgICBmbHVzaF90bGJfZG9tYWluKGQpOwotICAgICAgICBy ZXQgPSBpb21tdV9pb3RsYl9mbHVzaChkLCBzZ2ZuLCBlZ2ZuIC0gc2dmbik7CisgICAgICAgIHJl dCA9IGlvbW11X2lvdGxiX2ZsdXNoKGQsIGdmbl94KHNnZm4pLCBucik7CiAgICAgICAgIGlmICgg IXJjICkKICAgICAgICAgICAgIHJjID0gcmV0OwogICAgIH0KQEAgLTExNDYsMTIgKzExNDgsMTQg QEAgb3V0OgogICAgIGlmICggcmMgPCAwICYmICggb3AgPT0gSU5TRVJUICkgJiYKICAgICAgICAg IGFkZHIgIT0gc3RhcnRfZ3BhZGRyICkKICAgICB7CisgICAgICAgIHVuc2lnbmVkIGxvbmcgZ2Zu ID0gcGFkZHJfdG9fcGZuKGFkZHIpOworCiAgICAgICAgIEJVR19PTihhZGRyID09IGVuZF9ncGFk ZHIpOwogICAgICAgICAvKgogICAgICAgICAgKiBhZGRyIGtlZXBzIHRoZSBhZGRyZXNzIG9mIHRo ZSBlbmQgb2YgdGhlIGxhc3Qgc3VjY2Vzc2Z1bGx5LWluc2VydGVkCiAgICAgICAgICAqIG1hcHBp bmcuCiAgICAgICAgICAqLwotICAgICAgICBhcHBseV9wMm1fY2hhbmdlcyhkLCBSRU1PVkUsIHN0 YXJ0X2dwYWRkciwgYWRkciwgb3JpZ19tYWRkciwKKyAgICAgICAgYXBwbHlfcDJtX2NoYW5nZXMo ZCwgUkVNT1ZFLCBzZ2ZuLCBnZm4gLSBnZm5feChzZ2ZuKSwgc21mbiwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgbWF0dHIsIDAsIHAybV9pbnZhbGlkLCBkLT5hcmNoLnAybS5kZWZhdWx0X2Fj Y2Vzcyk7CiAgICAgfQogCkBAIC0xMTY0LDEwICsxMTY4LDcgQEAgc3RhdGljIGlubGluZSBpbnQg cDJtX2luc2VydF9tYXBwaW5nKHN0cnVjdCBkb21haW4gKmQsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbWZuX3QgbWZuLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGludCBtYXR0ciwgcDJtX3R5cGVfdCB0KQogewotICAgIHJldHVybiBhcHBseV9w Mm1fY2hhbmdlcyhkLCBJTlNFUlQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90 b19wYWRkcihnZm5feChzdGFydF9nZm4pKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cGZuX3RvX3BhZGRyKGdmbl94KHN0YXJ0X2dmbikgKyBuciksCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHBmbl90b19wYWRkcihtZm5feChtZm4pKSwKKyAgICByZXR1cm4gYXBwbHlfcDJt X2NoYW5nZXMoZCwgSU5TRVJULCBzdGFydF9nZm4sIG5yLCBtZm4sCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1hdHRyLCAwLCB0LCBkLT5hcmNoLnAybS5kZWZhdWx0X2FjY2Vzcyk7CiB9 CiAKQEAgLTExNzYsMTAgKzExNzcsNyBAQCBzdGF0aWMgaW5saW5lIGludCBwMm1fcmVtb3ZlX21h cHBpbmcoc3RydWN0IGRvbWFpbiAqZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB1bnNpZ25lZCBsb25nIG5yLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG1mbl90IG1mbikKIHsKLSAgICByZXR1cm4gYXBwbHlfcDJtX2NoYW5nZXMoZCwgUkVNT1ZF LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFkZHIoZ2ZuX3goc3RhcnRf Z2ZuKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihnZm5feChz dGFydF9nZm4pICsgbnIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9fcGFk ZHIobWZuX3gobWZuKSksCisgICAgcmV0dXJuIGFwcGx5X3AybV9jaGFuZ2VzKGQsIFJFTU9WRSwg c3RhcnRfZ2ZuLCBuciwgbWZuLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBhcmd1 bWVudHMgYmVsb3cgbm90IHVzZWQgd2hlbiByZW1vdmluZyBtYXBwaW5nICovCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIE1BVFRSX01FTSwgMCwgcDJtX2ludmFsaWQsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGQtPmFyY2gucDJtLmRlZmF1bHRfYWNjZXNzKTsKQEAgLTEzOTks MTMgKzEzOTcsMTMgQEAgZXJyOgogaW50IHJlbGlucXVpc2hfcDJtX21hcHBpbmcoc3RydWN0IGRv bWFpbiAqZCkKIHsKICAgICBzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtID0gJmQtPmFyY2gucDJtOwor ICAgIHVuc2lnbmVkIGxvbmcgbnI7CiAKLSAgICByZXR1cm4gYXBwbHlfcDJtX2NoYW5nZXMoZCwg UkVMSU5RVUlTSCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19wYWRkcihn Zm5feChwMm0tPmxvd2VzdF9tYXBwZWRfZ2ZuKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwZm5fdG9fcGFkZHIoZ2ZuX3gocDJtLT5tYXhfbWFwcGVkX2dmbikpLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcGZuX3RvX3BhZGRyKG1mbl94KElOVkFMSURfTUZOKSksCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNQVRUUl9NRU0sIDAsIHAybV9pbnZhbGlkLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZC0+YXJjaC5wMm0uZGVmYXVsdF9hY2Nlc3Mp OworICAgIG5yID0gZ2ZuX3gocDJtLT5tYXhfbWFwcGVkX2dmbikgLSBnZm5feChwMm0tPmxvd2Vz dF9tYXBwZWRfZ2ZuKTsKKworICAgIHJldHVybiBhcHBseV9wMm1fY2hhbmdlcyhkLCBSRUxJTlFV SVNILCBwMm0tPmxvd2VzdF9tYXBwZWRfZ2ZuLCBuciwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgSU5WQUxJRF9NRk4sIE1BVFRSX01FTSwgMCwgcDJtX2ludmFsaWQsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGQtPmFyY2gucDJtLmRlZmF1bHRfYWNjZXNzKTsKIH0KIAogaW50 IHAybV9jYWNoZV9mbHVzaChzdHJ1Y3QgZG9tYWluICpkLCBnZm5fdCBzdGFydCwgdW5zaWduZWQg bG9uZyBucikKQEAgLTE0MTYsMTAgKzE0MTQsNyBAQCBpbnQgcDJtX2NhY2hlX2ZsdXNoKHN0cnVj dCBkb21haW4gKmQsIGdmbl90IHN0YXJ0LCB1bnNpZ25lZCBsb25nIG5yKQogICAgIHN0YXJ0ID0g Z2ZuX21heChzdGFydCwgcDJtLT5sb3dlc3RfbWFwcGVkX2dmbik7CiAgICAgZW5kID0gZ2ZuX21p bihlbmQsIHAybS0+bWF4X21hcHBlZF9nZm4pOwogCi0gICAgcmV0dXJuIGFwcGx5X3AybV9jaGFu Z2VzKGQsIENBQ0hFRkxVU0gsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19w YWRkcihnZm5feChzdGFydCkpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwZm5fdG9f cGFkZHIoZ2ZuX3goZW5kKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBmbl90b19w YWRkcihtZm5feChJTlZBTElEX01GTikpLAorICAgIHJldHVybiBhcHBseV9wMm1fY2hhbmdlcyhk LCBDQUNIRUZMVVNILCBzdGFydCwgbnIsIElOVkFMSURfTUZOLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBNQVRUUl9NRU0sIDAsIHAybV9pbnZhbGlkLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkLT5hcmNoLnAybS5kZWZhdWx0X2FjY2Vzcyk7CiB9CkBAIC0xODI4LDEwICsx ODIzLDkgQEAgbG9uZyBwMm1fc2V0X21lbV9hY2Nlc3Moc3RydWN0IGRvbWFpbiAqZCwgZ2ZuX3Qg Z2ZuLCB1aW50MzJfdCBuciwKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCi0gICAgcmMgPSBh cHBseV9wMm1fY2hhbmdlcyhkLCBNRU1BQ0NFU1MsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICBwZm5fdG9fcGFkZHIoZ2ZuX3goZ2ZuKSArIHN0YXJ0KSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgIHBmbl90b19wYWRkcihnZm5feChnZm4pICsgbnIpLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgMCwgTUFUVFJfTUVNLCBtYXNrLCAwLCBhKTsKKyAgICByYyA9IGFwcGx5X3AybV9j aGFuZ2VzKGQsIE1FTUFDQ0VTUywgZ2ZuX2FkZChnZm4sIHN0YXJ0KSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgIChuciAtIHN0YXJ0KSwgSU5WQUxJRF9NRk4sCisgICAgICAgICAgICAgICAg ICAgICAgICAgICBNQVRUUl9NRU0sIG1hc2ssIDAsIGEpOwogICAgIGlmICggcmMgPCAwICkKICAg ICAgICAgcmV0dXJuIHJjOwogICAgIGVsc2UgaWYgKCByYyA+IDAgKQotLSAKMS45LjEKCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFp bGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHA6Ly9saXN0cy54ZW4ub3JnL3hl bi1kZXZlbAo=