From: Stephen Hemminger <stephen@networkplumber.org>
To: Jianfeng Tan <jianfeng.tan@intel.com>
Cc: dev@dpdk.org, yuanhan.liu@linux.intel.com,
zhihong.wang@intel.com, lining18@jd.com
Subject: Re: [dpdk-dev] [PATCH 3/3] net/virtio_user: fix dev not freed after init error
Date: Fri, 5 Aug 2016 09:34:13 -0700 [thread overview]
Message-ID: <20160805093413.431ba323@xeon-e3> (raw)
In-Reply-To: <1470397003-5782-4-git-send-email-jianfeng.tan@intel.com>
On Fri, 5 Aug 2016 11:36:43 +0000
Jianfeng Tan <jianfeng.tan@intel.com> wrote:
> diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
> index daef09b..62ccb0b 100644
> --- a/drivers/net/virtio/virtio_user_ethdev.c
> +++ b/drivers/net/virtio/virtio_user_ethdev.c
> @@ -313,6 +313,17 @@ virtio_user_eth_dev_alloc(const char *name)
> return eth_dev;
> }
>
> +static void
> +virtio_user_eth_dev_free(struct rte_eth_dev *eth_dev)
> +{
> + struct rte_eth_dev_data *data = eth_dev->data;
> + struct virtio_hw *hw = data->dev_private;
> +
> + rte_free(hw->virtio_user_dev);
> + rte_free(hw);
> + rte_eth_dev_release_port(eth_dev);
> +}
> +
> /* Dev initialization routine. Invoked once for each virtio vdev at
> * EAL init time, see rte_eal_dev_init().
> * Returns 0 on success.
> @@ -328,7 +339,7 @@ virtio_user_pmd_devinit(const char *name, const char *params)
> uint64_t queue_size = VIRTIO_USER_DEF_Q_SZ;
> char *path = NULL;
> char *mac_addr = NULL;
> - int ret = -1;
> + int result = -1, ret;
It is not clear why two return value variables are needed?
>
> if (!params || params[0] == '\0') {
> PMD_INIT_LOG(ERR, "arg %s is mandatory for virtio_user",
> @@ -411,15 +422,19 @@ virtio_user_pmd_devinit(const char *name, const char *params)
>
> hw = eth_dev->data->dev_private;
> if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
> - queue_size, mac_addr) < 0)
> + queue_size, mac_addr) < 0) {
> + PMD_INIT_LOG(ERR, "virtio_user_dev_init fails");
> + virtio_user_eth_dev_free(eth_dev);
> goto end;
> + }
>
> /* previously called by rte_eal_pci_probe() for physical dev */
> if (eth_virtio_dev_init(eth_dev) < 0) {
> PMD_INIT_LOG(ERR, "eth_virtio_dev_init fails");
> + virtio_user_eth_dev_free(eth_dev);
> goto end;
> }
> - ret = 0;
> + result = 0;
>
> end:
> if (kvlist)
> @@ -428,7 +443,7 @@ end:
> free(path);
> if (mac_addr)
> free(mac_addr);
Unrelated, but this code could eliminate those if () tests.
> - return ret;
> + return result;
> }
next prev parent reply other threads:[~2016-08-05 16:34 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-05 11:36 [dpdk-dev] [PATCH 0/3] fix virtio_user issues Jianfeng Tan
2016-08-05 11:36 ` [dpdk-dev] [PATCH 1/3] net/virtio_user: fix queue pair not enabled Jianfeng Tan
2016-09-06 6:30 ` Yuanhan Liu
2016-08-05 11:36 ` [dpdk-dev] [PATCH 2/3] net/virtio_user: fix wrong sequence of messages Jianfeng Tan
2016-08-05 16:36 ` Stephen Hemminger
2016-08-08 1:19 ` Tan, Jianfeng
2016-09-06 6:42 ` Yuanhan Liu
2016-09-06 7:54 ` Tan, Jianfeng
2016-09-06 8:20 ` Yuanhan Liu
2016-09-08 8:53 ` Tan, Jianfeng
2016-09-08 12:18 ` Yuanhan Liu
2016-09-09 3:59 ` Tan, Jianfeng
2016-09-09 4:19 ` Yuanhan Liu
2016-09-09 5:50 ` Tan, Jianfeng
2016-09-09 6:03 ` Yuanhan Liu
2016-09-09 6:24 ` Tan, Jianfeng
2016-09-09 6:31 ` Yuanhan Liu
2016-08-05 11:36 ` [dpdk-dev] [PATCH 3/3] net/virtio_user: fix dev not freed after init error Jianfeng Tan
2016-08-05 16:34 ` Stephen Hemminger [this message]
2016-08-08 1:07 ` Tan, Jianfeng
2016-08-29 7:01 ` [dpdk-dev] [PATCH 0/3] fix virtio_user issues Christian Ehrhardt
2016-09-27 19:11 ` [dpdk-dev] [PATCH v2 " Jianfeng Tan
2016-09-27 19:11 ` [dpdk-dev] [PATCH v2 1/3] net/virtio_user: fix queue pair not enabled Jianfeng Tan
2016-09-28 0:05 ` Yuanhan Liu
2016-09-27 19:11 ` [dpdk-dev] [PATCH v2 2/3] net/virtio_user: fix wrong sequence of messages Jianfeng Tan
2016-09-27 19:11 ` [dpdk-dev] [PATCH v2 3/3] net/virtio_user: fix dev not freed after init error Jianfeng Tan
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=20160805093413.431ba323@xeon-e3 \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
--cc=jianfeng.tan@intel.com \
--cc=lining18@jd.com \
--cc=yuanhan.liu@linux.intel.com \
--cc=zhihong.wang@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).