From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v4 09/31] x86/mm: rename and move update_intpte Date: Thu, 17 Aug 2017 15:44:34 +0100 Message-ID: <20170817144456.18989-10-wei.liu2@citrix.com> References: <20170817144456.18989-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 1diM3L-0001CK-LY for xen-devel@lists.xenproject.org; Thu, 17 Aug 2017 14:45:43 +0000 In-Reply-To: <20170817144456.18989-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 KysrKysrKwogeGVuL2luY2x1ZGUvYXNtLXg4Ni9wdi9tbS5oIHwgMTYgKysrKysrKysrKysKIDMg ZmlsZXMgY2hhbmdlZCwgNzAgaW5zZXJ0aW9ucygrKSwgNjUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEveGVuL2FyY2gveDg2L21tLmMgYi94ZW4vYXJjaC94ODYvbW0uYwppbmRleCBkMjVkMzE0 NjczLi5kYzRhYzU1OTJhIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0uYworKysgYi94ZW4v YXJjaC94ODYvbW0uYwpAQCAtMTMzLDE0ICsxMzMsNiBAQAogbDFfcGdlbnRyeV90IF9fc2VjdGlv bigiLmJzcy5wYWdlX2FsaWduZWQiKSBfX2FsaWduZWQoUEFHRV9TSVpFKQogICAgIGwxX2ZpeG1h cFtMMV9QQUdFVEFCTEVfRU5UUklFU107CiAKLS8qCi0gKiBQVEUgdXBkYXRlcyBjYW4gYmUgZG9u ZSB3aXRoIG9yZGluYXJ5IHdyaXRlcyBleGNlcHQ6Ci0gKiAgMS4gRGVidWcgYnVpbGRzIGdldCBl eHRyYSBjaGVja2luZyBieSB1c2luZyBDTVBYQ0hHWzhCXS4KLSAqLwotI2lmICFkZWZpbmVkKE5E RUJVRykKLSNkZWZpbmUgUFRFX1VQREFURV9XSVRIX0NNUFhDSEcKLSNlbmRpZgotCiBwYWRkcl90 IF9fcmVhZF9tb3N0bHkgbWVtX2hvdHBsdWc7CiAKIC8qIFByaXZhdGUgZG9tYWluIHN0cnVjdHMg Zm9yIERPTUlEX1hFTiBhbmQgRE9NSURfSU8uICovCkBAIC0xODEyLDYzICsxODA0LDYgQEAgdm9p ZCBwYWdlX3VubG9jayhzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlKQogICAgIH0gd2hpbGUgKCAoeSA9 IGNtcHhjaGcoJnBhZ2UtPnUuaW51c2UudHlwZV9pbmZvLCB4LCBueCkpICE9IHggKTsKIH0KIAot LyoKLSAqIEhvdyB0byB3cml0ZSBhbiBlbnRyeSB0byB0aGUgZ3Vlc3QgcGFnZXRhYmxlcy4KLSAq IFJldHVybnMgZmFsc2UgZm9yIGZhaWx1cmUgKHBvaW50ZXIgbm90IHZhbGlkKSwgdHJ1ZSBmb3Ig c3VjY2Vzcy4KLSAqLwotc3RhdGljIGlubGluZSBib29sIHVwZGF0ZV9pbnRwdGUoCi0gICAgaW50 cHRlX3QgKnAsIGludHB0ZV90IG9sZCwgaW50cHRlX3QgbmV3LCB1bnNpZ25lZCBsb25nIG1mbiwK LSAgICBzdHJ1Y3QgdmNwdSAqdiwgaW50IHByZXNlcnZlX2FkKQotewotICAgIGJvb2wgcnYgPSB0 cnVlOwotCi0jaWZuZGVmIFBURV9VUERBVEVfV0lUSF9DTVBYQ0hHCi0gICAgaWYgKCAhcHJlc2Vy dmVfYWQgKQotICAgIHsKLSAgICAgICAgcnYgPSBwYWdpbmdfd3JpdGVfZ3Vlc3RfZW50cnkodiwg cCwgbmV3LCBfbWZuKG1mbikpOwotICAgIH0KLSAgICBlbHNlCi0jZW5kaWYKLSAgICB7Ci0gICAg ICAgIGludHB0ZV90IHQgPSBvbGQ7Ci0KLSAgICAgICAgZm9yICggOyA7ICkKLSAgICAgICAgewot ICAgICAgICAgICAgaW50cHRlX3QgX25ldyA9IG5ldzsKLQotICAgICAgICAgICAgaWYgKCBwcmVz ZXJ2ZV9hZCApCi0gICAgICAgICAgICAgICAgX25ldyB8PSBvbGQgJiAoX1BBR0VfQUNDRVNTRUQg fCBfUEFHRV9ESVJUWSk7Ci0KLSAgICAgICAgICAgIHJ2ID0gcGFnaW5nX2NtcHhjaGdfZ3Vlc3Rf ZW50cnkodiwgcCwgJnQsIF9uZXcsIF9tZm4obWZuKSk7Ci0gICAgICAgICAgICBpZiAoIHVubGlr ZWx5KHJ2ID09IDApICkKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBnZHByaW50ayhY RU5MT0dfV0FSTklORywKLSAgICAgICAgICAgICAgICAgICAgICAgICAiRmFpbGVkIHRvIHVwZGF0 ZSAlIiBQUklwdGUgIiAtPiAlIiBQUklwdGUKLSAgICAgICAgICAgICAgICAgICAgICAgICAiOiBz YXcgJSIgUFJJcHRlICJcbiIsIG9sZCwgX25ldywgdCk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGlmICggdCA9PSBvbGQgKQotICAgICAgICAg ICAgICAgIGJyZWFrOwotCi0gICAgICAgICAgICAvKiBBbGxvd2VkIHRvIGNoYW5nZSBpbiBBY2Nl c3NlZC9EaXJ0eSBmbGFncyBvbmx5LiAqLwotICAgICAgICAgICAgQlVHX09OKCh0IF4gb2xkKSAm IH4oaW50cHRlX3QpKF9QQUdFX0FDQ0VTU0VEfF9QQUdFX0RJUlRZKSk7Ci0KLSAgICAgICAgICAg IG9sZCA9IHQ7Ci0gICAgICAgIH0KLSAgICB9Ci0gICAgcmV0dXJuIHJ2OwotfQotCi0vKgotICog TWFjcm8gdGhhdCB3cmFwcyB0aGUgYXBwcm9wcmlhdGUgdHlwZS1jaGFuZ2VzIGFyb3VuZCB1cGRh dGVfaW50cHRlKCkuCi0gKiBBcmd1bWVudHMgYXJlOiB0eXBlLCBwdHIsIG9sZCwgbmV3LCBtZm4s IHZjcHUKLSAqLwotI2RlZmluZSBVUERBVEVfRU5UUlkoX3QsX3AsX28sX24sX20sX3YsX2FkKSAg ICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgdXBkYXRlX2ludHB0ZSgmX3QgIyMgZV9nZXRf aW50cHRlKCooX3ApKSwgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgICAgICAg IF90ICMjIGVfZ2V0X2ludHB0ZShfbyksIF90ICMjIGVfZ2V0X2ludHB0ZShfbiksICAgXAotICAg ICAgICAgICAgICAgICAgKF9tKSwgKF92KSwgKF9hZCkpCi0KIC8qCiAgKiBQVEUgZmxhZ3MgdGhh dCBhIGd1ZXN0IG1heSBjaGFuZ2Ugd2l0aG91dCByZS12YWxpZGF0aW5nIHRoZSBQVEUuCiAgKiBB bGwgb3RoZXIgYml0cyBhZmZlY3QgdHJhbnNsYXRpb24sIGNhY2hpbmcsIG9yIFhlbidzIHNhZmV0 eS4KZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9wdi9tbS5jIGIveGVuL2FyY2gveDg2L3B2L21t LmMKaW5kZXggYWEyY2UzNDE0NS4uMmNiNTk5NWU2MiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2 L3B2L21tLmMKKysrIGIveGVuL2FyY2gveDg2L3B2L21tLmMKQEAgLTI0LDYgKzI0LDEzIEBACiAK ICNpbmNsdWRlIDxhc20vcHYvbW0uaD4KIAorLyoKKyAqIFBURSB1cGRhdGVzIGNhbiBiZSBkb25l IHdpdGggb3JkaW5hcnkgd3JpdGVzIGV4Y2VwdDoKKyAqICAxLiBEZWJ1ZyBidWlsZHMgZ2V0IGV4 dHJhIGNoZWNraW5nIGJ5IHVzaW5nIENNUFhDSEdbOEJdLgorICovCisjaWYgIWRlZmluZWQoTkRF QlVHKQorI2RlZmluZSBQVEVfVVBEQVRFX1dJVEhfQ01QWENIRworI2VuZGlmCiAKIC8qIFJlYWQg YSBQViBndWVzdCdzIGwxZSB0aGF0IG1hcHMgdGhpcyB2aXJ0dWFsIGFkZHJlc3MuICovCiB2b2lk IHB2X2dldF9ndWVzdF9lZmZfbDFlKHVuc2lnbmVkIGxvbmcgYWRkciwgbDFfcGdlbnRyeV90ICpl ZmZfbDFlKQpAQCAtNTYsNiArNjMsNTMgQEAgdm9pZCBwdl9nZXRfZ3Vlc3RfZWZmX2tlcm5fbDFl KHN0cnVjdCB2Y3B1ICp2LCB1bnNpZ25lZCBsb25nIGFkZHIsCiAgICAgICAgIHRvZ2dsZV9ndWVz dF9tb2RlKHYpOwogfQogCisvKgorICogSG93IHRvIHdyaXRlIGFuIGVudHJ5IHRvIHRoZSBndWVz dCBwYWdldGFibGVzLgorICogUmV0dXJucyBmYWxzZSBmb3IgZmFpbHVyZSAocG9pbnRlciBub3Qg dmFsaWQpLCB0cnVlIGZvciBzdWNjZXNzLgorICovCitib29sIHB2X3VwZGF0ZV9pbnRwdGUoaW50 cHRlX3QgKnAsIGludHB0ZV90IG9sZCwgaW50cHRlX3QgbmV3LAorICAgICAgICAgICAgICAgICAg ICAgIHVuc2lnbmVkIGxvbmcgbWZuLCBzdHJ1Y3QgdmNwdSAqdiwgaW50IHByZXNlcnZlX2FkKQor eworICAgIGJvb2wgcnYgPSB0cnVlOworCisjaWZuZGVmIFBURV9VUERBVEVfV0lUSF9DTVBYQ0hH CisgICAgaWYgKCAhcHJlc2VydmVfYWQgKQorICAgIHsKKyAgICAgICAgcnYgPSBwYWdpbmdfd3Jp dGVfZ3Vlc3RfZW50cnkodiwgcCwgbmV3LCBfbWZuKG1mbikpOworICAgIH0KKyAgICBlbHNlCisj ZW5kaWYKKyAgICB7CisgICAgICAgIGludHB0ZV90IHQgPSBvbGQ7CisKKyAgICAgICAgZm9yICgg OyA7ICkKKyAgICAgICAgeworICAgICAgICAgICAgaW50cHRlX3QgX25ldyA9IG5ldzsKKworICAg ICAgICAgICAgaWYgKCBwcmVzZXJ2ZV9hZCApCisgICAgICAgICAgICAgICAgX25ldyB8PSBvbGQg JiAoX1BBR0VfQUNDRVNTRUQgfCBfUEFHRV9ESVJUWSk7CisKKyAgICAgICAgICAgIHJ2ID0gcGFn aW5nX2NtcHhjaGdfZ3Vlc3RfZW50cnkodiwgcCwgJnQsIF9uZXcsIF9tZm4obWZuKSk7CisgICAg ICAgICAgICBpZiAoIHVubGlrZWx5KHJ2ID09IDApICkKKyAgICAgICAgICAgIHsKKyAgICAgICAg ICAgICAgICBnZHByaW50ayhYRU5MT0dfV0FSTklORywKKyAgICAgICAgICAgICAgICAgICAgICAg ICAiRmFpbGVkIHRvIHVwZGF0ZSAlIiBQUklwdGUgIiAtPiAlIiBQUklwdGUKKyAgICAgICAgICAg ICAgICAgICAgICAgICAiOiBzYXcgJSIgUFJJcHRlICJcbiIsIG9sZCwgX25ldywgdCk7CisgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmICggdCA9 PSBvbGQgKQorICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICAvKiBBbGxvd2Vk IHRvIGNoYW5nZSBpbiBBY2Nlc3NlZC9EaXJ0eSBmbGFncyBvbmx5LiAqLworICAgICAgICAgICAg QlVHX09OKCh0IF4gb2xkKSAmIH4oaW50cHRlX3QpKF9QQUdFX0FDQ0VTU0VEfF9QQUdFX0RJUlRZ KSk7CisKKyAgICAgICAgICAgIG9sZCA9IHQ7CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJu IHJ2OworfQorCiAvKgogICogTG9jYWwgdmFyaWFibGVzOgogICogbW9kZTogQwpkaWZmIC0tZ2l0 IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9wdi9tbS5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wdi9t bS5oCmluZGV4IDE5ZGJjM2I2NmMuLjcyYzA0YzY4NGYgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRl L2FzbS14ODYvcHYvbW0uaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L3B2L21tLmgKQEAgLTI4 LDYgKzI4LDE3IEBAIHZvaWQgcHZfZ2V0X2d1ZXN0X2VmZl9sMWUodW5zaWduZWQgbG9uZyBhZGRy LCBsMV9wZ2VudHJ5X3QgKmVmZl9sMWUpOwogdm9pZCBwdl9nZXRfZ3Vlc3RfZWZmX2tlcm5fbDFl KHN0cnVjdCB2Y3B1ICp2LCB1bnNpZ25lZCBsb25nIGFkZHIsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdm9pZCAqZWZmX2wxZSk7CiAKK2Jvb2wgcHZfdXBkYXRlX2ludHB0ZShpbnRw dGVfdCAqcCwgaW50cHRlX3Qgb2xkLCBpbnRwdGVfdCBuZXcsCisgICAgICAgICAgICAgICAgICAg ICAgdW5zaWduZWQgbG9uZyBtZm4sIHN0cnVjdCB2Y3B1ICp2LCBpbnQgcHJlc2VydmVfYWQpOwor LyoKKyAqIE1hY3JvIHRoYXQgd3JhcHMgdGhlIGFwcHJvcHJpYXRlIHR5cGUtY2hhbmdlcyBhcm91 bmQgdXBkYXRlX2ludHB0ZSgpLgorICogQXJndW1lbnRzIGFyZTogdHlwZSwgcHRyLCBvbGQsIG5l dywgbWZuLCB2Y3B1CisgKi8KKyNkZWZpbmUgVVBEQVRFX0VOVFJZKF90LF9wLF9vLF9uLF9tLF92 LF9hZCkgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIHB2X3VwZGF0ZV9pbnRwdGUo Jl90ICMjIGVfZ2V0X2ludHB0ZSgqKF9wKSksICAgICAgICAgICAgICAgICAgICAgICBcCisgICAg ICAgICAgICAgICAgICAgICBfdCAjIyBlX2dldF9pbnRwdGUoX28pLCBfdCAjIyBlX2dldF9pbnRw dGUoX24pLCAgIFwKKyAgICAgICAgICAgICAgICAgICAgIChfbSksIChfdiksIChfYWQpKQorCiAj ZWxzZQogCiBzdGF0aWMgaW5saW5lIHZvaWQgcHZfZ2V0X2d1ZXN0X2VmZl9sMWUodW5zaWduZWQg bG9uZyBhZGRyLApAQCAtMzgsNiArNDksMTEgQEAgc3RhdGljIGlubGluZSB2b2lkIHB2X2dldF9n dWVzdF9lZmZfa2Vybl9sMWUoc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGxvbmcgYWRkciwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZvaWQgKmVmZl9sMWUp CiB7fQogCitzdGF0aWMgaW5saW5lIGJvb2wgcHZfdXBkYXRlX2ludHB0ZShpbnRwdGVfdCAqcCwg aW50cHRlX3Qgb2xkLCBpbnRwdGVfdCBuZXcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB1bnNpZ25lZCBsb25nIG1mbiwgc3RydWN0IHZjcHUgKnYsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBpbnQgcHJlc2VydmVfYWQpCit7IHJldHVybiBmYWxzZTsg fQorCiAjZW5kaWYKIAogI2VuZGlmIC8qIF9fWDg2X1BWX01NX0hfXyAqLwotLSAKMi4xMS4wCgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5v cmcveGVuLWRldmVsCg==