From: Paul Durrant Subject: [PATCH 2/2] viridian: fix mistakes in timer expiration and re-start Date: Mon, 18 Mar 2019 09:07:00 +0000 Message-ID: <20190318090700.1538-3-paul.durrant@citrix.com> References: <20190318090700.1538-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 1h5oEk-0000T8-Ek for xen-devel@lists.xenproject.org; Mon, 18 Mar 2019 09:07:14 +0000 In-Reply-To: <20190318090700.1538-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 VGhpcyBwYXRjaCBmaXhlcyBhIGZldyBpc3N1ZXM6CgotIFRoZSBzcGVjaWZpY2F0aW9uIHNheXMg dGhhdCBhIG9uZS1zaG90IHRpbWVycyBzaG91bGQgYmUgbWFya2VkIGFzCiAgZGlzYWJsZWQgYXQg dGhlIHBvaW50IG9mIGV4cGlyeSwgc28gdGhlIGVuYWJsZWQgYml0IHNob3VsZCBiZSBjbGVhcmVk IGJ5CiAgc3RpbWVyX2V4cGlyZSgpIHJhdGhlciB0aGFuIHBvbGxfc3RpbWVyKCkuIEZvciBzaW1w bGljaXR5LCBjYWxsCiAgc3RpbWVyX2V4cGlyZSgpIGZyb20gc3RhcnRfc3RpbWVyKCkgZm9yIHRp bWVycyB0aGF0IGV4cGlyZSBpbW1lZGlhdGVseQogIHJhdGhlciB0aGFuIG9wZW4tY29kaW5nIHRo ZSBleHBpcnkuCgotIFRoZSBjb2RlIG9taXRzIHVwZGF0aW5nIHRoZSBleHBpcmF0aW9uIHZhbHVl IGZvciBvbmUtc2hvdCB0aW1lcnMgYW5kCiAgc28gdGhlIGV2ZW50dWFsIG1lc3NhZ2UgZGVsaXZl cmVkIHZpYSB0aGUgc3luaWMgd2lsbCBiZSBpbmNvcnJlY3QuCgotIFBlcmlvZGljIHRpbWVycyBz aG91bGQgb25seSBiZSByZS1zdGFydGVkIGlmIHRoZXkgYXJlIHN0aWxsIGVuYWJsZWQgc28sCiAg bm93IHRoYXQgZW5hYmxlZCB3aWxsIGJlIGFscmVhZHkgY2xlYXIgZm9yIG9uZS1zaG90IHRpbWVy cywgY2FsbAogIHN0YXJ0X3N0aW1lcigpIGZyb20gcG9sbF9zdGltZXIoKSBvbmx5IGlmIHRoZSB0 aW1lciBpcyBzdGlsbCBlbmFibGVkLgoKU2lnbmVkLW9mZi1ieTogUGF1bCBEdXJyYW50IDxwYXVs LmR1cnJhbnRAY2l0cml4LmNvbT4KLS0tCkNjOiBKYW4gQmV1bGljaCA8amJldWxpY2hAc3VzZS5j b20+CkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgpDYzogV2Vp IExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ2M6ICJSb2dlciBQYXUgTW9ubsOpIiA8cm9nZXIu cGF1QGNpdHJpeC5jb20+Ci0tLQogeGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMgfCAx MiArKysrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDUgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS92aXJpZGlhbi90aW1lLmMgYi94 ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3RpbWUuYwppbmRleCA3YTc1OWU3MGIzLi42OTJmMDE0 ZmM0IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3RpbWUuYworKysgYi94 ZW4vYXJjaC94ODYvaHZtL3ZpcmlkaWFuL3RpbWUuYwpAQCAtMTg3LDcgKzE4Nyw3IEBAIHN0YXRp YyB2b2lkIHN0b3Bfc3RpbWVyKHN0cnVjdCB2aXJpZGlhbl9zdGltZXIgKnZzKQogCiBzdGF0aWMg dm9pZCBzdGltZXJfZXhwaXJlKHZvaWQgKmRhdGEpCiB7Ci0gICAgY29uc3Qgc3RydWN0IHZpcmlk aWFuX3N0aW1lciAqdnMgPSBkYXRhOworICAgIHN0cnVjdCB2aXJpZGlhbl9zdGltZXIgKnZzID0g ZGF0YTsKICAgICBzdHJ1Y3QgdmNwdSAqdiA9IHZzLT52OwogICAgIHN0cnVjdCB2aXJpZGlhbl92 Y3B1ICp2diA9IHYtPmFyY2guaHZtLnZpcmlkaWFuOwogICAgIHVuc2lnbmVkIGludCBzdGltZXJ4 ID0gdnMgLSAmdnYtPnN0aW1lclswXTsKQEAgLTE5Nyw2ICsxOTcsOSBAQCBzdGF0aWMgdm9pZCBz dGltZXJfZXhwaXJlKHZvaWQgKmRhdGEpCiAKICAgICBzZXRfYml0KHN0aW1lcngsICZ2di0+c3Rp bWVyX3BlbmRpbmcpOwogICAgIHZjcHVfa2ljayh2KTsKKworICAgIGlmICggIXZzLT5jb25maWcu cGVyaW9kaWMgKQorICAgICAgICB2cy0+Y29uZmlnLmVuYWJsZWQgPSAwOwogfQogCiBzdGF0aWMg dm9pZCBzdGFydF9zdGltZXIoc3RydWN0IHZpcmlkaWFuX3N0aW1lciAqdnMpCkBAIC0yNTYsNyAr MjU5LDggQEAgc3RhdGljIHZvaWQgc3RhcnRfc3RpbWVyKHN0cnVjdCB2aXJpZGlhbl9zdGltZXIg KnZzKQogICAgICAgICBleHBpcmF0aW9uID0gdnMtPmNvdW50OwogICAgICAgICBpZiAoIGV4cGly YXRpb24gLSBub3cgPD0gMCApCiAgICAgICAgIHsKLSAgICAgICAgICAgIHNldF9iaXQoc3RpbWVy eCwgJnZ2LT5zdGltZXJfcGVuZGluZyk7CisgICAgICAgICAgICB2cy0+ZXhwaXJhdGlvbiA9IGV4 cGlyYXRpb247CisgICAgICAgICAgICBzdGltZXJfZXhwaXJlKHZzKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogICAgIH0KQEAgLTI4NSwxMCArMjg5LDggQEAgc3RhdGljIHZvaWQg cG9sbF9zdGltZXIoc3RydWN0IHZjcHUgKnYsIHVuc2lnbmVkIGludCBzdGltZXJ4KQogCiAgICAg Y2xlYXJfYml0KHN0aW1lcngsICZ2di0+c3RpbWVyX3BlbmRpbmcpOwogCi0gICAgaWYgKCB2cy0+ Y29uZmlnLnBlcmlvZGljICkKKyAgICBpZiAoIHZzLT5jb25maWcuZW5hYmxlZCApCiAgICAgICAg IHN0YXJ0X3N0aW1lcih2cyk7Ci0gICAgZWxzZQotICAgICAgICB2cy0+Y29uZmlnLmVuYWJsZWQg PSAwOwogfQogCiB2b2lkIHZpcmlkaWFuX3RpbWVfcG9sbF90aW1lcnMoc3RydWN0IHZjcHUgKnYp Ci0tIAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9y ZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs