From: "Stillwell Jr, Paul M" <paul.m.stillwell.jr@intel.com>
To: "Yang, Qiming" <qiming.yang@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "Lu, Wenzhuo" <wenzhuo.lu@intel.com>,
"Yang, Qiming" <qiming.yang@intel.com>,
"stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH] net/ice: fix link status recovery
Date: Mon, 4 Nov 2019 15:02:31 +0000 [thread overview]
Message-ID: <BN8PR11MB38286BBFD3DF4BB43EEE86C5E07F0@BN8PR11MB3828.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20191104054005.146150-1-qiming.yang@intel.com>
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Qiming Yang
> Sent: Sunday, November 3, 2019 9:40 PM
> To: dev@dpdk.org
> Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/ice: fix link status recovery
>
> This patch fix a kernel driver link status issue by recovering link status when
> device stop.
>
> Fixes: e6161345d8a9 ("net/ice: support link status change")
> Cc: stable@dpdk.org
>
> Signed-off-by: Qiming Yang <qiming.yang@intel.com>
> ---
> drivers/net/ice/ice_ethdev.c | 26 +++++++++++++++++++++++++-
> drivers/net/ice/ice_ethdev.h | 1 +
> 2 files changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
> index d746758..c9972cf 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -2277,7 +2277,10 @@ ice_dev_stop(struct rte_eth_dev *dev)
> /* Clear all queues and release mbufs */
> ice_clear_queues(dev);
>
> - ice_dev_set_link_down(dev);
> + if (pf->init_link_status)
> + ice_dev_set_link_up(dev);
> + else
> + ice_dev_set_link_down(dev);
>
> /* Clean datapath event and queue/vec mapping */
> rte_intr_efd_disable(intr_handle);
> @@ -2648,6 +2651,25 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev)
> return 0;
> }
>
> +static void ice_get_init_link_status(struct rte_eth_dev *dev) {
> + struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> + struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data-
> >dev_private);
> + bool enable_lse = dev->data->dev_conf.intr_conf.lsc ? true : false;
> + struct ice_link_status link_status;
> + int ret;
> +
> + ret = ice_aq_get_link_info(hw->port_info, enable_lse,
> + &link_status, NULL);
> + if (ret != ICE_SUCCESS) {
> + PMD_DRV_LOG(ERR, "Failed to get link info");
> + pf->init_link_status = false;
You should probably just return here instead of continuing on. If the FW doesn't clear out the link_status variable then there could be garbage in there that would match the test below for link_info & ICE_AQ_LINK_UP, thus setting init_link_status to true after you just set it to false.
> + }
> +
> + if (link_status.link_info & ICE_AQ_LINK_UP)
> + pf->init_link_status = true;
> +}
> +
> static int
> ice_dev_start(struct rte_eth_dev *dev)
> {
> @@ -2717,6 +2739,8 @@ ice_dev_start(struct rte_eth_dev *dev)
> if (ret != ICE_SUCCESS)
> PMD_DRV_LOG(WARNING, "Fail to set phy mask");
>
> + ice_get_init_link_status(dev);
> +
> ice_dev_set_link_up(dev);
>
> /* Call get_link_info aq commond to enable/disable LSE */ diff --git
> a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index
> de67e59..27db4e7 100644
> --- a/drivers/net/ice/ice_ethdev.h
> +++ b/drivers/net/ice/ice_ethdev.h
> @@ -369,6 +369,7 @@ struct ice_pf {
> struct ice_parser_list rss_parser_list;
> struct ice_parser_list perm_parser_list;
> struct ice_parser_list dist_parser_list;
> + bool init_link_status;
> };
>
> #define ICE_MAX_QUEUE_NUM 2048
> --
> 2.9.5
next prev parent reply other threads:[~2019-11-04 15:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 5:40 Qiming Yang
2019-11-04 15:02 ` Stillwell Jr, Paul M [this message]
2019-11-05 2:40 ` Yang, Qiming
2019-11-05 5:08 Qiming Yang
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=BN8PR11MB38286BBFD3DF4BB43EEE86C5E07F0@BN8PR11MB3828.namprd11.prod.outlook.com \
--to=paul.m.stillwell.jr@intel.com \
--cc=dev@dpdk.org \
--cc=qiming.yang@intel.com \
--cc=stable@dpdk.org \
--cc=wenzhuo.lu@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).