Skip to contentSkip to conversation

mpt2sas: Correct resizing calculation for max_queue_depth

PATCH In review Kashyap, Desai 1 participant 1 message Jan 4, 2011 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 3/10 mpt2sas: Correct resizing calculation for max_queue_depth

The ioc->hba_queue_depth is not properly resized when the controller firmware reports that it supports more outstanding IO than what can be fit inside the reply descriptor pool depth. This is reproduced by setting the controller global credits larger than 30,000. The bug results in an incorrect sizing of the queues. The fix is to resize the queue_size by dividing queue_diff by two.

---

drivers/scsi/mpt2sas/mpt2sas_base.c +3 -3
index b2a8170..723573b 100644
@@ -2176,9 +2176,9 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)
 		/* adjust hba_queue_depth, reply_free_queue_depth,
 		 * and queue_size
 		 */
-		ioc->hba_queue_depth -= queue_diff;
-		ioc->reply_free_queue_depth -= queue_diff;
-		queue_size -= queue_diff;
+		ioc->hba_queue_depth -= (queue_diff / 2);
+		ioc->reply_free_queue_depth -= (queue_diff / 2);
+		queue_size = facts->MaxReplyDescriptorPostQueueDepth;
 	}
 	ioc->reply_post_queue_depth = queue_size;