From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiong Zhang Subject: [PATCH] x86/ioreq server: Fix DomU couldn't reboot when using p2m_ioreq_server p2m_type Date: Fri, 5 May 2017 11:52:14 +0800 Message-ID: <1493956334-3310-1-git-send-email-xiong.y.zhang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: george.dunlap@eu.citrix.com, andrew.cooper3@citrix.com, paul.durrant@citrix.com, yu.c.zhang@linux.intel.com, zhiyuan.lv@intel.com, JBeulich@suse.com, Xiong Zhang List-Id: xen-devel@lists.xenproject.org J2NvbW1pdCAxNjc5ZTBkZjNkZjYgKCJ4ODYvaW9yZXEgc2VydmVyOiBhc3luY2hyb25vdXNseSBy ZXNldApvdXRzdGFuZGluZyBwMm1faW9yZXFfc2VydmVyIGVudHJpZXMiKScgd2lsbCBjYWxsCnAy bV9jaGFuZ2VfZW50cnlfdHlwZV9nbG9iYWwoKSB3aGljaCBzZXQgZW50cnkucmVjYWxjPTEuIFRo ZW4KdGhlIGZvbGxvd2luZyBnZXRfZW50cnkocDJtX2lvcmVxX3NlcnZlcikgd2lsbCByZXR1cm4K cDJtX3JhbV9ydyB0eXBlLgpCdXQgJ2NvbW1pdCA2ZDc3NGE5NTE2OTYgKCJ4ODYvaW9yZXEgc2Vy dmVyOiBzeW5jaHJvbm91c2x5IHJlc2V0Cm91dHN0YW5kaW5nIHAybV9pb3JlcV9zZXJ2ZXIgZW50 cmllcyB3aGVuIGFuIGlvcmVxIHNlcnZlciB1bm1hcHMiKScKYXNzdW1lIGdldF9lbnRyeShwMm1f aW9yZXFfc2VydmVyKSB3aWxsIHJldHVybiBwMm1faW9yZXFfc2VydmVyCnR5cGUsIHRoZW4gcmVz ZXQgcDJtX2lvcmVxX3NlcnZlciBlbnRyaWVzLiBUaGUgZmFjdCBpcyB0aGUgYXNzdW1wdGlvbgpp c24ndCB0cnVlLCBhbmQgc3lzbmNocm9ub3VzbHkgcmVzZXQgZnVuY3Rpb24gY291bGRuJ3Qgd29y ay4gVGhlbgppb3JlcS5lbnRyeV9jb3VudCBpcyBsYXJnZXIgdGhhbiB6ZXJvIGFmdGVyIGFuIGlv cmVxIHNlcnZlciB1bm1hcHMsCmZpbmFsbHkgdGhpcyByZXN1bHRzIERvbVUgY291bGRuJ3QgcmVi b290LgoKVGhpcyBwYXRjaCBhZGQgYSBQMk1fUFJFX1JFQ0FMQyBmbGFnIHRvIHAybV9xdWVyeV90 LCB0aGVuCmdldF9lbnRyeShQMk1fUFJFX1JFQ0FMQykgd2lsbCByZXR1cm4gcDJtX2lvcmVxX3Nl cnZlciB0eXBlCmZvciBwMm1faW9yZXFfc2VydmVyIHBmbiwgYW5kIGZpbmFsbHkgY2hhbmdlIG1l bSB0eXBlIHRocm91Z2ggc2V0X2VudHJ5LgoKRml4OiAnY29tbWl0IDZkNzc0YTk1MTY5NiAoIng4 Ni9pb3JlcSBzZXJ2ZXI6IHN5bmNocm9ub3VzbHkgcmVzZXQKICAgICAgb3V0c3RhbmRpbmcgcDJt X2lvcmVxX3NlcnZlciBlbnRyaWVzIHdoZW4gYW4gaW9yZXEgc2VydmVyIHVubWFwcyIpJwoKU2ln bmVkLW9mZi1ieTogWGlvbmcgWmhhbmcgPHhpb25nLnkuemhhbmdAaW50ZWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBZdSBaaGFuZyA8eXUuYy56aGFuZ0BsaW51eC5pbnRlbC5jb20+Ci0tLQogeGVuL2Fy Y2gveDg2L21tL3AybS1lcHQuYyB8ICA3ICsrKysrLS0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0tcHQu YyAgfCAxOSArKysrKysrKysrKysrKy0tLS0tCiB4ZW4vYXJjaC94ODYvbW0vcDJtLmMgICAgIHwg IDggKysrKystLS0KIHhlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmggfCAgMSArCiA0IGZpbGVzIGNo YW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hl bi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMgYi94ZW4vYXJjaC94ODYvbW0vcDJtLWVwdC5jCmluZGV4 IGYzN2ExZjIuLjhmODhkMmIgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMK KysrIGIveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYwpAQCAtOTkxLDggKzk5MSwxMSBAQCBzdGF0 aWMgbWZuX3QgZXB0X2dldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLAogCiAgICAgaWYg KCBpc19lcHRlX3ZhbGlkKGVwdF9lbnRyeSkgKQogICAgIHsKLSAgICAgICAgKnQgPSBwMm1fcmVj YWxjX3R5cGUocmVjYWxjIHx8IGVwdF9lbnRyeS0+cmVjYWxjLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBlcHRfZW50cnktPnNhX3AybXQsIHAybSwgZ2ZuKTsKKyAgICAgICAgaWYgKCAh KHEgJiBQMk1fUFJFX1JFQ0FMQykgKQorICAgICAgICAgICAgKnQgPSBwMm1fcmVjYWxjX3R5cGUo cmVjYWxjIHx8IGVwdF9lbnRyeS0+cmVjYWxjLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZXB0X2VudHJ5LT5zYV9wMm10LCBwMm0sIGdmbik7CisgICAgICAgIGVsc2UKKyAgICAg ICAgICAgICp0ID0gZXB0X2VudHJ5LT5zYV9wMm10OwogICAgICAgICAqYSA9IGVwdF9lbnRyeS0+ YWNjZXNzOwogICAgICAgICBpZiAoIHN2ZSApCiAgICAgICAgICAgICAqc3ZlID0gZXB0X2VudHJ5 LT5zdXBwcmVzc192ZTsKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYyBiL3hl bi9hcmNoL3g4Ni9tbS9wMm0tcHQuYwppbmRleCA1MDc5YjU5Li41MGU3NGY1IDEwMDY0NAotLS0g YS94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMKKysrIGIveGVuL2FyY2gveDg2L21tL3AybS1wdC5j CkBAIC04NDAsOCArODQwLDExIEBAIHBvZF9yZXRyeV9sMzoKICAgICAgICAgICAgIG1mbiA9IF9t Zm4obDNlX2dldF9wZm4oKmwzZSkgKwogICAgICAgICAgICAgICAgICAgICAgICBsMl90YWJsZV9v ZmZzZXQoYWRkcikgKiBMMV9QQUdFVEFCTEVfRU5UUklFUyArCiAgICAgICAgICAgICAgICAgICAg ICAgIGwxX3RhYmxlX29mZnNldChhZGRyKSk7Ci0gICAgICAgICAgICAqdCA9IHAybV9yZWNhbGNf dHlwZShyZWNhbGMgfHwgX25lZWRzX3JlY2FsYyhmbGFncyksCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBwMm1fZmxhZ3NfdG9fdHlwZShmbGFncyksIHAybSwgZ2ZuKTsKKyAgICAg ICAgICAgIGlmICggIShxICYgUDJNX1BSRV9SRUNBTEMpICkKKyAgICAgICAgICAgICAgICAqdCA9 IHAybV9yZWNhbGNfdHlwZShyZWNhbGMgfHwgX25lZWRzX3JlY2FsYyhmbGFncyksCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHAybV9mbGFnc190b190eXBlKGZsYWdzKSwgcDJtLCBn Zm4pOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICp0ID0gcDJtX2ZsYWdzX3Rv X3R5cGUoZmxhZ3MpOwogICAgICAgICAgICAgdW5tYXBfZG9tYWluX3BhZ2UobDNlKTsKIAogICAg ICAgICAgICAgQVNTRVJUKG1mbl92YWxpZChtZm4pIHx8ICFwMm1faXNfcmFtKCp0KSk7CkBAIC04 NzksOCArODgyLDExIEBAIHBvZF9yZXRyeV9sMjoKICAgICBpZiAoIGZsYWdzICYgX1BBR0VfUFNF ICkKICAgICB7CiAgICAgICAgIG1mbiA9IF9tZm4obDJlX2dldF9wZm4oKmwyZSkgKyBsMV90YWJs ZV9vZmZzZXQoYWRkcikpOwotICAgICAgICAqdCA9IHAybV9yZWNhbGNfdHlwZShyZWNhbGMgfHwg X25lZWRzX3JlY2FsYyhmbGFncyksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAybV9m bGFnc190b190eXBlKGZsYWdzKSwgcDJtLCBnZm4pOworICAgICAgICBpZiAoICEocSAmIFAyTV9Q UkVfUkVDQUxDKSApCisgICAgICAgICAgICAqdCA9IHAybV9yZWNhbGNfdHlwZShyZWNhbGMgfHwg X25lZWRzX3JlY2FsYyhmbGFncyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAy bV9mbGFnc190b190eXBlKGZsYWdzKSwgcDJtLCBnZm4pOworICAgICAgICBlbHNlCisgICAgICAg ICAgICAqdCA9IHAybV9mbGFnc190b190eXBlKGZsYWdzKTsKICAgICAgICAgdW5tYXBfZG9tYWlu X3BhZ2UobDJlKTsKICAgICAgICAgCiAgICAgICAgIEFTU0VSVChtZm5fdmFsaWQobWZuKSB8fCAh cDJtX2lzX3JhbSgqdCkpOwpAQCAtOTE2LDcgKzkyMiwxMCBAQCBwb2RfcmV0cnlfbDE6CiAgICAg ICAgIHJldHVybiBJTlZBTElEX01GTjsKICAgICB9CiAgICAgbWZuID0gX21mbihsMWVfZ2V0X3Bm bigqbDFlKSk7Ci0gICAgKnQgPSBwMm1fcmVjYWxjX3R5cGUocmVjYWxjIHx8IF9uZWVkc19yZWNh bGMoZmxhZ3MpLCBsMXQsIHAybSwgZ2ZuKTsKKyAgICBpZiAoICEocSAmIFAyTV9QUkVfUkVDQUxD KSApCisgICAgICAgICp0ID0gcDJtX3JlY2FsY190eXBlKHJlY2FsYyB8fCBfbmVlZHNfcmVjYWxj KGZsYWdzKSwgbDF0LCBwMm0sIGdmbik7CisgICAgZWxzZQorICAgICAgICAqdCA9IGwxdDsKICAg ICB1bm1hcF9kb21haW5fcGFnZShsMWUpOwogCiAgICAgQVNTRVJUKG1mbl92YWxpZChtZm4pIHx8 ICFwMm1faXNfcmFtKCp0KSB8fCBwMm1faXNfcGFnaW5nKCp0KSk7CmRpZmYgLS1naXQgYS94ZW4v YXJjaC94ODYvbW0vcDJtLmMgYi94ZW4vYXJjaC94ODYvbW0vcDJtLmMKaW5kZXggMWQ1N2U1Yy4u MWMzZTIyZiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21tL3AybS5jCisrKyBiL3hlbi9hcmNo L3g4Ni9tbS9wMm0uYwpAQCAtMTAyMCw2ICsxMDIwLDggQEAgdm9pZCBwMm1fZmluaXNoX3R5cGVf Y2hhbmdlKHN0cnVjdCBkb21haW4gKmQsCiAgICAgcDJtX3R5cGVfdCB0OwogICAgIHVuc2lnbmVk IGxvbmcgZ2ZuID0gZ2ZuX3goZmlyc3RfZ2ZuKTsKICAgICB1bnNpZ25lZCBsb25nIGxhc3RfZ2Zu ID0gZ2ZuICsgbWF4X25yIC0gMTsKKyAgICBtZm5fdCBtZm47CisgICAgcDJtX2FjY2Vzc190IGE7 CiAKICAgICBBU1NFUlQob3QgIT0gbnQpOwogICAgIEFTU0VSVChwMm1faXNfY2hhbmdlYWJsZShv dCkgJiYgcDJtX2lzX2NoYW5nZWFibGUobnQpKTsKQEAgLTEwMjksMTAgKzEwMzEsMTAgQEAgdm9p ZCBwMm1fZmluaXNoX3R5cGVfY2hhbmdlKHN0cnVjdCBkb21haW4gKmQsCiAgICAgbGFzdF9nZm4g PSBtaW4obGFzdF9nZm4sIHAybS0+bWF4X21hcHBlZF9wZm4pOwogICAgIHdoaWxlICggZ2ZuIDw9 IGxhc3RfZ2ZuICkKICAgICB7Ci0gICAgICAgIGdldF9nZm5fcXVlcnlfdW5sb2NrZWQoZCwgZ2Zu LCAmdCk7Ci0KKyAgICAgICAgbWZuID0gcDJtLT5nZXRfZW50cnkocDJtLCBnZm4sICZ0LCAmYSwg UDJNX1BSRV9SRUNBTEMsIE5VTEwsIE5VTEwpOwogICAgICAgICBpZiAoIHQgPT0gb3QgKQotICAg ICAgICAgICAgcDJtX2NoYW5nZV90eXBlX29uZShkLCBnZm4sIHQsIG50KTsKKyAgICAgICAgICAg IHAybV9zZXRfZW50cnkocDJtLCBnZm4sIG1mbiwgUEFHRV9PUkRFUl80SywgbnQsCisgICAgICAg ICAgICAgICAgICAgICAgICAgIHAybS0+ZGVmYXVsdF9hY2Nlc3MpOwogCiAgICAgICAgIGdmbisr OwogICAgIH0KZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmggYi94ZW4vaW5j bHVkZS9hc20teDg2L3AybS5oCmluZGV4IDc1NzRhOWIuLjk2NDUyNjAgMTAwNjQ0Ci0tLSBhL3hl bi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wMm0uaApA QCAtNzgsNiArNzgsNyBAQCB0eXBlZGVmIGVudW0gewogdHlwZWRlZiB1bnNpZ25lZCBpbnQgcDJt X3F1ZXJ5X3Q7CiAjZGVmaW5lIFAyTV9BTExPQyAgICAoMXU8PDApICAgLyogUG9wdWxhdGUgUG9E IGFuZCBwYWdlZC1vdXQgZW50cmllcyAqLwogI2RlZmluZSBQMk1fVU5TSEFSRSAgKDF1PDwxKSAg IC8qIEJyZWFrIENvVyBzaGFyaW5nICovCisjZGVmaW5lIFAyTV9QUkVfUkVDQUxDICgxdTw8Mikg ICAvKiBHZXQgcDJtIHR5cGUgYmVmb3JlIHJlY2FsYyAqLwogCiAvKiBXZSB1c2UgYml0bWFwcyBh bmQgbWFrcyB0byBoYW5kbGUgZ3JvdXBzIG9mIHR5cGVzICovCiAjZGVmaW5lIHAybV90b19tYXNr KF90KSAoMVVMIDw8IChfdCkpCi0tIAoyLjcuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=