From: Paul Durrant Subject: [PATCH 7/8] viridian: stop directly calling viridian_time_ref_count_freeze/thaw()... Date: Thu, 20 Dec 2018 16:33:44 +0000 Message-ID: <20181220163345.10708-8-paul.durrant@citrix.com> References: <20181220163345.10708-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ga1TK-0000GH-60 for xen-devel@lists.xenproject.org; Thu, 20 Dec 2018 16:46:54 +0000 In-Reply-To: <20181220163345.10708-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+Ci0tLQpDYzogSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPgpDYzogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNA Y2l0cml4LmNvbT4KQ2M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CkNjOiAiUm9nZXIg UGF1IE1vbm7DqSIgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgotLS0KIHhlbi9hcmNoL3g4Ni9kb21h aW4uYyAgICAgICAgICAgICAgfCAxMiArKysrKystLS0tLS0KIHhlbi9hcmNoL3g4Ni9odm0vdmly aWRpYW4vdGltZS5jICAgfCAyNCArKysrKysrKysrKysrKysrKysrKystLS0KIHhlbi9pbmNsdWRl L2FzbS14ODYvaHZtL3ZpcmlkaWFuLmggfCAgNCArKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDI5IGlu c2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9k b21haW4uYyBiL3hlbi9hcmNoL3g4Ni9kb21haW4uYwppbmRleCAzMmRjNDI1M2ZmLi5lZDJhNTdh OGE2IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvZG9tYWluLmMKKysrIGIveGVuL2FyY2gveDg2 L2RvbWFpbi5jCkBAIC02NTgsMjAgKzY1OCwyMCBAQCB2b2lkIGFyY2hfZG9tYWluX2Rlc3Ryb3ko c3RydWN0IGRvbWFpbiAqZCkKIAogdm9pZCBhcmNoX2RvbWFpbl9zaHV0ZG93bihzdHJ1Y3QgZG9t YWluICpkKQogewotICAgIGlmICggaGFzX3ZpcmlkaWFuX3RpbWVfcmVmX2NvdW50KGQpICkKLSAg ICAgICAgdmlyaWRpYW5fdGltZV9yZWZfY291bnRfZnJlZXplKGQpOworICAgIGlmICggaXNfdmly aWRpYW5fZG9tYWluKGQpICkKKyAgICAgICAgdmlyaWRpYW5fdGltZV9kb21haW5fZnJlZXplKGQp OwogfQogCiB2b2lkIGFyY2hfZG9tYWluX3BhdXNlKHN0cnVjdCBkb21haW4gKmQpCiB7Ci0gICAg aWYgKCBoYXNfdmlyaWRpYW5fdGltZV9yZWZfY291bnQoZCkgKQotICAgICAgICB2aXJpZGlhbl90 aW1lX3JlZl9jb3VudF9mcmVlemUoZCk7CisgICAgaWYgKCBpc192aXJpZGlhbl9kb21haW4oZCkg KQorICAgICAgICB2aXJpZGlhbl90aW1lX2RvbWFpbl9mcmVlemUoZCk7CiB9CiAKIHZvaWQgYXJj aF9kb21haW5fdW5wYXVzZShzdHJ1Y3QgZG9tYWluICpkKQogewotICAgIGlmICggaGFzX3Zpcmlk aWFuX3RpbWVfcmVmX2NvdW50KGQpICkKLSAgICAgICAgdmlyaWRpYW5fdGltZV9yZWZfY291bnRf dGhhdyhkKTsKKyAgICBpZiAoIGlzX3ZpcmlkaWFuX2RvbWFpbihkKSApCisgICAgICAgIHZpcmlk aWFuX3RpbWVfZG9tYWluX3RoYXcoZCk7CiB9CiAKIGludCBhcmNoX2RvbWFpbl9zb2Z0X3Jlc2V0 KHN0cnVjdCBkb21haW4gKmQpCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFu L3RpbWUuYyBiL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdGltZS5jCmluZGV4IGU4OTI0YWRm YTEuLmNiNzE2MmMyZDQgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdGlt ZS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9odm0vdmlyaWRpYW4vdGltZS5jCkBAIC05MSw3ICs5MSw3 IEBAIHN0YXRpYyBpbnQ2NF90IHJhd190cmNfdmFsKHN0cnVjdCBkb21haW4gKmQpCiAgICAgcmV0 dXJuIHNjYWxlX2RlbHRhKHRzYywgJnRzY190b19ucykgLyAxMDB1bDsKIH0KIAotdm9pZCB2aXJp ZGlhbl90aW1lX3JlZl9jb3VudF9mcmVlemUoc3RydWN0IGRvbWFpbiAqZCkKK3N0YXRpYyB2b2lk IHRpbWVfcmVmX2NvdW50X2ZyZWV6ZShzdHJ1Y3QgZG9tYWluICpkKQogewogICAgIHN0cnVjdCB2 aXJpZGlhbl90aW1lX3JlZl9jb3VudCAqdHJjID0KICAgICAgICAgJmQtPmFyY2guaHZtLnZpcmlk aWFuLT50aW1lX3JlZl9jb3VudDsKQEAgLTEwMCw3ICsxMDAsNyBAQCB2b2lkIHZpcmlkaWFuX3Rp bWVfcmVmX2NvdW50X2ZyZWV6ZShzdHJ1Y3QgZG9tYWluICpkKQogICAgICAgICB0cmMtPnZhbCA9 IHJhd190cmNfdmFsKGQpICsgdHJjLT5vZmY7CiB9CiAKLXZvaWQgdmlyaWRpYW5fdGltZV9yZWZf Y291bnRfdGhhdyhzdHJ1Y3QgZG9tYWluICpkKQorc3RhdGljIHZvaWQgdGltZV9yZWZfY291bnRf dGhhdyhzdHJ1Y3QgZG9tYWluICpkKQogewogICAgIHN0cnVjdCB2aXJpZGlhbl90aW1lX3JlZl9j b3VudCAqdHJjID0KICAgICAgICAgJmQtPmFyY2guaHZtLnZpcmlkaWFuLT50aW1lX3JlZl9jb3Vu dDsKQEAgLTExMCw2ICsxMTAsMjQgQEAgdm9pZCB2aXJpZGlhbl90aW1lX3JlZl9jb3VudF90aGF3 KHN0cnVjdCBkb21haW4gKmQpCiAgICAgICAgIHRyYy0+b2ZmID0gKGludDY0X3QpdHJjLT52YWwg LSByYXdfdHJjX3ZhbChkKTsKIH0KIAorc3RhdGljIGludDY0X3QgdGltZV9yZWZfY291bnQoc3Ry dWN0IGRvbWFpbiAqZCkKK3sKKyAgICBzdHJ1Y3QgdmlyaWRpYW5fdGltZV9yZWZfY291bnQgKnRy YyA9CisgICAgICAgICZkLT5hcmNoLmh2bS52aXJpZGlhbi0+dGltZV9yZWZfY291bnQ7CisKKyAg ICByZXR1cm4gcmF3X3RyY192YWwoZCkgKyB0cmMtPm9mZjsKK30KKwordm9pZCB2aXJpZGlhbl90 aW1lX2RvbWFpbl9mcmVlemUoc3RydWN0IGRvbWFpbiAqZCkKK3sKKyAgICB0aW1lX3JlZl9jb3Vu dF9mcmVlemUoZCk7Cit9CisKK3ZvaWQgdmlyaWRpYW5fdGltZV9kb21haW5fdGhhdyhzdHJ1Y3Qg ZG9tYWluICpkKQoreworICAgIHRpbWVfcmVmX2NvdW50X3RoYXcoZCk7Cit9CisKIGludCB2aXJp ZGlhbl90aW1lX3dybXNyKHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJfdCBpZHgsIHVpbnQ2NF90IHZh bCkKIHsKICAgICBzdHJ1Y3QgZG9tYWluICpkID0gdi0+ZG9tYWluOwpAQCAtMTc5LDcgKzE5Nyw3 IEBAIGludCB2aXJpZGlhbl90aW1lX3JkbXNyKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1aW50MzJf dCBpZHgsIHVpbnQ2NF90ICp2YWwpCiAgICAgICAgICAgICBwcmludGsoWEVOTE9HX0dfSU5GTyAi ZCVkOiBWSVJJRElBTiBNU1JfVElNRV9SRUZfQ09VTlQ6IGFjY2Vzc2VkXG4iLAogICAgICAgICAg ICAgICAgICAgIGQtPmRvbWFpbl9pZCk7CiAKLSAgICAgICAgKnZhbCA9IHJhd190cmNfdmFsKGQp ICsgdHJjLT5vZmY7CisgICAgICAgICp2YWwgPSB0aW1lX3JlZl9jb3VudChkKTsKICAgICAgICAg YnJlYWs7CiAgICAgfQogCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92aXJp ZGlhbi5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vdmlyaWRpYW4uaAppbmRleCA2ZDQwZDM5 MWUxLi45YTQ5M2NmMDQ4IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92aXJp ZGlhbi5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZpcmlkaWFuLmgKQEAgLTk3LDgg Kzk3LDggQEAgaW50IGd1ZXN0X3JkbXNyX3ZpcmlkaWFuKGNvbnN0IHN0cnVjdCB2Y3B1ICp2LCB1 aW50MzJfdCBpZHgsIHVpbnQ2NF90ICp2YWwpOwogaW50CiB2aXJpZGlhbl9oeXBlcmNhbGwoc3Ry dWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpOwogCi12b2lkIHZpcmlkaWFuX3RpbWVfcmVmX2NvdW50 X2ZyZWV6ZShzdHJ1Y3QgZG9tYWluICpkKTsKLXZvaWQgdmlyaWRpYW5fdGltZV9yZWZfY291bnRf dGhhdyhzdHJ1Y3QgZG9tYWluICpkKTsKK3ZvaWQgdmlyaWRpYW5fdGltZV9kb21haW5fZnJlZXpl KHN0cnVjdCBkb21haW4gKmQpOwordm9pZCB2aXJpZGlhbl90aW1lX2RvbWFpbl90aGF3KHN0cnVj dCBkb21haW4gKmQpOwogCiBpbnQgdmlyaWRpYW5fdmNwdV9pbml0KHN0cnVjdCB2Y3B1ICp2KTsK IGludCB2aXJpZGlhbl9kb21haW5faW5pdChzdHJ1Y3QgZG9tYWluICpkKTsKLS0gCjIuMjAuMS4y LmdiMjFlYmI2NzEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9y ZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs