convert md to use seq_file for /proc/mdstat
PATCH 1/1 convert md to use seq_file for /proc/mdstat
To make a long story short, I just converted my home server over to 2.5.64, and started using LVM2 (device mapper) on top of an md RAID-1. Everything works great, except that /proc/mdstat is hosed because when device mapper is in use the md driver reports all 255 possible minors, overflowing the single-page proc read buffer.
So, even though the proper fix is probably to make md only report the minors that are actually in use, it's also a good idea to switch to using the more modern (:-) seq_file interface... so the patch is attached. It touches nearly everything in drivers/md, and include/linux/raid/md_k.h because the prototype for pers->status changed (to take struct seq_file * instead of char page *). It's relative to 2.5.64 plain (no bk updates). I've compiled tested the entire patch, and run tested using the raid-1 personality; I don't have the facilities to test the other personalities, but the code changes were pretty simple in those files.
If the attachment is a problem for anyone, I'll post it on a web site (this mailer can't inline it without mangling it).
drivers/md/linear.c +8 -10
@@ -22,6 +22,7 @@#include <linux/slab.h> #include <linux/bio.h> #include <linux/raid/linear.h> +#include <linux/seq_file.h> #define MAJOR_NR MD_MAJOR#define MD_DRIVER
@@ -208,31 +209,28 @@return 1 ; } -static int linear_status (char *page,mddev_t *mddev) +static void linear_status (struct seq_file *seq,mddev_t *mddev) { -int sz =0 ; -#undef MD_DEBUG#ifdef MD_DEBUG int j;linear_conf_t *conf =mddev_to_conf (mddev); - sz +=sprintf (page+sz," " ); +seq_printf (seq," " );for (j =0 ; j < conf->nr_zones; j++) { - sz +=sprintf (page+sz,"[%s" , +seq_printf (seq,"[%s" ,bdev_partition_name (conf->hash_table[j].dev0->rdev->bdev));if (conf->hash_table[j].dev1) - sz +=sprintf (page+sz,"/%s] " , +seq_printf (seq,"/%s] " ,bdev_partition_name (conf->hash_table[j].dev1->rdev->bdev));else - sz +=sprintf (page+sz,"] " ); +seq_printf (seq,"] " ); } - sz +=sprintf (page+sz,"\n" ); +seq_printf (seq,"\n" );#endif - sz +=sprintf (page+sz," %dk rounding" , mddev->chunk_size/1024 ); -return sz; +seq_printf (seq," %dk rounding" , mddev->chunk_size/1024 ); }
drivers/md/md.c +60 -49
229 lines not on this page · raw message
drivers/md/multipath.c +6 -6
@@ -26,6 +26,7 @@#include <linux/bio.h> #include <linux/buffer_head.h> #include <asm/atomic.h> +#include <linux/seq_file.h> #define MAJOR_NR MD_MAJOR#define MD_DRIVER
@@ -185,19 +186,18 @@return 0 ; } -static int multipath_status (char *page,mddev_t *mddev) +static void multipath_status (struct seq_file *seq,mddev_t *mddev) {multipath_conf_t *conf =mddev_to_conf (mddev); -int sz =0 , i; +int i; - sz +=sprintf (page+sz," [%d/%d] [" , conf->raid_disks, +seq_printf (seq," [%d/%d] [" , conf->raid_disks, conf->working_disks);for (i =0 ; i < conf->raid_disks; i++) - sz +=sprintf (page+sz,"%s" , +seq_printf (seq,"%s" , conf->multipaths[i].rdev && conf->multipaths[i].rdev->in_sync ?"U" :"_" ); - sz +=sprintf (page+sz,"]" ); -return sz; +seq_printf (seq,"]" ); }#define LAST_DISK KERN_ALERT \
drivers/md/raid0.c +11 -13
@@ -21,6 +21,7 @@#include <linux/module.h> #include <linux/raid/raid0.h> #include <linux/bio.h> +#include <linux/seq_file.h> #define MAJOR_NR MD_MAJOR#define MD_DRIVER
@@ -372,41 +373,38 @@return 0 ; } -static int raid0_status (char *page,mddev_t *mddev) +static void raid0_status (struct seq_file *seq,mddev_t *mddev) { -int sz =0 ;#undef MD_DEBUG#ifdef MD_DEBUG int j, k;raid0_conf_t *conf =mddev_to_conf (mddev); - sz +=sprintf (page + sz," " ); +seq_printf (seq," " );for (j =0 ; j < conf->nr_zones; j++) { - sz +=sprintf (page + sz,"[z%d" , +seq_printf (seq,"[z%d" , conf->hash_table[j].zone0 - conf->strip_zone);if (conf->hash_table[j].zone1) - sz +=sprintf (page+sz,"/z%d] " , +seq_printf (seq,"/z%d] " , conf->hash_table[j].zone1 - conf->strip_zone);else - sz +=sprintf (page+sz,"] " ); +seq_printf (seq,"] " ); } - sz +=sprintf (page + sz,"\n" ); +seq_printf (seq,"\n" );for (j =0 ; j < conf->nr_strip_zones; j++) { - sz +=sprintf (page + sz," z%d=[" , j); +seq_printf (seq," z%d=[" , j);for (k =0 ; k < conf->strip_zone[j].nb_dev; k++) - sz +=sprintf (page+sz,"%s/" ,bdev_partition_name ( +seq_printf (seq,"%s/" ,bdev_partition_name ( conf->strip_zone[j].dev[k]->bdev)); - sz--; - sz +=sprintf (page+sz,"] zo=%d do=%d s=%d\n" , +seq_printf (seq,"] zo=%d do=%d s=%d\n" , conf->strip_zone[j].zone_offset, conf->strip_zone[j].dev_offset, conf->strip_zone[j].size); }#endif - sz +=sprintf (page + sz," %dk chunks" , mddev->chunk_size/1024 ); -return sz; +seq_printf (seq," %dk chunks" , mddev->chunk_size/1024 ); } static mdk_personality_t raid0_personality=
drivers/md/raid1.c +6 -6
@@ -24,6 +24,7 @@#include <linux/raid/raid1.h> #include <linux/bio.h> +#include <linux/seq_file.h> #define MAJOR_NR MD_MAJOR#define MD_DRIVER
@@ -571,19 +572,18 @@return 0 ; } -static int status (char *page,mddev_t *mddev) +static void status (struct seq_file *seq,mddev_t *mddev) {conf_t *conf =mddev_to_conf (mddev); -int sz =0 , i; +int i; - sz +=sprintf (page+sz," [%d/%d] [" , conf->raid_disks, +seq_printf (seq," [%d/%d] [" , conf->raid_disks, conf->working_disks);for (i =0 ; i < conf->raid_disks; i++) - sz +=sprintf (page+sz,"%s" , +seq_printf (seq,"%s" , conf->mirrors[i].rdev && conf->mirrors[i].rdev->in_sync ?"U" :"_" ); - sz +=sprintf (page+sz,"]" ); -return sz; +seq_printf (seq,"]" ); }#define LAST_DISK KERN_ALERT \
drivers/md/raid5.c +8 -8
@@ -23,6 +23,7 @@#include <linux/bio.h> #include <asm/bitops.h> #include <asm/atomic.h> +#include <linux/seq_file.h> /* * Stripe cache
@@ -1579,24 +1580,23 @@ }#endif -static int status (char *page,mddev_t *mddev) +static void status (struct seq_file *seq,mddev_t *mddev) {raid5_conf_t *conf = (raid5_conf_t *) mddev->private; -int sz =0 , i; +int i; - sz +=sprintf (page+sz," level %d, %dk chunk, algorithm %d" , mddev->level, mddev->chunk_size >>10 , mddev->layout); - sz +=sprintf (page+sz," [%d/%d] [" , conf->raid_disks, conf->working_disks); +seq_printf (seq," level %d, %dk chunk, algorithm %d" , mddev->level, mddev->chunk_size >>10 , mddev->layout); +seq_printf (seq," [%d/%d] [" , conf->raid_disks, conf->working_disks);for (i =0 ; i < conf->raid_disks; i++) - sz +=sprintf (page+sz,"%s" , +seq_printf (seq,"%s" , conf->disks[i].rdev && conf->disks[i].rdev->in_sync ?"U" :"_" ); - sz +=sprintf (page+sz,"]" ); +seq_printf (seq,"]" );#if RAID5_DEBUG #define D (x) \ - sz += sprintf (page+sz, "<"#x":%d>", atomic_read(&conf->x)) + seq_printf (seq, "<"#x":%d>", atomic_read(&conf->x))printall (conf);#endif -return sz; }static void print_raid5_conf (raid5_conf_t *conf)
Hi Kevin,
I like the patch. I'm just curious...why'd you axe the CONFIG_PROC_FS ifdef's ?
--
Paul
Quoted 8 lines
drivers/md/md.c +0
-5-#ifdef CONFIG_PROC_FS -create_proc_read_entry ("mdstat" ,0 ,NULL , md_status_read_proc,NULL ); -#endif -#ifdef CONFIG_PROC_FS remove_proc_entry ("mdstat" ,NULL ); -#endif
Quoted 16 lines · Paul Clements
Hi Kevin,
I like the patch. I'm just curious...why'd you axe the
CONFIG_PROC_FSifdef's ?--
PaulQuoted 3 lines
drivers/md/md.c +0
-3-#ifdef CONFIG_PROC_FS -create_proc_read_entry ("mdstat" ,0 ,NULL , md_status_read_proc,NULL ); -#endif
Quoted 3 lines
drivers/md/md.c line 3303
Quoted 3 lines
drivers/md/md.c +0
-2-#ifdef CONFIG_PROC_FS remove_proc_entry ("mdstat" ,NULL ); -#endif
Two reasons, really:
- constant harping on LKML about how everyone hates #ifdefs <G>
- <linux/proc_fs.h> provides "return NULL" inline versions of these functions if CONFIG_PROC_FS is not defined, so presumably the compiler will just compile them away in that situation