From: "Zhang, Helin" <helin.zhang@intel.com>
To: "Zhao1, Wei" <wei.zhao1@intel.com>, "dev@dpdk.org" <dev@dpdk.org>,
"Zhang, Qi Z" <qi.z.zhang@intel.com>
Subject: Re: [dpdk-dev] [PATCH v4] net/i40e: fix port segmentation fault when restart
Date: Sat, 13 Jan 2018 15:29:56 +0000 [thread overview]
Message-ID: <F35DEAC7BCE34641BA9FAC6BCA4A12E71ACFCDB9@SHSMSX103.ccr.corp.intel.com> (raw)
In-Reply-To: <20180112065919.64982-1-wei.zhao1@intel.com>
> -----Original Message-----
> From: Zhao1, Wei
> Sent: Friday, January 12, 2018 2:59 PM
> To: dev@dpdk.org
> Cc: Zhang, Helin; Zhao1, Wei
> Subject: [PATCH v4] net/i40e: fix port segmentation fault when restart
>
> This patch will go into the process of clear all queue region related
> configuration when dev stop even if there is no queue region command before,
> so this is a bug, it may cause error. So add code to check if there is queue
> configuration exist when flush queue region config and remove this process
> when device stop. Queue region clear only do when device initialization or
> PMD get flush command.
>
> Fixes: 7cbecc2f742 ("net/i40e: support queue region set and flush")
>
> Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel, with minor commit log changes. Thanks!
BTW, I replied v3 email with a mistake, though v4 just modifed the commit log a bit.
Sorry for any confusing!
/Helin
>
> ---
>
> v2:
> -fix patch check warning.
>
> v3:
> -add more log message.
>
> v4:
> -add more log message.
> ---
> drivers/net/i40e/i40e_ethdev.c | 3 --- drivers/net/i40e/rte_pmd_i40e.c | 27
> ++++++++++++++-------------
> 2 files changed, 14 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index d80671a..5d1b916 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -2144,9 +2144,6 @@ i40e_dev_stop(struct rte_eth_dev *dev)
> /* reset hierarchy commit */
> pf->tm_conf.committed = false;
>
> - /* Remove all the queue region configuration */
> - i40e_flush_queue_region_all_conf(dev, hw, pf, 0);
> -
> hw->adapter_stopped = 1;
> }
>
> diff --git a/drivers/net/i40e/rte_pmd_i40e.c
> b/drivers/net/i40e/rte_pmd_i40e.c index 55ae2fe..2cb22d4 100644
> --- a/drivers/net/i40e/rte_pmd_i40e.c
> +++ b/drivers/net/i40e/rte_pmd_i40e.c
> @@ -2816,22 +2816,23 @@ i40e_flush_queue_region_all_conf(struct
> rte_eth_dev *dev,
> return 0;
> }
>
> - info->queue_region_number = 1;
> - info->region[0].queue_num = main_vsi->nb_used_qps;
> - info->region[0].queue_start_index = 0;
> + if (info->queue_region_number) {
> + info->queue_region_number = 1;
> + info->region[0].queue_num = main_vsi->nb_used_qps;
> + info->region[0].queue_start_index = 0;
>
> - ret = i40e_vsi_update_queue_region_mapping(hw, pf);
> - if (ret != I40E_SUCCESS)
> - PMD_DRV_LOG(INFO, "Failed to flush queue region mapping.");
> -
> - ret = i40e_dcb_init_configure(dev, TRUE);
> - if (ret != I40E_SUCCESS) {
> - PMD_DRV_LOG(INFO, "Failed to flush dcb.");
> - pf->flags &= ~I40E_FLAG_DCB;
> - }
> + ret = i40e_vsi_update_queue_region_mapping(hw, pf);
> + if (ret != I40E_SUCCESS)
> + PMD_DRV_LOG(INFO, "Failed to flush queue region
> mapping.");
>
> - i40e_init_queue_region_conf(dev);
> + ret = i40e_dcb_init_configure(dev, TRUE);
> + if (ret != I40E_SUCCESS) {
> + PMD_DRV_LOG(INFO, "Failed to flush dcb.");
> + pf->flags &= ~I40E_FLAG_DCB;
> + }
>
> + i40e_init_queue_region_conf(dev);
> + }
> return 0;
> }
>
> --
> 2.9.3
prev parent reply other threads:[~2018-01-13 15:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-15 5:46 [dpdk-dev] [PATCH] " Wei Zhao
2017-11-15 5:55 ` [dpdk-dev] [PATCH v2] " Wei Zhao
2017-12-22 3:30 ` Zhang, Qi Z
2018-01-03 6:10 ` Zhao1, Wei
2018-01-03 7:17 ` [dpdk-dev] [PATCH v3] " Wei Zhao
2018-01-03 8:19 ` Zhang, Qi Z
2018-01-13 6:04 ` Zhang, Helin
2018-01-12 6:59 ` [dpdk-dev] [PATCH v4] " Wei Zhao
2018-01-13 15:29 ` Zhang, Helin [this message]
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=F35DEAC7BCE34641BA9FAC6BCA4A12E71ACFCDB9@SHSMSX103.ccr.corp.intel.com \
--to=helin.zhang@intel.com \
--cc=dev@dpdk.org \
--cc=qi.z.zhang@intel.com \
--cc=wei.zhao1@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).