From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 2/2] x86/smp: Misc cleanup Date: Fri, 18 Aug 2017 11:27:27 +0100 Message-ID: <1503052047-14722-2-git-send-email-andrew.cooper3@citrix.com> References: <1503052047-14722-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: <1503052047-14722-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: Andrew Cooper , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org ICogRGVsZXRlIHRyYWlsaW5nIHdoaXRlc3BhY2UKICogU3dpdGNoIHRvIHVzaW5nIG1mbl90IGZv ciBtZm5fdG9fcGFnZSgpL3BhZ2VfdG9fbWZuKCkKClNpZ25lZC1vZmYtYnk6IEFuZHJldyBDb29w ZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+Ci0tLQpDQzogSmFuIEJldWxpY2ggPEpCZXVs aWNoQHN1c2UuY29tPgpDQzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4v YXJjaC94ODYvc21wYm9vdC5jIHwgMzIgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS94ZW4vYXJjaC94ODYvc21wYm9vdC5jIGIveGVuL2FyY2gveDg2L3NtcGJvb3QuYwpp bmRleCA4ZDkxZjZjLi40ZDQ1ZjQyIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvc21wYm9vdC5j CisrKyBiL3hlbi9hcmNoL3g4Ni9zbXBib290LmMKQEAgLTQsMTcgKzQsMTcgQEAKICAqIFRoaXMg aW5oZXJpdHMgYSBncmVhdCBkZWFsIGZyb20gTGludXgncyBTTVAgYm9vdCBjb2RlOgogICogIChj KSAxOTk1IEFsYW4gQ294LCBCdWlsZGluZyAjMyA8YWxhbkByZWRoYXQuY29tPgogICogIChjKSAx OTk4LCAxOTk5LCAyMDAwIEluZ28gTW9sbmFyIDxtaW5nb0ByZWRoYXQuY29tPgotICogCisgKgog ICogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0 IGFuZC9vciBtb2RpZnkKICAqIGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwg UHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5CiAgKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3Vu ZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvcgogICogKGF0IHlvdXIg b3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KLSAqIAorICoKICAqIFRoaXMgcHJvZ3JhbSBpcyBk aXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAogICogYnV0IFdJ VEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YK ICAqIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4g IFNlZSB0aGUKICAqIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMu Ci0gKiAKKyAqCiAgKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUg R2VuZXJhbCBQdWJsaWMgTGljZW5zZQogICogYWxvbmcgd2l0aCB0aGlzIHByb2dyYW07IElmIG5v dCwgc2VlIDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4KICAqLwpAQCAtNDYsNiArNDYs MTIgQEAKICNpbmNsdWRlIDxtYWNoX3dha2VjcHUuaD4KICNpbmNsdWRlIDxzbXBib290X2hvb2tz Lmg+CiAKKy8qIE92ZXJyaWRlIG1hY3JvcyBmcm9tIGFzbS9tbS5oIHRvIG1ha2UgdGhlbSB3b3Jr IHdpdGggbWZuX3QgKi8KKyN1bmRlZiBtZm5fdG9fcGFnZQorI2RlZmluZSBtZm5fdG9fcGFnZSht Zm4pIF9fbWZuX3RvX3BhZ2UobWZuX3gobWZuKSkKKyN1bmRlZiBwYWdlX3RvX21mbgorI2RlZmlu ZSBwYWdlX3RvX21mbihwZykgX21mbihfX3BhZ2VfdG9fbWZuKHBnKSkKKwogI2RlZmluZSBzZXR1 cF90cmFtcG9saW5lKCkgICAgKGJvb3RzeW1fcGh5cyh0cmFtcG9saW5lX3JlYWxtb2RlX2VudHJ5 KSkKIAogdW5zaWduZWQgbG9uZyBfX3JlYWRfbW9zdGx5IHRyYW1wb2xpbmVfcGh5czsKQEAgLTMw NywxNCArMzEzLDE0IEBAIHZvaWQgc3RhcnRfc2Vjb25kYXJ5KHZvaWQgKnVudXNlZCkKICAgICAg KiBKdXN0IGFzIGR1cmluZyBlYXJseSBib290c3RyYXAsIGl0IGlzIGNvbnZlbmllbnQgaGVyZSB0 byBkaXNhYmxlCiAgICAgICogc3BpbmxvY2sgY2hlY2tpbmcgd2hpbGUgd2UgaGF2ZSBJUlFzIGRp c2FibGVkLiBUaGlzIGFsbG93cyB1cyB0bwogICAgICAqIGFjcXVpcmUgSVJRLXVuc2FmZSBsb2Nr cyB3aGVuIGl0IHdvdWxkIG90aGVyd2lzZSBiZSBkaXNhbGxvd2VkLgotICAgICAqIAorICAgICAq CiAgICAgICogSXQgaXMgc2FmZSBiZWNhdXNlIHRoZSByYWNlIHdlIGFyZSB1c3VhbGx5IHRyeWlu ZyB0byBhdm9pZCBpbnZvbHZlcwogICAgICAqIGEgZ3JvdXAgb2YgQ1BVcyByZW5kZXp2b3VzaW5n IGluIGFuIElQSSBoYW5kbGVyLCB3aGVyZSBvbmUgY2Fubm90CiAgICAgICogam9pbiBiZWNhdXNl IGl0IGlzIHNwaW5uaW5nIHdpdGggSVJRcyBkaXNhYmxlZCB3YWl0aW5nIHRvIGFjcXVpcmUgYQog ICAgICAqIGxvY2sgaGVsZCBieSBhbm90aGVyIGluIHRoZSByZW5kZXp2b3VzIGdyb3VwICh0aGUg bG9jayBtdXN0IGJlIGFuCiAgICAgICogSVJRLXVuc2FmZSBsb2NrIHNpbmNlIHRoZSBDUFUgdG9v ayB0aGUgSVBJIGFmdGVyIGFjcXVpcmluZyBpdCwgYW5kCiAgICAgICogaGVuY2UgaGFkIElSUXMg ZW5hYmxlZCkuIFRoaXMgaXMgYSBkZWFkbG9jayBzY2VuYXJpby4KLSAgICAgKiAKKyAgICAgKgog ICAgICAqIEhvd2V2ZXIsIG5vIENQVSBjYW4gYmUgaW52b2x2ZWQgaW4gcmVuZGV6dm91cyB1bnRp bCBpdCBpcyBvbmxpbmUsCiAgICAgICogaGVuY2Ugbm8gc3VjaCBncm91cCBjYW4gYmUgd2FpdGlu ZyBmb3IgdGhpcyBDUFUgdW50aWwgaXQgaXMKICAgICAgKiB2aXNpYmxlIGluIGNwdV9vbmxpbmVf bWFwLiBIZW5jZSBzdWNoIGEgZGVhZGxvY2sgaXMgbm90IHBvc3NpYmxlLgpAQCAtNDIzLDggKzQy OSw4IEBAIHN0YXRpYyBpbnQgd2FrZXVwX3NlY29uZGFyeV9jcHUoaW50IHBoeXNfYXBpY2lkLCB1 bnNpZ25lZCBsb25nIHN0YXJ0X2VpcCkKICAgICBlbHNlIGlmICggdGJvb3RfaW5fbWVhc3VyZWRf ZW52KCkgKQogICAgIHsKICAgICAgICAgLyoKLSAgICAgICAgICogV2l0aCB0Ym9vdCBBUCBpcyBh Y3R1YWxseSBzcGlubmluZyBpbiBhIG1pbmktZ3Vlc3QgYmVmb3JlIAotICAgICAgICAgKiByZWNl aXZpbmcgSU5JVC4gVXBvbiByZWNlaXZpbmcgSU5JVCBpcGksIEFQIG5lZWQgdGltZSB0byBWTUV4 aXQsIAorICAgICAgICAgKiBXaXRoIHRib290IEFQIGlzIGFjdHVhbGx5IHNwaW5uaW5nIGluIGEg bWluaS1ndWVzdCBiZWZvcmUKKyAgICAgICAgICogcmVjZWl2aW5nIElOSVQuIFVwb24gcmVjZWl2 aW5nIElOSVQgaXBpLCBBUCBuZWVkIHRpbWUgdG8gVk1FeGl0LAogICAgICAgICAgKiB1cGRhdGUg Vk1DUyB0byB0cmFja2luZyBTSVBJcyBhbmQgVk1SZXN1bWUuCiAgICAgICAgICAqCiAgICAgICAg ICAqIFdoaWxlIEFQIGlzIGluIHJvb3QgbW9kZSBoYW5kbGluZyB0aGUgSU5JVCB0aGUgQ1BVIHdp bGwgZHJvcApAQCAtNTk2LDcgKzYwMiw3IEBAIHVuc2lnbmVkIGxvbmcgYWxsb2Nfc3R1Yl9wYWdl KHVuc2lnbmVkIGludCBjcHUsIHVuc2lnbmVkIGxvbmcgKm1mbikKICAgICBCVUlMRF9CVUdfT04o U1RVQlNfUEVSX1BBR0UgJiAoU1RVQlNfUEVSX1BBR0UgLSAxKSk7CiAKICAgICBpZiAoICptZm4g KQotICAgICAgICBwZyA9IG1mbl90b19wYWdlKCptZm4pOworICAgICAgICBwZyA9IG1mbl90b19w YWdlKF9tZm4oKm1mbikpOwogICAgIGVsc2UKICAgICB7CiAgICAgICAgIG5vZGVpZF90IG5vZGUg PSBjcHVfdG9fbm9kZShjcHUpOwpAQCAtNjEwLDcgKzYxNiw3IEBAIHVuc2lnbmVkIGxvbmcgYWxs b2Nfc3R1Yl9wYWdlKHVuc2lnbmVkIGludCBjcHUsIHVuc2lnbmVkIGxvbmcgKm1mbikKICAgICB9 CiAKICAgICBzdHViX3ZhID0gWEVOX1ZJUlRfRU5EIC0gKGNwdSArIDEpICogUEFHRV9TSVpFOwot ICAgIGlmICggbWFwX3BhZ2VzX3RvX3hlbihzdHViX3ZhLCBwYWdlX3RvX21mbihwZyksIDEsCisg ICAgaWYgKCBtYXBfcGFnZXNfdG9feGVuKHN0dWJfdmEsIG1mbl94KHBhZ2VfdG9fbWZuKHBnKSks IDEsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIFBBR0VfSFlQRVJWSVNPUl9SWCB8IE1BUF9T TUFMTF9QQUdFUykgKQogICAgIHsKICAgICAgICAgaWYgKCAhKm1mbiApCkBAIC02MTgsNyArNjI0 LDcgQEAgdW5zaWduZWQgbG9uZyBhbGxvY19zdHViX3BhZ2UodW5zaWduZWQgaW50IGNwdSwgdW5z aWduZWQgbG9uZyAqbWZuKQogICAgICAgICBzdHViX3ZhID0gMDsKICAgICB9CiAgICAgZWxzZSBp ZiAoICEqbWZuICkKLSAgICAgICAgKm1mbiA9IHBhZ2VfdG9fbWZuKHBnKTsKKyAgICAgICAgKm1m biA9IG1mbl94KHBhZ2VfdG9fbWZuKHBnKSk7CiAKICAgICByZXR1cm4gc3R1Yl92YTsKIH0KQEAg LTY1Miw4ICs2NTgsOCBAQCBzdGF0aWMgdm9pZCBjcHVfc21wYm9vdF9mcmVlKHVuc2lnbmVkIGlu dCBjcHUpCiAKICAgICBpZiAoIHBlcl9jcHUoc3R1YnMuYWRkciwgY3B1KSApCiAgICAgewotICAg ICAgICB1bnNpZ25lZCBsb25nIG1mbiA9IHBlcl9jcHUoc3R1YnMubWZuLCBjcHUpOwotICAgICAg ICB1bnNpZ25lZCBjaGFyICpzdHViX3BhZ2UgPSBtYXBfZG9tYWluX3BhZ2UoX21mbihtZm4pKTsK KyAgICAgICAgbWZuX3QgbWZuID0gX21mbihwZXJfY3B1KHN0dWJzLm1mbiwgY3B1KSk7CisgICAg ICAgIHVuc2lnbmVkIGNoYXIgKnN0dWJfcGFnZSA9IG1hcF9kb21haW5fcGFnZShtZm4pOwogICAg ICAgICB1bnNpZ25lZCBpbnQgaTsKIAogICAgICAgICBtZW1zZXQoc3R1Yl9wYWdlICsgU1RVQl9C VUZfQ1BVX09GRlMoY3B1KSwgMHhjYywgU1RVQl9CVUZfU0laRSk7CkBAIC04NzEsNyArODc3LDcg QEAgcmVtb3ZlX3NpYmxpbmdpbmZvKGludCBjcHUpCiAgICAgICAgIGlmICggY3B1bWFza193ZWln aHQocGVyX2NwdShjcHVfc2libGluZ19tYXNrLCBjcHUpKSA9PSAxICkKICAgICAgICAgICAgIGNw dV9kYXRhW3NpYmxpbmddLmJvb3RlZF9jb3Jlcy0tOwogICAgIH0KLSAgIAorCiAgICAgZm9yX2Vh Y2hfY3B1KHNpYmxpbmcsIHBlcl9jcHUoY3B1X3NpYmxpbmdfbWFzaywgY3B1KSkKICAgICAgICAg Y3B1bWFza19jbGVhcl9jcHUoY3B1LCBwZXJfY3B1KGNwdV9zaWJsaW5nX21hc2ssIHNpYmxpbmcp KTsKICAgICBjcHVtYXNrX2NsZWFyKHBlcl9jcHUoY3B1X3NpYmxpbmdfbWFzaywgY3B1KSk7Ci0t IAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Clhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9s aXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=