LinuxLists.cc - [BK PATCH] klibc for 2.5.64

2003-03-05 06:07:23

Subject: [BK PATCH] klibc for 2.5.64

2003-03-08 00:42:19

by Greg KH

[permalink] [raw]

Subject: [BK PATCH] gen_init_cpio fixes for 2.5.64

Hi,

Here are two patches split out of the big klibc patch that fix some
problems in the gen_init_cpio.c code. The first one allows files to be
added to the cpio image and fixes a padding error, and the second one
fixes some build problems with the cpio image (if there was an error,
the build would not stop.)

Please pull from:
bk://kernel.bkbits.net/gregkh/linux/initramfs-2.5

I'll send the two patches as followups to this message to lkml for those
who want to see them.

thanks,

greg k-h

usr/Makefile | 26 ++++++++++++---
usr/gen_init_cpio.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 112 insertions(+), 4 deletions(-)
-----

[email protected], 2003-03-07 16:46:13-08:00, [email protected]
kbuild: handle any failures of the gen_init_cpio or initramfs image to stop the build.

This also shows how to add files to the initramfs build, but is
commented out.

Patch originally done by Kai.

usr/Makefile | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
------

[email protected], 2003-03-07 16:39:06-08:00, [email protected]
gen_init_cpio: Add the ability to add files to the cpio image.

Push file://home/greg/linux/BK/initramfs-2.5 -> file://home/greg/linux/BK/bleed-2.5
usr/gen_init_cpio.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+)
------

2003-03-08 00:52:33

by Greg KH

[permalink] [raw]

Subject: Re: [PATCH] gen_init_cpio fixes for 2.5.64

ChangeSet 1.1125, 2003/03/07 16:46:13-08:00, [email protected]

kbuild: handle any failures of the gen_init_cpio or initramfs image to stop the build.

This also shows how to add files to the initramfs build, but is
commented out.

Patch originally done by Kai.

usr/Makefile | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)

diff -Nru a/usr/Makefile b/usr/Makefile
--- a/usr/Makefile Fri Mar 7 16:48:16 2003
+++ b/usr/Makefile Fri Mar 7 16:48:16 2003
@@ -1,16 +1,34 @@

obj-y := initramfs_data.o

-host-progs := gen_init_cpio
+host-progs := gen_init_cpio

clean-files := initramfs_data.cpio.gz

LDFLAGS_initramfs_data.o := $(LDFLAGS_BLOB) -r -T

-$(obj)/initramfs_data.o: $(src)/initramfs_data.scr $(obj)/initramfs_data.cpio.gz FORCE
+$(obj)/initramfs_data.o: $(src)/initramfs_data.scr \
+ $(obj)/initramfs_data.cpio.gz FORCE
$(call if_changed,ld)

-$(obj)/initramfs_data.cpio.gz: $(obj)/gen_init_cpio
- ./$< | gzip -9c > $@
+# initramfs-y are the programs which will be copied into the CPIO
+# archive. Currently, the filenames are hardcoded in gen_init_cpio,
+# but we need the information for the build as well, so it's duplicated
+# here.

+# Commented out for now
+# initramfs-y := $(obj)/root/hello
+
+quiet_cmd_cpio = CPIO $@
+ cmd_cpio = ./$< > $@
+
+$(obj)/initramfs_data.cpio: $(obj)/gen_init_cpio $(initramfs-y) FORCE
+ $(call if_changed,cpio)
+
+targets += $(obj)/initramfs_data.cpio
+
+$(obj)/initramfs_data.cpio.gz: $(obj)/initramfs_data.cpio FORCE
+ $(call if_changed,gzip)
+
+targets += $(obj)/initramfs_data.cpio.gz

2003-03-08 00:52:31

by Greg KH

[permalink] [raw]

Subject: [PATCH] gen_init_cpio fixes for 2.5.64

ChangeSet 1.1124, 2003/03/07 16:39:06-08:00, [email protected]

gen_init_cpio: Add the ability to add files to the cpio image.

usr/gen_init_cpio.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+)

diff -Nru a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
--- a/usr/gen_init_cpio.c Fri Mar 7 16:48:24 2003
+++ b/usr/gen_init_cpio.c Fri Mar 7 16:48:24 2003
@@ -5,10 +5,28 @@
#include <string.h>
#include <unistd.h>
#include <time.h>
+#include <fcntl.h>

static unsigned int offset;
static unsigned int ino = 721;

+static void push_string(const char *name)
+{
+ unsigned int name_len = strlen(name) + 1;
+
+ fputs(name, stdout);
+ putchar(0);
+ offset += name_len;
+}
+
+static void push_pad (void)
+{
+ while (offset & 3) {
+ putchar(0);
+ offset++;
+ }
+}
+
static void push_rest(const char *name)
{
unsigned int name_len = strlen(name) + 1;
@@ -118,6 +136,78 @@
0); /* chksum */
push_hdr(s);
push_rest(name);
+}
+
+/* Not marked static to keep the compiler quiet, as no one uses this yet... */
+void cpio_mkfile(const char *filename, const char *location,
+ unsigned int mode, uid_t uid, gid_t gid)
+{
+ char s[256];
+ char *filebuf;
+ struct stat buf;
+ int file;
+ int retval;
+ int i;
+
+ mode |= S_IFREG;
+
+ retval = stat (filename, &buf);
+ if (retval) {
+ fprintf (stderr, "Filename %s could not be located\n", filename);
+ goto error;
+ }
+
+ file = open (filename, O_RDONLY);
+ if (file < 0) {
+ fprintf (stderr, "Filename %s could not be opened for reading\n", filename);
+ goto error;
+ }
+
+ filebuf = malloc(buf.st_size);
+ if (!filebuf) {
+ fprintf (stderr, "out of memory\n");
+ goto error_close;
+ }
+
+ retval = read (file, filebuf, buf.st_size);
+ if (retval < 0) {
+ fprintf (stderr, "Can not read %s file\n", filename);
+ goto error_free;
+ }
+
+ sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
+ "%08X%08X%08X%08X%08X%08X%08X",
+ "070701", /* magic */
+ ino++, /* ino */
+ mode, /* mode */
+ (long) uid, /* uid */
+ (long) gid, /* gid */
+ 1, /* nlink */
+ (long) buf.st_mtime, /* mtime */
+ (int) buf.st_size, /* filesize */
+ 3, /* major */
+ 1, /* minor */
+ 0, /* rmajor */
+ 0, /* rminor */
+ strlen(location) + 1, /* namesize */
+ 0); /* chksum */
+ push_hdr(s);
+ push_string(location);
+ push_pad();
+
+ for (i = 0; i < buf.st_size; ++i)
+ fputc(filebuf[i], stdout);
+ close(file);
+ free(filebuf);
+ push_pad();
+ return;
+
+error_free:
+ free(filebuf);
+error_close:
+ close(file);
+error:
+ exit(-1);
}

int main (int argc, char *argv[])

2003-03-08 14:27:28

by Anders Gustafsson

[permalink] [raw]

Subject: Re: [PATCH] gen_init_cpio fixes for 2.5.64

On Fri, Mar 07, 2003 at 04:43:40PM -0800, Greg KH wrote:
>
> ChangeSet 1.1124, 2003/03/07 16:39:06-08:00, [email protected]
>
> gen_init_cpio: Add the ability to add files to the cpio image.

Have you been able to boot the kernel with a cpio-archive that contains
files larger than a few k? The kernel crashes on me when writing to the file
in ramfs.
It crashes i the third or forth flush_window or so..

--
Anders Gustafsson - [email protected] - http://0x63.nu/

2003-03-09 06:04:34

by Greg KH

[permalink] [raw]

Subject: Re: [PATCH] gen_init_cpio fixes for 2.5.64

On Sat, Mar 08, 2003 at 03:37:45PM +0100, Anders Gustafsson wrote:
> On Fri, Mar 07, 2003 at 04:43:40PM -0800, Greg KH wrote:
> >
> > ChangeSet 1.1124, 2003/03/07 16:39:06-08:00, [email protected]
> >
> > gen_init_cpio: Add the ability to add files to the cpio image.
>
> Have you been able to boot the kernel with a cpio-archive that contains
> files larger than a few k? The kernel crashes on me when writing to the file
> in ramfs.

I have not tried that, no.

> It crashes i the third or forth flush_window or so..

What does the oops show?

thanks,

greg k-h

2003-03-09 21:17:55

by Anders Gustafsson

[permalink] [raw]

Subject: Re: [PATCH] gen_init_cpio fixes for 2.5.64

2003-03-12 08:11:34

by Anders Gustafsson

[permalink] [raw]

Subject: [PATCH] fix big initramfs (was: [PATCH] gen_init_cpio fixes for 2.5.64)

On Sat, Mar 08, 2003 at 10:04:52PM -0800, Greg KH wrote:
> On Sat, Mar 08, 2003 at 03:37:45PM +0100, Anders Gustafsson wrote:
> > On Fri, Mar 07, 2003 at 04:43:40PM -0800, Greg KH wrote:
> > >
> > > ChangeSet 1.1124, 2003/03/07 16:39:06-08:00, [email protected]
> > >
> > > gen_init_cpio: Add the ability to add files to the cpio image.
> >
> > Have you been able to boot the kernel with a cpio-archive that contains
> > files larger than a few k? The kernel crashes on me when writing to the file
> > in ramfs.
>
> I have not tried that, no.
>
> > It crashes i the third or forth flush_window or so..
>
> What does the oops show?

The oops shows a crash in balance_dirty_pages. Or rather get_dirty_limits(),
and in get_dirty_limits() we have:

unmapped_ratio = 100 - (ps->nr_mapped * 100) / total_pages;

total_pages is initialized in page_writeback_init(), which is a init-call,
called far later than populate_rootfs(). So, BOOM, division by zero.

Patch below makes the call to page_writeback_init() explicit in
start_kernel, just before populate_rootfs().

--
Anders Gustafsson - [email protected] - http://0x63.nu/

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.

===================================================================

[email protected], 2003-03-12 09:14:47+01:00, [email protected]
Explicitly call page_writeback_init because it must be called before populate_rootfs()

init/main.c | 3 +++
mm/page-writeback.c | 4 +---
2 files changed, 4 insertions(+), 3 deletions(-)

diff -Nru a/init/main.c b/init/main.c
--- a/init/main.c Wed Mar 12 09:16:57 2003
+++ b/init/main.c Wed Mar 12 09:16:57 2003
@@ -70,6 +70,7 @@
extern void pte_chain_init(void);
extern void radix_tree_init(void);
extern void free_initmem(void);
+extern void page_writeback_init(void);
extern void populate_rootfs(void);
extern void driver_init(void);

@@ -429,6 +430,8 @@
vfs_caches_init(num_physpages);
radix_tree_init();
signals_init();
+ /* rootfs populating might need page-writeback */
+ page_writeback_init();
populate_rootfs();
#ifdef CONFIG_PROC_FS
proc_root_init();
diff -Nru a/mm/page-writeback.c b/mm/page-writeback.c
--- a/mm/page-writeback.c Wed Mar 12 09:16:57 2003
+++ b/mm/page-writeback.c Wed Mar 12 09:16:57 2003
@@ -369,7 +369,7 @@
* dirty memory thresholds: allowing too much dirty highmem pins an excessive
* number of buffer_heads.
*/
-static int __init page_writeback_init(void)
+void __init page_writeback_init(void)
{
long buffer_pages = nr_free_buffer_pages();
long correction;
@@ -392,9 +392,7 @@
add_timer(&wb_timer);
set_ratelimit();
register_cpu_notifier(&ratelimit_nb);
- return 0;
}
-module_init(page_writeback_init);

