From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 09/14] x86/p2m: Switch the two_gfns infrastructure to using gfn_t Date: Wed, 21 Nov 2018 13:21:17 +0000 Message-ID: <1542806482-24030-10-git-send-email-andrew.cooper3@citrix.com> References: <1542806482-24030-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1542806482-24030-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Xen-devel Cc: George Dunlap , Andrew Cooper , Tamas K Lengyel , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org QWRkaXRpb25hbGx5LCBkcm9wIHN1cnJvdW5kaW5nIHRyYWlsaW5nIHdoaXRlc3BhY2UuCgpTaWdu ZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0K Q0M6IEphbiBCZXVsaWNoIDxKQmV1bGljaEBzdXNlLmNvbT4KQ0M6IFdlaSBMaXUgPHdlaS5saXUy QGNpdHJpeC5jb20+CkNDOiBHZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGV1LmNpdHJpeC5j b20+CkNDOiBUYW1hcyBLIExlbmd5ZWwgPHRhbWFzQHRrbGVuZ3llbC5jb20+Ci0tLQogeGVuL2Fy Y2gveDg2L21tL21lbV9zaGFyaW5nLmMgfCAgOCArKysrLS0tLQogeGVuL2luY2x1ZGUvYXNtLXg4 Ni9wMm0uaCAgICAgfCAyMSArKysrKysrKysrLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwg MTQgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gv eDg2L21tL21lbV9zaGFyaW5nLmMgYi94ZW4vYXJjaC94ODYvbW0vbWVtX3NoYXJpbmcuYwppbmRl eCA3N2YwZDNmLi41NzNkMzU0IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vbWVtX3NoYXJp bmcuYworKysgYi94ZW4vYXJjaC94ODYvbW0vbWVtX3NoYXJpbmcuYwpAQCAtOTAxLDggKzkwMSw4 IEBAIHN0YXRpYyBpbnQgc2hhcmVfcGFnZXMoc3RydWN0IGRvbWFpbiAqc2QsIGdmbl90IHNnZm4s IHNocl9oYW5kbGVfdCBzaCwKICAgICBzdHJ1Y3QgdHdvX2dmbnMgdGc7CiAgICAgc3RydWN0IHJt YXBfaXRlcmF0b3Igcmk7CiAKLSAgICBnZXRfdHdvX2dmbnMoc2QsIGdmbl94KHNnZm4pLCAmc21m bl90eXBlLCBOVUxMLCAmc21mbiwKLSAgICAgICAgICAgICAgICAgY2QsIGdmbl94KGNnZm4pLCAm Y21mbl90eXBlLCBOVUxMLCAmY21mbiwKKyAgICBnZXRfdHdvX2dmbnMoc2QsIHNnZm4sICZzbWZu X3R5cGUsIE5VTEwsICZzbWZuLAorICAgICAgICAgICAgICAgICBjZCwgY2dmbiwgJmNtZm5fdHlw ZSwgTlVMTCwgJmNtZm4sCiAgICAgICAgICAgICAgICAgIDAsICZ0Zyk7CiAKICAgICAvKiBUaGlz IHRyaWNreSBidXNpbmVzcyBpcyB0byBhdm9pZCB0d28gY2FsbGVycyBkZWFkbG9ja2luZyBpZiAK QEAgLTEwMjcsOCArMTAyNyw4IEBAIGludCBtZW1fc2hhcmluZ19hZGRfdG9fcGh5c21hcChzdHJ1 Y3QgZG9tYWluICpzZCwgdW5zaWduZWQgbG9uZyBzZ2ZuLCBzaHJfaGFuZGxlCiAgICAgcDJtX2Fj Y2Vzc190IGE7CiAgICAgc3RydWN0IHR3b19nZm5zIHRnOwogCi0gICAgZ2V0X3R3b19nZm5zKHNk LCBzZ2ZuLCAmc21mbl90eXBlLCBOVUxMLCAmc21mbiwKLSAgICAgICAgICAgICAgICAgY2QsIGNn Zm4sICZjbWZuX3R5cGUsICZhLCAmY21mbiwKKyAgICBnZXRfdHdvX2dmbnMoc2QsIF9nZm4oc2dm biksICZzbWZuX3R5cGUsIE5VTEwsICZzbWZuLAorICAgICAgICAgICAgICAgICBjZCwgX2dmbihj Z2ZuKSwgJmNtZm5fdHlwZSwgJmEsICZjbWZuLAogICAgICAgICAgICAgICAgICAwLCAmdGcpOwog CiAgICAgLyogR2V0IHRoZSBzb3VyY2Ugc2hhcmVkIHBhZ2UsIGNoZWNrIGFuZCBsb2NrICovCmRp ZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oIGIveGVuL2luY2x1ZGUvYXNtLXg4 Ni9wMm0uaAppbmRleCA3NGQwY2Y2Li44YmQ2ZjY0IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9h c20teDg2L3AybS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKQEAgLTUyOSwxNyAr NTI5LDE1IEBAIHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgbG9uZyBtZm5fdG9fZ2ZuKHN0cnVjdCBk b21haW4gKmQsIG1mbl90IG1mbikKIAogLyogRGVhZGxvY2stYXZvaWRhbmNlIHNjaGVtZSB3aGVu IGNhbGxpbmcgZ2V0X2dmbiBvbiBkaWZmZXJlbnQgZ2ZuJ3MgKi8KIHN0cnVjdCB0d29fZ2ZucyB7 Ci0gICAgc3RydWN0IGRvbWFpbiAgKmZpcnN0X2RvbWFpbjsKLSAgICB1bnNpZ25lZCBsb25nICAg Zmlyc3RfZ2ZuOwotICAgIHN0cnVjdCBkb21haW4gICpzZWNvbmRfZG9tYWluOwotICAgIHVuc2ln bmVkIGxvbmcgICBzZWNvbmRfZ2ZuOworICAgIHN0cnVjdCBkb21haW4gKmZpcnN0X2RvbWFpbiwg KnNlY29uZF9kb21haW47CisgICAgZ2ZuX3QgICAgICAgICAgZmlyc3RfZ2ZuLCAgICAgc2Vjb25k X2dmbjsKIH07CiAKIC8qIFJldHVybnMgbWZuLCB0eXBlIGFuZCBhY2Nlc3MgZm9yIHBvdGVudGlh bCBjYWxsZXIgY29uc3VtcHRpb24sIGJ1dCBhbnkKICAqIG9mIHRob3NlIGNhbiBiZSBOVUxMICov Ci1zdGF0aWMgaW5saW5lIHZvaWQgZ2V0X3R3b19nZm5zKHN0cnVjdCBkb21haW4gKnJkLCB1bnNp Z25lZCBsb25nIHJnZm4sCitzdGF0aWMgaW5saW5lIHZvaWQgZ2V0X3R3b19nZm5zKHN0cnVjdCBk b21haW4gKnJkLCBnZm5fdCByZ2ZuLAogICAgICAgICBwMm1fdHlwZV90ICpydCwgcDJtX2FjY2Vz c190ICpyYSwgbWZuX3QgKnJtZm4sIHN0cnVjdCBkb21haW4gKmxkLAotICAgICAgICB1bnNpZ25l ZCBsb25nIGxnZm4sIHAybV90eXBlX3QgKmx0LCBwMm1fYWNjZXNzX3QgKmxhLCBtZm5fdCAqbG1m biwKKyAgICAgICAgZ2ZuX3QgbGdmbiwgcDJtX3R5cGVfdCAqbHQsIHAybV9hY2Nlc3NfdCAqbGEs IG1mbl90ICpsbWZuLAogICAgICAgICBwMm1fcXVlcnlfdCBxLCBzdHJ1Y3QgdHdvX2dmbnMgKnJ2 YWwpCiB7CiAgICAgbWZuX3QgICAgICAgICAgICpmaXJzdF9tZm4sICpzZWNvbmRfbWZuLCBzY3Jh dGNoX21mbjsKQEAgLTU1Nyw3ICs1NTUsOCBAQCBkbyB7ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICBkZXN0ICMjIF90ICAgPSAoc291cmNl ICMjIHQpICAgPzogJnNjcmF0Y2hfdDsgICAgICAgXAogfSB3aGlsZSAoMCkKIAotICAgIGlmICgg KHJkLT5kb21haW5faWQgPD0gbGQtPmRvbWFpbl9pZCkgfHwgKChyZCA9PSBsZCkgJiYgKHJnZm4g PD0gbGdmbikpICkKKyAgICBpZiAoIChyZC0+ZG9tYWluX2lkIDw9IGxkLT5kb21haW5faWQpIHx8 CisgICAgICAgICAoKHJkID09IGxkKSAmJiAoZ2ZuX3gocmdmbikgPD0gZ2ZuX3gobGdmbikpKSAp CiAgICAgewogICAgICAgICBhc3NpZ25fcG9pbnRlcnMoZmlyc3QsIHIpOwogICAgICAgICBhc3Np Z25fcG9pbnRlcnMoc2Vjb25kLCBsKTsKQEAgLTU3MCw5ICs1NjksOSBAQCBkbyB7ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKIAogICAgIC8qIE5v dyBkbyB0aGUgZ2V0cyAqLwogICAgICpmaXJzdF9tZm4gID0gZ2V0X2dmbl90eXBlX2FjY2Vzcyhw Mm1fZ2V0X2hvc3RwMm0ocnZhbC0+Zmlyc3RfZG9tYWluKSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgcnZhbC0+Zmlyc3RfZ2ZuLCBmaXJzdF90LCBmaXJzdF9hLCBxLCBO VUxMKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2ZuX3gocnZhbC0+ Zmlyc3RfZ2ZuKSwgZmlyc3RfdCwgZmlyc3RfYSwgcSwgTlVMTCk7CiAgICAgKnNlY29uZF9tZm4g PSBnZXRfZ2ZuX3R5cGVfYWNjZXNzKHAybV9nZXRfaG9zdHAybShydmFsLT5zZWNvbmRfZG9tYWlu KSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcnZhbC0+c2Vjb25kX2dm biwgc2Vjb25kX3QsIHNlY29uZF9hLCBxLCBOVUxMKTsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZ2ZuX3gocnZhbC0+c2Vjb25kX2dmbiksIHNlY29uZF90LCBzZWNvbmRf YSwgcSwgTlVMTCk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZCBwdXRfdHdvX2dmbnMoc3RydWN0 IHR3b19nZm5zICphcmcpCkBAIC01ODAsOCArNTc5LDggQEAgc3RhdGljIGlubGluZSB2b2lkIHB1 dF90d29fZ2ZucyhzdHJ1Y3QgdHdvX2dmbnMgKmFyZykKICAgICBpZiAoICFhcmcgKQogICAgICAg ICByZXR1cm47CiAKLSAgICBwdXRfZ2ZuKGFyZy0+c2Vjb25kX2RvbWFpbiwgYXJnLT5zZWNvbmRf Z2ZuKTsKLSAgICBwdXRfZ2ZuKGFyZy0+Zmlyc3RfZG9tYWluLCBhcmctPmZpcnN0X2dmbik7Cisg ICAgcHV0X2dmbihhcmctPnNlY29uZF9kb21haW4sIGdmbl94KGFyZy0+c2Vjb25kX2dmbikpOwor ICAgIHB1dF9nZm4oYXJnLT5maXJzdF9kb21haW4sICBnZm5feChhcmctPmZpcnN0X2dmbikpOwog fQogCiAvKiBJbml0IHRoZSBkYXRhc3RydWN0dXJlcyBmb3IgbGF0ZXIgdXNlIGJ5IHRoZSBwMm0g Y29kZSAqLwotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9q ZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVu LWRldmVs