Patch against ll_rw_blk and blkdev.h in 2.2
Hello Alan, Hi list-readers!
I'd like to suggest a change to ll_rw_blk and blkdev.h in the 2.2-Kernel:
rational
-----
On mainframe architectures, we're running a large number of disks on a System. Our disk-device-driver (dasd) has a static major number for the first 64 disks and uses dynamicaly allocated ones for the rest. In ll_rw_blk there are static allocated lists (CASE_COALESCE*) for majors that support merging requests (including our static one DASD_MAJOR). For the dynamic allocated majors, our requests do not get clustered which leads to a major performance drop.
the patch
-------
I added a global int field named blk_merge_rule to blkdev.h, which contains the device driver's rule about merging. I did three definitions for this
variable: do not merge (the default), do merge, and merge but not the first request (like for the static majors).
The device driver has to set this field for a major it uses and reset it to BLK_MERGE_NEVER when freeing the major.
In ll_rw_blk I invented a case, which is taken if there is no static setting
for the major. It then processes like set in blk_merge_rule.
If the device driver has a static setting for its major, it does'nt have to care
about blk_merge_rule. If the device driverhas no static setting and does not
set blk_merge_rule, the requests do not get merged (same as before).
I attached the patch (sorry, notes messes up white-spaces when embedding stuff), it applies against 2.2.19. (See attached file: dyn_majors.diff)
What is your opinion about including it into the standard brach? Why not change all block-dev-drivers so that they set blk_merge_rule and throw out the CASE_COALESCE* stuff and simplify the code again?
mit freundlichem Gruß / with kind regards
Carsten Otte
IBM Deutschland Entwicklung GmbH
Linux for 390/zSeries Development - Device Driver Team
Phone: +49/07031/16-4076
IBM internal phone: *120-4076
--
We are Linux.
Resistance indicates that you're missing the point!
Index: drivers/block/ll_rw_blk.c
===================================================================
RCS file: /home/cvs/linux/drivers/block/ll_rw_blk.c,v retrieving revision 1.15
retrieving revision 1.17
block/ll_rw_blk.c +26 -1
@@ -4,6 +4,7 @@* Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1994, Karl Keyte: Added support for disk statistics * Elevator latency, (C) 2000 Andrea Arcangeli <[email protected]> SuSE +* Merging for dyn. allocated majors, (C) 2001 Carsten Otte <[email protected]> IBM */ /*
@@ -119,6 +120,12 @@*/ int * max_segments[MAX_BLKDEV ]; +/* +* rule to merge requests for major +* +*/ +int blk_merge_rule[MAX_BLKDEV ]; +static inline int get_max_sectors (kdev_t dev) {if (!max_sectors[MAJOR (dev)])
@@ -578,6 +585,7 @@int rw_ahead, max_req, max_sectors, max_segments;unsigned long flags;int back, front; +int skip_first_req; count = bh->b_size >>9 ; sector = bh->b_rsector;
@@ -660,12 +668,29 @@*/ spin_lock_irqsave (&io_request_lock,flags); req = *get_queue (bh->b_rdev); +/* +* Do not skip merging first request in queue +*/ + skip_first_req =0 ;if (!req) {/* MD and loop can't handle plugging without deadlocking */ if (major !=MD_MAJOR && major !=LOOP_MAJOR && major !=DDV_MAJOR && major !=NBD_MAJOR )plug_device (blk_dev + major);/* is atomic */ }else switch (major) { +default : +/* +* For dynamicaly allocated majors, that are not defined in +* CASE_COALESCE_BUT_FIRST_REQUEST_MAYBE_BUSY or +* CASE_COALESCE_ALSO_FIRST_REQUEST have a look at blk_merge_rule +* to determine whether requests may be merged +*/ +if ((blk_merge_rule[major] !=BLK_MERGE_BUT_FIRST_REQUEST_MAY_BE_BUSY ) && + (blk_merge_rule[major] !=BLK_MERGE_ALSO_FIRST_REQUEST )) +break ; +if (blk_merge_rule[major] ==BLK_MERGE_ALSO_FIRST_REQUEST ) + skip_first_req =1 ; +/* fall through */ CASE_COALESCE_BUT_FIRST_REQUEST_MAYBE_BUSY /* * The scsi disk and cdrom drivers completely remove the request
@@ -676,7 +701,7 @@* All other drivers need to jump over the first entry, as that * entry may be busy being processed and we thus can't change it. */ -if (req == blk_dev[major].current_request) +if (req == blk_dev[major].current_request && skip_first_req ==0 )if (!(req = req->next))break ;/* fall through */
Index: include/linux/blkdev.h
===================================================================
RCS file: /home/cvs/linux/include/linux/blkdev.h,v retrieving revision 1.4
retrieving revision 1.5
linux/blkdev.h +9 -0
@@ -107,6 +107,15 @@extern int * max_segments[MAX_BLKDEV ]; +extern int blk_merge_rule[MAX_BLKDEV ]; + +/* +* definitions which can be set into blk_merge_rule +*/ +#define BLK_MERGE_NEVER 0 +#define BLK_MERGE_BUT_FIRST_REQUEST_MAY_BE_BUSY 1 +#define BLK_MERGE_ALSO_FIRST_REQUEST 2 +#define MAX_SECTORS 128#define MAX_SEGMENTS MAX_SECTORS