scsi: virtio: Reduce BUG if total_sg > virtqueue size to WARN.
If using indirect descriptors, you can make the total_sg as large as you want. If not, BUG is too serious because the function later returns -ENOSPC. Signed-off-by: Richard W.M. Jones <rjones@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Родитель
42d7c10f23
Коммит
44ed8089e9
|
@ -296,7 +296,6 @@ static inline int virtqueue_add(struct virtqueue *_vq,
|
|||
}
|
||||
#endif
|
||||
|
||||
BUG_ON(total_sg > vq->vring.num);
|
||||
BUG_ON(total_sg == 0);
|
||||
|
||||
head = vq->free_head;
|
||||
|
@ -305,8 +304,10 @@ static inline int virtqueue_add(struct virtqueue *_vq,
|
|||
* buffers, then go indirect. FIXME: tune this threshold */
|
||||
if (vq->indirect && total_sg > 1 && vq->vq.num_free)
|
||||
desc = alloc_indirect(_vq, total_sg, gfp);
|
||||
else
|
||||
else {
|
||||
desc = NULL;
|
||||
WARN_ON_ONCE(total_sg > vq->vring.num && !vq->indirect);
|
||||
}
|
||||
|
||||
if (desc) {
|
||||
/* Use a single buffer which doesn't continue */
|
||||
|
|
Загрузка…
Ссылка в новой задаче