X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc.h;h=2520cf2b7ce705688a3da622299e32dc841f3318;hb=19621712924d4585ac53df66681b3da30b23b272;hp=75575349ba218a2165827c8cd696bc8f4bc16190;hpb=ffc905f3b856b96c6d8d864dba4052104fae4064;p=dpdk.git diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h index 75575349ba..2520cf2b7c 100644 --- a/drivers/net/sfc/sfc.h +++ b/drivers/net/sfc/sfc.h @@ -27,11 +27,6 @@ extern "C" { #endif -#if EFSYS_OPT_RX_SCALE -/** RSS hash offloads mask */ -#define SFC_RSS_OFFLOADS (ETH_RSS_IP | ETH_RSS_TCP) -#endif - /* * +---------------+ * | UNINITIALIZED |<-----------+ @@ -104,7 +99,7 @@ struct sfc_mcdi { efsys_mem_t mem; enum sfc_mcdi_state state; efx_mcdi_transport_t transport; - bool logging; + uint32_t logtype; uint32_t proxy_handle; efx_rc_t proxy_result; }; @@ -113,8 +108,12 @@ struct sfc_intr { efx_intr_type_t type; rte_intr_callback_fn handler; boolean_t lsc_intr; + boolean_t rxq_intr; }; +struct sfc_rxq; +struct sfc_txq; + struct sfc_rxq_info; struct sfc_txq_info; struct sfc_dp_rx; @@ -133,11 +132,10 @@ struct sfc_port { * Flow API isolated mode overrides promisc and allmulti settings; * they won't be applied if isolated mode is active */ - boolean_t isolated; boolean_t promisc; boolean_t allmulti; - struct ether_addr default_mac_addr; + struct rte_ether_addr default_mac_addr; unsigned int max_mcast_addrs; unsigned int nb_mcast_addrs; @@ -154,10 +152,74 @@ struct sfc_port { uint64_t mac_stats_last_request_timestamp; uint32_t mac_stats_mask[EFX_MAC_STATS_MASK_NPAGES]; + + uint64_t ipackets; +}; + +struct sfc_rss_hf_rte_to_efx { + uint64_t rte; + efx_rx_hash_type_t efx; +}; + +struct sfc_rss { + unsigned int channels; + efx_rx_scale_context_type_t context_type; + efx_rx_hash_support_t hash_support; + efx_rx_hash_alg_t hash_alg; + unsigned int hf_map_nb_entries; + struct sfc_rss_hf_rte_to_efx *hf_map; + + efx_rx_hash_type_t hash_types; + unsigned int tbl[EFX_RSS_TBL_SIZE]; + uint8_t key[EFX_RSS_KEY_SIZE]; }; +/* Adapter private data shared by primary and secondary processes */ +struct sfc_adapter_shared { + unsigned int rxq_count; + struct sfc_rxq_info *rxq_info; + + unsigned int txq_count; + struct sfc_txq_info *txq_info; + + struct sfc_rss rss; + + boolean_t isolated; + uint32_t tunnel_encaps; + + struct rte_pci_addr pci_addr; + uint16_t port_id; + + char *dp_rx_name; + char *dp_tx_name; +}; + +/* Adapter process private data */ +struct sfc_adapter_priv { + struct sfc_adapter_shared *shared; + const struct sfc_dp_rx *dp_rx; + const struct sfc_dp_tx *dp_tx; + uint32_t logtype_main; +}; + +static inline struct sfc_adapter_priv * +sfc_adapter_priv_by_eth_dev(struct rte_eth_dev *eth_dev) +{ + struct sfc_adapter_priv *sap = eth_dev->process_private; + + SFC_ASSERT(sap != NULL); + return sap; +} + /* Adapter private data */ struct sfc_adapter { + /* + * It must be the first field of the sfc_adapter structure since + * sfc_adapter is the primary process private data (i.e. process + * private data plus additional primary process specific data). + */ + struct sfc_adapter_priv priv; + /* * PMD setup and configuration is not thread safe. Since it is not * performance sensitive, it is better to guarantee thread-safety @@ -166,11 +228,8 @@ struct sfc_adapter { */ rte_spinlock_t lock; enum sfc_adapter_state state; - struct rte_pci_addr pci_addr; - uint16_t port_id; struct rte_eth_dev *eth_dev; struct rte_kvargs *kvargs; - bool debug_init; int socket_id; efsys_bar_t mem_bar; efx_family_t family; @@ -183,10 +242,19 @@ struct sfc_adapter { struct sfc_port port; struct sfc_filter filter; + struct sfc_flow_list flow_list; + unsigned int rxq_max; unsigned int txq_max; + unsigned int rxq_max_entries; + unsigned int rxq_min_entries; + unsigned int txq_max_entries; + unsigned int txq_min_entries; + + unsigned int evq_max_entries; + unsigned int evq_min_entries; uint32_t evq_flags; unsigned int evq_count; @@ -217,38 +285,38 @@ struct sfc_adapter { bool mgmt_evq_running; struct sfc_evq *mgmt_evq; - unsigned int rxq_count; - struct sfc_rxq_info *rxq_info; - - unsigned int txq_count; - struct sfc_txq_info *txq_info; + struct sfc_rxq *rxq_ctrl; + struct sfc_txq *txq_ctrl; boolean_t tso; + boolean_t tso_encap; - unsigned int rss_channels; + uint32_t rxd_wait_timeout_ns; +}; -#if EFSYS_OPT_RX_SCALE - efx_rx_scale_context_type_t rss_support; - efx_rx_hash_support_t hash_support; - efx_rx_hash_type_t rss_hash_types; - unsigned int rss_tbl[EFX_RSS_TBL_SIZE]; - uint8_t rss_key[EFX_RSS_KEY_SIZE]; -#endif +static inline struct sfc_adapter_shared * +sfc_adapter_shared_by_eth_dev(struct rte_eth_dev *eth_dev) +{ + struct sfc_adapter_shared *sas = eth_dev->data->dev_private; - /* - * Shared memory copy of the Rx datapath name to be used by - * the secondary process to find Rx datapath to be used. - */ - char *dp_rx_name; - const struct sfc_dp_rx *dp_rx; + return sas; +} - /* - * Shared memory copy of the Tx datapath name to be used by - * the secondary process to find Rx datapath to be used. - */ - char *dp_tx_name; - const struct sfc_dp_tx *dp_tx; -}; +static inline struct sfc_adapter * +sfc_adapter_by_eth_dev(struct rte_eth_dev *eth_dev) +{ + struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(eth_dev); + + SFC_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY); + + return container_of(sap, struct sfc_adapter, priv); +} + +static inline struct sfc_adapter_shared * +sfc_sa2shared(struct sfc_adapter *sa) +{ + return sa->priv.shared; +} /* * Add wrapper functions to acquire/release lock to be able to remove or @@ -302,6 +370,10 @@ int sfc_dma_alloc(const struct sfc_adapter *sa, const char *name, uint16_t id, size_t len, int socket_id, efsys_mem_t *esmp); void sfc_dma_free(const struct sfc_adapter *sa, efsys_mem_t *esmp); +uint32_t sfc_register_logtype(const struct rte_pci_addr *pci_addr, + const char *lt_prefix_str, + uint32_t ll_default); + int sfc_probe(struct sfc_adapter *sa); void sfc_unprobe(struct sfc_adapter *sa); int sfc_attach(struct sfc_adapter *sa);