X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fenic%2Fenic.h;h=a95e51eea8376e6b21bfaa809a5bf88956592b47;hb=3c334fcd9e565258667ec052550ab023d0fc9adb;hp=681109ba93d31bf84286ffc6a3b4229c90f60eb0;hpb=e92a4b4148d3caadb5d3a8351fdf0fa3a2a709c2;p=dpdk.git diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index 681109ba93..a95e51eea8 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -6,8 +6,11 @@ #ifndef _ENIC_H_ #define _ENIC_H_ +#include +#include #include "vnic_enet.h" #include "vnic_dev.h" +#include "vnic_flowman.h" #include "vnic_wq.h" #include "vnic_rq.h" #include "vnic_cq.h" @@ -50,9 +53,6 @@ #define ENICPMD_FDIR_MAX 64 -/* HW default VXLAN port */ -#define ENIC_DEFAULT_VXLAN_PORT 4789 - /* * Interrupt 0: LSC and errors * Interrupt 1: rx queue 0 @@ -64,16 +64,16 @@ struct enic_fdir_node { struct rte_eth_fdir_filter filter; - u16 fltr_id; - u16 rq_index; + uint16_t fltr_id; + uint16_t rq_index; }; struct enic_fdir { struct rte_eth_fdir_stats stats; struct rte_hash *hash; struct enic_fdir_node *nodes[ENICPMD_FDIR_MAX]; - u32 modes; - u32 types_mask; + uint32_t modes; + uint32_t types_mask; void (*copy_fltr_fn)(struct filter_v2 *filt, const struct rte_eth_fdir_input *input, const struct rte_eth_fdir_masks *masks); @@ -90,10 +90,17 @@ struct enic_memzone_entry { LIST_ENTRY(enic_memzone_entry) entries; }; +/* Defined in enic_fm_flow.c */ +struct enic_flowman; +struct enic_fm_flow; + struct rte_flow { LIST_ENTRY(rte_flow) next; - u16 enic_filter_id; + /* Data for filter API based flow (enic_flow.c) */ + uint16_t enic_filter_id; struct filter_v2 enic_filter; + /* Data for flow manager based flow (enic_fm_flow.c) */ + struct enic_fm_flow *fm; }; /* Per-instance private data structure */ @@ -112,26 +119,30 @@ struct enic { unsigned int port_id; bool overlay_offload; struct rte_eth_dev *rte_dev; + struct rte_eth_dev_data *dev_data; struct enic_fdir fdir; char bdf_name[ENICPMD_BDF_LENGTH]; int dev_fd; int iommu_group_fd; int iommu_groupid; int eventfd; - uint8_t mac_addr[ETH_ALEN]; + uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; pthread_t err_intr_thread; int promisc; int allmulti; - u8 ig_vlan_strip_en; + uint8_t ig_vlan_strip_en; int link_status; - u8 hw_ip_checksum; - u16 max_mtu; - u8 adv_filters; - u32 flow_filter_mode; - u8 filter_actions; /* HW supported actions */ + uint8_t hw_ip_checksum; + uint16_t max_mtu; + uint8_t adv_filters; + uint32_t flow_filter_mode; + uint8_t filter_actions; /* HW supported actions */ bool vxlan; bool disable_overlay; /* devargs disable_overlay=1 */ uint8_t enable_avx2_rx; /* devargs enable-avx2-rx=1 */ + uint8_t geneve_opt_avail; /* Geneve with options offload available */ + uint8_t geneve_opt_enabled; /* Geneve with options offload enabled */ + uint8_t geneve_opt_request; /* devargs geneve-opt=1 */ bool nic_cfg_chk; /* NIC_CFG_CHK available */ bool udp_rss_weak; /* Bodega style UDP RSS */ uint8_t ig_vlan_rewrite_mode; /* devargs ig-vlan-rewrite */ @@ -195,6 +206,9 @@ struct enic { /* Multicast MAC addresses added to the NIC */ uint32_t mc_count; struct rte_ether_addr mc_addrs[ENIC_MULTICAST_PERFECT_FILTERS]; + + /* Flow manager API */ + struct enic_flowman *fm; }; /* Compute ethdev's max packet size from MTU */ @@ -207,25 +221,26 @@ static inline uint32_t enic_mtu_to_max_rx_pktlen(uint32_t mtu) /* Get the CQ index from a Start of Packet(SOP) RQ index */ static inline unsigned int enic_sop_rq_idx_to_cq_idx(unsigned int sop_idx) { - return sop_idx / 2; + return sop_idx; } /* Get the RTE RQ index from a Start of Packet(SOP) RQ index */ static inline unsigned int enic_sop_rq_idx_to_rte_idx(unsigned int sop_idx) { - return sop_idx / 2; + return sop_idx; } /* Get the Start of Packet(SOP) RQ index from a RTE RQ index */ static inline unsigned int enic_rte_rq_idx_to_sop_idx(unsigned int rte_idx) { - return rte_idx * 2; + return rte_idx; } /* Get the Data RQ index from a RTE RQ index */ -static inline unsigned int enic_rte_rq_idx_to_data_idx(unsigned int rte_idx) +static inline unsigned int enic_rte_rq_idx_to_data_idx(unsigned int rte_idx, + struct enic *enic) { - return rte_idx * 2 + 1; + return enic->rq_count + rte_idx; } static inline unsigned int enic_vnic_rq_count(struct enic *enic) @@ -239,7 +254,7 @@ static inline unsigned int enic_cq_rq(__rte_unused struct enic *enic, unsigned i * completion queue, so the completion queue number is no * longer the same as the rq number. */ - return rq / 2; + return rq; } static inline unsigned int enic_cq_wq(struct enic *enic, unsigned int wq) @@ -276,6 +291,7 @@ enic_ring_incr(uint32_t n_descriptors, uint32_t idx) return idx; } +int dev_is_enic(struct rte_eth_dev *dev); void enic_fdir_stats_get(struct enic *enic, struct rte_eth_fdir_stats *stats); int enic_fdir_add_fltr(struct enic *enic, @@ -321,6 +337,12 @@ void enic_post_wq_index(struct vnic_wq *wq); int enic_probe(struct enic *enic); int enic_clsf_init(struct enic *enic); void enic_clsf_destroy(struct enic *enic); +int enic_fm_init(struct enic *enic); +void enic_fm_destroy(struct enic *enic); +void *enic_alloc_consistent(void *priv, size_t size, dma_addr_t *dma_handle, + uint8_t *name); +void enic_free_consistent(void *priv, size_t size, void *vaddr, + dma_addr_t dma_handle); uint16_t enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts); uint16_t enic_noscatter_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, @@ -335,11 +357,12 @@ uint16_t enic_simple_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t enic_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); int enic_set_mtu(struct enic *enic, uint16_t new_mtu); -int enic_link_update(struct enic *enic); +int enic_link_update(struct rte_eth_dev *eth_dev); bool enic_use_vector_rx_handler(struct rte_eth_dev *eth_dev); void enic_pick_rx_handler(struct rte_eth_dev *eth_dev); void enic_pick_tx_handler(struct rte_eth_dev *eth_dev); void enic_fdir_info(struct enic *enic); void enic_fdir_info_get(struct enic *enic, struct rte_eth_fdir_info *stats); extern const struct rte_flow_ops enic_flow_ops; +extern const struct rte_flow_ops enic_fm_flow_ops; #endif /* _ENIC_H_ */