Attachment 155721 Details for Bug 238768 – patch to retry locate_hole if there is a segment overlap and to limit elfcorehdr buffer to max mmap end

[patch] patch to retry locate_hole if there is a segment overlap and to limit elfcorehdr buffer to max mmap end

kexec-x86.patch (text/plain), 2.04 KB, created by Neil Horman on 2007-05-30 18:24:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-05-30 18:24:48 UTC

Size: 2.04 KB

patch

obsolete

>--- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c.orig1	2007-05-30 14:21:01.000000000 -0400
>+++ kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c	2007-05-30 14:21:57.000000000 -0400
>@@ -663,6 +663,7 @@
> 	int nr_ranges, align = 1024;
> 	long int nr_cpus = 0;
> 	struct memory_range *mem_range, *memmap_p;
>+	int i;
> 
> 	if (get_crash_memory_ranges(&mem_range, &nr_ranges) < 0)
> 		return -1;
>@@ -720,8 +721,13 @@
> 	 * elf core header segment to 16K to avoid being placed in such gaps.
> 	 * This is a makeshift solution until it is fixed in kernel.
> 	 */
>-	elfcorehdr = add_buffer(info, tmp, sz, 16*1024, align, min_base,
>-							max_addr, -1);
>+	for (i=0;i<KEXEC_MAX_SEGMENTS;i++) {
>+		if ((memmap_p[i].start == 0) &&
>+		    (memmap_p[i].end == 0))
>+			break;
>+	}
>+	elfcorehdr = add_buffer(info, tmp, sz, 16*1024, align, min_base, 
>+				memmap_p[i-1].end, -1);
> 	dfprintf(stdout, "Created elf header segment at 0x%lx\n", elfcorehdr);
> 	if (delete_memmap(memmap_p, elfcorehdr, sz) < 0)
> 		return -1;
>--- kexec-tools-1.101/kexec/kexec.c.orig1	2007-05-30 14:21:01.000000000 -0400
>+++ kexec-tools-1.101/kexec/kexec.c	2007-05-30 14:21:34.000000000 -0400
>@@ -327,6 +327,7 @@
> 	unsigned long base;
> 	int result;
> 	int pagesize;
>+	int i;
> 
> 	result = sort_segments(info);
> 	if (result < 0) {
>@@ -336,11 +337,24 @@
> 	/* Round memsz up to a multiple of pagesize */
> 	pagesize = getpagesize();
> 	memsz = (memsz + (pagesize - 1)) & ~(pagesize - 1);
>-
>+retry:
> 	base = locate_hole(info, memsz, buf_align, buf_min, buf_max, buf_end);
> 	if (base == ULONG_MAX) {
> 		die("locate_hole failed\n");
> 	}
>+
>+	for (i = 0; i < info->nr_segments; i++) {
>+		if (((base <= (unsigned long)info->segment[i].mem) &&
>+		    (base+memsz > (unsigned long)info->segment[i].mem)) ||
>+		    ((base > (unsigned long)info->segment[i].mem) && 
>+		     (base <= ((unsigned long)info->segment[i].mem + info->segment[i].memsz)))) {
>+			/*
>+			 *we have an overlap, bump down buf_max
>+			 */
>+			buf_max = (unsigned long)info->segment[i].mem;
>+			goto retry;
>+		}
>+	}
> 	
> 	add_segment(info, buf, bufsz, base, memsz);
> 	return base;

Actions: View | Diff

Attachments on bug 238768: 154149 | 154826 | 155015 | 155257 | 155721