Skip to contentSkip to conversation

__initdata strings

RFC In review Oleg Nesterov 3 participants 3 messages Oct 10, 2004 VFS

lore
Share & tools
lore
#0 lore raw

RFC 1/1 __initdata strings

Hello.

This patch is not intended for inclusion, just for illustration.

__init functions leaves strings (mainly printk's arguments) in .data section. It make sense to move them in .init.data.

Is there anyone else who would consider this useful?

Oleg.

include/linux/init.h +25 -0
diff -rup 2.6.9-rc3-clean/include/linux/init.h 2.6.9-rc3-i_str/include/linux/init.h
@@ -61,6 +61,31 @@
 /*
  * Used for initialization calls..
  */
+
+#define I_STRING(str)	\
+({						\
+	static char data[] __initdata = (str);	\
+	data;					\
+})
+
+#if	defined(__GNUC__) && (__GNUC__ >= 3)
+#define CK_FMTSTR(expr)	do if (0) { expr; } while (0)
+#else
+#define CK_FMTSTR(expr)	do ; while (0)
+#endif
+
+#define i_printk(fmt, args...)	\
+({						\
+	CK_FMTSTR(printk(fmt , ##args));	\
+	printk(I_STRING(fmt) , ##args);		\
+})
+
+#define i_panic(fmt, args...)	\
+({						\
+	CK_FMTSTR(panic(fmt , ##args));		\
+	panic(I_STRING(fmt) , ##args);		\
+})
+
 typedef int (*initcall_t)(void);
 typedef void (*exitcall_t)(void);
 
init/do_mounts.c +8 -8
diff -rup 2.6.9-rc3-clean/init/do_mounts.c 2.6.9-rc3-i_str/init/do_mounts.c
@@ -265,10 +265,10 @@ static int __init do_mount_root(char *na
 
 	sys_chdir("/root");
 	ROOT_DEV = current->fs->pwdmnt->mnt_sb->s_dev;
-	printk("VFS: Mounted root (%s filesystem)%s.\n",
+	i_printk("VFS: Mounted root (%s filesystem)%s.\n",
 	       current->fs->pwdmnt->mnt_sb->s_type->name,
 	       current->fs->pwdmnt->mnt_sb->s_flags & MS_RDONLY ? 
-	       " readonly" : "");
+	       I_STRING(" readonly") : "");
 	return 0;
 }
 
@@ -296,13 +296,13 @@ retry:
 		 * and bad superblock on root device.
 		 */
 		__bdevname(ROOT_DEV, b);
-		printk("VFS: Cannot open root device \"%s\" or %s\n",
+		i_printk("VFS: Cannot open root device \"%s\" or %s\n",
 				root_device_name, b);
-		printk("Please append a correct \"root=\" boot option\n");
+		i_printk("Please append a correct \"root=\" boot option\n");
 
-		panic("VFS: Unable to mount root fs on %s", b);
+		i_panic("VFS: Unable to mount root fs on %s", b);
 	}
-	panic("VFS: Unable to mount root fs on %s", __bdevname(ROOT_DEV, b));
+	i_panic("VFS: Unable to mount root fs on %s", __bdevname(ROOT_DEV, b));
 out:
 	putname(fs_names);
 }
@@ -336,7 +336,7 @@ void __init change_floppy(char *fmt, ...
 		sys_ioctl(fd, FDEJECT, 0);
 		sys_close(fd);
 	}
-	printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
+	i_printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
 	fd = sys_open("/dev/console", O_RDWR, 0);
 	if (fd >= 0) {
 		sys_ioctl(fd, TCGETS, (long)&termios);
@@ -357,7 +357,7 @@ void __init mount_root(void)
 		if (mount_nfs_root())
 			return;
 
-		printk(KERN_ERR "VFS: Unable to mount root fs via NFS, trying floppy.\n");
+		i_printk(KERN_ERR "VFS: Unable to mount root fs via NFS, trying floppy.\n");
 		ROOT_DEV = Root_FD0;
 	}
 #endif
#1 lore raw
Quoted 6 lines · Oleg Nesterov

Hello.

This patch is not intended for inclusion, just for illustration.

__init functions leaves strings (mainly printk's arguments) in .data section. It make sense to move them in .init.data.

Probably better to do this with something like objcopy?

Signature · 1 line
Mathematics is the supreme nostalgia of our time.
#2 lore raw
Quoted 4 lines · Matt Mackall
Quoted 2 lines · Oleg Nesterov

Hello.

Quoted 8 lines
Quoted 4 lines

This patch is not intended for inclusion, just for illustration.

__init functions leaves strings (mainly printk's arguments) in .data section. It make sense to move them in .init.data.

Probably better to do this with something like objcopy?

Yes, this is another way of doing that, but the kernel has to be prepared to get such treatment, think about register functions that only save a pointer to strings passed from __init functions...

Ah, nothing related to this specific way of doing what is intended, any scheme that moves strings in __init functions to .data.init has to deal with this.

- Arnaldo