From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH for 4.9 1/6] x86/hvm: Correct some address space terminology Date: Fri, 31 Mar 2017 20:50:48 +0100 Message-ID: <1490989853-21879-2-git-send-email-andrew.cooper3@citrix.com> References: <1490989853-21879-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1490989853-21879-1-git-send-email-andrew.cooper3@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: Andrew Cooper , Julien Grall , Paul Durrant , Tim Deegan , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhlIGZ1bmN0aW9uIGh2bV90cmFuc2xhdGVfbGluZWFyX2FkZHIoKSB0cmFuc2xhdGVzIGEgdmly dHVhbCBhZGRyZXNzIHRvIGEKbGluZWFyIGFkZHJlc3MsIG5vdCBhIGxpbmVhciBhZGRyZXNzIHRv IGEgcGh5c2ljYWwgYWRkcmVzcy4gIENvcnJlY3QgaXRzIG5hbWUuCgpCb3RoIGh2bV90cmFuc2xh dGVfdmlydHVhbF9hZGRyKCkgYW5kIGh2bWVtdWxfdmlydHVhbF90b19saW5lYXIoKSByZXR1cm4g YQpsaW5lYXIgYWRkcmVzcywgbm90IGEgcGh5c2ljYWwgYWRkcmVzcy4gIENvcnJlY3QgdGhlIHBh cmFtZXRlcnMgbmFtZS4KCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoKU2lnbmVkLW9mZi1ieTogQW5k cmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCkNDOiBKYW4gQmV1bGlj aCA8SkJldWxpY2hAc3VzZS5jb20+CkNDOiBUaW0gRGVlZ2FuIDx0aW1AeGVuLm9yZz4KQ0M6IFBh dWwgRHVycmFudCA8cGF1bC5kdXJyYW50QGNpdHJpeC5jb20+CkNDOiBKdWxpZW4gR3JhbGwgPGp1 bGllbi5ncmFsbEBhcm0uY29tPgotLS0KIHhlbi9hcmNoL3g4Ni9odm0vZW11bGF0ZS5jICAgICAg fCAxMiArKysrKystLS0tLS0KIHhlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMgfCAxNiAr KysrKysrKy0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDE0IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vZW11bGF0ZS5jIGIveGVu L2FyY2gveDg2L2h2bS9lbXVsYXRlLmMKaW5kZXggMmQ5Mjk1Ny4uNDA3MzcxNSAxMDA2NDQKLS0t IGEveGVuL2FyY2gveDg2L2h2bS9lbXVsYXRlLmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS9lbXVs YXRlLmMKQEAgLTUwNiw3ICs1MDYsNyBAQCBzdGF0aWMgaW50IGh2bWVtdWxfdmlydHVhbF90b19s aW5lYXIoCiAgICAgdW5zaWduZWQgbG9uZyAqcmVwcywKICAgICBlbnVtIGh2bV9hY2Nlc3NfdHlw ZSBhY2Nlc3NfdHlwZSwKICAgICBzdHJ1Y3QgaHZtX2VtdWxhdGVfY3R4dCAqaHZtZW11bF9jdHh0 LAotICAgIHVuc2lnbmVkIGxvbmcgKnBhZGRyKQorICAgIHVuc2lnbmVkIGxvbmcgKmxpbmVhcikK IHsKICAgICBzdHJ1Y3Qgc2VnbWVudF9yZWdpc3RlciAqcmVnOwogICAgIGludCBva2F5OwpAQCAt NTE0LDcgKzUxNCw3IEBAIHN0YXRpYyBpbnQgaHZtZW11bF92aXJ0dWFsX3RvX2xpbmVhcigKIAog ICAgIGlmICggc2VnID09IHg4Nl9zZWdfbm9uZSApCiAgICAgewotICAgICAgICAqcGFkZHIgPSBv ZmZzZXQ7CisgICAgICAgICpsaW5lYXIgPSBvZmZzZXQ7CiAgICAgICAgIHJldHVybiBYODZFTVVM X09LQVk7CiAgICAgfQogCkBAIC01NDksMTYgKzU0OSwxNiBAQCBzdGF0aWMgaW50IGh2bWVtdWxf dmlydHVhbF90b19saW5lYXIoCiAgICAgICAgIG9rYXkgPSBodm1fdmlydHVhbF90b19saW5lYXJf YWRkcigKICAgICAgICAgICAgIHNlZywgcmVnLCBvZmZzZXQgLSAoKnJlcHMgLSAxKSAqIGJ5dGVz X3Blcl9yZXAsCiAgICAgICAgICAgICAqcmVwcyAqIGJ5dGVzX3Blcl9yZXAsIGFjY2Vzc190eXBl LAotICAgICAgICAgICAgaHZtZW11bF9jdHh0LT5jdHh0LmFkZHJfc2l6ZSwgcGFkZHIpOwotICAg ICAgICAqcGFkZHIgKz0gKCpyZXBzIC0gMSkgKiBieXRlc19wZXJfcmVwOworICAgICAgICAgICAg aHZtZW11bF9jdHh0LT5jdHh0LmFkZHJfc2l6ZSwgbGluZWFyKTsKKyAgICAgICAgKmxpbmVhciAr PSAoKnJlcHMgLSAxKSAqIGJ5dGVzX3Blcl9yZXA7CiAgICAgICAgIGlmICggaHZtZW11bF9jdHh0 LT5jdHh0LmFkZHJfc2l6ZSAhPSA2NCApCi0gICAgICAgICAgICAqcGFkZHIgPSAodWludDMyX3Qp KnBhZGRyOworICAgICAgICAgICAgKmxpbmVhciA9ICh1aW50MzJfdCkqbGluZWFyOwogICAgIH0K ICAgICBlbHNlCiAgICAgewogICAgICAgICBva2F5ID0gaHZtX3ZpcnR1YWxfdG9fbGluZWFyX2Fk ZHIoCiAgICAgICAgICAgICBzZWcsIHJlZywgb2Zmc2V0LCAqcmVwcyAqIGJ5dGVzX3Blcl9yZXAs IGFjY2Vzc190eXBlLAotICAgICAgICAgICAgaHZtZW11bF9jdHh0LT5jdHh0LmFkZHJfc2l6ZSwg cGFkZHIpOworICAgICAgICAgICAgaHZtZW11bF9jdHh0LT5jdHh0LmFkZHJfc2l6ZSwgbGluZWFy KTsKICAgICB9CiAKICAgICBpZiAoIG9rYXkgKQpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21t L3NoYWRvdy9jb21tb24uYyBiL3hlbi9hcmNoL3g4Ni9tbS9zaGFkb3cvY29tbW9uLmMKaW5kZXgg ZDkzZjJhYi4uMDNjYjI0ZCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3NoYWRvdy9jb21t b24uYworKysgYi94ZW4vYXJjaC94ODYvbW0vc2hhZG93L2NvbW1vbi5jCkBAIC0xMzYsMTMgKzEz NiwxMyBAQCBzdGF0aWMgc3RydWN0IHNlZ21lbnRfcmVnaXN0ZXIgKmh2bV9nZXRfc2VnX3JlZygK ICAgICByZXR1cm4gc2VnX3JlZzsKIH0KIAotc3RhdGljIGludCBodm1fdHJhbnNsYXRlX2xpbmVh cl9hZGRyKAorc3RhdGljIGludCBodm1fdHJhbnNsYXRlX3ZpcnR1YWxfYWRkcigKICAgICBlbnVt IHg4Nl9zZWdtZW50IHNlZywKICAgICB1bnNpZ25lZCBsb25nIG9mZnNldCwKICAgICB1bnNpZ25l ZCBpbnQgYnl0ZXMsCiAgICAgZW51bSBodm1fYWNjZXNzX3R5cGUgYWNjZXNzX3R5cGUsCiAgICAg c3RydWN0IHNoX2VtdWxhdGVfY3R4dCAqc2hfY3R4dCwKLSAgICB1bnNpZ25lZCBsb25nICpwYWRk cikKKyAgICB1bnNpZ25lZCBsb25nICpsaW5lYXIpCiB7CiAgICAgY29uc3Qgc3RydWN0IHNlZ21l bnRfcmVnaXN0ZXIgKnJlZzsKICAgICBpbnQgb2theTsKQEAgLTE1Miw3ICsxNTIsNyBAQCBzdGF0 aWMgaW50IGh2bV90cmFuc2xhdGVfbGluZWFyX2FkZHIoCiAgICAgICAgIHJldHVybiAtUFRSX0VS UihyZWcpOwogCiAgICAgb2theSA9IGh2bV92aXJ0dWFsX3RvX2xpbmVhcl9hZGRyKAotICAgICAg ICBzZWcsIHJlZywgb2Zmc2V0LCBieXRlcywgYWNjZXNzX3R5cGUsIHNoX2N0eHQtPmN0eHQuYWRk cl9zaXplLCBwYWRkcik7CisgICAgICAgIHNlZywgcmVnLCBvZmZzZXQsIGJ5dGVzLCBhY2Nlc3Nf dHlwZSwgc2hfY3R4dC0+Y3R4dC5hZGRyX3NpemUsIGxpbmVhcik7CiAKICAgICBpZiAoICFva2F5 ICkKICAgICB7CkBAIC0xODMsNyArMTgzLDcgQEAgaHZtX3JlYWQoZW51bSB4ODZfc2VnbWVudCBz ZWcsCiAgICAgdW5zaWduZWQgbG9uZyBhZGRyOwogICAgIGludCByYzsKIAotICAgIHJjID0gaHZt X3RyYW5zbGF0ZV9saW5lYXJfYWRkcigKKyAgICByYyA9IGh2bV90cmFuc2xhdGVfdmlydHVhbF9h ZGRyKAogICAgICAgICBzZWcsIG9mZnNldCwgYnl0ZXMsIGFjY2Vzc190eXBlLCBzaF9jdHh0LCAm YWRkcik7CiAgICAgaWYgKCByYyB8fCAhYnl0ZXMgKQogICAgICAgICByZXR1cm4gcmM7CkBAIC0y NjUsNyArMjY1LDcgQEAgaHZtX2VtdWxhdGVfd3JpdGUoZW51bSB4ODZfc2VnbWVudCBzZWcsCiAg ICAgaWYgKCBzZWcgPT0geDg2X3NlZ19zcyApCiAgICAgICAgIHBlcmZjX2luY3Ioc2hhZG93X2Zh dWx0X2VtdWxhdGVfc3RhY2spOwogCi0gICAgcmMgPSBodm1fdHJhbnNsYXRlX2xpbmVhcl9hZGRy KAorICAgIHJjID0gaHZtX3RyYW5zbGF0ZV92aXJ0dWFsX2FkZHIoCiAgICAgICAgIHNlZywgb2Zm c2V0LCBieXRlcywgaHZtX2FjY2Vzc193cml0ZSwgc2hfY3R4dCwgJmFkZHIpOwogICAgIGlmICgg cmMgfHwgIWJ5dGVzICkKICAgICAgICAgcmV0dXJuIHJjOwpAQCAtMjkxLDcgKzI5MSw3IEBAIGh2 bV9lbXVsYXRlX2NtcHhjaGcoZW51bSB4ODZfc2VnbWVudCBzZWcsCiAgICAgaWYgKCBieXRlcyA+ IHNpemVvZihsb25nKSApCiAgICAgICAgIHJldHVybiBYODZFTVVMX1VOSEFORExFQUJMRTsKIAot ICAgIHJjID0gaHZtX3RyYW5zbGF0ZV9saW5lYXJfYWRkcigKKyAgICByYyA9IGh2bV90cmFuc2xh dGVfdmlydHVhbF9hZGRyKAogICAgICAgICBzZWcsIG9mZnNldCwgYnl0ZXMsIGh2bV9hY2Nlc3Nf d3JpdGUsIHNoX2N0eHQsICZhZGRyKTsKICAgICBpZiAoIHJjICkKICAgICAgICAgcmV0dXJuIHJj OwpAQCAtMzQ1LDcgKzM0NSw3IEBAIGNvbnN0IHN0cnVjdCB4ODZfZW11bGF0ZV9vcHMgKnNoYWRv d19pbml0X2VtdWxhdGlvbigKICAgICAvKiBBdHRlbXB0IHRvIHByZWZldGNoIHdob2xlIGluc3Ry dWN0aW9uLiAqLwogICAgIHNoX2N0eHQtPmluc25fYnVmX2VpcCA9IHJlZ3MtPnJpcDsKICAgICBz aF9jdHh0LT5pbnNuX2J1Zl9ieXRlcyA9Ci0gICAgICAgICghaHZtX3RyYW5zbGF0ZV9saW5lYXJf YWRkcigKKyAgICAgICAgKCFodm1fdHJhbnNsYXRlX3ZpcnR1YWxfYWRkcigKICAgICAgICAgICAg IHg4Nl9zZWdfY3MsIHJlZ3MtPnJpcCwgc2l6ZW9mKHNoX2N0eHQtPmluc25fYnVmKSwKICAgICAg ICAgICAgIGh2bV9hY2Nlc3NfaW5zbl9mZXRjaCwgc2hfY3R4dCwgJmFkZHIpICYmCiAgICAgICAg ICAhaHZtX2ZldGNoX2Zyb21fZ3Vlc3RfbGluZWFyKApAQCAtMzc0LDcgKzM3NCw3IEBAIHZvaWQg c2hhZG93X2NvbnRpbnVlX2VtdWxhdGlvbihzdHJ1Y3Qgc2hfZW11bGF0ZV9jdHh0ICpzaF9jdHh0 LAogICAgIHsKICAgICAgICAgLyogUHJlZmV0Y2ggbW9yZSBieXRlcy4gKi8KICAgICAgICAgc2hf Y3R4dC0+aW5zbl9idWZfYnl0ZXMgPQotICAgICAgICAgICAgKCFodm1fdHJhbnNsYXRlX2xpbmVh cl9hZGRyKAorICAgICAgICAgICAgKCFodm1fdHJhbnNsYXRlX3ZpcnR1YWxfYWRkcigKICAgICAg ICAgICAgICAgICB4ODZfc2VnX2NzLCByZWdzLT5yaXAsIHNpemVvZihzaF9jdHh0LT5pbnNuX2J1 ZiksCiAgICAgICAgICAgICAgICAgaHZtX2FjY2Vzc19pbnNuX2ZldGNoLCBzaF9jdHh0LCAmYWRk cikgJiYKICAgICAgICAgICAgICAhaHZtX2ZldGNoX2Zyb21fZ3Vlc3RfbGluZWFyKAotLSAKMi4x LjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMu eGVuLm9yZy94ZW4tZGV2ZWwK