_(DEV_TX_OFFLOAD_QINQ_INSERT, "qinq-insert")
#define foreach_dpdk_pkt_rx_offload_flag \
- _ (PKT_RX_VLAN_PKT, "RX packet is a 802.1q VLAN packet") \
+ _ (PKT_RX_VLAN, "RX packet is a 802.1q VLAN packet") \
_ (PKT_RX_RSS_HASH, "RX packet with RSS hash result") \
_ (PKT_RX_FDIR, "RX packet with FDIR infos") \
_ (PKT_RX_L4_CKSUM_BAD, "L4 cksum of RX pkt. is not OK") \
_ (PKT_RX_IP_CKSUM_BAD, "IP cksum of RX pkt. is not OK") \
+ _ (PKT_RX_EIP_CKSUM_BAD, "External IP header checksum error") \
_ (PKT_RX_VLAN_STRIPPED, "RX packet VLAN tag stripped") \
_ (PKT_RX_IP_CKSUM_GOOD, "IP cksum of RX pkt. is valid") \
_ (PKT_RX_L4_CKSUM_GOOD, "L4 cksum of RX pkt. is valid") \
_ (PKT_RX_IEEE1588_PTP, "RX IEEE1588 L2 Ethernet PT Packet") \
_ (PKT_RX_IEEE1588_TMST, "RX IEEE1588 L2/L4 timestamped packet") \
- _ (PKT_RX_QINQ_STRIPPED, "RX packet QinQ tags stripped")
+ _ (PKT_RX_QINQ_STRIPPED, "RX packet QinQ tags stripped") \
+ _ (PKT_RX_TIMESTAMP, "Timestamp field is valid")
#define foreach_dpdk_pkt_type \
_ (L2, ETHER, "Ethernet packet") \
device_name = "GigabitEthernet";
break;
+ case VNET_DPDK_PORT_TYPE_ETH_2_5G:
+ device_name = "Two_FiveGigabitEthernet";
+ break;
+
+ case VNET_DPDK_PORT_TYPE_ETH_5G:
+ device_name = "FiveGigabitEthernet";
+ break;
+
case VNET_DPDK_PORT_TYPE_ETH_10G:
device_name = "TenGigabitEthernet";
break;
+ case VNET_DPDK_PORT_TYPE_ETH_20G:
+ device_name = "TwentyGigabitEthernet";
+ break;
+
case VNET_DPDK_PORT_TYPE_ETH_25G:
device_name = "TwentyFiveGigabitEthernet";
break;
device_name = "FiftyGigabitEthernet";
break;
+ case VNET_DPDK_PORT_TYPE_ETH_56G:
+ device_name = "FiftySixGigabitEthernet";
+ break;
+
case VNET_DPDK_PORT_TYPE_ETH_100G:
device_name = "HundredGigabitEthernet";
break;
case VNET_DPDK_PORT_TYPE_ETH_BOND:
- return format (s, "BondEthernet%d", dm->devices[i].port_id);
+ return format (s, "BondEthernet%d", dm->devices[i].bond_instance_num);
case VNET_DPDK_PORT_TYPE_ETH_SWITCH:
device_name = "EthernetSwitch";
case VNET_DPDK_PORT_TYPE_AF_PACKET:
rte_eth_dev_info_get (i, &dev_info);
- return format (s, "af_packet%d", dm->devices[i].port_id);
+ return format (s, "af_packet%d", dm->devices[i].af_packet_instance_num);
case VNET_DPDK_PORT_TYPE_VIRTIO_USER:
device_name = "VirtioUser";
device_name = "VhostEthernet";
break;
+ case VNET_DPDK_PORT_TYPE_FAILSAFE:
+ device_name = "FailsafeEthernet";
+ break;
+
default:
case VNET_DPDK_PORT_TYPE_UNKNOWN:
device_name = "UnknownEthernet";
rte_eth_dev_info_get (i, &dev_info);
- if (dev_info.pci_dev)
+ if (dev_info.pci_dev &&
+ dm->devices[i].port_type != VNET_DPDK_PORT_TYPE_FAILSAFE)
ret = format (s, devname_format, device_name, dev_info.pci_dev->addr.bus,
dev_info.pci_dev->addr.devid,
dev_info.pci_dev->addr.function);
return ret;
}
+u8 *
+format_dpdk_device_flags (u8 * s, va_list * args)
+{
+ dpdk_device_t *xd = va_arg (*args, dpdk_device_t *);
+ u8 *t = 0;
+
+#define _(a, b, c) if (xd->flags & (1 << a)) \
+t = format (t, "%s%s", t ? " ":"", c);
+ foreach_dpdk_device_flags
+#undef _
+ s = format (s, "%v", t);
+ vec_free (t);
+ return s;
+}
+
static u8 *
format_dpdk_device_type (u8 * s, va_list * args)
{
dev_type = "VhostEthernet";
break;
+ case VNET_DPDK_PMD_ENA:
+ dev_type = "AWS ENA VF";
+ break;
+
+ case VNET_DPDK_PMD_FAILSAFE:
+ dev_type = "Failsafe Ethernet";
+ break;
+
+ case VNET_DPDK_PMD_LIOVF_ETHER:
+ dev_type = "Cavium Lio VF";
+ break;
+
default:
case VNET_DPDK_PMD_UNKNOWN:
dev_type = "### UNKNOWN ###";
s = format (s, "%U\n%Ucarrier %U",
format_dpdk_device_type, xd->device_index,
format_white_space, indent + 2, format_dpdk_link_status, xd);
+ s = format (s, "%Uflags: %U\n",
+ format_white_space, indent + 2, format_dpdk_device_flags, xd);
rte_eth_dev_info_get (xd->device_index, &di);
}
u8 *
-format_dpdk_tx_dma_trace (u8 * s, va_list * va)
+format_dpdk_tx_trace (u8 * s, va_list * va)
{
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
CLIB_UNUSED (vnet_main_t * vnm) = vnet_get_main ();
- dpdk_tx_dma_trace_t *t = va_arg (*va, dpdk_tx_dma_trace_t *);
+ dpdk_tx_trace_t *t = va_arg (*va, dpdk_tx_trace_t *);
dpdk_main_t *dm = &dpdk_main;
dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
u32 indent = format_get_indent (s);
- vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
+ vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->sw_if_index);
s = format (s, "%U tx queue %d",
format_vnet_sw_interface_name, vnm, sw, t->queue_index);
s = format (s, "\n%Ubuffer 0x%x: %U",
format_white_space, indent,
- t->buffer_index, format_vlib_buffer, &t->buffer);
+ t->buffer_index, format_vnet_buffer, &t->buffer);
+
+ s = format (s, "\n%U%U",
+ format_white_space, indent,
+ format_dpdk_rte_mbuf, &t->mb, &t->data);
s = format (s, "\n%U%U", format_white_space, indent,
format_ethernet_header_with_length, t->buffer.pre_data,
}
u8 *
-format_dpdk_rx_dma_trace (u8 * s, va_list * va)
+format_dpdk_rx_trace (u8 * s, va_list * va)
{
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *);
CLIB_UNUSED (vnet_main_t * vnm) = vnet_get_main ();
- dpdk_rx_dma_trace_t *t = va_arg (*va, dpdk_rx_dma_trace_t *);
+ dpdk_rx_trace_t *t = va_arg (*va, dpdk_rx_trace_t *);
dpdk_main_t *dm = &dpdk_main;
dpdk_device_t *xd = vec_elt_at_index (dm->devices, t->device_index);
format_function_t *f;
u32 indent = format_get_indent (s);
- vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->vlib_sw_if_index);
+ vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->sw_if_index);
s = format (s, "%U rx queue %d",
format_vnet_sw_interface_name, vnm, sw, t->queue_index);
s = format (s, "\n%Ubuffer 0x%x: %U",
format_white_space, indent,
- t->buffer_index, format_vlib_buffer, &t->buffer);
+ t->buffer_index, format_vnet_buffer, &t->buffer);
s = format (s, "\n%U%U",
format_white_space, indent,
u32 indent = format_get_indent (s) + 2;
s = format (s, "PKT MBUF: port %d, nb_segs %d, pkt_len %d"
- "\n%Ubuf_len %d, data_len %d, ol_flags 0x%x, data_off %d, phys_addr 0x%x"
- "\n%Upacket_type 0x%x",
+ "\n%Ubuf_len %d, data_len %d, ol_flags 0x%lx, data_off %d, phys_addr 0x%x"
+ "\n%Upacket_type 0x%x l2_len %u l3_len %u outer_l2_len %u outer_l3_len %u"
+ "\n%Urss 0x%x fdir.hi 0x%x fdir.lo 0x%x",
mb->port, mb->nb_segs, mb->pkt_len,
format_white_space, indent,
mb->buf_len, mb->data_len, mb->ol_flags, mb->data_off,
- mb->buf_physaddr, format_white_space, indent, mb->packet_type);
+ mb->buf_physaddr, format_white_space, indent, mb->packet_type,
+ mb->l2_len, mb->l3_len, mb->outer_l2_len, mb->outer_l3_len,
+ format_white_space, indent, mb->hash.rss, mb->hash.fdir.hi,
+ mb->hash.fdir.lo);
if (mb->ol_flags)
s = format (s, "\n%U%U", format_white_space, indent,
format_dpdk_pkt_offload_flags, &mb->ol_flags);
- if ((mb->ol_flags & PKT_RX_VLAN_PKT) &&
+ if ((mb->ol_flags & PKT_RX_VLAN) &&
((mb->ol_flags & (PKT_RX_VLAN_STRIPPED | PKT_RX_QINQ_STRIPPED)) == 0))
{
ethernet_vlan_header_tv_t *vlan_hdr =
Code Review / vpp.git / blobdiff