From: "Gaëtan Rivet" <gaetan.rivet@6wind.com>
To: Matan Azrad <matan@mellanox.com>
Cc: dev@dpdk.org, stable@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v2] net/failsafe: fix tx sub device deactivating
Date: Wed, 16 Aug 2017 16:39:06 +0200 [thread overview]
Message-ID: <20170816143906.GN8124@bidouze.vm.6wind.com> (raw)
In-Reply-To: <1502893168-61001-1-git-send-email-matan@mellanox.com>
On Wed, Aug 16, 2017 at 05:19:28PM +0300, Matan Azrad wrote:
> The corrupted code couldn't recognize that all sub devices
> were not ready for tx traffic when failsafe PMD was trying
> to switch device because of an unreachable condition using.
>
> Hence, the current tx sub device variable was not updated
> correctly.
>
> The fix removed the unreachable branch and added new one
> in the right place respecting the original intent.
>
> Fixes: ebea83f899d8 ("net/failsafe: add plug-in support")
> Fixes: 598fb8aec6f6 ("net/failsafe: support device removal")
> Cc: stable@dpdk.org
>
> Signed-off-by: Matan Azrad <matan@mellanox.com>
> Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>
> ---
> drivers/net/failsafe/failsafe_private.h | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
> index 0361cf4..ef646db 100644
> --- a/drivers/net/failsafe/failsafe_private.h
> +++ b/drivers/net/failsafe/failsafe_private.h
> @@ -334,7 +334,7 @@ fs_switch_dev(struct rte_eth_dev *dev,
> } else if ((txd && txd->state < req_state) ||
> txd == NULL ||
> txd == banned) {
> - struct sub_device *sdev;
> + struct sub_device *sdev = NULL;
Good catch, actually this makes me think that the FOREACH_SUBDEV_STATE
macro is not following the usual tailq API (which sets the iterator to
NULL upon terminating). This can throw-off the unsuspecting writer.
I will fix this soon™. In the meantime, sdev should be initialized to
NULL.
> uint8_t i;
>
> /* Using acceptable device */
> @@ -346,9 +346,10 @@ fs_switch_dev(struct rte_eth_dev *dev,
> PRIV(dev)->subs_tx = i;
> break;
> }
> - } else if (txd && txd->state < req_state) {
> - DEBUG("No device ready, deactivating tx_dev");
> - PRIV(dev)->subs_tx = PRIV(dev)->subs_tail;
> + if (i >= PRIV(dev)->subs_tail || sdev == NULL) {
> + DEBUG("No device ready, deactivating tx_dev");
> + PRIV(dev)->subs_tx = PRIV(dev)->subs_tail;
> + }
> } else {
> return;
> }
> --
> 2.7.4
>
--
Gaëtan Rivet
6WIND
next prev parent reply other threads:[~2017-08-16 14:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-15 6:59 [dpdk-dev] [PATCH] " Matan Azrad
2017-08-16 8:46 ` Gaëtan Rivet
2017-08-16 9:02 ` Matan Azrad
2017-08-16 12:51 ` Gaëtan Rivet
2017-08-16 14:19 ` [dpdk-dev] [PATCH v2] " Matan Azrad
2017-08-16 14:39 ` Gaëtan Rivet [this message]
2017-08-16 14:53 ` Matan Azrad
2017-08-21 12:56 ` [dpdk-dev] [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=20170816143906.GN8124@bidouze.vm.6wind.com \
--to=gaetan.rivet@6wind.com \
--cc=dev@dpdk.org \
--cc=matan@mellanox.com \
--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 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).