History

block: Consolidate phys_segment and hw_segment limits

Except for SCSI no device drivers distinguish between physical and hardware segment limits. Consolidate the two into a single segment limit.

Martin K. Petersen committed 16 years ago

Commit 8a783621 parent 086fa5f35 files · +70 −136Browse files

Unified · Split

35 files
  1. arch/um/drivers/ubd_kern.c +1 −1
  2. block/blk-core.c +1 −2
  3. block/blk-merge.c +2 −6
  4. block/blk-settings.c +13 −47
  5. drivers/ata/sata_nv.c +1 −1
  6. drivers/block/DAC960.c +1 −1
  7. drivers/block/cciss.c +1 −4
  8. drivers/block/cpqarray.c +1 −4
  9. drivers/block/drbd/drbd_nl.c +1 −2
  10. drivers/block/paride/pf.c +1 −2
  11. drivers/block/pktcdvd.c +2 −2
  12. drivers/block/ps3disk.c +1 −2
  13. drivers/block/ps3vram.c +1 −2
  14. drivers/block/sunvdc.c +1 −2
  15. drivers/block/sx8.c +1 −2
  16. drivers/block/ub.c +1 −2
  17. drivers/block/viodasd.c +1 −2
  18. drivers/block/xen-blkfront.c +1 −2
  19. drivers/cdrom/gdrom.c +1 −1
  20. drivers/cdrom/viocd.c +1 −2
  21. drivers/ide/ide-probe.c +1 −2
  22. drivers/md/raid5.c +1 −1
  23. drivers/memstick/core/mspro_block.c +1 −2
  24. drivers/message/i2o/i2o_block.c +1 −2
  25. drivers/mmc/card/queue.c +2 −4
  26. drivers/s390/block/dasd.c +1 −2
  27. drivers/s390/char/tape_block.c +1 −2
  28. drivers/scsi/ibmvscsi/ibmvfc.c +2 −2
  29. drivers/scsi/scsi_lib.c +2 −2
  30. drivers/scsi/sg.c +2 −4
  31. drivers/scsi/st.c +1 −2
  32. drivers/staging/hv/blkvsc_drv.c +1 −4
  33. fs/bio.c +3 −6
  34. include/linux/blkdev.h +16 −11
  35. include/linux/i2o.h +1 −1
