avf: fix race between avf process node and avf_delete_if(...)

[vpp.git] / src / plugins / avf / avf.h

diff --git a/src/plugins/avf/avf.h b/src/plugins/avf/avf.h
index b0779f2..4b35899 100644 (file)
--- a/src/plugins/avf/avf.h
+++ b/src/plugins/avf/avf.h
@@ -22,6 +22,15 @@
 
 #include <vlib/log.h>
 
+#define AVF_AQ_ENQ_SUSPEND_TIME                50e-6
+#define AVF_AQ_ENQ_MAX_WAIT_TIME       250e-3
+
+#define AVF_RESET_SUSPEND_TIME         20e-3
+#define AVF_RESET_MAX_WAIT_TIME                1
+
+#define AVF_SEND_TO_PF_SUSPEND_TIME    10e-3
+#define AVF_SEND_TO_PF_MAX_WAIT_TIME   1
+
 #define AVF_RXD_STATUS(x)              (1ULL << x)
 #define AVF_RXD_STATUS_DD              AVF_RXD_STATUS(0)
 #define AVF_RXD_STATUS_EOP             AVF_RXD_STATUS(1)
@@ -60,7 +69,9 @@
   _(3, VA_DMA, "vaddr-dma") \
   _(4, LINK_UP, "link-up") \
   _(5, SHARED_TXQ_LOCK, "shared-txq-lock") \
-  _(6, ELOG, "elog")
+  _(6, ELOG, "elog") \
+  _(7, PROMISC, "promisc") \
+  _(8, RX_INT, "rx-interrupts")
 
 enum
 {
@@ -169,6 +180,7 @@ typedef struct
   u8 hwaddr[6];
   u16 num_queue_pairs;
   u16 max_vectors;
+  u16 n_rx_irqs;
   u16 max_mtu;
   u32 rss_key_size;
   u32 rss_lut_size;
@@ -177,6 +189,7 @@ typedef struct
 
   /* stats */
   virtchnl_eth_stats_t eth_stats;
+  virtchnl_eth_stats_t last_cleared_eth_stats;
 
   /* error */
   clib_error_t *error;
@@ -187,7 +200,7 @@ typedef struct
 typedef enum
 {
   AVF_PROCESS_EVENT_START = 1,
-  AVF_PROCESS_EVENT_STOP = 2,
+  AVF_PROCESS_EVENT_DELETE_IF = 2,
   AVF_PROCESS_EVENT_AQ_INT = 3,
 } avf_process_event_t;
 
@@ -233,9 +246,9 @@ typedef struct
 } avf_create_if_args_t;
 
 void avf_create_if (vlib_main_t * vm, avf_create_if_args_t * args);
-void avf_delete_if (vlib_main_t * vm, avf_device_t * ad);
 
 extern vlib_node_registration_t avf_input_node;
+extern vlib_node_registration_t avf_process_node;
 extern vnet_device_class_t avf_device_class;
 
 /* format.c */
@@ -316,13 +329,15 @@ avf_rxd_is_not_dd (avf_rx_desc_t * d)
 
 typedef struct
 {
-  u32 next_index;
+  u16 qid;
+  u16 next_index;
   u32 hw_if_index;
   u64 qw1s[AVF_RX_MAX_DESC_IN_CHAIN];
 } avf_input_trace_t;
 
 #define foreach_avf_tx_func_error             \
-_(NO_FREE_SLOTS, "no free tx slots")
+  _(SEGMENT_SIZE_EXCEEDED, "segment size exceeded")    \
+  _(NO_FREE_SLOTS, "no free tx slots")
 
 typedef enum
 {