ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio: vhost gso checksum error when both indirect and mrg_rxbuf are off

Browse Source 
Turn on gso, turn off both indirect and mrg_rxbuf caused traffic received
and sent with checksum error. The problem is we are not mapping the hdr
correctly in the shared memory address.

Type: fix

Signed-off-by: Steven Luong <sluong@cisco.com>
Change-Id: I7ef3bc2755544167b0e624365988111b17399e89
This commit is contained in:
Steven Luong
2020-03-17 09:01:30 -07:00
committed by Damjan Marion
parent 547a616546
commit b232d192f2
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/vnet/devices/virtio/vhost_user_input.c
View File

@@ -544,13 +544,11 @@ vhost_user_if_input (vlib_main_t * vm,
/* This depends on the setup but is very consistent /* This depends on the setup but is very consistent
* So I think the CPU branch predictor will make a pretty good job * So I think the CPU branch predictor will make a pretty good job
* at optimizing the decision. */ * at optimizing the decision. */
u8 indirect = 0;
if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT) if (txvq->desc[desc_current].flags & VIRTQ_DESC_F_INDIRECT)
{ {
desc_table = map_guest_mem (vui, txvq->desc[desc_current].addr, desc_table = map_guest_mem (vui, txvq->desc[desc_current].addr,
&map_hint); &map_hint);
desc_current = 0; desc_current = 0;
indirect = 1;
if (PREDICT_FALSE (desc_table == 0)) if (PREDICT_FALSE (desc_table == 0))
{ {
vlib_error_count (vm, node->node_index, vlib_error_count (vm, node->node_index,
@@ -565,35 +563,36 @@ vhost_user_if_input (vlib_main_t * vm,
{ {
virtio_net_hdr_mrg_rxbuf_t *hdr; virtio_net_hdr_mrg_rxbuf_t *hdr;
u8 *b_data; u8 *b_data;
u16 current = desc_current; u16 current;
u32 data_offset = desc_data_offset;
if ((data_offset == desc_table[current].len) && hdr = map_guest_mem (vui, desc_table[desc_current].addr, &map_hint);
(desc_table[current].flags & VIRTQ_DESC_F_NEXT))
{
current = desc_table[current].next;
data_offset = 0;
}
hdr = map_guest_mem (vui, desc_table[current].addr, &map_hint);
if (PREDICT_FALSE (hdr == 0)) if (PREDICT_FALSE (hdr == 0))
{ {
vlib_error_count (vm, node->node_index, vlib_error_count (vm, node->node_index,
VHOST_USER_INPUT_FUNC_ERROR_MMAP_FAIL, 1); VHOST_USER_INPUT_FUNC_ERROR_MMAP_FAIL, 1);
goto out; goto out;
} }
b_data = (u8 *) hdr + data_offset; if (hdr->hdr.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM)
if (indirect)
{ {
hdr = map_guest_mem (vui, desc_table[desc_current].addr, if ((desc_data_offset == desc_table[desc_current].len) &&
&map_hint); (desc_table[desc_current].flags & VIRTQ_DESC_F_NEXT))
if (PREDICT_FALSE (hdr == 0))
{ {
vlib_error_count (vm, node->node_index, current = desc_table[desc_current].next;
VHOST_USER_INPUT_FUNC_ERROR_MMAP_FAIL, 1); b_data = map_guest_mem (vui, desc_table[current].addr,
goto out; &map_hint);
if (PREDICT_FALSE (b_data == 0))
{
vlib_error_count (vm, node->node_index,
VHOST_USER_INPUT_FUNC_ERROR_MMAP_FAIL,
1);
goto out;
}
} }
else
b_data = (u8 *) hdr + desc_data_offset;
vhost_user_handle_rx_offload (b_head, b_data, &hdr->hdr);
} }
vhost_user_handle_rx_offload (b_head, b_data, &hdr->hdr);
} }
while (1) while (1)