lkml.org 
[lkml]   [2014]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2] initramfs: Support initrd that is bigger than 2GiB
On 06/20/2014 07:29 PM, Yinghai Lu wrote:
> When initrd (compressed or not) is used, kernel report data corrupted
> with /dev/ram0.
>
> The root cause:
> During initramfs checking, if it is initrd, it will be transferred to
> /initrd.image with sys_write.
> sys_write only support 2G-4K write, so if the initrd ram is more than
> that, /initrd.image will not complete at all.
>
> Add local xwrite to loop calling sys_write to workaround the
> problem.
>
> Also need to use xwrite in write_buffer() to handle:
> image is uncompressed cpio and there is one big file (>2G) in it.
> unpack_to_rootfs ===> write_buffer ===> actions[]/do_copy
>
> At the same time, we don't need to worry about sys_read/sys_write in
> do_mounts_rd.c::crd_load. As decompressor will have fill/flush and
> local buffer that is smaller than 2G.
>
> Test with uncompressed initrd, and compressed ones with gz, bz2, lzma,xz,
> lzop.
>
> -v2: according to HPA, change name to xwrite.
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> Acked-by: H. Peter Anvin <hpa@zytor.com>
>
> ---
> init/initramfs.c | 33 +++++++++++++++++++++++++++++----
> 1 file changed, 29 insertions(+), 4 deletions(-)
>
> Index: linux-2.6/init/initramfs.c
> ===================================================================
> --- linux-2.6.orig/init/initramfs.c
> +++ linux-2.6/init/initramfs.c
> @@ -19,6 +19,26 @@
> #include <linux/syscalls.h>
> #include <linux/utime.h>
>
> +static long __init xwrite(unsigned int fd, char *p,
> + size_t count)
> +{
> + ssize_t left = count;
> + long written;
> +
> + /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
> + while (left > 0) {
> + written = sys_write(fd, p, left);
> +
> + if (written <= 0)
> + break;
> +
> + left -= written;
> + p += written;
> + }
> +
> + return (written < 0) ? written : count;

The return value is bogus here, although it is probably theoretical (and
since you only care about a full write), but a written of 0 would return
in count being returned no matter the actual written value.

The normal behavior of xwrite(), like fwrite() and write(), is to return
the total number of bytes written if any bytes are written at all.

Here is my personal implementation of xwrite() (designed for userspace):

http://git.zytor.com/?p=lib/lib.git;a=blob;f=xwrite.c;hb=HEAD

Otherwise, the patch looks good.

-hpa



\
 
 \ /
  Last update: 2014-06-22 21:01    [W:0.054 / U:0.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site