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

net/txgbe: prevent driver forcing application to exit

Browse Source 
Replace the 'rte_panic()' with an error return.
Also change the type of the calling function.

Fixes: a6712cd029a4 ("net/txgbe: add PF module init and uninit for SRIOV")
Cc: stable@dpdk.org

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
This commit is contained in:
Jiawen Wu 2020-10-28 10:29:57 +08:00 committed by Ferruh Yigit
parent c783fd433c
commit 4c6dea0c0b
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/txgbe/txgbe_ethdev.c
View File

@ -475,7 +475,7 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
const struct rte_memzone *mz;
uint32_t ctrl_ext;
uint16_t csum;
int err, i;
int err, i, ret;
PMD_INIT_FUNC_TRACE();
@ -639,7 +639,14 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
memset(hwstrip, 0, sizeof(*hwstrip));
/* initialize PF if max_vfs not zero */
txgbe_pf_host_init(eth_dev);
ret = txgbe_pf_host_init(eth_dev);
if (ret) {
rte_free(eth_dev->data->mac_addrs);
eth_dev->data->mac_addrs = NULL;
rte_free(eth_dev->data->hash_mac_addrs);
eth_dev->data->hash_mac_addrs = NULL;
return ret;
}
ctrl_ext = rd32(hw, TXGBE_PORTCTL);
/* let hardware know driver is loaded */

2
drivers/net/txgbe/txgbe_ethdev.h
View File

@ -288,7 +288,7 @@ void txgbe_configure_dcb(struct rte_eth_dev *dev);
int
txgbe_dev_link_update_share(struct rte_eth_dev *dev,
int wait_to_complete);
void txgbe_pf_host_init(struct rte_eth_dev *eth_dev);
int txgbe_pf_host_init(struct rte_eth_dev *eth_dev);
void txgbe_pf_host_uninit(struct rte_eth_dev *eth_dev);

23
drivers/net/txgbe/txgbe_pf.c
View File

@ -64,7 +64,7 @@ txgbe_mb_intr_setup(struct rte_eth_dev *dev)
return 0;
}
void txgbe_pf_host_init(struct rte_eth_dev *eth_dev)
int txgbe_pf_host_init(struct rte_eth_dev *eth_dev)
{
struct txgbe_vf_info **vfinfo = TXGBE_DEV_VFDATA(eth_dev);
struct txgbe_mirror_info *mirror_info = TXGBE_DEV_MR_INFO(eth_dev);
@ -72,20 +72,31 @@ void txgbe_pf_host_init(struct rte_eth_dev *eth_dev)
struct txgbe_hw *hw = TXGBE_DEV_HW(eth_dev);
uint16_t vf_num;
uint8_t nb_queue;
int ret = 0;
PMD_INIT_FUNC_TRACE();
RTE_ETH_DEV_SRIOV(eth_dev).active = 0;
vf_num = dev_num_vf(eth_dev);
if (vf_num == 0)
return;
return ret;
*vfinfo = rte_zmalloc("vf_info",
sizeof(struct txgbe_vf_info) * vf_num, 0);
if (*vfinfo == NULL)
rte_panic("Cannot allocate memory for private VF data\n");
if (*vfinfo == NULL) {
PMD_INIT_LOG(ERR,
"Cannot allocate memory for private VF data\n");
return -ENOMEM;
}
rte_eth_switch_domain_alloc(&(*vfinfo)->switch_domain_id);
ret = rte_eth_switch_domain_alloc(&(*vfinfo)->switch_domain_id);
if (ret) {
PMD_INIT_LOG(ERR,
"failed to allocate switch domain for device %d", ret);
rte_free(*vfinfo);
*vfinfo = NULL;
return ret;
}
memset(mirror_info, 0, sizeof(struct txgbe_mirror_info));
memset(uta_info, 0, sizeof(struct txgbe_uta_info));
@ -114,6 +125,8 @@ void txgbe_pf_host_init(struct rte_eth_dev *eth_dev)
/* set mb interrupt mask */
txgbe_mb_intr_setup(eth_dev);
return ret;
}
void txgbe_pf_host_uninit(struct rte_eth_dev *eth_dev)