linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anchal Agarwal <anchalag@amazon.com>
To: <tglx@linutronix.de>, <mingo@redhat.com>, <hpa@zytor.com>,
	<x86@kernel.org>
Cc: <boris.ostrovsky@oracle.com>, <konrad.wilk@oracle.com>,
	<roger.pau@citrix.com>, <netdev@vger.kernel.org>,
	<jgross@suse.com>, <xen-devel@lists.xenproject.org>,
	<linux-kernel@vger.kernel.org>, <kamatam@amazon.com>,
	<anchalag@amazon.com>, <fllinden@amazon.com>,
	<vallish@amazon.com>, <guruanb@amazon.com>, <eduval@amazon.com>,
	<rjw@rjwysocki.net>, <pavel@ucw.cz>, <len.brown@intel.com>,
	<linux-pm@vger.kernel.org>, <cyberax@amazon.com>
Subject: [RFC PATCH 05/12] x86/xen: add system core suspend and resume callbacks
Date: Tue, 12 Jun 2018 20:56:12 +0000	[thread overview]
Message-ID: <20180612205619.28156-6-anchalag@amazon.com> (raw)
In-Reply-To: <20180612205619.28156-1-anchalag@amazon.com>

From: Munehisa Kamata <kamatam@amazon.com>

Add Xen PVHVM specific system core callbacks for PM suspend and
hibernation support. The callbacks suspend and resume Xen primitives,
like shared_info, pvclock and grant table. Note that Xen suspend can
handle them in a different manner, but system core callbacks are called
from the context. So if the callbacks are called from Xen suspend
context, return immediately.

Signed-off-by: Munehisa Kamata <kamatam@amazon.com>
Signed-off-by: Anchal Agarwal <anchalag@amazon.com>
Reviewed-by: Munehisa Kamata <kamatam@amazon.com>
Reviewed-by: Eduardo Valentin <eduval@amazon.com>
---
 arch/x86/xen/enlighten_hvm.c |  1 +
 arch/x86/xen/suspend.c       | 53 ++++++++++++++++++++++++++++++++++++++++++++
 include/xen/xen-ops.h        |  2 ++
 3 files changed, 56 insertions(+)

diff --git a/arch/x86/xen/enlighten_hvm.c b/arch/x86/xen/enlighten_hvm.c
index d24ad16..4196a65 100644
--- a/arch/x86/xen/enlighten_hvm.c
+++ b/arch/x86/xen/enlighten_hvm.c
@@ -202,6 +202,7 @@ static void __init xen_hvm_guest_init(void)
 	if (xen_feature(XENFEAT_hvm_callback_vector))
 		xen_have_vector_callback = 1;
 
+	xen_setup_syscore_ops();
 	xen_hvm_smp_init();
 	WARN_ON(xen_cpuhp_setup(xen_cpu_up_prepare_hvm, xen_cpu_dead_hvm));
 	xen_unplug_emulated_devices();
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index 1d83152..784c448 100644
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -2,17 +2,22 @@
 #include <linux/types.h>
 #include <linux/tick.h>
 #include <linux/percpu-defs.h>
+#include <linux/syscore_ops.h>
+#include <linux/kernel_stat.h>
 
 #include <xen/xen.h>
 #include <xen/interface/xen.h>
+#include <xen/interface/memory.h>
 #include <xen/grant_table.h>
 #include <xen/events.h>
+#include <xen/xen-ops.h>
 
 #include <asm/cpufeatures.h>
 #include <asm/msr-index.h>
 #include <asm/xen/hypercall.h>
 #include <asm/xen/page.h>
 #include <asm/fixmap.h>
+#include <asm/pvclock.h>
 
 #include "xen-ops.h"
 #include "mmu.h"
@@ -82,3 +87,51 @@ void xen_arch_suspend(void)
 
 	on_each_cpu(xen_vcpu_notify_suspend, NULL, 1);
 }
