From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v4 10/31] x86/mm: move {un, }adjust_guest_* to pv/mm.h Date: Thu, 17 Aug 2017 15:44:35 +0100 Message-ID: <20170817144456.18989-11-wei.liu2@citrix.com> References: <20170817144456.18989-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.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1diM57-0002na-Ig for xen-devel@lists.xenproject.org; Thu, 17 Aug 2017 14:47:33 +0000 In-Reply-To: <20170817144456.18989-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 , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhvc2UgbWFjcm9zIHdpbGwgc29vbiBiZSB1c2VkIGluIGRpZmZlcmVudCBmaWxlcy4gVGhleSBh cmUgUFYKc3BlY2lmaWMgc28gbW92ZSB0aGVtIHRvIHB2L21tLmguCgpTaWduZWQtb2ZmLWJ5OiBX ZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KIHhlbi9hcmNoL3g4Ni9tbS5jICAgICAg ICAgICB8IDQ3IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog eGVuL2luY2x1ZGUvYXNtLXg4Ni9wdi9tbS5oIHwgNDcgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDQ3IGluc2VydGlvbnMoKyks IDQ3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS5jIGIveGVuL2Fy Y2gveDg2L21tLmMKaW5kZXggZGM0YWM1NTkyYS4uNGFjNjliMzgwNCAxMDA2NDQKLS0tIGEveGVu L2FyY2gveDg2L21tLmMKKysrIGIveGVuL2FyY2gveDg2L21tLmMKQEAgLTExNTEsNTMgKzExNTEs NiBAQCBnZXRfcGFnZV9mcm9tX2w0ZSgKICAgICByZXR1cm4gcmM7CiB9CiAKLSNkZWZpbmUgYWRq dXN0X2d1ZXN0X2wxZShwbDFlLCBkKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXAotICAgIGRvIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgIGlmICggbGlrZWx5KGwx ZV9nZXRfZmxhZ3MoKHBsMWUpKSAmIF9QQUdFX1BSRVNFTlQpICYmICAgICAgICAgICAgICAgIFwK LSAgICAgICAgICAgICBsaWtlbHkoIWlzX3B2XzMyYml0X2RvbWFpbihkKSkgKSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICB7ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgICAg ICAvKiBfUEFHRV9HVUVTVF9LRVJORUwgcGFnZSBjYW5ub3QgaGF2ZSB0aGUgR2xvYmFsIGJpdCBz ZXQuICovICAgIFwKLSAgICAgICAgICAgIGlmICggKGwxZV9nZXRfZmxhZ3MoKHBsMWUpKSAmIChf UEFHRV9HVUVTVF9LRVJORUx8X1BBR0VfR0xPQkFMKSkgXAotICAgICAgICAgICAgICAgICA9PSAo X1BBR0VfR1VFU1RfS0VSTkVMfF9QQUdFX0dMT0JBTCkgKSAgICAgICAgICAgICAgICAgICAgICBc Ci0gICAgICAgICAgICAgICAgZ2RwcmludGsoWEVOTE9HX1dBUk5JTkcsICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgICAgICAgICAgICAgICAiR2xvYmFs IGJpdCBpcyBzZXQgdG8ga2VybmVsIHBhZ2UgJWx4XG4iLCAgICAgICAgICAgXAotICAgICAgICAg ICAgICAgICAgICAgICAgIGwxZV9nZXRfcGZuKChwbDFlKSkpOyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBcCi0gICAgICAgICAgICBpZiAoICEobDFlX2dldF9mbGFncygocGwxZSkpICYg X1BBR0VfVVNFUikgKSAgICAgICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgICAgICBsMWVf YWRkX2ZsYWdzKChwbDFlKSwgKF9QQUdFX0dVRVNUX0tFUk5FTHxfUEFHRV9VU0VSKSk7ICAgICAg XAotICAgICAgICAgICAgaWYgKCAhKGwxZV9nZXRfZmxhZ3MoKHBsMWUpKSAmIF9QQUdFX0dVRVNU X0tFUk5FTCkgKSAgICAgICAgICAgICBcCi0gICAgICAgICAgICAgICAgbDFlX2FkZF9mbGFncygo cGwxZSksIChfUEFHRV9HTE9CQUx8X1BBR0VfVVNFUikpOyAgICAgICAgICAgIFwKLSAgICAgICAg fSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXAotICAgIH0gd2hpbGUgKCAwICkKLQotI2RlZmluZSBhZGp1c3RfZ3Vlc3Rf bDJlKHBsMmUsIGQpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKLSAgICBkbyB7ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCi0g ICAgICAgIGlmICggbGlrZWx5KGwyZV9nZXRfZmxhZ3MoKHBsMmUpKSAmIF9QQUdFX1BSRVNFTlQp ICYmICAgXAotICAgICAgICAgICAgIGxpa2VseSghaXNfcHZfMzJiaXRfZG9tYWluKGQpKSApICAg ICAgICAgICAgICAgICAgIFwKLSAgICAgICAgICAgIGwyZV9hZGRfZmxhZ3MoKHBsMmUpLCBfUEFH RV9VU0VSKTsgICAgICAgICAgICAgICAgICBcCi0gICAgfSB3aGlsZSAoIDAgKQotCi0jZGVmaW5l IGFkanVzdF9ndWVzdF9sM2UocGwzZSwgZCkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKLSAgICBkbyB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXAotICAgICAgICBpZiAoIGxpa2VseShsM2VfZ2V0X2ZsYWdzKChw bDNlKSkgJiBfUEFHRV9QUkVTRU5UKSApICAgICAgICBcCi0gICAgICAgICAgICBsM2VfYWRkX2Zs YWdzKChwbDNlKSwgbGlrZWx5KCFpc19wdl8zMmJpdF9kb21haW4oZCkpID8gIFwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX1BBR0VfVVNFUiA6ICAgICAgICAgICAg ICAgXAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfUEFHRV9VU0VS fF9QQUdFX1JXKTsgICAgICBcCi0gICAgfSB3aGlsZSAoIDAgKQotCi0jZGVmaW5lIGFkanVzdF9n dWVzdF9sNGUocGw0ZSwgZCkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgIGRv IHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKLSAgICAgICAgaWYgKCBsaWtlbHkobDRlX2dldF9mbGFncygocGw0ZSkpICYgX1BBR0VfUFJF U0VOVCkgJiYgICBcCi0gICAgICAgICAgICAgbGlrZWx5KCFpc19wdl8zMmJpdF9kb21haW4oZCkp ICkgICAgICAgICAgICAgICAgICAgXAotICAgICAgICAgICAgbDRlX2FkZF9mbGFncygocGw0ZSks IF9QQUdFX1VTRVIpOyAgICAgICAgICAgICAgICAgIFwKLSAgICB9IHdoaWxlICggMCApCi0KLSNk ZWZpbmUgdW5hZGp1c3RfZ3Vlc3RfbDNlKHBsM2UsIGQpICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCi0gICAgZG8geyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAotICAgICAgICBpZiAoIHVu bGlrZWx5KGlzX3B2XzMyYml0X2RvbWFpbihkKSkgJiYgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKLSAgICAgICAgICAgICBsaWtlbHkobDNlX2dldF9mbGFncygocGwzZSkpICYgX1BBR0Vf UFJFU0VOVCkgKSAgICAgICAgICAgICAgICBcCi0gICAgICAgICAgICBsM2VfcmVtb3ZlX2ZsYWdz KChwbDNlKSwgX1BBR0VfVVNFUnxfUEFHRV9SV3xfUEFHRV9BQ0NFU1NFRCk7ICAgXAotICAgIH0g d2hpbGUgKCAwICkKLQogdm9pZCBwdXRfcGFnZV9mcm9tX2wxZShsMV9wZ2VudHJ5X3QgbDFlLCBz dHJ1Y3QgZG9tYWluICpsMWVfb3duZXIpCiB7CiAgICAgdW5zaWduZWQgbG9uZyAgICAgcGZuID0g bDFlX2dldF9wZm4obDFlKTsKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcHYvbW0u aCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcHYvbW0uaAppbmRleCA3MmMwNGM2ODRmLi5iMzg4Nzk4 OWI2IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L3B2L21tLmgKKysrIGIveGVuL2lu Y2x1ZGUvYXNtLXg4Ni9wdi9tbS5oCkBAIC0yMyw2ICsyMyw1MyBAQAogCiAjaWZkZWYgQ09ORklH X1BWCiAKKyNkZWZpbmUgYWRqdXN0X2d1ZXN0X2wxZShwbDFlLCBkKSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIGRvIHsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAg ICAgIGlmICggbGlrZWx5KGwxZV9nZXRfZmxhZ3MoKHBsMWUpKSAmIF9QQUdFX1BSRVNFTlQpICYm ICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgICBsaWtlbHkoIWlzX3B2XzMyYml0X2RvbWFp bihkKSkgKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICB7ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCisgICAgICAgICAgICAvKiBfUEFHRV9HVUVTVF9LRVJORUwgcGFnZSBjYW5ub3QgaGF2 ZSB0aGUgR2xvYmFsIGJpdCBzZXQuICovICAgIFwKKyAgICAgICAgICAgIGlmICggKGwxZV9nZXRf ZmxhZ3MoKHBsMWUpKSAmIChfUEFHRV9HVUVTVF9LRVJORUx8X1BBR0VfR0xPQkFMKSkgXAorICAg ICAgICAgICAgICAgICA9PSAoX1BBR0VfR1VFU1RfS0VSTkVMfF9QQUdFX0dMT0JBTCkgKSAgICAg ICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICAgICAgZ2RwcmludGsoWEVOTE9HX1dBUk5J TkcsICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAiR2xvYmFsIGJpdCBpcyBzZXQgdG8ga2VybmVsIHBhZ2UgJWx4XG4iLCAgICAg ICAgICAgXAorICAgICAgICAgICAgICAgICAgICAgICAgIGwxZV9nZXRfcGZuKChwbDFlKSkpOyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICBpZiAoICEobDFlX2dl dF9mbGFncygocGwxZSkpICYgX1BBR0VfVVNFUikgKSAgICAgICAgICAgICAgICAgICAgIFwKKyAg ICAgICAgICAgICAgICBsMWVfYWRkX2ZsYWdzKChwbDFlKSwgKF9QQUdFX0dVRVNUX0tFUk5FTHxf UEFHRV9VU0VSKSk7ICAgICAgXAorICAgICAgICAgICAgaWYgKCAhKGwxZV9nZXRfZmxhZ3MoKHBs MWUpKSAmIF9QQUdFX0dVRVNUX0tFUk5FTCkgKSAgICAgICAgICAgICBcCisgICAgICAgICAgICAg ICAgbDFlX2FkZF9mbGFncygocGwxZSksIChfUEFHRV9HTE9CQUx8X1BBR0VfVVNFUikpOyAgICAg ICAgICAgIFwKKyAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIH0gd2hpbGUgKCAwICkKKworI2Rl ZmluZSBhZGp1c3RfZ3Vlc3RfbDJlKHBsMmUsIGQpICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFwKKyAgICBkbyB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCisgICAgICAgIGlmICggbGlrZWx5KGwyZV9nZXRfZmxhZ3MoKHBsMmUp KSAmIF9QQUdFX1BSRVNFTlQpICYmICAgXAorICAgICAgICAgICAgIGxpa2VseSghaXNfcHZfMzJi aXRfZG9tYWluKGQpKSApICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgIGwyZV9hZGRf ZmxhZ3MoKHBsMmUpLCBfUEFHRV9VU0VSKTsgICAgICAgICAgICAgICAgICBcCisgICAgfSB3aGls ZSAoIDAgKQorCisjZGVmaW5lIGFkanVzdF9ndWVzdF9sM2UocGwzZSwgZCkgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICBkbyB7ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICBpZiAoIGxpa2Vs eShsM2VfZ2V0X2ZsYWdzKChwbDNlKSkgJiBfUEFHRV9QUkVTRU5UKSApICAgICAgICBcCisgICAg ICAgICAgICBsM2VfYWRkX2ZsYWdzKChwbDNlKSwgbGlrZWx5KCFpc19wdl8zMmJpdF9kb21haW4o ZCkpID8gIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX1BBR0Vf VVNFUiA6ICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBfUEFHRV9VU0VSfF9QQUdFX1JXKTsgICAgICBcCisgICAgfSB3aGlsZSAoIDAgKQor CisjZGVmaW5lIGFkanVzdF9ndWVzdF9sNGUocGw0ZSwgZCkgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXAorICAgIGRvIHsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgaWYgKCBsaWtlbHkobDRlX2dldF9mbGFncygo cGw0ZSkpICYgX1BBR0VfUFJFU0VOVCkgJiYgICBcCisgICAgICAgICAgICAgbGlrZWx5KCFpc19w dl8zMmJpdF9kb21haW4oZCkpICkgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgbDRl X2FkZF9mbGFncygocGw0ZSksIF9QQUdFX1VTRVIpOyAgICAgICAgICAgICAgICAgIFwKKyAgICB9 IHdoaWxlICggMCApCisKKyNkZWZpbmUgdW5hZGp1c3RfZ3Vlc3RfbDNlKHBsM2UsIGQpICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgZG8geyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg XAorICAgICAgICBpZiAoIHVubGlrZWx5KGlzX3B2XzMyYml0X2RvbWFpbihkKSkgJiYgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgICBsaWtlbHkobDNlX2dldF9mbGFn cygocGwzZSkpICYgX1BBR0VfUFJFU0VOVCkgKSAgICAgICAgICAgICAgICBcCisgICAgICAgICAg ICBsM2VfcmVtb3ZlX2ZsYWdzKChwbDNlKSwgX1BBR0VfVVNFUnxfUEFHRV9SV3xfUEFHRV9BQ0NF U1NFRCk7ICAgXAorICAgIH0gd2hpbGUgKCAwICkKKwogdm9pZCBwdl9nZXRfZ3Vlc3RfZWZmX2wx ZSh1bnNpZ25lZCBsb25nIGFkZHIsIGwxX3BnZW50cnlfdCAqZWZmX2wxZSk7CiAKIHZvaWQgcHZf Z2V0X2d1ZXN0X2VmZl9rZXJuX2wxZShzdHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgbG9uZyBhZGRy LAotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRw czovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==