d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase device CCB queue array size by CAM_RL_VALUES - 1 (4) elements.

Browse Source 
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
This commit is contained in:
mav 2012-10-11 15:21:07 +00:00
parent 61816f86e1
commit e867826c02
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/cam/cam_queue.c
View File

@ -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);
@ -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;