From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by dpdk.org (Postfix) with ESMTP id 003A57260 for ; Thu, 19 Apr 2018 19:26:22 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 94979EB6E5; Thu, 19 Apr 2018 17:26:22 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-2.ams2.redhat.com [10.36.117.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BA8B2026985; Thu, 19 Apr 2018 17:26:20 +0000 (UTC) To: Arnon Warshavsky , 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 References: <1524117669-25729-1-git-send-email-arnon@qwilt.com> <1524117669-25729-5-git-send-email-arnon@qwilt.com> From: Kevin Traynor Organization: Red Hat Message-ID: <9150e0ac-5ec5-e40d-1304-124644d67d67@redhat.com> Date: Thu, 19 Apr 2018 18:26:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.0 MIME-Version: 1.0 In-Reply-To: <1524117669-25729-5-git-send-email-arnon@qwilt.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 19 Apr 2018 17:26:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 19 Apr 2018 17:26:22 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ktraynor@redhat.com' RCPT:'' Subject: Re: [dpdk-dev] [PATCH v4 04/11] ixgbe: replace rte_panic instances in ixgbe driver X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Apr 2018 17:26:23 -0000 On 04/19/2018 07:01 AM, Arnon Warshavsky wrote: > replace panic calls with log and retrun value. typo return, seems to be in a few commit msgs > Local function to this file, > changing from void to int is non-abi-breaking > > Signed-off-by: Arnon Warshavsky > --- > drivers/net/ixgbe/ixgbe_ethdev.c | 3 ++- > drivers/net/ixgbe/ixgbe_ethdev.h | 2 +- > drivers/net/ixgbe/ixgbe_pf.c | 13 +++++++++---- > 3 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c > index a5e2fc0..c7797f1 100644 > --- a/drivers/net/ixgbe/ixgbe_ethdev.c > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c > @@ -1224,7 +1224,8 @@ struct rte_ixgbe_xstats_name_off { > memset(hwstrip, 0, sizeof(*hwstrip)); > > /* initialize PF if max_vfs not zero */ > - ixgbe_pf_host_init(eth_dev); > + if (ixgbe_pf_host_init(eth_dev) != 0) > + return -1; similar comment as previous patch about using an appropriate return value > > ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT); > /* let hardware know driver is loaded */ > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h > index 6550777..8bb41ec 100644 > --- a/drivers/net/ixgbe/ixgbe_ethdev.h > +++ b/drivers/net/ixgbe/ixgbe_ethdev.h > @@ -661,7 +661,7 @@ int ixgbe_fdir_filter_program(struct rte_eth_dev *dev, > > void ixgbe_vlan_hw_strip_config(struct rte_eth_dev *dev); > > -void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev); > +int ixgbe_pf_host_init(struct rte_eth_dev *eth_dev); > > void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev); > > diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c > index 4e61310..4cd3651 100644 > --- a/drivers/net/ixgbe/ixgbe_pf.c > +++ b/drivers/net/ixgbe/ixgbe_pf.c > @@ -66,7 +66,7 @@ int ixgbe_vf_perm_addr_gen(struct rte_eth_dev *dev, uint16_t vf_num) > return 0; > } > > -void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev) > +int ixgbe_pf_host_init(struct rte_eth_dev *eth_dev) > { > struct ixgbe_vf_info **vfinfo = > IXGBE_DEV_PRIVATE_TO_P_VFDATA(eth_dev->data->dev_private); > @@ -84,11 +84,14 @@ void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev) > RTE_ETH_DEV_SRIOV(eth_dev).active = 0; > vf_num = dev_num_vf(eth_dev); > if (vf_num == 0) > - return; > + return 0; > > *vfinfo = rte_zmalloc("vf_info", sizeof(struct ixgbe_vf_info) * vf_num, 0); > - if (*vfinfo == NULL) > - rte_panic("Cannot allocate memory for private VF data\n"); > + if (*vfinfo == NULL) { > + RTE_LOG(ERR, PMD, "%s() Cannot allocate memory for private VF data\n", > + __func__); > + return -1; > + } > > memset(mirror_info, 0, sizeof(struct ixgbe_mirror_info)); > memset(uta_info, 0, sizeof(struct ixgbe_uta_info)); > @@ -116,6 +119,8 @@ void ixgbe_pf_host_init(struct rte_eth_dev *eth_dev) > > /* set mb interrupt mask */ > ixgbe_mb_intr_setup(eth_dev); > + > + return 0; > } > > void ixgbe_pf_host_uninit(struct rte_eth_dev *eth_dev) >