From: Declan Doherty <declan.doherty@intel.com>
To: Yaacov Hazan <yaacovh@mellanox.com>, dev@dpdk.org
Cc: Raslsn Darawsheh <rdarawsheh@asaltech.com>
Subject: Re: [dpdk-dev] [PATCH v2] net:bonding: fix free_queues function when no queues exist
Date: Thu, 29 Oct 2015 16:25:03 +0000 [thread overview]
Message-ID: <5632485F.8070104@intel.com> (raw)
In-Reply-To: <1445843277-10934-1-git-send-email-yaacovh@mellanox.com>
On 26/10/15 07:07, Yaacov Hazan wrote:
> From: Raslsn Darawsheh <rdarawsheh@asaltech.com>
>
> In case of creating bond device without add any slaves and
> quit from testpmd, application crashed since rx/tx queues
> are NULL.
>
> add checking of this paramters before trying to free.
>
> Signed-off-by: Raslsn Darawsheh <rdarawsheh@asaltech.com>
> Signed-off-by: Yaacov Hazan <yaacovh@mellanox.com>
> ---
> in previous patch there was mismatch in the solution.
> this patch is the correct fix for the described bug
>
> drivers/net/bonding/rte_eth_bond_pmd.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
> index 5cc6372..383fdcf 100644
> --- a/drivers/net/bonding/rte_eth_bond_pmd.c
> +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
> @@ -1517,17 +1517,21 @@ bond_ethdev_free_queues(struct rte_eth_dev *dev)
> {
> uint8_t i;
>
> - for (i = 0; i < dev->data->nb_rx_queues; i++) {
> - rte_free(dev->data->rx_queues[i]);
> - dev->data->rx_queues[i] = NULL;
> + if (dev->data->rx_queues != NULL) {
> + for (i = 0; i < dev->data->nb_rx_queues; i++) {
> + rte_free(dev->data->rx_queues[i]);
> + dev->data->rx_queues[i] = NULL;
> + }
> + dev->data->nb_rx_queues = 0;
> }
> - dev->data->nb_rx_queues = 0;
>
> - for (i = 0; i < dev->data->nb_tx_queues; i++) {
> - rte_free(dev->data->tx_queues[i]);
> - dev->data->tx_queues[i] = NULL;
> + if (dev->data->tx_queues != NULL) {
> + for (i = 0; i < dev->data->nb_tx_queues; i++) {
> + rte_free(dev->data->tx_queues[i]);
> + dev->data->tx_queues[i] = NULL;
> + }
> + dev->data->nb_tx_queues = 0;
> }
> - dev->data->nb_tx_queues = 0;
> }
>
> void
>
Acked-by: Declan Doherty <declan.doherty@intel.com>
next prev parent reply other threads:[~2015-10-29 16:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-22 12:55 [dpdk-dev] [PATCH] " Yaacov Hazan
2015-10-26 7:07 ` [dpdk-dev] [PATCH v2] " Yaacov Hazan
2015-10-29 16:25 ` Declan Doherty [this message]
2015-11-04 22:47 ` Thomas Monjalon
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=5632485F.8070104@intel.com \
--to=declan.doherty@intel.com \
--cc=dev@dpdk.org \
--cc=rdarawsheh@asaltech.com \
--cc=yaacovh@mellanox.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).