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

fm10k: fix VLAN in Rx mbuf

Browse Source 
vlan_tci should be copied from RX descriptor to mbuf,
and flag PKT_RX_VLAN_PKT should be set for every RX packet,
this patch fixes this issue.
Packets in fm10k device always carry at least one VLAN tag.
For those packets coming in without VLAN tag,
the port default VLAN tag will be used.
So in fm10k, always PKT_RX_VLAN_PKT flag is set and vlan_tci
is valid for each RX packet's mbuf.

Signed-off-by: Shaopeng He <shaopeng.he@intel.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Shaopeng He 2015-11-20 22:09:47 +08:00 committed by Thomas Monjalon
parent 4522eca135
commit 6b59a3bc82
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/fm10k/fm10k_rxtx.c
View File

@ -104,9 +104,6 @@ rx_desc_to_ol_flags(struct rte_mbuf *m, const union fm10k_rx_desc *d)
(FM10K_RXD_STATUS_L4CS | FM10K_RXD_STATUS_L4E))) (FM10K_RXD_STATUS_L4CS | FM10K_RXD_STATUS_L4E)))
m->ol_flags |= PKT_RX_L4_CKSUM_BAD; m->ol_flags |= PKT_RX_L4_CKSUM_BAD;
if (d->d.staterr & FM10K_RXD_STATUS_VEXT)
m->ol_flags |= PKT_RX_VLAN_PKT;
if (unlikely(d->d.staterr & FM10K_RXD_STATUS_HBO)) if (unlikely(d->d.staterr & FM10K_RXD_STATUS_HBO))
m->ol_flags |= PKT_RX_HBUF_OVERFLOW; m->ol_flags |= PKT_RX_HBUF_OVERFLOW;
@ -146,6 +143,15 @@ fm10k_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
#endif #endif
mbuf->hash.rss = desc.d.rss; mbuf->hash.rss = desc.d.rss;
/**
* Packets in fm10k device always carry at least one VLAN tag.
* For those packets coming in without VLAN tag,
* the port default VLAN tag will be used.
* So, always PKT_RX_VLAN_PKT flag is set and vlan_tci
* is valid for each RX packet's mbuf.
*/
mbuf->ol_flags |= PKT_RX_VLAN_PKT;
mbuf->vlan_tci = desc.w.vlan;
rx_pkts[count] = mbuf; rx_pkts[count] = mbuf;
if (++next_dd == q->nb_desc) { if (++next_dd == q->nb_desc) {
@ -292,6 +298,15 @@ fm10k_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
rx_desc_to_ol_flags(first_seg, &desc); rx_desc_to_ol_flags(first_seg, &desc);
#endif #endif
first_seg->hash.rss = desc.d.rss; first_seg->hash.rss = desc.d.rss;
/**
* Packets in fm10k device always carry at least one VLAN tag.
* For those packets coming in without VLAN tag,
* the port default VLAN tag will be used.
* So, always PKT_RX_VLAN_PKT flag is set and vlan_tci
* is valid for each RX packet's mbuf.
*/
mbuf->ol_flags |= PKT_RX_VLAN_PKT;
first_seg->vlan_tci = desc.w.vlan;
/* Prefetch data of first segment, if configured to do so. */ /* Prefetch data of first segment, if configured to do so. */
rte_packet_prefetch((char *)first_seg->buf_addr + rte_packet_prefetch((char *)first_seg->buf_addr +