From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: [PULL 01/36] xen: fix ram init regression Date: Mon, 4 Jul 2016 19:46:06 +0300 Message-ID: <20160704194606-mutt-send-email-mst@redhat.com> References: <1467650742-17580-1-git-send-email-mst@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1467650742-17580-1-git-send-email-mst@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefano Stabellini , Eduardo Habkost , xen-devel@lists.xensource.com, Gerd Hoffmann , Anthony PERARD , Paolo Bonzini , Richard Henderson List-Id: xen-devel@lists.xenproject.org RnJvbTogR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+CgpDb21taXQgIjgxNTZkNDgg cGM6IGFsbG93IHJhaXNpbmcgbG93IG1lbW9yeSB2aWEgbWF4LXJhbS1iZWxvdy00ZwpvcHRpb24i IGNhdXNlcyBhIHJlZ3Jlc3Npb24gb24geGVuLCBiZWNhdXNlIGl0IHVzZXMgYSBkaWZmZXJlbnQK bWVtb3J5IHNwbGl0LgoKVGhpcyBwYXRjaCBpbml0aWFsaXplcyBtYXgtcmFtLWJlbG93LTRnIHRv IHplcm8gYW5kIGxlYXZlcyB0aGUKaW5pdGlhbGl6YXRpb24gdG8gdGhlIG1lbW9yeSBpbml0aWFs aXphdGlvbiBmdW5jdGlvbnMuICBUaGF0IHdheQp0aGV5IGNhbiBwaWNrIGRpZmZlcmVudCBkZWZh dWx0IHZhbHVlcyAobWF4LXJhbS1iZWxvdy00ZyBpcyB6ZXJvCnN0aWxsKSBvciB1c2UgdGhlIHVz ZXIgc3VwcGxpZWQgdmFsdWUgKG1heC1yYW0tYmVsb3ctNGcgaXMgbm9uLXplcm8pLgoKQWxzbyBz a2lwIHRoZSB3aG9sZSByYW0gc3BsaXQgY2FsY3VsYXRpb24gb24gWGVuLiAgeGVuX3JhbV9pbml0 KCkKZG9lcyBpdHMgb3duIHNwbGl0IGNhbGN1bGF0aW9uIGFueXdheSBzbyBpdCBpcyBzdXBlcmZs dW91cywgYWxzbwp0aGlzIHdheSB4ZW5fcmFtX2luaXQgY2FuIGFjdHVhbGx5IHNlZSB3aGVuZXZl ciBtYXgtcmFtLWJlbG93LTRnCmlzIHplcm8gb3Igbm90LgoKUmVwb3J0ZWQtYnk6IEFudGhvbnkg UEVSQVJEIDxhbnRob255LnBlcmFyZEBjaXRyaXguY29tPgpUZXN0ZWQtYnk6IEFudGhvbnkgUEVS QVJEIDxhbnRob255LnBlcmFyZEBjaXRyaXguY29tPgpTaWduZWQtb2ZmLWJ5OiBHZXJkIEhvZmZt YW5uIDxrcmF4ZWxAcmVkaGF0LmNvbT4KUmV2aWV3ZWQtYnk6IE1pY2hhZWwgUy4gVHNpcmtpbiA8 bXN0QHJlZGhhdC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pY2hhZWwgUy4gVHNpcmtpbiA8bXN0QHJl ZGhhdC5jb20+Ci0tLQogaHcvaTM4Ni9wYy5jICAgICAgfCAgMiArLQogaHcvaTM4Ni9wY19waWl4 LmMgfCA1MCArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogaHcvaTM4Ni9wY19xMzUuYyAgfCAgMyArKysKIHhlbi1odm0uYyAgICAgICAgIHwgIDMgKysr CiA0IGZpbGVzIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2h3L2kzODYvcGMuYyBiL2h3L2kzODYvcGMuYwppbmRleCA0NGE4ZjNiLi5jZDE3 NDVlIDEwMDY0NAotLS0gYS9ody9pMzg2L3BjLmMKKysrIGIvaHcvaTM4Ni9wYy5jCkBAIC0xOTE5 LDcgKzE5MTksNyBAQCBzdGF0aWMgdm9pZCBwY19tYWNoaW5lX2luaXRmbihPYmplY3QgKm9iaikK ICAgICAgICAgICAgICAgICAgICAgICAgIHBjX21hY2hpbmVfZ2V0X2hvdHBsdWdfbWVtb3J5X3Jl Z2lvbl9zaXplLAogICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwgTlVMTCwgTlVMTCwgJmVy cm9yX2Fib3J0KTsKIAotICAgIHBjbXMtPm1heF9yYW1fYmVsb3dfNGcgPSAweGUwMDAwMDAwOyAv KiAzLjVHICovCisgICAgcGNtcy0+bWF4X3JhbV9iZWxvd180ZyA9IDA7IC8qIHVzZSBkZWZhdWx0 ICovCiAgICAgb2JqZWN0X3Byb3BlcnR5X2FkZChvYmosIFBDX01BQ0hJTkVfTUFYX1JBTV9CRUxP V180RywgInNpemUiLAogICAgICAgICAgICAgICAgICAgICAgICAgcGNfbWFjaGluZV9nZXRfbWF4 X3JhbV9iZWxvd180ZywKICAgICAgICAgICAgICAgICAgICAgICAgIHBjX21hY2hpbmVfc2V0X21h eF9yYW1fYmVsb3dfNGcsCmRpZmYgLS1naXQgYS9ody9pMzg2L3BjX3BpaXguYyBiL2h3L2kzODYv cGNfcGlpeC5jCmluZGV4IGM3ZDcwYWYuLmEwN2RjODEgMTAwNjQ0Ci0tLSBhL2h3L2kzODYvcGNf cGlpeC5jCisrKyBiL2h3L2kzODYvcGNfcGlpeC5jCkBAIC0xMDgsMzcgKzEwOCw0MyBAQCBzdGF0 aWMgdm9pZCBwY19pbml0MShNYWNoaW5lU3RhdGUgKm1hY2hpbmUsCiAgICAgICogICAgc28gbGVn YWN5IG5vbi1QQUUgZ3Vlc3RzIGNhbiBnZXQgYXMgbXVjaCBtZW1vcnkgYXMgcG9zc2libGUgaW4K ICAgICAgKiAgICB0aGUgMzJiaXQgYWRkcmVzcyBzcGFjZSBiZWxvdyA0Ry4KICAgICAgKgorICAg ICAqICAtIE5vdGUgdGhhdCBYZW4gaGFzIGl0cyBvd24gcmFtIHNldHAgY29kZSBpbiB4ZW5fcmFt X2luaXQoKSwKKyAgICAgKiAgICBjYWxsZWQgdmlhIHhlbl9odm1faW5pdCgpLgorICAgICAqCiAg ICAgICogRXhhbXBsZXM6CiAgICAgICogICAgcWVtdSAtTSBwYy0xLjcgLW0gNEcgICAgKG9sZCBk ZWZhdWx0KSAgICAtPiAzNTg0TSBsb3csICA1MTJNIGhpZ2gKICAgICAgKiAgICBxZW11IC1NIHBj IC1tIDRHICAgICAgICAobmV3IGRlZmF1bHQpICAgIC0+IDMwNzJNIGxvdywgMTAyNE0gaGlnaAog ICAgICAqICAgIHFlbXUgLU0gcGMsbWF4LXJhbS1iZWxvdy00Zz0yRyAtbSA0RyAgICAgLT4gMjA0 OE0gbG93LCAyMDQ4TSBoaWdoCiAgICAgICogICAgcWVtdSAtTSBwYyxtYXgtcmFtLWJlbG93LTRn PTRHIC1tIDM5NjhNICAtPiAzOTY4TSBsb3cgKD00Ry0xMjhNKQogICAgICAqLwotICAgIGxvd21l bSA9IHBjbXMtPm1heF9yYW1fYmVsb3dfNGc7Ci0gICAgaWYgKG1hY2hpbmUtPnJhbV9zaXplID49 IHBjbXMtPm1heF9yYW1fYmVsb3dfNGcpIHsKLSAgICAgICAgaWYgKHBjbWMtPmdpZ2FieXRlX2Fs aWduKSB7Ci0gICAgICAgICAgICBpZiAobG93bWVtID4gMHhjMDAwMDAwMCkgewotICAgICAgICAg ICAgICAgIGxvd21lbSA9IDB4YzAwMDAwMDA7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBp ZiAobG93bWVtICYgKCgxVUxMIDw8IDMwKSAtIDEpKSB7Ci0gICAgICAgICAgICAgICAgZXJyb3Jf cmVwb3J0KCJXYXJuaW5nOiBMYXJnZSBtYWNoaW5lIGFuZCBtYXhfcmFtX2JlbG93XzRnICIKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIiglIiBQUkl1NjQgIikgbm90IGEgbXVsdGlwbGUg b2YgMUc7ICIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInBvc3NpYmxlIGJhZCBwZXJm b3JtYW5jZS4iLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwY21zLT5tYXhfcmFtX2Jl bG93XzRnKTsKKyAgICBpZiAoeGVuX2VuYWJsZWQoKSkgeworICAgICAgICB4ZW5faHZtX2luaXQo cGNtcywgJnJhbV9tZW1vcnkpOworICAgIH0gZWxzZSB7CisgICAgICAgIGlmICghcGNtcy0+bWF4 X3JhbV9iZWxvd180ZykgeworICAgICAgICAgICAgcGNtcy0+bWF4X3JhbV9iZWxvd180ZyA9IDB4 ZTAwMDAwMDA7IC8qIGRlZmF1bHQ6IDMuNUcgKi8KKyAgICAgICAgfQorICAgICAgICBsb3dtZW0g PSBwY21zLT5tYXhfcmFtX2JlbG93XzRnOworICAgICAgICBpZiAobWFjaGluZS0+cmFtX3NpemUg Pj0gcGNtcy0+bWF4X3JhbV9iZWxvd180ZykgeworICAgICAgICAgICAgaWYgKHBjbWMtPmdpZ2Fi eXRlX2FsaWduKSB7CisgICAgICAgICAgICAgICAgaWYgKGxvd21lbSA+IDB4YzAwMDAwMDApIHsK KyAgICAgICAgICAgICAgICAgICAgbG93bWVtID0gMHhjMDAwMDAwMDsKKyAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICAgICAgaWYgKGxvd21lbSAmICgoMVVMTCA8PCAzMCkgLSAxKSkgewor ICAgICAgICAgICAgICAgICAgICBlcnJvcl9yZXBvcnQoIldhcm5pbmc6IExhcmdlIG1hY2hpbmUg YW5kIG1heF9yYW1fYmVsb3dfNGcgIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IiglIiBQUkl1NjQgIikgbm90IGEgbXVsdGlwbGUgb2YgMUc7ICIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJwb3NzaWJsZSBiYWQgcGVyZm9ybWFuY2UuIiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHBjbXMtPm1heF9yYW1fYmVsb3dfNGcpOworICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgIH0KIAotICAgIGlmIChtYWNo aW5lLT5yYW1fc2l6ZSA+PSBsb3dtZW0pIHsKLSAgICAgICAgcGNtcy0+YWJvdmVfNGdfbWVtX3Np emUgPSBtYWNoaW5lLT5yYW1fc2l6ZSAtIGxvd21lbTsKLSAgICAgICAgcGNtcy0+YmVsb3dfNGdf bWVtX3NpemUgPSBsb3dtZW07Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgcGNtcy0+YWJvdmVfNGdf bWVtX3NpemUgPSAwOwotICAgICAgICBwY21zLT5iZWxvd180Z19tZW1fc2l6ZSA9IG1hY2hpbmUt PnJhbV9zaXplOwotICAgIH0KLQotICAgIGlmICh4ZW5fZW5hYmxlZCgpKSB7Ci0gICAgICAgIHhl bl9odm1faW5pdChwY21zLCAmcmFtX21lbW9yeSk7CisgICAgICAgIGlmIChtYWNoaW5lLT5yYW1f c2l6ZSA+PSBsb3dtZW0pIHsKKyAgICAgICAgICAgIHBjbXMtPmFib3ZlXzRnX21lbV9zaXplID0g bWFjaGluZS0+cmFtX3NpemUgLSBsb3dtZW07CisgICAgICAgICAgICBwY21zLT5iZWxvd180Z19t ZW1fc2l6ZSA9IGxvd21lbTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHBjbXMtPmFi b3ZlXzRnX21lbV9zaXplID0gMDsKKyAgICAgICAgICAgIHBjbXMtPmJlbG93XzRnX21lbV9zaXpl ID0gbWFjaGluZS0+cmFtX3NpemU7CisgICAgICAgIH0KICAgICB9CiAKICAgICBwY19jcHVzX2lu aXQocGNtcyk7CmRpZmYgLS1naXQgYS9ody9pMzg2L3BjX3EzNS5jIGIvaHcvaTM4Ni9wY19xMzUu YwppbmRleCAwNGIyNjg0Li5jZDU3YmNlIDEwMDY0NAotLS0gYS9ody9pMzg2L3BjX3EzNS5jCisr KyBiL2h3L2kzODYvcGNfcTM1LmMKQEAgLTk0LDYgKzk0LDkgQEAgc3RhdGljIHZvaWQgcGNfcTM1 X2luaXQoTWFjaGluZVN0YXRlICptYWNoaW5lKQogICAgIC8qIEhhbmRsZSB0aGUgbWFjaGluZSBv cHQgbWF4LXJhbS1iZWxvdy00Zy4gIEl0IGlzIGJhc2ljYWxseSBkb2luZwogICAgICAqIG1pbihx ZW11IGxpbWl0LCB1c2VyIGxpbWl0KS4KICAgICAgKi8KKyAgICBpZiAoIXBjbXMtPm1heF9yYW1f YmVsb3dfNGcpIHsKKyAgICAgICAgcGNtcy0+bWF4X3JhbV9iZWxvd180ZyA9IDFVTEwgPDwgMzI7 IC8qIGRlZmF1bHQ6IDRHICovOworICAgIH0KICAgICBpZiAobG93bWVtID4gcGNtcy0+bWF4X3Jh bV9iZWxvd180ZykgewogICAgICAgICBsb3dtZW0gPSBwY21zLT5tYXhfcmFtX2JlbG93XzRnOwog ICAgICAgICBpZiAobWFjaGluZS0+cmFtX3NpemUgLSBsb3dtZW0gPiBsb3dtZW0gJiYKZGlmZiAt LWdpdCBhL3hlbi1odm0uYyBiL3hlbi1odm0uYwppbmRleCA5OGVhNDRmLi5lYjU3NzkyIDEwMDY0 NAotLS0gYS94ZW4taHZtLmMKKysrIGIveGVuLWh2bS5jCkBAIC0xOTAsNiArMTkwLDkgQEAgc3Rh dGljIHZvaWQgeGVuX3JhbV9pbml0KFBDTWFjaGluZVN0YXRlICpwY21zLAogICAgIC8qIEhhbmRs ZSB0aGUgbWFjaGluZSBvcHQgbWF4LXJhbS1iZWxvdy00Zy4gIEl0IGlzIGJhc2ljYWxseSBkb2lu ZwogICAgICAqIG1pbih4ZW4gbGltaXQsIHVzZXIgbGltaXQpLgogICAgICAqLworICAgIGlmICgh dXNlcl9sb3dtZW0pIHsKKyAgICAgICAgdXNlcl9sb3dtZW0gPSBIVk1fQkVMT1dfNEdfUkFNX0VO RDsgLyogZGVmYXVsdCAqLworICAgIH0KICAgICBpZiAoSFZNX0JFTE9XXzRHX1JBTV9FTkQgPD0g dXNlcl9sb3dtZW0pIHsKICAgICAgICAgdXNlcl9sb3dtZW0gPSBIVk1fQkVMT1dfNEdfUkFNX0VO RDsKICAgICB9Ci0tIApNU1QKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3Jn Cmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK