From: Paul Durrant Subject: [PATCH v3 7/9] viridian: stop directly calling viridian_time_ref_count_freeze/thaw()... Date: Thu, 31 Jan 2019 10:47:28 +0000 Message-ID: <20190131104730.2085-8-paul.durrant@citrix.com> References: <20190131104730.2085-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gp9sg-00087j-1i for xen-devel@lists.xenproject.org; Thu, 31 Jan 2019 10:47:38 +0000 In-Reply-To: <20190131104730.2085-1-paul.durrant@citrix.com> 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 , Paul Durrant , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org Li4uZnJvbSBhcmNoX2RvbWFpbl9zaHV0ZG93bi9wYXVzZS91bnBhdXNlKCkuCgpBIHN1YnNlcXVl bnQgcGF0Y2ggd2lsbCBpbnRyb2R1Y2UgYW4gaW1wbGVtZW50YWlvbiBvZiBzeW50aGV0aWMgdGlt ZXJzCndoaWNoIHdpbGwgYWxzbyBuZWVkIGZyZWV6ZS90aGF3IGhvb2tzLCBzbyBtYWtlIHRoZSBl eHBvcnRlZCBob29rcyBtb3JlCmdlbmVyaWMgYW5kIGNhbGwgdGhyb3VnaCB0byAocmUtbmFtZWQg YW5kIHN0YXRpYykgdGltZV9yZWZfY291bnRfZnJlZXplL3RoYXcKZnVuY3Rpb25zLgoKTk9URTog VGhpcyBwYXRjaCBhbHNvIGludHJvZHVjZXMgYSBuZXcgdGltZV9yZWZfY291bnQoKSBoZWxwZXIg dG8gcmV0dXJuCiAgICAgIHRoZSBjdXJyZW50IGNvdW50ZXIgdmFsdWUuIFRoaXMgaXMgY3VycmVu dGx5IG9ubHkgdXNlZCBieSB0aGUgTVNSCiAgICAgIHJlYWQgaGFuZGxlciBidXQgdGhlIHN5bnRo ZXRpYyB0aW1lciBjb2RlIHdpbGwgYWxzbyBuZWVkIHRvIHVzZSBpdC4KClNpZ25lZC1vZmYtYnk6 IFBhdWwgRHVycmFudCA8cGF1bC5kdXJyYW50QGNpdHJpeC5jb20+ClJldmlld2VkLWJ5OiBXZWkg TGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KQ2M6IEphbiBCZXVsaWNoIDxqYmV1bGljaEBz dXNlLmNvbT4KQ2M6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+CkNj OiAiUm9nZXIgUGF1IE1vbm7DqSIgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgotLS0KIHhlbi9hcmNo L3g4Ni9kb21haW4uYyAgICAgICAgICAgICAgfCAxMiArKysrKystLS0tLS0KIHhlbi9hcmNoL3g4 Ni9odm0vdmlyaWRpYW4vdGltZS5jICAgfCAyNCArKysrKysrKysrKysrKysrKysrKystLS0KIHhl bi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZpcmlkaWFuLmggfCAgNCArKy0tCiAzIGZpbGVzIGNoYW5n ZWQsIDI5IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9h cmNoL3g4Ni9kb21haW4uYyBiL3hlbi9hcmNoL3g4Ni9kb21haW4uYwppbmRleCAzMmRjNDI1M2Zm Li5lZDJhNTdhOGE2IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvZG9tYWluLmMKKysrIGIveGVu L2FyY2gveDg2L2RvbWFpbi5jCkBAIC02NTgsMjAgKzY1OCwyMCBAQCB2b2lkIGFyY2hfZG9tYWlu X2Rlc3Ryb3koc3RydWN0IGRvbWFpbiAqZCkKIAogdm9pZCBhcmNoX2RvbWFpbl9zaHV0ZG93bihz dHJ1Y3QgZG9tYWluICpkKQogewotICAgIGlmICggaGFzX3ZpcmlkaWFuX3RpbWVfcmVmX2NvdW50 KGQpICkKLSAgICAgICAgdmlyaWRpYW5fdGltZV9yZWZfY291bnRfZnJlZXplKGQpOworICAgIGlm ICggaXNfdmlyaWRpYW5fZG9tYWluKGQpICkKKyAgICAgICAgdmlyaWRpYW5fdGltZV9kb21haW5f ZnJlZXplKGQpOwogfQogCiB2b2lkIGFyY2hfZG9tYWluX3BhdXNlKHN0cnVjdCBkb21haW4gKmQp CiB7Ci0gICAgaWYgKCBoYXNfdmlyaWRpYW5fdGltZV9yZWZfY291bnQoZCkgKQotICAgICAgICB2 aXJpZGlhbl90aW1lX3JlZl9jb3VudF9mcmVlemUoZCk7CisgICAgaWYgKCBpc192aXJpZGlhbl9k b21haW4oZCkgKQorICAgICAgICB2aXJpZGlhbl90aW1lX2RvbWFpbl9mcmVlemUoZCk7CiB9CiAK IHZvaWQgYXJjaF9kb21haW5fdW5wYXVzZShzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIGlmICgg aGFzX3ZpcmlkaWFuX3RpbWVfcmVmX2NvdW50KGQpICkKLSAgICAgICAgdmlyaWRpYW5fdGltZV9y ZWZfY291bnRfdGhhdyhkKTsKKyAgICBpZiAoIGlzX3ZpcmlkaWFuX2RvbWFpbihkKSApCisgICAg ICAgIHZpcmlkaWFuX3RpbWVfZG9tYWluX3RoYXcoZCk7CiB9CiAKIGludCBhcmNoX2RvbWFpbl9z b2Z0X3Jlc2V0KHN0cnVjdCBkb21haW4gKmQpCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvaHZt L3ZpcmlkaWFuL3RpbWUuYyBiL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdGltZS5jCmluZGV4 IGU4OTI0YWRmYTEuLmNiNzE2MmMyZDQgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vdmly aWRpYW4vdGltZS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdGltZS5jCkBAIC05 MSw3ICs5MSw3IEBAIHN0YXRpYyBpbnQ2NF90IHJhd190cmNfdmFsKHN0cnVjdCBkb21haW4gKmQp CiAgICAgcmV0dXJuIHNjYWxlX2RlbHRhKHRzYywgJnRzY190b19ucykgLyAxMDB1bDsKIH0KIAot dm9pZCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudF9mcmVlemUoc3RydWN0IGRvbWFpbiAqZCkKK3N0 YXRpYyB2b2lkIHRpbWVfcmVmX2NvdW50X2ZyZWV6ZShzdHJ1Y3QgZG9tYWluICpkKQogewogICAg IHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJjID0KICAgICAgICAgJmQtPmFyY2gu aHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3VudDsKQEAgLTEwMCw3ICsxMDAsNyBAQCB2b2lkIHZp cmlkaWFuX3RpbWVfcmVmX2NvdW50X2ZyZWV6ZShzdHJ1Y3QgZG9tYWluICpkKQogICAgICAgICB0 cmMtPnZhbCA9IHJhd190cmNfdmFsKGQpICsgdHJjLT5vZmY7CiB9CiAKLXZvaWQgdmlyaWRpYW5f dGltZV9yZWZfY291bnRfdGhhdyhzdHJ1Y3QgZG9tYWluICpkKQorc3RhdGljIHZvaWQgdGltZV9y ZWZfY291bnRfdGhhdyhzdHJ1Y3QgZG9tYWluICpkKQogewogICAgIHN0cnVjdCB2aXJpZGlhbl90 aW1lX3JlZl9jb3VudCAqdHJjID0KICAgICAgICAgJmQtPmFyY2guaHZtLnZpcmlkaWFuLT50aW1l X3JlZl9jb3VudDsKQEAgLTExMCw2ICsxMTAsMjQgQEAgdm9pZCB2aXJpZGlhbl90aW1lX3JlZl9j b3VudF90aGF3KHN0cnVjdCBkb21haW4gKmQpCiAgICAgICAgIHRyYy0+b2ZmID0gKGludDY0X3Qp dHJjLT52YWwgLSByYXdfdHJjX3ZhbChkKTsKIH0KIAorc3RhdGljIGludDY0X3QgdGltZV9yZWZf Y291bnQoc3RydWN0IGRvbWFpbiAqZCkKK3sKKyAgICBzdHJ1Y3QgdmlyaWRpYW5fdGltZV9yZWZf Y291bnQgKnRyYyA9CisgICAgICAgICZkLT5hcmNoLmh2bS52aXJpZGlhbi0+dGltZV9yZWZfY291 bnQ7CisKKyAgICByZXR1cm4gcmF3X3RyY192YWwoZCkgKyB0cmMtPm9mZjsKK30KKwordm9pZCB2 aXJpZGlhbl90aW1lX2RvbWFpbl9mcmVlemUoc3RydWN0IGRvbWFpbiAqZCkKK3sKKyAgICB0aW1l X3JlZl9jb3VudF9mcmVlemUoZCk7Cit9CisKK3ZvaWQgdmlyaWRpYW5fdGltZV9kb21haW5fdGhh dyhzdHJ1Y3QgZG9tYWluICpkKQoreworICAgIHRpbWVfcmVmX2NvdW50X3RoYXcoZCk7Cit9CisK IGludCB2aXJpZGlhbl90aW1lX3dybXNyKHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVp bnQ2NF90IHZhbCkKIHsKICAgICBzdHJ1Y3QgZG9tYWluICpkID0gdi0+ZG9tYWluOwpAQCAtMTc5 LDcgKzE5Nyw3IEBAIGludCB2aXJpZGlhbl90aW1lX3JkbXNyKGNvbnN0IHN0cnVjdCB2Y3B1ICp2 LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpCiAgICAgICAgICAgICBwcmludGsoWEVOTE9H X0dfSU5GTyAiZCVkOiBWSVJJRElBTiBNU1JfVElNRV9SRUZfQ09VTlQ6IGFjY2Vzc2VkXG4iLAog ICAgICAgICAgICAgICAgICAgIGQtPmRvbWFpbl9pZCk7CiAKLSAgICAgICAgKnZhbCA9IHJhd190 cmNfdmFsKGQpICsgdHJjLT5vZmY7CisgICAgICAgICp2YWwgPSB0aW1lX3JlZl9jb3VudChkKTsK ICAgICAgICAgYnJlYWs7CiAgICAgfQogCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2 L2h2bS92aXJpZGlhbi5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vdmlyaWRpYW4uaAppbmRl eCA2ZDQwZDM5MWUxLi45YTQ5M2NmMDQ4IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2 L2h2bS92aXJpZGlhbi5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZpcmlkaWFuLmgK QEAgLTk3LDggKzk3LDggQEAgaW50IGd1ZXN0X3JkbXNyX3ZpcmlkaWFuKGNvbnN0IHN0cnVjdCB2 Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpOwogaW50CiB2aXJpZGlhbl9oeXBl cmNhbGwoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpOwogCi12b2lkIHZpcmlkaWFuX3RpbWVf cmVmX2NvdW50X2ZyZWV6ZShzdHJ1Y3QgZG9tYWluICpkKTsKLXZvaWQgdmlyaWRpYW5fdGltZV9y ZWZfY291bnRfdGhhdyhzdHJ1Y3QgZG9tYWluICpkKTsKK3ZvaWQgdmlyaWRpYW5fdGltZV9kb21h aW5fZnJlZXplKHN0cnVjdCBkb21haW4gKmQpOwordm9pZCB2aXJpZGlhbl90aW1lX2RvbWFpbl90 aGF3KHN0cnVjdCBkb21haW4gKmQpOwogCiBpbnQgdmlyaWRpYW5fdmNwdV9pbml0KHN0cnVjdCB2 Y3B1ICp2KTsKIGludCB2aXJpZGlhbl9kb21haW5faW5pdChzdHJ1Y3QgZG9tYWluICpkKTsKLS0g CjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Clhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0 dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=