History

[BLOCK] Reimplement elevator switch

This patch reimplements elevator switch. This patch assumes generic dispatch queue patchset is applied. * Each request is tagged with REQ_ELVPRIV flag if it has its elevator private data set. * Requests which doesn't have REQ_ELVPRIV flag set never enter iosched. They are always directly back inserted to dispatch queue. Of course, elevator_put_req_fn is called only for requests which have its REQ_ELVPRIV set. * Request queue maintains the current number of requests which have its elevator data set (elevator_set_req_fn called) in q->rq->elvpriv. * If a request queue has QUEUE_FLAG_BYPASS set, elevator private data is not allocated for new requests. To switch to another iosched, we set QUEUE_FLAG_BYPASS and wait until elvpriv goes to zero; then, we attach the new iosched and clears QUEUE_FLAG_BYPASS. New implementation is much simpler and main code paths are less cluttered, IMHO.

Tejun Heo committed 21 years ago

Commit cb98fc81 parent cb198333 files · +66 −164Browse files

Showing the changes to include/linux/blkdev.h (1 of 3 files). Show all

Unified · Split

include/linux/blkdev.h+4−6
@@ -107,9 +107,9 @@ typedef void (rq_end_io_fn)(struct request *); · 106 unmodified lines
107107 struct request_list {
108108 int count[2];
109109 int starved[2];
110+ int elvpriv;
110111 mempool_t *rq_pool;
111112 wait_queue_head_t wait[2];
112− wait_queue_head_t drain;
113113 };
114114
115115 #define BLK_MAX_CDB 16
@@ -211,6 +211,7 @@ enum rq_flag_bits { · 95 unmodified lines
211211 __REQ_STARTED, /* drive already may have started this one */
212212 __REQ_DONTPREP, /* don't call prep for this one */
213213 __REQ_QUEUED, /* uses queueing */
214+ __REQ_ELVPRIV, /* elevator private data attached */
214215 /*
215216 * for ATA/ATAPI devices
216217 */
@@ -244,6 +245,7 @@ enum rq_flag_bits { · 27 unmodified lines
244245 #define REQ_STARTED (1 << __REQ_STARTED)
245246 #define REQ_DONTPREP (1 << __REQ_DONTPREP)
246247 #define REQ_QUEUED (1 << __REQ_QUEUED)
248+#define REQ_ELVPRIV (1 << __REQ_ELVPRIV)
247249 #define REQ_PC (1 << __REQ_PC)
248250 #define REQ_BLOCK_PC (1 << __REQ_BLOCK_PC)
249251 #define REQ_SENSE (1 << __REQ_SENSE)
@@ -413,8 +415,6 @@ struct request_queue · 163 unmodified lines
413415 unsigned int sg_reserved_size;
414416 int node;
415417
416− struct list_head drain_list;
417−
418418 /*
419419 * reserved for flush operations
420420 */
@@ -442,7 +442,7 @@ enum { · 21 unmodified lines
442442 #define QUEUE_FLAG_DEAD 5 /* queue being torn down */
443443 #define QUEUE_FLAG_REENTER 6 /* Re-entrancy avoidance */
444444 #define QUEUE_FLAG_PLUGGED 7 /* queue is plugged */
445−#define QUEUE_FLAG_DRAIN 8 /* draining queue for sched switch */
445+#define QUEUE_FLAG_BYPASS 8 /* don't use elevator, just do FIFO */
446446 #define QUEUE_FLAG_FLUSH 9 /* doing barrier flush sequence */
447447
448448 #define blk_queue_plugged(q) test_bit(QUEUE_FLAG_PLUGGED, &(q)->queue_flags)
@@ -668,8 +668,6 @@ extern void blk_dump_rq_flags(struct request *, char *); · 219 unmodified lines
668668 extern void generic_unplug_device(request_queue_t *);
669669 extern void __generic_unplug_device(request_queue_t *);
670670 extern long nr_blockdev_pages(void);
671−extern void blk_wait_queue_drained(request_queue_t *, int);
672−extern void blk_finish_queue_drain(request_queue_t *);
673671
674672 int blk_get_queue(request_queue_t *);
675673 request_queue_t *blk_alloc_queue(int gfp_mask);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t