dpdk: enable int mode for virtio

[vpp.git] / src / plugins / dpdk / device / dpdk_priv.h

diff --git a/src/plugins/dpdk/device/dpdk_priv.h b/src/plugins/dpdk/device/dpdk_priv.h
index 46b8751..4e4438a 100644 (file)
--- a/src/plugins/dpdk/device/dpdk_priv.h
+++ b/src/plugins/dpdk/device/dpdk_priv.h
@@ -15,15 +15,7 @@
 
 #define DPDK_NB_RX_DESC_DEFAULT   1024
 #define DPDK_NB_TX_DESC_DEFAULT   1024
-#define DPDK_NB_RX_DESC_VIRTIO    256
-#define DPDK_NB_TX_DESC_VIRTIO    256
-
-#define I40E_DEV_ID_SFP_XL710           0x1572
-#define I40E_DEV_ID_QSFP_A              0x1583
-#define I40E_DEV_ID_QSFP_B              0x1584
-#define I40E_DEV_ID_QSFP_C              0x1585
-#define I40E_DEV_ID_10G_BASE_T          0x1586
-#define I40E_DEV_ID_VF                  0x154C
+#define DPDK_MAX_LRO_SIZE_DEFAULT 65536
 
 /* These args appear by themselves */
 #define foreach_eal_double_hyphen_predicate_arg \
@@ -32,14 +24,11 @@ _(no-hpet)                                      \
 _(no-huge)                                      \
 _(vmware-tsc-map)
 
-#define foreach_eal_single_hyphen_mandatory_arg \
-_(coremask, c)                                  \
-_(nchannels, n)                                 \
-
 #define foreach_eal_single_hyphen_arg           \
 _(mem-alloc-request, m)                         \
 _(force-ranks, r)
 
+/* clang-format off */
 /* These args are preceded by "--" and followed by a single string */
 #define foreach_eal_double_hyphen_arg           \
 _(huge-dir)                                     \
@@ -47,7 +36,15 @@ _(proc-type)                                    \
 _(file-prefix)                                  \
 _(vdev)                                         \
 _(log-level)                                    \
-_(iova-mode)
+_(iova-mode)                                    \
+_(base-virtaddr)
+/* clang-format on */
+
+static_always_inline void
+dpdk_device_flag_set (dpdk_device_t *xd, __typeof__ (xd->flags) flag, int val)
+{
+  xd->flags = val ? xd->flags | flag : xd->flags & ~flag;
+}
 
 static inline void
 dpdk_get_xstats (dpdk_device_t * xd)
@@ -97,10 +94,6 @@ dpdk_update_counters (dpdk_device_t * xd, f64 now)
   vnet_main_t *vnm = vnet_get_main ();
   u32 thread_index = vlib_get_thread_index ();
 
-  /* only update counters for PMD interfaces */
-  if ((xd->flags & DPDK_DEVICE_FLAG_PMD) == 0)
-    return;
-
   xd->time_last_stats_update = now ? now : xd->time_last_stats_update;
   clib_memcpy_fast (&xd->last_stats, &xd->stats, sizeof (xd->last_stats));
   rte_eth_stats_get (xd->port_id, &xd->stats);
@@ -116,6 +109,58 @@ dpdk_update_counters (dpdk_device_t * xd, f64 now)
   dpdk_get_xstats (xd);
 }
 
