Attachment 156570 Details for Bug 243118 – new patch

[patch] new patch

kexec-xen.patch (text/plain), 4.27 KB, created by Neil Horman on 2007-06-08 12:13:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-06-08 12:13:54 UTC

Size: 4.27 KB

patch

obsolete

>--- /dev/null	2007-05-12 17:40:21.471089444 -0400
>+++ kexec-tools-1.101/kexec/crashdump-xen.c	2007-06-08 08:09:47.000000000 -0400
>@@ -0,0 +1,126 @@
>+#define _GNU_SOURCE
>+#include <stdio.h>
>+#include <stdarg.h>
>+#include <string.h>
>+#include <stdlib.h>
>+#include <elf.h>
>+#include <errno.h>
>+#include <limits.h>
>+#include <sys/types.h>
>+#include <sys/stat.h>
>+#include <unistd.h>
>+#include <fcntl.h>
>+#include "kexec.h"
>+#include "crashdump.h"
>+
>+#ifdef HAVE_XENCTRL_H
>+#include <xenctrl.h>
>+#endif
>+
>+struct crash_note_info {
>+	unsigned long base;
>+	unsigned long length;
>+};
>+
>+int xen_phys_cpus = 0;
>+struct crash_note_info *xen_phys_notes;
>+
>+int xen_present(void)
>+{
>+	struct stat buf;
>+
>+	return stat("/proc/xen", &buf) == 0;
>+}
>+
>+unsigned long xen_architecture(struct crash_elf_info *elf_info)
>+{
>+	unsigned long machine = elf_info->machine;
>+#ifdef HAVE_XENCTRL_H
>+	int xc, rc;
>+	xen_capabilities_info_t capabilities;
>+
>+	if (!xen_present())
>+		goto out;
>+
>+	memset(capabilities, '0', XEN_CAPABILITIES_INFO_LEN);
>+
>+	xc = xc_interface_open();
>+	if ( xc == -1 ) {
>+		fprintf(stderr, "failed to open xen control interface.\n");
>+		goto out;
>+	}
>+
>+	rc = xc_version(xc, XENVER_capabilities, &capabilities[0]);
>+	if ( rc == -1 ) {
>+		fprintf(stderr, "failed to make Xen version hypercall.\n");
>+		goto out_close;
>+	}
>+
>+	if (strstr(capabilities, "xen-3.0-x86_64"))
>+		machine = EM_X86_64;
>+        else if (strstr(capabilities, "xen-3.0-x86_32"))
>+		machine = EM_386;
>+
>+ out_close:
>+	xc_interface_close(xc);
>+
>+ out:
>+#endif
>+	return machine;
>+}
>+
>+static int xen_crash_note_callback(void *data, int nr,
>+				   char *str,
>+				   unsigned long base,
>+				   unsigned long length)
>+{
>+	struct crash_note_info *note = xen_phys_notes + nr;
>+
>+	note->base = base;
>+	note->length = length;
>+
>+	return 0;
>+}
>+
>+/*
>+ * NASTY XEN HACK TO GET THINGS BUILDING
>+ */
>+#define kexec_iomem_for_each_line(x,y,z) 0
>+
>+int xen_get_nr_phys_cpus(void)
>+{
>+	char *match = "Crash note\n";
>+	int cpus, n;
>+
>+	if (xen_phys_cpus)
>+		return xen_phys_cpus;
>+
>+	if ((cpus = kexec_iomem_for_each_line(match, NULL, NULL))) {
>+		n = sizeof(struct crash_note_info) * cpus;
>+		xen_phys_notes = malloc(n);
>+		if (!xen_phys_notes) {
>+			fprintf(stderr, "failed to allocate xen_phys_notes.\n");
>+			return -1;
>+		}
>+		memset(xen_phys_notes, 0, n);
>+		kexec_iomem_for_each_line(match, xen_crash_note_callback, NULL);
>+		xen_phys_cpus = cpus;
>+	}
>+
>+	return cpus;
>+}
>+
>+int xen_get_note(int cpu, uint64_t *addr, uint64_t *len)
>+{
>+	struct crash_note_info *note;
>+
>+	if (xen_phys_cpus <= 0)
>+		return -1;
>+
>+	note = xen_phys_notes + cpu;
>+
>+	*addr = note->base;
>+	*len = note->length;
>+
>+	return 0;
>+}
>--- kexec-tools-1.101/kexec/Makefile.xen	2007-06-08 08:07:57.000000000 -0400
>+++ kexec-tools-1.101/kexec/Makefile	2007-06-08 08:09:47.000000000 -0400
>@@ -17,6 +17,7 @@
> KEXEC_C_SRCS+= kexec/kexec-elf-rel.c 
> KEXEC_C_SRCS+= kexec/kexec-elf-boot.c 
> KEXEC_C_SRCS+= kexec/crashdump.c
>+KEXEC_C_SRCS+= kexec/crashdump-xen.c
> KEXEC_C_SRCS+= $(PURGATORY_HEX_C)
> KEXEC_S_SRCS:= 
> include kexec/arch/$(ARCH)/Makefile
>--- kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c.xen	2007-06-08 08:10:52.000000000 -0400
>+++ kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c	2007-06-08 08:12:55.000000000 -0400
>@@ -53,6 +53,9 @@
> 	FILE *fp;
> 	unsigned long long start, end;
> 
>+	if (xen_present()) /* Kernel not entity mapped under Xen */
>+		return 0;
>+
> 	fp = fopen(iomem, "r");
> 	if (!fp) {
> 		fprintf(stderr, "Cannot open %s: %s\n", iomem, strerror(errno));
>@@ -122,6 +125,9 @@
> 	unsigned long size;
> 	uint32_t elf_flags = 0;
> 
>+	if (xen_present()) /* Kernel not entity mapped under Xen */
>+		return 0;
>+
> 	align = getpagesize();
> 	size = KCORE_ELF_HEADERS_SIZE;
> 	buf = slurp_file_len(kcore, size);
>--- kexec-tools-1.101/kexec/crashdump.h.xen	2007-06-08 08:07:57.000000000 -0400
>+++ kexec-tools-1.101/kexec/crashdump.h	2007-06-08 08:09:47.000000000 -0400
>@@ -8,4 +8,18 @@
> /* Expecting ELF headers to fit in 4K. Increase it if you need more. */
> #define KCORE_ELF_HEADERS_SIZE  4096
> 
>+struct crash_elf_info {
>+	unsigned long class;
>+	unsigned long data;
>+	unsigned long machine;
>+
>+	unsigned long backup_src_start;
>+	unsigned long backup_src_end;
>+
>+	unsigned long page_offset;
>+	unsigned long lowmem_limit;
>+
>+	int (*get_note_info)(int cpu, uint64_t *addr, uint64_t *len);
>+};
>+
> #endif /* CRASHDUMP_H */

Actions: View | Diff

Attachments on bug 243118: 156504 | 156565 | 156570 | 157006 | 157015