From: Wang Nan <wangnan0@huawei.com>
To: kexec@lists.infradead.org
Cc: Wang Nan <wangnan0@huawei.com>, Simon Horman <horms@verge.net.au>,
Dave Young <dyoung@redhat.com>, Geng Hui <hui.geng@huawei.com>
Subject: [PATCH 1/3] kexec: align initrd when no --image-size
Date: Wed, 22 Jan 2014 18:52:02 +0800 [thread overview]
Message-ID: <1390387924-73946-2-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1390387924-73946-1-git-send-email-wangnan0@huawei.com>
Before this patch, when no --image-size passed, initrd_base is caculated using
base + len * 4, which is unaligned, and unable to pass check in
add_segment_phys_virt():
if (base & (pagesize -1)) {
die("Base address: 0x%lx is not page aligned\n", base);
}
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Simon Horman <horms@verge.net.au>
Cc: Dave Young <dyoung@redhat.com>
Cc: Geng Hui <hui.geng@huawei.com>
---
kexec/arch/arm/kexec-zImage-arm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kexec/arch/arm/kexec-zImage-arm.c b/kexec/arch/arm/kexec-zImage-arm.c
index 792187a..4547765 100644
--- a/kexec/arch/arm/kexec-zImage-arm.c
+++ b/kexec/arch/arm/kexec-zImage-arm.c
@@ -351,7 +351,7 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len,
} else {
/* Otherwise, assume the maximum kernel compression ratio
* is 4, and just to be safe, place ramdisk after that */
- initrd_base = base + len * 4;
+ initrd_base = base + _ALIGN(len * 4, 4096);
}
if (use_atags) {
--
1.8.4
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2014-01-22 10:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-22 10:52 [PATCH 0/3] kexec-tools: fix bugs and pass initrd position for arm Wang Nan
2014-01-22 10:52 ` Wang Nan [this message]
2014-02-06 3:44 ` [PATCH 1/3] kexec: align initrd when no --image-size Dave Young
2014-01-22 10:52 ` [PATCH 2/3] kexec: pass initrd position in dtb Wang Nan
2014-02-06 3:58 ` Dave Young
2014-01-22 10:52 ` [PATCH 3/3] kexec: increase zImage compression ratio from 4 to 5 Wang Nan
2014-02-06 4:01 ` Dave Young
2014-01-23 2:02 ` [PATCH 0/3] kexec-tools: fix bugs and pass initrd position for arm Dave Young
2014-01-23 2:47 ` Dave Young
2014-01-23 2:56 ` Wang Nan
2014-01-23 3:38 ` Dave Young
2014-01-23 4:17 ` Wang Nan
2014-01-23 5:00 ` Dave Young
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=1390387924-73946-2-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=dyoung@redhat.com \
--cc=horms@verge.net.au \
--cc=hui.geng@huawei.com \
--cc=kexec@lists.infradead.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