From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v5 04/13] x86: move compat_set_trap_table along side the non-compat variant Date: Mon, 26 Jun 2017 17:28:33 +0100 Message-ID: <20170626162842.482-5-wei.liu2@citrix.com> References: <20170626162842.482-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.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPWt1-00059F-AT for xen-devel@lists.xenproject.org; Mon, 26 Jun 2017 16:29:15 +0000 In-Reply-To: <20170626162842.482-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 U2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJj aC94ODYvcHYvY2FsbGJhY2suYyAgICAgICAgIHwgNDcgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIHhlbi9hcmNoL3g4Ni94ODZfNjQvY29tcGF0L3RyYXBzLmMgfCA0NCAt LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0NyBp bnNlcnRpb25zKCspLCA0NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYv cHYvY2FsbGJhY2suYyBiL3hlbi9hcmNoL3g4Ni9wdi9jYWxsYmFjay5jCmluZGV4IDBkNzY0MWRm NDMuLmI5ZGQzOWJmMGUgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9wdi9jYWxsYmFjay5jCisr KyBiL3hlbi9hcmNoL3g4Ni9wdi9jYWxsYmFjay5jCkBAIC0xNyw2ICsxNyw3IEBACiAgKi8KIAog I2luY2x1ZGUgPHhlbi9ldmVudC5oPgorI2luY2x1ZGUgPHhlbi9oeXBlcmNhbGwuaD4KICNpbmNs dWRlIDx4ZW4vZ3Vlc3RfYWNjZXNzLmg+CiAjaW5jbHVkZSA8eGVuL2xpYi5oPgogI2luY2x1ZGUg PHhlbi9zY2hlZC5oPgpAQCAtMzY0LDYgKzM2NSw1MiBAQCBsb25nIGRvX3NldF90cmFwX3RhYmxl KFhFTl9HVUVTVF9IQU5ETEVfUEFSQU0oY29uc3RfdHJhcF9pbmZvX3QpIHRyYXBzKQogICAgIHJl dHVybiByYzsKIH0KIAoraW50IGNvbXBhdF9zZXRfdHJhcF90YWJsZShYRU5fR1VFU1RfSEFORExF KHRyYXBfaW5mb19jb21wYXRfdCkgdHJhcHMpCit7CisgICAgc3RydWN0IHZjcHUgKmN1cnIgPSBj dXJyZW50OworICAgIHN0cnVjdCBjb21wYXRfdHJhcF9pbmZvIGN1cjsKKyAgICBzdHJ1Y3QgdHJh cF9pbmZvICpkc3QgPSBjdXJyLT5hcmNoLnB2X3ZjcHUudHJhcF9jdHh0OworICAgIGxvbmcgcmMg PSAwOworCisgICAgLyogSWYgbm8gdGFibGUgaXMgcHJlc2VudGVkIHRoZW4gY2xlYXIgdGhlIGVu dGlyZSB2aXJ0dWFsIElEVC4gKi8KKyAgICBpZiAoIGd1ZXN0X2hhbmRsZV9pc19udWxsKHRyYXBz KSApCisgICAgeworICAgICAgICBtZW1zZXQoZHN0LCAwLCBOUl9WRUNUT1JTICogc2l6ZW9mKCpk c3QpKTsKKyAgICAgICAgaW5pdF9pbnQ4MF9kaXJlY3RfdHJhcChjdXJyKTsKKyAgICAgICAgcmV0 dXJuIDA7CisgICAgfQorCisgICAgZm9yICggOyA7ICkKKyAgICB7CisgICAgICAgIGlmICggY29w eV9mcm9tX2d1ZXN0KCZjdXIsIHRyYXBzLCAxKSApCisgICAgICAgIHsKKyAgICAgICAgICAgIHJj ID0gLUVGQVVMVDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisKKyAgICAgICAgaWYg KCBjdXIuYWRkcmVzcyA9PSAwICkKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGZpeHVw X2d1ZXN0X2NvZGVfc2VsZWN0b3IoY3Vyci0+ZG9tYWluLCBjdXIuY3MpOworCisgICAgICAgIFhM QVRfdHJhcF9pbmZvKGRzdCArIGN1ci52ZWN0b3IsICZjdXIpOworCisgICAgICAgIGlmICggY3Vy LnZlY3RvciA9PSAweDgwICkKKyAgICAgICAgICAgIGluaXRfaW50ODBfZGlyZWN0X3RyYXAoY3Vy cik7CisKKyAgICAgICAgZ3Vlc3RfaGFuZGxlX2FkZF9vZmZzZXQodHJhcHMsIDEpOworCisgICAg ICAgIGlmICggaHlwZXJjYWxsX3ByZWVtcHRfY2hlY2soKSApCisgICAgICAgIHsKKyAgICAgICAg ICAgIHJjID0gaHlwZXJjYWxsX2NyZWF0ZV9jb250aW51YXRpb24oCisgICAgICAgICAgICAgICAg X19IWVBFUlZJU09SX3NldF90cmFwX3RhYmxlLCAiaCIsIHRyYXBzKTsKKyAgICAgICAgICAgIGJy ZWFrOworICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIHJjOworfQorCiAvKgogICogTG9j YWwgdmFyaWFibGVzOgogICogbW9kZTogQwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L3g4Nl82 NC9jb21wYXQvdHJhcHMuYyBiL3hlbi9hcmNoL3g4Ni94ODZfNjQvY29tcGF0L3RyYXBzLmMKaW5k ZXggOWUxY2NiYTY0Ni4uY2FkZTdmMjkyMyAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L3g4Nl82 NC9jb21wYXQvdHJhcHMuYworKysgYi94ZW4vYXJjaC94ODYveDg2XzY0L2NvbXBhdC90cmFwcy5j CkBAIC0zLDUwICszLDYgQEAKICNpbmNsdWRlIDxjb21wYXQvY2FsbGJhY2suaD4KICNpbmNsdWRl IDxjb21wYXQvYXJjaC14ODZfMzIuaD4KIAotaW50IGNvbXBhdF9zZXRfdHJhcF90YWJsZShYRU5f R1VFU1RfSEFORExFKHRyYXBfaW5mb19jb21wYXRfdCkgdHJhcHMpCi17Ci0gICAgc3RydWN0IGNv bXBhdF90cmFwX2luZm8gY3VyOwotICAgIHN0cnVjdCB0cmFwX2luZm8gKmRzdCA9IGN1cnJlbnQt PmFyY2gucHZfdmNwdS50cmFwX2N0eHQ7Ci0gICAgbG9uZyByYyA9IDA7Ci0KLSAgICAvKiBJZiBu byB0YWJsZSBpcyBwcmVzZW50ZWQgdGhlbiBjbGVhciB0aGUgZW50aXJlIHZpcnR1YWwgSURULiAq LwotICAgIGlmICggZ3Vlc3RfaGFuZGxlX2lzX251bGwodHJhcHMpICkKLSAgICB7Ci0gICAgICAg IG1lbXNldChkc3QsIDAsIE5SX1ZFQ1RPUlMgKiBzaXplb2YoKmRzdCkpOwotICAgICAgICBpbml0 X2ludDgwX2RpcmVjdF90cmFwKGN1cnJlbnQpOwotICAgICAgICByZXR1cm4gMDsKLSAgICB9Ci0K LSAgICBmb3IgKCA7IDsgKQotICAgIHsKLSAgICAgICAgaWYgKCBjb3B5X2Zyb21fZ3Vlc3QoJmN1 ciwgdHJhcHMsIDEpICkKLSAgICAgICAgewotICAgICAgICAgICAgcmMgPSAtRUZBVUxUOwotICAg ICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoIGN1ci5hZGRyZXNzID09 IDAgKQotICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgZml4dXBfZ3Vlc3RfY29kZV9zZWxl Y3RvcihjdXJyZW50LT5kb21haW4sIGN1ci5jcyk7Ci0KLSAgICAgICAgWExBVF90cmFwX2luZm8o ZHN0ICsgY3VyLnZlY3RvciwgJmN1cik7Ci0KLSAgICAgICAgaWYgKCBjdXIudmVjdG9yID09IDB4 ODAgKQotICAgICAgICAgICAgaW5pdF9pbnQ4MF9kaXJlY3RfdHJhcChjdXJyZW50KTsKLQotICAg ICAgICBndWVzdF9oYW5kbGVfYWRkX29mZnNldCh0cmFwcywgMSk7Ci0KLSAgICAgICAgaWYgKCBo eXBlcmNhbGxfcHJlZW1wdF9jaGVjaygpICkKLSAgICAgICAgewotICAgICAgICAgICAgcmMgPSBo eXBlcmNhbGxfY3JlYXRlX2NvbnRpbnVhdGlvbigKLSAgICAgICAgICAgICAgICBfX0hZUEVSVklT T1Jfc2V0X3RyYXBfdGFibGUsICJoIiwgdHJhcHMpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgIH0KLSAgICB9Ci0KLSAgICByZXR1cm4gcmM7Ci19CiAKIC8qCiAgKiBMb2NhbCB2YXJpYWJs ZXM6Ci0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0 dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK