Commit c729de8f authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

x86, kdump: Set crashkernel_low automatically 



Chao said that kdump does does work well on his system on 3.8
without extra parameter, even iommu does not work with kdump.
And now have to append crashkernel_low=Y in first kernel to make
kdump work.

We have now modified crashkernel=X to allocate memory beyong 4G (if
available) and do not allocate low range for crashkernel if the user
does not specify that with crashkernel_low=Y.  This causes regression
if iommu is not enabled.  Without iommu, swiotlb needs to be setup in
first 4G and there is no low memory available to second kernel.

Set crashkernel_low automatically if the user does not specify that.

For system that does support IOMMU with kdump properly, user could
specify crashkernel_low=0 to save that 72M low ram.

-v3: add swiotlb_size() according to Konrad.
-v4: add comments what 8M is for according to hpa.
     also update more crashkernel_low= in kernel-parameters.txt
-v5: update changelog according to Vivek.
-v6: Change description about swiotlb referring according to HATAYAMA.

Reported-by: default avatarWANG Chao <chaowang@redhat.com>
Tested-by: default avatarWANG Chao <chaowang@redhat.com>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-2-git-send-email-yinghai@kernel.org


Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 41ef2d56

Documentation/kernel-parameters.txt

+11 −3
Original line number Diff line number Diff line
@@ -596,9 +596,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			is selected automatically. Check

			Documentation/kdump/kdump.txt for further details.



	crashkernel_low=size[KMG]

			[KNL, x86] parts under 4G.



	crashkernel=range1:size1[,range2:size2,...][@offset]

			[KNL] Same as above, but depends on the memory

			in the running system. The syntax of range is
@@ -606,6 +603,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			a memory unit (amount[KMG]). See also

			Documentation/kdump/kdump.txt for an example.



	crashkernel_low=size[KMG]

			[KNL, x86_64] range under 4G. When crashkernel= is

			passed, kernel allocate physical memory region

			above 4G, that cause second kernel crash on system

			that require some amount of low memory, e.g. swiotlb

			requires at least 64M+32K low memory.  Kernel would

			try to allocate 72M below 4G automatically.

			This one let user to specify own low range under 4G

			for second kernel instead.

			0: to disable low allocation.



	cs89x0_dma=	[HW,NET]

			Format: <dma>

arch/x86/kernel/setup.c

+18 −3
Original line number Diff line number Diff line
@@ -521,18 +521,33 @@ static void __init reserve_crashkernel_low(void) 
	unsigned long long low_base = 0, low_size = 0;

	unsigned long total_low_mem;

	unsigned long long base;

	bool auto_set = false;

	int ret;



	total_low_mem = memblock_mem_size(1UL<<(32-PAGE_SHIFT));

	ret = parse_crashkernel_low(boot_command_line, total_low_mem,

						&low_size, &base);

	if (ret != 0 || low_size <= 0)

	if (ret != 0) {

		/*

		 * two parts from lib/swiotlb.c:

		 *	swiotlb size: user specified with swiotlb= or default.

		 *	swiotlb overflow buffer: now is hardcoded to 32k.

		 *		We round it to 8M for other buffers that

		 *		may need to stay low too.

		 */

		low_size = swiotlb_size_or_default() + (8UL<<20);

		auto_set = true;

	} else {

		/* passed with crashkernel_low=0 ? */

		if (!low_size)

			return;

	}



	low_base = memblock_find_in_range(low_size, (1ULL<<32),

					low_size, alignment);



	if (!low_base) {

		if (!auto_set)

			pr_info("crashkernel low reservation failed - No suitable area found.\n");



		return;

include/linux/swiotlb.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ extern int swiotlb_force; 
extern void swiotlb_init(int verbose);

int swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);

extern unsigned long swiotlb_nr_tbl(void);

unsigned long swiotlb_size_or_default(void);

extern int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs);



/*

lib/swiotlb.c

+15 −4
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ setup_io_tlb_npages(char *str) 
	if (!strcmp(str, "force"))

		swiotlb_force = 1;



	return 1;

	return 0;

}

__setup("swiotlb=", setup_io_tlb_npages);

early_param("swiotlb", setup_io_tlb_npages);

/* make io_tlb_overflow tunable too? */



unsigned long swiotlb_nr_tbl(void)
@@ -115,6 +115,18 @@ unsigned long swiotlb_nr_tbl(void) 
	return io_tlb_nslabs;

}

EXPORT_SYMBOL_GPL(swiotlb_nr_tbl);



/* default to 64MB */

#define IO_TLB_DEFAULT_SIZE (64UL<<20)

unsigned long swiotlb_size_or_default(void)

{

	unsigned long size;



	size = io_tlb_nslabs << IO_TLB_SHIFT;



	return size ? size : (IO_TLB_DEFAULT_SIZE);

}



/* Note that this doesn't work with highmem page */

static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,

				      volatile void *address)
@@ -188,8 +200,7 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose) 
void  __init

swiotlb_init(int verbose)

{

	/* default to 64MB */

	size_t default_size = 64UL<<20;

	size_t default_size = IO_TLB_DEFAULT_SIZE;

	unsigned char *vstart;

	unsigned long bytes;

CRA Git | Maintained and supported by SUSTech CRA and CCSE