TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: virtio: Reduce BUG if total_sg > virtqueue size to WARN.

Browse Source 
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:
Richard W.M. Jones
2017-08-10 17:56:51 +01:00
committed by Martin K. Petersen
parent 42d7c10f23
commit 44ed8089e9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/virtio/virtio_ring.c
+3 -2
View File
@@ -296,7 +296,6 @@ static inline int virtqueue_add(struct virtqueue *_vq,
} }
#endif #endif
BUG_ON(total_sg > vq->vring.num);
BUG_ON(total_sg == 0); BUG_ON(total_sg == 0);
head = vq->free_head; head = vq->free_head;
@@ -305,8 +304,10 @@ static inline int virtqueue_add(struct virtqueue *_vq,
* buffers, then go indirect. FIXME: tune this threshold */ * buffers, then go indirect. FIXME: tune this threshold */
if (vq->indirect && total_sg > 1 && vq->vq.num_free) if (vq->indirect && total_sg > 1 && vq->vq.num_free)
desc = alloc_indirect(_vq, total_sg, gfp); desc = alloc_indirect(_vq, total_sg, gfp);
else else {
desc = NULL; desc = NULL;
WARN_ON_ONCE(total_sg > vq->vring.num && !vq->indirect);
}
if (desc) { if (desc) {
/* Use a single buffer which doesn't continue */ /* Use a single buffer which doesn't continue */