From: Kevin Traynor <ktraynor@redhat.com>
To: Arnon Warshavsky <arnon@qwilt.com>,
thomas@monjalon.net, anatoly.burakov@intel.com,
wenzhuo.lu@intel.com, declan.doherty@intel.com,
jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com,
ferruh.yigit@intel.com
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v4 03/11] e1000: replace rte_panic instances in e1000 driver
Date: Thu, 19 Apr 2018 18:25:54 +0100 [thread overview]
Message-ID: <6d3e4e56-e46d-7116-5812-000eeff18d77@redhat.com> (raw)
In-Reply-To: <1524117669-25729-4-git-send-email-arnon@qwilt.com>
On 04/19/2018 07:01 AM, Arnon Warshavsky wrote:
> replace panic calls with log and retrun value.
> Local function to this file,
> changing from void to int is non-abi-breaking
> --
> v4 - keep error message literal string in a singhle line
>
> 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(-)
>
> diff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_ethdev.h
> index 6354b89..2e527de 100644
> --- a/drivers/net/e1000/e1000_ethdev.h
> +++ b/drivers/net/e1000/e1000_ethdev.h
> @@ -411,7 +411,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);
>
> diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
> index 9b808a9..4479616 100644
> --- a/drivers/net/e1000/igb_ethdev.c
> +++ b/drivers/net/e1000/igb_ethdev.c
> @@ -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)
You don't need "!= 0"
You need to set "error" here, or else return it from igb_pf_host_init().
We know -ENOMEM is the only error that can be returned from
igb_pf_host_init() but not sure if should assume that.
> + goto err_late;
>
> ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
> /* Set PF Reset Done bit so PF/VF Mail Ops can work */
> diff --git a/drivers/net/e1000/igb_pf.c b/drivers/net/e1000/igb_pf.c
> index b9f2e53..ae4b0a4 100644
> --- a/drivers/net/e1000/igb_pf.c
> +++ b/drivers/net/e1000/igb_pf.c
> @@ -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)
>
next prev parent reply other threads:[~2018-04-19 17:25 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 6:00 [dpdk-dev] [PATCH v4 00/11] eal: replace calls to rte_panic and refrain from new instances Arnon Warshavsky
2018-04-19 6:00 ` [dpdk-dev] [PATCH v4 01/11] crypto: replace rte_panic instances in crypto driver Arnon Warshavsky
2018-04-19 10:53 ` Trahe, Fiona
2018-04-19 13:49 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 02/11] bond: replace rte_panic instances in bonding driver Arnon Warshavsky
2018-04-19 17:25 ` Kevin Traynor
2018-04-20 13:13 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 03/11] e1000: replace rte_panic instances in e1000 driver Arnon Warshavsky
2018-04-19 17:25 ` Kevin Traynor [this message]
2018-04-20 13:14 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 04/11] ixgbe: replace rte_panic instances in ixgbe driver Arnon Warshavsky
2018-04-19 17:26 ` Kevin Traynor
2018-04-20 13:16 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 05/11] eal: replace rte_panic instances in eventdev Arnon Warshavsky
2018-04-19 17:26 ` Kevin Traynor
2018-04-20 13:17 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 06/11] kni: replace rte_panic instances in kni Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 07/11] eal: replace rte_panic instances in hugepage_info Arnon Warshavsky
2018-04-19 14:03 ` Burakov, Anatoly
2018-04-19 14:09 ` Arnon Warshavsky
2018-04-19 14:45 ` Burakov, Anatoly
2018-04-19 14:50 ` Burakov, Anatoly
2018-04-20 13:11 ` Arnon Warshavsky
2018-04-19 14:36 ` Kevin Traynor
2018-04-20 13:12 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 08/11] eal: replace rte_panic instances in interrupts thread Arnon Warshavsky
2018-04-19 17:27 ` Kevin Traynor
2018-04-20 13:18 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 09/11] eal: replace rte_panic instances in ethdev Arnon Warshavsky
2018-04-19 17:27 ` Kevin Traynor
2018-04-20 13:23 ` Arnon Warshavsky
2018-04-20 13:56 ` Thomas Monjalon
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 10/11] eal: replace rte_panic instances in init sequence Arnon Warshavsky
2018-04-19 14:39 ` Burakov, Anatoly
2018-04-19 14:48 ` Arnon Warshavsky
2018-04-19 14:57 ` Burakov, Anatoly
2018-04-19 17:31 ` Kevin Traynor
2018-04-20 13:32 ` Arnon Warshavsky
2018-04-20 13:31 ` Arnon Warshavsky
2018-04-19 17:48 ` Aaron Conole
2018-04-20 13:55 ` Arnon Warshavsky
2018-04-20 14:53 ` Aaron Conole
2018-04-23 8:07 ` Arnon Warshavsky
2018-04-19 6:01 ` [dpdk-dev] [PATCH v4 11/11] devtools: prevent new instances of rte_panic and rte_exit Arnon Warshavsky
2018-04-19 17:52 ` Aaron Conole
2018-04-20 14:01 ` Arnon Warshavsky
2018-04-20 15:41 ` Burakov, Anatoly
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6d3e4e56-e46d-7116-5812-000eeff18d77@redhat.com \
--to=ktraynor@redhat.com \
--cc=anatoly.burakov@intel.com \
--cc=arnon@qwilt.com \
--cc=bruce.richardson@intel.com \
--cc=declan.doherty@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=jerin.jacob@caviumnetworks.com \
--cc=thomas@monjalon.net \
--cc=wenzhuo.lu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).