arch/um/drivers/ubd_kern.c+1−1
@@ -849,7 +849,7 @@ static int ubd_add(int n, char **error_out) · 848 unmodified lines
849 }849 }
850 ubd_dev->queue->queuedata = ubd_dev;850 ubd_dev->queue->queuedata = ubd_dev;
851 851
852 blk_queue_max_hw_segments(ubd_dev->queue, MAX_SG);852 blk_queue_max_segments(ubd_dev->queue, MAX_SG);
853 err = ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, &ubd_gendisk[n]);853 err = ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, &ubd_gendisk[n]);
854 if(err){854 if(err){
855 *error_out = "Failed to register device";855 *error_out = "Failed to register device";
block/blk-core.c+1−2
@@ -1614,8 +1614,7 @@ int blk_rq_check_limits(struct request_queue *q, struct request *rq) · 1613 unmodified lines
1614 * limitation.1614 * limitation.
1615 */1615 */
1616 blk_recalc_rq_segments(rq);1616 blk_recalc_rq_segments(rq);
1617 if (rq->nr_phys_segments > queue_max_phys_segments(q) ||1617 if (rq->nr_phys_segments > queue_max_segments(q)) {
1618 rq->nr_phys_segments > queue_max_hw_segments(q)) {
1619 printk(KERN_ERR "%s: over max segments limit.\n", __func__);1618 printk(KERN_ERR "%s: over max segments limit.\n", __func__);
1620 return -EIO;1619 return -EIO;
1621 }1620 }
block/blk-merge.c+2−6
@@ -206,8 +206,7 @@ static inline int ll_new_hw_segment(struct request_queue *q, · 205 unmodified lines
206{206{
207 int nr_phys_segs = bio_phys_segments(q, bio);207 int nr_phys_segs = bio_phys_segments(q, bio);
208 208
209 if (req->nr_phys_segments + nr_phys_segs > queue_max_hw_segments(q) ||209 if (req->nr_phys_segments + nr_phys_segs > queue_max_segments(q)) {
210 req->nr_phys_segments + nr_phys_segs > queue_max_phys_segments(q)) {
211 req->cmd_flags |= REQ_NOMERGE;210 req->cmd_flags |= REQ_NOMERGE;
212 if (req == q->last_merge)211 if (req == q->last_merge)
213 q->last_merge = NULL;212 q->last_merge = NULL;
@@ -300,10 +299,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req, · 86 unmodified lines
300 total_phys_segments--;299 total_phys_segments--;
301 }300 }
302 301
303 if (total_phys_segments > queue_max_phys_segments(q))302 if (total_phys_segments > queue_max_segments(q))
304 return 0;
305
306 if (total_phys_segments > queue_max_hw_segments(q))
307 return 0;303 return 0;
308 304
309 /* Merge is OK... */305 /* Merge is OK... */
block/blk-settings.c+13−47
@@ -91,8 +91,7 @@ EXPORT_SYMBOL_GPL(blk_queue_lld_busy); · 90 unmodified lines
91 */91 */
92void blk_set_default_limits(struct queue_limits *lim)92void blk_set_default_limits(struct queue_limits *lim)
93{93{
94 lim->max_phys_segments = MAX_PHYS_SEGMENTS;94 lim->max_segments = BLK_MAX_SEGMENTS;
95 lim->max_hw_segments = MAX_HW_SEGMENTS;
96 lim->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK;95 lim->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK;
97 lim->max_segment_size = BLK_MAX_SEGMENT_SIZE;96 lim->max_segment_size = BLK_MAX_SEGMENT_SIZE;
98 lim->max_sectors = BLK_DEF_MAX_SECTORS;97 lim->max_sectors = BLK_DEF_MAX_SECTORS;
@@ -252,17 +251,15 @@ void blk_queue_max_discard_sectors(struct request_queue *q, · 153 unmodified lines
252EXPORT_SYMBOL(blk_queue_max_discard_sectors);251EXPORT_SYMBOL(blk_queue_max_discard_sectors);
253 252
254/**253/**
255 * blk_queue_max_phys_segments - set max phys segments for a request for this queue254 * blk_queue_max_segments - set max hw segments for a request for this queue
256 * @q: the request queue for the device255 * @q: the request queue for the device
257 * @max_segments: max number of segments256 * @max_segments: max number of segments
258 *257 *
259 * Description:258 * Description:
260 * Enables a low level driver to set an upper limit on the number of259 * Enables a low level driver to set an upper limit on the number of
261 * physical data segments in a request. This would be the largest sized260 * hw data segments in a request.
262 * scatter list the driver could handle.
263 **/261 **/
264void blk_queue_max_phys_segments(struct request_queue *q,262void blk_queue_max_segments(struct request_queue *q, unsigned short max_segments)
265 unsigned short max_segments)
266{263{
267 if (!max_segments) {264 if (!max_segments) {
268 max_segments = 1;265 max_segments = 1;
@@ -270,33 +267,9 @@ void blk_queue_max_phys_segments(struct request_queue *q, · 1 unmodified line
270 __func__, max_segments);267 __func__, max_segments);
271 }268 }
272 269
273 q->limits.max_phys_segments = max_segments;270 q->limits.max_segments = max_segments;
274}271}
275EXPORT_SYMBOL(blk_queue_max_phys_segments);272EXPORT_SYMBOL(blk_queue_max_segments);
276
277/**
278 * blk_queue_max_hw_segments - set max hw segments for a request for this queue
279 * @q: the request queue for the device
280 * @max_segments: max number of segments
281 *
282 * Description:
283 * Enables a low level driver to set an upper limit on the number of
284 * hw data segments in a request. This would be the largest number of
285 * address/length pairs the host adapter can actually give at once
286 * to the device.
287 **/
288void blk_queue_max_hw_segments(struct request_queue *q,
289 unsigned short max_segments)
290{
291 if (!max_segments) {
292 max_segments = 1;
293 printk(KERN_INFO "%s: set to minimum %d\n",
294 __func__, max_segments);
295 }
296
297 q->limits.max_hw_segments = max_segments;
298}
299EXPORT_SYMBOL(blk_queue_max_hw_segments);
300 273
301/**274/**
302 * blk_queue_max_segment_size - set max segment size for blk_rq_map_sg275 * blk_queue_max_segment_size - set max segment size for blk_rq_map_sg
@@ -531,11 +504,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, · 228 unmodified lines
531 t->seg_boundary_mask = min_not_zero(t->seg_boundary_mask,504 t->seg_boundary_mask = min_not_zero(t->seg_boundary_mask,
532 b->seg_boundary_mask);505 b->seg_boundary_mask);
533 506
534 t->max_phys_segments = min_not_zero(t->max_phys_segments,507 t->max_segments = min_not_zero(t->max_segments, b->max_segments);
535 b->max_phys_segments);
536
537 t->max_hw_segments = min_not_zero(t->max_hw_segments,
538 b->max_hw_segments);
539 508
540 t->max_segment_size = min_not_zero(t->max_segment_size,509 t->max_segment_size = min_not_zero(t->max_segment_size,
541 b->max_segment_size);510 b->max_segment_size);
@@ -739,22 +708,19 @@ EXPORT_SYMBOL(blk_queue_update_dma_pad); · 197 unmodified lines
739 * does is adjust the queue so that the buf is always appended708 * does is adjust the queue so that the buf is always appended
740 * silently to the scatterlist.709 * silently to the scatterlist.
741 *710 *
742 * Note: This routine adjusts max_hw_segments to make room for711 * Note: This routine adjusts max_hw_segments to make room for appending
743 * appending the drain buffer. If you call712 * the drain buffer. If you call blk_queue_max_segments() after calling
744 * blk_queue_max_hw_segments() or blk_queue_max_phys_segments() after713 * this routine, you must set the limit to one fewer than your device
745 * calling this routine, you must set the limit to one fewer than your714 * can support otherwise there won't be room for the drain buffer.
746 * device can support otherwise there won't be room for the drain
747 * buffer.
748 */715 */
749int blk_queue_dma_drain(struct request_queue *q,716int blk_queue_dma_drain(struct request_queue *q,
750 dma_drain_needed_fn *dma_drain_needed,717 dma_drain_needed_fn *dma_drain_needed,
751 void *buf, unsigned int size)718 void *buf, unsigned int size)
752{719{
753 if (queue_max_hw_segments(q) < 2 || queue_max_phys_segments(q) < 2)720 if (queue_max_segments(q) < 2)
754 return -EINVAL;721 return -EINVAL;
755 /* make room for appending the drain */722 /* make room for appending the drain */
756 blk_queue_max_hw_segments(q, queue_max_hw_segments(q) - 1);723 blk_queue_max_segments(q, queue_max_segments(q) - 1);
757 blk_queue_max_phys_segments(q, queue_max_phys_segments(q) - 1);
758 q->dma_drain_needed = dma_drain_needed;724 q->dma_drain_needed = dma_drain_needed;
759 q->dma_drain_buffer = buf;725 q->dma_drain_buffer = buf;
760 q->dma_drain_size = size;726 q->dma_drain_size = size;
drivers/ata/sata_nv.c+1−1
@@ -772,7 +772,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev) · 771 unmodified lines
772 }772 }
773 773
774 blk_queue_segment_boundary(sdev->request_queue, segment_boundary);774 blk_queue_segment_boundary(sdev->request_queue, segment_boundary);
775 blk_queue_max_hw_segments(sdev->request_queue, sg_tablesize);775 blk_queue_max_segments(sdev->request_queue, sg_tablesize);
776 ata_port_printk(ap, KERN_INFO,776 ata_port_printk(ap, KERN_INFO,
777 "DMA mask 0x%llX, segment boundary 0x%lX, hw segs %hu\n",777 "DMA mask 0x%llX, segment boundary 0x%lX, hw segs %hu\n",
778 (unsigned long long)*ap->host->dev->dma_mask,778 (unsigned long long)*ap->host->dev->dma_mask,
drivers/block/DAC960.c+1−1
@@ -2534,7 +2534,7 @@ static bool DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller) · 2533 unmodified lines
2534 blk_queue_bounce_limit(RequestQueue, Controller->BounceBufferLimit);2534 blk_queue_bounce_limit(RequestQueue, Controller->BounceBufferLimit);
2535 RequestQueue->queuedata = Controller;2535 RequestQueue->queuedata = Controller;
2536 blk_queue_max_hw_segments(RequestQueue, Controller->DriverScatterGatherLimit);2536 blk_queue_max_hw_segments(RequestQueue, Controller->DriverScatterGatherLimit);
2537 blk_queue_max_phys_segments(RequestQueue, Controller->DriverScatterGatherLimit);2537 blk_queue_max_segments(RequestQueue, Controller->DriverScatterGatherLimit);
2538 blk_queue_max_hw_sectors(RequestQueue, Controller->MaxBlocksPerCommand);2538 blk_queue_max_hw_sectors(RequestQueue, Controller->MaxBlocksPerCommand);
2539 disk->queue = RequestQueue;2539 disk->queue = RequestQueue;
2540 sprintf(disk->disk_name, "rd/c%dd%d", Controller->ControllerNumber, n);2540 sprintf(disk->disk_name, "rd/c%dd%d", Controller->ControllerNumber, n);
drivers/block/cciss.c+1−4
@@ -1797,10 +1797,7 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk, · 1796 unmodified lines
1797 blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask);1797 blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask);
1798 1798
1799 /* This is a hardware imposed limit. */1799 /* This is a hardware imposed limit. */
1800 blk_queue_max_hw_segments(disk->queue, h->maxsgentries);1800 blk_queue_max_segments(disk->queue, h->maxsgentries);
1801
1802 /* This is a limit in the driver and could be eliminated. */
1803 blk_queue_max_phys_segments(disk->queue, h->maxsgentries);
1804 1801
1805 blk_queue_max_hw_sectors(disk->queue, h->cciss_max_sectors);1802 blk_queue_max_hw_sectors(disk->queue, h->cciss_max_sectors);
1806 1803
drivers/block/cpqarray.c+1−4
@@ -448,11 +448,8 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev) · 447 unmodified lines
448 blk_queue_bounce_limit(q, hba[i]->pci_dev->dma_mask);448 blk_queue_bounce_limit(q, hba[i]->pci_dev->dma_mask);
449 449
450 /* This is a hardware imposed limit. */450 /* This is a hardware imposed limit. */
451 blk_queue_max_hw_segments(q, SG_MAX);451 blk_queue_max_segments(q, SG_MAX);
452 452
453 /* This is a driver limit and could be eliminated. */
454 blk_queue_max_phys_segments(q, SG_MAX);
455
456 init_timer(&hba[i]->timer);453 init_timer(&hba[i]->timer);
457 hba[i]->timer.expires = jiffies + IDA_TIMER;454 hba[i]->timer.expires = jiffies + IDA_TIMER;
458 hba[i]->timer.data = (unsigned long)hba[i];455 hba[i]->timer.data = (unsigned long)hba[i];
drivers/block/drbd/drbd_nl.c+1−2
@@ -710,8 +710,7 @@ void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_seg_s) __mu · 709 unmodified lines
710 max_seg_s = min(queue_max_sectors(b) * queue_logical_block_size(b), max_seg_s);710 max_seg_s = min(queue_max_sectors(b) * queue_logical_block_size(b), max_seg_s);
711 711
712 blk_queue_max_hw_sectors(q, max_seg_s >> 9);712 blk_queue_max_hw_sectors(q, max_seg_s >> 9);
713 blk_queue_max_phys_segments(q, max_segments ? max_segments : MAX_PHYS_SEGMENTS);713 blk_queue_max_segments(q, max_segments ? max_segments : BLK_MAX_SEGMENTS);
714 blk_queue_max_hw_segments(q, max_segments ? max_segments : MAX_HW_SEGMENTS);
715 blk_queue_max_segment_size(q, max_seg_s);714 blk_queue_max_segment_size(q, max_seg_s);
716 blk_queue_logical_block_size(q, 512);715 blk_queue_logical_block_size(q, 512);
717 blk_queue_segment_boundary(q, PAGE_SIZE-1);716 blk_queue_segment_boundary(q, PAGE_SIZE-1);
drivers/block/paride/pf.c+1−2
@@ -956,8 +956,7 @@ static int __init pf_init(void) · 955 unmodified lines
956 return -ENOMEM;956 return -ENOMEM;
957 }957 }
958 958
959 blk_queue_max_phys_segments(pf_queue, cluster);959 blk_queue_max_segments(pf_queue, cluster);
960 blk_queue_max_hw_segments(pf_queue, cluster);
961 960
962 for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) {961 for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) {
963 struct gendisk *disk = pf->disk;962 struct gendisk *disk = pf->disk;
drivers/block/pktcdvd.c+2−2
@@ -950,14 +950,14 @@ static void pkt_iosched_process_queue(struct pktcdvd_device *pd) · 949 unmodified lines
950static int pkt_set_segment_merging(struct pktcdvd_device *pd, struct request_queue *q)950static int pkt_set_segment_merging(struct pktcdvd_device *pd, struct request_queue *q)
951{951{
952 if ((pd->settings.size << 9) / CD_FRAMESIZE952 if ((pd->settings.size << 9) / CD_FRAMESIZE
953 <= queue_max_phys_segments(q)) {953 <= queue_max_segments(q)) {
954 /*954 /*
955 * The cdrom device can handle one segment/frame955 * The cdrom device can handle one segment/frame
956 */956 */
957 clear_bit(PACKET_MERGE_SEGS, &pd->flags);957 clear_bit(PACKET_MERGE_SEGS, &pd->flags);
958 return 0;958 return 0;
959 } else if ((pd->settings.size << 9) / PAGE_SIZE959 } else if ((pd->settings.size << 9) / PAGE_SIZE
960 <= queue_max_phys_segments(q)) {960 <= queue_max_segments(q)) {
961 /*961 /*
962 * We can handle this case at the expense of some extra memory962 * We can handle this case at the expense of some extra memory
963 * copies during write operations963 * copies during write operations
drivers/block/ps3disk.c+1−2
@@ -482,8 +482,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev) · 481 unmodified lines
482 blk_queue_ordered(queue, QUEUE_ORDERED_DRAIN_FLUSH,482 blk_queue_ordered(queue, QUEUE_ORDERED_DRAIN_FLUSH,
483 ps3disk_prepare_flush);483 ps3disk_prepare_flush);
484 484
485 blk_queue_max_phys_segments(queue, -1);485 blk_queue_max_segments(queue, -1);
486 blk_queue_max_hw_segments(queue, -1);
487 blk_queue_max_segment_size(queue, dev->bounce_size);486 blk_queue_max_segment_size(queue, dev->bounce_size);
488 487
489 gendisk = alloc_disk(PS3DISK_MINORS);488 gendisk = alloc_disk(PS3DISK_MINORS);
drivers/block/ps3vram.c+1−2
@@ -751,8 +751,7 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) · 750 unmodified lines
751 priv->queue = queue;751 priv->queue = queue;
752 queue->queuedata = dev;752 queue->queuedata = dev;
753 blk_queue_make_request(queue, ps3vram_make_request);753 blk_queue_make_request(queue, ps3vram_make_request);
754 blk_queue_max_phys_segments(queue, MAX_PHYS_SEGMENTS);754 blk_queue_max_segments(queue, BLK_MAX_HW_SEGMENTS);
755 blk_queue_max_hw_segments(queue, MAX_HW_SEGMENTS);
756 blk_queue_max_segment_size(queue, BLK_MAX_SEGMENT_SIZE);755 blk_queue_max_segment_size(queue, BLK_MAX_SEGMENT_SIZE);
757 blk_queue_max_hw_sectors(queue, BLK_SAFE_MAX_SECTORS);756 blk_queue_max_hw_sectors(queue, BLK_SAFE_MAX_SECTORS);
758 757
drivers/block/sunvdc.c+1−2
@@ -691,8 +691,7 @@ static int probe_disk(struct vdc_port *port) · 690 unmodified lines
691 691
692 port->disk = g;692 port->disk = g;
693 693
694 blk_queue_max_hw_segments(q, port->ring_cookies);694 blk_queue_max_segments(q, port->ring_cookies);
695 blk_queue_max_phys_segments(q, port->ring_cookies);
696 blk_queue_max_hw_sectors(q, port->max_xfer_size);695 blk_queue_max_hw_sectors(q, port->max_xfer_size);
697 g->major = vdc_major;696 g->major = vdc_major;
698 g->first_minor = port->vio.vdev->dev_no << PARTITION_SHIFT;697 g->first_minor = port->vio.vdev->dev_no << PARTITION_SHIFT;
drivers/block/sx8.c+1−2
@@ -1518,8 +1518,7 @@ static int carm_init_disks(struct carm_host *host) · 1517 unmodified lines
1518 break;1518 break;
1519 }1519 }
1520 disk->queue = q;1520 disk->queue = q;
1521 blk_queue_max_hw_segments(q, CARM_MAX_REQ_SG);1521 blk_queue_max_segments(q, CARM_MAX_REQ_SG);
1522 blk_queue_max_phys_segments(q, CARM_MAX_REQ_SG);
1523 blk_queue_segment_boundary(q, CARM_SG_BOUNDARY);1522 blk_queue_segment_boundary(q, CARM_SG_BOUNDARY);
1524 1523
1525 q->queuedata = port;1524 q->queuedata = port;
drivers/block/ub.c+1−2
@@ -2320,8 +2320,7 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum) · 2319 unmodified lines
2320 disk->queue = q;2320 disk->queue = q;
2321 2321
2322 blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);2322 blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);
2323 blk_queue_max_hw_segments(q, UB_MAX_REQ_SG);2323 blk_queue_max_segments(q, UB_MAX_REQ_SG);
2324 blk_queue_max_phys_segments(q, UB_MAX_REQ_SG);
2325 blk_queue_segment_boundary(q, 0xffffffff); /* Dubious. */2324 blk_queue_segment_boundary(q, 0xffffffff); /* Dubious. */
2326 blk_queue_max_hw_sectors(q, UB_MAX_SECTORS);2325 blk_queue_max_hw_sectors(q, UB_MAX_SECTORS);
2327 blk_queue_logical_block_size(q, lun->capacity.bsize);2326 blk_queue_logical_block_size(q, lun->capacity.bsize);
drivers/block/viodasd.c+1−2
@@ -471,8 +471,7 @@ retry: · 470 unmodified lines
471 }471 }
472 472
473 d->disk = g;473 d->disk = g;
474 blk_queue_max_hw_segments(q, VIOMAXBLOCKDMA);474 blk_queue_max_segments(q, VIOMAXBLOCKDMA);
475 blk_queue_max_phys_segments(q, VIOMAXBLOCKDMA);
476 blk_queue_max_hw_sectors(q, VIODASD_MAXSECTORS);475 blk_queue_max_hw_sectors(q, VIODASD_MAXSECTORS);
477 g->major = VIODASD_MAJOR;476 g->major = VIODASD_MAJOR;
478 g->first_minor = dev_no << PARTITION_SHIFT;477 g->first_minor = dev_no << PARTITION_SHIFT;
drivers/block/xen-blkfront.c+1−2
@@ -353,8 +353,7 @@ static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size) · 352 unmodified lines
353 blk_queue_max_segment_size(rq, PAGE_SIZE);353 blk_queue_max_segment_size(rq, PAGE_SIZE);
354 354
355 /* Ensure a merged request will fit in a single I/O ring slot. */355 /* Ensure a merged request will fit in a single I/O ring slot. */
356 blk_queue_max_phys_segments(rq, BLKIF_MAX_SEGMENTS_PER_REQUEST);356 blk_queue_max_segments(rq, BLKIF_MAX_SEGMENTS_PER_REQUEST);
357 blk_queue_max_hw_segments(rq, BLKIF_MAX_SEGMENTS_PER_REQUEST);
358 357
359 /* Make sure buffer addresses are sector-aligned. */358 /* Make sure buffer addresses are sector-aligned. */
360 blk_queue_dma_alignment(rq, 511);359 blk_queue_dma_alignment(rq, 511);
drivers/cdrom/gdrom.c+1−1
@@ -741,7 +741,7 @@ static int __devinit probe_gdrom_setupqueue(void) · 740 unmodified lines
741{741{
742 blk_queue_logical_block_size(gd.gdrom_rq, GDROM_HARD_SECTOR);742 blk_queue_logical_block_size(gd.gdrom_rq, GDROM_HARD_SECTOR);
743 /* using DMA so memory will need to be contiguous */743 /* using DMA so memory will need to be contiguous */
744 blk_queue_max_hw_segments(gd.gdrom_rq, 1);744 blk_queue_max_segments(gd.gdrom_rq, 1);
745 /* set a large max size to get most from DMA */745 /* set a large max size to get most from DMA */
746 blk_queue_max_segment_size(gd.gdrom_rq, 0x40000);746 blk_queue_max_segment_size(gd.gdrom_rq, 0x40000);
747 gd.disk->queue = gd.gdrom_rq;747 gd.disk->queue = gd.gdrom_rq;
drivers/cdrom/viocd.c+1−2
@@ -616,8 +616,7 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id) · 615 unmodified lines
616 gendisk->first_minor = deviceno;616 gendisk->first_minor = deviceno;
617 strncpy(gendisk->disk_name, c->name,617 strncpy(gendisk->disk_name, c->name,
618 sizeof(gendisk->disk_name));618 sizeof(gendisk->disk_name));
619 blk_queue_max_hw_segments(q, 1);619 blk_queue_max_segments(q, 1);
620 blk_queue_max_phys_segments(q, 1);
621 blk_queue_max_hw_sectors(q, 4096 / 512);620 blk_queue_max_hw_sectors(q, 4096 / 512);
622 gendisk->queue = q;621 gendisk->queue = q;
623 gendisk->fops = &viocd_fops;622 gendisk->fops = &viocd_fops;
drivers/ide/ide-probe.c+1−2
@@ -790,8 +790,7 @@ static int ide_init_queue(ide_drive_t *drive) · 789 unmodified lines
790 max_sg_entries >>= 1;790 max_sg_entries >>= 1;
791#endif /* CONFIG_PCI */791#endif /* CONFIG_PCI */
792 792
793 blk_queue_max_hw_segments(q, max_sg_entries);793 blk_queue_max_segments(q, max_sg_entries);
794 blk_queue_max_phys_segments(q, max_sg_entries);
795 794
796 /* assign drive queue */795 /* assign drive queue */
797 drive->queue = q;796 drive->queue = q;
drivers/md/raid5.c+1−1
@@ -3739,7 +3739,7 @@ static int bio_fits_rdev(struct bio *bi) · 3738 unmodified lines
3739 if ((bi->bi_size>>9) > queue_max_sectors(q))3739 if ((bi->bi_size>>9) > queue_max_sectors(q))
3740 return 0;3740 return 0;
3741 blk_recount_segments(q, bi);3741 blk_recount_segments(q, bi);
3742 if (bi->bi_phys_segments > queue_max_phys_segments(q))3742 if (bi->bi_phys_segments > queue_max_segments(q))
3743 return 0;3743 return 0;
3744 3744
3745 if (q->merge_bvec_fn)3745 if (q->merge_bvec_fn)
drivers/memstick/core/mspro_block.c+1−2
@@ -1227,8 +1227,7 @@ static int mspro_block_init_disk(struct memstick_dev *card) · 1226 unmodified lines
1227 1227
1228 blk_queue_bounce_limit(msb->queue, limit);1228 blk_queue_bounce_limit(msb->queue, limit);
1229 blk_queue_max_hw_sectors(msb->queue, MSPRO_BLOCK_MAX_PAGES);1229 blk_queue_max_hw_sectors(msb->queue, MSPRO_BLOCK_MAX_PAGES);
1230 blk_queue_max_phys_segments(msb->queue, MSPRO_BLOCK_MAX_SEGS);1230 blk_queue_max_segments(msb->queue, MSPRO_BLOCK_MAX_SEGS);
1231 blk_queue_max_hw_segments(msb->queue, MSPRO_BLOCK_MAX_SEGS);
1232 blk_queue_max_segment_size(msb->queue,1231 blk_queue_max_segment_size(msb->queue,
1233 MSPRO_BLOCK_MAX_PAGES * msb->page_size);1232 MSPRO_BLOCK_MAX_PAGES * msb->page_size);
1234 1233
drivers/message/i2o/i2o_block.c+1−2
@@ -1065,9 +1065,8 @@ static int i2o_block_probe(struct device *dev) · 1064 unmodified lines
1065 queue = gd->queue;1065 queue = gd->queue;
1066 queue->queuedata = i2o_blk_dev;1066 queue->queuedata = i2o_blk_dev;
1067 1067
1068 blk_queue_max_phys_segments(queue, I2O_MAX_PHYS_SEGMENTS);
1069 blk_queue_max_hw_sectors(queue, max_sectors);1068 blk_queue_max_hw_sectors(queue, max_sectors);
1070 blk_queue_max_hw_segments(queue, i2o_sg_tablesize(c, body_size));1069 blk_queue_max_segments(queue, i2o_sg_tablesize(c, body_size));
1071 1070
1072 osm_debug("max sectors = %d\n", queue->max_sectors);1071 osm_debug("max sectors = %d\n", queue->max_sectors);
1073 osm_debug("phys segments = %d\n", queue->max_phys_segments);1072 osm_debug("phys segments = %d\n", queue->max_phys_segments);
drivers/mmc/card/queue.c+2−4
@@ -155,8 +155,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock · 154 unmodified lines
155 if (mq->bounce_buf) {155 if (mq->bounce_buf) {
156 blk_queue_bounce_limit(mq->queue, BLK_BOUNCE_ANY);156 blk_queue_bounce_limit(mq->queue, BLK_BOUNCE_ANY);
157 blk_queue_max_hw_sectors(mq->queue, bouncesz / 512);157 blk_queue_max_hw_sectors(mq->queue, bouncesz / 512);
158 blk_queue_max_phys_segments(mq->queue, bouncesz / 512);158 blk_queue_max_segments(mq->queue, bouncesz / 512);
159 blk_queue_max_hw_segments(mq->queue, bouncesz / 512);
160 blk_queue_max_segment_size(mq->queue, bouncesz);159 blk_queue_max_segment_size(mq->queue, bouncesz);
161 160
162 mq->sg = kmalloc(sizeof(struct scatterlist),161 mq->sg = kmalloc(sizeof(struct scatterlist),
@@ -182,8 +181,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock · 19 unmodified lines
182 blk_queue_bounce_limit(mq->queue, limit);181 blk_queue_bounce_limit(mq->queue, limit);
183 blk_queue_max_hw_sectors(mq->queue,182 blk_queue_max_hw_sectors(mq->queue,
184 min(host->max_blk_count, host->max_req_size / 512));183 min(host->max_blk_count, host->max_req_size / 512));
185 blk_queue_max_phys_segments(mq->queue, host->max_phys_segs);184 blk_queue_max_segments(mq->queue, host->max_hw_segs);
186 blk_queue_max_hw_segments(mq->queue, host->max_hw_segs);
187 blk_queue_max_segment_size(mq->queue, host->max_seg_size);185 blk_queue_max_segment_size(mq->queue, host->max_seg_size);
188 186
189 mq->sg = kmalloc(sizeof(struct scatterlist) *187 mq->sg = kmalloc(sizeof(struct scatterlist) *
drivers/s390/block/dasd.c+1−2
@@ -2130,8 +2130,7 @@ static void dasd_setup_queue(struct dasd_block *block) · 2129 unmodified lines
2130 blk_queue_logical_block_size(block->request_queue, block->bp_block);2130 blk_queue_logical_block_size(block->request_queue, block->bp_block);
2131 max = block->base->discipline->max_blocks << block->s2b_shift;2131 max = block->base->discipline->max_blocks << block->s2b_shift;
2132 blk_queue_max_hw_sectors(block->request_queue, max);2132 blk_queue_max_hw_sectors(block->request_queue, max);
2133 blk_queue_max_phys_segments(block->request_queue, -1L);2133 blk_queue_max_segments(block->request_queue, -1L);
2134 blk_queue_max_hw_segments(block->request_queue, -1L);
2135 /* with page sized segments we can translate each segement into2134 /* with page sized segments we can translate each segement into
2136 * one idaw/tidaw2135 * one idaw/tidaw
2137 */2136 */
drivers/s390/char/tape_block.c+1−2
@@ -223,8 +223,7 @@ tapeblock_setup_device(struct tape_device * device) · 222 unmodified lines
223 223
224 blk_queue_logical_block_size(blkdat->request_queue, TAPEBLOCK_HSEC_SIZE);224 blk_queue_logical_block_size(blkdat->request_queue, TAPEBLOCK_HSEC_SIZE);
225 blk_queue_max_hw_sectors(blkdat->request_queue, TAPEBLOCK_MAX_SEC);225 blk_queue_max_hw_sectors(blkdat->request_queue, TAPEBLOCK_MAX_SEC);
226 blk_queue_max_phys_segments(blkdat->request_queue, -1L);226 blk_queue_max_segments(blkdat->request_queue, -1L);
227 blk_queue_max_hw_segments(blkdat->request_queue, -1L);
228 blk_queue_max_segment_size(blkdat->request_queue, -1L);227 blk_queue_max_segment_size(blkdat->request_queue, -1L);
229 blk_queue_segment_boundary(blkdat->request_queue, -1L);228 blk_queue_segment_boundary(blkdat->request_queue, -1L);
230 229
drivers/scsi/ibmvscsi/ibmvfc.c+2−2
@@ -4195,7 +4195,7 @@ static void ibmvfc_tgt_add_rport(struct ibmvfc_target *tgt) · 4194 unmodified lines
4195 if (tgt->service_parms.class3_parms[0] & 0x80000000)4195 if (tgt->service_parms.class3_parms[0] & 0x80000000)
4196 rport->supported_classes |= FC_COS_CLASS3;4196 rport->supported_classes |= FC_COS_CLASS3;
4197 if (rport->rqst_q)4197 if (rport->rqst_q)
4198 blk_queue_max_hw_segments(rport->rqst_q, 1);4198 blk_queue_max_segments(rport->rqst_q, 1);
4199 } else4199 } else
4200 tgt_dbg(tgt, "rport add failed\n");4200 tgt_dbg(tgt, "rport add failed\n");
4201 spin_unlock_irqrestore(vhost->host->host_lock, flags);4201 spin_unlock_irqrestore(vhost->host->host_lock, flags);
@@ -4669,7 +4669,7 @@ static int ibmvfc_probe(struct vio_dev *vdev, const struct vio_device_id *id) · 467 unmodified lines
4669 }4669 }
4670 4670
4671 if (shost_to_fc_host(shost)->rqst_q)4671 if (shost_to_fc_host(shost)->rqst_q)
4672 blk_queue_max_hw_segments(shost_to_fc_host(shost)->rqst_q, 1);4672 blk_queue_max_segments(shost_to_fc_host(shost)->rqst_q, 1);
4673 dev_set_drvdata(dev, vhost);4673 dev_set_drvdata(dev, vhost);
4674 spin_lock(&ibmvfc_driver_lock);4674 spin_lock(&ibmvfc_driver_lock);
4675 list_add_tail(&vhost->queue, &ibmvfc_head);4675 list_add_tail(&vhost->queue, &ibmvfc_head);
drivers/scsi/scsi_lib.c+2−2
@@ -1624,8 +1624,8 @@ struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost, · 1623 unmodified lines
1624 /*1624 /*
1625 * this limit is imposed by hardware restrictions1625 * this limit is imposed by hardware restrictions
1626 */1626 */
1627 blk_queue_max_hw_segments(q, shost->sg_tablesize);1627 blk_queue_max_segments(q, min_t(unsigned short, shost->sg_tablesize,
1628 blk_queue_max_phys_segments(q, SCSI_MAX_SG_CHAIN_SEGMENTS);1628 SCSI_MAX_SG_CHAIN_SEGMENTS));
1629 1629
1630 blk_queue_max_hw_sectors(q, shost->max_sectors);1630 blk_queue_max_hw_sectors(q, shost->max_sectors);
1631 blk_queue_bounce_limit(q, scsi_calculate_bounce_limit(shost));1631 blk_queue_bounce_limit(q, scsi_calculate_bounce_limit(shost));
drivers/scsi/sg.c+2−4
@@ -287,8 +287,7 @@ sg_open(struct inode *inode, struct file *filp) · 286 unmodified lines
287 if (list_empty(&sdp->sfds)) { /* no existing opens on this device */287 if (list_empty(&sdp->sfds)) { /* no existing opens on this device */
288 sdp->sgdebug = 0;288 sdp->sgdebug = 0;
289 q = sdp->device->request_queue;289 q = sdp->device->request_queue;
290 sdp->sg_tablesize = min(queue_max_hw_segments(q),290 sdp->sg_tablesize = queue_max_segments(q);
291 queue_max_phys_segments(q));
292 }291 }
293 if ((sfp = sg_add_sfp(sdp, dev)))292 if ((sfp = sg_add_sfp(sdp, dev)))
294 filp->private_data = sfp;293 filp->private_data = sfp;
@@ -1376,8 +1375,7 @@ static Sg_device *sg_alloc(struct gendisk *disk, struct scsi_device *scsidp) · 1081 unmodified lines
1376 sdp->device = scsidp;1375 sdp->device = scsidp;
1377 INIT_LIST_HEAD(&sdp->sfds);1376 INIT_LIST_HEAD(&sdp->sfds);
1378 init_waitqueue_head(&sdp->o_excl_wait);1377 init_waitqueue_head(&sdp->o_excl_wait);
1379 sdp->sg_tablesize = min(queue_max_hw_segments(q),1378 sdp->sg_tablesize = queue_max_segments(q);
1380 queue_max_phys_segments(q));
1381 sdp->index = k;1379 sdp->index = k;
1382 kref_init(&sdp->d_ref);1380 kref_init(&sdp->d_ref);
1383 1381
drivers/scsi/st.c+1−2
@@ -3983,8 +3983,7 @@ static int st_probe(struct device *dev) · 3982 unmodified lines
3983 return -ENODEV;3983 return -ENODEV;
3984 }3984 }
3985 3985
3986 i = min(queue_max_hw_segments(SDp->request_queue),3986 i = queue_max_segments(SDp->request_queue);
3987 queue_max_phys_segments(SDp->request_queue));
3988 if (st_max_sg_segs < i)3987 if (st_max_sg_segs < i)
3989 i = st_max_sg_segs;3988 i = st_max_sg_segs;
3990 buffer = new_tape_buffer((SDp->host)->unchecked_isa_dma, i);3989 buffer = new_tape_buffer((SDp->host)->unchecked_isa_dma, i);
drivers/staging/hv/blkvsc_drv.c+1−4
@@ -363,10 +363,7 @@ static int blkvsc_probe(struct device *device) · 362 unmodified lines
363 blkdev->gd->queue = blk_init_queue(blkvsc_request, &blkdev->lock);363 blkdev->gd->queue = blk_init_queue(blkvsc_request, &blkdev->lock);
364 364
365 blk_queue_max_segment_size(blkdev->gd->queue, PAGE_SIZE);365 blk_queue_max_segment_size(blkdev->gd->queue, PAGE_SIZE);
366 blk_queue_max_phys_segments(blkdev->gd->queue,366 blk_queue_max_segments(blkdev->gd->queue, MAX_MULTIPAGE_BUFFER_COUNT);
367 MAX_MULTIPAGE_BUFFER_COUNT);
368 blk_queue_max_hw_segments(blkdev->gd->queue,
369 MAX_MULTIPAGE_BUFFER_COUNT);
370 blk_queue_segment_boundary(blkdev->gd->queue, PAGE_SIZE-1);367 blk_queue_segment_boundary(blkdev->gd->queue, PAGE_SIZE-1);
371 blk_queue_bounce_limit(blkdev->gd->queue, BLK_BOUNCE_ANY);368 blk_queue_bounce_limit(blkdev->gd->queue, BLK_BOUNCE_ANY);
372 blk_queue_dma_alignment(blkdev->gd->queue, 511);369 blk_queue_dma_alignment(blkdev->gd->queue, 511);
fs/bio.c+3−6
@@ -507,10 +507,8 @@ int bio_get_nr_vecs(struct block_device *bdev) · 506 unmodified lines
507 int nr_pages;507 int nr_pages;
508 508
509 nr_pages = ((queue_max_sectors(q) << 9) + PAGE_SIZE - 1) >> PAGE_SHIFT;509 nr_pages = ((queue_max_sectors(q) << 9) + PAGE_SIZE - 1) >> PAGE_SHIFT;
510 if (nr_pages > queue_max_phys_segments(q))510 if (nr_pages > queue_max_segments(q))
511 nr_pages = queue_max_phys_segments(q);511 nr_pages = queue_max_segments(q);
512 if (nr_pages > queue_max_hw_segments(q))
513 nr_pages = queue_max_hw_segments(q);
514 512
515 return nr_pages;513 return nr_pages;
516}514}
@@ -575,8 +573,7 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page · 58 unmodified lines
575 * make this too complex.573 * make this too complex.
576 */574 */
577 575
578 while (bio->bi_phys_segments >= queue_max_phys_segments(q)576 while (bio->bi_phys_segments >= queue_max_segments(q)) {
579 || bio->bi_phys_segments >= queue_max_hw_segments(q)) {
580 577
581 if (retried_segments)578 if (retried_segments)
582 return 0;579 return 0;
include/linux/blkdev.h+16−11
@@ -316,8 +316,7 @@ struct queue_limits { · 315 unmodified lines
316 unsigned int discard_alignment;316 unsigned int discard_alignment;
317 317
318 unsigned short logical_block_size;318 unsigned short logical_block_size;
319 unsigned short max_hw_segments;319 unsigned short max_segments;
320 unsigned short max_phys_segments;
321 320
322 unsigned char misaligned;321 unsigned char misaligned;
323 unsigned char discard_misaligned;322 unsigned char discard_misaligned;
@@ -929,8 +928,19 @@ static inline void blk_queue_max_sectors(struct request_queue *q, unsigned int m · 605 unmodified lines
929 blk_queue_max_hw_sectors(q, max);928 blk_queue_max_hw_sectors(q, max);
930}929}
931 930
932extern void blk_queue_max_phys_segments(struct request_queue *, unsigned short);931extern void blk_queue_max_segments(struct request_queue *, unsigned short);
933extern void blk_queue_max_hw_segments(struct request_queue *, unsigned short);932
933static inline void blk_queue_max_phys_segments(struct request_queue *q, unsigned short max)
934{
935 blk_queue_max_segments(q, max);
936}
937
938static inline void blk_queue_max_hw_segments(struct request_queue *q, unsigned short max)
939{
940 blk_queue_max_segments(q, max);
941}
942
943
934extern void blk_queue_max_segment_size(struct request_queue *, unsigned int);944extern void blk_queue_max_segment_size(struct request_queue *, unsigned int);
935extern void blk_queue_max_discard_sectors(struct request_queue *q,945extern void blk_queue_max_discard_sectors(struct request_queue *q,
936 unsigned int max_discard_sectors);946 unsigned int max_discard_sectors);
@@ -1055,14 +1065,9 @@ static inline unsigned int queue_max_hw_sectors(struct request_queue *q) · 118 unmodified lines
1055 return q->limits.max_hw_sectors;1065 return q->limits.max_hw_sectors;
1056}1066}
1057 1067
1058static inline unsigned short queue_max_hw_segments(struct request_queue *q)1068static inline unsigned short queue_max_segments(struct request_queue *q)
1059{
1060 return q->limits.max_hw_segments;
1061}
1062
1063static inline unsigned short queue_max_phys_segments(struct request_queue *q)
1064{1069{
1065 return q->limits.max_phys_segments;1070 return q->limits.max_segments;
1066}1071}
1067 1072
1068static inline unsigned int queue_max_segment_size(struct request_queue *q)1073static inline unsigned int queue_max_segment_size(struct request_queue *q)
include/linux/i2o.h+1−1
@@ -385,7 +385,7 @@ · 384 unmodified lines
385/* defines for max_sectors and max_phys_segments */385/* defines for max_sectors and max_phys_segments */
386#define I2O_MAX_SECTORS 1024386#define I2O_MAX_SECTORS 1024
387#define I2O_MAX_SECTORS_LIMITED 128387#define I2O_MAX_SECTORS_LIMITED 128
388#define I2O_MAX_PHYS_SEGMENTS MAX_PHYS_SEGMENTS388#define I2O_MAX_PHYS_SEGMENTS BLK_MAX_SEGMENTS
389 389
390/*390/*
391 * Message structures391 * Message structures

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