From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH v2 9/9] x86/pagewalk: non-functional cleanup Date: Thu, 16 Mar 2017 16:31:43 +0000 Message-ID: <1489681903-28119-10-git-send-email-andrew.cooper3@citrix.com> References: <1489681903-28119-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1489681903-28119-1-git-send-email-andrew.cooper3@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 , Tim Deegan , Jan Beulich List-Id: xen-devel@lists.xenproject.org ICogRHJvcCB0cmFpbGluZyB3aGl0ZXNwYWNlCiAqIENvbnNpc3RlbnRseSBhcHBseSBYZW4gc3R5 bGUKICogSW50cm9kdWNlIGEgbG9jYWwgdmFyaWFibGUgYmxvY2sKClNpZ25lZC1vZmYtYnk6IEFu ZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+Ci0tLQpDQzogSmFuIEJldWxp Y2ggPEpCZXVsaWNoQHN1c2UuY29tPgpDQzogVGltIERlZWdhbiA8dGltQHhlbi5vcmc+CkNDOiBH ZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGV1LmNpdHJpeC5jb20+Cgp2MjoKICogTmV3Ci0t LQogeGVuL2FyY2gveDg2L21tL2d1ZXN0X3dhbGsuYyB8IDgyICsrKysrKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygr KSwgMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL2d1ZXN0X3dh bGsuYyBiL3hlbi9hcmNoL3g4Ni9tbS9ndWVzdF93YWxrLmMKaW5kZXggNGJhNzYwMi4uYThiNzJi MiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL2d1ZXN0X3dhbGsuYworKysgYi94ZW4vYXJj aC94ODYvbW0vZ3Vlc3Rfd2Fsay5jCkBAIC04MSw3ICs4MSw3IEBAIHN0YXRpYyBib29sIHNldF9h ZF9iaXRzKHZvaWQgKl9ndWVzdF9wLCB2b2lkICpfd2Fsa19wLCBib29sIHNldF9kaXJ0eSkKICAq LwogYm9vbAogZ3Vlc3Rfd2Fsa190YWJsZXMoc3RydWN0IHZjcHUgKnYsIHN0cnVjdCBwMm1fZG9t YWluICpwMm0sCi0gICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIHZhLCB3YWxrX3QgKmd3 LCAKKyAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcgdmEsIHdhbGtfdCAqZ3csCiAgICAg ICAgICAgICAgICAgICB1aW50MzJfdCB3YWxrLCBtZm5fdCB0b3BfbWZuLCB2b2lkICp0b3BfbWFw KQogewogICAgIHN0cnVjdCBkb21haW4gKmQgPSB2LT5kb21haW47CkBAIC0xNTQsMTMgKzE1NCwx MyBAQCBndWVzdF93YWxrX3RhYmxlcyhzdHJ1Y3QgdmNwdSAqdiwgc3RydWN0IHAybV9kb21haW4g KnAybSwKICAgICBhcl9vciAgfD0gZ2ZsYWdzOwogCiAgICAgLyogTWFwIHRoZSBsMyB0YWJsZSAq LwotICAgIGwzcCA9IG1hcF9kb21haW5fZ2ZuKHAybSwgCi0gICAgICAgICAgICAgICAgICAgICAg ICAgZ3Vlc3RfbDRlX2dldF9nZm4oZ3ctPmw0ZSksIAorICAgIGwzcCA9IG1hcF9kb21haW5fZ2Zu KHAybSwKKyAgICAgICAgICAgICAgICAgICAgICAgICBndWVzdF9sNGVfZ2V0X2dmbihndy0+bDRl KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAmZ3ctPmwzbWZuLAogICAgICAgICAgICAgICAg ICAgICAgICAgICZwMm10LAogICAgICAgICAgICAgICAgICAgICAgICAgIHF0LAotICAgICAgICAg ICAgICAgICAgICAgICAgICZyYyk7IAotICAgIGlmKGwzcCA9PSBOVUxMKQorICAgICAgICAgICAg ICAgICAgICAgICAgICZyYyk7CisgICAgaWYgKCBsM3AgPT0gTlVMTCApCiAgICAgewogICAgICAg ICBndy0+cGZlYyB8PSByYyAmIFBGRUNfc3ludGhfbWFzazsKICAgICAgICAgZ290byBvdXQ7CkBA IC0xNzgsMjMgKzE3OCwyOSBAQCBndWVzdF93YWxrX3RhYmxlcyhzdHJ1Y3QgdmNwdSAqdiwgc3Ry dWN0IHAybV9kb21haW4gKnAybSwKICAgICAgICAgZ3ctPnBmZWMgfD0gUEZFQ19yZXNlcnZlZF9i aXQgfCBQRkVDX3BhZ2VfcHJlc2VudDsKICAgICAgICAgZ290byBvdXQ7CiAgICAgfQotICAgIAor CiAgICAgLyogQWNjdW11bGF0ZSBsM2UgYWNjZXNzIHJpZ2h0cy4gKi8KICAgICBhcl9hbmQgJj0g Z2ZsYWdzOwogICAgIGFyX29yICB8PSBnZmxhZ3M7CiAKICAgICBpZiAoIGdmbGFncyAmIF9QQUdF X1BTRSApCiAgICAgewotICAgICAgICAvKiBHZW5lcmF0ZSBhIGZha2UgbDEgdGFibGUgZW50cnkg c28gY2FsbGVycyBkb24ndCBhbGwgCi0gICAgICAgICAqIGhhdmUgdG8gdW5kZXJzdGFuZCBzdXBl cnBhZ2VzLiAqLworICAgICAgICAvKgorICAgICAgICAgKiBHZW5lcmF0ZSBhIGZha2UgbDEgdGFi bGUgZW50cnkgc28gY2FsbGVycyBkb24ndCBhbGwKKyAgICAgICAgICogaGF2ZSB0byB1bmRlcnN0 YW5kIHN1cGVycGFnZXMuCisgICAgICAgICAqLwogICAgICAgICBnZm5fdCBzdGFydCA9IGd1ZXN0 X2wzZV9nZXRfZ2ZuKGd3LT5sM2UpOwotICAgICAgICAvKiBHcmFudCBmdWxsIGFjY2VzcyBpbiB0 aGUgbDFlLCBzaW5jZSBhbGwgdGhlIGd1ZXN0IGVudHJ5J3MKLSAgICAgICAgICogYWNjZXNzIGNv bnRyb2xzIGFyZSBlbmZvcmNlZCBpbiB0aGUgbDNlLiAqLworICAgICAgICAvKgorICAgICAgICAg KiBHcmFudCBmdWxsIGFjY2VzcyBpbiB0aGUgbDFlLCBzaW5jZSBhbGwgdGhlIGd1ZXN0IGVudHJ5 J3MKKyAgICAgICAgICogYWNjZXNzIGNvbnRyb2xzIGFyZSBlbmZvcmNlZCBpbiB0aGUgbDNlLgor ICAgICAgICAgKi8KICAgICAgICAgaW50IGZsYWdzID0gKF9QQUdFX1BSRVNFTlR8X1BBR0VfVVNF UnxfUEFHRV9SV3wKICAgICAgICAgICAgICAgICAgICAgIF9QQUdFX0FDQ0VTU0VEfF9QQUdFX0RJ UlRZKTsKLSAgICAgICAgLyogSW1wb3J0IGNhY2hlLWNvbnRyb2wgYml0cy4gTm90ZSB0aGF0IF9Q QUdFX1BBVCBpcyBhY3R1YWxseQorICAgICAgICAvKgorICAgICAgICAgKiBJbXBvcnQgY2FjaGUt Y29udHJvbCBiaXRzLiBOb3RlIHRoYXQgX1BBR0VfUEFUIGlzIGFjdHVhbGx5CiAgICAgICAgICAq IF9QQUdFX1BTRSwgYW5kIGl0IGlzIGFsd2F5cyBzZXQuIFdlIHdpbGwgY2xlYXIgaXQgaW4gY2Fz ZQotICAgICAgICAgKiBfUEFHRV9QU0VfUEFUIChiaXQgMTIsIGkuZS4gZmlyc3QgYml0IG9mIGdm bikgaXMgY2xlYXIuICovCisgICAgICAgICAqIF9QQUdFX1BTRV9QQVQgKGJpdCAxMiwgaS5lLiBm aXJzdCBiaXQgb2YgZ2ZuKSBpcyBjbGVhci4KKyAgICAgICAgICovCiAgICAgICAgIGZsYWdzIHw9 IChndWVzdF9sM2VfZ2V0X2ZsYWdzKGd3LT5sM2UpCiAgICAgICAgICAgICAgICAgICAmIChfUEFH RV9QQVR8X1BBR0VfUFdUfF9QQUdFX1BDRCkpOwogICAgICAgICBpZiAoICEoZ2ZuX3goc3RhcnQp ICYgMSkgKQpAQCAtMjI3LDEzICsyMzMsMTMgQEAgZ3Vlc3Rfd2Fsa190YWJsZXMoc3RydWN0IHZj cHUgKnYsIHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAjZW5kaWYgLyogUEFFIG9yIDY0Li4uICov CiAKICAgICAvKiBNYXAgdGhlIGwyIHRhYmxlICovCi0gICAgbDJwID0gbWFwX2RvbWFpbl9nZm4o cDJtLCAKLSAgICAgICAgICAgICAgICAgICAgICAgICBndWVzdF9sM2VfZ2V0X2dmbihndy0+bDNl KSwgCisgICAgbDJwID0gbWFwX2RvbWFpbl9nZm4ocDJtLAorICAgICAgICAgICAgICAgICAgICAg ICAgIGd1ZXN0X2wzZV9nZXRfZ2ZuKGd3LT5sM2UpLAogICAgICAgICAgICAgICAgICAgICAgICAg ICZndy0+bDJtZm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgJnAybXQsIAorICAgICAgICAg ICAgICAgICAgICAgICAgICZwMm10LAogICAgICAgICAgICAgICAgICAgICAgICAgIHF0LAotICAg ICAgICAgICAgICAgICAgICAgICAgICZyYyk7IAotICAgIGlmKGwycCA9PSBOVUxMKQorICAgICAg ICAgICAgICAgICAgICAgICAgICZyYyk7CisgICAgaWYgKCBsMnAgPT0gTlVMTCApCiAgICAgewog ICAgICAgICBndy0+cGZlYyB8PSByYyAmIFBGRUNfc3ludGhfbWFzazsKICAgICAgICAgZ290byBv dXQ7CkBAIC0yNzgsMjIgKzI4NCwyOCBAQCBndWVzdF93YWxrX3RhYmxlcyhzdHJ1Y3QgdmNwdSAq diwgc3RydWN0IHAybV9kb21haW4gKnAybSwKIAogICAgIGlmICggZ2ZsYWdzICYgX1BBR0VfUFNF ICkKICAgICB7Ci0gICAgICAgIC8qIFNwZWNpYWwgY2FzZTogdGhpcyBndWVzdCBWQSBpcyBpbiBh IFBTRSBzdXBlcnBhZ2UsIHNvIHRoZXJlJ3MKKyAgICAgICAgLyoKKyAgICAgICAgICogU3BlY2lh bCBjYXNlOiB0aGlzIGd1ZXN0IFZBIGlzIGluIGEgUFNFIHN1cGVycGFnZSwgc28gdGhlcmUncwog ICAgICAgICAgKiBubyBndWVzdCBsMWUuICBXZSBtYWtlIG9uZSB1cCBzbyB0aGF0IHRoZSBwcm9w YWdhdGlvbiBjb2RlCi0gICAgICAgICAqIGNhbiBnZW5lcmF0ZSBhIHNoYWRvdyBsMSB0YWJsZS4g IFN0YXJ0IHdpdGggdGhlIGdmbiBvZiB0aGUgCi0gICAgICAgICAqIGZpcnN0IDRrLXBhZ2Ugb2Yg dGhlIHN1cGVycGFnZS4gKi8KKyAgICAgICAgICogY2FuIGdlbmVyYXRlIGEgc2hhZG93IGwxIHRh YmxlLiAgU3RhcnQgd2l0aCB0aGUgZ2ZuIG9mIHRoZQorICAgICAgICAgKiBmaXJzdCA0ay1wYWdl IG9mIHRoZSBzdXBlcnBhZ2UuCisgICAgICAgICAqLwogI2lmIEdVRVNUX1BBR0lOR19MRVZFTFMg PT0gMgogICAgICAgICBnZm5fdCBzdGFydCA9IF9nZm4odW5mb2xkX3BzZTM2KGd3LT5sMmUubDIp ID4+IFBBR0VfU0hJRlQpOwogI2Vsc2UKICAgICAgICAgZ2ZuX3Qgc3RhcnQgPSBndWVzdF9sMmVf Z2V0X2dmbihndy0+bDJlKTsKICNlbmRpZgotICAgICAgICAvKiBHcmFudCBmdWxsIGFjY2VzcyBp biB0aGUgbDFlLCBzaW5jZSBhbGwgdGhlIGd1ZXN0IGVudHJ5J3MgCi0gICAgICAgICAqIGFjY2Vz cyBjb250cm9scyBhcmUgZW5mb3JjZWQgaW4gdGhlIHNoYWRvdyBsMmUuICovCisgICAgICAgIC8q CisgICAgICAgICAqIEdyYW50IGZ1bGwgYWNjZXNzIGluIHRoZSBsMWUsIHNpbmNlIGFsbCB0aGUg Z3Vlc3QgZW50cnkncworICAgICAgICAgKiBhY2Nlc3MgY29udHJvbHMgYXJlIGVuZm9yY2VkIGlu IHRoZSBzaGFkb3cgbDJlLgorICAgICAgICAgKi8KICAgICAgICAgaW50IGZsYWdzID0gKF9QQUdF X1BSRVNFTlR8X1BBR0VfVVNFUnxfUEFHRV9SV3wKICAgICAgICAgICAgICAgICAgICAgIF9QQUdF X0FDQ0VTU0VEfF9QQUdFX0RJUlRZKTsKLSAgICAgICAgLyogSW1wb3J0IGNhY2hlLWNvbnRyb2wg Yml0cy4gTm90ZSB0aGF0IF9QQUdFX1BBVCBpcyBhY3R1YWxseQorICAgICAgICAvKgorICAgICAg ICAgKiBJbXBvcnQgY2FjaGUtY29udHJvbCBiaXRzLiBOb3RlIHRoYXQgX1BBR0VfUEFUIGlzIGFj dHVhbGx5CiAgICAgICAgICAqIF9QQUdFX1BTRSwgYW5kIGl0IGlzIGFsd2F5cyBzZXQuIFdlIHdp bGwgY2xlYXIgaXQgaW4gY2FzZQotICAgICAgICAgKiBfUEFHRV9QU0VfUEFUIChiaXQgMTIsIGku ZS4gZmlyc3QgYml0IG9mIGdmbikgaXMgY2xlYXIuICovCisgICAgICAgICAqIF9QQUdFX1BTRV9Q QVQgKGJpdCAxMiwgaS5lLiBmaXJzdCBiaXQgb2YgZ2ZuKSBpcyBjbGVhci4KKyAgICAgICAgICov CiAgICAgICAgIGZsYWdzIHw9IChndWVzdF9sMmVfZ2V0X2ZsYWdzKGd3LT5sMmUpCiAgICAgICAg ICAgICAgICAgICAmIChfUEFHRV9QQVR8X1BBR0VfUFdUfF9QQUdFX1BDRCkpOwogICAgICAgICBp ZiAoICEoZ2ZuX3goc3RhcnQpICYgMSkgKQpAQCAtNDEzLDEwICs0MjUsMTIgQEAgZ3Vlc3Rfd2Fs a190YWJsZXMoc3RydWN0IHZjcHUgKnYsIHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAKICAgICB3 YWxrX29rID0gdHJ1ZTsKIAotICAgIC8qIEdvIGJhY2sgYW5kIHNldCBhY2Nlc3NlZCBhbmQgZGly dHkgYml0cyBvbmx5IGlmIHRoZSB3YWxrIHdhcyBhCisgICAgLyoKKyAgICAgKiBHbyBiYWNrIGFu ZCBzZXQgYWNjZXNzZWQgYW5kIGRpcnR5IGJpdHMgb25seSBpZiB0aGUgd2FsayB3YXMgYQogICAg ICAqIHN1Y2Nlc3MuICBBbHRob3VnaCB0aGUgUFJNcyBzYXkgaGlnaGVyLWxldmVsIF9QQUdFX0FD Q0VTU0VEIGJpdHMKICAgICAgKiBnZXQgc2V0IHdoZW5ldmVyIGEgbG93ZXItbGV2ZWwgUFQgaXMg dXNlZCwgYXQgbGVhc3Qgc29tZSBoYXJkd2FyZQotICAgICAqIHdhbGtlcnMgYmVoYXZlIHRoaXMg d2F5LiAqLworICAgICAqIHdhbGtlcnMgYmVoYXZlIHRoaXMgd2F5LgorICAgICAqLwogICAgIHN3 aXRjaCAoIGxlYWZfbGV2ZWwgKQogICAgIHsKICAgICBkZWZhdWx0OgpAQCAtNDQ4LDIwICs0NjIs MjAgQEAgZ3Vlc3Rfd2Fsa190YWJsZXMoc3RydWN0IHZjcHUgKnYsIHN0cnVjdCBwMm1fZG9tYWlu ICpwMm0sCiAKICBvdXQ6CiAjaWYgR1VFU1RfUEFHSU5HX0xFVkVMUyA9PSA0Ci0gICAgaWYgKCBs M3AgKSAKKyAgICBpZiAoIGwzcCApCiAgICAgewogICAgICAgICB1bm1hcF9kb21haW5fcGFnZShs M3ApOwogICAgICAgICBwdXRfcGFnZShtZm5fdG9fcGFnZShtZm5feChndy0+bDNtZm4pKSk7CiAg ICAgfQogI2VuZGlmCiAjaWYgR1VFU1RfUEFHSU5HX0xFVkVMUyA+PSAzCi0gICAgaWYgKCBsMnAg KSAKKyAgICBpZiAoIGwycCApCiAgICAgewogICAgICAgICB1bm1hcF9kb21haW5fcGFnZShsMnAp OwogICAgICAgICBwdXRfcGFnZShtZm5fdG9fcGFnZShtZm5feChndy0+bDJtZm4pKSk7CiAgICAg fQogI2VuZGlmCi0gICAgaWYgKCBsMXAgKSAKKyAgICBpZiAoIGwxcCApCiAgICAgewogICAgICAg ICB1bm1hcF9kb21haW5fcGFnZShsMXApOwogICAgICAgICBwdXRfcGFnZShtZm5fdG9fcGFnZSht Zm5feChndy0+bDFtZm4pKSk7CkBAIC00NjksMyArNDgzLDEzIEBAIGd1ZXN0X3dhbGtfdGFibGVz KHN0cnVjdCB2Y3B1ICp2LCBzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogCiAgICAgcmV0dXJuIHdh bGtfb2s7CiB9CisKKy8qCisgKiBMb2NhbCB2YXJpYWJsZXM6CisgKiBtb2RlOiBDCisgKiBjLWZp bGUtc3R5bGU6ICJCU0QiCisgKiBjLWJhc2ljLW9mZnNldDogNAorICogdGFiLXdpZHRoOiA0Cisg KiBpbmRlbnQtdGFicy1tb2RlOiBuaWwKKyAqIEVuZDoKKyAqLwotLSAKMi4xLjQKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGlu ZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4t ZGV2ZWwK