LKML Archive on lore.kernel.org
 help / color / Atom feed
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Yinghai Lu <yinghai@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>, Jacob Shin <jacob.shin@amd.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH v8 14/46] x86, mm: use pfn_range_is_mapped() with reserve_initrd
Date: Wed, 28 Nov 2012 12:08:56 -0500
Message-ID: <20121128170856.GL21266@phenom.dumpdata.com> (raw)
In-Reply-To: <1353123563-3103-15-git-send-email-yinghai@kernel.org>

On Fri, Nov 16, 2012 at 07:38:51PM -0800, Yinghai Lu wrote:
> We are going to map ram only, so under max_low_pfn_mapped,
> between 4g and max_pfn_mapped does not mean mapped at all.
> 
> Use pfn_range_is_mapped() to find out if range is mapped for initrd.
> 
> That could happen bootloader put initrd in range but user could
                   ^- 'if the'                              ^^^^^-'used'

> use memmap to carve some of range out.
  ^^^-> get rid of that.       ^^^^->'ranges'

> 
> Also during copying need to use early_memmap to map original initrd
> for accessing.
> 
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> ---
>  arch/x86/kernel/setup.c |   52 +++++++++++++++++++++++++---------------------
>  1 files changed, 28 insertions(+), 24 deletions(-)
> 
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index d85cbd9..bd52f9d 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -317,20 +317,19 @@ static void __init relocate_initrd(void)
>  	u64 ramdisk_image = boot_params.hdr.ramdisk_image;
>  	u64 ramdisk_size  = boot_params.hdr.ramdisk_size;
>  	u64 area_size     = PAGE_ALIGN(ramdisk_size);
> -	u64 end_of_lowmem = max_low_pfn_mapped << PAGE_SHIFT;
>  	u64 ramdisk_here;
>  	unsigned long slop, clen, mapaddr;
>  	char *p, *q;
>  
> -	/* We need to move the initrd down into lowmem */
> -	ramdisk_here = memblock_find_in_range(0, end_of_lowmem, area_size,
> -					 PAGE_SIZE);
> +	/* We need to move the initrd down into directly mapped mem */
> +	ramdisk_here = memblock_find_in_range(0, PFN_PHYS(max_low_pfn_mapped),
> +						 area_size, PAGE_SIZE);
>  
>  	if (!ramdisk_here)
>  		panic("Cannot find place for new RAMDISK of size %lld\n",
>  			 ramdisk_size);
>  
> -	/* Note: this includes all the lowmem currently occupied by
> +	/* Note: this includes all the mem currently occupied by
>  	   the initrd, we rely on that fact to keep the data intact. */
>  	memblock_reserve(ramdisk_here, area_size);
>  	initrd_start = ramdisk_here + PAGE_OFFSET;
> @@ -340,17 +339,7 @@ static void __init relocate_initrd(void)
>  
>  	q = (char *)initrd_start;
>  
> -	/* Copy any lowmem portion of the initrd */
> -	if (ramdisk_image < end_of_lowmem) {
> -		clen = end_of_lowmem - ramdisk_image;
> -		p = (char *)__va(ramdisk_image);
> -		memcpy(q, p, clen);
> -		q += clen;
> -		ramdisk_image += clen;
> -		ramdisk_size  -= clen;
> -	}
> -
> -	/* Copy the highmem portion of the initrd */
> +	/* Copy the initrd */
>  	while (ramdisk_size) {
>  		slop = ramdisk_image & ~PAGE_MASK;
>  		clen = ramdisk_size;
> @@ -364,7 +353,7 @@ static void __init relocate_initrd(void)
>  		ramdisk_image += clen;
>  		ramdisk_size  -= clen;
>  	}
> -	/* high pages is not converted by early_res_to_bootmem */
> +
>  	ramdisk_image = boot_params.hdr.ramdisk_image;
>  	ramdisk_size  = boot_params.hdr.ramdisk_size;
>  	printk(KERN_INFO "Move RAMDISK from [mem %#010llx-%#010llx] to"
> @@ -373,13 +362,27 @@ static void __init relocate_initrd(void)
>  		ramdisk_here, ramdisk_here + ramdisk_size - 1);
>  }
>  
> +static u64 __init get_mem_size(unsigned long limit_pfn)
> +{
> +	int i;
> +	u64 mapped_pages = 0;
> +	unsigned long start_pfn, end_pfn;
> +
> +	for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, NULL) {
> +		start_pfn = min_t(unsigned long, start_pfn, limit_pfn);
> +		end_pfn = min_t(unsigned long, end_pfn, limit_pfn);
> +		mapped_pages += end_pfn - start_pfn;
> +	}
> +
> +	return mapped_pages << PAGE_SHIFT;
> +}
>  static void __init reserve_initrd(void)
>  {
>  	/* Assume only end is not page aligned */
>  	u64 ramdisk_image = boot_params.hdr.ramdisk_image;
>  	u64 ramdisk_size  = boot_params.hdr.ramdisk_size;
>  	u64 ramdisk_end   = PAGE_ALIGN(ramdisk_image + ramdisk_size);
> -	u64 end_of_lowmem = max_low_pfn_mapped << PAGE_SHIFT;
> +	u64 mapped_size;
>  
>  	if (!boot_params.hdr.type_of_loader ||
>  	    !ramdisk_image || !ramdisk_size)
> @@ -387,18 +390,19 @@ static void __init reserve_initrd(void)
>  
>  	initrd_start = 0;
>  
> -	if (ramdisk_size >= (end_of_lowmem>>1)) {
> +	mapped_size = get_mem_size(max_low_pfn_mapped);
> +	if (ramdisk_size >= (mapped_size>>1))
>  		panic("initrd too large to handle, "
>  		       "disabling initrd (%lld needed, %lld available)\n",
> -		       ramdisk_size, end_of_lowmem>>1);
> -	}
> +		       ramdisk_size, mapped_size>>1);
>  
>  	printk(KERN_INFO "RAMDISK: [mem %#010llx-%#010llx]\n", ramdisk_image,
>  			ramdisk_end - 1);
>  
> -
> -	if (ramdisk_end <= end_of_lowmem) {
> -		/* All in lowmem, easy case */
> +	if (ramdisk_end <= (max_low_pfn_mapped<<PAGE_SHIFT) &&
> +	    pfn_range_is_mapped(PFN_DOWN(ramdisk_image),
> +				PFN_DOWN(ramdisk_end))) {
> +		/* All are mapped, easy case */
>  		/*
>  		 * don't need to reserve again, already reserved early
>  		 * in i386_start_kernel
> -- 
> 1.7.7

  parent reply index

Thread overview: 119+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-17  3:38 [PATCH v8 00/46] x86, mm: map ram from top-down with BRK and memblock Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 01/46] x86, mm: Add global page_size_mask and probe one time only Yinghai Lu
2012-11-22  1:38   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 02/46] x86, mm: Split out split_mem_range from init_memory_mapping Yinghai Lu
2012-11-22  1:39   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 03/46] x86, mm: Move down find_early_table_space() Yinghai Lu
2012-11-22  1:40   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 16:50   ` [PATCH v8 03/46] " Konrad Rzeszutek Wilk
2012-11-17  3:38 ` [PATCH v8 04/46] x86, mm: Move init_memory_mapping calling out of setup.c Yinghai Lu
2012-11-22  1:41   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 16:50   ` [PATCH v8 04/46] " Konrad Rzeszutek Wilk
2012-11-17  3:38 ` [PATCH v8 05/46] x86, mm: Revert back good_end setting for 64bit Yinghai Lu
2012-11-22  1:42   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 06/46] x86, mm: Change find_early_table_space() paramters Yinghai Lu
2012-11-22  1:43   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 16:50   ` [PATCH v8 06/46] " Konrad Rzeszutek Wilk
2012-11-17  3:38 ` [PATCH v8 07/46] x86, mm: Find early page table buffer together Yinghai Lu
2012-11-22  1:44   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 16:50   ` [PATCH v8 07/46] " Konrad Rzeszutek Wilk
2012-11-17  3:38 ` [PATCH v8 08/46] x86, mm: Separate out calculate_table_space_size() Yinghai Lu
2012-11-22  1:45   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 16:59   ` [PATCH v8 08/46] " Konrad Rzeszutek Wilk
2012-11-17  3:38 ` [PATCH v8 09/46] x86, mm: Set memblock initial limit to 1M Yinghai Lu
2012-11-22  1:46   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 10/46] x86, mm: if kernel .text .data .bss are not marked as E820_RAM, complain and fix Yinghai Lu
2012-11-22  1:47   ` [tip:x86/mm2] " tip-bot for Jacob Shin
2012-11-17  3:38 ` [PATCH v8 11/46] x86, mm: Fixup code testing if a pfn is direct mapped Yinghai Lu
2012-11-22  1:48   ` [tip:x86/mm2] " tip-bot for Jacob Shin
2012-11-17  3:38 ` [PATCH v8 12/46] x86, mm: use pfn_range_is_mapped() with CPA Yinghai Lu
2012-11-22  1:49   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 17:06   ` [PATCH v8 12/46] " Konrad Rzeszutek Wilk
2012-11-28 19:33     ` Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 13/46] x86, mm: use pfn_range_is_mapped() with gart Yinghai Lu
2012-11-22  1:50   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 17:07   ` [PATCH v8 13/46] " Konrad Rzeszutek Wilk
2012-11-17  3:38 ` [PATCH v8 14/46] x86, mm: use pfn_range_is_mapped() with reserve_initrd Yinghai Lu
2012-11-22  1:51   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 17:08   ` Konrad Rzeszutek Wilk [this message]
2012-11-28 19:40     ` [PATCH v8 14/46] " Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 15/46] x86, mm: Only direct map addresses that are marked as E820_RAM Yinghai Lu
2012-11-22  1:53   ` [tip:x86/mm2] " tip-bot for Jacob Shin
2012-11-28 17:15   ` [PATCH v8 15/46] " Konrad Rzeszutek Wilk
2012-11-28 19:43     ` Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 16/46] x86, mm: relocate initrd under all mem for 64bit Yinghai Lu
2012-11-22  1:54   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 17/46] x86, mm: Align start address to correct big page size Yinghai Lu
2012-11-22  1:55   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 18/46] x86, mm: Use big page size for small memory range Yinghai Lu
2012-11-22  1:56   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 19/46] x86, mm: Don't clear page table if range is ram Yinghai Lu
2012-11-22  1:57   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 20/46] x86, mm: Break down init_all_memory_mapping Yinghai Lu
2012-11-22  1:58   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:38 ` [PATCH v8 21/46] x86, mm: setup page table in top-down Yinghai Lu
2012-11-22  1:59   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 17:50   ` [PATCH v8 21/46] " Konrad Rzeszutek Wilk
2012-11-28 20:16     ` Yinghai Lu
2012-12-05 21:53       ` Konrad Rzeszutek Wilk
2012-11-17  3:38 ` [PATCH v8 22/46] x86, mm: Remove early_memremap workaround for page table accessing on 64bit Yinghai Lu
2012-11-22  2:00   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 18:57   ` [PATCH v8 22/46] " Konrad Rzeszutek Wilk
2012-11-17  3:39 ` [PATCH v8 23/46] x86, mm: Remove parameter in alloc_low_page for 64bit Yinghai Lu
2012-11-22  2:01   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 18:57   ` [PATCH v8 23/46] " Konrad Rzeszutek Wilk
2012-11-17  3:39 ` [PATCH v8 24/46] x86, mm: Merge alloc_low_page between 64bit and 32bit Yinghai Lu
2012-11-22  2:02   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 25/46] x86, mm: Move min_pfn_mapped back to mm/init.c Yinghai Lu
2012-11-22  2:03   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 26/46] x86, mm, Xen: Remove mapping_pagetable_reserve() Yinghai Lu
2012-11-22  2:04   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 27/46] x86, mm: Add alloc_low_pages(num) Yinghai Lu
2012-11-22  2:05   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 28/46] x86, mm: Add pointer about Xen mmu requirement for alloc_low_pages Yinghai Lu
2012-11-22  2:06   ` [tip:x86/mm2] " tip-bot for Stefano Stabellini
2012-11-17  3:39 ` [PATCH v8 29/46] x86, mm: only call early_ioremap_page_table_range_init() once Yinghai Lu
2012-11-22  2:07   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 19:02   ` [PATCH v8 29/46] " Konrad Rzeszutek Wilk
2012-11-17  3:39 ` [PATCH v8 30/46] x86, mm: Move back pgt_buf_* to mm/init.c Yinghai Lu
2012-11-22  2:08   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 31/46] x86, mm: Move init_gbpages() out of setup.c Yinghai Lu
2012-11-22  2:09   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 32/46] x86, mm: change low/hignmem_pfn_init to static on 32bit Yinghai Lu
2012-11-22  2:10   ` [tip:x86/mm2] x86, mm: change low/ hignmem_pfn_init " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 33/46] x86, mm: Move function declaration into mm_internal.h Yinghai Lu
2012-11-22  2:11   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 34/46] x86, mm: Add check before clear pte above max_low_pfn on 32bit Yinghai Lu
2012-11-22  2:13   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 19:09   ` [PATCH v8 34/46] " Konrad Rzeszutek Wilk
2012-11-28 20:38     ` Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 35/46] x86, mm: use round_up/down in split_mem_range() Yinghai Lu
2012-11-22  2:14   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 36/46] x86, mm: use PFN_DOWN " Yinghai Lu
2012-11-22  2:15   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 37/46] x86, mm: use pfn instead of pos in split_mem_range Yinghai Lu
2012-11-22  2:16   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 38/46] x86, mm: use limit_pfn for end pfn Yinghai Lu
2012-11-22  2:17   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 39/46] x86, mm: Unifying after_bootmem for 32bit and 64bit Yinghai Lu
2012-11-22  2:18   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 40/46] x86, mm: Move after_bootmem to mm_internel.h Yinghai Lu
2012-11-22  2:19   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 41/46] x86, mm: Use clamp_t() in init_range_memory_mapping Yinghai Lu
2012-11-22  2:20   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 42/46] x86, mm: kill numa_free_all_bootmem() Yinghai Lu
2012-11-22  2:21   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 43/46] x86, mm: kill numa_64.h Yinghai Lu
2012-11-22  2:22   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 44/46] sparc, mm: Remove calling of free_all_bootmem_node() Yinghai Lu
2012-11-22  2:23   ` [tip:x86/mm2] sparc, mm: Remove calling of free_all_bootmem_node( ) tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 45/46] mm: Kill NO_BOOTMEM version free_all_bootmem_node() Yinghai Lu
2012-11-22  2:24   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-17  3:39 ` [PATCH v8 46/46] x86, mm: Let "memmap=" take more entries one time Yinghai Lu
2012-11-22  2:25   ` [tip:x86/mm2] " tip-bot for Yinghai Lu
2012-11-28 19:12   ` [PATCH v8 46/46] " Konrad Rzeszutek Wilk
2012-11-27 21:17 ` [PATCH v8 00/46] x86, mm: map ram from top-down with BRK and memblock Konrad Rzeszutek Wilk
2012-11-28 19:35   ` Konrad Rzeszutek Wilk
2012-11-28 19:47     ` Yinghai Lu
2012-11-28 20:57       ` Konrad Rzeszutek Wilk
2012-11-28 21:06         ` Yinghai Lu

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121128170856.GL21266@phenom.dumpdata.com \
    --to=konrad.wilk@oracle.com \
    --cc=akpm@linux-foundation.org \
    --cc=hpa@zytor.com \
    --cc=jacob.shin@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=tglx@linutronix.de \
    --cc=yinghai@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
	git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org linux-kernel@archiver.kernel.org
	public-inbox-index lkml

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox