From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v4 07/27] x86: move do_set_trap_table to pv/traps.c Date: Thu, 8 Jun 2017 18:11:43 +0100 Message-ID: <20170608171203.20416-8-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.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dJ0yg-0004qo-NL for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 17:12:10 +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 U2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJj aC94ODYvcHYvdHJhcHMuYyB8IDUyICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIHhlbi9hcmNoL3g4Ni90cmFwcy5jICAgIHwgNDkgLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA1MiBp bnNlcnRpb25zKCspLCA0OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYv cHYvdHJhcHMuYyBiL3hlbi9hcmNoL3g4Ni9wdi90cmFwcy5jCmluZGV4IDUxMTI1YThkODYuLjZl NjlmMmFkNTggMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9wdi90cmFwcy5jCisrKyBiL3hlbi9h cmNoL3g4Ni9wdi90cmFwcy5jCkBAIC0xOSw3ICsxOSwxMCBAQAogICogQ29weXJpZ2h0IChjKSAy MDE3IENpdHJpeCBTeXN0ZW1zIEx0ZC4KICAqLwogCisjaW5jbHVkZSA8eGVuL2V2ZW50Lmg+Cisj aW5jbHVkZSA8eGVuL2d1ZXN0X2FjY2Vzcy5oPgogI2luY2x1ZGUgPHhlbi9oeXBlcmNhbGwuaD4K KyNpbmNsdWRlIDx4ZW4vc2NoZWQuaD4KIAogI2luY2x1ZGUgPGFzbS9hcGljLmg+CiAKQEAgLTMx LDYgKzM0LDU1IEBAIHZvaWQgZG9fZW50cnlfaW50ODIoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJl Z3MpCiAgICAgcHZfaHlwZXJjYWxsKHJlZ3MpOwogfQogCitsb25nIGRvX3NldF90cmFwX3RhYmxl KFhFTl9HVUVTVF9IQU5ETEVfUEFSQU0oY29uc3RfdHJhcF9pbmZvX3QpIHRyYXBzKQoreworICAg IHN0cnVjdCB0cmFwX2luZm8gY3VyOworICAgIHN0cnVjdCB2Y3B1ICpjdXJyID0gY3VycmVudDsK KyAgICBzdHJ1Y3QgdHJhcF9pbmZvICpkc3QgPSBjdXJyLT5hcmNoLnB2X3ZjcHUudHJhcF9jdHh0 OworICAgIGxvbmcgcmMgPSAwOworCisgICAgLyogSWYgbm8gdGFibGUgaXMgcHJlc2VudGVkIHRo ZW4gY2xlYXIgdGhlIGVudGlyZSB2aXJ0dWFsIElEVC4gKi8KKyAgICBpZiAoIGd1ZXN0X2hhbmRs ZV9pc19udWxsKHRyYXBzKSApCisgICAgeworICAgICAgICBtZW1zZXQoZHN0LCAwLCBOUl9WRUNU T1JTICogc2l6ZW9mKCpkc3QpKTsKKyAgICAgICAgaW5pdF9pbnQ4MF9kaXJlY3RfdHJhcChjdXJy KTsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorCisgICAgZm9yICggOyA7ICkKKyAgICB7Cisg ICAgICAgIGlmICggY29weV9mcm9tX2d1ZXN0KCZjdXIsIHRyYXBzLCAxKSApCisgICAgICAgIHsK KyAgICAgICAgICAgIHJjID0gLUVGQVVMVDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9 CisKKyAgICAgICAgaWYgKCBjdXIuYWRkcmVzcyA9PSAwICkKKyAgICAgICAgICAgIGJyZWFrOwor CisgICAgICAgIGlmICggIWlzX2Nhbm9uaWNhbF9hZGRyZXNzKGN1ci5hZGRyZXNzKSApCisgICAg ICAgICAgICByZXR1cm4gLUVJTlZBTDsKKworICAgICAgICBmaXh1cF9ndWVzdF9jb2RlX3NlbGVj dG9yKGN1cnItPmRvbWFpbiwgY3VyLmNzKTsKKworICAgICAgICBtZW1jcHkoJmRzdFtjdXIudmVj dG9yXSwgJmN1ciwgc2l6ZW9mKGN1cikpOworCisgICAgICAgIGlmICggY3VyLnZlY3RvciA9PSAw eDgwICkKKyAgICAgICAgICAgIGluaXRfaW50ODBfZGlyZWN0X3RyYXAoY3Vycik7CisKKyAgICAg ICAgZ3Vlc3RfaGFuZGxlX2FkZF9vZmZzZXQodHJhcHMsIDEpOworCisgICAgICAgIGlmICggaHlw ZXJjYWxsX3ByZWVtcHRfY2hlY2soKSApCisgICAgICAgIHsKKyAgICAgICAgICAgIHJjID0gaHlw ZXJjYWxsX2NyZWF0ZV9jb250aW51YXRpb24oCisgICAgICAgICAgICAgICAgX19IWVBFUlZJU09S X3NldF90cmFwX3RhYmxlLCAiaCIsIHRyYXBzKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICB9CisgICAgfQorCisgICAgcmV0dXJuIHJjOworfQorCiAvKgogICogTG9jYWwgdmFyaWFibGVz OgogICogbW9kZTogQwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L3RyYXBzLmMgYi94ZW4vYXJj aC94ODYvdHJhcHMuYwppbmRleCBiNTY0MmIwZjlhLi40NDBhYWQxODJiIDEwMDY0NAotLS0gYS94 ZW4vYXJjaC94ODYvdHJhcHMuYworKysgYi94ZW4vYXJjaC94ODYvdHJhcHMuYwpAQCAtMjEyNiw1 NSArMjEyNiw2IEBAIGludCBzZW5kX2d1ZXN0X3RyYXAoc3RydWN0IGRvbWFpbiAqZCwgdWludDE2 X3QgdmNwdWlkLCB1bnNpZ25lZCBpbnQgdHJhcF9ucikKIH0KIAogCi1sb25nIGRvX3NldF90cmFw X3RhYmxlKFhFTl9HVUVTVF9IQU5ETEVfUEFSQU0oY29uc3RfdHJhcF9pbmZvX3QpIHRyYXBzKQot ewotICAgIHN0cnVjdCB0cmFwX2luZm8gY3VyOwotICAgIHN0cnVjdCB2Y3B1ICpjdXJyID0gY3Vy cmVudDsKLSAgICBzdHJ1Y3QgdHJhcF9pbmZvICpkc3QgPSBjdXJyLT5hcmNoLnB2X3ZjcHUudHJh cF9jdHh0OwotICAgIGxvbmcgcmMgPSAwOwotCi0gICAgLyogSWYgbm8gdGFibGUgaXMgcHJlc2Vu dGVkIHRoZW4gY2xlYXIgdGhlIGVudGlyZSB2aXJ0dWFsIElEVC4gKi8KLSAgICBpZiAoIGd1ZXN0 X2hhbmRsZV9pc19udWxsKHRyYXBzKSApCi0gICAgewotICAgICAgICBtZW1zZXQoZHN0LCAwLCBO Ul9WRUNUT1JTICogc2l6ZW9mKCpkc3QpKTsKLSAgICAgICAgaW5pdF9pbnQ4MF9kaXJlY3RfdHJh cChjdXJyKTsKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgfQotCi0gICAgZm9yICggOyA7ICkKLSAg ICB7Ci0gICAgICAgIGlmICggY29weV9mcm9tX2d1ZXN0KCZjdXIsIHRyYXBzLCAxKSApCi0gICAg ICAgIHsKLSAgICAgICAgICAgIHJjID0gLUVGQVVMVDsKLSAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICB9Ci0KLSAgICAgICAgaWYgKCBjdXIuYWRkcmVzcyA9PSAwICkKLSAgICAgICAgICAgIGJy ZWFrOwotCi0gICAgICAgIGlmICggIWlzX2Nhbm9uaWNhbF9hZGRyZXNzKGN1ci5hZGRyZXNzKSAp Ci0gICAgICAgICAgICByZXR1cm4gLUVJTlZBTDsKLQotICAgICAgICBmaXh1cF9ndWVzdF9jb2Rl X3NlbGVjdG9yKGN1cnItPmRvbWFpbiwgY3VyLmNzKTsKLQotICAgICAgICBtZW1jcHkoJmRzdFtj dXIudmVjdG9yXSwgJmN1ciwgc2l6ZW9mKGN1cikpOwotCi0gICAgICAgIGlmICggY3VyLnZlY3Rv ciA9PSAweDgwICkKLSAgICAgICAgICAgIGluaXRfaW50ODBfZGlyZWN0X3RyYXAoY3Vycik7Ci0K LSAgICAgICAgZ3Vlc3RfaGFuZGxlX2FkZF9vZmZzZXQodHJhcHMsIDEpOwotCi0gICAgICAgIGlm ICggaHlwZXJjYWxsX3ByZWVtcHRfY2hlY2soKSApCi0gICAgICAgIHsKLSAgICAgICAgICAgIHJj ID0gaHlwZXJjYWxsX2NyZWF0ZV9jb250aW51YXRpb24oCi0gICAgICAgICAgICAgICAgX19IWVBF UlZJU09SX3NldF90cmFwX3RhYmxlLCAiaCIsIHRyYXBzKTsKLSAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICB9Ci0gICAgfQotCi0gICAgcmV0dXJuIHJjOwotfQotCiB2b2lkIGFjdGl2YXRlX2Rl YnVncmVncyhjb25zdCBzdHJ1Y3QgdmNwdSAqY3VycikKIHsKICAgICBBU1NFUlQoY3VyciA9PSBj dXJyZW50KTsKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5v cmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=