int do_writepages(struct address_space *mapping, struct writeback_control *wbc)
{

===================================================================

This BitKeeper patch contains the following changesets:
1.1102
## Wrapped with gzip_uu ##

begin 664 bkpatch17604
M'XL(`/GL;CX``]656V^;,!B&K^-?\4F]Z4$!&QMSF#)E:ZNMVJ15F7HU39$#
M#D$<!4Z:3OSX&6C2-DV[M>I-P<@'[$^OW^\!'\!5+2M_(/)05G6$#N!K42M_
M@-><&OE2]R=%H?MF*)0P0[DR$UGE,C5GB9G))$%ZQJ50P0)6>KT_(`;=CJB;
M4OJ#R?F7J^^?)@B-1G"Z$'DD?TH%HQ%21;42:5B/A5JD16ZH2N1U)I4P@B)K
MME,;"V-+WS9Q*+9Y0SAF3A.0D!#!B`RQQ5S.D$C*;!S&D2P>+Z>8$DL_E/"&
M<L?VT!D0@Q!L`::F+D0W/)\PGSDGF/@8PZT?XUL?X,2"(4:?X6U%GZ(`SM=E
M&@>Q2F\@$&D*I8CD]+J*E9R)()G&>:Q@)@.QK"7H9K:LVWXW5X:Z-2\J"651
M+E.AY+32V9K7AT?H&U#;)AQ=WIF.AB^\$,("HX_0>?LG+ML]&F+99)G9JAQN
M51I!OV%&NSW;M+$=CSH-G<\(<QQNN=P+YTSLVOI4I#YA+L'$:3CU2"OB>>=;
MF\Q,Q/E&2N^]1[V&V0[FC73U"'-#X<Z]4#^/I.Q$>"`!Z^QU`._1VZ+\9@;M
M8/QKL^G?SSB%/4PMB[%&*\:T0]MV'X*-??(DV`2&]'V!W1/Q`X;5=5<TJ)?[
M,O,*WL^H8P%!%WVU*N(0IKW2/>H/V_='>HUGZ\FZ<G354G(/I7__Z%Y,+LJ*
M8"'3<5&'J5%4T1YR,2.<4$8;YG%F=4AX[/^1H._N7]=_H3M(W//E%2A<=`C(
MM=+G'70D/(G`!W3!*`$+#<QCZ%5M5,9Y!%D<+13D4O8A[A"%8Q,-]D75$;>G
7J,YUD-3+;,0QGU&.!?H+R/-63[0'````
`
end

2003-03-12 08:36:25

by Andrew Morton

[permalink] [raw]

Subject: Re: [PATCH] fix big initramfs (was: [PATCH] gen_init_cpio fixes for 2.5.64)

Anders Gustafsson <[email protected]> wrote:
>
> Patch below makes the call to page_writeback_init() explicit in
> start_kernel, just before populate_rootfs().
>

Fair enough.

> +extern void page_writeback_init(void);

But please don't put declarations of external functions into .c. It is
always the wrong thing to do, even though others have done it...

writeback.h is a fine place for this declaration.

2003-03-12 09:15:12

by Anders Gustafsson

[permalink] [raw]

Subject: Re: [PATCH] fix big initramfs (was: [PATCH] gen_init_cpio fixes for 2.5.64)

On Wed, Mar 12, 2003 at 12:48:01AM -0800, Andrew Morton wrote:
> > Patch below makes the call to page_writeback_init() explicit in
> > start_kernel, just before populate_rootfs().
> >
>
> Fair enough.

Sending to Linus too then.

> > +extern void page_writeback_init(void);
>
> But please don't put declarations of external functions into .c. It is
> always the wrong thing to do, even though others have done it...
>
> writeback.h is a fine place for this declaration.

Allright, I did that first, but then I saw the other declarations, and
wanted to follow the style. Revised patch below.

--
Anders Gustafsson - [email protected] - http://0x63.nu/

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.

===================================================================

[email protected], 2003-03-12 10:01:46+01:00, [email protected]
Explicitly call page_writeback_init because it must be called before populate_
rootfs()

include/linux/writeback.h | 1 +
init/main.c | 3 +++
mm/page-writeback.c | 4 +---
3 files changed, 5 insertions(+), 3 deletions(-)

diff -Nru a/include/linux/writeback.h b/include/linux/writeback.h
--- a/include/linux/writeback.h Wed Mar 12 10:09:13 2003
+++ b/include/linux/writeback.h Wed Mar 12 10:09:13 2003
@@ -79,6 +79,7 @@
extern int dirty_expire_centisecs;

+void page_writeback_init(void);
void balance_dirty_pages(struct address_space *mapping);
void balance_dirty_pages_ratelimited(struct address_space *mapping);
int pdflush_operation(void (*fn)(unsigned long), unsigned long arg0);
diff -Nru a/init/main.c b/init/main.c
--- a/init/main.c Wed Mar 12 10:09:13 2003
+++ b/init/main.c Wed Mar 12 10:09:13 2003
@@ -35,6 +35,7 @@
#include <linux/profile.h>
#include <linux/rcupdate.h>
#include <linux/moduleparam.h>
+#include <linux/writeback.h>

#include <asm/io.h>
#include <asm/bugs.h>
@@ -429,6 +430,8 @@
vfs_caches_init(num_physpages);
radix_tree_init();
signals_init();
+ /* rootfs populating might need page-writeback */
+ page_writeback_init();
populate_rootfs();
#ifdef CONFIG_PROC_FS
proc_root_init();
diff -Nru a/mm/page-writeback.c b/mm/page-writeback.c
--- a/mm/page-writeback.c Wed Mar 12 10:09:13 2003
+++ b/mm/page-writeback.c Wed Mar 12 10:09:13 2003
@@ -369,7 +369,7 @@
* dirty memory thresholds: allowing too much dirty highmem pins an excessive
* number of buffer_heads.
*/
-static int __init page_writeback_init(void)
+void __init page_writeback_init(void)
{
long buffer_pages = nr_free_buffer_pages();
long correction;
@@ -392,9 +392,7 @@
add_timer(&wb_timer);
set_ratelimit();
register_cpu_notifier(&ratelimit_nb);
- return 0;
}
-module_init(page_writeback_init);

int do_writepages(struct address_space *mapping, struct writeback_control *wbc)
{

===================================================================

This BitKeeper patch contains the following changesets:
1.1102
## Wrapped with gzip_uu ##

begin 664 bkpatch18281
M'XL(`#GY;CX``]566V_:,!A]QK_"4E]Z$8D_VW$2-BJVMMJJ35K5J4_3A$QB
M("(7E`NE4W[\G`1H!Z%=45\*"8X3^]/Q\3DG'.&[3*6]CHQ]E683=(2_)EG>
MZY"E8$9<Z/YMDNB^Z<M<FKY:F#.5QBHT1S,S4K,9TB-N9.Y-\4+/[W7`8)L[
M^<-<]3JW5U_NOG^Z1:C?QQ=3&4_43Y7C?A_E2;J0H9\-9#X-D]C(4QEGD<JE
MX251N1E:4D*H_EI@,V*)$@3A=NF!#R`Y*)]0[@B.Y&P>#?Q@HI+=Z8PPH/ID
M($HF;,M%EQ@,`$(Q8:8^@&(@/0(]+L[T+R%XQ<=@Q0,^8[A+T&?\MJ`OD(>O
MEO,P$(\?,">#$,\EQ,UO$^#7(VD-QL&<9#CD?)DD2FL+Z,BJ_KU6.7KJW&2
M*CQ/YD4H<S74!5.]8>/L^`1]PXQS8:&;1]Y1]Y4?A(@DZ!S7]/X)YM4R#5F4
M46160+L;H(;7K)FS>MD6*RW;97;)QB/@MBVH(UQ_S.4VL_LJ-7OF$F!N*9@+
M;2""V`L+7YEA$!=+\['`=!L*H0"TM,;"&7'N@:.8E&-K!\JS]9X"HL+FC@;T
MO!JJK3,C&<1K;AH]N+H`MVPB2N7H.]SQI3-V?7VV`/JGPE,(EN,*4IMJ+^K*
M9&],V9;-?JT)^/U"8:!@:?`.$(RF[#:@)1LVX^Y^^P'[]%^C4Q^X&YZ7Q_:
M3C?[M^L`;UX[@`$MDL!OPWU</3CY4(NDQ65M\CC8UON%L=_?6LF,4LY+K8R5
M)"SG59)@[TX2391M2:*%H@/$<,EL31JZ;II:%,,&[%YMZ#FNI0?KQM9-DR:;
MR'GY)?WJA$-1XDU5.$@R/S22=-*2<(2#`,99R5W!::T*E_^_*M[E>[H)\YV@
MV%!S2#2P:D>/5FF#/^[$S3FZY@PP11WS=(5E#2^()S@*)M,<QTHUT?*H37QJ
@HDZ;HJJD6?_UTYOLS;(BZEN>[9.1#>@OWSU4;VD*````
`
end