Linux MIPS Architecture development
 help / color / mirror / Atom feed
From: "Ashok Kumar" <ashoks@broadcom.com>
To: linux-mips@linux-mips.org, gerg@uclinux.org
Cc: ralf@linux-mips.org, "Ashok Kumar" <ashoks@broadcom.com>
Subject: [PATCH] MIPS: fix mapstart when using initrd
Date: Mon, 23 Sep 2013 19:40:26 +0530	[thread overview]
Message-ID: <1379945426-32205-1-git-send-email-ashoks@broadcom.com> (raw)

When initrd is present in the PFN right after the _end, bootmem
bitmap(mapstart) overwrites it. So check for initrd_end in
mapstart calculation.

Signed-off-by: Ashok Kumar <ashoks@broadcom.com>
---
This is seen after the commit
"mips: fix start of free memory when using initrd"
in git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git branch

Tested the image on MIPS platform creating the above
said scenario and initrd was corrupted.

 arch/mips/kernel/setup.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 5342385..dfb8585 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -364,6 +364,11 @@ static void __init bootmem_init(void)
 	}
 
 	/*
+	 * mapstart should be after initrd_end
+	 */
+	mapstart = max(mapstart, (unsigned long)PFN_UP(__pa(initrd_end)));
+
+	/*
 	 * Initialize the boot-time allocator with low memory only.
 	 */
 	bootmap_size = init_bootmem_node(NODE_DATA(0), mapstart,
-- 
1.7.6

             reply	other threads:[~2013-09-23 14:11 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-23 14:10 Ashok Kumar [this message]
2013-10-07 16:08 ` [PATCH] MIPS: fix mapstart when using initrd Ralf Baechle
2013-10-07 16:10   ` Markos Chandras
2013-10-07 16:10     ` Markos Chandras
2013-10-07 16:29     ` Ralf Baechle
2013-10-14 12:05 ` Jonas Gorski
2013-10-15 10:19   ` Ashok Kumar
     [not found]   ` <525d1725.85680e0a.0dea.4371SMTPIN_ADDED_BROKEN@mx.google.com>
2013-10-15 10:57     ` Jonas Gorski

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=1379945426-32205-1-git-send-email-ashoks@broadcom.com \
    --to=ashoks@broadcom.com \
    --cc=gerg@uclinux.org \
    --cc=linux-mips@linux-mips.org \
    --cc=ralf@linux-mips.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
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