From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH] xen/multicall: Use the common hcall_preempted boolean Date: Wed, 15 Feb 2017 19:41:41 +0000 Message-ID: <1487187705-24445-4-git-send-email-andrew.cooper3@citrix.com> References: <1487187705-24445-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: <1487187705-24445-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 , Stefano Stabellini , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhlIG5vdy1jb21tb24gaGNhbGxfcHJlZW1wdGVkIGJvb2xlYW4gaXMgcGVyZmVjdGx5IHVzYWJs ZSBmb3IgbXVsdGljYWxscy4KUmVtb3ZlIHRoZSBtdWx0aWNhbGwtc3BlY2lmaWMgcHJlZW1wdGlv biBtZWNoYW5pc20uCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVy M0BjaXRyaXguY29tPgotLS0KQ0M6IEphbiBCZXVsaWNoIDxKQmV1bGljaEBzdXNlLmNvbT4KQ0M6 IFN0ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KQ0M6IEp1bGllbiBH cmFsbCA8anVsaWVuLmdyYWxsQGFybS5jb20+Ci0tLQogeGVuL2FyY2gvYXJtL2RvbWFpbi5jICAg ICAgIHwgMTMgKysrLS0tLS0tLS0tLQogeGVuL2FyY2gveDg2L2RvbWFpbi5jICAgICAgIHwgMTkg KysrKysrLS0tLS0tLS0tLS0tLQogeGVuL2NvbW1vbi9tdWx0aWNhbGwuYyAgICAgIHwgIDQgKysr LQogeGVuL2luY2x1ZGUveGVuL211bHRpY2FsbC5oIHwgIDIgLS0KIDQgZmlsZXMgY2hhbmdlZCwg MTIgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gv YXJtL2RvbWFpbi5jIGIveGVuL2FyY2gvYXJtL2RvbWFpbi5jCmluZGV4IGZiMWQ4YTUuLjM5YjZl YjggMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9kb21haW4uYworKysgYi94ZW4vYXJjaC9hcm0v ZG9tYWluLmMKQEAgLTM0OSwxMiArMzQ5LDcgQEAgdm9pZCBzeW5jX3ZjcHVfZXhlY3N0YXRlKHN0 cnVjdCB2Y3B1ICp2KQogCiB2b2lkIGh5cGVyY2FsbF9jYW5jZWxfY29udGludWF0aW9uKHZvaWQp CiB7Ci0gICAgc3RydWN0IG1jX3N0YXRlICptY3MgPSAmY3VycmVudC0+bWNfc3RhdGU7Ci0KLSAg ICBpZiAoIG1jcy0+ZmxhZ3MgJiBNQ1NGX2luX211bHRpY2FsbCApCi0gICAgICAgIF9fY2xlYXJf Yml0KF9NQ1NGX2NhbGxfcHJlZW1wdGVkLCAmbWNzLT5mbGFncyk7Ci0gICAgZWxzZQotICAgICAg ICBjdXJyZW50LT5oY2FsbF9wcmVlbXB0ZWQgPSBmYWxzZTsKKyAgICBjdXJyZW50LT5oY2FsbF9w cmVlbXB0ZWQgPSBmYWxzZTsKIH0KIAogdW5zaWduZWQgbG9uZyBoeXBlcmNhbGxfY3JlYXRlX2Nv bnRpbnVhdGlvbigKQEAgLTM3MCwxMiArMzY1LDEyIEBAIHVuc2lnbmVkIGxvbmcgaHlwZXJjYWxs X2NyZWF0ZV9jb250aW51YXRpb24oCiAgICAgLyogQWxsIGh5cGVyY2FsbHMgdGFrZSBhdCBsZWFz dCBvbmUgYXJndW1lbnQgKi8KICAgICBCVUdfT04oICFwIHx8ICpwID09ICdcMCcgKTsKIAorICAg IGN1cnJlbnQtPmhjYWxsX3ByZWVtcHRlZCA9IHRydWU7CisKICAgICB2YV9zdGFydChhcmdzLCBm b3JtYXQpOwogCiAgICAgaWYgKCBtY3MtPmZsYWdzICYgTUNTRl9pbl9tdWx0aWNhbGwgKQogICAg IHsKLSAgICAgICAgX19zZXRfYml0KF9NQ1NGX2NhbGxfcHJlZW1wdGVkLCAmbWNzLT5mbGFncyk7 Ci0KICAgICAgICAgZm9yICggaSA9IDA7ICpwICE9ICdcMCc7IGkrKyApCiAgICAgICAgICAgICBt Y3MtPmNhbGwuYXJnc1tpXSA9IG5leHRfYXJnKHAsIGFyZ3MpOwogCkBAIC0zODYsOCArMzgxLDYg QEAgdW5zaWduZWQgbG9uZyBoeXBlcmNhbGxfY3JlYXRlX2NvbnRpbnVhdGlvbigKICAgICB7CiAg ICAgICAgIHJlZ3MgPSBndWVzdF9jcHVfdXNlcl9yZWdzKCk7CiAKLSAgICAgICAgY3VycmVudC0+ aGNhbGxfcHJlZW1wdGVkID0gdHJ1ZTsKLQogI2lmZGVmIENPTkZJR19BUk1fNjQKICAgICAgICAg aWYgKCAhaXNfMzJiaXRfZG9tYWluKGN1cnJlbnQtPmRvbWFpbikgKQogICAgICAgICB7CmRpZmYg LS1naXQgYS94ZW4vYXJjaC94ODYvZG9tYWluLmMgYi94ZW4vYXJjaC94ODYvZG9tYWluLmMKaW5k ZXggYjE5OWM3MC4uMDhjNTgxMyAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2RvbWFpbi5jCisr KyBiL3hlbi9hcmNoL3g4Ni9kb21haW4uYwpAQCAtMjE5OCw0MSArMjE5OCwzNCBAQCB2b2lkIHN5 bmNfdmNwdV9leGVjc3RhdGUoc3RydWN0IHZjcHUgKnYpCiAKIHZvaWQgaHlwZXJjYWxsX2NhbmNl bF9jb250aW51YXRpb24odm9pZCkKIHsKLSAgICBzdHJ1Y3QgbWNfc3RhdGUgKm1jcyA9ICZjdXJy ZW50LT5tY19zdGF0ZTsKLQotICAgIGlmICggbWNzLT5mbGFncyAmIE1DU0ZfaW5fbXVsdGljYWxs ICkKLSAgICAgICAgX19jbGVhcl9iaXQoX01DU0ZfY2FsbF9wcmVlbXB0ZWQsICZtY3MtPmZsYWdz KTsKLSAgICBlbHNlCi0gICAgICAgIGN1cnJlbnQtPmhjYWxsX3ByZWVtcHRlZCA9IGZhbHNlOwor ICAgIGN1cnJlbnQtPmhjYWxsX3ByZWVtcHRlZCA9IGZhbHNlOwogfQogCiB1bnNpZ25lZCBsb25n IGh5cGVyY2FsbF9jcmVhdGVfY29udGludWF0aW9uKAogICAgIHVuc2lnbmVkIGludCBvcCwgY29u c3QgY2hhciAqZm9ybWF0LCAuLi4pCiB7Ci0gICAgc3RydWN0IG1jX3N0YXRlICptY3MgPSAmY3Vy cmVudC0+bWNfc3RhdGU7CisgICAgc3RydWN0IHZjcHUgKmN1cnIgPSBjdXJyZW50OworICAgIHN0 cnVjdCBtY19zdGF0ZSAqbWNzID0gJmN1cnItPm1jX3N0YXRlOwogICAgIGNvbnN0IGNoYXIgKnAg PSBmb3JtYXQ7CiAgICAgdW5zaWduZWQgbG9uZyBhcmc7CiAgICAgdW5zaWduZWQgaW50IGk7CiAg ICAgdmFfbGlzdCBhcmdzOwogCisgICAgY3Vyci0+aGNhbGxfcHJlZW1wdGVkID0gdHJ1ZTsKKwog ICAgIHZhX3N0YXJ0KGFyZ3MsIGZvcm1hdCk7CiAKICAgICBpZiAoIG1jcy0+ZmxhZ3MgJiBNQ1NG X2luX211bHRpY2FsbCApCiAgICAgewotICAgICAgICBfX3NldF9iaXQoX01DU0ZfY2FsbF9wcmVl bXB0ZWQsICZtY3MtPmZsYWdzKTsKLQogICAgICAgICBmb3IgKCBpID0gMDsgKnAgIT0gJ1wwJzsg aSsrICkKICAgICAgICAgICAgIG1jcy0+Y2FsbC5hcmdzW2ldID0gbmV4dF9hcmcocCwgYXJncyk7 CiAgICAgfQogICAgIGVsc2UKICAgICB7CiAgICAgICAgIHN0cnVjdCBjcHVfdXNlcl9yZWdzICpy ZWdzID0gZ3Vlc3RfY3B1X3VzZXJfcmVncygpOwotICAgICAgICBzdHJ1Y3QgdmNwdSAqY3VyciA9 IGN1cnJlbnQ7CiAKICAgICAgICAgcmVncy0+cmF4ID0gb3A7CiAKLSAgICAgICAgY3Vyci0+aGNh bGxfcHJlZW1wdGVkID0gdHJ1ZTsKLQogICAgICAgICBpZiAoIGlzX3B2X3ZjcHUoY3VycikgPwog ICAgICAgICAgICAgICFpc19wdl8zMmJpdF92Y3B1KGN1cnIpIDoKICAgICAgICAgICAgICBjdXJy LT5hcmNoLmh2bV92Y3B1LmhjYWxsXzY0Yml0ICkKQEAgLTIyOTMsNyArMjI4Niw3IEBAIGludCBo eXBlcmNhbGxfeGxhdF9jb250aW51YXRpb24odW5zaWduZWQgaW50ICppZCwgdW5zaWduZWQgaW50 IG5yLAogCiAgICAgaWYgKCBtY3MtPmZsYWdzICYgTUNTRl9pbl9tdWx0aWNhbGwgKQogICAgIHsK LSAgICAgICAgaWYgKCAhKG1jcy0+ZmxhZ3MgJiBNQ1NGX2NhbGxfcHJlZW1wdGVkKSApCisgICAg ICAgIGlmICggIWN1cnJlbnQtPmhjYWxsX3ByZWVtcHRlZCApCiAgICAgICAgIHsKICAgICAgICAg ICAgIHZhX2VuZChhcmdzKTsKICAgICAgICAgICAgIHJldHVybiAwOwpkaWZmIC0tZ2l0IGEveGVu L2NvbW1vbi9tdWx0aWNhbGwuYyBiL3hlbi9jb21tb24vbXVsdGljYWxsLmMKaW5kZXggNTI0Yzli Zi4uMDJmNTdjYiAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9tdWx0aWNhbGwuYworKysgYi94ZW4v Y29tbW9uL211bHRpY2FsbC5jCkBAIC03OSw3ICs3OSw3IEBAIGRvX211bHRpY2FsbCgKIAogICAg ICAgICBpZiAoIHVubGlrZWx5KF9fY29weV9maWVsZF90b19ndWVzdChjYWxsX2xpc3QsICZtY3Mt PmNhbGwsIHJlc3VsdCkpICkKICAgICAgICAgICAgIHJjID0gLUVGQVVMVDsKLSAgICAgICAgZWxz ZSBpZiAoIG1jcy0+ZmxhZ3MgJiBNQ1NGX2NhbGxfcHJlZW1wdGVkICkKKyAgICAgICAgZWxzZSBp ZiAoIGN1cnJlbnQtPmhjYWxsX3ByZWVtcHRlZCApCiAgICAgICAgIHsKICAgICAgICAgICAgIC8q IFRyYW5zbGF0ZSBzdWItY2FsbCBjb250aW51YXRpb24gdG8gZ3Vlc3QgbGF5b3V0ICovCiAgICAg ICAgICAgICB4bGF0X211bHRpY2FsbF9lbnRyeShtY3MpOwpAQCAtODcsNiArODcsOCBAQCBkb19t dWx0aWNhbGwoCiAgICAgICAgICAgICAvKiBDb3B5IHRoZSBzdWItY2FsbCBjb250aW51YXRpb24u ICovCiAgICAgICAgICAgICBpZiAoIGxpa2VseSghX19jb3B5X3RvX2d1ZXN0KGNhbGxfbGlzdCwg Jm1jcy0+Y2FsbCwgMSkpICkKICAgICAgICAgICAgICAgICBnb3RvIHByZWVtcHRlZDsKKyAgICAg ICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBoeXBlcmNhbGxfY2FuY2VsX2NvbnRpbnVhdGlv bigpOwogICAgICAgICAgICAgcmMgPSAtRUZBVUxUOwogICAgICAgICB9CiAgICAgICAgIGVsc2UK ZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL3hlbi9tdWx0aWNhbGwuaCBiL3hlbi9pbmNsdWRlL3hl bi9tdWx0aWNhbGwuaAppbmRleCBmZmYxNWViLi5lOGQ3OTA1IDEwMDY0NAotLS0gYS94ZW4vaW5j bHVkZS94ZW4vbXVsdGljYWxsLmgKKysrIGIveGVuL2luY2x1ZGUveGVuL211bHRpY2FsbC5oCkBA IC0xMSw5ICsxMSw3IEBACiAjZW5kaWYKIAogI2RlZmluZSBfTUNTRl9pbl9tdWx0aWNhbGwgICAw Ci0jZGVmaW5lIF9NQ1NGX2NhbGxfcHJlZW1wdGVkIDEKICNkZWZpbmUgTUNTRl9pbl9tdWx0aWNh bGwgICAgKDE8PF9NQ1NGX2luX211bHRpY2FsbCkKLSNkZWZpbmUgTUNTRl9jYWxsX3ByZWVtcHRl ZCAgKDE8PF9NQ1NGX2NhbGxfcHJlZW1wdGVkKQogc3RydWN0IG1jX3N0YXRlIHsKICAgICB1bnNp Z25lZCBsb25nIGZsYWdzOwogICAgIHVuaW9uIHsKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApY ZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==