From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v3 02/17] x86: do a revert of e871e80c38547d9faefc6604532ba3e985e65873 Date: Fri, 9 Feb 2018 15:01:36 +0100 Message-ID: <20180209140151.24714-3-jgross@suse.com> References: <20180209140151.24714-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ek9Fg-0003CJ-5i for xen-devel@lists.xenproject.org; Fri, 09 Feb 2018 14:02:08 +0000 In-Reply-To: <20180209140151.24714-1-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Juergen Gross , andrew.cooper3@citrix.com, dfaggioli@suse.com, jbeulich@suse.com List-Id: xen-devel@lists.xenproject.org UmV2ZXJ0ICJ4ODY6IGFsbG93IE1lbHRkb3duIGJhbmQtYWlkIHRvIGJlIGRpc2FibGVkIiBpbiBv cmRlciB0bwpwcmVwYXJlIGZvciBhIGZpbmFsIE1lbHRkb3duIG1pdGlnYXRpb24uCgpTaWduZWQt b2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+Ci0tLQogZG9jcy9taXNjL3hl bi1jb21tYW5kLWxpbmUubWFya2Rvd24gfCAxMiAtLS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni9k b21haW4uYyAgICAgICAgICAgICAgIHwgIDcgKystLS0tLQogeGVuL2FyY2gveDg2L21tLmMgICAg ICAgICAgICAgICAgICAgfCAxMiArLS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni9zbXBib290LmMg ICAgICAgICAgICAgIHwgMTcgKysrLS0tLS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni94ODZfNjQv ZW50cnkuUyAgICAgICAgIHwgIDIgLS0KIDUgZmlsZXMgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCsp LCA0NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kb2NzL21pc2MveGVuLWNvbW1hbmQtbGlu ZS5tYXJrZG93biBiL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCmluZGV4IDc5 ZmViYTZiY2QuLjZkZjM5ZGFlMGIgMTAwNjQ0Ci0tLSBhL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1s aW5lLm1hcmtkb3duCisrKyBiL2RvY3MvbWlzYy94ZW4tY29tbWFuZC1saW5lLm1hcmtkb3duCkBA IC0xOTI2LDE4ICsxOTI2LDYgQEAgSW4gdGhlIGNhc2UgdGhhdCB4MmFwaWMgaXMgaW4gdXNlLCB0 aGlzIG9wdGlvbiBzd2l0Y2hlcyBiZXR3ZWVuIHBoeXNpY2FsIGFuZAogY2x1c3RlcmVkIG1vZGUu ICBUaGUgZGVmYXVsdCwgZ2l2ZW4gbm8gaGludCBmcm9tIHRoZSAqKkZBRFQqKiwgaXMgY2x1c3Rl cgogbW9kZS4KIAotIyMjIHhwdGkKLT4gYD0gPGJvb2xlYW4+YAotCi0+IERlZmF1bHQ6IGBmYWxz ZWAgb24gQU1EIGhhcmR3YXJlCi0+IERlZmF1bHQ6IGB0cnVlYCBldmVyeXdoZXJlIGVsc2UKLQot T3ZlcnJpZGUgZGVmYXVsdCBzZWxlY3Rpb24gb2Ygd2hldGhlciB0byBpc29sYXRlIDY0LWJpdCBQ ViBndWVzdCBwYWdlCi10YWJsZXMuCi0KLSoqIFdBUk5JTkc6IE5vdCB5ZXQgYSBjb21wbGV0ZSBp c29sYXRpb24gaW1wbGVtZW50YXRpb24sIGJ1dCBiZXR0ZXIgdGhhbgotbm90aGluZy4gKioKLQog IyMjIHhzYXZlCiA+IGA9IDxib29sZWFuPmAKIApkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2Rv bWFpbi5jIGIveGVuL2FyY2gveDg2L2RvbWFpbi5jCmluZGV4IGY5MzMyN2IwYTIuLjc1MmUwZmFm ZWUgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9kb21haW4uYworKysgYi94ZW4vYXJjaC94ODYv ZG9tYWluLmMKQEAgLTE1MTgsMTMgKzE1MTgsMTAgQEAgdm9pZCBwYXJhdmlydF9jdHh0X3N3aXRj aF9mcm9tKHN0cnVjdCB2Y3B1ICp2KQogCiB2b2lkIHBhcmF2aXJ0X2N0eHRfc3dpdGNoX3RvKHN0 cnVjdCB2Y3B1ICp2KQogewotICAgIHJvb3RfcGdlbnRyeV90ICpyb290X3BndCA9IHRoaXNfY3B1 KHJvb3RfcGd0KTsKICAgICB1bnNpZ25lZCBsb25nIGNyNDsKIAotICAgIGlmICggcm9vdF9wZ3Qg KQotICAgICAgICByb290X3BndFtyb290X3RhYmxlX29mZnNldChQRVJET01BSU5fVklSVF9TVEFS VCldID0KLSAgICAgICAgICAgIGw0ZV9mcm9tX3BhZ2Uodi0+ZG9tYWluLT5hcmNoLnBlcmRvbWFp bl9sM19wZywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgX19QQUdFX0hZUEVSVklTT1JfUlcp OworICAgIHRoaXNfY3B1KHJvb3RfcGd0KVtyb290X3RhYmxlX29mZnNldChQRVJET01BSU5fVklS VF9TVEFSVCldID0KKyAgICAgICAgbDRlX2Zyb21fcGFnZSh2LT5kb21haW4tPmFyY2gucGVyZG9t YWluX2wzX3BnLCBfX1BBR0VfSFlQRVJWSVNPUl9SVyk7CiAKICAgICBjcjQgPSBwdl9ndWVzdF9j cjRfdG9fcmVhbF9jcjQodik7CiAgICAgaWYgKCB1bmxpa2VseShjcjQgIT0gcmVhZF9jcjQoKSkg KQpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tLmMgYi94ZW4vYXJjaC94ODYvbW0uYwppbmRl eCAzNWYyMDQzNjliLi5mYTBkYTdiMGZmIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0uYwor KysgYi94ZW4vYXJjaC94ODYvbW0uYwpAQCAtMzcwNiwxNyArMzcwNiw3IEBAIGxvbmcgZG9fbW11 X3VwZGF0ZSgKICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAg ICAgICByYyA9IG1vZF9sNF9lbnRyeSh2YSwgbDRlX2Zyb21faW50cHRlKHJlcS52YWwpLCBtZm4s CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNtZCA9PSBNTVVfUFRfVVBE QVRFX1BSRVNFUlZFX0FELCB2KTsKLSAgICAgICAgICAgICAgICAgICAgLyoKLSAgICAgICAgICAg ICAgICAgICAgICogTm8gbmVlZCB0byBzeW5jIGlmIGFsbCB1c2VzIG9mIHRoZSBwYWdlIGNhbiBi ZSBhY2NvdW50ZWQKLSAgICAgICAgICAgICAgICAgICAgICogdG8gdGhlIHBhZ2UgbG9jayB3ZSBo b2xkLCBpdHMgcGlubmVkIHN0YXR1cywgYW5kIHVzZXMgb24KLSAgICAgICAgICAgICAgICAgICAg ICogdGhpcyAodilDUFUuCi0gICAgICAgICAgICAgICAgICAgICAqLwotICAgICAgICAgICAgICAg ICAgICBpZiAoICFyYyAmJiB0aGlzX2NwdShyb290X3BndCkgJiYKLSAgICAgICAgICAgICAgICAg ICAgICAgICAoKHBhZ2UtPnUuaW51c2UudHlwZV9pbmZvICYgUEdUX2NvdW50X21hc2spID4KLSAg ICAgICAgICAgICAgICAgICAgICAgICAgKDEgKyAhIShwYWdlLT51LmludXNlLnR5cGVfaW5mbyAm IFBHVF9waW5uZWQpICsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIChwYWdldGFibGVfZ2V0 X3BmbihjdXJyLT5hcmNoLmd1ZXN0X3RhYmxlKSA9PSBtZm4pICsKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgIChwYWdldGFibGVfZ2V0X3BmbihjdXJyLT5hcmNoLmd1ZXN0X3RhYmxlX3VzZXIp ID09Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbWZuKSkpICkKKyAgICAgICAgICAgICAg ICAgICAgaWYgKCAhcmMgKQogICAgICAgICAgICAgICAgICAgICAgICAgc3luY19ndWVzdCA9IHRy dWU7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94 ODYvc21wYm9vdC5jIGIveGVuL2FyY2gveDg2L3NtcGJvb3QuYwppbmRleCAyZWJlZjAzMDI3Li40 OTk3OGIzNjk3IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvc21wYm9vdC5jCisrKyBiL3hlbi9h cmNoL3g4Ni9zbXBib290LmMKQEAgLTMzMSw3ICszMzEsNyBAQCB2b2lkIHN0YXJ0X3NlY29uZGFy eSh2b2lkICp1bnVzZWQpCiAgICAgc3Bpbl9kZWJ1Z19kaXNhYmxlKCk7CiAKICAgICBnZXRfY3B1 X2luZm8oKS0+eGVuX2NyMyA9IDA7Ci0gICAgZ2V0X2NwdV9pbmZvKCktPnB2X2NyMyA9IHRoaXNf Y3B1KHJvb3RfcGd0KSA/IF9fcGEodGhpc19jcHUocm9vdF9wZ3QpKSA6IDA7CisgICAgZ2V0X2Nw dV9pbmZvKCktPnB2X2NyMyA9IF9fcGEodGhpc19jcHUocm9vdF9wZ3QpKTsKIAogICAgIGxvYWRf c3lzdGVtX3RhYmxlcygpOwogCkBAIC03NDAsMjAgKzc0MCwxNCBAQCBzdGF0aWMgaW50IGNsb25l X21hcHBpbmcoY29uc3Qgdm9pZCAqcHRyLCByb290X3BnZW50cnlfdCAqcnB0KQogICAgIHJldHVy biAwOwogfQogCi1zdGF0aWMgX19yZWFkX21vc3RseSBpbnQ4X3Qgb3B0X3hwdGkgPSAtMTsKLWJv b2xlYW5fcGFyYW0oInhwdGkiLCBvcHRfeHB0aSk7CiBERUZJTkVfUEVSX0NQVShyb290X3BnZW50 cnlfdCAqLCByb290X3BndCk7CiAKIHN0YXRpYyBpbnQgc2V0dXBfY3B1X3Jvb3RfcGd0KHVuc2ln bmVkIGludCBjcHUpCiB7Ci0gICAgcm9vdF9wZ2VudHJ5X3QgKnJwdDsKKyAgICByb290X3BnZW50 cnlfdCAqcnB0ID0gYWxsb2NfeGVuX3BhZ2V0YWJsZSgpOwogICAgIHVuc2lnbmVkIGludCBvZmY7 CiAgICAgaW50IHJjOwogCi0gICAgaWYgKCAhb3B0X3hwdGkgKQotICAgICAgICByZXR1cm4gMDsK LQotICAgIHJwdCA9IGFsbG9jX3hlbl9wYWdldGFibGUoKTsKICAgICBpZiAoICFycHQgKQogICAg ICAgICByZXR1cm4gLUVOT01FTTsKIApAQCAtMTAwMiwxNCArOTk2LDEwIEBAIHZvaWQgX19pbml0 IHNtcF9wcmVwYXJlX2NwdXModW5zaWduZWQgaW50IG1heF9jcHVzKQogCiAgICAgc3RhY2tfYmFz ZVswXSA9IHN0YWNrX3N0YXJ0OwogCi0gICAgaWYgKCBvcHRfeHB0aSA8IDAgKQotICAgICAgICBv cHRfeHB0aSA9IGJvb3RfY3B1X2RhdGEueDg2X3ZlbmRvciAhPSBYODZfVkVORE9SX0FNRDsKLQog ICAgIHJjID0gc2V0dXBfY3B1X3Jvb3RfcGd0KDApOwogICAgIGlmICggcmMgKQogICAgICAgICBw YW5pYygiRXJyb3IgJWQgc2V0dGluZyB1cCBQViByb290IHBhZ2UgdGFibGVcbiIsIHJjKTsKLSAg ICBpZiAoIHBlcl9jcHUocm9vdF9wZ3QsIDApICkKLSAgICAgICAgZ2V0X2NwdV9pbmZvKCktPnB2 X2NyMyA9IF9fcGEocGVyX2NwdShyb290X3BndCwgMCkpOworICAgIGdldF9jcHVfaW5mbygpLT5w dl9jcjMgPSBfX3BhKHBlcl9jcHUocm9vdF9wZ3QsIDApKTsKIAogICAgIHNldF9ucl9zb2NrZXRz KCk7CiAKQEAgLTEwODEsNyArMTA3MSw2IEBAIHZvaWQgX19pbml0IHNtcF9wcmVwYXJlX2Jvb3Rf Y3B1KHZvaWQpCiAjZW5kaWYKIAogICAgIGdldF9jcHVfaW5mbygpLT54ZW5fY3IzID0gMDsKLSAg ICBnZXRfY3B1X2luZm8oKS0+cHZfY3IzID0gMDsKIH0KIAogc3RhdGljIHZvaWQKZGlmZiAtLWdp dCBhL3hlbi9hcmNoL3g4Ni94ODZfNjQvZW50cnkuUyBiL3hlbi9hcmNoL3g4Ni94ODZfNjQvZW50 cnkuUwppbmRleCA1OGY2NTJkMDEwLi41MmY2NGNjZWRhIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94 ODYveDg2XzY0L2VudHJ5LlMKKysrIGIveGVuL2FyY2gveDg2L3g4Nl82NC9lbnRyeS5TCkBAIC01 MCw3ICs1MCw2IEBAIHJlc3RvcmVfYWxsX2d1ZXN0OgogICAgICAgICBtb3ZhYnMgJERJUkVDVE1B UF9WSVJUX1NUQVJULCAlcmN4CiAgICAgICAgIG1vdiAgICVyZGksICVyYXgKICAgICAgICAgYW5k ICAgJXJzaSwgJXJkaQotICAgICAgICBqeiAgICAuTHJhZ19rZWVwX2NyMwogICAgICAgICBhbmQg ICAlcjksICVyc2kKICAgICAgICAgYWRkICAgJXJjeCwgJXJkaQogICAgICAgICBhZGQgICAlcmN4 LCAlcnNpCkBAIC02Nyw3ICs2Niw2IEBAIHJlc3RvcmVfYWxsX2d1ZXN0OgogICAgICAgICByZXAg bW92c3EKICAgICAgICAgbW92ICAgJXI5LCBTVEFDS19DUFVJTkZPX0ZJRUxEKHhlbl9jcjMpKCVy ZHgpCiAgICAgICAgIHdyaXRlX2NyMyByYXgsIHJkaSwgcnNpCi0uTHJhZ19rZWVwX2NyMzoKIAog ICAgICAgICAvKiBSZXN0b3JlIHN0YXNoZWQgU1BFQ19DVFJMIHZhbHVlLiAqLwogICAgICAgICBt b3YgICAlcjE1ZCwgJWVheAotLSAKMi4xMy42CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlz dHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xp c3RpbmZvL3hlbi1kZXZlbA==