From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4327C3F68F for ; Fri, 14 Feb 2020 23:27:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 952A42187F for ; Fri, 14 Feb 2020 23:27:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="wIWeAYgn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728351AbgBNX1s (ORCPT ); Fri, 14 Feb 2020 18:27:48 -0500 Received: from smtp-fw-33001.amazon.com ([207.171.190.10]:1035 "EHLO smtp-fw-33001.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727649AbgBNX1s (ORCPT ); Fri, 14 Feb 2020 18:27:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1581722867; x=1613258867; h=date:from:to:subject:message-id:references:mime-version: in-reply-to; bh=w2YudPijii+dzE2cW4maD6E6FQY1WRpU8HmwPnvoM5k=; b=wIWeAYgn40YOrYt2FC6c5BTIphd+RIWYLpUy4SbFnDl1Cp9drlyhvVc6 N6VynUKymRW5+/IXaVCtxQa6ACgoS7pFMti42jWpUJ9wV9sdUlKLIfV9c JA7UZLw1SXo1k6n10q7e3xqgNSG/14gZHHn0S6xD+tF38IR+IZUBgLjbu 0=; IronPort-SDR: 4QzLk7agU2cCkHMRbCkf+yxdh7O3HX/h13ILndMQD5DBXAC5QIGb3xBDBxJz+ZI2EvA/bpTqBv mUC+a3+dOYhg== X-IronPort-AV: E=Sophos;i="5.70,442,1574121600"; d="scan'208";a="26558954" Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-1d-74cf8b49.us-east-1.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP; 14 Feb 2020 23:27:45 +0000 Received: from EX13MTAUEB002.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1d-74cf8b49.us-east-1.amazon.com (Postfix) with ESMTPS id 9E2B3C0845; Fri, 14 Feb 2020 23:27:38 +0000 (UTC) Received: from EX13D08UEB001.ant.amazon.com (10.43.60.245) by EX13MTAUEB002.ant.amazon.com (10.43.60.12) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 14 Feb 2020 23:27:25 +0000 Received: from EX13MTAUEB002.ant.amazon.com (10.43.60.12) by EX13D08UEB001.ant.amazon.com (10.43.60.245) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 14 Feb 2020 23:27:25 +0000 Received: from dev-dsk-anchalag-2a-9c2d1d96.us-west-2.amazon.com (172.22.96.68) by mail-relay.amazon.com (10.43.60.234) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Fri, 14 Feb 2020 23:27:19 +0000 Received: by dev-dsk-anchalag-2a-9c2d1d96.us-west-2.amazon.com (Postfix, from userid 4335130) id F07DD4028E; Fri, 14 Feb 2020 23:27:18 +0000 (UTC) Date: Fri, 14 Feb 2020 23:27:18 +0000 From: Anchal Agarwal To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v3 10/12] xen: Introduce wrapper for save/restore sched clock offset Message-ID: <305f20fbf503b637b1a08b7bec543f49271a725a.1581721799.git.anchalag@amazon.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce wrappers for save/restore xen_sched_clock_offset to be used by PM hibernation code to avoid system instability during resume. Signed-off-by: Anchal Agarwal --- arch/x86/xen/time.c | 15 +++++++++++++-- arch/x86/xen/xen-ops.h | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 8cf632dda605..eeb6d3d2eaab 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -379,12 +379,23 @@ static const struct pv_time_ops xen_time_ops __initconst = { static struct pvclock_vsyscall_time_info *xen_clock __read_mostly; static u64 xen_clock_value_saved; +/*This is needed to maintain a monotonic clock value during PM hibernation */ +void xen_save_sched_clock_offset(void) +{ + xen_clock_value_saved = xen_clocksource_read() - xen_sched_clock_offset; +} + +void xen_restore_sched_clock_offset(void) +{ + xen_sched_clock_offset = xen_clocksource_read() - xen_clock_value_saved; +} + void xen_save_time_memory_area(void) { struct vcpu_register_time_memory_area t; int ret; - xen_clock_value_saved = xen_clocksource_read() - xen_sched_clock_offset; + xen_save_sched_clock_offset(); if (!xen_clock) return; @@ -426,7 +437,7 @@ void xen_restore_time_memory_area(void) out: /* Need pvclock_resume() before using xen_clocksource_read(). */ pvclock_resume(); - xen_sched_clock_offset = xen_clocksource_read() - xen_clock_value_saved; + xen_restore_sched_clock_offset(); } static void xen_setup_vsyscall_time_info(void) diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index d84c357994bd..9f49124df033 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -72,6 +72,8 @@ void xen_save_time_memory_area(void); void xen_restore_time_memory_area(void); void xen_init_time_ops(void); void xen_hvm_init_time_ops(void); +void xen_save_sched_clock_offset(void); +void xen_restore_sched_clock_offset(void); irqreturn_t xen_debug_interrupt(int irq, void *dev_id); -- 2.24.1.AMZN From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIM_ADSP_ALL,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16D96C35242 for ; Fri, 14 Feb 2020 23:28:00 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D8D322086A for ; Fri, 14 Feb 2020 23:27:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="HeiQn5cA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8D322086A Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j2kNC-0001QB-7x; Fri, 14 Feb 2020 23:27:50 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j2kNA-0001PJ-9J for xen-devel@lists.xenproject.org; Fri, 14 Feb 2020 23:27:48 +0000 X-Inumbo-ID: 9bc8dc16-4f81-11ea-ade5-bc764e2007e4 Received: from smtp-fw-33001.amazon.com (unknown [207.171.190.10]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9bc8dc16-4f81-11ea-ade5-bc764e2007e4; Fri, 14 Feb 2020 23:27:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1581722868; x=1613258868; h=date:from:to:subject:message-id:references:mime-version: in-reply-to; bh=w2YudPijii+dzE2cW4maD6E6FQY1WRpU8HmwPnvoM5k=; b=HeiQn5cAUKdo/Y8RuhOHqDEZH/v12wrXQksyYEHFTEAbCde5MvR6vMxF mgpG4CkNfjV/OsS9mQpYSUy9jV66GBOe6LMIBtqfSqj5xyyZ2akD1TVCQ VWc7kLSoodXxcF9X2jXfeYV3LcIvBcc0q9Tq4GascjHVH4ySR0eXH4Er5 k=; IronPort-SDR: 4QzLk7agU2cCkHMRbCkf+yxdh7O3HX/h13ILndMQD5DBXAC5QIGb3xBDBxJz+ZI2EvA/bpTqBv mUC+a3+dOYhg== X-IronPort-AV: E=Sophos;i="5.70,442,1574121600"; d="scan'208";a="26558954" Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-1d-74cf8b49.us-east-1.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP; 14 Feb 2020 23:27:45 +0000 Received: from EX13MTAUEB002.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1d-74cf8b49.us-east-1.amazon.com (Postfix) with ESMTPS id 9E2B3C0845; Fri, 14 Feb 2020 23:27:38 +0000 (UTC) Received: from EX13D08UEB001.ant.amazon.com (10.43.60.245) by EX13MTAUEB002.ant.amazon.com (10.43.60.12) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 14 Feb 2020 23:27:25 +0000 Received: from EX13MTAUEB002.ant.amazon.com (10.43.60.12) by EX13D08UEB001.ant.amazon.com (10.43.60.245) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 14 Feb 2020 23:27:25 +0000 Received: from dev-dsk-anchalag-2a-9c2d1d96.us-west-2.amazon.com (172.22.96.68) by mail-relay.amazon.com (10.43.60.234) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Fri, 14 Feb 2020 23:27:19 +0000 Received: by dev-dsk-anchalag-2a-9c2d1d96.us-west-2.amazon.com (Postfix, from userid 4335130) id F07DD4028E; Fri, 14 Feb 2020 23:27:18 +0000 (UTC) Date: Fri, 14 Feb 2020 23:27:18 +0000 From: Anchal Agarwal To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , Message-ID: <305f20fbf503b637b1a08b7bec543f49271a725a.1581721799.git.anchalag@amazon.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Precedence: Bulk Subject: [Xen-devel] [RFC PATCH v3 10/12] xen: Introduce wrapper for save/restore sched clock offset X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" SW50cm9kdWNlIHdyYXBwZXJzIGZvciBzYXZlL3Jlc3RvcmUgeGVuX3NjaGVkX2Nsb2NrX29mZnNl dCB0byBiZQp1c2VkIGJ5IFBNIGhpYmVybmF0aW9uIGNvZGUgdG8gYXZvaWQgc3lzdGVtIGluc3Rh YmlsaXR5IGR1cmluZyByZXN1bWUuCgpTaWduZWQtb2ZmLWJ5OiBBbmNoYWwgQWdhcndhbCA8YW5j aGFsYWdAYW1hem9uLmNvbT4KLS0tCiBhcmNoL3g4Ni94ZW4vdGltZS5jICAgIHwgMTUgKysrKysr KysrKysrKy0tCiBhcmNoL3g4Ni94ZW4veGVuLW9wcy5oIHwgIDIgKysKIDIgZmlsZXMgY2hhbmdl ZCwgMTUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL3g4 Ni94ZW4vdGltZS5jIGIvYXJjaC94ODYveGVuL3RpbWUuYwppbmRleCA4Y2Y2MzJkZGE2MDUuLmVl YjZkM2QyZWFhYiAxMDA2NDQKLS0tIGEvYXJjaC94ODYveGVuL3RpbWUuYworKysgYi9hcmNoL3g4 Ni94ZW4vdGltZS5jCkBAIC0zNzksMTIgKzM3OSwyMyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHB2 X3RpbWVfb3BzIHhlbl90aW1lX29wcyBfX2luaXRjb25zdCA9IHsKIHN0YXRpYyBzdHJ1Y3QgcHZj bG9ja192c3lzY2FsbF90aW1lX2luZm8gKnhlbl9jbG9jayBfX3JlYWRfbW9zdGx5Owogc3RhdGlj IHU2NCB4ZW5fY2xvY2tfdmFsdWVfc2F2ZWQ7CiAKKy8qVGhpcyBpcyBuZWVkZWQgdG8gbWFpbnRh aW4gYSBtb25vdG9uaWMgY2xvY2sgdmFsdWUgZHVyaW5nIFBNIGhpYmVybmF0aW9uICovCit2b2lk IHhlbl9zYXZlX3NjaGVkX2Nsb2NrX29mZnNldCh2b2lkKQoreworCXhlbl9jbG9ja192YWx1ZV9z YXZlZCA9IHhlbl9jbG9ja3NvdXJjZV9yZWFkKCkgLSB4ZW5fc2NoZWRfY2xvY2tfb2Zmc2V0Owor fQorCit2b2lkIHhlbl9yZXN0b3JlX3NjaGVkX2Nsb2NrX29mZnNldCh2b2lkKQoreworCXhlbl9z Y2hlZF9jbG9ja19vZmZzZXQgPSB4ZW5fY2xvY2tzb3VyY2VfcmVhZCgpIC0geGVuX2Nsb2NrX3Zh bHVlX3NhdmVkOworfQorCiB2b2lkIHhlbl9zYXZlX3RpbWVfbWVtb3J5X2FyZWEodm9pZCkKIHsK IAlzdHJ1Y3QgdmNwdV9yZWdpc3Rlcl90aW1lX21lbW9yeV9hcmVhIHQ7CiAJaW50IHJldDsKIAot CXhlbl9jbG9ja192YWx1ZV9zYXZlZCA9IHhlbl9jbG9ja3NvdXJjZV9yZWFkKCkgLSB4ZW5fc2No ZWRfY2xvY2tfb2Zmc2V0OworCXhlbl9zYXZlX3NjaGVkX2Nsb2NrX29mZnNldCgpOwogCiAJaWYg KCF4ZW5fY2xvY2spCiAJCXJldHVybjsKQEAgLTQyNiw3ICs0MzcsNyBAQCB2b2lkIHhlbl9yZXN0 b3JlX3RpbWVfbWVtb3J5X2FyZWEodm9pZCkKIG91dDoKIAkvKiBOZWVkIHB2Y2xvY2tfcmVzdW1l KCkgYmVmb3JlIHVzaW5nIHhlbl9jbG9ja3NvdXJjZV9yZWFkKCkuICovCiAJcHZjbG9ja19yZXN1 bWUoKTsKLQl4ZW5fc2NoZWRfY2xvY2tfb2Zmc2V0ID0geGVuX2Nsb2Nrc291cmNlX3JlYWQoKSAt IHhlbl9jbG9ja192YWx1ZV9zYXZlZDsKKwl4ZW5fcmVzdG9yZV9zY2hlZF9jbG9ja19vZmZzZXQo KTsKIH0KIAogc3RhdGljIHZvaWQgeGVuX3NldHVwX3ZzeXNjYWxsX3RpbWVfaW5mbyh2b2lkKQpk aWZmIC0tZ2l0IGEvYXJjaC94ODYveGVuL3hlbi1vcHMuaCBiL2FyY2gveDg2L3hlbi94ZW4tb3Bz LmgKaW5kZXggZDg0YzM1Nzk5NGJkLi45ZjQ5MTI0ZGYwMzMgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2 L3hlbi94ZW4tb3BzLmgKKysrIGIvYXJjaC94ODYveGVuL3hlbi1vcHMuaApAQCAtNzIsNiArNzIs OCBAQCB2b2lkIHhlbl9zYXZlX3RpbWVfbWVtb3J5X2FyZWEodm9pZCk7CiB2b2lkIHhlbl9yZXN0 b3JlX3RpbWVfbWVtb3J5X2FyZWEodm9pZCk7CiB2b2lkIHhlbl9pbml0X3RpbWVfb3BzKHZvaWQp Owogdm9pZCB4ZW5faHZtX2luaXRfdGltZV9vcHModm9pZCk7Cit2b2lkIHhlbl9zYXZlX3NjaGVk X2Nsb2NrX29mZnNldCh2b2lkKTsKK3ZvaWQgeGVuX3Jlc3RvcmVfc2NoZWRfY2xvY2tfb2Zmc2V0 KHZvaWQpOwogCiBpcnFyZXR1cm5fdCB4ZW5fZGVidWdfaW50ZXJydXB0KGludCBpcnEsIHZvaWQg KmRldl9pZCk7CiAKLS0gCjIuMjQuMS5BTVpOCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlz dHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xp c3RpbmZvL3hlbi1kZXZlbA==