d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost: do not stall if guest is slow

Browse Source 
When guest is booting (or any othertime guest is busy) it is possible
for the small receive ring (256) to get full. If this happens the
vhost library should just return normally. It's current behavior
of logging just creates massive log spew/overflow which could even
act as a DoS attack against host.

Reported-by: Nathan Law <nlaw@brocade.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
This commit is contained in:
Stephen Hemminger 2015-12-07 16:50:21 -08:00 committed by Thomas Monjalon
parent 6ed346a462
commit 98b5ecbf76
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/librte_vhost/vhost_rxtx.c
View File

@ -510,17 +510,12 @@ virtio_dev_merge_rx(struct virtio_net *dev, uint16_t queue_id,
do {
avail_idx = *((volatile uint16_t *)&vq->avail->idx);
if (unlikely(res_cur_idx == avail_idx)) {
LOG_DEBUG(VHOST_DATA,
"(%"PRIu64") Failed "
"to get enough desc from "
"vring\n",
dev->device_fh);
if (unlikely(res_cur_idx == avail_idx))
goto merge_rx_exit;
} else {
update_secure_len(vq, res_cur_idx, &secure_len, &vec_idx);
res_cur_idx++;
}
update_secure_len(vq, res_cur_idx,
&secure_len, &vec_idx);
res_cur_idx++;
} while (pkt_len > secure_len);
/* vq->last_used_idx_res is atomically updated. */