From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v3 09/21] x86/mm: rename and move update_intpte Date: Thu, 20 Jul 2017 17:04:14 +0100 Message-ID: <20170720160426.2343-10-wei.liu2@citrix.com> References: <20170720160426.2343-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 1dYDwH-0000DU-M3 for xen-devel@lists.xenproject.org; Thu, 20 Jul 2017 16:04:33 +0000 In-Reply-To: <20170720160426.2343-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 VGhhdCBmdW5jdGlvbiBpcyBvbmx5IHVzZWQgYnkgUFYgZ3Vlc3RzIHN1cHBvcnRpbmcgY29kZSwg YWRkIHB2XwpwcmVmaXguCgpFeHBvcnQgaXQgdmlhIHB2L21tLmguIE1vdmUgVVBEQVRFX0VOVFJZ IGFzIHdlbGwuCgpTaWduZWQtb2ZmLWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgot LS0KTm93IGl0IGlzIG5vIGxvbmdlciBhbiBpbmxpbmUgZnVuY3Rpb24sIGJ1dCBJIGRvbid0IHRo aW5rIHRoYXQgbWF0dGVycwptdWNoLgotLS0KIHhlbi9hcmNoL3g4Ni9tbS5jICAgICAgICAgICB8 IDY1IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogeGVuL2Fy Y2gveDg2L3B2L21tLmMgICAgICAgIHwgNTQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKwogeGVuL2luY2x1ZGUvYXNtLXg4Ni9wdi9tbS5oIHwgMTcgKysrKysrKysrKysrCiAz IGZpbGVzIGNoYW5nZWQsIDcxIGluc2VydGlvbnMoKyksIDY1IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS5jIGIveGVuL2FyY2gveDg2L21tLmMKaW5kZXggNDcyZjBk NDBkNS4uZmJmM2IzMTA1MSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tLmMKKysrIGIveGVu L2FyY2gveDg2L21tLmMKQEAgLTEzMywxNCArMTMzLDYgQEAKIGwxX3BnZW50cnlfdCBfX3NlY3Rp b24oIi5ic3MucGFnZV9hbGlnbmVkIikgX19hbGlnbmVkKFBBR0VfU0laRSkKICAgICBsMV9maXht YXBbTDFfUEFHRVRBQkxFX0VOVFJJRVNdOwogCi0vKgotICogUFRFIHVwZGF0ZXMgY2FuIGJlIGRv bmUgd2l0aCBvcmRpbmFyeSB3cml0ZXMgZXhjZXB0OgotICogIDEuIERlYnVnIGJ1aWxkcyBnZXQg ZXh0cmEgY2hlY2tpbmcgYnkgdXNpbmcgQ01QWENIR1s4Ql0uCi0gKi8KLSNpZiAhZGVmaW5lZChO REVCVUcpCi0jZGVmaW5lIFBURV9VUERBVEVfV0lUSF9DTVBYQ0hHCi0jZW5kaWYKLQogcGFkZHJf dCBfX3JlYWRfbW9zdGx5IG1lbV9ob3RwbHVnOwogCiAvKiBQcml2YXRlIGRvbWFpbiBzdHJ1Y3Rz IGZvciBET01JRF9YRU4gYW5kIERPTUlEX0lPLiAqLwpAQCAtMTg0Niw2MyArMTgzOCw2IEBAIHZv aWQgcGFnZV91bmxvY2soc3RydWN0IHBhZ2VfaW5mbyAqcGFnZSkKICAgICB9IHdoaWxlICggKHkg PSBjbXB4Y2hnKCZwYWdlLT51LmludXNlLnR5cGVfaW5mbywgeCwgbngpKSAhPSB4ICk7CiB9CiAK LS8qCi0gKiBIb3cgdG8gd3JpdGUgYW4gZW50cnkgdG8gdGhlIGd1ZXN0IHBhZ2V0YWJsZXMuCi0g KiBSZXR1cm5zIGZhbHNlIGZvciBmYWlsdXJlIChwb2ludGVyIG5vdCB2YWxpZCksIHRydWUgZm9y IHN1Y2Nlc3MuCi0gKi8KLXN0YXRpYyBpbmxpbmUgYm9vbCB1cGRhdGVfaW50cHRlKAotICAgIGlu dHB0ZV90ICpwLCBpbnRwdGVfdCBvbGQsIGludHB0ZV90IG5ldywgdW5zaWduZWQgbG9uZyBtZm4s Ci0gICAgc3RydWN0IHZjcHUgKnYsIGludCBwcmVzZXJ2ZV9hZCkKLXsKLSAgICBib29sIHJ2ID0g dHJ1ZTsKLQotI2lmbmRlZiBQVEVfVVBEQVRFX1dJVEhfQ01QWENIRwotICAgIGlmICggIXByZXNl cnZlX2FkICkKLSAgICB7Ci0gICAgICAgIHJ2ID0gcGFnaW5nX3dyaXRlX2d1ZXN0X2VudHJ5KHYs IHAsIG5ldywgX21mbihtZm4pKTsKLSAgICB9Ci0gICAgZWxzZQotI2VuZGlmCi0gICAgewotICAg ICAgICBpbnRwdGVfdCB0ID0gb2xkOwotCi0gICAgICAgIGZvciAoIDsgOyApCi0gICAgICAgIHsK LSAgICAgICAgICAgIGludHB0ZV90IF9uZXcgPSBuZXc7Ci0KLSAgICAgICAgICAgIGlmICggcHJl c2VydmVfYWQgKQotICAgICAgICAgICAgICAgIF9uZXcgfD0gb2xkICYgKF9QQUdFX0FDQ0VTU0VE IHwgX1BBR0VfRElSVFkpOwotCi0gICAgICAgICAgICBydiA9IHBhZ2luZ19jbXB4Y2hnX2d1ZXN0 X2VudHJ5KHYsIHAsICZ0LCBfbmV3LCBfbWZuKG1mbikpOwotICAgICAgICAgICAgaWYgKCB1bmxp a2VseShydiA9PSAwKSApCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgZ2RwcmludGso WEVOTE9HX1dBUk5JTkcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIkZhaWxlZCB0byB1cGRh dGUgJSIgUFJJcHRlICIgLT4gJSIgUFJJcHRlCi0gICAgICAgICAgICAgICAgICAgICAgICAgIjog c2F3ICUiIFBSSXB0ZSAiXG4iLCBvbGQsIF9uZXcsIHQpOwotICAgICAgICAgICAgICAgIGJyZWFr OwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBpZiAoIHQgPT0gb2xkICkKLSAgICAgICAg ICAgICAgICBicmVhazsKLQotICAgICAgICAgICAgLyogQWxsb3dlZCB0byBjaGFuZ2UgaW4gQWNj ZXNzZWQvRGlydHkgZmxhZ3Mgb25seS4gKi8KLSAgICAgICAgICAgIEJVR19PTigodCBeIG9sZCkg JiB+KGludHB0ZV90KShfUEFHRV9BQ0NFU1NFRHxfUEFHRV9ESVJUWSkpOwotCi0gICAgICAgICAg ICBvbGQgPSB0OwotICAgICAgICB9Ci0gICAgfQotICAgIHJldHVybiBydjsKLX0KLQotLyoKLSAq IE1hY3JvIHRoYXQgd3JhcHMgdGhlIGFwcHJvcHJpYXRlIHR5cGUtY2hhbmdlcyBhcm91bmQgdXBk YXRlX2ludHB0ZSgpLgotICogQXJndW1lbnRzIGFyZTogdHlwZSwgcHRyLCBvbGQsIG5ldywgbWZu LCB2Y3B1Ci0gKi8KLSNkZWZpbmUgVVBEQVRFX0VOVFJZKF90LF9wLF9vLF9uLF9tLF92LF9hZCkg ICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgIHVwZGF0ZV9pbnRwdGUoJl90ICMjIGVfZ2V0 X2ludHB0ZSgqKF9wKSksICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgICAgICAgICAg ICBfdCAjIyBlX2dldF9pbnRwdGUoX28pLCBfdCAjIyBlX2dldF9pbnRwdGUoX24pLCAgIFwKLSAg ICAgICAgICAgICAgICAgIChfbSksIChfdiksIChfYWQpKQotCiAvKgogICogUFRFIGZsYWdzIHRo YXQgYSBndWVzdCBtYXkgY2hhbmdlIHdpdGhvdXQgcmUtdmFsaWRhdGluZyB0aGUgUFRFLgogICog QWxsIG90aGVyIGJpdHMgYWZmZWN0IHRyYW5zbGF0aW9uLCBjYWNoaW5nLCBvciBYZW4ncyBzYWZl dHkuCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvcHYvbW0uYyBiL3hlbi9hcmNoL3g4Ni9wdi9t bS5jCmluZGV4IGFhMmNlMzQxNDUuLjJjYjU5OTVlNjIgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4 Ni9wdi9tbS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9wdi9tbS5jCkBAIC0yNCw2ICsyNCwxMyBAQAog CiAjaW5jbHVkZSA8YXNtL3B2L21tLmg+CiAKKy8qCisgKiBQVEUgdXBkYXRlcyBjYW4gYmUgZG9u ZSB3aXRoIG9yZGluYXJ5IHdyaXRlcyBleGNlcHQ6CisgKiAgMS4gRGVidWcgYnVpbGRzIGdldCBl eHRyYSBjaGVja2luZyBieSB1c2luZyBDTVBYQ0hHWzhCXS4KKyAqLworI2lmICFkZWZpbmVkKE5E RUJVRykKKyNkZWZpbmUgUFRFX1VQREFURV9XSVRIX0NNUFhDSEcKKyNlbmRpZgogCiAvKiBSZWFk IGEgUFYgZ3Vlc3QncyBsMWUgdGhhdCBtYXBzIHRoaXMgdmlydHVhbCBhZGRyZXNzLiAqLwogdm9p ZCBwdl9nZXRfZ3Vlc3RfZWZmX2wxZSh1bnNpZ25lZCBsb25nIGFkZHIsIGwxX3BnZW50cnlfdCAq ZWZmX2wxZSkKQEAgLTU2LDYgKzYzLDUzIEBAIHZvaWQgcHZfZ2V0X2d1ZXN0X2VmZl9rZXJuX2wx ZShzdHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgbG9uZyBhZGRyLAogICAgICAgICB0b2dnbGVfZ3Vl c3RfbW9kZSh2KTsKIH0KIAorLyoKKyAqIEhvdyB0byB3cml0ZSBhbiBlbnRyeSB0byB0aGUgZ3Vl c3QgcGFnZXRhYmxlcy4KKyAqIFJldHVybnMgZmFsc2UgZm9yIGZhaWx1cmUgKHBvaW50ZXIgbm90 IHZhbGlkKSwgdHJ1ZSBmb3Igc3VjY2Vzcy4KKyAqLworYm9vbCBwdl91cGRhdGVfaW50cHRlKGlu dHB0ZV90ICpwLCBpbnRwdGVfdCBvbGQsIGludHB0ZV90IG5ldywKKyAgICAgICAgICAgICAgICAg ICAgICB1bnNpZ25lZCBsb25nIG1mbiwgc3RydWN0IHZjcHUgKnYsIGludCBwcmVzZXJ2ZV9hZCkK K3sKKyAgICBib29sIHJ2ID0gdHJ1ZTsKKworI2lmbmRlZiBQVEVfVVBEQVRFX1dJVEhfQ01QWENI RworICAgIGlmICggIXByZXNlcnZlX2FkICkKKyAgICB7CisgICAgICAgIHJ2ID0gcGFnaW5nX3dy aXRlX2d1ZXN0X2VudHJ5KHYsIHAsIG5ldywgX21mbihtZm4pKTsKKyAgICB9CisgICAgZWxzZQor I2VuZGlmCisgICAgeworICAgICAgICBpbnRwdGVfdCB0ID0gb2xkOworCisgICAgICAgIGZvciAo IDsgOyApCisgICAgICAgIHsKKyAgICAgICAgICAgIGludHB0ZV90IF9uZXcgPSBuZXc7CisKKyAg ICAgICAgICAgIGlmICggcHJlc2VydmVfYWQgKQorICAgICAgICAgICAgICAgIF9uZXcgfD0gb2xk ICYgKF9QQUdFX0FDQ0VTU0VEIHwgX1BBR0VfRElSVFkpOworCisgICAgICAgICAgICBydiA9IHBh Z2luZ19jbXB4Y2hnX2d1ZXN0X2VudHJ5KHYsIHAsICZ0LCBfbmV3LCBfbWZuKG1mbikpOworICAg ICAgICAgICAgaWYgKCB1bmxpa2VseShydiA9PSAwKSApCisgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgZ2RwcmludGsoWEVOTE9HX1dBUk5JTkcsCisgICAgICAgICAgICAgICAgICAgICAg ICAgIkZhaWxlZCB0byB1cGRhdGUgJSIgUFJJcHRlICIgLT4gJSIgUFJJcHRlCisgICAgICAgICAg ICAgICAgICAgICAgICAgIjogc2F3ICUiIFBSSXB0ZSAiXG4iLCBvbGQsIF9uZXcsIHQpOworICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAoIHQg PT0gb2xkICkKKyAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgLyogQWxsb3dl ZCB0byBjaGFuZ2UgaW4gQWNjZXNzZWQvRGlydHkgZmxhZ3Mgb25seS4gKi8KKyAgICAgICAgICAg IEJVR19PTigodCBeIG9sZCkgJiB+KGludHB0ZV90KShfUEFHRV9BQ0NFU1NFRHxfUEFHRV9ESVJU WSkpOworCisgICAgICAgICAgICBvbGQgPSB0OworICAgICAgICB9CisgICAgfQorICAgIHJldHVy biBydjsKK30KKwogLyoKICAqIExvY2FsIHZhcmlhYmxlczoKICAqIG1vZGU6IEMKZGlmZiAtLWdp dCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcHYvbW0uaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcHYv bW0uaAppbmRleCAxOWRiYzNiNjZjLi5hZTg1YTljYTFhIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVk ZS9hc20teDg2L3B2L21tLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wdi9tbS5oCkBAIC0y MSw2ICsyMSw3IEBACiAjaWZuZGVmIF9fWDg2X1BWX01NX0hfXwogI2RlZmluZSBfX1g4Nl9QVl9N TV9IX18KIAorCiAjaWZkZWYgQ09ORklHX1BWCiAKIHZvaWQgcHZfZ2V0X2d1ZXN0X2VmZl9sMWUo dW5zaWduZWQgbG9uZyBhZGRyLCBsMV9wZ2VudHJ5X3QgKmVmZl9sMWUpOwpAQCAtMjgsNiArMjks MTcgQEAgdm9pZCBwdl9nZXRfZ3Vlc3RfZWZmX2wxZSh1bnNpZ25lZCBsb25nIGFkZHIsIGwxX3Bn ZW50cnlfdCAqZWZmX2wxZSk7CiB2b2lkIHB2X2dldF9ndWVzdF9lZmZfa2Vybl9sMWUoc3RydWN0 IHZjcHUgKnYsIHVuc2lnbmVkIGxvbmcgYWRkciwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB2b2lkICplZmZfbDFlKTsKIAorYm9vbCBwdl91cGRhdGVfaW50cHRlKGludHB0ZV90ICpw LCBpbnRwdGVfdCBvbGQsIGludHB0ZV90IG5ldywKKyAgICAgICAgICAgICAgICAgICAgICB1bnNp Z25lZCBsb25nIG1mbiwgc3RydWN0IHZjcHUgKnYsIGludCBwcmVzZXJ2ZV9hZCk7CisvKgorICog TWFjcm8gdGhhdCB3cmFwcyB0aGUgYXBwcm9wcmlhdGUgdHlwZS1jaGFuZ2VzIGFyb3VuZCB1cGRh dGVfaW50cHRlKCkuCisgKiBBcmd1bWVudHMgYXJlOiB0eXBlLCBwdHIsIG9sZCwgbmV3LCBtZm4s IHZjcHUKKyAqLworI2RlZmluZSBVUERBVEVfRU5UUlkoX3QsX3AsX28sX24sX20sX3YsX2FkKSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgcHZfdXBkYXRlX2ludHB0ZSgmX3QgIyMg ZV9nZXRfaW50cHRlKCooX3ApKSwgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAg ICAgICAgICAgIF90ICMjIGVfZ2V0X2ludHB0ZShfbyksIF90ICMjIGVfZ2V0X2ludHB0ZShfbiks ICAgXAorICAgICAgICAgICAgICAgICAgICAgKF9tKSwgKF92KSwgKF9hZCkpCisKICNlbHNlCiAK IHN0YXRpYyBpbmxpbmUgdm9pZCBwdl9nZXRfZ3Vlc3RfZWZmX2wxZSh1bnNpZ25lZCBsb25nIGFk ZHIsCkBAIC0zOCw2ICs1MCwxMSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgcHZfZ2V0X2d1ZXN0X2Vm Zl9rZXJuX2wxZShzdHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgbG9uZyBhZGRyLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAqZWZmX2wxZSkKIHt9CiAK K3N0YXRpYyBpbmxpbmUgYm9vbCBwdl91cGRhdGVfaW50cHRlKGludHB0ZV90ICpwLCBpbnRwdGVf dCBvbGQsIGludHB0ZV90IG5ldywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHVuc2lnbmVkIGxvbmcgbWZuLCBzdHJ1Y3QgdmNwdSAqdiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGludCBwcmVzZXJ2ZV9hZCkKK3sgcmV0dXJuIGZhbHNlOyB9CisKICNl bmRpZgogCiAjZW5kaWYgLyogX19YODZfUFZfTU1fSF9fICovCi0tIAoyLjExLjAKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGlu ZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4t ZGV2ZWwK