devices: vhost: fix data offset on input

[vpp.git] / src / vnet / devices / virtio / vhost_user_input.c

diff --git a/src/vnet/devices/virtio/vhost_user_input.c b/src/vnet/devices/virtio/vhost_user_input.c
index 22f79e6..1c3e180 100644 (file)
--- a/src/vnet/devices/virtio/vhost_user_input.c
+++ b/src/vnet/devices/virtio/vhost_user_input.c
@@ -426,7 +426,7 @@ vhost_user_if_input (vlib_main_t * vm,
 
   /*
    * For small packets (<2kB), we will not need more than one vlib buffer
-   * per packet. In case packets are bigger, we will just yeld at some point
+   * per packet. In case packets are bigger, we will just yield at some point
    * in the loop and come back later. This is not an issue as for big packet,
    * processing cost really comes from the memory copy.
    * The assumption is that big packets will fit in 40 buffers.
@@ -559,17 +559,7 @@ vhost_user_if_input (vlib_main_t * vm,
            }
        }
 
-      if (PREDICT_TRUE (vui->is_any_layout) ||
-         (!(desc_table[desc_current].flags & VIRTQ_DESC_F_NEXT)))
-       {
-         /* ANYLAYOUT or single buffer */
-         desc_data_offset = vui->virtio_net_hdr_sz;
-       }
-      else
-       {
-         /* CSR case without ANYLAYOUT, skip 1st buffer */
-         desc_data_offset = desc_table[desc_current].len;
-       }
+      desc_data_offset = vui->virtio_net_hdr_sz;
 
       if (enable_csum)
        {
@@ -585,10 +575,24 @@ vhost_user_if_input (vlib_main_t * vm,
              data_offset = 0;
            }
          hdr = map_guest_mem (vui, desc_table[current].addr, &map_hint);
+         if (PREDICT_FALSE (hdr == 0))
+           {
+             vlib_error_count (vm, node->node_index,
+                               VHOST_USER_INPUT_FUNC_ERROR_MMAP_FAIL, 1);
+             goto out;
+           }
          b_data = (u8 *) hdr + data_offset;
          if (indirect)
-           hdr = map_guest_mem (vui, desc_table[desc_current].addr,
-                                &map_hint);
+           {
+             hdr = map_guest_mem (vui, desc_table[desc_current].addr,
+                                  &map_hint);
+             if (PREDICT_FALSE (hdr == 0))
+               {
+                 vlib_error_count (vm, node->node_index,
+                                   VHOST_USER_INPUT_FUNC_ERROR_MMAP_FAIL, 1);
+                 goto out;
+               }
+           }
          vhost_user_handle_rx_offload (b_head, b_data, &hdr->hdr);
        }
 
@@ -640,6 +644,7 @@ vhost_user_if_input (vlib_main_t * vm,
            }
 
          /* Prepare a copy order executed later for the data */
+         ASSERT (copy_len < VHOST_USER_COPY_ARRAY_N);
          vhost_copy_t *cpy = &cpu->copy[copy_len];
          copy_len++;
          u32 desc_data_l = desc_table[desc_current].len - desc_data_offset;
@@ -780,6 +785,7 @@ VLIB_REGISTER_NODE (vhost_user_input_node) = {
   .type = VLIB_NODE_TYPE_INPUT,
   .name = "vhost-user-input",
   .sibling_of = "device-input",
+  .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
 
   /* Will be enabled if/when hardware is detected. */
   .state = VLIB_NODE_STATE_DISABLED,