From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH v2 for-4.9 2/2] x86/emul: Reorder the user segments in x86_segment to match SReg3 encoding Date: Tue, 25 Oct 2016 19:10:33 +0100 Message-ID: <1477419033-24412-2-git-send-email-andrew.cooper3@citrix.com> References: <1477419033-24412-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: <1477419033-24412-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 VGhpcyBhdm9pZHMgbmVlZGluZyBhIHRyYW5zbGF0aW9uIHRhYmxlIGJldHdlZW4gaGFyZHdhcmUg b3JkZXJpbmcgYW5kIFhlbidzCm9yZGVyaW5nLgoKVGhpcyBhbHNvIGZpeGVzIGEgYnVnIHdoZXJl YnkgYW4gZW5jb2RpbmcgdXNpbmcgUkVYLlIgd2Fzbid0IGlnbm9yZWQuCgpTaWduZWQtb2ZmLWJ5 OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0KQ0M6IEphbiBC ZXVsaWNoIDxKQmV1bGljaEBzdXNlLmNvbT4KCnYyOgogKiBNYXNrIG91dCBSRVguUiwgd2hpY2gg aXMgaWdub3JlZCBieSBoYXJkd2FyZS4KICogRXhwb3NlIHRoZSBCVUlMRF9CVUdfT04oKXMgdG8g dGhlIHRlc3QgaGFybmVzcywgYW5kIGZpeCBpdHMgYnVpbGQuCi0tLQogdG9vbHMvdGVzdHMveDg2 X2VtdWxhdG9yL3g4Nl9lbXVsYXRlLmMgfCAxMyArKysrKysrKysrKysrCiB4ZW4vYXJjaC94ODYv eDg2X2VtdWxhdGUveDg2X2VtdWxhdGUuYyB8IDM1ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni94ODZfZW11bGF0ZS94ODZfZW11bGF0ZS5oIHwgIDQgKyst LQogMyBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS90b29scy90ZXN0cy94ODZfZW11bGF0b3IveDg2X2VtdWxhdGUuYyBiL3Rvb2xz L3Rlc3RzL3g4Nl9lbXVsYXRvci94ODZfZW11bGF0ZS5jCmluZGV4IGFmOTBiNmUuLmM0NmI3ZmMg MTAwNjQ0Ci0tLSBhL3Rvb2xzL3Rlc3RzL3g4Nl9lbXVsYXRvci94ODZfZW11bGF0ZS5jCisrKyBi L3Rvb2xzL3Rlc3RzL3g4Nl9lbXVsYXRvci94ODZfZW11bGF0ZS5jCkBAIC0xOSw2ICsxOSwxNiBA QCB0eXBlZGVmIGJvb2wgYm9vbF90OwogI2RlZmluZSBBU1NFUlQgYXNzZXJ0CiAjZGVmaW5lIEFT U0VSVF9VTlJFQUNIQUJMRSgpIGFzc2VydCghX19MSU5FX18pCiAKKyNpZiBfX0dOVUNfXyA+IDQg fHwgKF9fR05VQ19fID09IDQgJiYgX19HTlVDX01JTk9SX18gPj0gNikKKy8qIEZvcmNlIGEgY29t cGlsYXRpb24gZXJyb3IgaWYgY29uZGl0aW9uIGlzIHRydWUgKi8KKyNkZWZpbmUgQlVJTERfQlVH X09OKGNvbmQpICh7IF9TdGF0aWNfYXNzZXJ0KCEoY29uZCksICIhKCIgI2NvbmQgIikiKTsgfSkK KyNkZWZpbmUgQlVJTERfQlVHX09OX1pFUk8oY29uZCkgXAorICAgIHNpemVvZihzdHJ1Y3QgeyBf U3RhdGljX2Fzc2VydCghKGNvbmQpLCAiISgiICNjb25kICIpIik7IH0pCisjZWxzZQorI2RlZmlu ZSBCVUlMRF9CVUdfT05fWkVSTyhjb25kKSBzaXplb2Yoc3RydWN0IHsgaW50Oi0hIShjb25kKTsg fSkKKyNkZWZpbmUgQlVJTERfQlVHX09OKGNvbmQpICgodm9pZClCVUlMRF9CVUdfT05fWkVSTyhj b25kKSkKKyNlbmRpZgorCiAjZGVmaW5lIE1BU0tfRVhUUih2LCBtKSAoKCh2KSAmIChtKSkgLyAo KG0pICYgLShtKSkpCiAjZGVmaW5lIE1BU0tfSU5TUih2LCBtKSAoKCh2KSAqICgobSkgJiAtKG0p KSkgJiAobSkpCiAKQEAgLTM3LDQgKzQ3LDcgQEAgdHlwZWRlZiBib29sIGJvb2xfdDsKICNkZWZp bmUgZ2V0X3N0dWIoc3RiKSAoKHZvaWQgKikoKHN0YikuYWRkciA9ICh1aW50cHRyX3QpKHN0Yiku YnVmKSkKICNkZWZpbmUgcHV0X3N0dWIoc3RiKQogCisjZGVmaW5lIF9faW5pdAorI2RlZmluZSBf X21heWJlX3VudXNlZCBfX2F0dHJpYnV0ZV9fKChfX3VudXNlZF9fKSkKKwogI2luY2x1ZGUgIng4 Nl9lbXVsYXRlL3g4Nl9lbXVsYXRlLmMiCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYveDg2X2Vt dWxhdGUveDg2X2VtdWxhdGUuYyBiL3hlbi9hcmNoL3g4Ni94ODZfZW11bGF0ZS94ODZfZW11bGF0 ZS5jCmluZGV4IGExODIxZDUuLjI5NTkwN2UgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni94ODZf ZW11bGF0ZS94ODZfZW11bGF0ZS5jCisrKyBiL3hlbi9hcmNoL3g4Ni94ODZfZW11bGF0ZS94ODZf ZW11bGF0ZS5jCkBAIC0xNTU3LDIyICsxNTU3LDYgQEAgZGVjb2RlX3JlZ2lzdGVyKAogICAgIHJl dHVybiBwOwogfQogCi0jZGVmaW5lIGRlY29kZV9zZWdtZW50X2ZhaWxlZCB4ODZfc2VnX3RyCi1z dGF0aWMgZW51bSB4ODZfc2VnbWVudAotZGVjb2RlX3NlZ21lbnQodWludDhfdCBtb2RybV9yZWcp Ci17Ci0gICAgc3dpdGNoICggbW9kcm1fcmVnICkKLSAgICB7Ci0gICAgY2FzZSAwOiByZXR1cm4g eDg2X3NlZ19lczsKLSAgICBjYXNlIDE6IHJldHVybiB4ODZfc2VnX2NzOwotICAgIGNhc2UgMjog cmV0dXJuIHg4Nl9zZWdfc3M7Ci0gICAgY2FzZSAzOiByZXR1cm4geDg2X3NlZ19kczsKLSAgICBj YXNlIDQ6IHJldHVybiB4ODZfc2VnX2ZzOwotICAgIGNhc2UgNTogcmV0dXJuIHg4Nl9zZWdfZ3M7 Ci0gICAgfQotICAgIHJldHVybiBkZWNvZGVfc2VnbWVudF9mYWlsZWQ7Ci19Ci0KIHN0YXRpYyBi b29sIGlzX2FsaWduZWQoZW51bSB4ODZfc2VnbWVudCBzZWcsIHVuc2lnbmVkIGxvbmcgb2ZmcywK ICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgaW50IHNpemUsIHN0cnVjdCB4ODZfZW11 bGF0ZV9jdHh0ICpjdHh0LAogICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBzdHJ1Y3QgeDg2 X2VtdWxhdGVfb3BzICpvcHMpCkBAIC0yOTgyLDggKzI5NjYsOCBAQCB4ODZfZW11bGF0ZSgKICAg ICAgICAgYnJlYWs7CiAKICAgICBjYXNlIDB4OGM6IC8qIG1vdiBTcmVnLHIvbSAqLwotICAgICAg ICBzZWcgPSBkZWNvZGVfc2VnbWVudChtb2RybV9yZWcpOwotICAgICAgICBnZW5lcmF0ZV9leGNl cHRpb25faWYoc2VnID09IGRlY29kZV9zZWdtZW50X2ZhaWxlZCwgRVhDX1VELCAtMSk7CisgICAg ICAgIHNlZyA9IG1vZHJtX3JlZyAmIDc7IC8qIFJFWC5SIGlzIGlnbm9yZWQuICovCisgICAgICAg IGdlbmVyYXRlX2V4Y2VwdGlvbl9pZighaXNfeDg2X3VzZXJfc2VnbWVudChzZWcpLCBFWENfVUQs IC0xKTsKICAgICBzdG9yZV9zZWxlY3RvcjoKICAgICAgICAgZmFpbF9pZihvcHMtPnJlYWRfc2Vn bWVudCA9PSBOVUxMKTsKICAgICAgICAgaWYgKCAocmMgPSBvcHMtPnJlYWRfc2VnbWVudChzZWcs ICZzcmVnLCBjdHh0KSkgIT0gMCApCkBAIC0yOTk0LDggKzI5NzgsOCBAQCB4ODZfZW11bGF0ZSgK ICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIDB4OGU6IC8qIG1vdiByL20sU3JlZyAqLwotICAg ICAgICBzZWcgPSBkZWNvZGVfc2VnbWVudChtb2RybV9yZWcpOwotICAgICAgICBnZW5lcmF0ZV9l eGNlcHRpb25faWYoc2VnID09IGRlY29kZV9zZWdtZW50X2ZhaWxlZCwgRVhDX1VELCAtMSk7Cisg ICAgICAgIHNlZyA9IG1vZHJtX3JlZyAmIDc7IC8qIFJFWC5SIGlzIGlnbm9yZWQuICovCisgICAg ICAgIGdlbmVyYXRlX2V4Y2VwdGlvbl9pZighaXNfeDg2X3VzZXJfc2VnbWVudChzZWcpLCBFWENf VUQsIC0xKTsKICAgICAgICAgZ2VuZXJhdGVfZXhjZXB0aW9uX2lmKHNlZyA9PSB4ODZfc2VnX2Nz LCBFWENfVUQsIC0xKTsKICAgICAgICAgaWYgKCAocmMgPSBsb2FkX3NlZyhzZWcsIHNyYy52YWws IDAsIE5VTEwsIGN0eHQsIG9wcykpICE9IDAgKQogICAgICAgICAgICAgZ290byBkb25lOwpAQCAt NTQzOCw2ICs1NDIyLDE3IEBAIHg4Nl9lbXVsYXRlKAogI3VuZGVmIG92ZXJyaWRlX3NlZwogI3Vu ZGVmIGVhCiAKK3N0YXRpYyB2b2lkIF9faW5pdCBfX21heWJlX3VudXNlZCBidWlsZF9hc3NlcnRp b25zKHZvaWQpCit7CisgICAgLyogQ2hlY2sgdGhlIHZhbHVlcyBhZ2FpbnN0IFNSZWczIGVuY29k aW5nIGluIG9wY29kZS9Nb2RSTSBieXRlcy4gKi8KKyAgICBCVUlMRF9CVUdfT04oeDg2X3NlZ19l cyAhPSAwKTsKKyAgICBCVUlMRF9CVUdfT04oeDg2X3NlZ19jcyAhPSAxKTsKKyAgICBCVUlMRF9C VUdfT04oeDg2X3NlZ19zcyAhPSAyKTsKKyAgICBCVUlMRF9CVUdfT04oeDg2X3NlZ19kcyAhPSAz KTsKKyAgICBCVUlMRF9CVUdfT04oeDg2X3NlZ19mcyAhPSA0KTsKKyAgICBCVUlMRF9CVUdfT04o eDg2X3NlZ19ncyAhPSA1KTsKK30KKwogI2lmZGVmIF9fWEVOX18KIAogI2luY2x1ZGUgPHhlbi9l cnIuaD4KZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni94ODZfZW11bGF0ZS94ODZfZW11bGF0ZS5o IGIveGVuL2FyY2gveDg2L3g4Nl9lbXVsYXRlL3g4Nl9lbXVsYXRlLmgKaW5kZXggMmIzOWI4MS4u NjM5MzU2YSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L3g4Nl9lbXVsYXRlL3g4Nl9lbXVsYXRl LmgKKysrIGIveGVuL2FyY2gveDg2L3g4Nl9lbXVsYXRlL3g4Nl9lbXVsYXRlLmgKQEAgLTI5LDEx ICsyOSwxMSBAQCBzdHJ1Y3QgeDg2X2VtdWxhdGVfY3R4dDsKIAogLyogQ29tcHJlaGVuc2l2ZSBl bnVtZXJhdGlvbiBvZiB4ODYgc2VnbWVudCByZWdpc3RlcnMuICovCiBlbnVtIHg4Nl9zZWdtZW50 IHsKLSAgICAvKiBHZW5lcmFsIHB1cnBvc2UuICovCisgICAgLyogR2VuZXJhbCBwdXJwb3NlLiAg TWF0Y2hlcyB0aGUgU1JlZzMgZW5jb2RpbmcgaW4gb3Bjb2RlL01vZFJNIGJ5dGVzLiAqLworICAg IHg4Nl9zZWdfZXMsCiAgICAgeDg2X3NlZ19jcywKICAgICB4ODZfc2VnX3NzLAogICAgIHg4Nl9z ZWdfZHMsCi0gICAgeDg2X3NlZ19lcywKICAgICB4ODZfc2VnX2ZzLAogICAgIHg4Nl9zZWdfZ3Ms CiAgICAgLyogU3lzdGVtLiAqLwotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK