d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/enic: fix probe for secondary process

Browse Source 
Only the primary process initializes the adapter private data and
rte_eth_dev_data. For secondary processes, do not touch them.

Secondary processes need to select the right Tx and Rx handlers. Pick
the same handlers that the primary process uses.

Fixes: fefed3d1e6 ("enic: new driver")
Cc: stable@dpdk.org

Reported-by: Dirk-Holger Lenz <dirk.lenz@ng4t.com>
Signed-off-by: Hyong Youb Kim <hyonkim@cisco.com>
Tested-by: Dirk-Holger Lenz <dirk.lenz@ng4t.com>
Reviewed-by: John Daley <johndale@cisco.com>
This commit is contained in:
Hyong Youb Kim 2019-09-05 23:50:19 -07:00 committed by Ferruh Yigit
parent 9e06e39b3c
commit e92a4b4148
4 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/enic/enic.h
View File

@ -136,6 +136,7 @@ struct enic {
bool udp_rss_weak; /* Bodega style UDP RSS */
uint8_t ig_vlan_rewrite_mode; /* devargs ig-vlan-rewrite */
uint16_t vxlan_port; /* current vxlan port pushed to NIC */
int use_simple_tx_handler;
unsigned int flags;
unsigned int priv_flags;
@ -335,7 +336,9 @@ 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);
bool enic_use_vector_rx_handler(struct enic *enic);
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;

10
drivers/net/enic/enic_ethdev.c
View File

@ -1227,12 +1227,18 @@ static int eth_enicpmd_dev_init(struct rte_eth_dev *eth_dev)
ENICPMD_FUNC_TRACE();
enic->port_id = eth_dev->data->port_id;
enic->rte_dev = eth_dev;
eth_dev->dev_ops = &enicpmd_eth_dev_ops;
eth_dev->rx_pkt_burst = &enic_recv_pkts;
eth_dev->tx_pkt_burst = &enic_xmit_pkts;
eth_dev->tx_pkt_prepare = &enic_prep_pkts;
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
enic_pick_tx_handler(eth_dev);
enic_pick_rx_handler(eth_dev);
return 0;
}
/* Only the primary sets up adapter and other data in shared memory */
enic->port_id = eth_dev->data->port_id;
enic->rte_dev = eth_dev;
/* Let rte_eth_dev_close() release the port resources */
eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;

28
drivers/net/enic/enic_main.c
View File

@ -525,14 +525,14 @@ static void enic_prep_wq_for_simple_tx(struct enic *enic, uint16_t queue_idx)
* used when that file is not compiled.
*/
__rte_weak bool
enic_use_vector_rx_handler(__rte_unused struct enic *enic)
enic_use_vector_rx_handler(__rte_unused struct rte_eth_dev *eth_dev)
{
return false;
}
static void pick_rx_handler(struct enic *enic)
void enic_pick_rx_handler(struct rte_eth_dev *eth_dev)
{
struct rte_eth_dev *eth_dev;
struct enic *enic = pmd_priv(eth_dev);
/*
* Preference order:
@ -540,8 +540,7 @@ static void pick_rx_handler(struct enic *enic)
* 2. The non-scatter, simplified handler if scatter Rx is not used.
* 3. The default handler as a fallback.
*/
eth_dev = enic->rte_dev;
if (enic_use_vector_rx_handler(enic))
if (enic_use_vector_rx_handler(eth_dev))
return;
if (enic->rq_count > 0 && enic->rq[0].data_queue_enable == 0) {
ENICPMD_LOG(DEBUG, " use the non-scatter Rx handler");
@ -552,6 +551,20 @@ static void pick_rx_handler(struct enic *enic)
}
}
/* Secondary process uses this to set the Tx handler */
void enic_pick_tx_handler(struct rte_eth_dev *eth_dev)
{
struct enic *enic = pmd_priv(eth_dev);
if (enic->use_simple_tx_handler) {
ENICPMD_LOG(DEBUG, " use the simple tx handler");
eth_dev->tx_pkt_burst = &enic_simple_xmit_pkts;
} else {
ENICPMD_LOG(DEBUG, " use the default tx handler");
eth_dev->tx_pkt_burst = &enic_xmit_pkts;
}
}
int enic_enable(struct enic *enic)
{
unsigned int index;
@ -629,12 +642,13 @@ int enic_enable(struct enic *enic)
eth_dev->tx_pkt_burst = &enic_simple_xmit_pkts;
for (index = 0; index < enic->wq_count; index++)
enic_prep_wq_for_simple_tx(enic, index);
enic->use_simple_tx_handler = 1;
} else {
ENICPMD_LOG(DEBUG, " use the default tx handler");
eth_dev->tx_pkt_burst = &enic_xmit_pkts;
}
pick_rx_handler(enic);
enic_pick_rx_handler(eth_dev);
for (index = 0; index < enic->wq_count; index++)
enic_start_wq(enic, index);
@ -1605,7 +1619,7 @@ int enic_set_mtu(struct enic *enic, uint16_t new_mtu)
/* put back the real receive function */
rte_mb();
pick_rx_handler(enic);
enic_pick_rx_handler(eth_dev);
rte_mb();
/* restart Rx traffic */

5
drivers/net/enic/enic_rxtx_vec_avx2.c
View File

@ -806,12 +806,11 @@ enic_noscatter_vec_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
}
bool
enic_use_vector_rx_handler(struct enic *enic)
enic_use_vector_rx_handler(struct rte_eth_dev *eth_dev)
{
struct rte_eth_dev *eth_dev;
struct enic *enic = pmd_priv(eth_dev);
struct rte_fdir_conf *fconf;
eth_dev = enic->rte_dev;
/* User needs to request for the avx2 handler */
if (!enic->enable_avx2_rx)
return false;