dpdk/dpdk-16.07_patches/0005-drivers-reset-packet_type-before-using-buffer.patch

   1 From 729a464f9a58fc77bf4e8f527a7848c6153e4b75 Mon Sep 17 00:00:00 2001
   2 From: Ray Kinsella <ray.kinsella@intel.com>
   3 Date: Mon, 8 Aug 2016 19:41:59 +0100
   4 Subject: [PATCH] drivers: reset packet_type before using buffer
   5
   6 Ensure the packet_type is reset before the buffer is used. This can cause packets to be mishandled in systems with more than one type of driver in use.
   7
   8 Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
   9 Signed-off-by: Todd Foggoa (tfoggoa) <tfoggoa@cisco.com>
  10 ---
  11  drivers/net/e1000/em_rxtx.c        | 2 ++
  12  drivers/net/virtio/virtio_rxtx.c   | 2 ++
  13  drivers/net/vmxnet3/vmxnet3_rxtx.c | 1 +
  14  3 files changed, 5 insertions(+)
  15
  16 diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
  17 index 6d8750a..693dd9d 100644
  18 --- a/drivers/net/e1000/em_rxtx.c
  19 +++ b/drivers/net/e1000/em_rxtx.c
  20 @@ -784,6 +784,7 @@ eth_em_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
  21                 rxm->ol_flags = rx_desc_status_to_pkt_flags(status);
  22                 rxm->ol_flags = rxm->ol_flags |
  23                                 rx_desc_error_to_pkt_flags(rxd.errors);
  24 +               rxm->packet_type = RTE_PTYPE_UNKNOWN;
  25
  26                 /* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */
  27                 rxm->vlan_tci = rte_le_to_cpu_16(rxd.special);
  28 @@ -1010,6 +1011,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
  29                 first_seg->ol_flags = rx_desc_status_to_pkt_flags(status);
  30                 first_seg->ol_flags = first_seg->ol_flags |
  31                                         rx_desc_error_to_pkt_flags(rxd.errors);
  32 +               first_seg->packet_type = RTE_PTYPE_UNKNOWN;
  33
  34                 /* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */
  35                 rxm->vlan_tci = rte_le_to_cpu_16(rxd.special);
  36 diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
  37 index 724517e..f1a572d 100644
  38 --- a/drivers/net/virtio/virtio_rxtx.c
  39 +++ b/drivers/net/virtio/virtio_rxtx.c
  40 @@ -677,6 +677,7 @@ virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
  41                 rxm->data_off = RTE_PKTMBUF_HEADROOM;
  42                 rxm->ol_flags = 0;
  43                 rxm->vlan_tci = 0;
  44 +               rxm->packet_type = RTE_PTYPE_UNKNOWN;
  45
  46                 rxm->nb_segs = 1;
  47                 rxm->next = NULL;
  48 @@ -800,6 +801,7 @@ virtio_recv_mergeable_pkts(void *rx_queue,
  49                 rxm->vlan_tci = 0;
  50                 rxm->pkt_len = (uint32_t)(len[0] - hdr_size);
  51                 rxm->data_len = (uint16_t)(len[0] - hdr_size);
  52 +               rxm->packet_type = RTE_PTYPE_UNKNOWN;
  53
  54                 rxm->port = rxvq->port_id;
  55                 rx_pkts[nb_rx] = rxm;
  56 diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
  57 index 9deeb3f..ac11d82 100644
  58 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
  59 +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
  60 @@ -686,6 +686,7 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
  61                 rxm->data_off = RTE_PKTMBUF_HEADROOM;
  62                 rxm->ol_flags = 0;
  63                 rxm->vlan_tci = 0;
  64 +               rxm->packet_type = RTE_PTYPE_UNKNOWN;
  65
  66                 /*
  67                  * If this is the first buffer of the received packet,
  68 --
  69 1.9.1
  70