Attachment 157006 Details for Bug 243118 – additional bits for xen support

[patch] additional bits for xen support

more-xen-bits.diff (text/plain), 7.32 KB, created by Gerd Hoffmann on 2007-06-14 14:35:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerd Hoffmann

Created: 2007-06-14 14:35:23 UTC

Size: 7.32 KB

patch

obsolete

>--- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c.xen	2007-06-14 15:31:47.000000000 +0200
>+++ kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c	2007-06-14 15:47:04.000000000 +0200
>@@ -434,7 +434,7 @@
>  * backward compatibility, other architectures can use the per
>  * cpu version get_crash_notes_per_cpu() directly.
>  */
>-static int get_crash_notes(int cpu, uint64_t *addr)
>+static int get_crash_notes(int cpu, uint64_t *addr, uint64_t *size)
> {
> 	char crash_notes[PATH_MAX];
> 	char line[MAX_LINE];
>@@ -456,8 +456,10 @@
> 		printf("crash_notes addr = %Lx\n", *addr);
> #endif
> 		return 0;
>-	} else
>+	} else {
>+		*size = MAX_NOTE_BYTES;
> 		return get_crash_notes_per_cpu(cpu, addr);
>+	}
> }
> 
> /* Prepares the crash memory elf64 headers and stores in supplied buffer. */
>@@ -469,7 +471,10 @@
> 	int i;
> 	char *bufp;
> 	long int nr_cpus = 0;
>+
>+	int (*get_note)(int cpu, uint64_t *addr, uint64_t *len);
> 	uint64_t notes_addr;
>+	uint64_t notes_size;
> 
> 	bufp = (char*) buf;
> 
>@@ -497,13 +502,19 @@
> 	elf->e_shstrndx = 0;
> 
> 	/* PT_NOTE program headers. One per cpu*/
>-	nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
>+	if (xen_present()) {
>+		nr_cpus = xen_get_nr_phys_cpus();
>+		get_note = xen_get_note;
>+	} else {
>+		nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
>+		get_note = get_crash_notes;
>+	}
> 	if (nr_cpus < 0) {
> 		return -1;
> 	}
> 
> 	for (i = 0; i < nr_cpus; i++) {
>-		if (get_crash_notes(i, &notes_addr) < 0) {
>+		if (get_note(i, &notes_addr, &notes_size) < 0) {
> 			/* This cpu is not present. Skip it. */
> 			continue;
> 		}
>@@ -513,7 +524,7 @@
> 		phdr->p_flags	= 0;
> 		phdr->p_offset	= phdr->p_paddr = notes_addr;
> 		phdr->p_vaddr	= 0;
>-		phdr->p_filesz	= phdr->p_memsz	= MAX_NOTE_BYTES;
>+		phdr->p_filesz	= phdr->p_memsz	= notes_size;
> 		/* Do we need any alignment of segments? */
> 		phdr->p_align	= 0;
> 
>@@ -564,7 +575,10 @@
> 	int i;
> 	char *bufp;
> 	long int nr_cpus = 0;
>+
>+	int (*get_note)(int cpu, uint64_t *addr, uint64_t *len);
> 	uint64_t notes_addr;
>+	uint64_t notes_size;
> 
> 	bufp = (char*) buf;
> 
>@@ -592,15 +606,20 @@
> 	elf->e_shstrndx = 0;
> 
> 	/* PT_NOTE program headers. One per cpu*/
>-	nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
>+	if (xen_present()) {
>+		nr_cpus = xen_get_nr_phys_cpus();
>+		get_note = xen_get_note;
>+	} else {
>+		nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
>+		get_note = get_crash_notes;
>+	}
> 	if (nr_cpus < 0) {
> 		return -1;
> 	}
> 
> 	/* Need to find a better way to determine per cpu notes section size. */
>-#define MAX_NOTE_BYTES	1024
> 	for (i = 0; i < nr_cpus; i++) {
>-		if (get_crash_notes(i, &notes_addr) < 0) {
>+		if (get_note(i, &notes_addr, &notes_size) < 0) {
> 			/* This cpu is not present. Skip it. */
> 			return -1;
> 		}
>@@ -610,7 +629,7 @@
> 		phdr->p_flags	= 0;
> 		phdr->p_offset	= phdr->p_paddr = notes_addr;
> 		phdr->p_vaddr	= 0;
>-		phdr->p_filesz	= phdr->p_memsz	= MAX_NOTE_BYTES;
>+		phdr->p_filesz	= phdr->p_memsz	= notes_size;
> 		/* Do we need any alignment of segments? */
> 		phdr->p_align	= 0;
> 
>@@ -687,7 +706,10 @@
> 		return -1;
> 
> 	/* Create elf header segment and store crash image data. */
>-	nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
>+	if (xen_present())
>+		nr_cpus = xen_get_nr_phys_cpus();
>+	else
>+		nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
> 	if (nr_cpus < 0) {
> 		fprintf(stderr,"kexec_load (elf header segment)"
> 			" failed: %s\n", strerror(errno));
>--- kexec-tools-1.101/kexec/crashdump-xen.c.xen	2007-06-14 16:16:33.000000000 +0200
>+++ kexec-tools-1.101/kexec/crashdump-xen.c	2007-06-14 16:16:42.000000000 +0200
>@@ -82,11 +82,6 @@
> 	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";
>--- kexec-tools-1.101/kexec/crashdump.h.xen	2007-06-14 15:41:09.000000000 +0200
>+++ kexec-tools-1.101/kexec/crashdump.h	2007-06-14 15:42:34.000000000 +0200
>@@ -22,4 +22,8 @@
> 	int (*get_note_info)(int cpu, uint64_t *addr, uint64_t *len);
> };
> 
>+int xen_present(void);
>+int xen_get_nr_phys_cpus(void);
>+int xen_get_note(int cpu, uint64_t *addr, uint64_t *len);
>+
> #endif /* CRASHDUMP_H */
>--- kexec-tools-1.101/kexec/kexec-iomem.c.xen	2007-06-14 16:13:36.000000000 +0200
>+++ kexec-tools-1.101/kexec/kexec-iomem.c	2007-06-14 16:13:55.000000000 +0200
>@@ -0,0 +1,101 @@
>+#define _GNU_SOURCE
>+#include <stdio.h>
>+#include <stdarg.h>
>+#include <string.h>
>+#include <stdlib.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"
>+
>+/*
>+ * kexec_iomem_for_each_line()
>+ *
>+ * Iterate over each line in /proc/iomem. If match is NULL or if the line
>+ * matches with our match-pattern then call the callback if non-NULL.
>+ * Return the number of lines matched.
>+ */
>+
>+int kexec_iomem_for_each_line(char *match,
>+			      int (*callback)(void *data,
>+					      int nr,
>+					      char *str,
>+					      unsigned long base,
>+					      unsigned long length),
>+			      void *data)
>+{
>+	const char iomem[]= "/proc/iomem";
>+	char line[MAX_LINE];
>+	FILE *fp;
>+	unsigned long long start, end, size;
>+	char *str;
>+	int consumed;
>+	int count;
>+	int nr = 0;
>+
>+	fp = fopen(iomem, "r");
>+	if (!fp)
>+		die("Cannot open /proc/iomem");
>+
>+	while(fgets(line, sizeof(line), fp) != 0) {
>+		count = sscanf(line, "%Lx-%Lx : %n", &start, &end, &consumed);
>+		if (count != 2)
>+			continue;
>+		str = line + consumed;
>+		size = end - start + 1;
>+		if (!match || memcmp(str, match, strlen(match)) == 0) {
>+			if (callback
>+			    && callback(data, nr, str, start, size) < 0) {
>+				break;
>+			}
>+			nr++;
>+		}
>+	}
>+
>+	fclose(fp);
>+
>+	return nr;
>+}
>+
>+static int kexec_iomem_single_callback(void *data, int nr,
>+				       char *str,
>+				       unsigned long base,
>+				       unsigned long length)
>+{
>+	struct memory_range *range = data;
>+
>+	if (nr == 0) {
>+		range->start = base;
>+		range->end = base + length - 1;
>+	}
>+
>+	return 0;
>+}
>+
>+int parse_iomem_single(char *str, uint64_t *start, uint64_t *end)
>+{
>+	struct memory_range range;
>+	int ret;
>+
>+	memset(&range, 0, sizeof(range));
>+
>+	ret = kexec_iomem_for_each_line(str, kexec_iomem_single_callback,
>+					&range);
>+
>+	if (ret == 1) {
>+		if (start)
>+			*start = range.start;
>+		if (end)
>+			*end = range.end;
>+
>+		ret = 0;
>+	}
>+	else
>+		ret = -1;
>+
>+	return ret;
>+}
>--- kexec-tools-1.101/kexec/kexec.h.xen	2007-06-14 16:14:38.000000000 +0200
>+++ kexec-tools-1.101/kexec/kexec.h	2007-06-14 16:15:15.000000000 +0200
>@@ -200,6 +200,15 @@
> int arch_compat_trampoline(struct kexec_info *info);
> void arch_update_purgatory(struct kexec_info *info);
> 
>+int kexec_iomem_for_each_line(char *match,
>+                              int (*callback)(void *data,
>+                                              int nr,
>+                                              char *str,
>+                                              unsigned long base,
>+                                              unsigned long length),
>+                              void *data);
>+int parse_iomem_single(char *str, uint64_t *start, uint64_t *end);
>+
> #define MAX_LINE	160
> 
> #ifdef DEBUG
>--- kexec-tools-1.101/kexec/Makefile.xen	2007-06-14 16:15:30.000000000 +0200
>+++ kexec-tools-1.101/kexec/Makefile	2007-06-14 16:15:55.000000000 +0200
>@@ -16,6 +16,7 @@
> KEXEC_C_SRCS+= kexec/kexec-elf-core.c
> KEXEC_C_SRCS+= kexec/kexec-elf-rel.c 
> KEXEC_C_SRCS+= kexec/kexec-elf-boot.c 
>+KEXEC_C_SRCS+= kexec/kexec-iomem.c 
> KEXEC_C_SRCS+= kexec/crashdump.c
> KEXEC_C_SRCS+= kexec/crashdump-xen.c
> KEXEC_C_SRCS+= $(PURGATORY_HEX_C)

Actions: View | Diff

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