net/axgbe: add multi-process support
PATCH 1/2 net/axgbe: add multi-process support
Added multi-process support for axgbe PMD
To achieve multi-process support separate out TX and RX function inside the axgbe driver and call that from a secondary process when it is attaching to an already-configured NIC
Signed-off-by Jesna K E <[email protected]>
--- doc/guides/nics/features/axgbe.ini | 1 + drivers/net/axgbe/axgbe_ethdev.c | 65 ++++++++++++++++++++++-------- drivers/net/axgbe/axgbe_rxtx.c | 11 ----- drivers/net/axgbe/axgbe_rxtx.h | 7 +++- 4 files changed, 55 insertions(+), 29 deletions(-)
doc/guides/nics/features/axgbe.ini +1 -0
@@ -18,6 +18,7 @@ L3 checksum offload = Y L4 checksum offload = Y Basic stats = Y FW version = Y +Multiprocess aware = Y Linux = Y x86-32 = Y x86-64 = Y
drivers/net/axgbe/axgbe_ethdev.c +48 -17
103 lines not on this page · raw message
drivers/net/axgbe/axgbe_rxtx.c +0 -11
@@ -629,17 +629,6 @@ int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, RTE_ETH_TX_OFFLOAD_MULTI_SEGS)) pdata->multi_segs_tx = true; -if (pdata->multi_segs_tx) - dev->tx_pkt_burst = &axgbe_xmit_pkts_seg; -else if (txq->vector_disable || -rte_vect_get_max_simd_bitwidth () <RTE_VECT_SIMD_128 ) - dev->tx_pkt_burst = &axgbe_xmit_pkts; - else -#ifdef RTE_ARCH_X86 - dev->tx_pkt_burst = &axgbe_xmit_pkts_vec; -#else - dev->tx_pkt_burst = &axgbe_xmit_pkts; -#endif return 0 ; }
drivers/net/axgbe/axgbe_rxtx.h +6 -1
@@ -158,7 +158,12 @@ struct axgbe_tx_queue {* RX/TX function prototypes */ - +/* Takes an ethdev and sets up the tx function to be used based on +* the queue parameters. Used in dev_start by primary process and then +* in dev_init by secondary process when attaching to an existing ethdev. +*/ +void axgbe_set_tx_function (struct rte_eth_dev *dev); +void axgbe_set_rx_function (struct rte_eth_dev *dev);void axgbe_dev_tx_queue_release (struct rte_eth_dev *dev,uint16_t queue_idx); int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, uint16_t nb_tx_desc, unsigned int socket_id,
Signature · 1 line
2.25.1
PATCH 2/2 net/axgbe: move offloads to Rx/Tx queue setup
For Multiprocess dpdk applications retrieving the offload parameter for receive packet directly from struct eth_dev
giving segmentation fault since rxmode.offloads from eth_dev was null duirng recv_pkts. So retrieved offload from rx/tx_queue_setup()
Signed-off-by Jesna K E <[email protected]>
--- drivers/net/axgbe/axgbe_rxtx.c | 10 ++++------ drivers/net/axgbe/axgbe_rxtx.h | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-)
drivers/net/axgbe/axgbe_rxtx.c +4 -6
@@ -86,6 +86,7 @@ int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,if (rxq->free_thresh > rxq->nb_desc) rxq->free_thresh = rxq->nb_desc >>3 ; + rxq->offloads = rx_conf->offloads | dev->data->dev_conf.rxmode.offloads;/* Allocate RX ring hardware descriptors */ size = rxq->nb_desc *sizeof (union axgbe_rx_desc ); dma = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx, size, 128,
@@ -211,7 +212,6 @@ axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,unsigned int err, etlt;uint32_t error_status;uint16_t idx, pidx, pkt_len; -uint64_t offloads; idx =AXGBE_GET_DESC_IDX (rxq, rxq->cur);while (nb_rx < nb_pkts) {
@@ -278,14 +278,13 @@ axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, mbuf->hash.rss =rte_le_to_cpu_32 (desc->write.desc1); etlt =AXGMAC_GET_BITS_LE (desc->write.desc3,RX_NORMAL_DESC3 ,ETLT ); - offloads = rxq->pdata->eth_dev->data->dev_conf.rxmode.offloads;if (!err || !etlt) {if (etlt ==RX_CVLAN_TAG_PRESENT ) { mbuf->ol_flags |=RTE_MBUF_F_RX_VLAN ; mbuf->vlan_tci =AXGMAC_GET_BITS_LE (desc->write.desc0,RX_NORMAL_DESC0 ,OVT ); -if (offloads &RTE_ETH_RX_OFFLOAD_VLAN_STRIP ) +if (rxq->offloads &RTE_ETH_RX_OFFLOAD_VLAN_STRIP ) mbuf->ol_flags |=RTE_MBUF_F_RX_VLAN_STRIPPED ;else mbuf->ol_flags &= ~RTE_MBUF_F_RX_VLAN_STRIPPED ;
@@ -345,7 +344,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,unsigned int err =0 , etlt;uint32_t error_status =0 ;uint16_t idx, pidx, data_len =0 , pkt_len =0 ; -uint64_t offloads;bool eop =0 ; idx =AXGBE_GET_DESC_IDX (rxq, rxq->cur);
@@ -441,14 +439,13 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,rte_le_to_cpu_32 (desc->write.desc1); etlt =AXGMAC_GET_BITS_LE (desc->write.desc3,RX_NORMAL_DESC3 ,ETLT ); - offloads = rxq->pdata->eth_dev->data->dev_conf.rxmode.offloads;if (!err || !etlt) {if (etlt ==RX_CVLAN_TAG_PRESENT ) { first_seg->ol_flags |=RTE_MBUF_F_RX_VLAN ; first_seg->vlan_tci =AXGMAC_GET_BITS_LE (desc->write.desc0,RX_NORMAL_DESC0 ,OVT ); -if (offloads &RTE_ETH_RX_OFFLOAD_VLAN_STRIP ) +if (rxq->offloads &RTE_ETH_RX_OFFLOAD_VLAN_STRIP ) first_seg->ol_flags |=RTE_MBUF_F_RX_VLAN_STRIPPED ;else
@@ -606,6 +603,7 @@ int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, txq->desc = tz->addr; txq->queue_id = queue_idx; txq->port_id = dev->data->port_id; + txq->offloads = offloads; txq->dma_regs = (void *)((uint8_t *)pdata->xgmac_regs +DMA_CH_BASE + (DMA_CH_INC * txq->queue_id)); txq->dma_tail_reg = (volatile uint32_t *)((uint8_t *)txq->dma_regs +
drivers/net/axgbe/axgbe_rxtx.h +2 -2
@@ -100,7 +100,7 @@ struct axgbe_rx_queue {uint64_t rx_mbuf_alloc_failed;/* Number of mbufs allocated from pool*/ uint64_t mbuf_alloc; - +uint64_t offloads;/**< Rx offloads with RTE_ETH_RX_OFFLOAD_**/ } __rte_cache_aligned;/*Tx descriptor format */
@@ -149,7 +149,7 @@ struct axgbe_tx_queue {uint64_t pkts;uint64_t bytes;uint64_t errors; - +uint64_t offloads;/**< Tx offload flags of RTE_ETH_TX_OFFLOAD_* */ } __rte_cache_aligned;/*Queue related APIs */
Signature · 1 line
2.25.1