From mboxrd@z Thu Jan 1 00:00:00 1970 From: Razvan Cojocaru Subject: [PATCH V11 2/5] x86/p2m: refactor p2m_reset_altp2m() Date: Wed, 5 Dec 2018 11:18:05 +0200 Message-ID: <1544001488-23763-3-git-send-email-rcojocaru@bitdefender.com> References: <1544001488-23763-1-git-send-email-rcojocaru@bitdefender.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gUTJv-0000pc-Ae for xen-devel@lists.xenproject.org; Wed, 05 Dec 2018 09:18:15 +0000 In-Reply-To: <1544001488-23763-1-git-send-email-rcojocaru@bitdefender.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Wei Liu , Razvan Cojocaru , George Dunlap , Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org UmVmYWN0b3IgcDJtX3Jlc2V0X2FsdHAybSgpIHNvIHRoYXQgaXQgY2FuIGJlIHVzZWQgdG8gcmVt b3ZlCnJlZHVuZGFudCBjb2RlcGF0aHMsIGZpeGluZyB0aGUgbG9ja2luZyB3aGlsZSB3ZSdyZSBh dCBpdC4KClRoZSBwcmV2aW91cyBjb2RlIG5vdyByZXBsYWNlZCBieSBwMm1fcmVzZXRfYWx0cDJt KGQsIGksCkFMVFAyTV9ERUFDVElWQVRFKSBjYWxscyBkaWQgbm90IHNldCBwMm0tPm1pbl9yZW1h cHBlZF9nZm4KYW5kIHAybS0+bWF4X3JlbWFwcGVkX2dmbiBiZWNhdXNlIGluIHRob3NlIGNhc2Vz IHRoZSBhbHRwMm0KaWR4IHdhcyBkaXNhYmxlZDsgc28gYmVmb3JlIGdldHRpbmcgdXNlZCBhZ2Fp biwKcDJtX2luaXRfYWx0cDJtX2VwdCgpIHdvdWxkIGdldCBjYWxsZWQsIHdoaWNoIHJlc2V0cyB0 aGVtLgpBbHdheXMgc2V0dGluZyB0aGVtIGluIHAybV9yZXNldF9hbHRwMm0oKSwgd2hpbGUgcmVk dW5kYW50LAppcyBwcmVmZXJhYmxlIHRvIGFuIGV4dHJhIGNvbmRpdGlvbmFsLgoKU2lnbmVkLW9m Zi1ieTogUmF6dmFuIENvam9jYXJ1IDxyY29qb2NhcnVAYml0ZGVmZW5kZXIuY29tPgpUZXN0ZWQt Ynk6IFRhbWFzIEsgTGVuZ3llbCA8dGFtYXNAdGtsZW5neWVsLmNvbT4KCi0tLQpDQzogR2Vvcmdl IER1bmxhcCA8Z2VvcmdlLmR1bmxhcEBldS5jaXRyaXguY29tPgpDQzogSmFuIEJldWxpY2ggPGpi ZXVsaWNoQHN1c2UuY29tPgpDQzogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4 LmNvbT4KQ0M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CkNDOiAiUm9nZXIgUGF1IE1v bm7DqSIgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgoKLS0tCkNoYW5nZXMgc2luY2UgVjEwOgogLSBB ZGRlZCBUYW1hcycgVGVzdGVkLWJ5LgotLS0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0uYyB8IDU3ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3hlbi9hcmNoL3g4Ni9tbS9wMm0uYyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0uYwppbmRleCA5NmE2 ZDNlLi43YzZhYWU3IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vcDJtLmMKKysrIGIveGVu L2FyY2gveDg2L21tL3AybS5jCkBAIC0yMjQ3LDYgKzIyNDcsMzYgQEAgYm9vbF90IHAybV9hbHRw Mm1fbGF6eV9jb3B5KHN0cnVjdCB2Y3B1ICp2LCBwYWRkcl90IGdwYSwKICAgICByZXR1cm4gMTsK IH0KIAorZW51bSBhbHRwMm1fcmVzZXRfdHlwZSB7CisgICAgQUxUUDJNX1JFU0VULAorICAgIEFM VFAyTV9ERUFDVElWQVRFCit9OworCitzdGF0aWMgdm9pZCBwMm1fcmVzZXRfYWx0cDJtKHN0cnVj dCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBpZHgsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGVudW0gYWx0cDJtX3Jlc2V0X3R5cGUgcmVzZXRfdHlwZSkKK3sKKyAgICBzdHJ1Y3QgcDJt X2RvbWFpbiAqcDJtOworCisgICAgQVNTRVJUKGlkeCA8IE1BWF9BTFRQMk0pOworICAgIHAybSA9 IGQtPmFyY2guYWx0cDJtX3AybVtpZHhdOworCisgICAgcDJtX2xvY2socDJtKTsKKworICAgIHAy bV9mbHVzaF90YWJsZV9sb2NrZWQocDJtKTsKKworICAgIGlmICggcmVzZXRfdHlwZSA9PSBBTFRQ Mk1fREVBQ1RJVkFURSApCisgICAgICAgIHAybV9mcmVlX2xvZ2RpcnR5KHAybSk7CisKKyAgICAv KiBVbmluaXQgYW5kIHJlaW5pdCBlcHQgdG8gZm9yY2UgVExCIHNob290ZG93biAqLworICAgIGVw dF9wMm1fdW5pbml0KHAybSk7CisgICAgZXB0X3AybV9pbml0KHAybSk7CisKKyAgICBwMm0tPm1p bl9yZW1hcHBlZF9nZm4gPSBnZm5feChJTlZBTElEX0dGTik7CisgICAgcDJtLT5tYXhfcmVtYXBw ZWRfZ2ZuID0gMDsKKworICAgIHAybV91bmxvY2socDJtKTsKK30KKwogdm9pZCBwMm1fZmx1c2hf YWx0cDJtKHN0cnVjdCBkb21haW4gKmQpCiB7CiAgICAgdW5zaWduZWQgaW50IGk7CkBAIC0yMjU1 LDEwICsyMjg1LDcgQEAgdm9pZCBwMm1fZmx1c2hfYWx0cDJtKHN0cnVjdCBkb21haW4gKmQpCiAK ICAgICBmb3IgKCBpID0gMDsgaSA8IE1BWF9BTFRQMk07IGkrKyApCiAgICAgewotICAgICAgICBw Mm1fZmx1c2hfdGFibGUoZC0+YXJjaC5hbHRwMm1fcDJtW2ldKTsKLSAgICAgICAgLyogVW5pbml0 IGFuZCByZWluaXQgZXB0IHRvIGZvcmNlIFRMQiBzaG9vdGRvd24gKi8KLSAgICAgICAgZXB0X3Ay bV91bmluaXQoZC0+YXJjaC5hbHRwMm1fcDJtW2ldKTsKLSAgICAgICAgZXB0X3AybV9pbml0KGQt PmFyY2guYWx0cDJtX3AybVtpXSk7CisgICAgICAgIHAybV9yZXNldF9hbHRwMm0oZCwgaSwgQUxU UDJNX0RFQUNUSVZBVEUpOwogICAgICAgICBkLT5hcmNoLmFsdHAybV9lcHRwW2ldID0gbWZuX3go SU5WQUxJRF9NRk4pOwogICAgIH0KIApAQCAtMjM1NywxMCArMjM4NCw3IEBAIGludCBwMm1fZGVz dHJveV9hbHRwMm1fYnlfaWQoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IGlkeCkKIAog ICAgICAgICBpZiAoICFfYXRvbWljX3JlYWQocDJtLT5hY3RpdmVfdmNwdXMpICkKICAgICAgICAg ewotICAgICAgICAgICAgcDJtX2ZsdXNoX3RhYmxlKGQtPmFyY2guYWx0cDJtX3AybVtpZHhdKTsK LSAgICAgICAgICAgIC8qIFVuaW5pdCBhbmQgcmVpbml0IGVwdCB0byBmb3JjZSBUTEIgc2hvb3Rk b3duICovCi0gICAgICAgICAgICBlcHRfcDJtX3VuaW5pdChkLT5hcmNoLmFsdHAybV9wMm1baWR4 XSk7Ci0gICAgICAgICAgICBlcHRfcDJtX2luaXQoZC0+YXJjaC5hbHRwMm1fcDJtW2lkeF0pOwor ICAgICAgICAgICAgcDJtX3Jlc2V0X2FsdHAybShkLCBpZHgsIEFMVFAyTV9ERUFDVElWQVRFKTsK ICAgICAgICAgICAgIGQtPmFyY2guYWx0cDJtX2VwdHBbaWR4XSA9IG1mbl94KElOVkFMSURfTUZO KTsKICAgICAgICAgICAgIHJjID0gMDsKICAgICAgICAgfQpAQCAtMjQ4NSwxNiArMjUwOSw2IEBA IGludCBwMm1fY2hhbmdlX2FsdHAybV9nZm4oc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50 IGlkeCwKICAgICByZXR1cm4gcmM7CiB9CiAKLXN0YXRpYyB2b2lkIHAybV9yZXNldF9hbHRwMm0o c3RydWN0IHAybV9kb21haW4gKnAybSkKLXsKLSAgICBwMm1fZmx1c2hfdGFibGUocDJtKTsKLSAg ICAvKiBVbmluaXQgYW5kIHJlaW5pdCBlcHQgdG8gZm9yY2UgVExCIHNob290ZG93biAqLwotICAg IGVwdF9wMm1fdW5pbml0KHAybSk7Ci0gICAgZXB0X3AybV9pbml0KHAybSk7Ci0gICAgcDJtLT5t aW5fcmVtYXBwZWRfZ2ZuID0gZ2ZuX3goSU5WQUxJRF9HRk4pOwotICAgIHAybS0+bWF4X3JlbWFw cGVkX2dmbiA9IDA7Ci19Ci0KIGludCBwMm1fYWx0cDJtX3Byb3BhZ2F0ZV9jaGFuZ2Uoc3RydWN0 IGRvbWFpbiAqZCwgZ2ZuX3QgZ2ZuLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBt Zm5fdCBtZm4sIHVuc2lnbmVkIGludCBwYWdlX29yZGVyLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBwMm1fdHlwZV90IHAybXQsIHAybV9hY2Nlc3NfdCBwMm1hKQpAQCAtMjUyOCw3 ICsyNTQyLDcgQEAgaW50IHAybV9hbHRwMm1fcHJvcGFnYXRlX2NoYW5nZShzdHJ1Y3QgZG9tYWlu ICpkLCBnZm5fdCBnZm4sCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICggIXJlc2V0X2NvdW50 KysgKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHAybV9yZXNldF9hbHRwMm0ocDJt KTsKKyAgICAgICAgICAgICAgICBwMm1fcmVzZXRfYWx0cDJtKGQsIGksIEFMVFAyTV9SRVNFVCk7 CiAgICAgICAgICAgICAgICAgbGFzdF9yZXNldF9pZHggPSBpOwogICAgICAgICAgICAgfQogICAg ICAgICAgICAgZWxzZQpAQCAtMjU0MiwxMCArMjU1Niw3IEBAIGludCBwMm1fYWx0cDJtX3Byb3Bh Z2F0ZV9jaGFuZ2Uoc3RydWN0IGRvbWFpbiAqZCwgZ2ZuX3QgZ2ZuLAogICAgICAgICAgICAgICAg ICAgICAgICAgIGQtPmFyY2guYWx0cDJtX2VwdHBbaV0gPT0gbWZuX3goSU5WQUxJRF9NRk4pICkK ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgICAgICAgICAgICAg IHAybSA9IGQtPmFyY2guYWx0cDJtX3AybVtpXTsKLSAgICAgICAgICAgICAgICAgICAgcDJtX2xv Y2socDJtKTsKLSAgICAgICAgICAgICAgICAgICAgcDJtX3Jlc2V0X2FsdHAybShwMm0pOwotICAg ICAgICAgICAgICAgICAgICBwMm1fdW5sb2NrKHAybSk7CisgICAgICAgICAgICAgICAgICAgIHAy bV9yZXNldF9hbHRwMm0oZCwgaSwgQUxUUDJNX1JFU0VUKTsKICAgICAgICAgICAgICAgICB9CiAK ICAgICAgICAgICAgICAgICByZXQgPSAwOwotLSAKMi43LjQKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21h aWxtYW4vbGlzdGluZm8veGVuLWRldmVs