From: Wei Liu Subject: [PATCH v2] x86/pv: Fix construction of 32bit dom0's Date: Thu, 14 Feb 2019 11:10:09 +0000 Message-ID: <20190214111009.16448-1-wei.liu2@citrix.com> 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] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1guEuN-0000bO-BX for xen-devel@lists.xenproject.org; Thu, 14 Feb 2019 11:10:23 +0000 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: Andrew Cooper , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org RnJvbTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KCmRvbTBfY29u c3RydWN0X3B2KCkgaGFzIGxvZ2ljIHRvIHRyYW5zaXRpb24gZG9tMCBpbnRvIGEgY29tcGF0IGRv bWFpbiB3aGVuCmJvb3RpbmcgYW4gRUxGMzIgaW1hZ2UuCgpPbmUgYXNwZWN0IHdoaWNoIGlzIG1p c3NpbmcgaXMgdGhlIENQVUlEIHBvbGljeSByZWNhbGN1bGF0aW9uLCBtZWFuaW5nIHRoYXQgYQoz MmJpdCBkb20wIHNlZXMgYSA2NGJpdCBwb2xpY3ksIHdoaWNoIGRpZmZlciBieSB0aGUgTG9uZyBN b2RlIGZlYXR1cmUgZmxhZyBpbgpwYXJ0aWN1bGFyLiAgQW5vdGhlciBtaXNzaW5nIGl0ZW0gaXMg dGhlIHg4N19maXBfd2lkdGggaW5pdGlhbGlzYXRpb24uCgpVcGRhdGUgZG9tMF9jb25zdHJ1Y3Rf cHYoKSB0byB1c2Ugc3dpdGNoX2NvbXBhdCgpLCByYXRoZXIgdGhhbiByZXRhaW5pbmcgdGhlCm9w ZW5jb2RpbmcuICBQb3NpdGlvbiB0aGUgY2FsbCB0byBzd2l0Y2hfY29tcGF0KCkgc3VjaCB0aGF0 IHRoZSBjb21wYXQzMiBsb2NhbAp2YXJpYWJsZSBjYW4gZGlzYXBwZWFyIGVudGlyZWx5LgoKVGhl IDMyYml0IG1vbml0b3IgdGFibGUgaXMgbm93IGNyZWF0ZWQgYnkgc2V0dXBfY29tcGF0X2w0KCks IGF2b2lkaW5nIHRoZSBuZWVkCnRvIGZvciBtYW51YWwgY3JlYXRpb24gbGF0ZXIuICBGdXJ0aGVy bW9yZSwgdGhlIEwzIHRhYmxlIGNyZWF0aW9uIGlzIHJlZHVuZGFudAp3aXRoIHRoZSBsb2dpYyBp bnNpZGUgdGhlIG1haW4gbWFwcGluZyBsb29wLCBzbyBjYW4gYmUgZHJvcHBlZCBhcyB3ZWxsLgoK U2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4K U2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCnYyOgoxLiBS ZXRhaW4gQUJJLWNvbXBhdGliaWxpdHkgY29kZSBhbmQgYWRkIGNvbW1lbnQgcmVmZXJyaW5nIHRv IHhlbi5oLgoyLiBBZGQgQlVJTERfQlVHX09OCi0tLQogeGVuL2FyY2gveDg2L3B2L2RvbTBfYnVp bGQuYyB8IDQwICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHhlbi9h cmNoL3g4Ni9wdi9kb21haW4uYyAgICAgfCAgNCArKystCiAyIGZpbGVzIGNoYW5nZWQsIDE3IGlu c2VydGlvbnMoKyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9w di9kb20wX2J1aWxkLmMgYi94ZW4vYXJjaC94ODYvcHYvZG9tMF9idWlsZC5jCmluZGV4IDgzN2Vm N2JjYTEuLmNlZjJkNDIyNTQgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9wdi9kb20wX2J1aWxk LmMKKysrIGIveGVuL2FyY2gveDg2L3B2L2RvbTBfYnVpbGQuYwpAQCAtMjg1LDcgKzI4NSw3IEBA IGludCBfX2luaXQgZG9tMF9jb25zdHJ1Y3RfcHYoc3RydWN0IGRvbWFpbiAqZCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbW9kdWxlX3QgKmluaXRyZCwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY2hhciAqY21kbGluZSkKIHsKLSAgICBpbnQgaSwgY3B1LCByYywgY29tcGF0 aWJsZSwgY29tcGF0MzIsIG9yZGVyLCBtYWNoaW5lOworICAgIGludCBpLCBjcHUsIHJjLCBjb21w YXRpYmxlLCBvcmRlciwgbWFjaGluZTsKICAgICBzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVnczsK ICAgICB1bnNpZ25lZCBsb25nIHBmbiwgbWZuOwogICAgIHVuc2lnbmVkIGxvbmcgbnJfcGFnZXM7 CkBAIC0zNTQsMTQgKzM1NCwxOCBAQCBpbnQgX19pbml0IGRvbTBfY29uc3RydWN0X3B2KHN0cnVj dCBkb21haW4gKmQsCiAKICAgICAvKiBjb21wYXRpYmlsaXR5IGNoZWNrICovCiAgICAgY29tcGF0 aWJsZSA9IDA7Ci0gICAgY29tcGF0MzIgICA9IDA7CiAgICAgbWFjaGluZSA9IGVsZl91dmFsKCZl bGYsIGVsZi5laGRyLCBlX21hY2hpbmUpOwogICAgIHByaW50aygiIFhlbiAga2VybmVsOiA2NC1i aXQsIGxzYiwgY29tcGF0MzJcbiIpOwogICAgIGlmICggZWxmXzMyYml0KCZlbGYpICYmIHBhcm1z LnBhZSA9PSBYRU5fUEFFX0JJTU9EQUwgKQogICAgICAgICBwYXJtcy5wYWUgPSBYRU5fUEFFX0VY VENSMzsKICAgICBpZiAoIGVsZl8zMmJpdCgmZWxmKSAmJiBwYXJtcy5wYWUgJiYgbWFjaGluZSA9 PSBFTV8zODYgKQogICAgIHsKLSAgICAgICAgY29tcGF0MzIgPSAxOworICAgICAgICBpZiAoIHVu bGlrZWx5KHJjID0gc3dpdGNoX2NvbXBhdChkKSkgKQorICAgICAgICB7CisgICAgICAgICAgICBw cmludGsoIkRvbTAgZmFpbGVkIHRvIHN3aXRjaCB0byBjb21wYXQ6ICVkXG4iLCByYyk7CisgICAg ICAgICAgICByZXR1cm4gcmM7CisgICAgICAgIH0KKwogICAgICAgICBjb21wYXRpYmxlID0gMTsK ICAgICB9CiAgICAgaWYgKGVsZl82NGJpdCgmZWxmKSAmJiBtYWNoaW5lID09IEVNX1g4Nl82NCkK QEAgLTM5MiwxNiArMzk2LDYgQEAgaW50IF9faW5pdCBkb20wX2NvbnN0cnVjdF9wdihzdHJ1Y3Qg ZG9tYWluICpkLAogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYgKCBjb21wYXQzMiApCi0gICAg ewotICAgICAgICBkLT5hcmNoLmlzXzMyYml0X3B2ID0gZC0+YXJjaC5oYXNfMzJiaXRfc2hpbmZv ID0gMTsKLSAgICAgICAgZC0+YXJjaC5wdi54cHRpID0gZmFsc2U7Ci0gICAgICAgIGQtPmFyY2gu cHYucGNpZCA9IGZhbHNlOwotICAgICAgICB2LT52Y3B1X2luZm8gPSAodm9pZCAqKSZkLT5zaGFy ZWRfaW5mby0+Y29tcGF0LnZjcHVfaW5mb1swXTsKLSAgICAgICAgaWYgKCBzZXR1cF9jb21wYXRf YXJnX3hsYXQodikgIT0gMCApCi0gICAgICAgICAgICBCVUcoKTsKLSAgICB9Ci0KICAgICBucl9w YWdlcyA9IGRvbTBfY29tcHV0ZV9ucl9wYWdlcyhkLCAmcGFybXMsIGluaXRyZF9sZW4pOwogCiAg ICAgaWYgKCBwYXJtcy5wYWUgPT0gWEVOX1BBRV9FWFRDUjMgKQpAQCAtNDI1LDggKzQxOSw2IEBA IGludCBfX2luaXQgZG9tMF9jb25zdHJ1Y3RfcHYoc3RydWN0IGRvbWFpbiAqZCwKICAgICAgICAg cGFybXMucDJtX2Jhc2UgPSBVTlNFVF9BRERSOwogICAgIH0KIAotICAgIGRvbWFpbl9zZXRfYWxs b2NfYml0c2l6ZShkKTsKLQogICAgIC8qCiAgICAgICogV2h5IGRvIHdlIG5lZWQgdGhpcz8gVGhl IG51bWJlciBvZiBwYWdlLXRhYmxlIGZyYW1lcyBkZXBlbmRzIG9uIHRoZQogICAgICAqIHNpemUg b2YgdGhlIGJvb3RzdHJhcCBhZGRyZXNzIHNwYWNlLiBCdXQgdGhlIHNpemUgb2YgdGhlIGFkZHJl c3Mgc3BhY2UKQEAgLTYwNiwyMyArNTk4LDE5IEBAIGludCBfX2luaXQgZG9tMF9jb25zdHJ1Y3Rf cHYoc3RydWN0IGRvbWFpbiAqZCwKICAgICB7CiAgICAgICAgIG1hZGRyX3RvX3BhZ2UobXB0X2Fs bG9jKS0+dS5pbnVzZS50eXBlX2luZm8gPSBQR1RfbDRfcGFnZV90YWJsZTsKICAgICAgICAgbDRz dGFydCA9IGw0dGFiID0gX192YShtcHRfYWxsb2MpOyBtcHRfYWxsb2MgKz0gUEFHRV9TSVpFOwor ICAgICAgICBjbGVhcl9wYWdlKGw0dGFiKTsKKyAgICAgICAgaW5pdF94ZW5fbDRfc2xvdHMobDR0 YWIsIF9tZm4odmlydF90b19tZm4obDRzdGFydCkpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICBkLCBJTlZBTElEX01GTiwgdHJ1ZSk7CisgICAgICAgIHYtPmFyY2guZ3Vlc3RfdGFibGUgPSBw YWdldGFibGVfZnJvbV9wYWRkcihfX3BhKGw0c3RhcnQpKTsKICAgICB9CiAgICAgZWxzZQogICAg IHsKLSAgICAgICAgcGFnZSA9IGFsbG9jX2RvbWhlYXBfcGFnZShkLCBNRU1GX25vX293bmVyIHwg TUVNRl9ub19zY3J1Yik7Ci0gICAgICAgIGlmICggIXBhZ2UgKQotICAgICAgICAgICAgcGFuaWMo Ik5vdCBlbm91Z2ggUkFNIGZvciBkb21haW4gMCBQTUw0XG4iKTsKLSAgICAgICAgcGFnZS0+dS5p bnVzZS50eXBlX2luZm8gPSBQR1RfbDRfcGFnZV90YWJsZXxQR1RfdmFsaWRhdGVkfDE7Ci0gICAg ICAgIGw0c3RhcnQgPSBsNHRhYiA9IHBhZ2VfdG9fdmlydChwYWdlKTsKKyAgICAgICAgLyogTW9u aXRvciB0YWJsZSBhbHJlYWR5IGNyZWF0ZWQgYnkgc3dpdGNoX2NvbXBhdCgpLiAqLworICAgICAg ICBsNHN0YXJ0ID0gbDR0YWIgPSBfX3ZhKHBhZ2V0YWJsZV9nZXRfcGFkZHIodi0+YXJjaC5ndWVz dF90YWJsZSkpOworICAgICAgICAvKiBTZWUgcHVibGljL3hlbi5oIG9uIHdoeSB0aGUgZm9sbG93 aW5nIGlzIG5lZWRlZC4gKi8KICAgICAgICAgbWFkZHJfdG9fcGFnZShtcHRfYWxsb2MpLT51Lmlu dXNlLnR5cGVfaW5mbyA9IFBHVF9sM19wYWdlX3RhYmxlOwogICAgICAgICBsM3N0YXJ0ID0gX192 YShtcHRfYWxsb2MpOyBtcHRfYWxsb2MgKz0gUEFHRV9TSVpFOwogICAgIH0KLSAgICBjbGVhcl9w YWdlKGw0dGFiKTsKLSAgICBpbml0X3hlbl9sNF9zbG90cyhsNHRhYiwgX21mbih2aXJ0X3RvX21m bihsNHN0YXJ0KSksCi0gICAgICAgICAgICAgICAgICAgICAgZCwgSU5WQUxJRF9NRk4sIHRydWUp OwotICAgIHYtPmFyY2guZ3Vlc3RfdGFibGUgPSBwYWdldGFibGVfZnJvbV9wYWRkcihfX3BhKGw0 c3RhcnQpKTsKLSAgICBpZiAoIGlzX3B2XzMyYml0X2RvbWFpbihkKSApCi0gICAgICAgIHYtPmFy Y2guZ3Vlc3RfdGFibGVfdXNlciA9IHYtPmFyY2guZ3Vlc3RfdGFibGU7CiAKICAgICBsNHRhYiAr PSBsNF90YWJsZV9vZmZzZXQodl9zdGFydCk7CiAgICAgcGZuID0gYWxsb2Nfc3BmbjsKZGlmZiAt LWdpdCBhL3hlbi9hcmNoL3g4Ni9wdi9kb21haW4uYyBiL3hlbi9hcmNoL3g4Ni9wdi9kb21haW4u YwppbmRleCA3ZTg0YjA0MDgyLi44MDQ2NzY5MWMyIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYv cHYvZG9tYWluLmMKKysrIGIveGVuL2FyY2gveDg2L3B2L2RvbWFpbi5jCkBAIC03MCw3ICs3MCw3 IEBAIHN0YXRpYyBpbnQgc2V0dXBfY29tcGF0X2w0KHN0cnVjdCB2Y3B1ICp2KQogICAgIGw0X3Bn ZW50cnlfdCAqbDR0YWI7CiAgICAgbWZuX3QgbWZuOwogCi0gICAgcGcgPSBhbGxvY19kb21oZWFw X3BhZ2Uodi0+ZG9tYWluLCBNRU1GX25vX293bmVyKTsKKyAgICBwZyA9IGFsbG9jX2RvbWhlYXBf cGFnZSh2LT5kb21haW4sIE1FTUZfbm9fb3duZXIgfCBNRU1GX25vX3NjcnViKTsKICAgICBpZiAo IHBnID09IE5VTEwgKQogICAgICAgICByZXR1cm4gLUVOT01FTTsKIApAQCAtMTAyLDYgKzEwMiw4 IEBAIGludCBzd2l0Y2hfY29tcGF0KHN0cnVjdCBkb21haW4gKmQpCiAgICAgc3RydWN0IHZjcHUg KnY7CiAgICAgaW50IHJjOwogCisgICAgQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBzaGFy ZWRfaW5mbywgdmNwdV9pbmZvKSAhPSAwKTsKKwogICAgIGlmICggaXNfaHZtX2RvbWFpbihkKSB8 fCBkLT50b3RfcGFnZXMgIT0gMCApCiAgICAgICAgIHJldHVybiAtRUFDQ0VTOwogICAgIGlmICgg aXNfcHZfMzJiaXRfZG9tYWluKGQpICkKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRl dmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFp bG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=