Commit 669280a1 authored by Baoquan He's avatar Baoquan He Committed by Linus Torvalds
Browse files

kexec: take the segment adding out of locate_mem_hole functions 



In locate_mem_hole functions, a memory hole is located and added as
kexec_segment.  But from the name of locate_mem_hole, it should only take
responsibility of searching a available memory hole to contain data of a
specified size.

So in this patch add a new field 'mem' into kexec_buf, then take that
kexec segment adding code out of locate_mem_hole_top_down and
locate_mem_hole_bottom_up.  This make clear of the functionality of
locate_mem_hole just like it declars to do.  And by this
locate_mem_hole_callback chould be used later if anyone want to locate a
memory hole for other use.

Meanwhile Vivek suggested opening code function __kexec_add_segment(),
that way we have to retreive ksegment pointer once and it is easy to read.
 So just do it in this patch and remove __kexec_add_segment() since no one
use it anymore.

Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 887f4f86

include/linux/kexec.h

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ struct kexec_buf { 
	struct kimage *image;

	char *buffer;

	unsigned long bufsz;

	unsigned long mem;

	unsigned long memsz;

	unsigned long buf_align;

	unsigned long buf_min;

kernel/kexec.c

+8 −21
Original line number Diff line number Diff line
@@ -2016,22 +2016,6 @@ static int __init crash_save_vmcoreinfo_init(void) 
subsys_initcall(crash_save_vmcoreinfo_init);



#ifdef CONFIG_KEXEC_FILE

static int __kexec_add_segment(struct kimage *image, char *buf,

			       unsigned long bufsz, unsigned long mem,

			       unsigned long memsz)

{

	struct kexec_segment *ksegment;



	ksegment = &image->segment[image->nr_segments];

	ksegment->kbuf = buf;

	ksegment->bufsz = bufsz;

	ksegment->mem = mem;

	ksegment->memsz = memsz;

	image->nr_segments++;



	return 0;

}



static int locate_mem_hole_top_down(unsigned long start, unsigned long end,

				    struct kexec_buf *kbuf)

{
@@ -2064,8 +2048,7 @@ static int locate_mem_hole_top_down(unsigned long start, unsigned long end, 
	} while (1);



	/* If we are here, we found a suitable memory range */

	__kexec_add_segment(image, kbuf->buffer, kbuf->bufsz, temp_start,

			    kbuf->memsz);

	kbuf->mem = temp_start;



	/* Success, stop navigating through remaining System RAM ranges */

	return 1;
@@ -2099,8 +2082,7 @@ static int locate_mem_hole_bottom_up(unsigned long start, unsigned long end, 
	} while (1);



	/* If we are here, we found a suitable memory range */

	__kexec_add_segment(image, kbuf->buffer, kbuf->bufsz, temp_start,

			    kbuf->memsz);

	kbuf->mem = temp_start;



	/* Success, stop navigating through remaining System RAM ranges */

	return 1;
@@ -2187,7 +2169,12 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, 
	}



	/* Found a suitable memory range */

	ksegment = &image->segment[image->nr_segments - 1];

	ksegment = &image->segment[image->nr_segments];

	ksegment->kbuf = kbuf->buffer;

	ksegment->bufsz = kbuf->bufsz;

	ksegment->mem = kbuf->mem;

	ksegment->memsz = kbuf->memsz;

	image->nr_segments++;

	*load_addr = ksegment->mem;

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE