From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v5 04/23] x86/mm: move {un, }adjust_guest_l*e to pv/mm.h Date: Thu, 14 Sep 2017 13:58:33 +0100 Message-ID: <20170914125852.22129-5-wei.liu2@citrix.com> References: <20170914125852.22129-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 1dsTjY-0004MU-Kd for xen-devel@lists.xenproject.org; Thu, 14 Sep 2017 12:59:08 +0000 In-Reply-To: <20170914125852.22129-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 U2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJj aC94ODYvbW0uYyAgICB8IDU3IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiB4ZW4vYXJjaC94ODYvcHYvbW0uaCB8IDYyICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNjIgaW5z ZXJ0aW9ucygrKSwgNTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21t LmMgYi94ZW4vYXJjaC94ODYvbW0uYwppbmRleCA1MDRhMGEyYTZhLi5iMDU2NDhlNGU3IDEwMDY0 NAotLS0gYS94ZW4vYXJjaC94ODYvbW0uYworKysgYi94ZW4vYXJjaC94ODYvbW0uYwpAQCAtMTE3 NSw2MyArMTE3NSw2IEBAIGdldF9wYWdlX2Zyb21fbDRlKAogICAgIHJldHVybiByYzsKIH0KIAot c3RhdGljIGwxX3BnZW50cnlfdCBhZGp1c3RfZ3Vlc3RfbDFlKGwxX3BnZW50cnlfdCBsMWUsIGNv bnN0IHN0cnVjdCBkb21haW4gKmQpCi17Ci0gICAgaWYgKCBsaWtlbHkobDFlX2dldF9mbGFncyhs MWUpICYgX1BBR0VfUFJFU0VOVCkgJiYKLSAgICAgICAgIGxpa2VseSghaXNfcHZfMzJiaXRfZG9t YWluKGQpKSApCi0gICAgewotICAgICAgICAvKiBfUEFHRV9HVUVTVF9LRVJORUwgcGFnZSBjYW5u b3QgaGF2ZSB0aGUgR2xvYmFsIGJpdCBzZXQuICovCi0gICAgICAgIGlmICggKGwxZV9nZXRfZmxh Z3MobDFlKSAmIChfUEFHRV9HVUVTVF9LRVJORUwgfCBfUEFHRV9HTE9CQUwpKSA9PQotICAgICAg ICAgICAgIChfUEFHRV9HVUVTVF9LRVJORUwgfCBfUEFHRV9HTE9CQUwpICkKLSAgICAgICAgICAg IGdkcHJpbnRrKFhFTkxPR19XQVJOSU5HLCAiR2xvYmFsIGJpdCBpcyBzZXQgaW4ga2VybmVsIHBh Z2UgJWx4XG4iLAotICAgICAgICAgICAgICAgICAgICAgbDFlX2dldF9wZm4obDFlKSk7Ci0KLSAg ICAgICAgaWYgKCAhKGwxZV9nZXRfZmxhZ3MobDFlKSAmIF9QQUdFX1VTRVIpICkKLSAgICAgICAg ICAgIGwxZV9hZGRfZmxhZ3MobDFlLCAoX1BBR0VfR1VFU1RfS0VSTkVMIHwgX1BBR0VfVVNFUikp OwotCi0gICAgICAgIGlmICggIShsMWVfZ2V0X2ZsYWdzKGwxZSkgJiBfUEFHRV9HVUVTVF9LRVJO RUwpICkKLSAgICAgICAgICAgIGwxZV9hZGRfZmxhZ3MobDFlLCAoX1BBR0VfR0xPQkFMIHwgX1BB R0VfVVNFUikpOwotICAgIH0KLQotICAgIHJldHVybiBsMWU7Ci19Ci0KLXN0YXRpYyBsMl9wZ2Vu dHJ5X3QgYWRqdXN0X2d1ZXN0X2wyZShsMl9wZ2VudHJ5X3QgbDJlLCBjb25zdCBzdHJ1Y3QgZG9t YWluICpkKQotewotICAgIGlmICggbGlrZWx5KGwyZV9nZXRfZmxhZ3MobDJlKSAmIF9QQUdFX1BS RVNFTlQpICYmCi0gICAgICAgICBsaWtlbHkoIWlzX3B2XzMyYml0X2RvbWFpbihkKSkgKQotICAg ICAgICBsMmVfYWRkX2ZsYWdzKGwyZSwgX1BBR0VfVVNFUik7Ci0KLSAgICByZXR1cm4gbDJlOwot fQotCi1zdGF0aWMgbDNfcGdlbnRyeV90IGFkanVzdF9ndWVzdF9sM2UobDNfcGdlbnRyeV90IGwz ZSwgY29uc3Qgc3RydWN0IGRvbWFpbiAqZCkKLXsKLSAgICBpZiAoIGxpa2VseShsM2VfZ2V0X2Zs YWdzKGwzZSkgJiBfUEFHRV9QUkVTRU5UKSApCi0gICAgICAgIGwzZV9hZGRfZmxhZ3MobDNlLCAo bGlrZWx5KCFpc19wdl8zMmJpdF9kb21haW4oZCkpCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgPyBfUEFHRV9VU0VSIDogX1BBR0VfVVNFUiB8IF9QQUdFX1JXKSk7Ci0KLSAgICByZXR1cm4g bDNlOwotfQotCi1zdGF0aWMgbDNfcGdlbnRyeV90IHVuYWRqdXN0X2d1ZXN0X2wzZShsM19wZ2Vu dHJ5X3QgbDNlLCBjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQotewotICAgIGlmICggdW5saWtlbHko aXNfcHZfMzJiaXRfZG9tYWluKGQpKSAmJgotICAgICAgICAgbGlrZWx5KGwzZV9nZXRfZmxhZ3Mo bDNlKSAmIF9QQUdFX1BSRVNFTlQpICkKLSAgICAgICAgbDNlX3JlbW92ZV9mbGFncyhsM2UsIF9Q QUdFX1VTRVIgfCBfUEFHRV9SVyB8IF9QQUdFX0FDQ0VTU0VEKTsKLQotICAgIHJldHVybiBsM2U7 Ci19Ci0KLXN0YXRpYyBsNF9wZ2VudHJ5X3QgYWRqdXN0X2d1ZXN0X2w0ZShsNF9wZ2VudHJ5X3Qg bDRlLCBjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQotewotICAgIGlmICggbGlrZWx5KGw0ZV9nZXRf ZmxhZ3MobDRlKSAmIF9QQUdFX1BSRVNFTlQpICYmCi0gICAgICAgICBsaWtlbHkoIWlzX3B2XzMy Yml0X2RvbWFpbihkKSkgKQotICAgICAgICBsNGVfYWRkX2ZsYWdzKGw0ZSwgX1BBR0VfVVNFUik7 Ci0KLSAgICByZXR1cm4gbDRlOwotfQotCiB2b2lkIHB1dF9wYWdlX2Zyb21fbDFlKGwxX3BnZW50 cnlfdCBsMWUsIHN0cnVjdCBkb21haW4gKmwxZV9vd25lcikKIHsKICAgICB1bnNpZ25lZCBsb25n ICAgICBwZm4gPSBsMWVfZ2V0X3BmbihsMWUpOwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L3B2 L21tLmggYi94ZW4vYXJjaC94ODYvcHYvbW0uaAppbmRleCAyNTYzZDI4MGE1Li42NjAyZTZjZTA3 IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvcHYvbW0uaAorKysgYi94ZW4vYXJjaC94ODYvcHYv bW0uaApAQCAtODMsNCArODMsNjYgQEAgc3RhdGljIGlubGluZSBib29sIHVwZGF0ZV9pbnRwdGUo aW50cHRlX3QgKnAsIGludHB0ZV90IG9sZCwgaW50cHRlX3QgbmV3LAogICAgICAgICAgICAgICAg ICAgX3QgIyMgZV9nZXRfaW50cHRlKF9vKSwgX3QgIyMgZV9nZXRfaW50cHRlKF9uKSwgICBcCiAg ICAgICAgICAgICAgICAgICAoX20pLCAoX3YpLCAoX2FkKSkKIAorc3RhdGljIGlubGluZSBsMV9w Z2VudHJ5X3QgYWRqdXN0X2d1ZXN0X2wxZShsMV9wZ2VudHJ5X3QgbDFlLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQor eworICAgIGlmICggbGlrZWx5KGwxZV9nZXRfZmxhZ3MobDFlKSAmIF9QQUdFX1BSRVNFTlQpICYm CisgICAgICAgICBsaWtlbHkoIWlzX3B2XzMyYml0X2RvbWFpbihkKSkgKQorICAgIHsKKyAgICAg ICAgLyogX1BBR0VfR1VFU1RfS0VSTkVMIHBhZ2UgY2Fubm90IGhhdmUgdGhlIEdsb2JhbCBiaXQg c2V0LiAqLworICAgICAgICBpZiAoIChsMWVfZ2V0X2ZsYWdzKGwxZSkgJiAoX1BBR0VfR1VFU1Rf S0VSTkVMIHwgX1BBR0VfR0xPQkFMKSkgPT0KKyAgICAgICAgICAgICAoX1BBR0VfR1VFU1RfS0VS TkVMIHwgX1BBR0VfR0xPQkFMKSApCisgICAgICAgICAgICBnZHByaW50ayhYRU5MT0dfV0FSTklO RywgIkdsb2JhbCBiaXQgaXMgc2V0IGluIGtlcm5lbCBwYWdlICVseFxuIiwKKyAgICAgICAgICAg ICAgICAgICAgIGwxZV9nZXRfcGZuKGwxZSkpOworCisgICAgICAgIGlmICggIShsMWVfZ2V0X2Zs YWdzKGwxZSkgJiBfUEFHRV9VU0VSKSApCisgICAgICAgICAgICBsMWVfYWRkX2ZsYWdzKGwxZSwg KF9QQUdFX0dVRVNUX0tFUk5FTCB8IF9QQUdFX1VTRVIpKTsKKworICAgICAgICBpZiAoICEobDFl X2dldF9mbGFncyhsMWUpICYgX1BBR0VfR1VFU1RfS0VSTkVMKSApCisgICAgICAgICAgICBsMWVf YWRkX2ZsYWdzKGwxZSwgKF9QQUdFX0dMT0JBTCB8IF9QQUdFX1VTRVIpKTsKKyAgICB9CisKKyAg ICByZXR1cm4gbDFlOworfQorCitzdGF0aWMgaW5saW5lIGwyX3BnZW50cnlfdCBhZGp1c3RfZ3Vl c3RfbDJlKGwyX3BnZW50cnlfdCBsMmUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBkb21haW4gKmQpCit7CisgICAgaWYgKCBsaWtlbHko bDJlX2dldF9mbGFncyhsMmUpICYgX1BBR0VfUFJFU0VOVCkgJiYKKyAgICAgICAgIGxpa2VseSgh aXNfcHZfMzJiaXRfZG9tYWluKGQpKSApCisgICAgICAgIGwyZV9hZGRfZmxhZ3MobDJlLCBfUEFH RV9VU0VSKTsKKworICAgIHJldHVybiBsMmU7Cit9CisKK3N0YXRpYyBpbmxpbmUgbDNfcGdlbnRy eV90IGFkanVzdF9ndWVzdF9sM2UobDNfcGdlbnRyeV90IGwzZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0IGRvbWFpbiAqZCkKK3sKKyAg ICBpZiAoIGxpa2VseShsM2VfZ2V0X2ZsYWdzKGwzZSkgJiBfUEFHRV9QUkVTRU5UKSApCisgICAg ICAgIGwzZV9hZGRfZmxhZ3MobDNlLCAobGlrZWx5KCFpc19wdl8zMmJpdF9kb21haW4oZCkpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgPyBfUEFHRV9VU0VSIDogX1BBR0VfVVNFUiB8IF9Q QUdFX1JXKSk7CisKKyAgICByZXR1cm4gbDNlOworfQorCitzdGF0aWMgaW5saW5lIGwzX3BnZW50 cnlfdCB1bmFkanVzdF9ndWVzdF9sM2UobDNfcGdlbnRyeV90IGwzZSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBzdHJ1Y3QgZG9tYWluICpkKQor eworICAgIGlmICggdW5saWtlbHkoaXNfcHZfMzJiaXRfZG9tYWluKGQpKSAmJgorICAgICAgICAg bGlrZWx5KGwzZV9nZXRfZmxhZ3MobDNlKSAmIF9QQUdFX1BSRVNFTlQpICkKKyAgICAgICAgbDNl X3JlbW92ZV9mbGFncyhsM2UsIF9QQUdFX1VTRVIgfCBfUEFHRV9SVyB8IF9QQUdFX0FDQ0VTU0VE KTsKKworICAgIHJldHVybiBsM2U7Cit9CisKK3N0YXRpYyBpbmxpbmUgbDRfcGdlbnRyeV90IGFk anVzdF9ndWVzdF9sNGUobDRfcGdlbnRyeV90IGw0ZSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0IGRvbWFpbiAqZCkKK3sKKyAgICBpZiAo IGxpa2VseShsNGVfZ2V0X2ZsYWdzKGw0ZSkgJiBfUEFHRV9QUkVTRU5UKSAmJgorICAgICAgICAg bGlrZWx5KCFpc19wdl8zMmJpdF9kb21haW4oZCkpICkKKyAgICAgICAgbDRlX2FkZF9mbGFncyhs NGUsIF9QQUdFX1VTRVIpOworCisgICAgcmV0dXJuIGw0ZTsKK30KKwogI2VuZGlmIC8qIF9fUFZf TU1fSF9fICovCi0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4u b3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK