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

cam_periph.c:

Browse Source 
Move handling of CAM_AUTOSENSE_FAIL into block dealing with
	all other scsi status errors.

cam_queue.c:
cam_queue.h:
	Fix 'off by one' heap bug in a more efficient manner.  Since
	heap algorithms like to deal with indexes started from 1,
	offset our heap array pointer at allocation time to make this
	so for a C environment.  This makes the implementation of the
	algorithm a bit more efficient.

cam_xpt.c:
	Use macros for accessing the head of the heap so that code
	is isolated from implementation details of the heap.
This commit is contained in:
gibbs 1999-04-19 21:26:08 +00:00
parent 9a72e19488
commit 666095b0dc
4 changed files with 67 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/cam/cam_periph.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: cam_periph.c,v 1.10 1999/01/21 08:29:02 dillon Exp $ * $Id: cam_periph.c,v 1.11 1999/04/06 03:05:36 peter Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -1047,6 +1047,7 @@ cam_periph_error(union ccb *ccb, cam_flags camflags,
ccb->ccb_h.retry_count--; ccb->ccb_h.retry_count--;
error = 0; error = 0;
break; break;
case CAM_AUTOSENSE_FAIL:
case CAM_SCSI_STATUS_ERROR: case CAM_SCSI_STATUS_ERROR:
switch (ccb->csio.scsi_status) { switch (ccb->csio.scsi_status) {
@ -1354,7 +1355,8 @@ cam_periph_error(union ccb *ccb, cam_flags camflags,
err_action); err_action);
} }
} else if (ccb->csio.scsi_status == } else if (ccb->csio.scsi_status ==
SCSI_STATUS_CHECK_COND) { SCSI_STATUS_CHECK_COND
&& status != CAM_AUTOSENSE_FAIL) {
/* no point in decrementing the retry count */ /* no point in decrementing the retry count */
panic("cam_periph_error: scsi status of " panic("cam_periph_error: scsi status of "
"CHECK COND returned but no sense " "CHECK COND returned but no sense "
@ -1459,7 +1461,6 @@ cam_periph_error(union ccb *ccb, cam_flags camflags,
} }
break; break;
case CAM_REQ_CMP_ERR: case CAM_REQ_CMP_ERR:
case CAM_AUTOSENSE_FAIL:
case CAM_CMD_TIMEOUT: case CAM_CMD_TIMEOUT:
case CAM_UNEXP_BUSFREE: case CAM_UNEXP_BUSFREE:
case CAM_UNCOR_PARITY: case CAM_UNCOR_PARITY:

57
sys/cam/cam_queue.c
View File

@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: cam_queue.c,v 1.1 1998/09/15 06:33:23 gibbs Exp $ * $Id: cam_queue.c,v 1.2 1999/04/07 22:57:48 gibbs Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -72,6 +72,11 @@ camq_init(struct camq *camq, int size)
printf("camq_init: - cannot malloc array!\n"); printf("camq_init: - cannot malloc array!\n");
return (1); return (1);
} }
/*
* Heap algorithms like everything numbered from 1, so
* offset our pointer into the heap array by one element.
*/
camq->queue_array--;
} }
return (0); return (0);
} }
@ -95,6 +100,11 @@ void
camq_fini(struct camq *queue) camq_fini(struct camq *queue)
{ {
if (queue->queue_array != NULL) { if (queue->queue_array != NULL) {
/*
* Heap algorithms like everything numbered from 1, so
* our pointer into the heap array is offset by one element.
*/
queue->queue_array++;
free(queue->queue_array, M_DEVBUF); free(queue->queue_array, M_DEVBUF);
} }
} }
@ -115,20 +125,26 @@ camq_resize(struct camq *queue, int new_size)
/* Couldn't satisfy request */ /* Couldn't satisfy request */
return (CAM_RESRC_UNAVAIL); return (CAM_RESRC_UNAVAIL);
} }
/*
* Heap algorithms like everything numbered from 1, so
* remember that our pointer into the heap array is offset
* by one element.
*/
if (queue->queue_array != NULL) { if (queue->queue_array != NULL) {
queue->queue_array++;
bcopy(queue->queue_array, new_array, bcopy(queue->queue_array, new_array,
queue->entries * sizeof(cam_pinfo *)); queue->entries * sizeof(cam_pinfo *));
free(queue->queue_array, M_DEVBUF); free(queue->queue_array, M_DEVBUF);
} }
queue->queue_array = new_array; queue->queue_array = new_array-1;
queue->array_size = new_size; queue->array_size = new_size;
return (CAM_REQ_CMP); return (CAM_REQ_CMP);
} }
/* /*
* camq_insert: Given an array of cam_pinfo* elememnts with * camq_insert: Given an array of cam_pinfo* elememnts with
* the Heap(0, num_elements) property and array_size - num_elements >= 1, * the Heap(1, num_elements) property and array_size - num_elements >= 1,
* output Heap(0, num_elements+1) including new_entry in the array. * output Heap(1, num_elements+1) including new_entry in the array.
*/ */
void void
camq_insert(struct camq *queue, cam_pinfo *new_entry) camq_insert(struct camq *queue, cam_pinfo *new_entry)
@ -137,17 +153,17 @@ camq_insert(struct camq *queue, cam_pinfo *new_entry)
if (queue->entries >= queue->array_size) if (queue->entries >= queue->array_size)
panic("camq_insert: Attempt to insert into a full queue"); panic("camq_insert: Attempt to insert into a full queue");
#endif #endif
queue->entries++;
queue->queue_array[queue->entries] = new_entry; queue->queue_array[queue->entries] = new_entry;
new_entry->index = queue->entries; new_entry->index = queue->entries;
if (queue->entries != 0) if (queue->entries != 0)
heap_up(queue->queue_array, queue->entries); heap_up(queue->queue_array, queue->entries);
queue->entries++;
} }
/* /*
* camq_remove: Given an array of cam_pinfo* elevements with the * camq_remove: Given an array of cam_pinfo* elevements with the
* Heap(0, num_elements) property and an index such that 0 <= index <= * Heap(1, num_elements) property and an index such that 1 <= index <=
* num_elements, remove that entry and restore the Heap(0, num_elements-1) * num_elements, remove that entry and restore the Heap(1, num_elements-1)
* property. * property.
*/ */
cam_pinfo * cam_pinfo *
@ -155,22 +171,22 @@ camq_remove(struct camq *queue, int index)
{ {
cam_pinfo *removed_entry; cam_pinfo *removed_entry;
if ((queue->entries - index) <= 0) if (index == 0 || index > queue->entries)
return (NULL); return (NULL);
removed_entry = queue->queue_array[index]; removed_entry = queue->queue_array[index];
queue->entries--;
if (queue->entries != index) { if (queue->entries != index) {
queue->queue_array[index] = queue->queue_array[queue->entries]; queue->queue_array[index] = queue->queue_array[queue->entries];
queue->queue_array[index]->index = index; queue->queue_array[index]->index = index;
heap_down(queue->queue_array, index, queue->entries); heap_down(queue->queue_array, index, queue->entries - 1);
} }
removed_entry->index = CAM_UNQUEUED_INDEX; removed_entry->index = CAM_UNQUEUED_INDEX;
queue->entries--;
return (removed_entry); return (removed_entry);
} }
/* /*
* camq_change_priority: Given an array of cam_pinfo* elements with the * camq_change_priority: Given an array of cam_pinfo* elements with the
* Heap(0, num_entries) property, an index such that 0 <= index <= num_elements, * Heap(1, num_entries) property, an index such that 1 <= index <= num_elements,
* and an new priority for the element at index, change the priority of * and an new priority for the element at index, change the priority of
* element index and restore the Heap(0, num_elements) property. * element index and restore the Heap(0, num_elements) property.
*/ */
@ -352,8 +368,8 @@ swap(cam_pinfo **queue_array, int i, int j)
/* /*
* heap_up: Given an array of cam_pinfo* elements with the * heap_up: Given an array of cam_pinfo* elements with the
* Heap(0, new_index-1) property and a new element in location * Heap(1, new_index-1) property and a new element in location
* new_index, output Heap(0, new_index). * new_index, output Heap(1, new_index).
*/ */
static void static void
heap_up(cam_pinfo **queue_array, int new_index) heap_up(cam_pinfo **queue_array, int new_index)
@ -363,9 +379,9 @@ heap_up(cam_pinfo **queue_array, int new_index)
child = new_index; child = new_index;
while (child != 0) { while (child != 1) {
parent = (child - 1) >> 1; parent = child >> 1;
if (queue_cmp(queue_array, parent, child) <= 0) if (queue_cmp(queue_array, parent, child) <= 0)
break; break;
swap(queue_array, parent, child); swap(queue_array, parent, child);
@ -375,8 +391,8 @@ heap_up(cam_pinfo **queue_array, int new_index)
/* /*
* heap_down: Given an array of cam_pinfo* elements with the * heap_down: Given an array of cam_pinfo* elements with the
* Heap(index + 1, num_entries - 1) property with index containing * Heap(index + 1, num_entries) property with index containing
* an unsorted entry, output Heap(0, num_entries - 1). * an unsorted entry, output Heap(index, num_entries).
*/ */
static void static void
heap_down(cam_pinfo **queue_array, int index, int num_entries) heap_down(cam_pinfo **queue_array, int index, int num_entries)
@ -385,10 +401,10 @@ heap_down(cam_pinfo **queue_array, int index, int num_entries)
int parent; int parent;
parent = index; parent = index;
child = (parent << 1) + 1; child = parent << 1;
for (; child < num_entries; child = (parent << 1) + 1) { for (; child <= num_entries; child = parent << 1) {
if (child + 1 < num_entries) { if (child < num_entries) {
/* child+1 is the right child of parent */ /* child+1 is the right child of parent */
if (queue_cmp(queue_array, child + 1, child) < 0) if (queue_cmp(queue_array, child + 1, child) < 0)
child++; child++;
@ -400,4 +416,3 @@ heap_down(cam_pinfo **queue_array, int index, int num_entries)
parent = child; parent = child;
} }
} }

6
sys/cam/cam_queue.h
View File

@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: cam_queue.h,v 1.2 1998/12/15 08:12:03 gibbs Exp $ * $Id: cam_queue.h,v 1.3 1999/04/07 22:57:48 gibbs Exp $
*/ */
#ifndef _CAM_CAM_QUEUE_H #ifndef _CAM_CAM_QUEUE_H
@ -136,6 +136,10 @@ void camq_insert(struct camq *queue, cam_pinfo *new_entry);
* queue order. * queue order.
*/ */
cam_pinfo *camq_remove(struct camq *queue, int index); cam_pinfo *camq_remove(struct camq *queue, int index);
#define CAMQ_HEAD 1 /* Head of queue index */
/* Index the first element in the heap */
#define CAMQ_GET_HEAD(camq) ((camq)->queue_array[CAMQ_HEAD])
/* /*
* camq_change_priority: Raise or lower the priority of an entry * camq_change_priority: Raise or lower the priority of an entry

45
sys/cam/cam_xpt.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: cam_xpt.c,v 1.50 1999/04/07 22:57:48 gibbs Exp $ * $Id: cam_xpt.c,v 1.51 1999/04/17 08:36:03 peter Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -755,9 +755,14 @@ xpt_schedule_dev_allocq(struct cam_eb *bus, struct cam_ed *dev)
+ dev->ccbq.dev_active); + dev->ccbq.dev_active);
dev->flags &= ~CAM_DEV_RESIZE_QUEUE_NEEDED; dev->flags &= ~CAM_DEV_RESIZE_QUEUE_NEEDED;
} }
/*
* The priority of a device waiting for CCB resources
* is that of the the highest priority peripheral driver
* enqueued.
*/
retval = xpt_schedule_dev(&bus->sim->devq->alloc_queue, retval = xpt_schedule_dev(&bus->sim->devq->alloc_queue,
&dev->alloc_ccb_entry.pinfo, &dev->alloc_ccb_entry.pinfo,
dev->drvq.queue_array[0]->priority); CAMQ_GET_HEAD(&dev->drvq)->priority);
} else { } else {
retval = 0; retval = 0;
} }
@ -771,9 +776,15 @@ xpt_schedule_dev_sendq(struct cam_eb *bus, struct cam_ed *dev)
int retval; int retval;
if (dev->ccbq.dev_openings > 0) { if (dev->ccbq.dev_openings > 0) {
retval = xpt_schedule_dev(&bus->sim->devq->send_queue, /*
&dev->send_ccb_entry.pinfo, * The priority of a device waiting for controller
dev->ccbq.queue.queue_array[0]->priority); * resources is that of the the highest priority CCB
* enqueued.
*/
retval =
xpt_schedule_dev(&bus->sim->devq->send_queue,
&dev->send_ccb_entry.pinfo,
CAMQ_GET_HEAD(&dev->ccbq.queue)->priority);
} else { } else {
retval = 0; retval = 0;
} }
@ -2334,7 +2345,7 @@ xptperiphlistmatch(struct ccb_dev_match *cdm)
if ((cdm->pos.position_type & CAM_DEV_POS_PDPTR) if ((cdm->pos.position_type & CAM_DEV_POS_PDPTR)
&& (cdm->pos.cookie.pdrv != NULL)) && (cdm->pos.cookie.pdrv != NULL))
ret = xptpdrvtraverse( ret = xptpdrvtraverse(
(struct periph_driver **)cdm->pos.cookie.pdrv, (struct periph_driver **)cdm->pos.cookie.pdrv,
xptplistpdrvfunc, cdm); xptplistpdrvfunc, cdm);
else else
ret = xptpdrvtraverse(NULL, xptplistpdrvfunc, cdm); ret = xptpdrvtraverse(NULL, xptplistpdrvfunc, cdm);
@ -3382,7 +3393,7 @@ xpt_run_dev_allocq(struct cam_eb *bus)
struct camq *drvq; struct camq *drvq;
qinfo = (struct cam_ed_qinfo *)camq_remove(&devq->alloc_queue, qinfo = (struct cam_ed_qinfo *)camq_remove(&devq->alloc_queue,
/*position*/0); CAMQ_HEAD);
device = qinfo->device; device = qinfo->device;
CAM_DEBUG_PRINT(CAM_DEBUG_XPT, CAM_DEBUG_PRINT(CAM_DEBUG_XPT,
@ -3399,14 +3410,7 @@ xpt_run_dev_allocq(struct cam_eb *bus)
if ((work_ccb = xpt_get_ccb(device)) != NULL) { if ((work_ccb = xpt_get_ccb(device)) != NULL) {
devq->alloc_openings--; devq->alloc_openings--;
devq->alloc_active++; devq->alloc_active++;
drv = (struct cam_periph*)camq_remove(drvq, drv = (struct cam_periph*)camq_remove(drvq, CAMQ_HEAD);
/*pos*/0);
/* Update priority */
if (drvq->entries > 0) {
qinfo->pinfo.priority = drvq->queue_array[0]->priority;
} else {
qinfo->pinfo.priority = CAM_PRIORITY_NONE;
}
splx(s); splx(s);
xpt_setup_ccb(&work_ccb->ccb_h, drv->path, xpt_setup_ccb(&work_ccb->ccb_h, drv->path,
drv->pinfo.priority); drv->pinfo.priority);
@ -3467,7 +3471,7 @@ xpt_run_dev_sendq(struct cam_eb *bus)
} }
qinfo = (struct cam_ed_qinfo *)camq_remove(&devq->send_queue, qinfo = (struct cam_ed_qinfo *)camq_remove(&devq->send_queue,
/*position*/0); CAMQ_HEAD);
device = qinfo->device; device = qinfo->device;
/* /*
@ -3482,7 +3486,7 @@ xpt_run_dev_sendq(struct cam_eb *bus)
CAM_DEBUG_PRINT(CAM_DEBUG_XPT, CAM_DEBUG_PRINT(CAM_DEBUG_XPT,
("running device %p\n", device)); ("running device %p\n", device));
work_ccb = cam_ccbq_peek_ccb(&device->ccbq, 0); work_ccb = cam_ccbq_peek_ccb(&device->ccbq, CAMQ_HEAD);
if (work_ccb == NULL) { if (work_ccb == NULL) {
printf("device on run queue with no ccbs???"); printf("device on run queue with no ccbs???");
splx(ospl); splx(ospl);
@ -3522,13 +3526,8 @@ xpt_run_dev_sendq(struct cam_eb *bus)
devq->send_openings--; devq->send_openings--;
devq->send_active++; devq->send_active++;
if (device->ccbq.queue.entries > 0) { if (device->ccbq.queue.entries > 0)
qinfo->pinfo.priority =
device->ccbq.queue.queue_array[0]->priority;
xpt_schedule_dev_sendq(bus, device); xpt_schedule_dev_sendq(bus, device);
} else {
qinfo->pinfo.priority = CAM_PRIORITY_NONE;
}
if (work_ccb && (work_ccb->ccb_h.flags & CAM_DEV_QFREEZE) != 0){ if (work_ccb && (work_ccb->ccb_h.flags & CAM_DEV_QFREEZE) != 0){
/* /*