[dpdk-dev,v3,03/13] e1000: replace rte_panic instances in e1000 driver
Checks
Commit Message
replace panic calls with log and retrun value.
Local function to this file,
changing from void to int is non-abi-breaking
Signed-off-by: Arnon Warshavsky <arnon@qwilt.com>
---
drivers/net/e1000/e1000_ethdev.h | 2 +-
drivers/net/e1000/igb_ethdev.c | 3 ++-
drivers/net/e1000/igb_pf.c | 15 +++++++++------
3 files changed, 12 insertions(+), 8 deletions(-)
Comments
On Fri, 13 Apr 2018 21:30:34 +0300
Arnon Warshavsky <arnon@qwilt.com> wrote:
> + if (*vfinfo == NULL) {
> + RTE_LOG(CRIT, PMD, "%s(): Cannot allocate memory for private "
> + "VF data\n", __func__);
> + return -1;
> + }
>
Don't split strings across lines. Checkpatch should complain about that.
It makes searching for error messages in source harder.
Instead do:
if (!*vfinfo) {
RTE_LOG(CRIT, PMD,
"%s(): Cannot allocate memory for private VF data\n",
__func__);
return -1;
}
Also why not use PMD_DRV_LOG() macro.
Thanks Stephen
I thought I handled all the split strings. Apparently checkpatches
overlooked it.
Will do a rescan on the entire patchset and fix those in v4.
Missed the separate log macro. Will change that as well
On Mon, Apr 16, 2018 at 6:34 PM, Stephen Hemminger <
stephen@networkplumber.org> wrote:
> On Fri, 13 Apr 2018 21:30:34 +0300
> Arnon Warshavsky <arnon@qwilt.com> wrote:
>
> > + if (*vfinfo == NULL) {
> > + RTE_LOG(CRIT, PMD, "%s(): Cannot allocate memory for
> private "
> > + "VF data\n", __func__);
> > + return -1;
> > + }
> >
> Don't split strings across lines. Checkpatch should complain about that.
> It makes searching for error messages in source harder.
>
> Instead do:
> if (!*vfinfo) {
> RTE_LOG(CRIT, PMD,
> "%s(): Cannot allocate memory for private VF
> data\n",
> __func__);
> return -1;
> }
>
> Also why not use PMD_DRV_LOG() macro.
>
@@ -405,7 +405,7 @@ int eth_igb_rss_hash_conf_get(struct rte_eth_dev *dev,
/*
* misc function prototypes
*/
-void igb_pf_host_init(struct rte_eth_dev *eth_dev);
+int igb_pf_host_init(struct rte_eth_dev *eth_dev);
void igb_pf_mbx_process(struct rte_eth_dev *eth_dev);
@@ -833,7 +833,8 @@ static int igb_flex_filter_uninit(struct rte_eth_dev *eth_dev)
}
/* initialize PF if max_vfs not zero */
- igb_pf_host_init(eth_dev);
+ if (igb_pf_host_init(eth_dev) != 0)
+ goto err_late;
ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
/* Set PF Reset Done bit so PF/VF Mail Ops can work */
@@ -63,7 +63,7 @@ int igb_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num)
return 0;
}
-void igb_pf_host_init(struct rte_eth_dev *eth_dev)
+int igb_pf_host_init(struct rte_eth_dev *eth_dev)
{
struct e1000_vf_info **vfinfo =
E1000_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private);
@@ -74,7 +74,7 @@ void igb_pf_host_init(struct rte_eth_dev *eth_dev)
RTE_ETH_DEV_SRIOV(eth_dev).active = 0;
if (0 == (vf_num = dev_num_vf(eth_dev)))
- return;
+ return 0;
if (hw->mac.type == e1000_i350)
nb_queue = 1;
@@ -82,11 +82,14 @@ void igb_pf_host_init(struct rte_eth_dev *eth_dev)
/* per datasheet, it should be 2, but 1 seems correct */
nb_queue = 1;
else
- return;
+ return 0;
*vfinfo = rte_zmalloc("vf_info", sizeof(struct e1000_vf_info) * vf_num, 0);
- if (*vfinfo == NULL)
- rte_panic("Cannot allocate memory for private VF data\n");
+ if (*vfinfo == NULL) {
+ RTE_LOG(CRIT, PMD, "%s(): Cannot allocate memory for private "
+ "VF data\n", __func__);
+ return -1;
+ }
RTE_ETH_DEV_SRIOV(eth_dev).active = ETH_8_POOLS;
RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool = nb_queue;
@@ -98,7 +101,7 @@ void igb_pf_host_init(struct rte_eth_dev *eth_dev)
/* set mb interrupt mask */
igb_mb_intr_setup(eth_dev);
- return;
+ return 0;
}
void igb_pf_host_uninit(struct rte_eth_dev *dev)