From: Daniel Kiper <daniel.kiper@oracle.com>
To: konrad.wilk@oracle.com, andrew.cooper3@citrix.com,
jbeulich@suse.com, linux-kernel@vger.kernel.org,
xen-devel@lists.xensource.com
Cc: Daniel Kiper <daniel.kiper@oracle.com>
Subject: [PATCH 04/11] x86/xen: Introduce architecture dependent data for kexec/kdump
Date: Thu, 27 Sep 2012 20:06:31 +0200 [thread overview]
Message-ID: <1348769198-29580-5-git-send-email-daniel.kiper@oracle.com> (raw)
In-Reply-To: <1348769198-29580-4-git-send-email-daniel.kiper@oracle.com>
Introduce architecture dependent constants, structures and
functions required by Xen kexec/kdump implementation.
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
---
arch/x86/include/asm/xen/hypercall.h | 6 +++
arch/x86/include/asm/xen/kexec.h | 83 ++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+), 0 deletions(-)
create mode 100644 arch/x86/include/asm/xen/kexec.h
diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
index 59c226d..553544c 100644
--- a/arch/x86/include/asm/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
@@ -466,6 +466,12 @@ HYPERVISOR_hvm_op(int op, void *arg)
}
static inline int
+HYPERVISOR_kexec_op(unsigned long op, void *args)
+{
+ return _hypercall2(int, kexec_op, op, args);
+}
+
+static inline int
HYPERVISOR_tmem_op(
struct tmem_op *op)
{
diff --git a/arch/x86/include/asm/xen/kexec.h b/arch/x86/include/asm/xen/kexec.h
new file mode 100644
index 0000000..3349031
--- /dev/null
+++ b/arch/x86/include/asm/xen/kexec.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2011 Daniel Kiper
+ * Copyright (c) 2012 Daniel Kiper, Oracle Corporation
+ *
+ * kexec/kdump implementation for Xen was written by Daniel Kiper.
+ * Initial work on it was sponsored by Google under Google Summer
+ * of Code 2011 program and Citrix. Konrad Rzeszutek Wilk from Oracle
+ * was the mentor for this project.
+ *
+ * Some ideas are taken from:
+ * - native kexec/kdump implementation,
+ * - kexec/kdump implementation for Xen Linux Kernel Ver. 2.6.18,
+ * - PV-GRUB.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _ASM_X86_XEN_KEXEC_H
+#define _ASM_X86_XEN_KEXEC_H
+
+#include <linux/init.h>
+
+#define KEXEC_XEN_NO_PAGES 17
+
+#define XK_MA_CONTROL_PAGE 0
+#define XK_VA_CONTROL_PAGE 1
+#define XK_MA_PGD_PAGE 2
+#define XK_VA_PGD_PAGE 3
+#define XK_MA_PUD0_PAGE 4
+#define XK_VA_PUD0_PAGE 5
+#define XK_MA_PUD1_PAGE 6
+#define XK_VA_PUD1_PAGE 7
+#define XK_MA_PMD0_PAGE 8
+#define XK_VA_PMD0_PAGE 9
+#define XK_MA_PMD1_PAGE 10
+#define XK_VA_PMD1_PAGE 11
+#define XK_MA_PTE0_PAGE 12
+#define XK_VA_PTE0_PAGE 13
+#define XK_MA_PTE1_PAGE 14
+#define XK_VA_PTE1_PAGE 15
+#define XK_MA_TABLE_PAGE 16
+
+#ifndef __ASSEMBLY__
+struct xen_kexec_image {
+ unsigned long page_list[KEXEC_XEN_NO_PAGES];
+ unsigned long indirection_page;
+ unsigned long start_address;
+};
+
+struct xen_kexec_load {
+ int type;
+ struct xen_kexec_image image;
+};
+
+extern unsigned int xen_kexec_control_code_size;
+
+extern void __init xen_init_kexec_ops(void);
+
+#ifdef CONFIG_X86_32
+extern void xen_relocate_kernel(unsigned long indirection_page,
+ unsigned long *page_list,
+ unsigned long start_address,
+ unsigned int has_pae,
+ unsigned int preserve_context);
+#else
+extern void xen_relocate_kernel(unsigned long indirection_page,
+ unsigned long *page_list,
+ unsigned long start_address,
+ unsigned int preserve_context);
+#endif
+#endif
+#endif /* _ASM_X86_XEN_KEXEC_H */
--
1.5.6.5
next prev parent reply other threads:[~2012-09-27 18:06 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-27 18:06 [PATCH 00/11] xen: Initial kexec/kdump implementation Daniel Kiper
2012-09-27 18:06 ` [PATCH 01/11] kexec: introduce kexec_ops struct Daniel Kiper
2012-09-27 18:06 ` [PATCH 02/11] x86/kexec: Add extra pointers to transition page table PGD, PUD, PMD and PTE Daniel Kiper
2012-09-27 18:06 ` [PATCH 03/11] xen: Introduce architecture independent data for kexec/kdump Daniel Kiper
2012-09-27 18:06 ` Daniel Kiper [this message]
2012-09-27 18:06 ` [PATCH 05/11] x86/xen: Register resources required by kexec-tools Daniel Kiper
2012-09-27 18:06 ` [PATCH 06/11] x86/xen: Add i386 kexec/kdump implementation Daniel Kiper
2012-09-27 18:06 ` [PATCH 07/11] x86/xen: Add x86_64 " Daniel Kiper
2012-09-27 18:06 ` [PATCH 08/11] x86/xen: Add kexec/kdump makefile rules Daniel Kiper
2012-09-27 18:06 ` [PATCH 09/11] x86/xen/enlighten: Add init and crash kexec/kdump hooks Daniel Kiper
2012-09-27 18:06 ` [PATCH 10/11] drivers/xen: Export vmcoreinfo through sysfs Daniel Kiper
2012-09-27 18:06 ` [PATCH 11/11] x86: Add Xen kexec control code size check to linker script Daniel Kiper
2012-09-28 8:11 ` [PATCH 06/11] x86/xen: Add i386 kexec/kdump implementation Jan Beulich
2012-09-28 16:39 ` Konrad Rzeszutek Wilk
2012-10-01 13:16 ` Daniel Kiper
[not found] ` <506577E3020000780009E65B@nat28.tlf.novell.com>
2012-10-01 12:52 ` Daniel Kiper
[not found] ` <20121001125252.GB2942@host-192-168-1-59.local.net-space.pl>
2012-10-01 13:55 ` Jan Beulich
[not found] ` <5069BCD5020000780009EC7D@nat28.tlf.novell.com>
2012-10-01 17:33 ` Daniel Kiper
2012-09-28 16:21 ` [PATCH 05/11] x86/xen: Register resources required by kexec-tools Konrad Rzeszutek Wilk
2012-10-01 9:40 ` Jan Beulich
2012-10-01 13:28 ` Daniel Kiper
2012-10-01 13:21 ` Daniel Kiper
2012-09-28 16:10 ` [PATCH 03/11] xen: Introduce architecture independent data for kexec/kdump Konrad Rzeszutek Wilk
2012-10-01 13:34 ` Daniel Kiper
2012-09-28 7:56 ` [PATCH 02/11] x86/kexec: Add extra pointers to transition page table PGD, PUD, PMD and PTE Jan Beulich
[not found] ` <50657462020000780009E64A@nat28.tlf.novell.com>
2012-10-01 13:01 ` Daniel Kiper
2012-09-28 7:49 ` [PATCH 01/11] kexec: introduce kexec_ops struct Jan Beulich
2012-09-28 16:07 ` Konrad Rzeszutek Wilk
2012-10-01 13:40 ` Daniel Kiper
[not found] ` <5065729C020000780009E63B@nat28.tlf.novell.com>
2012-10-01 11:36 ` Daniel Kiper
[not found] ` <20121001113046.GA2942@host-192-168-1-59.local.net-space.pl>
2012-10-05 13:27 ` Ian Campbell
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=1348769198-29580-5-git-send-email-daniel.kiper@oracle.com \
--to=daniel.kiper@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=xen-devel@lists.xensource.com \
/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).