From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v4 07/31] x86/mm: move and rename guest_get_eff{, kern}_l1e Date: Thu, 17 Aug 2017 15:44:32 +0100 Message-ID: <20170817144456.18989-8-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.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1diM2k-0000yG-48 for xen-devel@lists.xenproject.org; Thu, 17 Aug 2017 14:45:06 +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 TW92ZSB0aGVtIHRvIHB2L21tLmMgYW5kIHJlbmFtZSB0aGVtIHRvIHB2X2dldF9ndWVzdF9lZmZf eyxrZXJufV9sMWUuCkV4cG9ydCB0aGVtIHZpYSBwdi9tbS5oLgoKVGhleSB3aWxsIGJlIHVzZWQg bGF0ZXIgaW4gZW11bGF0aW9uIGhhbmRsZXJzLgoKU2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2Vp LmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvbW0uYyAgICAgICAgICAgfCAzOCAr KystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiB4ZW4vYXJjaC94ODYvcHYvTWFrZWZpbGUgICAgfCAg MSArCiB4ZW4vYXJjaC94ODYvcHYvbW0uYyAgICAgICAgfCA2NyArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysKIHhlbi9pbmNsdWRlL2FzbS14ODYvcHYvbW0uaCB8 IDUzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiA0IGZpbGVzIGNoYW5nZWQs IDEyNSBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCB4 ZW4vYXJjaC94ODYvcHYvbW0uYwogY3JlYXRlIG1vZGUgMTAwNjQ0IHhlbi9pbmNsdWRlL2FzbS14 ODYvcHYvbW0uaAoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS5jIGIveGVuL2FyY2gveDg2 L21tLmMKaW5kZXggZTBlNjU1YWMzMS4uN2ViODBlY2FhMyAxMDA2NDQKLS0tIGEveGVuL2FyY2gv eDg2L21tLmMKKysrIGIveGVuL2FyY2gveDg2L21tLmMKQEAgLTEyNSw2ICsxMjUsNyBAQAogCiAj aW5jbHVkZSA8YXNtL2h2bS9ncmFudF90YWJsZS5oPgogI2luY2x1ZGUgPGFzbS9wdi9ncmFudF90 YWJsZS5oPgorI2luY2x1ZGUgPGFzbS9wdi9tbS5oPgogCiAjaW5jbHVkZSAicHYvZW11bGF0ZS5o IgogCkBAIC01NTQsMzcgKzU1NSw2IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBndWVzdF91bm1hcF9s MWUodm9pZCAqcCkKICAgICB1bm1hcF9kb21haW5fcGFnZShwKTsKIH0KIAotLyogUmVhZCBhIFBW IGd1ZXN0J3MgbDFlIHRoYXQgbWFwcyB0aGlzIHZpcnR1YWwgYWRkcmVzcy4gKi8KLXN0YXRpYyBp bmxpbmUgdm9pZCBndWVzdF9nZXRfZWZmX2wxZSh1bnNpZ25lZCBsb25nIGFkZHIsIGwxX3BnZW50 cnlfdCAqZWZmX2wxZSkKLXsKLSAgICBBU1NFUlQoIXBhZ2luZ19tb2RlX3RyYW5zbGF0ZShjdXJy ZW50LT5kb21haW4pKTsKLSAgICBBU1NFUlQoIXBhZ2luZ19tb2RlX2V4dGVybmFsKGN1cnJlbnQt PmRvbWFpbikpOwotCi0gICAgaWYgKCB1bmxpa2VseSghX19hZGRyX29rKGFkZHIpKSB8fAotICAg ICAgICAgX19jb3B5X2Zyb21fdXNlcihlZmZfbDFlLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAmX19saW5lYXJfbDFfdGFibGVbbDFfbGluZWFyX29mZnNldChhZGRyKV0sCi0gICAgICAgICAg ICAgICAgICAgICAgICAgIHNpemVvZihsMV9wZ2VudHJ5X3QpKSApCi0gICAgICAgICplZmZfbDFl ID0gbDFlX2VtcHR5KCk7Ci19Ci0KLS8qCi0gKiBSZWFkIHRoZSBndWVzdCdzIGwxZSB0aGF0IG1h cHMgdGhpcyBhZGRyZXNzLCBmcm9tIHRoZSBrZXJuZWwtbW9kZQotICogcGFnZSB0YWJsZXMuCi0g Ki8KLXN0YXRpYyBpbmxpbmUgdm9pZCBndWVzdF9nZXRfZWZmX2tlcm5fbDFlKHN0cnVjdCB2Y3B1 ICp2LCB1bnNpZ25lZCBsb25nIGFkZHIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB2b2lkICplZmZfbDFlKQotewotICAgIGNvbnN0IGJvb2wgdXNlcl9tb2RlID0g ISh2LT5hcmNoLmZsYWdzICYgVEZfa2VybmVsX21vZGUpOwotCi0gICAgaWYgKCB1c2VyX21vZGUg KQotICAgICAgICB0b2dnbGVfZ3Vlc3RfbW9kZSh2KTsKLQotICAgIGd1ZXN0X2dldF9lZmZfbDFl KGFkZHIsIGVmZl9sMWUpOwotCi0gICAgaWYgKCB1c2VyX21vZGUgKQotICAgICAgICB0b2dnbGVf Z3Vlc3RfbW9kZSh2KTsKLX0KLQogc3RhdGljIGlubGluZSB2b2lkIHBhZ2Vfc2V0X3RsYmZsdXNo X3RpbWVzdGFtcChzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlKQogewogICAgIC8qCkBAIC02NjksNyAr NjM5LDcgQEAgaW50IG1hcF9sZHRfc2hhZG93X3BhZ2UodW5zaWduZWQgaW50IG9mZikKIAogICAg IGlmICggaXNfcHZfMzJiaXRfZG9tYWluKGQpICkKICAgICAgICAgZ3ZhID0gKHUzMilndmE7Ci0g ICAgZ3Vlc3RfZ2V0X2VmZl9rZXJuX2wxZSh2LCBndmEsICZsMWUpOworICAgIHB2X2dldF9ndWVz dF9lZmZfa2Vybl9sMWUodiwgZ3ZhLCAmbDFlKTsKICAgICBpZiAoIHVubGlrZWx5KCEobDFlX2dl dF9mbGFncyhsMWUpICYgX1BBR0VfUFJFU0VOVCkpICkKICAgICAgICAgcmV0dXJuIDA7CiAKQEAg LTUxNjgsNyArNTEzOCw3IEBAIGludCBwdHdyX2RvX3BhZ2VfZmF1bHQoc3RydWN0IHZjcHUgKnYs IHVuc2lnbmVkIGxvbmcgYWRkciwKICAgICBpbnQgcmM7CiAKICAgICAvKiBBdHRlbXB0IHRvIHJl YWQgdGhlIFBURSB0aGF0IG1hcHMgdGhlIFZBIGJlaW5nIGFjY2Vzc2VkLiAqLwotICAgIGd1ZXN0 X2dldF9lZmZfbDFlKGFkZHIsICZwdGUpOworICAgIHB2X2dldF9ndWVzdF9lZmZfbDFlKGFkZHIs ICZwdGUpOwogCiAgICAgLyogV2UgYXJlIGxvb2tpbmcgb25seSBmb3IgcmVhZC1vbmx5IG1hcHBp bmdzIG9mIHAudC4gcGFnZXMuICovCiAgICAgaWYgKCAoKGwxZV9nZXRfZmxhZ3MocHRlKSAmIChf UEFHRV9QUkVTRU5UfF9QQUdFX1JXKSkgIT0gX1BBR0VfUFJFU0VOVCkgfHwKQEAgLTUzMjMsNyAr NTI5Myw3IEBAIGludCBtbWlvX3JvX2RvX3BhZ2VfZmF1bHQoc3RydWN0IHZjcHUgKnYsIHVuc2ln bmVkIGxvbmcgYWRkciwKICAgICBpbnQgcmM7CiAKICAgICAvKiBBdHRlbXB0IHRvIHJlYWQgdGhl IFBURSB0aGF0IG1hcHMgdGhlIFZBIGJlaW5nIGFjY2Vzc2VkLiAqLwotICAgIGd1ZXN0X2dldF9l ZmZfbDFlKGFkZHIsICZwdGUpOworICAgIHB2X2dldF9ndWVzdF9lZmZfbDFlKGFkZHIsICZwdGUp OwogCiAgICAgLyogV2UgYXJlIGxvb2tpbmcgb25seSBmb3IgcmVhZC1vbmx5IG1hcHBpbmdzIG9m IE1NSU8gcGFnZXMuICovCiAgICAgaWYgKCAoKGwxZV9nZXRfZmxhZ3MocHRlKSAmIChfUEFHRV9Q UkVTRU5UfF9QQUdFX1JXKSkgIT0gX1BBR0VfUFJFU0VOVCkgKQpkaWZmIC0tZ2l0IGEveGVuL2Fy Y2gveDg2L3B2L01ha2VmaWxlIGIveGVuL2FyY2gveDg2L3B2L01ha2VmaWxlCmluZGV4IDRlMTU0 ODQ0NzEuLmM4M2FlZDQ5M2IgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9wdi9NYWtlZmlsZQor KysgYi94ZW4vYXJjaC94ODYvcHYvTWFrZWZpbGUKQEAgLTcsNiArNyw3IEBAIG9iai15ICs9IGVt dWwtcHJpdi1vcC5vCiBvYmoteSArPSBoeXBlcmNhbGwubwogb2JqLXkgKz0gaXJldC5vCiBvYmot eSArPSBtaXNjLWh5cGVyY2FsbHMubworb2JqLXkgKz0gbW0ubwogb2JqLXkgKz0gdHJhcHMubwog CiBvYmotYmluLXkgKz0gZG9tMF9idWlsZC5pbml0Lm8KZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4 Ni9wdi9tbS5jIGIveGVuL2FyY2gveDg2L3B2L21tLmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMC4uYWEyY2UzNDE0NQotLS0gL2Rldi9udWxsCisrKyBiL3hlbi9hcmNoL3g4 Ni9wdi9tbS5jCkBAIC0wLDAgKzEsNjcgQEAKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKKyAqIGFy Y2gveDg2L3B2L21tLmMKKyAqCisgKiBNZW1vcnkgbWFuYWdlbWVudCBjb2RlIGZvciBQViBndWVz dHMKKyAqCisgKiBDb3B5cmlnaHQgKGMpIDIwMDItMjAwNSBLIEEgRnJhc2VyCisgKiBDb3B5cmln aHQgKGMpIDIwMDQgQ2hyaXN0aWFuIExpbXBhY2gKKyAqCisgKiBUaGlzIHByb2dyYW0gaXMgZnJl ZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQorICogaXQg dW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJs aXNoZWQgYnkKKyAqIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJzaW9u IDIgb2YgdGhlIExpY2Vuc2UsIG9yCisgKiAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJz aW9uLgorICoKKyAqIFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0 IGl0IHdpbGwgYmUgdXNlZnVsLAorICogYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0 IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAqIE1FUkNIQU5UQUJJTElUWSBvciBGSVRO RVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUKKyAqIEdOVSBHZW5lcmFsIFB1 YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJl Y2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAqIGFsb25n IHdpdGggdGhpcyBwcm9ncmFtOyBJZiBub3QsIHNlZSA8aHR0cDovL3d3dy5nbnUub3JnL2xpY2Vu c2VzLz4uCisgKi8KKworI2luY2x1ZGUgPHhlbi9ndWVzdF9hY2Nlc3MuaD4KKworI2luY2x1ZGUg PGFzbS9wdi9tbS5oPgorCisKKy8qIFJlYWQgYSBQViBndWVzdCdzIGwxZSB0aGF0IG1hcHMgdGhp cyB2aXJ0dWFsIGFkZHJlc3MuICovCit2b2lkIHB2X2dldF9ndWVzdF9lZmZfbDFlKHVuc2lnbmVk IGxvbmcgYWRkciwgbDFfcGdlbnRyeV90ICplZmZfbDFlKQoreworICAgIEFTU0VSVCghcGFnaW5n X21vZGVfdHJhbnNsYXRlKGN1cnJlbnQtPmRvbWFpbikpOworICAgIEFTU0VSVCghcGFnaW5nX21v ZGVfZXh0ZXJuYWwoY3VycmVudC0+ZG9tYWluKSk7CisKKyAgICBpZiAoIHVubGlrZWx5KCFfX2Fk ZHJfb2soYWRkcikpIHx8CisgICAgICAgICBfX2NvcHlfZnJvbV91c2VyKGVmZl9sMWUsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICZfX2xpbmVhcl9sMV90YWJsZVtsMV9saW5lYXJfb2Zmc2V0 KGFkZHIpXSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZW9mKGwxX3BnZW50cnlfdCkp ICkKKyAgICAgICAgKmVmZl9sMWUgPSBsMWVfZW1wdHkoKTsKK30KKworLyoKKyAqIFJlYWQgdGhl IGd1ZXN0J3MgbDFlIHRoYXQgbWFwcyB0aGlzIGFkZHJlc3MsIGZyb20gdGhlIGtlcm5lbC1tb2Rl CisgKiBwYWdlIHRhYmxlcy4KKyAqLwordm9pZCBwdl9nZXRfZ3Vlc3RfZWZmX2tlcm5fbDFlKHN0 cnVjdCB2Y3B1ICp2LCB1bnNpZ25lZCBsb25nIGFkZHIsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdm9pZCAqZWZmX2wxZSkKK3sKKyAgICBjb25zdCBib29sIHVzZXJfbW9kZSA9ICEo di0+YXJjaC5mbGFncyAmIFRGX2tlcm5lbF9tb2RlKTsKKworICAgIGlmICggdXNlcl9tb2RlICkK KyAgICAgICAgdG9nZ2xlX2d1ZXN0X21vZGUodik7CisKKyAgICBwdl9nZXRfZ3Vlc3RfZWZmX2wx ZShhZGRyLCBlZmZfbDFlKTsKKworICAgIGlmICggdXNlcl9tb2RlICkKKyAgICAgICAgdG9nZ2xl X2d1ZXN0X21vZGUodik7Cit9CisKKy8qCisgKiBMb2NhbCB2YXJpYWJsZXM6CisgKiBtb2RlOiBD CisgKiBjLWZpbGUtc3R5bGU6ICJCU0QiCisgKiBjLWJhc2ljLW9mZnNldDogNAorICogdGFiLXdp ZHRoOiA0CisgKiBpbmRlbnQtdGFicy1tb2RlOiBuaWwKKyAqIEVuZDoKKyAqLwpkaWZmIC0tZ2l0 IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9wdi9tbS5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wdi9t bS5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAuLjE5ZGJjM2I2NmMKLS0t IC9kZXYvbnVsbAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L3B2L21tLmgKQEAgLTAsMCArMSw1 MyBAQAorLyoKKyAqIGFzbS14ODYvcHYvbW0uaAorICoKKyAqIE1lbW9yeSBtYW5hZ2VtZW50IGlu dGVyZmFjZXMgZm9yIFBWIGd1ZXN0cworICoKKyAqIENvcHlyaWdodCAoQykgMjAxNyBXZWkgTGl1 IDx3ZWkubGl1MkBjaXRyaXguY29tPgorICoKKyAqIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3 YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRlciB0 aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYworICogTGlj ZW5zZSwgdmVyc2lvbiAyLCBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRh dGlvbi4KKyAqCisgKiBUaGlzIHByb2dyYW0gaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhh dCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAqIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91 dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklU TkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICogR2VuZXJhbCBQ dWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBzaG91bGQgaGF2ZSBy ZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhbG9u ZyB3aXRoIHRoaXMgcHJvZ3JhbTsgSWYgbm90LCBzZWUgPGh0dHA6Ly93d3cuZ251Lm9yZy9saWNl bnNlcy8+LgorICovCisKKyNpZm5kZWYgX19YODZfUFZfTU1fSF9fCisjZGVmaW5lIF9fWDg2X1BW X01NX0hfXworCisjaWZkZWYgQ09ORklHX1BWCisKK3ZvaWQgcHZfZ2V0X2d1ZXN0X2VmZl9sMWUo dW5zaWduZWQgbG9uZyBhZGRyLCBsMV9wZ2VudHJ5X3QgKmVmZl9sMWUpOworCit2b2lkIHB2X2dl dF9ndWVzdF9lZmZfa2Vybl9sMWUoc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGxvbmcgYWRkciwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2b2lkICplZmZfbDFlKTsKKworI2Vsc2UK Kworc3RhdGljIGlubGluZSB2b2lkIHB2X2dldF9ndWVzdF9lZmZfbDFlKHVuc2lnbmVkIGxvbmcg YWRkciwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsMV9wZ2VudHJ5 X3QgKmVmZl9sMWUpCit7fQorCitzdGF0aWMgaW5saW5lIHZvaWQgcHZfZ2V0X2d1ZXN0X2VmZl9r ZXJuX2wxZShzdHJ1Y3QgdmNwdSAqdiwgdW5zaWduZWQgbG9uZyBhZGRyLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAqZWZmX2wxZSkKK3t9CisKKyNl bmRpZgorCisjZW5kaWYgLyogX19YODZfUFZfTU1fSF9fICovCisKKy8qCisgKiBMb2NhbCB2YXJp YWJsZXM6CisgKiBtb2RlOiBDCisgKiBjLWZpbGUtc3R5bGU6ICJCU0QiCisgKiBjLWJhc2ljLW9m ZnNldDogNAorICogdGFiLXdpZHRoOiA0CisgKiBpbmRlbnQtdGFicy1tb2RlOiBuaWwKKyAqIEVu ZDoKKyAqLwotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9y ZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==