From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v4 3/7] x86/mm: put nested p2m code under CONFIG_HVM Date: Thu, 13 Sep 2018 17:38:05 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1g0UeY-0000Ij-2y for xen-devel@lists.xenproject.org; Thu, 13 Sep 2018 16:39:38 +0000 In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: George Dunlap , Andrew Cooper , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhlc2UgZnVuY3Rpb25zIGFyZSBvbmx5IHVzZWZ1bCBmb3IgbmVzdGVkIGh2bSwgd2hpY2ggaXNu J3QgZW5hYmxlZAp3aGVuIENPTkZJR19IVk0gaXMgZmFsc2UuCgpFbmNsb3NlIHJlbGV2YW50IGNv ZGUgYW5kIGZpZWxkcyBpbiBDT05GSUdfSFZNLgoKU2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2Vp LmxpdTJAY2l0cml4LmNvbT4KLS0tCnY0OgoxLiBJbnRyb2R1Y2UgcDJtX25lc3RlZHAybV9pbml0 Ci0tLQogeGVuL2FyY2gveDg2L2RvbWFpbi5jICAgICAgICB8ICA0ICsrKysKIHhlbi9hcmNoL3g4 Ni9tbS9wMm0uYyAgICAgICAgfCAyNSArKysrKysrKysrKysrKysrKysrKystLS0tCiB4ZW4vaW5j bHVkZS9hc20teDg2L2RvbWFpbi5oIHwgIDIgKysKIHhlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgg ICAgfCAgMiArKwogNCBmaWxlcyBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9kb21haW4uYyBiL3hlbi9hcmNoL3g4Ni9k b21haW4uYwppbmRleCAzMTNlYmIzLi4zZGE1ZGY2IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYv ZG9tYWluLmMKKysrIGIveGVuL2FyY2gveDg2L2RvbWFpbi5jCkBAIC0xNjkxLDcgKzE2OTEsOSBA QCB2b2lkIGNvbnRleHRfc3dpdGNoKHN0cnVjdCB2Y3B1ICpwcmV2LCBzdHJ1Y3QgdmNwdSAqbmV4 dCkKICAgICB7CiAgICAgICAgIF91cGRhdGVfcnVuc3RhdGVfYXJlYShwcmV2KTsKICAgICAgICAg dnBtdV9zd2l0Y2hfZnJvbShwcmV2KTsKKyNpZmRlZiBDT05GSUdfSFZNCiAgICAgICAgIG5wMm1f c2NoZWR1bGUoTlAyTV9TQ0hFRExFX09VVCk7CisjZW5kaWYKICAgICB9CiAKICAgICBpZiAoIGlz X2h2bV9kb21haW4ocHJldmQpICYmICFsaXN0X2VtcHR5KCZwcmV2LT5hcmNoLmh2bS50bV9saXN0 KSApCkBAIC0xNzU4LDcgKzE3NjAsOSBAQCB2b2lkIGNvbnRleHRfc3dpdGNoKHN0cnVjdCB2Y3B1 ICpwcmV2LCBzdHJ1Y3QgdmNwdSAqbmV4dCkKIAogICAgICAgICAvKiBNdXN0IGJlIGRvbmUgd2l0 aCBpbnRlcnJ1cHRzIGVuYWJsZWQgKi8KICAgICAgICAgdnBtdV9zd2l0Y2hfdG8obmV4dCk7Cisj aWZkZWYgQ09ORklHX0hWTQogICAgICAgICBucDJtX3NjaGVkdWxlKE5QMk1fU0NIRURMRV9JTik7 CisjZW5kaWYKICAgICB9CiAKICAgICAvKiBFbnN1cmUgdGhhdCB0aGUgdmNwdSBoYXMgYW4gdXAt dG8tZGF0ZSB0aW1lIGJhc2UuICovCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vcDJtLmMg Yi94ZW4vYXJjaC94ODYvbW0vcDJtLmMKaW5kZXggODBiNzI5My4uNDE2OTA4NCAxMDA2NDQKLS0t IGEveGVuL2FyY2gveDg2L21tL3AybS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0uYwpAQCAt NjMsMjMgKzYzLDMwIEBAIHN0YXRpYyB2b2lkIHAybV9wb2RfaW5pdChzdHJ1Y3QgcDJtX2RvbWFp biAqcDJtKQogI2VuZGlmCiB9CiAKK3N0YXRpYyB2b2lkIHAybV9uZXN0ZWRwMm1faW5pdChzdHJ1 Y3QgcDJtX2RvbWFpbiAqcDJtKQoreworI2lmZGVmIENPTkZJR19IVk0KKyAgICBJTklUX0xJU1Rf SEVBRCgmcDJtLT5ucDJtX2xpc3QpOworCisgICAgcDJtLT5ucDJtX2Jhc2UgPSBQMk1fQkFTRV9F QUREUjsKKyAgICBwMm0tPm5wMm1fZ2VuZXJhdGlvbiA9IDA7CisjZW5kaWYKK30KKwogLyogSW5p dCB0aGUgZGF0YXN0cnVjdHVyZXMgZm9yIGxhdGVyIHVzZSBieSB0aGUgcDJtIGNvZGUgKi8KIHN0 YXRpYyBpbnQgcDJtX2luaXRpYWxpc2Uoc3RydWN0IGRvbWFpbiAqZCwgc3RydWN0IHAybV9kb21h aW4gKnAybSkKIHsKICAgICBpbnQgcmV0ID0gMDsKIAogICAgIG1tX3J3bG9ja19pbml0KCZwMm0t PmxvY2spOwotICAgIElOSVRfTElTVF9IRUFEKCZwMm0tPm5wMm1fbGlzdCk7CiAgICAgSU5JVF9Q QUdFX0xJU1RfSEVBRCgmcDJtLT5wYWdlcyk7CiAKICAgICBwMm0tPmRvbWFpbiA9IGQ7CiAgICAg cDJtLT5kZWZhdWx0X2FjY2VzcyA9IHAybV9hY2Nlc3Nfcnd4OwogICAgIHAybS0+cDJtX2NsYXNz ID0gcDJtX2hvc3Q7CiAKLSAgICBwMm0tPm5wMm1fYmFzZSA9IFAyTV9CQVNFX0VBRERSOwotICAg IHAybS0+bnAybV9nZW5lcmF0aW9uID0gMDsKLQogICAgIHAybV9wb2RfaW5pdChwMm0pOworICAg IHAybV9uZXN0ZWRwMm1faW5pdChwMm0pOwogCiAgICAgaWYgKCBoYXBfZW5hYmxlZChkKSAmJiBj cHVfaGFzX3ZteCApCiAgICAgICAgIHJldCA9IGVwdF9wMm1faW5pdChwMm0pOwpAQCAtMTUxLDYg KzE1OCw3IEBAIHN0YXRpYyB2b2lkIHAybV90ZWFyZG93bl9ob3N0cDJtKHN0cnVjdCBkb21haW4g KmQpCiAgICAgfQogfQogCisjaWZkZWYgQ09ORklHX0hWTQogc3RhdGljIHZvaWQgcDJtX3RlYXJk b3duX25lc3RlZHAybShzdHJ1Y3QgZG9tYWluICpkKQogewogICAgIHVuc2lnbmVkIGludCBpOwpA QCAtMTg4LDYgKzE5Niw3IEBAIHN0YXRpYyBpbnQgcDJtX2luaXRfbmVzdGVkcDJtKHN0cnVjdCBk b21haW4gKmQpCiAKICAgICByZXR1cm4gMDsKIH0KKyNlbmRpZgogCiBzdGF0aWMgdm9pZCBwMm1f dGVhcmRvd25fYWx0cDJtKHN0cnVjdCBkb21haW4gKmQpCiB7CkBAIC0yMzUsNiArMjQ0LDcgQEAg aW50IHAybV9pbml0KHN0cnVjdCBkb21haW4gKmQpCiAgICAgaWYgKCByYyApCiAgICAgICAgIHJl dHVybiByYzsKIAorI2lmZGVmIENPTkZJR19IVk0KICAgICAvKiBNdXN0IGluaXRpYWxpc2UgbmVz dGVkcDJtIHVuY29uZGl0aW9uYWxseQogICAgICAqIHNpbmNlIG5lc3RlZGh2bV9lbmFibGVkKGQp IHJldHVybnMgZmFsc2UgaGVyZS4KICAgICAgKiAocDJtX2luaXQgcnVucyB0b28gZWFybHkgZm9y IEhWTV9QQVJBTV8qIG9wdGlvbnMpICovCkBAIC0yNDQsMTIgKzI1NCwxNSBAQCBpbnQgcDJtX2lu aXQoc3RydWN0IGRvbWFpbiAqZCkKICAgICAgICAgcDJtX3RlYXJkb3duX2hvc3RwMm0oZCk7CiAg ICAgICAgIHJldHVybiByYzsKICAgICB9CisjZW5kaWYKIAogICAgIHJjID0gcDJtX2luaXRfYWx0 cDJtKGQpOwogICAgIGlmICggcmMgKQogICAgIHsKICAgICAgICAgcDJtX3RlYXJkb3duX2hvc3Rw Mm0oZCk7CisjaWZkZWYgQ09ORklHX0hWTQogICAgICAgICBwMm1fdGVhcmRvd25fbmVzdGVkcDJt KGQpOworI2VuZGlmCiAgICAgfQogCiAgICAgcmV0dXJuIHJjOwpAQCAtNzAxLDcgKzcxNCw5IEBA IHZvaWQgcDJtX2ZpbmFsX3RlYXJkb3duKHN0cnVjdCBkb21haW4gKmQpCiAgICAgICogd2UgaW5p dGlhbGlzZSB0aGVtIHVuY29uZGl0aW9uYWxseS4KICAgICAgKi8KICAgICBwMm1fdGVhcmRvd25f YWx0cDJtKGQpOworI2lmZGVmIENPTkZJR19IVk0KICAgICBwMm1fdGVhcmRvd25fbmVzdGVkcDJt KGQpOworI2VuZGlmCiAKICAgICAvKiBJdGVyYXRlIG92ZXIgYWxsIHAybSB0YWJsZXMgcGVyIGRv bWFpbiAqLwogICAgIHAybV90ZWFyZG93bl9ob3N0cDJtKGQpOwpAQCAtMTcyNyw2ICsxNzQyLDcg QEAgdm9pZCBwMm1fYWx0cDJtX2NoZWNrKHN0cnVjdCB2Y3B1ICp2LCB1aW50MTZfdCBpZHgpCiAg ICAgICAgIHAybV9zd2l0Y2hfdmNwdV9hbHRwMm1fYnlfaWQodiwgaWR4KTsKIH0KIAorI2lmZGVm IENPTkZJR19IVk0KIHN0YXRpYyBzdHJ1Y3QgcDJtX2RvbWFpbiAqCiBwMm1fZ2V0bHJ1X25lc3Rl ZHAybShzdHJ1Y3QgZG9tYWluICpkLCBzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtKQogewpAQCAtMTk4 NCw2ICsyMDAwLDcgQEAgdm9pZCBucDJtX3NjaGVkdWxlKGludCBkaXIpCiAgICAgICAgIHAybV91 bmxvY2socDJtKTsKICAgICB9CiB9CisjZW5kaWYKIAogdW5zaWduZWQgbG9uZyBwYWdpbmdfZ3Zh X3RvX2dmbihzdHJ1Y3QgdmNwdSAqdiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dW5zaWduZWQgbG9uZyB2YSwKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvZG9tYWlu LmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2RvbWFpbi5oCmluZGV4IDRkYTQzNTMuLmI0NmNmYjAg MTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvZG9tYWluLmgKKysrIGIveGVuL2luY2x1 ZGUvYXNtLXg4Ni9kb21haW4uaApAQCAtMzMzLDkgKzMzMywxMSBAQCBzdHJ1Y3QgYXJjaF9kb21h aW4KICAgICAgICAgdm9pZCAoKnRhaWwpKHN0cnVjdCB2Y3B1ICopOwogICAgIH0gKmN0eHRfc3dp dGNoOwogCisjaWZkZWYgQ09ORklHX0hWTQogICAgIC8qIG5lc3RlZGh2bTogdHJhbnNsYXRlIGwy IGd1ZXN0IHBoeXNpY2FsIHRvIGhvc3QgcGh5c2ljYWwgKi8KICAgICBzdHJ1Y3QgcDJtX2RvbWFp biAqbmVzdGVkX3AybVtNQVhfTkVTVEVEUDJNXTsKICAgICBtbV9sb2NrX3QgbmVzdGVkX3AybV9s b2NrOworI2VuZGlmCiAKICAgICAvKiBhbHRwMm06IGFsbG93IG11bHRpcGxlIGNvcGllcyBvZiBo b3N0IHAybSAqLwogICAgIGJvb2xfdCBhbHRwMm1fYWN0aXZlOwpkaWZmIC0tZ2l0IGEveGVuL2lu Y2x1ZGUvYXNtLXg4Ni9wMm0uaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKaW5kZXggMzc4 NTU5OC4uMjBjZjNmMSAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaAorKysg Yi94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oCkBAIC0yMDQsNiArMjA0LDcgQEAgc3RydWN0IHAy bV9kb21haW4gewogCiAgICAgcDJtX2NsYXNzX3QgICAgICAgcDJtX2NsYXNzOyAvKiBob3N0L25l c3RlZC9hbHRlcm5hdGUgKi8KIAorI2lmZGVmIENPTkZJR19IVk0KICAgICAvKiBOZXN0ZWQgcDJt cyBvbmx5OiBuZXN0ZWQgcDJtIGJhc2UgdmFsdWUgdGhhdCB0aGlzIHAybSBzaGFkb3dzLgogICAg ICAqIFRoaXMgY2FuIGJlIGNsZWFyZWQgdG8gUDJNX0JBU0VfRUFERFIgdW5kZXIgdGhlIHBlci1w Mm0gbG9jayBidXQKICAgICAgKiBuZWVkcyBib3RoIHRoZSBwZXItcDJtIGxvY2sgYW5kIHRoZSBw ZXItZG9tYWluIG5lc3RlZHAybSBsb2NrCkBAIC0yMTYsNiArMjE3LDcgQEAgc3RydWN0IHAybV9k b21haW4gewogICAgICAqIFRoZSBob3N0IHAybSBoYXNvbGRzIHRoZSBoZWFkIG9mIHRoZSBsaXN0 IGFuZCB0aGUgbnAybXMgYXJlIAogICAgICAqIHRocmVhZGVkIG9uIGluIExSVSBvcmRlci4gKi8K ICAgICBzdHJ1Y3QgbGlzdF9oZWFkICAgbnAybV9saXN0OworI2VuZGlmCiAKICAgICAvKiBIb3N0 IHAybTogTG9nLWRpcnR5IHJhbmdlcyByZWdpc3RlcmVkIGZvciB0aGUgZG9tYWluLiAqLwogICAg IHN0cnVjdCByYW5nZXNldCAgICpsb2dkaXJ0eV9yYW5nZXM7Ci0tIApnaXQtc2VyaWVzIDAuOS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2 ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xp c3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs