From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v3 extra 03/11] x86/mm: move and add pv_ prefix to create_pae_xen_mappings Date: Sun, 30 Jul 2017 16:43:27 +0100 Message-ID: <20170730154335.24313-4-wei.liu2@citrix.com> References: <20170720160426.2343-1-wei.liu2@citrix.com> <20170730154335.24313-1-wei.liu2@citrix.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 1dbqNa-0006LF-7Z for xen-devel@lists.xenproject.org; Sun, 30 Jul 2017 15:43:42 +0000 In-Reply-To: <20170730154335.24313-1-wei.liu2@citrix.com> 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 , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org QW5kIGV4cG9ydCBpdCB2aWEgYSBsb2NhbCBoZWFkZXIgYmVjYXVzZSBpdCBpcyBnb2luZyB0byBi ZSB1c2VkIGJ5CnNldmVyYWwgUFYgc3BlY2lmaWMgZmlsZXMuCgpUYWtlIHRoZSBjaGFuY2UgdG8g Y2hhbmdlIGl0cyByZXR1cm4gdHlwZSB0byBib29sLgoKU2lnbmVkLW9mZi1ieTogV2VpIExpdSA8 d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvbW0uYyAgICB8IDQ2ICsrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni9w di9tbS5jIHwgNDAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogeGVu L2FyY2gveDg2L3B2L21tLmggfCAgNiArKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0 aW9ucygrKSwgNDIgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgeGVuL2FyY2gveDg2 L3B2L21tLmgKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0uYyBiL3hlbi9hcmNoL3g4Ni9t bS5jCmluZGV4IDQwZjlhZDljOTguLjBjNmE2ZGUxYTkgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4 Ni9tbS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS5jCkBAIC0xMjcsNiArMTI3LDggQEAKICNpbmNs dWRlIDxhc20vcHYvZ3JhbnRfdGFibGUuaD4KICNpbmNsdWRlIDxhc20vcHYvbW0uaD4KIAorI2lu Y2x1ZGUgInB2L21tLmgiCisKIC8qIE1hcHBpbmcgb2YgdGhlIGZpeG1hcCBzcGFjZSBuZWVkZWQg ZWFybHkuICovCiBsMV9wZ2VudHJ5X3QgX19zZWN0aW9uKCIuYnNzLnBhZ2VfYWxpZ25lZCIpIF9f YWxpZ25lZChQQUdFX1NJWkUpCiAgICAgbDFfZml4bWFwW0wxX1BBR0VUQUJMRV9FTlRSSUVTXTsK QEAgLTEyMjMsNDYgKzEyMjUsNiBAQCBzdGF0aWMgaW50IGFsbG9jX2wxX3RhYmxlKHN0cnVjdCBw YWdlX2luZm8gKnBhZ2UpCiAgICAgcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIGludCBjcmVhdGVf cGFlX3hlbl9tYXBwaW5ncyhzdHJ1Y3QgZG9tYWluICpkLCBsM19wZ2VudHJ5X3QgKnBsM2UpCi17 Ci0gICAgc3RydWN0IHBhZ2VfaW5mbyAqcGFnZTsKLSAgICBsM19wZ2VudHJ5X3QgICAgIGwzZTM7 Ci0KLSAgICBpZiAoICFpc19wdl8zMmJpdF9kb21haW4oZCkgKQotICAgICAgICByZXR1cm4gMTsK LQotICAgIHBsM2UgPSAobDNfcGdlbnRyeV90ICopKCh1bnNpZ25lZCBsb25nKXBsM2UgJiBQQUdF X01BU0spOwotCi0gICAgLyogM3JkIEwzIHNsb3QgY29udGFpbnMgTDIgd2l0aCBYZW4tcHJpdmF0 ZSBtYXBwaW5ncy4gSXQgKm11c3QqIGV4aXN0LiAqLwotICAgIGwzZTMgPSBwbDNlWzNdOwotICAg IGlmICggIShsM2VfZ2V0X2ZsYWdzKGwzZTMpICYgX1BBR0VfUFJFU0VOVCkgKQotICAgIHsKLSAg ICAgICAgZ2RwcmludGsoWEVOTE9HX1dBUk5JTkcsICJQQUUgTDMgM3JkIHNsb3QgaXMgZW1wdHlc biIpOwotICAgICAgICByZXR1cm4gMDsKLSAgICB9Ci0KLSAgICAvKgotICAgICAqIFRoZSBYZW4t cHJpdmF0ZSBtYXBwaW5ncyBpbmNsdWRlIGxpbmVhciBtYXBwaW5ncy4gVGhlIEwyIHRodXMgY2Fu bm90Ci0gICAgICogYmUgc2hhcmVkIGJ5IG11bHRpcGxlIEwzIHRhYmxlcy4gVGhlIHRlc3QgaGVy ZSBpcyBhZGVxdWF0ZSBiZWNhdXNlOgotICAgICAqICAxLiBDYW5ub3QgYXBwZWFyIGluIHNsb3Rz ICE9IDMgYmVjYXVzZSBnZXRfcGFnZV90eXBlKCkgY2hlY2tzIHRoZQotICAgICAqICAgICBQR1Rf cGFlX3hlbl9sMiBmbGFnLCB3aGljaCBpcyBhc3NlcnRlZCBpZmYgdGhlIEwyIGFwcGVhcnMgaW4g c2xvdCAzCi0gICAgICogIDIuIENhbm5vdCBhcHBlYXIgaW4gYW5vdGhlciBwYWdlIHRhYmxlJ3Mg TDM6Ci0gICAgICogICAgIGEuIGFsbG9jX2wzX3RhYmxlKCkgY2FsbHMgdGhpcyBmdW5jdGlvbiBh bmQgdGhpcyBjaGVjayB3aWxsIGZhaWwKLSAgICAgKiAgICAgYi4gbW9kX2wzX2VudHJ5KCkgZGlz YWxsb3dzIHVwZGF0ZXMgdG8gc2xvdCAzIGluIGFuIGV4aXN0aW5nIHRhYmxlCi0gICAgICovCi0g ICAgcGFnZSA9IGwzZV9nZXRfcGFnZShsM2UzKTsKLSAgICBCVUdfT04ocGFnZS0+dS5pbnVzZS50 eXBlX2luZm8gJiBQR1RfcGlubmVkKTsKLSAgICBCVUdfT04oKHBhZ2UtPnUuaW51c2UudHlwZV9p bmZvICYgUEdUX2NvdW50X21hc2spID09IDApOwotICAgIEJVR19PTighKHBhZ2UtPnUuaW51c2Uu dHlwZV9pbmZvICYgUEdUX3BhZV94ZW5fbDIpKTsKLSAgICBpZiAoIChwYWdlLT51LmludXNlLnR5 cGVfaW5mbyAmIFBHVF9jb3VudF9tYXNrKSAhPSAxICkKLSAgICB7Ci0gICAgICAgIGdkcHJpbnRr KFhFTkxPR19XQVJOSU5HLCAiUEFFIEwzIDNyZCBzbG90IGlzIHNoYXJlZFxuIik7Ci0gICAgICAg IHJldHVybiAwOwotICAgIH0KLQotICAgIHJldHVybiAxOwotfQotCiBzdGF0aWMgaW50IGFsbG9j X2wyX3RhYmxlKHN0cnVjdCBwYWdlX2luZm8gKnBhZ2UsIHVuc2lnbmVkIGxvbmcgdHlwZSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgaW50IHByZWVtcHRpYmxlKQogewpAQCAtMTM2Nyw3ICsx MzI5LDcgQEAgc3RhdGljIGludCBhbGxvY19sM190YWJsZShzdHJ1Y3QgcGFnZV9pbmZvICpwYWdl KQogICAgICAgICBhZGp1c3RfZ3Vlc3RfbDNlKHBsM2VbaV0sIGQpOwogICAgIH0KIAotICAgIGlm ICggcmMgPj0gMCAmJiAhY3JlYXRlX3BhZV94ZW5fbWFwcGluZ3MoZCwgcGwzZSkgKQorICAgIGlm ICggcmMgPj0gMCAmJiAhcHZfY3JlYXRlX3BhZV94ZW5fbWFwcGluZ3MoZCwgcGwzZSkgKQogICAg ICAgICByYyA9IC1FSU5WQUw7CiAgICAgaWYgKCByYyA8IDAgJiYgcmMgIT0gLUVSRVNUQVJUICYm IHJjICE9IC1FSU5UUiApCiAgICAgewpAQCAtMTgzOSw3ICsxODAxLDcgQEAgc3RhdGljIGludCBt b2RfbDNfZW50cnkobDNfcGdlbnRyeV90ICpwbDNlLAogICAgIH0KIAogICAgIGlmICggbGlrZWx5 KHJjID09IDApICkKLSAgICAgICAgaWYgKCAhY3JlYXRlX3BhZV94ZW5fbWFwcGluZ3MoZCwgcGwz ZSkgKQorICAgICAgICBpZiAoICFwdl9jcmVhdGVfcGFlX3hlbl9tYXBwaW5ncyhkLCBwbDNlKSAp CiAgICAgICAgICAgICBCVUcoKTsKIAogICAgIHB1dF9wYWdlX2Zyb21fbDNlKG9sM2UsIHBmbiwg MCwgMSk7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvcHYvbW0uYyBiL3hlbi9hcmNoL3g4Ni9w di9tbS5jCmluZGV4IDBmNDMwM2NlZjIuLjQ2ZTFmY2Y0ZTUgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNo L3g4Ni9wdi9tbS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9wdi9tbS5jCkBAIC0yMTEsNiArMjExLDQ2 IEBAIGJvb2wgcHZfdXBkYXRlX2ludHB0ZShpbnRwdGVfdCAqcCwgaW50cHRlX3Qgb2xkLCBpbnRw dGVfdCBuZXcsCiAgICAgcmV0dXJuIHJ2OwogfQogCitib29sIHB2X2NyZWF0ZV9wYWVfeGVuX21h cHBpbmdzKHN0cnVjdCBkb21haW4gKmQsIGwzX3BnZW50cnlfdCAqcGwzZSkKK3sKKyAgICBzdHJ1 Y3QgcGFnZV9pbmZvICpwYWdlOworICAgIGwzX3BnZW50cnlfdCAgICAgbDNlMzsKKworICAgIGlm ICggIWlzX3B2XzMyYml0X2RvbWFpbihkKSApCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAg cGwzZSA9IChsM19wZ2VudHJ5X3QgKikoKHVuc2lnbmVkIGxvbmcpcGwzZSAmIFBBR0VfTUFTSyk7 CisKKyAgICAvKiAzcmQgTDMgc2xvdCBjb250YWlucyBMMiB3aXRoIFhlbi1wcml2YXRlIG1hcHBp bmdzLiBJdCAqbXVzdCogZXhpc3QuICovCisgICAgbDNlMyA9IHBsM2VbM107CisgICAgaWYgKCAh KGwzZV9nZXRfZmxhZ3MobDNlMykgJiBfUEFHRV9QUkVTRU5UKSApCisgICAgeworICAgICAgICBn ZHByaW50ayhYRU5MT0dfV0FSTklORywgIlBBRSBMMyAzcmQgc2xvdCBpcyBlbXB0eVxuIik7Cisg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICAvKgorICAgICAqIFRoZSBYZW4tcHJp dmF0ZSBtYXBwaW5ncyBpbmNsdWRlIGxpbmVhciBtYXBwaW5ncy4gVGhlIEwyIHRodXMgY2Fubm90 CisgICAgICogYmUgc2hhcmVkIGJ5IG11bHRpcGxlIEwzIHRhYmxlcy4gVGhlIHRlc3QgaGVyZSBp cyBhZGVxdWF0ZSBiZWNhdXNlOgorICAgICAqICAxLiBDYW5ub3QgYXBwZWFyIGluIHNsb3RzICE9 IDMgYmVjYXVzZSBnZXRfcGFnZV90eXBlKCkgY2hlY2tzIHRoZQorICAgICAqICAgICBQR1RfcGFl X3hlbl9sMiBmbGFnLCB3aGljaCBpcyBhc3NlcnRlZCBpZmYgdGhlIEwyIGFwcGVhcnMgaW4gc2xv dCAzCisgICAgICogIDIuIENhbm5vdCBhcHBlYXIgaW4gYW5vdGhlciBwYWdlIHRhYmxlJ3MgTDM6 CisgICAgICogICAgIGEuIGFsbG9jX2wzX3RhYmxlKCkgY2FsbHMgdGhpcyBmdW5jdGlvbiBhbmQg dGhpcyBjaGVjayB3aWxsIGZhaWwKKyAgICAgKiAgICAgYi4gbW9kX2wzX2VudHJ5KCkgZGlzYWxs b3dzIHVwZGF0ZXMgdG8gc2xvdCAzIGluIGFuIGV4aXN0aW5nIHRhYmxlCisgICAgICovCisgICAg cGFnZSA9IGwzZV9nZXRfcGFnZShsM2UzKTsKKyAgICBCVUdfT04ocGFnZS0+dS5pbnVzZS50eXBl X2luZm8gJiBQR1RfcGlubmVkKTsKKyAgICBCVUdfT04oKHBhZ2UtPnUuaW51c2UudHlwZV9pbmZv ICYgUEdUX2NvdW50X21hc2spID09IDApOworICAgIEJVR19PTighKHBhZ2UtPnUuaW51c2UudHlw ZV9pbmZvICYgUEdUX3BhZV94ZW5fbDIpKTsKKyAgICBpZiAoIChwYWdlLT51LmludXNlLnR5cGVf aW5mbyAmIFBHVF9jb3VudF9tYXNrKSAhPSAxICkKKyAgICB7CisgICAgICAgIGdkcHJpbnRrKFhF TkxPR19XQVJOSU5HLCAiUEFFIEwzIDNyZCBzbG90IGlzIHNoYXJlZFxuIik7CisgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogLyoKICAqIExvY2Fs IHZhcmlhYmxlczoKICAqIG1vZGU6IEMKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9wdi9tbS5o IGIveGVuL2FyY2gveDg2L3B2L21tLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMC4uYmFmYzJiNjExNgotLS0gL2Rldi9udWxsCisrKyBiL3hlbi9hcmNoL3g4Ni9wdi9tbS5o CkBAIC0wLDAgKzEsNiBAQAorI2lmbmRlZiBfX1BWX01NX0hfXworI2RlZmluZSBfX1BWX01NX0hf XworCitib29sIHB2X2NyZWF0ZV9wYWVfeGVuX21hcHBpbmdzKHN0cnVjdCBkb21haW4gKmQsIGwz X3BnZW50cnlfdCAqcGwzZSk7CisKKyNlbmRpZiAvKiBfX1BWX01NX0hfXyAqLwotLSAKMi4xMS4w CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRl dmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhl bi5vcmcveGVuLWRldmVsCg==