Skip to content

Commit

Permalink
Increase device CCB queue array size by CAM_RL_VALUES - 1 (4) elements.
Browse files Browse the repository at this point in the history
It is required to store extra recovery requests in case of bus resets.
On ATA/SATA this fixes assertion panics on HEAD with INVARIANTS enabled or
possible memory corruptions otherwise if timeout/reset happens when device
CCB queue is already full.

Reported by:	gibbs@
MFC after:	1 week
  • Loading branch information
amotin committed Oct 11, 2012
1 parent 61816f8 commit e867826
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions sys/cam/cam_queue.c
Expand Up @@ -314,7 +314,8 @@ cam_ccbq_resize(struct cam_ccbq *ccbq, int new_size)
* same size once the outstanding entries have been processed.
*/
if (space_left < 0
|| camq_resize(&ccbq->queue, new_size) == CAM_REQ_CMP) {
|| camq_resize(&ccbq->queue, new_size + (CAM_RL_VALUES - 1)) ==
CAM_REQ_CMP) {
ccbq->devq_openings += delta;
ccbq->dev_openings += delta;
return (CAM_REQ_CMP);
Expand All @@ -327,7 +328,7 @@ int
cam_ccbq_init(struct cam_ccbq *ccbq, int openings)
{
bzero(ccbq, sizeof(*ccbq));
if (camq_init(&ccbq->queue, openings) != 0) {
if (camq_init(&ccbq->queue, openings + (CAM_RL_VALUES - 1)) != 0) {
return (1);
}
ccbq->devq_openings = openings;
Expand Down

0 comments on commit e867826

Please sign in to comment.