X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Favf%2Favf.h;h=f6f79cf0e0915ac6280c2014c856864ef6de3525;hb=dfd426c2c83f69e95fe8dab5b4827825230f1d7c;hp=32d9cc61015dc735b66e34e97bbae98c4ab42355;hpb=8b388e35b2aeca39c277453337751d14aeba0d40;p=vpp.git diff --git a/src/plugins/avf/avf.h b/src/plugins/avf/avf.h index 32d9cc61015..f6f79cf0e09 100644 --- a/src/plugins/avf/avf.h +++ b/src/plugins/avf/avf.h @@ -19,14 +19,26 @@ #define _AVF_H_ #include +#include + +#include +#include +#include #include +#include + +#include + +#include +#include #define AVF_QUEUE_SZ_MAX 4096 #define AVF_QUEUE_SZ_MIN 64 #define AVF_AQ_ENQ_SUSPEND_TIME 50e-6 #define AVF_AQ_ENQ_MAX_WAIT_TIME 250e-3 +#define AVF_AQ_BUF_SIZE 4096 #define AVF_RESET_SUSPEND_TIME 20e-3 #define AVF_RESET_MAX_WAIT_TIME 1 @@ -37,6 +49,7 @@ #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) +#define AVF_RXD_STATUS_FLM AVF_RXD_STATUS (11) #define AVF_RXD_ERROR_SHIFT 19 #define AVF_RXD_PTYPE_SHIFT 30 #define AVF_RXD_LEN_SHIFT 38 @@ -46,35 +59,65 @@ #define AVF_RXD_ERROR_L4E (1ULL << (AVF_RXD_ERROR_SHIFT + 4)) #define AVF_TXD_CMD(x) (1 << (x + 4)) +#define AVF_TXD_CMD_EXT(x, val) ((u64)val << (x + 4)) #define AVF_TXD_CMD_EOP AVF_TXD_CMD(0) #define AVF_TXD_CMD_RS AVF_TXD_CMD(1) #define AVF_TXD_CMD_RSV AVF_TXD_CMD(2) +#define AVF_TXD_CMD_IIPT_NONE AVF_TXD_CMD_EXT(5, 0) +#define AVF_TXD_CMD_IIPT_IPV6 AVF_TXD_CMD_EXT(5, 1) +#define AVF_TXD_CMD_IIPT_IPV4_NO_CSUM AVF_TXD_CMD_EXT(5, 2) +#define AVF_TXD_CMD_IIPT_IPV4 AVF_TXD_CMD_EXT(5, 3) + +#define AVF_TXD_CMD_L4T_UNKNOWN AVF_TXD_CMD_EXT(8, 0) +#define AVF_TXD_CMD_L4T_TCP AVF_TXD_CMD_EXT(8, 1) +#define AVF_TXD_CMD_L4T_SCTP AVF_TXD_CMD_EXT(8, 2) +#define AVF_TXD_CMD_L4T_UDP AVF_TXD_CMD_EXT(8, 3) + +#define AVF_TXD_OFFSET(x,factor,val) (((u64)val/(u64)factor) << (16 + x)) +#define AVF_TXD_OFFSET_MACLEN(val) AVF_TXD_OFFSET( 0, 2, val) +#define AVF_TXD_OFFSET_IPLEN(val) AVF_TXD_OFFSET( 7, 4, val) +#define AVF_TXD_OFFSET_L4LEN(val) AVF_TXD_OFFSET(14, 4, val) + +#define AVF_TXD_DTYP_CTX 0x1ULL +#define AVF_TXD_CTX_CMD_TSO AVF_TXD_CMD(0) +#define AVF_TXD_CTX_SEG(val,x) (((u64)val) << (30 + x)) +#define AVF_TXD_CTX_SEG_TLEN(val) AVF_TXD_CTX_SEG(val,0) +#define AVF_TXD_CTX_SEG_MSS(val) AVF_TXD_CTX_SEG(val,20) + + +extern vlib_log_class_registration_t avf_log; +extern vlib_log_class_registration_t avf_stats_log; + #define avf_log_err(dev, f, ...) \ - vlib_log (VLIB_LOG_LEVEL_ERR, avf_main.log_class, "%U: " f, \ + vlib_log (VLIB_LOG_LEVEL_ERR, avf_log.class, "%U: " f, \ format_vlib_pci_addr, &dev->pci_addr, \ ## __VA_ARGS__) #define avf_log_warn(dev, f, ...) \ - vlib_log (VLIB_LOG_LEVEL_WARNING, avf_main.log_class, "%U: " f, \ + vlib_log (VLIB_LOG_LEVEL_WARNING, avf_log.class, "%U: " f, \ format_vlib_pci_addr, &dev->pci_addr, \ ## __VA_ARGS__) #define avf_log_debug(dev, f, ...) \ - vlib_log (VLIB_LOG_LEVEL_DEBUG, avf_main.log_class, "%U: " f, \ + vlib_log (VLIB_LOG_LEVEL_DEBUG, avf_log.class, "%U: " f, \ format_vlib_pci_addr, &dev->pci_addr, \ ## __VA_ARGS__) -#define foreach_avf_device_flags \ - _(0, INITIALIZED, "initialized") \ - _(1, ERROR, "error") \ - _(2, ADMIN_UP, "admin-up") \ - _(3, VA_DMA, "vaddr-dma") \ - _(4, LINK_UP, "link-up") \ - _(5, SHARED_TXQ_LOCK, "shared-txq-lock") \ - _(6, ELOG, "elog") \ - _(7, PROMISC, "promisc") \ - _(8, RX_INT, "rx-interrupts") +#define avf_stats_log_debug(dev, f, ...) \ + vlib_log (VLIB_LOG_LEVEL_DEBUG, avf_stats_log.class, "%U: " f, \ + format_vlib_pci_addr, &dev->pci_addr, ##__VA_ARGS__) + +#define foreach_avf_device_flags \ + _ (0, INITIALIZED, "initialized") \ + _ (1, ERROR, "error") \ + _ (2, ADMIN_UP, "admin-up") \ + _ (3, VA_DMA, "vaddr-dma") \ + _ (4, LINK_UP, "link-up") \ + _ (6, ELOG, "elog") \ + _ (7, PROMISC, "promisc") \ + _ (8, RX_INT, "rx-interrupts") \ + _ (9, RX_FLOW_OFFLOAD, "rx-flow-offload") enum { @@ -98,6 +141,10 @@ typedef volatile struct u64 rsv2:3; u64 ptype:8; u64 length:26; + + u64 rsv3 : 64; + u32 flex_lo; + u32 fdid_flex_hi; }; u64 qword[4]; #ifdef CLIB_HAVE_VEC256 @@ -108,7 +155,7 @@ typedef volatile struct STATIC_ASSERT_SIZEOF (avf_rx_desc_t, 32); -typedef volatile struct +typedef struct { union { @@ -132,6 +179,7 @@ typedef struct u16 n_enqueued; u8 int_mode; u8 buffer_pool_index; + u32 queue_index; } avf_rxq_t; typedef struct @@ -140,13 +188,34 @@ typedef struct volatile u32 *qtx_tail; u16 next; u16 size; + u32 *ph_bufs; clib_spinlock_t lock; avf_tx_desc_t *descs; u32 *bufs; u16 n_enqueued; u16 *rs_slots; + + avf_tx_desc_t *tmp_descs; + u32 *tmp_bufs; + u32 queue_index; } avf_txq_t; +typedef struct +{ + u32 flow_index; + u32 mark; + u8 flow_type_flag; + struct avf_fdir_conf *rcfg; + struct virtchnl_rss_cfg *rss_cfg; +} avf_flow_entry_t; + +typedef struct +{ + u32 flow_id; + u16 next_index; + i16 buffer_advance; +} avf_flow_lookup_entry_t; + typedef struct { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); @@ -179,7 +248,7 @@ typedef struct virtchnl_pf_event_t *events; u16 vsi_id; - u32 feature_bitmap; + u32 cap_flags; u8 hwaddr[6]; u16 num_queue_pairs; u16 max_vectors; @@ -190,6 +259,10 @@ typedef struct virtchnl_link_speed_t link_speed; vlib_pci_addr_t pci_addr; + /* flow */ + avf_flow_entry_t *flow_entries; /* pool */ + avf_flow_lookup_entry_t *flow_lookup_entries; /* pool */ + /* stats */ virtchnl_eth_stats_t eth_stats; virtchnl_eth_stats_t last_cleared_eth_stats; @@ -205,10 +278,34 @@ typedef enum AVF_PROCESS_EVENT_START = 1, AVF_PROCESS_EVENT_DELETE_IF = 2, AVF_PROCESS_EVENT_AQ_INT = 3, - AVF_PROCESS_EVENT_SET_PROMISC_ENABLE = 4, - AVF_PROCESS_EVENT_SET_PROMISC_DISABLE = 5, + AVF_PROCESS_EVENT_REQ = 4, } avf_process_event_t; +typedef enum +{ + AVF_PROCESS_REQ_ADD_DEL_ETH_ADDR = 1, + AVF_PROCESS_REQ_CONFIG_PROMISC_MDDE = 2, + AVF_PROCESS_REQ_PROGRAM_FLOW = 3, +} avf_process_req_type_t; + +typedef struct +{ + avf_process_req_type_t type; + u32 dev_instance; + u32 calling_process_index; + u8 eth_addr[6]; + int is_add, is_enable; + enum virthnl_adv_ops vc_op; + + /* below parameters are used for 'program flow' event */ + u8 *rule; + u32 rule_len; + u8 *program_status; + u32 status_len; + + clib_error_t *error; +} avf_process_req_t; + typedef struct { u64 qw1s[AVF_RX_MAX_DESC_IN_CHAIN - 1]; @@ -219,7 +316,9 @@ typedef struct { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); vlib_buffer_t *bufs[AVF_RX_VECTOR_SZ]; + u16 next[AVF_RX_VECTOR_SZ]; u64 qw1s[AVF_RX_VECTOR_SZ]; + u32 flow_ids[AVF_RX_VECTOR_SZ]; avf_rx_tail_t tails[AVF_RX_VECTOR_SZ]; vlib_buffer_t buffer_template; } avf_per_thread_data_t; @@ -230,8 +329,6 @@ typedef struct avf_device_t **devices; avf_per_thread_data_t *per_thread_data; - - vlib_log_class_t log_class; } avf_main_t; extern avf_main_t avf_main; @@ -242,6 +339,7 @@ typedef struct u8 *name; int enable_elog; u16 rxq_num; + u16 txq_num; u16 rxq_size; u16 txq_size; /* return */ @@ -256,10 +354,21 @@ extern vlib_node_registration_t avf_input_node; extern vlib_node_registration_t avf_process_node; extern vnet_device_class_t avf_device_class; +clib_error_t *avf_program_flow (u32 dev_instance, int is_add, + enum virthnl_adv_ops vc_op, u8 *rule, + u32 rule_len, u8 *program_status, + u32 status_len); + /* format.c */ format_function_t format_avf_device; format_function_t format_avf_device_name; format_function_t format_avf_input_trace; +format_function_t format_avf_vf_cap_flags; +format_function_t format_avf_vlan_supported_caps; +format_function_t format_avf_vlan_caps; +format_function_t format_avf_vlan_support; +format_function_t format_avf_eth_stats; +vnet_flow_dev_ops_function_t avf_flow_ops_fn; static_always_inline avf_device_t * avf_get_device (u32 dev_instance) @@ -267,6 +376,13 @@ avf_get_device (u32 dev_instance) return pool_elt_at_index (avf_main.devices, dev_instance)[0]; } +/* elog.c */ +void avf_elog_init (); +void avf_elog_reg (avf_device_t *ad, u32 addr, u32 val, int is_read); +void avf_elog_aq_enq_req (avf_device_t *ad, avf_aq_desc_t *d); +void avf_elog_aq_enq_resp (avf_device_t *ad, avf_aq_desc_t *d); +void avf_elog_arq_desc (avf_device_t *ad, avf_aq_desc_t *d); + static inline u32 avf_get_u32 (void *start, int offset) { @@ -310,13 +426,20 @@ avf_set_u32 (void *start, int offset, u32 value) static inline void avf_reg_write (avf_device_t * ad, u32 addr, u32 val) { - *(volatile u32 *) ((u8 *) ad->bar0 + addr) = val; + if (ad->flags & AVF_DEVICE_F_ELOG) + avf_elog_reg (ad, addr, val, 0); + __atomic_store_n ((u32 *) ((u8 *) ad->bar0 + addr), val, __ATOMIC_RELEASE); } static inline u32 avf_reg_read (avf_device_t * ad, u32 addr) { - return *(volatile u32 *) (ad->bar0 + addr); + u32 val = *(volatile u32 *) (ad->bar0 + addr); + + if (ad->flags & AVF_DEVICE_F_ELOG) + avf_elog_reg (ad, addr, val, 1); + + return val; } static inline void @@ -326,6 +449,17 @@ avf_reg_flush (avf_device_t * ad) asm volatile ("":::"memory"); } +static inline void +avf_tail_write (volatile u32 *addr, u32 val) +{ +#ifdef __MOVDIRI__ + _mm_sfence (); + _directstoreu_u32 ((void *) addr, val); +#else + clib_atomic_store_rel_n (addr, val); +#endif +} + static_always_inline int avf_rxd_is_not_eop (avf_rx_desc_t * d) { @@ -343,6 +477,7 @@ typedef struct u16 qid; u16 next_index; u32 hw_if_index; + u32 flow_id; u64 qw1s[AVF_RX_MAX_DESC_IN_CHAIN]; } avf_input_trace_t;