From: "Gaëtan Rivet" <gaetan.rivet@6wind.com>
To: Andrew Rybchenko <arybchenko@solarflare.com>
Cc: dev@dpdk.org, Igor Romanov <igor.romanov@oktetlabs.ru>, stable@dpdk.org
Subject: Re: [PATCH] net/failsafe: fix crash on slave queue release
Date: Wed, 19 Sep 2018 17:14:49 +0200 [thread overview]
Message-ID: <20180919151449.s2em4hgf7hti5jfg@bidouze.vm.6wind.com> (raw)
In-Reply-To: <1535732192-3058-1-git-send-email-arybchenko@solarflare.com>
On Fri, Aug 31, 2018 at 05:16:32PM +0100, Andrew Rybchenko wrote:
> From: Igor Romanov <igor.romanov@oktetlabs.ru>
>
> Releasing a queue that is already released by slave may cause a
> segmentation fault. For example, after a successfull device
> configuration a queue is set up. Afterwards the device is reconfigured
> with an invalid argument, forcing slaves to release the queues
> (e.g. rte_eth_dev.data.tx_queues). Finally the failsafe's queues
> are released. The queue release functions also try to release slaves'
> queues using ETH(sdev)->data->tx_queues which is NULL at the time.
>
> Add checks for NULL slaves' Tx and Rx queues before releasing them.
>
> Fixes: a46f8d584eb8 ("net/failsafe: add fail-safe PMD")
> Cc: stable@dpdk.org
>
> Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>
> ---
> drivers/net/failsafe/failsafe_ops.c | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
> index 24e91c931..94b9769e7 100644
> --- a/drivers/net/failsafe/failsafe_ops.c
> +++ b/drivers/net/failsafe/failsafe_ops.c
> @@ -309,9 +309,13 @@ fs_rx_queue_release(void *queue)
> fs_lock(dev, 0);
> if (rxq->event_fd > 0)
> close(rxq->event_fd);
> - FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
> - SUBOPS(sdev, rx_queue_release)
> - (ETH(sdev)->data->rx_queues[rxq->qid]);
> + FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
> + if (ETH(sdev)->data->rx_queues != NULL &&
> + ETH(sdev)->data->rx_queues[rxq->qid] != NULL) {
> + SUBOPS(sdev, rx_queue_release)
> + (ETH(sdev)->data->rx_queues[rxq->qid]);
> + }
> + }
> dev->data->rx_queues[rxq->qid] = NULL;
> rte_free(rxq);
> fs_unlock(dev, 0);
> @@ -477,9 +481,13 @@ fs_tx_queue_release(void *queue)
> txq = queue;
> dev = txq->priv->dev;
> fs_lock(dev, 0);
> - FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
> - SUBOPS(sdev, tx_queue_release)
> - (ETH(sdev)->data->tx_queues[txq->qid]);
> + FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
> + if (ETH(sdev)->data->tx_queues != NULL &&
> + ETH(sdev)->data->tx_queues[txq->qid] != NULL) {
> + SUBOPS(sdev, tx_queue_release)
> + (ETH(sdev)->data->tx_queues[txq->qid]);
> + }
> + }
> dev->data->tx_queues[txq->qid] = NULL;
> rte_free(txq);
> fs_unlock(dev, 0);
> --
> 2.17.1
>
--
Gaëtan Rivet
6WIND
next prev parent reply other threads:[~2018-09-19 15:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-31 16:16 [PATCH] net/failsafe: fix crash on slave queue release Andrew Rybchenko
2018-09-19 15:14 ` Gaëtan Rivet [this message]
2018-09-21 0:05 ` [dpdk-stable] " Ferruh Yigit
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=20180919151449.s2em4hgf7hti5jfg@bidouze.vm.6wind.com \
--to=gaetan.rivet@6wind.com \
--cc=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=igor.romanov@oktetlabs.ru \
--cc=stable@dpdk.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.