From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v2 for-next v2 6/8] x86/mm: move two PV hypercalls from x86_64/mm.c to pv/mm.c Date: Mon, 3 Apr 2017 12:22:44 +0100 Message-ID: <20170403112246.6975-7-wei.liu2@citrix.com> References: <20170403112246.6975-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 1cv04T-00022u-BA for xen-devel@lists.xenproject.org; Mon, 03 Apr 2017 11:22:53 +0000 In-Reply-To: <20170403112246.6975-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: George Dunlap , Andrew Cooper , Tim Deegan , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org Tm8gZnVuY3Rpb25hbCBjaGFuZ2UuCgpTaWduZWQtb2ZmLWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBj aXRyaXguY29tPgotLS0KIHhlbi9hcmNoL3g4Ni9wdi9tbS5jICAgICB8IDY4ICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIHhlbi9hcmNoL3g4Ni94ODZfNjQv bW0uYyB8IDcwIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMiBmaWxlcyBjaGFuZ2VkLCA2OCBpbnNlcnRpb25zKCspLCA3MCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvcHYvbW0uYyBiL3hlbi9hcmNoL3g4Ni9wdi9tbS5jCmlu ZGV4IGI1Mjc3YjVkMjguLjQ4ZDNmZTE4NGIgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9wdi9t bS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9wdi9tbS5jCkBAIC00MTA2LDYgKzQxMDYsNzQgQEAgaW50 IG1taW9fcm9fZG9fcGFnZV9mYXVsdChzdHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgbG9uZyBhZGRy LAogICAgIHJldHVybiAwOwogfQogCitsb25nIGRvX3N0YWNrX3N3aXRjaCh1bnNpZ25lZCBsb25n IHNzLCB1bnNpZ25lZCBsb25nIGVzcCkKK3sKKyAgICBmaXh1cF9ndWVzdF9zdGFja19zZWxlY3Rv cihjdXJyZW50LT5kb21haW4sIHNzKTsKKyAgICBjdXJyZW50LT5hcmNoLnB2X3ZjcHUua2VybmVs X3NzID0gc3M7CisgICAgY3VycmVudC0+YXJjaC5wdl92Y3B1Lmtlcm5lbF9zcCA9IGVzcDsKKyAg ICByZXR1cm4gMDsKK30KKworbG9uZyBkb19zZXRfc2VnbWVudF9iYXNlKHVuc2lnbmVkIGludCB3 aGljaCwgdW5zaWduZWQgbG9uZyBiYXNlKQoreworICAgIHN0cnVjdCB2Y3B1ICp2ID0gY3VycmVu dDsKKyAgICBsb25nIHJldCA9IDA7CisKKyAgICBpZiAoIGlzX3B2XzMyYml0X3ZjcHUodikgKQor ICAgICAgICByZXR1cm4gLUVOT1NZUzsgLyogeDg2LzY0IG9ubHkuICovCisKKyAgICBzd2l0Y2gg KCB3aGljaCApCisgICAgeworICAgIGNhc2UgU0VHQkFTRV9GUzoKKyAgICAgICAgaWYgKCBpc19j YW5vbmljYWxfYWRkcmVzcyhiYXNlKSApCisgICAgICAgIHsKKyAgICAgICAgICAgIHdyZnNiYXNl KGJhc2UpOworICAgICAgICAgICAgdi0+YXJjaC5wdl92Y3B1LmZzX2Jhc2UgPSBiYXNlOworICAg ICAgICB9CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHJldCA9IC1FSU5WQUw7CisgICAgICAg IGJyZWFrOworCisgICAgY2FzZSBTRUdCQVNFX0dTX1VTRVI6CisgICAgICAgIGlmICggaXNfY2Fu b25pY2FsX2FkZHJlc3MoYmFzZSkgKQorICAgICAgICB7CisgICAgICAgICAgICB3cm1zcmwoTVNS X1NIQURPV19HU19CQVNFLCBiYXNlKTsKKyAgICAgICAgICAgIHYtPmFyY2gucHZfdmNwdS5nc19i YXNlX3VzZXIgPSBiYXNlOworICAgICAgICB9CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHJl dCA9IC1FSU5WQUw7CisgICAgICAgIGJyZWFrOworCisgICAgY2FzZSBTRUdCQVNFX0dTX0tFUk5F TDoKKyAgICAgICAgaWYgKCBpc19jYW5vbmljYWxfYWRkcmVzcyhiYXNlKSApCisgICAgICAgIHsK KyAgICAgICAgICAgIHdyZ3NiYXNlKGJhc2UpOworICAgICAgICAgICAgdi0+YXJjaC5wdl92Y3B1 LmdzX2Jhc2Vfa2VybmVsID0gYmFzZTsKKyAgICAgICAgfQorICAgICAgICBlbHNlCisgICAgICAg ICAgICByZXQgPSAtRUlOVkFMOworICAgICAgICBicmVhazsKKworICAgIGNhc2UgU0VHQkFTRV9H U19VU0VSX1NFTDoKKyAgICAgICAgX19hc21fXyBfX3ZvbGF0aWxlX18gKAorICAgICAgICAgICAg IiAgICAgc3dhcGdzICAgICAgICAgICAgICBcbiIKKyAgICAgICAgICAgICIxOiAgIG1vdmwgJWsw LCUlZ3MgICAgICAgXG4iCisgICAgICAgICAgICAiICAgICJzYWZlX3N3YXBncyIgICAgICAgIFxu IgorICAgICAgICAgICAgIi5zZWN0aW9uIC5maXh1cCxcImF4XCIgICBcbiIKKyAgICAgICAgICAg ICIyOiAgIHhvcmwgJWswLCVrMCAgICAgICAgXG4iCisgICAgICAgICAgICAiICAgICBqbXAgIDFi ICAgICAgICAgICAgIFxuIgorICAgICAgICAgICAgIi5wcmV2aW91cyAgICAgICAgICAgICAgICBc biIKKyAgICAgICAgICAgIF9BU01fRVhUQUJMRSgxYiwgMmIpCisgICAgICAgICAgICA6IDogInIi IChiYXNlJjB4ZmZmZikgKTsKKyAgICAgICAgYnJlYWs7CisKKyAgICBkZWZhdWx0OgorICAgICAg ICByZXQgPSAtRUlOVkFMOworICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICByZXR1cm4gcmV0 OworfQogCiAvKgogICogTG9jYWwgdmFyaWFibGVzOgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2 L3g4Nl82NC9tbS5jIGIveGVuL2FyY2gveDg2L3g4Nl82NC9tbS5jCmluZGV4IDM0ZjMyNTBmZDcu LjE5YTE0ZTg4MjkgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni94ODZfNjQvbW0uYworKysgYi94 ZW4vYXJjaC94ODYveDg2XzY0L21tLmMKQEAgLTEwMTgsNzYgKzEwMTgsNiBAQCBsb25nIHN1YmFy Y2hfbWVtb3J5X29wKHVuc2lnbmVkIGxvbmcgY21kLCBYRU5fR1VFU1RfSEFORExFX1BBUkFNKHZv aWQpIGFyZykKICAgICByZXR1cm4gcmM7CiB9CiAKLWxvbmcgZG9fc3RhY2tfc3dpdGNoKHVuc2ln bmVkIGxvbmcgc3MsIHVuc2lnbmVkIGxvbmcgZXNwKQotewotICAgIGZpeHVwX2d1ZXN0X3N0YWNr X3NlbGVjdG9yKGN1cnJlbnQtPmRvbWFpbiwgc3MpOwotICAgIGN1cnJlbnQtPmFyY2gucHZfdmNw dS5rZXJuZWxfc3MgPSBzczsKLSAgICBjdXJyZW50LT5hcmNoLnB2X3ZjcHUua2VybmVsX3NwID0g ZXNwOwotICAgIHJldHVybiAwOwotfQotCi1sb25nIGRvX3NldF9zZWdtZW50X2Jhc2UodW5zaWdu ZWQgaW50IHdoaWNoLCB1bnNpZ25lZCBsb25nIGJhc2UpCi17Ci0gICAgc3RydWN0IHZjcHUgKnYg PSBjdXJyZW50OwotICAgIGxvbmcgcmV0ID0gMDsKLQotICAgIGlmICggaXNfcHZfMzJiaXRfdmNw dSh2KSApCi0gICAgICAgIHJldHVybiAtRU5PU1lTOyAvKiB4ODYvNjQgb25seS4gKi8KLQotICAg IHN3aXRjaCAoIHdoaWNoICkKLSAgICB7Ci0gICAgY2FzZSBTRUdCQVNFX0ZTOgotICAgICAgICBp ZiAoIGlzX2Nhbm9uaWNhbF9hZGRyZXNzKGJhc2UpICkKLSAgICAgICAgewotICAgICAgICAgICAg d3Jmc2Jhc2UoYmFzZSk7Ci0gICAgICAgICAgICB2LT5hcmNoLnB2X3ZjcHUuZnNfYmFzZSA9IGJh c2U7Ci0gICAgICAgIH0KLSAgICAgICAgZWxzZQotICAgICAgICAgICAgcmV0ID0gLUVJTlZBTDsK LSAgICAgICAgYnJlYWs7Ci0KLSAgICBjYXNlIFNFR0JBU0VfR1NfVVNFUjoKLSAgICAgICAgaWYg KCBpc19jYW5vbmljYWxfYWRkcmVzcyhiYXNlKSApCi0gICAgICAgIHsKLSAgICAgICAgICAgIHdy bXNybChNU1JfU0hBRE9XX0dTX0JBU0UsIGJhc2UpOwotICAgICAgICAgICAgdi0+YXJjaC5wdl92 Y3B1LmdzX2Jhc2VfdXNlciA9IGJhc2U7Ci0gICAgICAgIH0KLSAgICAgICAgZWxzZQotICAgICAg ICAgICAgcmV0ID0gLUVJTlZBTDsKLSAgICAgICAgYnJlYWs7Ci0KLSAgICBjYXNlIFNFR0JBU0Vf R1NfS0VSTkVMOgotICAgICAgICBpZiAoIGlzX2Nhbm9uaWNhbF9hZGRyZXNzKGJhc2UpICkKLSAg ICAgICAgewotICAgICAgICAgICAgd3Jnc2Jhc2UoYmFzZSk7Ci0gICAgICAgICAgICB2LT5hcmNo LnB2X3ZjcHUuZ3NfYmFzZV9rZXJuZWwgPSBiYXNlOwotICAgICAgICB9Ci0gICAgICAgIGVsc2UK LSAgICAgICAgICAgIHJldCA9IC1FSU5WQUw7Ci0gICAgICAgIGJyZWFrOwotCi0gICAgY2FzZSBT RUdCQVNFX0dTX1VTRVJfU0VMOgotICAgICAgICBfX2FzbV9fIF9fdm9sYXRpbGVfXyAoCi0gICAg ICAgICAgICAiICAgICBzd2FwZ3MgICAgICAgICAgICAgIFxuIgotICAgICAgICAgICAgIjE6ICAg bW92bCAlazAsJSVncyAgICAgICBcbiIKLSAgICAgICAgICAgICIgICAgInNhZmVfc3dhcGdzIiAg ICAgICAgXG4iCi0gICAgICAgICAgICAiLnNlY3Rpb24gLmZpeHVwLFwiYXhcIiAgIFxuIgotICAg ICAgICAgICAgIjI6ICAgeG9ybCAlazAsJWswICAgICAgICBcbiIKLSAgICAgICAgICAgICIgICAg IGptcCAgMWIgICAgICAgICAgICAgXG4iCi0gICAgICAgICAgICAiLnByZXZpb3VzICAgICAgICAg ICAgICAgIFxuIgotICAgICAgICAgICAgX0FTTV9FWFRBQkxFKDFiLCAyYikKLSAgICAgICAgICAg IDogOiAiciIgKGJhc2UmMHhmZmZmKSApOwotICAgICAgICBicmVhazsKLQotICAgIGRlZmF1bHQ6 Ci0gICAgICAgIHJldCA9IC1FSU5WQUw7Ci0gICAgICAgIGJyZWFrOwotICAgIH0KLQotICAgIHJl dHVybiByZXQ7Ci19Ci0KLQogLyogUmV0dXJucyBUUlVFIGlmIGdpdmVuIGRlc2NyaXB0b3IgaXMg dmFsaWQgZm9yIEdEVCBvciBMRFQuICovCiBpbnQgY2hlY2tfZGVzY3JpcHRvcihjb25zdCBzdHJ1 Y3QgZG9tYWluICpkb20sIHN0cnVjdCBkZXNjX3N0cnVjdCAqZCkKIHsKLS0gCjIuMTEuMAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3Jn L3hlbi1kZXZlbAo=