From: Nicolas Pitre <nicolas.pitre@linaro.org>
To: Cyril Chemparathy <cyril@ti.com>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, arnd@arndb.de,
catalin.marinas@arm.com, grant.likely@secretlab.ca,
linux@arm.linux.org.uk, will.deacon@arm.com,
Vitaly Andrianov <vitalya@ti.com>
Subject: Re: [PATCH v3 17/17] ARM: mm: clean up membank size limit checks
Date: Fri, 21 Sep 2012 14:42:12 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.2.02.1209211441520.6667@xanadu.home> (raw)
In-Reply-To: <1347385155-11643-18-git-send-email-cyril@ti.com>
On Tue, 11 Sep 2012, Cyril Chemparathy wrote:
> This patch cleans up the highmem sanity check code by simplifying the range
> checks with a pre-calculated size_limit. This patch should otherwise have no
> functional impact on behavior.
>
> This patch also removes a redundant (bank->start < vmalloc_limit) check, since
> this is already covered by the !highmem condition.
>
> Signed-off-by: Cyril Chemparathy <cyril@ti.com>
> Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
> ---
> arch/arm/mm/mmu.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
> index 6c35483..50d9df5 100644
> --- a/arch/arm/mm/mmu.c
> +++ b/arch/arm/mm/mmu.c
> @@ -917,10 +917,15 @@ void __init sanity_check_meminfo(void)
>
> for (i = 0, j = 0; i < meminfo.nr_banks; i++) {
> struct membank *bank = &meminfo.bank[j];
> + phys_addr_t size_limit;
> +
> *bank = meminfo.bank[i];
> + size_limit = bank->size;
>
> if (bank->start >= vmalloc_limit)
> highmem = 1;
> + else
> + size_limit = vmalloc_limit - bank->start;
>
> bank->highmem = highmem;
>
> @@ -929,8 +934,7 @@ void __init sanity_check_meminfo(void)
> * Split those memory banks which are partially overlapping
> * the vmalloc area greatly simplifying things later.
> */
> - if (!highmem && bank->start < vmalloc_limit &&
> - bank->size > vmalloc_limit - bank->start) {
> + if (!highmem && bank->size > size_limit) {
> if (meminfo.nr_banks >= NR_BANKS) {
> printk(KERN_CRIT "NR_BANKS too low, "
> "ignoring high memory\n");
> @@ -939,12 +943,12 @@ void __init sanity_check_meminfo(void)
> (meminfo.nr_banks - i) * sizeof(*bank));
> meminfo.nr_banks++;
> i++;
> - bank[1].size -= vmalloc_limit - bank->start;
> + bank[1].size -= size_limit;
> bank[1].start = vmalloc_limit;
> bank[1].highmem = highmem = 1;
> j++;
> }
> - bank->size = vmalloc_limit - bank->start;
> + bank->size = size_limit;
> }
> #else
> /*
> @@ -962,14 +966,13 @@ void __init sanity_check_meminfo(void)
> * Check whether this memory bank would partially overlap
> * the vmalloc area.
> */
> - if (bank->start + bank->size > vmalloc_limit)
> - unsigned long newsize = vmalloc_limit - bank->start;
> + if (bank->size > size_limit) {
> printk(KERN_NOTICE "Truncating RAM at %.8llx-%.8llx "
> "to -%.8llx (vmalloc region overlap).\n",
> (unsigned long long)bank->start,
> (unsigned long long)bank->start + bank->size - 1,
> - (unsigned long long)bank->start + newsize - 1);
> - bank->size = newsize;
> + (unsigned long long)bank->start + size_limit - 1);
> + bank->size = size_limit;
> }
> #endif
> if (!bank->highmem && bank->start + bank->size > arm_lowmem_limit)
> --
> 1.7.9.5
>
next prev parent reply other threads:[~2012-09-21 18:42 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 17:38 [PATCH v3 00/17] LPAE fixes and extensions for Keystone Cyril Chemparathy
2012-09-11 17:38 ` [PATCH v3 01/17] ARM: add mechanism for late code patching Cyril Chemparathy
2012-09-21 18:09 ` Nicolas Pitre
2012-09-21 22:30 ` Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 02/17] ARM: add self test for runtime patch mechanism Cyril Chemparathy
2012-09-21 17:40 ` Nicolas Pitre
2012-09-21 22:25 ` Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 03/17] ARM: use late patch framework for phys-virt patching Cyril Chemparathy
2012-09-21 18:15 ` Nicolas Pitre
2012-09-11 17:39 ` [PATCH v3 04/17] ARM: LPAE: use phys_addr_t on virt <--> phys conversion Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 05/17] ARM: LPAE: support 64-bit virt_to_phys patching Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 06/17] ARM: LPAE: use signed arithmetic for mask definitions Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 07/17] ARM: LPAE: use phys_addr_t in alloc_init_pud() Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 08/17] ARM: LPAE: use phys_addr_t in free_memmap() Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 09/17] ARM: LPAE: use phys_addr_t for initrd location and size Cyril Chemparathy
2012-09-21 18:30 ` Nicolas Pitre
2012-09-11 17:39 ` [PATCH v3 10/17] ARM: LPAE: use phys_addr_t in switch_mm() Cyril Chemparathy
2012-09-21 18:33 ` Nicolas Pitre
2012-09-21 18:41 ` Russell King - ARM Linux
2012-09-21 18:53 ` Nicolas Pitre
2012-09-11 17:39 ` [PATCH v3 11/17] ARM: LPAE: use 64-bit accessors for TTBR registers Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 12/17] ARM: LPAE: define ARCH_LOW_ADDRESS_LIMIT for bootmem Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 13/17] ARM: LPAE: factor out T1SZ and TTBR1 computations Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 14/17] ARM: LPAE: accomodate >32-bit addresses for page table base Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 15/17] ARM: mm: use physical addresses in highmem sanity checks Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 16/17] ARM: mm: cleanup checks for membank overlap with vmalloc area Cyril Chemparathy
2012-09-11 17:39 ` [PATCH v3 17/17] ARM: mm: clean up membank size limit checks Cyril Chemparathy
2012-09-21 18:42 ` Nicolas Pitre [this message]
2012-09-21 22:49 ` Cyril Chemparathy
Reply instructions:
You may reply publicly 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=alpine.LFD.2.02.1209211441520.6667@xanadu.home \
--to=nicolas.pitre@linaro.org \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=cyril@ti.com \
--cc=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=vitalya@ti.com \
--cc=will.deacon@arm.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®