From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jan Beulich" Subject: [PATCH v3 3/3] x86/p2m-pt: pass level instead of page type to p2m_next_level() Date: Fri, 11 Aug 2017 07:21:21 -0600 Message-ID: <598DCB71020000780016EE13@prv-mh.provo.novell.com> References: <598DC9B2020000780016EDF1@prv-mh.provo.novell.com> <598DC9B2020000780016EDF1@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dg9sU-0000y0-Pa for xen-devel@lists.xenproject.org; Fri, 11 Aug 2017 13:21:26 +0000 In-Reply-To: <598DC9B2020000780016EDF1@prv-mh.provo.novell.com> Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel Cc: George Dunlap , Andrew Cooper List-Id: xen-devel@lists.xenproject.org VGhpcyBpbiB0dXJuIGNhbGxzIGZvciBwMm1fYWxsb2NfcHRwKCkgYWxzbyBiZWluZyBwYXNzZWQg dGhlIG51bWVyaWMKbGV2ZWwuCgpTaWduZWQtb2ZmLWJ5OiBKYW4gQmV1bGljaCA8amJldWxpY2hA c3VzZS5jb20+ClJldmlld2VkLWJ5OiBHZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGNpdHJp eC5jb20+Ci0tLQp2MjogTmV3LgotLS0KUXVlc3Rpb24gaXMgd2hldGhlciBwYXNzaW5nIHRoZSBs ZXZlbCB0byBwMm1fYWxsb2NfcHRwKCkgaXMgcmVhbGx5IGFsbAp0aGF0IHVzZWZ1bDogcDJtLWVw dC5jJ3MgcGFzc2VzIHplcm8gb25seSBhbnl3YXksIGFuZCBwMm0uYydzIHVuaWZvcm0KcGFzc2lu ZyBvZiA0IGRvZXNuJ3QgbmVjZXNzYXJpbHkgbWF0Y2ggcmVhbGl0eSBhZmFpY3QuCgotLS0gYS94 ZW4vYXJjaC94ODYvbW0vcDJtLmMKKysrIGIveGVuL2FyY2gveDg2L21tL3AybS5jCkBAIC01Njks NyArNTY5LDcgQEAgaW50IHAybV9zZXRfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybQogICAg IHJldHVybiByYzsKIH0KIAotbWZuX3QgcDJtX2FsbG9jX3B0cChzdHJ1Y3QgcDJtX2RvbWFpbiAq cDJtLCB1bnNpZ25lZCBsb25nIHR5cGUpCittZm5fdCBwMm1fYWxsb2NfcHRwKHN0cnVjdCBwMm1f ZG9tYWluICpwMm0sIHVuc2lnbmVkIGludCBsZXZlbCkKIHsKICAgICBzdHJ1Y3QgcGFnZV9pbmZv ICpwZzsKIApAQCAtNTgxLDcgKzU4MSwxMCBAQCBtZm5fdCBwMm1fYWxsb2NfcHRwKHN0cnVjdCBw Mm1fZG9tYWluICpwCiAgICAgICAgIHJldHVybiBJTlZBTElEX01GTjsKIAogICAgIHBhZ2VfbGlz dF9hZGRfdGFpbChwZywgJnAybS0+cGFnZXMpOwotICAgIHBnLT51LmludXNlLnR5cGVfaW5mbyA9 IHR5cGUgfCAxIHwgUEdUX3ZhbGlkYXRlZDsKKyAgICBCVUlMRF9CVUdfT04oUEdUX2wxX3BhZ2Vf dGFibGUgKiAyICE9IFBHVF9sMl9wYWdlX3RhYmxlKTsKKyAgICBCVUlMRF9CVUdfT04oUEdUX2wx X3BhZ2VfdGFibGUgKiAzICE9IFBHVF9sM19wYWdlX3RhYmxlKTsKKyAgICBCVUlMRF9CVUdfT04o UEdUX2wxX3BhZ2VfdGFibGUgKiA0ICE9IFBHVF9sNF9wYWdlX3RhYmxlKTsKKyAgICBwZy0+dS5p bnVzZS50eXBlX2luZm8gPSAoUEdUX2wxX3BhZ2VfdGFibGUgKiBsZXZlbCkgfCAxIHwgUEdUX3Zh bGlkYXRlZDsKIAogICAgIHJldHVybiBwYWdlX3RvX21mbihwZyk7CiB9CkBAIC02MzIsNyArNjM1 LDcgQEAgaW50IHAybV9hbGxvY190YWJsZShzdHJ1Y3QgcDJtX2RvbWFpbiAqcAogCiAgICAgUDJN X1BSSU5USygiYWxsb2NhdGluZyBwMm0gdGFibGVcbiIpOwogCi0gICAgdG9wX21mbiA9IHAybV9h bGxvY19wdHAocDJtLCBQR1RfbDRfcGFnZV90YWJsZSk7CisgICAgdG9wX21mbiA9IHAybV9hbGxv Y19wdHAocDJtLCA0KTsKICAgICBpZiAoIG1mbl9lcSh0b3BfbWZuLCBJTlZBTElEX01GTikgKQog ICAgIHsKICAgICAgICAgcDJtX3VubG9jayhwMm0pOwotLS0gYS94ZW4vYXJjaC94ODYvbW0vcDJt LXB0LmMKKysrIGIveGVuL2FyY2gveDg2L21tL3AybS1wdC5jCkBAIC03MSwxMiArNzEsNiBAQAog I2RlZmluZSBuZWVkc19yZWNhbGMobGV2ZWwsIGVudCkgX25lZWRzX3JlY2FsYyhsZXZlbCMjZV9n ZXRfZmxhZ3MoZW50KSkKICNkZWZpbmUgdmFsaWRfcmVjYWxjKGxldmVsLCBlbnQpICghKGxldmVs IyNlX2dldF9mbGFncyhlbnQpICYgX1BBR0VfQUNDRVNTRUQpKQogCi1zdGF0aWMgY29uc3QgdW5z aWduZWQgbG9uZyBwZ3RbXSA9IHsKLSAgICBQR1RfbDFfcGFnZV90YWJsZSwKLSAgICBQR1RfbDJf cGFnZV90YWJsZSwKLSAgICBQR1RfbDNfcGFnZV90YWJsZQotfTsKLQogc3RhdGljIHVuc2lnbmVk IGxvbmcgcDJtX3R5cGVfdG9fZmxhZ3MoY29uc3Qgc3RydWN0IHAybV9kb21haW4gKnAybSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAybV90eXBlX3QgdCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1mbl90IG1mbiwKQEAgLTE4OSw3ICsx ODMsNyBAQCBzdGF0aWMgdm9pZCBwMm1fYWRkX2lvbW11X2ZsYWdzKGwxX3BnZW50CiBzdGF0aWMg aW50CiBwMm1fbmV4dF9sZXZlbChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB2b2lkICoqdGFibGUs CiAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nICpnZm5fcmVtYWluZGVyLCB1bnNpZ25lZCBs b25nIGdmbiwgdTMyIHNoaWZ0LAotICAgICAgICAgICAgICAgdTMyIG1heCwgdW5zaWduZWQgbG9u ZyB0eXBlLCBib29sX3QgdW5tYXApCisgICAgICAgICAgICAgICB1MzIgbWF4LCB1bnNpZ25lZCBp bnQgbGV2ZWwsIGJvb2xfdCB1bm1hcCkKIHsKICAgICBsMV9wZ2VudHJ5X3QgKnAybV9lbnRyeSwg bmV3X2VudHJ5OwogICAgIHZvaWQgKm5leHQ7CkBAIC0yMDQsMzAgKzE5OCwxNSBAQCBwMm1fbmV4 dF9sZXZlbChzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB2CiAgICAgLyogUG9EL3BhZ2luZzogTm90 IHByZXNlbnQgZG9lc24ndCBpbXBseSBlbXB0eS4gKi8KICAgICBpZiAoICFmbGFncyApCiAgICAg ewotICAgICAgICBtZm5fdCBtZm4gPSBwMm1fYWxsb2NfcHRwKHAybSwgdHlwZSk7CisgICAgICAg IG1mbl90IG1mbiA9IHAybV9hbGxvY19wdHAocDJtLCBsZXZlbCk7CiAKICAgICAgICAgaWYgKCBt Zm5fZXEobWZuLCBJTlZBTElEX01GTikgKQogICAgICAgICAgICAgcmV0dXJuIC1FTk9NRU07CiAK ICAgICAgICAgbmV3X2VudHJ5ID0gbDFlX2Zyb21fcGZuKG1mbl94KG1mbiksIFAyTV9CQVNFX0ZM QUdTIHwgX1BBR0VfUlcpOwogCi0gICAgICAgIHN3aXRjaCAoIHR5cGUgKSB7Ci0gICAgICAgIGNh c2UgUEdUX2wzX3BhZ2VfdGFibGU6Ci0gICAgICAgICAgICBwMm1fYWRkX2lvbW11X2ZsYWdzKCZu ZXdfZW50cnksIDMsIElPTU1VRl9yZWFkYWJsZXxJT01NVUZfd3JpdGFibGUpOwotICAgICAgICAg ICAgcDJtLT53cml0ZV9wMm1fZW50cnkocDJtLCBnZm4sIHAybV9lbnRyeSwgbmV3X2VudHJ5LCA0 KTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFBHVF9sMl9wYWdlX3RhYmxlOgot ICAgICAgICAgICAgcDJtX2FkZF9pb21tdV9mbGFncygmbmV3X2VudHJ5LCAyLCBJT01NVUZfcmVh ZGFibGV8SU9NTVVGX3dyaXRhYmxlKTsKLSAgICAgICAgICAgIHAybS0+d3JpdGVfcDJtX2VudHJ5 KHAybSwgZ2ZuLCBwMm1fZW50cnksIG5ld19lbnRyeSwgMyk7Ci0gICAgICAgICAgICBicmVhazsK LSAgICAgICAgY2FzZSBQR1RfbDFfcGFnZV90YWJsZToKLSAgICAgICAgICAgIHAybV9hZGRfaW9t bXVfZmxhZ3MoJm5ld19lbnRyeSwgMSwgSU9NTVVGX3JlYWRhYmxlfElPTU1VRl93cml0YWJsZSk7 Ci0gICAgICAgICAgICBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJtX2VudHJ5LCBu ZXdfZW50cnksIDIpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAg ICAgICAgICBCVUcoKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9CisgICAgICAgIHAy bV9hZGRfaW9tbXVfZmxhZ3MoJm5ld19lbnRyeSwgbGV2ZWwsIElPTU1VRl9yZWFkYWJsZXxJT01N VUZfd3JpdGFibGUpOworICAgICAgICBwMm0tPndyaXRlX3AybV9lbnRyeShwMm0sIGdmbiwgcDJt X2VudHJ5LCBuZXdfZW50cnksIGxldmVsICsgMSk7CiAgICAgfQogICAgIGVsc2UgaWYgKCBmbGFn cyAmIF9QQUdFX1BTRSApCiAgICAgewpAQCAtMjM1LDE1ICsyMTQsMTQgQEAgcDJtX25leHRfbGV2 ZWwoc3RydWN0IHAybV9kb21haW4gKnAybSwgdgogICAgICAgICB1bnNpZ25lZCBsb25nIHBmbiA9 IGwxZV9nZXRfcGZuKCpwMm1fZW50cnkpOwogICAgICAgICBtZm5fdCBtZm47CiAgICAgICAgIGwx X3BnZW50cnlfdCAqbDFfZW50cnk7Ci0gICAgICAgIHVuc2lnbmVkIGludCBpLCBsZXZlbDsKKyAg ICAgICAgdW5zaWduZWQgaW50IGk7CiAKLSAgICAgICAgc3dpdGNoICggdHlwZSApCisgICAgICAg IHN3aXRjaCAoIGxldmVsICkKICAgICAgICAgewotICAgICAgICBjYXNlIFBHVF9sMl9wYWdlX3Rh YmxlOgotICAgICAgICAgICAgbGV2ZWwgPSAyOworICAgICAgICBjYXNlIDI6CiAgICAgICAgICAg ICBicmVhazsKIAotICAgICAgICBjYXNlIFBHVF9sMV9wYWdlX3RhYmxlOgorICAgICAgICBjYXNl IDE6CiAgICAgICAgICAgICAvKgogICAgICAgICAgICAgICogTmV3IHNwbGludGVyZWQgbWFwcGlu Z3MgaW5oZXJpdCB0aGUgZmxhZ3Mgb2YgdGhlIG9sZCBzdXBlcnBhZ2UsCiAgICAgICAgICAgICAg KiB3aXRoIGEgbGl0dGxlIHJlb3JnYW5pc2F0aW9uIGZvciB0aGUgX1BBR0VfUFNFX1BBVCBiaXQu CkBAIC0yNTIsOCArMjMwLDYgQEAgcDJtX25leHRfbGV2ZWwoc3RydWN0IHAybV9kb21haW4gKnAy bSwgdgogICAgICAgICAgICAgICAgIHBmbiAtPSAxOyAgICAgICAgICAgIC8qIENsZWFyIGl0OyBf UEFHRV9QU0UgYmVjb21lcyBfUEFHRV9QQVQgKi8KICAgICAgICAgICAgIGVsc2UKICAgICAgICAg ICAgICAgICBmbGFncyAmPSB+X1BBR0VfUFNFOyAvKiBDbGVhciBfUEFHRV9QU0UgKD09IF9QQUdF X1BBVCkgKi8KLQotICAgICAgICAgICAgbGV2ZWwgPSAxOwogICAgICAgICAgICAgYnJlYWs7CiAK ICAgICAgICAgZGVmYXVsdDoKQEAgLTI2MSw3ICsyMzcsNyBAQCBwMm1fbmV4dF9sZXZlbChzdHJ1 Y3QgcDJtX2RvbWFpbiAqcDJtLCB2CiAgICAgICAgICAgICByZXR1cm4gLUVJTlZBTDsKICAgICAg ICAgfQogCi0gICAgICAgIG1mbiA9IHAybV9hbGxvY19wdHAocDJtLCB0eXBlKTsKKyAgICAgICAg bWZuID0gcDJtX2FsbG9jX3B0cChwMm0sIGxldmVsKTsKICAgICAgICAgaWYgKCBtZm5fZXEobWZu LCBJTlZBTElEX01GTikgKQogICAgICAgICAgICAgcmV0dXJuIC1FTk9NRU07CiAKQEAgLTMzMSw3 ICszMDcsNyBAQCBzdGF0aWMgaW50IHAybV9wdF9zZXRfcmVjYWxjX3JhbmdlKHN0cnVjCiAKICAg ICAgICAgZXJyID0gcDJtX25leHRfbGV2ZWwocDJtLCAmdGFibGUsICZnZm5fcmVtYWluZGVyLCBm aXJzdF9nZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGkgKiBQQUdFVEFCTEVfT1JE RVIsIDEgPDwgUEFHRVRBQkxFX09SREVSLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBw Z3RbaSAtIDFdLCAxKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaSwgMSk7CiAgICAg ICAgIGlmICggZXJyICkKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KQEAgLTM5OSw3ICsz NzUsNyBAQCBzdGF0aWMgaW50IGRvX3JlY2FsYyhzdHJ1Y3QgcDJtX2RvbWFpbiAqCiAKICAgICAg ICAgZXJyID0gcDJtX25leHRfbGV2ZWwocDJtLCAmdGFibGUsICZnZm5fcmVtYWluZGVyLCBnZm4s CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxldmVsICogUEFHRVRBQkxFX09SREVSLCAx IDw8IFBBR0VUQUJMRV9PUkRFUiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGd0W2xl dmVsIC0gMV0sIDApOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsZXZlbCwgMCk7CiAg ICAgICAgIGlmICggZXJyICkKICAgICAgICAgICAgIGdvdG8gb3V0OwogCkBAIC01NjMsNyArNTM5 LDcgQEAgcDJtX3B0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogICAgIHRhYmxl ID0gbWFwX2RvbWFpbl9wYWdlKHBhZ2V0YWJsZV9nZXRfbWZuKHAybV9nZXRfcGFnZXRhYmxlKHAy bSkpKTsKICAgICByYyA9IHAybV9uZXh0X2xldmVsKHAybSwgJnRhYmxlLCAmZ2ZuX3JlbWFpbmRl ciwgZ2ZuLAogICAgICAgICAgICAgICAgICAgICAgICAgTDRfUEFHRVRBQkxFX1NISUZUIC0gUEFH RV9TSElGVCwKLSAgICAgICAgICAgICAgICAgICAgICAgIEw0X1BBR0VUQUJMRV9FTlRSSUVTLCBQ R1RfbDNfcGFnZV90YWJsZSwgMSk7CisgICAgICAgICAgICAgICAgICAgICAgICBMNF9QQUdFVEFC TEVfRU5UUklFUywgMywgMSk7CiAgICAgaWYgKCByYyApCiAgICAgICAgIGdvdG8gb3V0OwogCkBA IC02MTEsNyArNTg3LDcgQEAgcDJtX3B0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LAogICAgIHsKICAgICAgICAgcmMgPSBwMm1fbmV4dF9sZXZlbChwMm0sICZ0YWJsZSwgJmdmbl9y ZW1haW5kZXIsIGdmbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBMM19QQUdFVEFCTEVf U0hJRlQgLSBQQUdFX1NISUZULAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIEwzX1BBR0VU QUJMRV9FTlRSSUVTLCBQR1RfbDJfcGFnZV90YWJsZSwgMSk7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgTDNfUEFHRVRBQkxFX0VOVFJJRVMsIDIsIDEpOwogICAgICAgICBpZiAoIHJjICkK ICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KQEAgLTYyMiw3ICs1OTgsNyBAQCBwMm1fcHRf c2V0X2VudHJ5KHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAKICAgICAgICAgcmMgPSBwMm1fbmV4 dF9sZXZlbChwMm0sICZ0YWJsZSwgJmdmbl9yZW1haW5kZXIsIGdmbiwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBMMl9QQUdFVEFCTEVfU0hJRlQgLSBQQUdFX1NISUZULAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgIEwyX1BBR0VUQUJMRV9FTlRSSUVTLCBQR1RfbDFfcGFnZV90YWJs ZSwgMSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgTDJfUEFHRVRBQkxFX0VOVFJJRVMs IDEsIDEpOwogICAgICAgICBpZiAoIHJjICkKICAgICAgICAgICAgIGdvdG8gb3V0OwogCi0tLSBh L3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0u aApAQCAtNjg0LDcgKzY4NCw3IEBAIHZvaWQgcDJtX21lbV9wYWdpbmdfcmVzdW1lKHN0cnVjdCBk b21haW4KICAqIEludGVybmFsIGZ1bmN0aW9ucywgb25seSBjYWxsZWQgYnkgb3RoZXIgcDJtIGNv ZGUKICAqLwogCi1tZm5fdCBwMm1fYWxsb2NfcHRwKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVu c2lnbmVkIGxvbmcgdHlwZSk7CittZm5fdCBwMm1fYWxsb2NfcHRwKHN0cnVjdCBwMm1fZG9tYWlu ICpwMm0sIHVuc2lnbmVkIGludCBsZXZlbCk7CiB2b2lkIHAybV9mcmVlX3B0cChzdHJ1Y3QgcDJt X2RvbWFpbiAqcDJtLCBzdHJ1Y3QgcGFnZV9pbmZvICpwZyk7CiAKIC8qIERpcmVjdGx5IHNldCBh IHAybSBlbnRyeTogb25seSBmb3IgdXNlIGJ5IHAybSBjb2RlLiBEb2VzIG5vdCBuZWVkCgoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3Jn L3hlbi1kZXZlbAo=