[PATCH] /proc/stat doesn't display stats for more than 16 devices

[Hariprasad Nellitheertha <hari@in.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]

Hello,

Currently, /proc/stat doesn't display statistics correctly if there are
more than 16 devices connected. Tests with more than 16 SCSI devices
show that /proc/stat displays statistics only for the first 16 devices.

This is because of the way the disk stats array has been implemented.
There is no room to capture the additional SCSI majors in the array. The
following patch corrects this behavior. It also makes a small adjustment
in the disk_index funtion to parse the additional majors correctly.

Also, this was first observed while using iostat. A small change is
needed in iostat as well to make it work properly. I am attaching the
iostat patch along with this.

The kernel patch is at the 2.4.2* level and the iostat (sysstat
actually) is at 4.0.* level. Both /proc/stat and iostat work correctly
after these changes.

Kindly review.

--- kernel_stat.h.org	2003-05-19 16:58:39.000000000 +0530
+++ kernel_stat.h	2003-05-19 17:03:41.000000000 +0530
@@ -12,7 +12,7 @@
  * used by rstatd/perfmeter
  */
 
-#define DK_MAX_MAJOR 16
+#define DK_MAX_MAJOR 256
 #define DK_MAX_DISK 16
 
 struct kernel_stat {
--- genhd.h.org	2003-05-19 16:58:48.000000000 +0530
+++ genhd.h	2003-05-19 17:04:01.000000000 +0530
@@ -298,6 +298,13 @@
 			index = (minor & 0x00f8) >> 3;
 			break;
 		case SCSI_DISK0_MAJOR:
+		case SCSI_DISK1_MAJOR:
+		case SCSI_DISK2_MAJOR:
+		case SCSI_DISK3_MAJOR:
+		case SCSI_DISK4_MAJOR:
+		case SCSI_DISK5_MAJOR:
+		case SCSI_DISK6_MAJOR:
+		case SCSI_DISK7_MAJOR:
 			index = (minor & 0x00f0) >> 4;
 			break;
 		case IDE0_MAJOR:	/* same as HD_MAJOR */


Regards,
Hari



[-- Attachment #2: iostat.patch --]
[-- Type: text/plain, Size: 942 bytes --]

--- iostat.c.org	Wed May 28 13:48:20 2003
+++ iostat.c	Wed May 28 13:46:42 2003
@@ -107,7 +107,7 @@
 void read_stat(int curr, int flags)
 {
    FILE *statfp;
-   char line[1024];
+   char line[8192];
    int pos, i;
    unsigned int v_tmp[3], v_major, v_index;
 #if 0
@@ -122,7 +122,7 @@
       exit(2);
    }
 
-   while (fgets(line, 1024, statfp) != NULL) {
+   while (fgets(line, 8192, statfp) != NULL) {
 
       if (!strncmp(line, "cpu ", 4)) {
 	 /*
@@ -245,7 +245,7 @@
 {
    FILE *partfp;
    int i;
-   char line[1024];
+   char line[8192];
    struct disk_stats part;
    struct disk_hdr_stats part_hdr;
 
@@ -255,7 +255,7 @@
       exit(2);
    }
 
-   while (fgets(line, 1024, partfp) != NULL) {
+   while (fgets(line, 8192, partfp) != NULL) {
 
       if (sscanf(line, "%*d %*d %*d %63s %d %d %d %d %d %d %d %d %*d %d %d",
 	     part_hdr.name,	/* No need to read major and minor numbers */