Menu
▾
▴
Re: [Lse-tech] Re: [PATCH]Disk IO statistics for all disks (request queue)
|
From: Andrew M. <ak...@zi...> - 2001-11-14 06:18:15
|
[ recipient snippage ]
Mingming cao wrote:
>
> Hi Linus, Alan, All,
>
> Here is a try in the direction of moving disk statistics into the
> request queue.
> ...
> diff -urN -X dontdiff linux-2.4.14/drivers/block/ll_rw_blk.c linux-test/drivers/block/ll_rw_blk.c
> --- linux-2.4.14/drivers/block/ll_rw_blk.c Mon Oct 29 12:11:17 2001
> +++ linux-test/drivers/block/ll_rw_blk.c Tue Nov 13 12:18:20 2001
> @@ -183,7 +183,12 @@
>
> if (count)
> printk("blk_cleanup_queue: leaked requests (%d)\n", count);
> -
> + /*
> + * free statistics structure
> + */
> + if (q->dk_stat)
> + kfree(q->dk_stat);
> +
You don't need to test for null here - kfree() does that.
> memset(q, 0, sizeof(*q));
> }
>
> @@ -393,6 +398,8 @@
> **/
> void blk_init_queue(request_queue_t * q, request_fn_proc * rfn)
> {
> + disk_stat * new;
> +
> INIT_LIST_HEAD(&q->queue_head);
> elevator_init(&q->elevator, ELEVATOR_LINUS);
> blk_init_free_list(q);
> @@ -413,6 +420,15 @@
> */
> q->plug_device_fn = generic_plug_device;
> q->head_active = 1;
> + /*
> + * At last, allocate and initialize the statistics
> + */
> + new = (disk_stat * )kmalloc(sizeof(disk_stat), GFP_KERNEL);
> + if (new == NULL) {
> + printk(KERN_ERR "blk_init_queue:error allocating statisitcs\n");
> + }
> + memset(new, 0, sizeof(disk_stat));
If new == NULL, kernel crashes.
> + q->dk_stat = new;
> }
>
> #define blkdev_free_rq(list) list_entry((list)->next, struct request, queue);
> @@ -497,23 +513,18 @@
> else ro_bits[major][minor >> 5] &= ~(1 << (minor & 31));
> }
>
> -inline void drive_stat_acct (kdev_t dev, int rw,
> +inline void drive_stat_acct (disk_stat * ds, int rw,
> unsigned long nr_sectors, int new_io)
> {
> - unsigned int major = MAJOR(dev);
> - unsigned int index;
> -
> - index = disk_index(dev);
> - if ((index >= DK_MAX_DISK) || (major >= DK_MAX_MAJOR))
> + if (ds == NULL)
> return;
>
> - kstat.dk_drive[major][index] += new_io;
> if (rw == READ) {
> - kstat.dk_drive_rio[major][index] += new_io;
> - kstat.dk_drive_rblk[major][index] += nr_sectors;
> + ds->dk_drive_rio += new_io;
> + ds->dk_drive_rblk += nr_sectors;
> } else if (rw == WRITE) {
> - kstat.dk_drive_wio[major][index] += new_io;
> - kstat.dk_drive_wblk[major][index] += nr_sectors;
> + ds->dk_drive_wio += new_io;
> + ds->dk_drive_wblk += nr_sectors;
> } else
> printk(KERN_ERR "drive_stat_acct: cmd not R/W?\n");
> }
> @@ -529,7 +540,7 @@
> static inline void add_request(request_queue_t * q, struct request * req,
> struct list_head *insert_here)
> {
> - drive_stat_acct(req->rq_dev, req->cmd, req->nr_sectors, 1);
> + drive_stat_acct(q->dk_stat, req->cmd, req->nr_sectors, 1);
>
> if (!q->plugged && q->head_active && insert_here == &q->queue_head) {
> spin_unlock_irq(&io_request_lock);
> @@ -701,7 +712,7 @@
> req->bhtail = bh;
> req->nr_sectors = req->hard_nr_sectors += count;
> blk_started_io(count);
> - drive_stat_acct(req->rq_dev, req->cmd, count, 0);
> + drive_stat_acct(q->dk_stat, req->cmd, count, 0);
> attempt_back_merge(q, req, max_sectors, max_segments);
> goto out;
>
> @@ -716,7 +727,7 @@
> req->sector = req->hard_sector = sector;
> req->nr_sectors = req->hard_nr_sectors += count;
> blk_started_io(count);
> - drive_stat_acct(req->rq_dev, req->cmd, count, 0);
> + drive_stat_acct(q->dk_stat, req->cmd, count, 0);
> attempt_front_merge(q, head, req, max_sectors, max_segments);
> goto out;
>
> diff -urN -X dontdiff linux-2.4.14/drivers/ide/ide.c linux-test/drivers/ide/ide.c
> --- linux-2.4.14/drivers/ide/ide.c Thu Oct 25 13:58:35 2001
> +++ linux-test/drivers/ide/ide.c Tue Nov 13 17:47:42 2001
> @@ -1451,8 +1451,10 @@
> request_queue_t *ide_get_queue (kdev_t dev)
> {
> ide_hwif_t *hwif = (ide_hwif_t *)blk_dev[MAJOR(dev)].data;
> -
> - return &hwif->drives[DEVICE_NR(dev) & 1].queue;
> + if (DEVICE_NR(dev) >= MAX_DRIVES)
> + return NULL;
> + else
> + return &hwif->drives[DEVICE_NR(dev)].queue;
> }
>
> /*
> diff -urN -X dontdiff linux-2.4.14/drivers/md/md.c linux-test/drivers/md/md.c
> --- linux-2.4.14/drivers/md/md.c Thu Oct 25 13:58:34 2001
> +++ linux-test/drivers/md/md.c Tue Nov 13 17:49:31 2001
> @@ -3302,12 +3302,15 @@
> ITERATE_RDEV(mddev,rdev,tmp) {
> int major = MAJOR(rdev->dev);
> int idx = disk_index(rdev->dev);
> -
> + request_queue_t * rq = blk_get_queue(rdev->dev);
> +
> if ((idx >= DK_MAX_DISK) || (major >= DK_MAX_MAJOR))
> continue;
> -
> - curr_events = kstat.dk_drive_rblk[major][idx] +
> - kstat.dk_drive_wblk[major][idx] ;
> +
> + if (rq == NULL || (rq->dk_stat == NULL))
> + continue;
> + curr_events = rq->dk_stat->dk_drive_rblk +
> + rq->dk_stat->dk_drive_wblk ;
> curr_events -= sync_io[major][idx];
> if ((curr_events - rdev->last_events) > 32) {
> rdev->last_events = curr_events;
> diff -urN -X dontdiff linux-2.4.14/fs/proc/proc_misc.c linux-test/fs/proc/proc_misc.c
> --- linux-2.4.14/fs/proc/proc_misc.c Thu Oct 11 10:46:57 2001
> +++ linux-test/fs/proc/proc_misc.c Tue Nov 13 16:11:33 2001
> @@ -35,12 +35,12 @@
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/smp_lock.h>
> +#include <linux/blkdev.h>
>
> #include <asm/uaccess.h>
> #include <asm/pgtable.h>
> #include <asm/io.h>
>
> -
> #define LOAD_INT(x) ((x) >> FSHIFT)
> #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
> /*
> @@ -259,7 +259,23 @@
> return len;
> }
> #endif
> -
> +static inline int show_disk_stat(char * page, int len, disk_stat * ds,
> + int major, int disk)
> +{
This should not be inline.
|