+
+static int xen_syscore_suspend(void)
+{
+	struct xen_remove_from_physmap xrfp;
+	int ret;
+
+	/* Xen suspend does similar stuffs in its own logic */
+	if (xen_suspend_mode_is_xen_suspend())
+		return 0;
+
+	xrfp.domid = DOMID_SELF;
+	xrfp.gpfn = __pa(HYPERVISOR_shared_info) >> PAGE_SHIFT;
+
+	ret = HYPERVISOR_memory_op(XENMEM_remove_from_physmap, &xrfp);
+	if (!ret)
+		HYPERVISOR_shared_info = &xen_dummy_shared_info;
+
+	return ret;
+}
+
+static void xen_syscore_resume(void)
+{
+	/* Xen suspend does similar stuffs in its own logic */
+	if (xen_suspend_mode_is_xen_suspend())
+		return;
+
+	/* No need to setup vcpu_info as it's already moved off */
+	xen_hvm_map_shared_info();
+
+	pvclock_resume();
+
+	gnttab_resume();
+}
+
+/*
+ * These callbacks will be called with interrupts disabled and when having only
+ * one CPU online.
+ */
+static struct syscore_ops xen_hvm_syscore_ops = {
+	.suspend = xen_syscore_suspend,
+	.resume = xen_syscore_resume
+};
+
+void __init xen_setup_syscore_ops(void)
+{
+	if (xen_hvm_domain())
+		register_syscore_ops(&xen_hvm_syscore_ops);
+}
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index be78f6f..65f25bd 100644
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -43,6 +43,8 @@ bool xen_suspend_mode_is_xen_suspend(void);
 bool xen_suspend_mode_is_pm_suspend(void);
 bool xen_suspend_mode_is_pm_hibernation(void);
 
+void xen_setup_syscore_ops(void);
+
 extern unsigned long *xen_contiguous_bitmap;
 
 #ifdef CONFIG_XEN_PV
-- 
2.7.4


  parent reply	other threads:[~2018-06-12 21:01 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-12 20:56 [RFC PATCH 00/12] Enable PM hibernation on guest VMs Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 01/12] xen/manage: keep track of the on-going suspend mode Anchal Agarwal
2018-06-13 16:42   ` Balbir Singh
2018-06-12 20:56 ` [RFC PATCH 02/12] xen/manage: introduce helper function to know " Anchal Agarwal
2018-06-13 17:41   ` Balbir Singh
2018-06-12 20:56 ` [RFC PATCH 03/12] xenbus: add freeze/thaw/restore callbacks support Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 04/12] x86/xen: Introduce new function to map HYPERVISOR_shared_info on Resume Anchal Agarwal
2018-06-12 20:56 ` Anchal Agarwal [this message]
2018-06-12 20:56 ` [RFC PATCH 06/12] xen-blkfront: add callbacks for PM suspend and hibernation Anchal Agarwal
2018-06-13  8:24   ` Roger Pau Monné
     [not found]     ` <20180613222048.GB33296@kaos-source-ops-60001.pdx1.amazon.com>
2018-06-14  8:43       ` Roger Pau Monné
2018-06-12 20:56 ` [RFC PATCH 07/12] xen-netfront: add callbacks for PM suspend and hibernation support Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 08/12] xen-time-introduce-xen_-save-restore-_steal_clock Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 09/12] x86/xen: save and restore steal clock Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 10/12] xen/events: add xen_shutdown_pirqs helper function Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 11/12] x86/xen: close event channels for PIRQs in system core suspend callback Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 12/12] PM / hibernate: update the resume offset on SNAPSHOT_SET_SWAP_AREA Anchal Agarwal
2018-06-14 19:45   ` Pavel Machek
2018-06-14 19:50     ` Besogonov, Aleksei
2018-06-12 21:09 ` [RFC PATCH 00/12] Enable PM hibernation on guest VMs Konrad Rzeszutek Wilk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180612205619.28156-6-anchalag@amazon.com \
    --to=anchalag@amazon.com \
    --cc=boris.ostrovsky@oracle.com \
    --cc=cyberax@amazon.com \
    --cc=eduval@amazon.com \
    --cc=fllinden@amazon.com \
    --cc=guruanb@amazon.com \
    --cc=hpa@zytor.com \
    --cc=jgross@suse.com \
    --cc=kamatam@amazon.com \
    --cc=konrad.wilk@oracle.com \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=pavel@ucw.cz \
    --cc=rjw@rjwysocki.net \
    --cc=roger.pau@citrix.com \
    --cc=tglx@linutronix.de \
    --cc=vallish@amazon.com \
    --cc=x86@kernel.org \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).