From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v4 24/27] x86: move compat_show_guest_statck near its non-compat variant Date: Thu, 8 Jun 2017 18:12:00 +0100 Message-ID: <20170608171203.20416-25-wei.liu2@citrix.com> References: <20170608171203.20416-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 1dJ12w-0006B4-0x for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 17:16:34 +0000 In-Reply-To: <20170608171203.20416-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: Andrew Cooper , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org QW5kIG1ha2UgaXQgc3RhdGljLCByZW1vdmUgdGhlIGRlY2xhcmF0aW9uIGluIGhlYWRlci4KClNp Z25lZC1vZmYtYnk6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQogeGVuL2FyY2gv eDg2L3RyYXBzLmMgICAgICAgICAgICAgICB8IDY0ICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrCiB4ZW4vYXJjaC94ODYveDg2XzY0L2NvbXBhdC90cmFwcy5jIHwgNjMgLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogeGVuL2luY2x1ZGUvYXNtLXg4Ni9w cm9jZXNzb3IuaCAgICB8ICAzIC0tCiAzIGZpbGVzIGNoYW5nZWQsIDY0IGluc2VydGlvbnMoKyks IDY2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni90cmFwcy5jIGIveGVu L2FyY2gveDg2L3RyYXBzLmMKaW5kZXggMjg3NTAzY2Q1Ni4uMGNlZGQ1MTU5YiAxMDA2NDQKLS0t IGEveGVuL2FyY2gveDg2L3RyYXBzLmMKKysrIGIveGVuL2FyY2gveDg2L3RyYXBzLmMKQEAgLTE4 Niw2ICsxODYsNzAgQEAgc3RhdGljIHZvaWQgc2hvd19jb2RlKGNvbnN0IHN0cnVjdCBjcHVfdXNl cl9yZWdzICpyZWdzKQogICAgIHByaW50aygiXG4iKTsKIH0KIAorc3RhdGljIHZvaWQgY29tcGF0 X3Nob3dfZ3Vlc3Rfc3RhY2soc3RydWN0IHZjcHUgKnYsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb25zdCBzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncywKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBkZWJ1Z19zdGFja19saW5lcykKK3sKKyAg ICB1bnNpZ25lZCBpbnQgaSwgKnN0YWNrLCBhZGRyLCBtYXNrID0gU1RBQ0tfU0laRTsKKworICAg IHN0YWNrID0gKHVuc2lnbmVkIGludCAqKSh1bnNpZ25lZCBsb25nKXJlZ3MtPmVzcDsKKyAgICBw cmludGsoIkd1ZXN0IHN0YWNrIHRyYWNlIGZyb20gZXNwPSUwOGx4OlxuICIsICh1bnNpZ25lZCBs b25nKXN0YWNrKTsKKworICAgIGlmICggIV9fY29tcGF0X2FjY2Vzc19vayh2LT5kb21haW4sIHN0 YWNrLCBzaXplb2YoKnN0YWNrKSkgKQorICAgIHsKKyAgICAgICAgcHJpbnRrKCJHdWVzdC1pbmFj Y2Vzc2libGUgbWVtb3J5LlxuIik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAo IHYgIT0gY3VycmVudCApCisgICAgeworICAgICAgICBzdHJ1Y3QgdmNwdSAqdmNwdTsKKyAgICAg ICAgdW5zaWduZWQgbG9uZyBtZm47CisKKyAgICAgICAgQVNTRVJUKGd1ZXN0X2tlcm5lbF9tb2Rl KHYsIHJlZ3MpKTsKKyAgICAgICAgbWZuID0gcmVhZF9jcjMoKSA+PiBQQUdFX1NISUZUOworICAg ICAgICBmb3JfZWFjaF92Y3B1KCB2LT5kb21haW4sIHZjcHUgKQorICAgICAgICAgICAgaWYgKCBw YWdldGFibGVfZ2V0X3Bmbih2Y3B1LT5hcmNoLmd1ZXN0X3RhYmxlKSA9PSBtZm4gKQorICAgICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBpZiAoICF2Y3B1ICkKKyAgICAgICAgeworICAgICAg ICAgICAgc3RhY2sgPSBkb19wYWdlX3dhbGsodiwgKHVuc2lnbmVkIGxvbmcpc3RhY2spOworICAg ICAgICAgICAgaWYgKCAodW5zaWduZWQgbG9uZylzdGFjayA8IFBBR0VfU0laRSApCisgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgcHJpbnRrKCJJbmFjY2Vzc2libGUgZ3Vlc3QgbWVtb3J5 LlxuIik7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAg ICAgbWFzayA9IFBBR0VfU0laRTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGZvciAoIGkgPSAw OyBpIDwgZGVidWdfc3RhY2tfbGluZXMgKiA4OyBpKysgKQorICAgIHsKKyAgICAgICAgaWYgKCAo KChsb25nKXN0YWNrIC0gMSkgXiAoKGxvbmcpKHN0YWNrICsgMSkgLSAxKSkgJiBtYXNrICkKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBpZiAoIF9fZ2V0X3VzZXIoYWRkciwgc3RhY2spICkK KyAgICAgICAgeworICAgICAgICAgICAgaWYgKCBpICE9IDAgKQorICAgICAgICAgICAgICAgIHBy aW50aygiXG4gICAgIik7CisgICAgICAgICAgICBwcmludGsoIkZhdWx0IHdoaWxlIGFjY2Vzc2lu ZyBndWVzdCBtZW1vcnkuIik7CisgICAgICAgICAgICBpID0gMTsKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICB9CisgICAgICAgIGlmICggKGkgIT0gMCkgJiYgKChpICUgOCkgPT0gMCkgKQor ICAgICAgICAgICAgcHJpbnRrKCJcbiAiKTsKKyAgICAgICAgcHJpbnRrKCIgJTA4eCIsIGFkZHIp OworICAgICAgICBzdGFjaysrOworICAgIH0KKyAgICBpZiAoIG1hc2sgPT0gUEFHRV9TSVpFICkK KyAgICB7CisgICAgICAgIEJVSUxEX0JVR19PTihQQUdFX1NJWkUgPT0gU1RBQ0tfU0laRSk7Cisg ICAgICAgIHVubWFwX2RvbWFpbl9wYWdlKHN0YWNrKTsKKyAgICB9CisgICAgaWYgKCBpID09IDAg KQorICAgICAgICBwcmludGsoIlN0YWNrIGVtcHR5LiIpOworICAgIHByaW50aygiXG4iKTsKK30K Kwogc3RhdGljIHZvaWQgc2hvd19ndWVzdF9zdGFjayhzdHJ1Y3QgdmNwdSAqdiwgY29uc3Qgc3Ry dWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCiB7CiAgICAgaW50IGk7CmRpZmYgLS1naXQgYS94ZW4v YXJjaC94ODYveDg2XzY0L2NvbXBhdC90cmFwcy5jIGIveGVuL2FyY2gveDg2L3g4Nl82NC9jb21w YXQvdHJhcHMuYwppbmRleCA2ZTE0NmE2MmE3Li4xOGNkMmMwMTdjIDEwMDY0NAotLS0gYS94ZW4v YXJjaC94ODYveDg2XzY0L2NvbXBhdC90cmFwcy5jCisrKyBiL3hlbi9hcmNoL3g4Ni94ODZfNjQv Y29tcGF0L3RyYXBzLmMKQEAgLTMsNjkgKzMsNiBAQAogI2luY2x1ZGUgPGNvbXBhdC9jYWxsYmFj ay5oPgogI2luY2x1ZGUgPGNvbXBhdC9hcmNoLXg4Nl8zMi5oPgogCi12b2lkIGNvbXBhdF9zaG93 X2d1ZXN0X3N0YWNrKHN0cnVjdCB2Y3B1ICp2LCBjb25zdCBzdHJ1Y3QgY3B1X3VzZXJfcmVncyAq cmVncywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGRlYnVnX3N0YWNrX2xpbmVz KQotewotICAgIHVuc2lnbmVkIGludCBpLCAqc3RhY2ssIGFkZHIsIG1hc2sgPSBTVEFDS19TSVpF OwotCi0gICAgc3RhY2sgPSAodW5zaWduZWQgaW50ICopKHVuc2lnbmVkIGxvbmcpcmVncy0+ZXNw OwotICAgIHByaW50aygiR3Vlc3Qgc3RhY2sgdHJhY2UgZnJvbSBlc3A9JTA4bHg6XG4gIiwgKHVu c2lnbmVkIGxvbmcpc3RhY2spOwotCi0gICAgaWYgKCAhX19jb21wYXRfYWNjZXNzX29rKHYtPmRv bWFpbiwgc3RhY2ssIHNpemVvZigqc3RhY2spKSApCi0gICAgewotICAgICAgICBwcmludGsoIkd1 ZXN0LWluYWNjZXNzaWJsZSBtZW1vcnkuXG4iKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQot ICAgIGlmICggdiAhPSBjdXJyZW50ICkKLSAgICB7Ci0gICAgICAgIHN0cnVjdCB2Y3B1ICp2Y3B1 OwotICAgICAgICB1bnNpZ25lZCBsb25nIG1mbjsKLQotICAgICAgICBBU1NFUlQoZ3Vlc3Rfa2Vy bmVsX21vZGUodiwgcmVncykpOwotICAgICAgICBtZm4gPSByZWFkX2NyMygpID4+IFBBR0VfU0hJ RlQ7Ci0gICAgICAgIGZvcl9lYWNoX3ZjcHUoIHYtPmRvbWFpbiwgdmNwdSApCi0gICAgICAgICAg ICBpZiAoIHBhZ2V0YWJsZV9nZXRfcGZuKHZjcHUtPmFyY2guZ3Vlc3RfdGFibGUpID09IG1mbiAp Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGlmICggIXZjcHUgKQotICAgICAgICB7 Ci0gICAgICAgICAgICBzdGFjayA9IGRvX3BhZ2Vfd2Fsayh2LCAodW5zaWduZWQgbG9uZylzdGFj ayk7Ci0gICAgICAgICAgICBpZiAoICh1bnNpZ25lZCBsb25nKXN0YWNrIDwgUEFHRV9TSVpFICkK LSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBwcmludGsoIkluYWNjZXNzaWJsZSBndWVz dCBtZW1vcnkuXG4iKTsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0g ICAgICAgICAgICBtYXNrID0gUEFHRV9TSVpFOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgZm9y ICggaSA9IDA7IGkgPCBkZWJ1Z19zdGFja19saW5lcyAqIDg7IGkrKyApCi0gICAgewotICAgICAg ICBpZiAoICgoKGxvbmcpc3RhY2sgLSAxKSBeICgobG9uZykoc3RhY2sgKyAxKSAtIDEpKSAmIG1h c2sgKQotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGlmICggX19nZXRfdXNlcihhZGRyLCBz dGFjaykgKQotICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIGkgIT0gMCApCi0gICAgICAgICAg ICAgICAgcHJpbnRrKCJcbiAgICAiKTsKLSAgICAgICAgICAgIHByaW50aygiRmF1bHQgd2hpbGUg YWNjZXNzaW5nIGd1ZXN0IG1lbW9yeS4iKTsKLSAgICAgICAgICAgIGkgPSAxOwotICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKCAoaSAhPSAwKSAmJiAoKGkgJSA4KSA9 PSAwKSApCi0gICAgICAgICAgICBwcmludGsoIlxuICIpOwotICAgICAgICBwcmludGsoIiAlMDh4 IiwgYWRkcik7Ci0gICAgICAgIHN0YWNrKys7Ci0gICAgfQotICAgIGlmICggbWFzayA9PSBQQUdF X1NJWkUgKQotICAgIHsKLSAgICAgICAgQlVJTERfQlVHX09OKFBBR0VfU0laRSA9PSBTVEFDS19T SVpFKTsKLSAgICAgICAgdW5tYXBfZG9tYWluX3BhZ2Uoc3RhY2spOwotICAgIH0KLSAgICBpZiAo IGkgPT0gMCApCi0gICAgICAgIHByaW50aygiU3RhY2sgZW1wdHkuIik7Ci0gICAgcHJpbnRrKCJc biIpOwotfQotCiAvKgogICogTG9jYWwgdmFyaWFibGVzOgogICogbW9kZTogQwpkaWZmIC0tZ2l0 IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9wcm9jZXNzb3IuaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYv cHJvY2Vzc29yLmgKaW5kZXggNmEzMzVkM2E2MS4uNWJmNTZiNDVlMSAxMDA2NDQKLS0tIGEveGVu L2luY2x1ZGUvYXNtLXg4Ni9wcm9jZXNzb3IuaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L3By b2Nlc3Nvci5oCkBAIC00ODAsOSArNDgwLDYgQEAgdm9pZCBzaG93X2V4ZWN1dGlvbl9zdGF0ZShj b25zdCBzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncyk7CiB2b2lkIHNob3dfcGFnZV93YWxrKHVu c2lnbmVkIGxvbmcgYWRkcik7CiB2b2lkIG5vcmV0dXJuIGZhdGFsX3RyYXAoY29uc3Qgc3RydWN0 IGNwdV91c2VyX3JlZ3MgKnJlZ3MsIGJvb2xfdCBzaG93X3JlbW90ZSk7CiAKLXZvaWQgY29tcGF0 X3Nob3dfZ3Vlc3Rfc3RhY2soc3RydWN0IHZjcHUgKnYsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzLCBpbnQgbGluZXMpOwotCiBl eHRlcm4gdm9pZCBtdHJyX2FwX2luaXQodm9pZCk7CiBleHRlcm4gdm9pZCBtdHJyX2JwX2luaXQo dm9pZCk7CiAKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5v cmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=