From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiong Zhang Subject: [PATCH V2] x86/ioreq server: Fix XenGT couldn't reboot when XenGT use p2m_ioreq_server p2m_type Date: Wed, 10 May 2017 05:22:44 +0800 Message-ID: <1494364964-3775-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: andrew.cooper3@citrix.com, george.dunlap@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 cmVxIHNlcnZlciB1bm1hcHMuCkR1cmluZyBYZW5HVCBkb21VIHJlYm9vdCwgaXQgd2lsbCB1bm1h cCwgbWFwIGFuZCB1bm1hcCBpb3JlcQpzZXJ2ZXIgd2l0aCBvbGQgZG9taWQsIHRoZSBtYXAgd2ls bCBmYWlsIGFzIGlvcmVxLmVudHJ5X2NvdW50ID4gMCBhbmQKcmVib290IHByb2Nlc3MgaXMgdGVy bWluYXRlZC4KClRoaXMgcGF0Y2ggYWRkIHAybS0+cmVjYWxjKCkgaG9vayB3aGljaCB1c2UgdGhl IGV4aXN0aW5nIGltcGxlbWVudGF0aW9uCnNwZWNpZmljIGZ1bmN0aW9uIGFzIGVwdCByZXNvbHZl X21pc2NvbmZpZyBhbmQgcHQgZG9fcmVjYWxjLCBzbwpwMm1fZmluaXNoX3R5cGVfY2hhbmdlKCkg Y291bGQgY2FsbCBwMm0tPnJlY2FsYygpIGRpcmVjdGx5IHRvCmNoYW5nZSBnZm4gcDJtX3R5cGUg d2hpY2ggbmVlZCByZWNhbGMuCgpGaXg6ICdjb21taXQgNmQ3NzRhOTUxNjk2ICgieDg2L2lvcmVx IHNlcnZlcjogc3luY2hyb25vdXNseSByZXNldAogICAgICBvdXRzdGFuZGluZyBwMm1faW9yZXFf c2VydmVyIGVudHJpZXMgd2hlbiBhbiBpb3JlcSBzZXJ2ZXIgdW5tYXBzIiknCgp2MTogQWRkIGlv cmVxX3ByZV9yZWNhbGMgcXVlcnkgZmxhZyB0byBnZXQgdGhlIG9sZCBwMm1fdHlwZS4oSmFuKQp2 MjogQWRkIHAybS0+cmVjYWxjKCkgaG9vayB0byBjaGFuZ2UgZ2ZuIHAybV90eXBlLiAoR2Vvcmdl KQoKU2lnbmVkLW9mZi1ieTogWGlvbmcgWmhhbmcgPHhpb25nLnkuemhhbmdAaW50ZWwuY29tPgpT aWduZWQtb2ZmLWJ5OiBZdSBaaGFuZyA8eXUuYy56aGFuZ0BsaW51eC5pbnRlbC5jb20+Ci0tLQog eGVuL2FyY2gveDg2L2h2bS9kbS5jICAgICB8ICAzICstLQogeGVuL2FyY2gveDg2L21tL3AybS1l cHQuYyB8ICA3ICsrKystLS0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0tcHQuYyAgfCAgNyArKysrLS0t CiB4ZW4vYXJjaC94ODYvbW0vcDJtLmMgICAgIHwgMTIgKystLS0tLS0tLS0tCiB4ZW4vaW5jbHVk ZS9hc20teDg2L3AybS5oIHwgIDUgKysrLS0KIDUgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9u cygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS9kbS5j IGIveGVuL2FyY2gveDg2L2h2bS9kbS5jCmluZGV4IGQ3MmI3YmQuLmMxNjI3ZWMgMTAwNjQ0Ci0t LSBhL3hlbi9hcmNoL3g4Ni9odm0vZG0uYworKysgYi94ZW4vYXJjaC94ODYvaHZtL2RtLmMKQEAg LTQxMiw4ICs0MTIsNyBAQCBzdGF0aWMgaW50IGRtX29wKGRvbWlkX3QgZG9taWQsCiAgICAgICAg ICAgICAgICAgICAgIGZpcnN0X2dmbiA8PSBwMm0tPm1heF9tYXBwZWRfcGZuICkKICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICAvKiBJdGVyYXRlIHAybSB0YWJsZSBmb3IgMjU2IGdmbnMg ZWFjaCB0aW1lLiAqLwotICAgICAgICAgICAgICAgIHAybV9maW5pc2hfdHlwZV9jaGFuZ2UoZCwg X2dmbihmaXJzdF9nZm4pLCAyNTYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwMm1faW9yZXFfc2VydmVyLCBwMm1fcmFtX3J3KTsKKyAgICAgICAgICAgICAgICBwMm1f ZmluaXNoX3R5cGVfY2hhbmdlKGQsIF9nZm4oZmlyc3RfZ2ZuKSwgMjU2KTsKIAogICAgICAgICAg ICAgICAgIGZpcnN0X2dmbiArPSAyNTY7CiAKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9w Mm0tZXB0LmMgYi94ZW4vYXJjaC94ODYvbW0vcDJtLWVwdC5jCmluZGV4IGYzN2ExZjIuLmY5NmJk M2IgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS9wMm0tZXB0LmMKKysrIGIveGVuL2FyY2gv eDg2L21tL3AybS1lcHQuYwpAQCAtNTAyLDcgKzUwMiw3IEBAIHN0YXRpYyBpbnQgZXB0X2ludmFs aWRhdGVfZW10X3JhbmdlKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sCiAgKiAtIHplcm8gaWYgbm8g YWRqdXN0bWVudCB3YXMgZG9uZSwKICAqIC0gYSBwb3NpdGl2ZSB2YWx1ZSBpZiBhdCBsZWFzdCBv bmUgYWRqdXN0bWVudCB3YXMgZG9uZS4KICAqLwotc3RhdGljIGludCByZXNvbHZlX21pc2NvbmZp ZyhzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKK3N0YXRpYyBpbnQg ZXB0X3Jlc29sdmVfbWlzY29uZmlnKHN0cnVjdCBwMm1fZG9tYWluICpwMm0sIHVuc2lnbmVkIGxv bmcgZ2ZuKQogewogICAgIHN0cnVjdCBlcHRfZGF0YSAqZXB0ID0gJnAybS0+ZXB0OwogICAgIHVu c2lnbmVkIGludCBsZXZlbCA9IGVwdC0+d2w7CkBAIC02NTksNyArNjU5LDcgQEAgYm9vbF90IGVw dF9oYW5kbGVfbWlzY29uZmlnKHVpbnQ2NF90IGdwYSkKICAgICBwMm1fbG9jayhwMm0pOwogCiAg ICAgc3B1cmlvdXMgPSBjdXJyLT5hcmNoLmh2bV92bXguZXB0X3NwdXJpb3VzX21pc2NvbmZpZzsK LSAgICByYyA9IHJlc29sdmVfbWlzY29uZmlnKHAybSwgUEZOX0RPV04oZ3BhKSk7CisgICAgcmMg PSBlcHRfcmVzb2x2ZV9taXNjb25maWcocDJtLCBQRk5fRE9XTihncGEpKTsKICAgICBjdXJyLT5h cmNoLmh2bV92bXguZXB0X3NwdXJpb3VzX21pc2NvbmZpZyA9IDA7CiAKICAgICBwMm1fdW5sb2Nr KHAybSk7CkBAIC03MDcsNyArNzA3LDcgQEAgZXB0X3NldF9lbnRyeShzdHJ1Y3QgcDJtX2RvbWFp biAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwgbWZuX3QgbWZuLAogICAgICAgICByZXR1cm4gLUVJ TlZBTDsKIAogICAgIC8qIENhcnJ5IG91dCBhbnkgZXZlbnR1YWxseSBwZW5kaW5nIGVhcmxpZXIg Y2hhbmdlcyBmaXJzdC4gKi8KLSAgICByZXQgPSByZXNvbHZlX21pc2NvbmZpZyhwMm0sIGdmbik7 CisgICAgcmV0ID0gZXB0X3Jlc29sdmVfbWlzY29uZmlnKHAybSwgZ2ZuKTsKICAgICBpZiAoIHJl dCA8IDAgKQogICAgICAgICByZXR1cm4gcmV0OwogCkBAIC0xMjM4LDYgKzEyMzgsNyBAQCBpbnQg ZXB0X3AybV9pbml0KHN0cnVjdCBwMm1fZG9tYWluICpwMm0pCiAKICAgICBwMm0tPnNldF9lbnRy eSA9IGVwdF9zZXRfZW50cnk7CiAgICAgcDJtLT5nZXRfZW50cnkgPSBlcHRfZ2V0X2VudHJ5Owor ICAgIHAybS0+cmVjYWxjID0gZXB0X3Jlc29sdmVfbWlzY29uZmlnOwogICAgIHAybS0+Y2hhbmdl X2VudHJ5X3R5cGVfZ2xvYmFsID0gZXB0X2NoYW5nZV9lbnRyeV90eXBlX2dsb2JhbDsKICAgICBw Mm0tPmNoYW5nZV9lbnRyeV90eXBlX3JhbmdlID0gZXB0X2NoYW5nZV9lbnRyeV90eXBlX3Jhbmdl OwogICAgIHAybS0+bWVtb3J5X3R5cGVfY2hhbmdlZCA9IGVwdF9tZW1vcnlfdHlwZV9jaGFuZ2Vk OwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3AybS1wdC5jIGIveGVuL2FyY2gveDg2L21t L3AybS1wdC5jCmluZGV4IDUwNzliNTkuLmIwZjZhYTAgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4 Ni9tbS9wMm0tcHQuYworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJtLXB0LmMKQEAgLTM2Nyw3ICsz NjcsNyBAQCBzdGF0aWMgaW50IHAybV9wdF9zZXRfcmVjYWxjX3JhbmdlKHN0cnVjdCBwMm1fZG9t YWluICpwMm0sCiAgKiBHRk4uIFByb3BhZ2F0ZSB0aGUgcmUtY2FsY3VsYXRpb24gZmxhZyBkb3du IHRvIHRoZSBuZXh0IHBhZ2UgdGFibGUgbGV2ZWwKICAqIGZvciBlbnRyaWVzIG5vdCBpbnZvbHZl ZCBpbiB0aGUgdHJhbnNsYXRpb24gb2YgdGhlIGdpdmVuIEdGTi4KICAqLwotc3RhdGljIGludCBk b19yZWNhbGMoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4pCitzdGF0 aWMgaW50IHAybV9wdF9kb19yZWNhbGMoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQg bG9uZyBnZm4pCiB7CiAgICAgdm9pZCAqdGFibGU7CiAgICAgdW5zaWduZWQgbG9uZyBnZm5fcmVt YWluZGVyID0gZ2ZuOwpAQCAtNDkzLDcgKzQ5Myw3IEBAIGludCBwMm1fcHRfaGFuZGxlX2RlZmVy cmVkX2NoYW5nZXModWludDY0X3QgZ3BhKQogICAgIGludCByYzsKIAogICAgIHAybV9sb2NrKHAy bSk7Ci0gICAgcmMgPSBkb19yZWNhbGMocDJtLCBQRk5fRE9XTihncGEpKTsKKyAgICByYyA9IHAy bV9wdF9kb19yZWNhbGMocDJtLCBQRk5fRE9XTihncGEpKTsKICAgICBwMm1fdW5sb2NrKHAybSk7 CiAKICAgICByZXR1cm4gcmM7CkBAIC01NTUsNyArNTU1LDcgQEAgcDJtX3B0X3NldF9lbnRyeShz dHJ1Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbiwgbWZuX3QgbWZuLAogICAg IH0KIAogICAgIC8qIENhcnJ5IG91dCBhbnkgZXZlbnR1YWxseSBwZW5kaW5nIGVhcmxpZXIgY2hh bmdlcyBmaXJzdC4gKi8KLSAgICByYyA9IGRvX3JlY2FsYyhwMm0sIGdmbik7CisgICAgcmMgPSBw Mm1fcHRfZG9fcmVjYWxjKHAybSwgZ2ZuKTsKICAgICBpZiAoIHJjIDwgMCApCiAgICAgICAgIHJl dHVybiByYzsKIApAQCAtMTE1Myw2ICsxMTUzLDcgQEAgdm9pZCBwMm1fcHRfaW5pdChzdHJ1Y3Qg cDJtX2RvbWFpbiAqcDJtKQogewogICAgIHAybS0+c2V0X2VudHJ5ID0gcDJtX3B0X3NldF9lbnRy eTsKICAgICBwMm0tPmdldF9lbnRyeSA9IHAybV9wdF9nZXRfZW50cnk7CisgICAgcDJtLT5yZWNh bGMgPSBwMm1fcHRfZG9fcmVjYWxjOwogICAgIHAybS0+Y2hhbmdlX2VudHJ5X3R5cGVfZ2xvYmFs ID0gcDJtX3B0X2NoYW5nZV9lbnRyeV90eXBlX2dsb2JhbDsKICAgICBwMm0tPmNoYW5nZV9lbnRy eV90eXBlX3JhbmdlID0gcDJtX3B0X2NoYW5nZV9lbnRyeV90eXBlX3JhbmdlOwogICAgIHAybS0+ d3JpdGVfcDJtX2VudHJ5ID0gcGFnaW5nX3dyaXRlX3AybV9lbnRyeTsKZGlmZiAtLWdpdCBhL3hl bi9hcmNoL3g4Ni9tbS9wMm0uYyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0uYwppbmRleCAxZDU3ZTVj Li4yYmFkMmUxIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvbW0vcDJtLmMKKysrIGIveGVuL2Fy Y2gveDg2L21tL3AybS5jCkBAIC0xMDEzLDI2ICsxMDEzLDE4IEBAIHZvaWQgcDJtX2NoYW5nZV90 eXBlX3JhbmdlKHN0cnVjdCBkb21haW4gKmQsCiAKIC8qIFN5bmNocm9ub3VzbHkgbW9kaWZ5IHRo ZSBwMm0gdHlwZSBmb3IgYSByYW5nZSBvZiBnZm5zIGZyb20gb3QgdG8gbnQuICovCiB2b2lkIHAy bV9maW5pc2hfdHlwZV9jaGFuZ2Uoc3RydWN0IGRvbWFpbiAqZCwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICBnZm5fdCBmaXJzdF9nZm4sIHVuc2lnbmVkIGxvbmcgbWF4X25yLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHAybV90eXBlX3Qgb3QsIHAybV90eXBlX3QgbnQpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZ2ZuX3QgZmlyc3RfZ2ZuLCB1bnNpZ25lZCBsb25nIG1h eF9ucikKIHsKICAgICBzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtID0gcDJtX2dldF9ob3N0cDJtKGQp OwotICAgIHAybV90eXBlX3QgdDsKICAgICB1bnNpZ25lZCBsb25nIGdmbiA9IGdmbl94KGZpcnN0 X2dmbik7CiAgICAgdW5zaWduZWQgbG9uZyBsYXN0X2dmbiA9IGdmbiArIG1heF9uciAtIDE7CiAK LSAgICBBU1NFUlQob3QgIT0gbnQpOwotICAgIEFTU0VSVChwMm1faXNfY2hhbmdlYWJsZShvdCkg JiYgcDJtX2lzX2NoYW5nZWFibGUobnQpKTsKLQogICAgIHAybV9sb2NrKHAybSk7CiAKICAgICBs YXN0X2dmbiA9IG1pbihsYXN0X2dmbiwgcDJtLT5tYXhfbWFwcGVkX3Bmbik7CiAgICAgd2hpbGUg KCBnZm4gPD0gbGFzdF9nZm4gKQogICAgIHsKLSAgICAgICAgZ2V0X2dmbl9xdWVyeV91bmxvY2tl ZChkLCBnZm4sICZ0KTsKLQotICAgICAgICBpZiAoIHQgPT0gb3QgKQotICAgICAgICAgICAgcDJt X2NoYW5nZV90eXBlX29uZShkLCBnZm4sIHQsIG50KTsKKyAgICAgICAgcDJtLT5yZWNhbGMocDJt LCBnZm4pOwogCiAgICAgICAgIGdmbisrOwogICAgIH0KZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRl L2FzbS14ODYvcDJtLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L3AybS5oCmluZGV4IDc1NzRhOWIu LjA4MTYzOWMgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvcDJtLmgKKysrIGIveGVu L2luY2x1ZGUvYXNtLXg4Ni9wMm0uaApAQCAtMjQ2LDYgKzI0Niw4IEBAIHN0cnVjdCBwMm1fZG9t YWluIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHAybV9xdWVyeV90IHEs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgKnBhZ2Vf b3JkZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sX3QgKnN2ZSk7 CisgICAgaW50ICAgICAgICAgICAgICAgICgqcmVjYWxjKShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJt LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBnZm4pOwog ICAgIHZvaWQgICAgICAgICAgICAgICAoKmVuYWJsZV9oYXJkd2FyZV9sb2dfZGlydHkpKHN0cnVj dCBwMm1fZG9tYWluICpwMm0pOwogICAgIHZvaWQgICAgICAgICAgICAgICAoKmRpc2FibGVfaGFy ZHdhcmVfbG9nX2RpcnR5KShzdHJ1Y3QgcDJtX2RvbWFpbiAqcDJtKTsKICAgICB2b2lkICAgICAg ICAgICAgICAgKCpmbHVzaF9oYXJkd2FyZV9jYWNoZWRfZGlydHkpKHN0cnVjdCBwMm1fZG9tYWlu ICpwMm0pOwpAQCAtNjA5LDggKzYxMSw3IEBAIGludCBwMm1fY2hhbmdlX3R5cGVfb25lKHN0cnVj dCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuLAogLyogU3luY2hyb25vdXNseSBjaGFuZ2Ug dGhlIHAybSB0eXBlIGZvciBhIHJhbmdlIG9mIGdmbnMgKi8KIHZvaWQgcDJtX2ZpbmlzaF90eXBl X2NoYW5nZShzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdm bl90IGZpcnN0X2dmbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25n IG1heF9uciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBwMm1fdHlwZV90IG90LCBwMm1f dHlwZV90IG50KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIG1h eF9ucik7CiAKIC8qIFJlcG9ydCBhIGNoYW5nZSBhZmZlY3RpbmcgbWVtb3J5IHR5cGVzLiAqLwog dm9pZCBwMm1fbWVtb3J5X3R5cGVfY2hhbmdlZChzdHJ1Y3QgZG9tYWluICpkKTsKLS0gCjIuNy40 CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRl dmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhl bi5vcmcveGVuLWRldmVsCg==