+#if RTE_VERSION < RTE_VERSION_NUM(21, 11, 0, 0)
+#define RTE_MBUF_F_RX_FDIR               PKT_RX_FDIR
+#define RTE_MBUF_F_RX_FDIR_FLX           PKT_RX_FDIR_FLX
+#define RTE_MBUF_F_RX_FDIR_ID            PKT_RX_FDIR_ID
+#define RTE_MBUF_F_RX_IEEE1588_PTP       PKT_RX_IEEE1588_PTP
+#define RTE_MBUF_F_RX_IEEE1588_TMST      PKT_RX_IEEE1588_TMST
+#define RTE_MBUF_F_RX_IP_CKSUM_BAD       PKT_RX_IP_CKSUM_BAD
+#define RTE_MBUF_F_RX_IP_CKSUM_GOOD      PKT_RX_IP_CKSUM_GOOD
+#define RTE_MBUF_F_RX_IP_CKSUM_NONE      PKT_RX_IP_CKSUM_GOOD
+#define RTE_MBUF_F_RX_L4_CKSUM_BAD       PKT_RX_L4_CKSUM_BAD
+#define RTE_MBUF_F_RX_L4_CKSUM_GOOD      PKT_RX_L4_CKSUM_GOOD
+#define RTE_MBUF_F_RX_L4_CKSUM_NONE      PKT_RX_L4_CKSUM_GOOD
+#define RTE_MBUF_F_RX_LRO                PKT_RX_LRO
+#define RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD  PKT_RX_OUTER_IP_CKSUM_BAD
+#define RTE_MBUF_F_RX_OUTER_L4_CKSUM_BAD  PKT_RX_OUTER_L4_CKSUM_GOOD
+#define RTE_MBUF_F_RX_OUTER_L4_CKSUM_GOOD PKT_RX_OUTER_L4_CKSUM_GOOD
+#define RTE_MBUF_F_RX_OUTER_L4_CKSUM_NONE PKT_RX_OUTER_L4_CKSUM_GOOD
+#define RTE_MBUF_F_RX_QINQ               PKT_RX_QINQ
+#define RTE_MBUF_F_RX_QINQ_STRIPPED      PKT_RX_QINQ_STRIPPED
+#define RTE_MBUF_F_RX_RSS_HASH           PKT_RX_RSS_HASH
+#define RTE_MBUF_F_RX_SEC_OFFLOAD        PKT_RX_SEC_OFFLOAD
+#define RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED  PKT_RX_SEC_OFFLOAD_FAILED
+#define RTE_MBUF_F_RX_VLAN               PKT_RX_VLAN
+#define RTE_MBUF_F_RX_VLAN_STRIPPED      PKT_RX_VLAN_STRIPPED
+#define RTE_MBUF_F_TX_IEEE1588_TMST      PKT_TX_IEEE1588_TMST
+#define RTE_MBUF_F_TX_IPV4               PKT_TX_IPV4
+#define RTE_MBUF_F_TX_IPV6               PKT_TX_IPV6
+#define RTE_MBUF_F_TX_IP_CKSUM           PKT_TX_IP_CKSUM
+#define RTE_MBUF_F_TX_MACSEC             PKT_TX_MACSEC
+#define RTE_MBUF_F_TX_OUTER_IPV4         PKT_TX_OUTER_IPV4
+#define RTE_MBUF_F_TX_OUTER_IPV6         PKT_TX_OUTER_IPV6
+#define RTE_MBUF_F_TX_OUTER_IP_CKSUM     PKT_TX_OUTER_IP_CKSUM
+#define RTE_MBUF_F_TX_OUTER_UDP_CKSUM    PKT_TX_OUTER_UDP_CKSUM
+#define RTE_MBUF_F_TX_QINQ               PKT_TX_QINQ
+#define RTE_MBUF_F_TX_SCTP_CKSUM         PKT_TX_SCTP_CKSUM
+#define RTE_MBUF_F_TX_SEC_OFFLOAD        PKT_TX_SEC_OFFLOAD
+#define RTE_MBUF_F_TX_TCP_CKSUM                  PKT_TX_TCP_CKSUM
+#define RTE_MBUF_F_TX_TCP_SEG            PKT_TX_TCP_SEG
+#define RTE_MBUF_F_TX_TUNNEL_GENEVE      PKT_TX_TUNNEL_GENEVE
+#define RTE_MBUF_F_TX_TUNNEL_GRE         PKT_TX_TUNNEL_GRE
+#define RTE_MBUF_F_TX_TUNNEL_GTP         PKT_TX_TUNNEL_GTP
+#define RTE_MBUF_F_TX_TUNNEL_IP                  PKT_TX_TUNNEL_IP
+#define RTE_MBUF_F_TX_TUNNEL_IPIP        PKT_TX_TUNNEL_IPIP
+#define RTE_MBUF_F_TX_TUNNEL_MPLSINUDP   PKT_TX_TUNNEL_MPLSINUDP
+#define RTE_MBUF_F_TX_TUNNEL_UDP         PKT_TX_TUNNEL_UDP
+#define RTE_MBUF_F_TX_TUNNEL_VXLAN       PKT_TX_TUNNEL_VXLAN
+#define RTE_MBUF_F_TX_TUNNEL_VXLAN_GPE   PKT_TX_TUNNEL_VXLAN_GPE
+#define RTE_MBUF_F_TX_UDP_CKSUM                  PKT_TX_UDP_CKSUM
+#define RTE_MBUF_F_TX_UDP_SEG            PKT_TX_UDP_SEG
+#define RTE_MBUF_F_TX_VLAN               PKT_TX_VLAN
+#endif
+
 /*
  * fd.io coding-style-patch-verification: ON
  *