From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id E22103257 for ; Sat, 13 Jan 2018 16:29:59 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jan 2018 07:29:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,354,1511856000"; d="scan'208";a="9464312" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga007.fm.intel.com with ESMTP; 13 Jan 2018 07:29:58 -0800 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 13 Jan 2018 07:29:58 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 13 Jan 2018 07:29:57 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.213]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.93]) with mapi id 14.03.0319.002; Sat, 13 Jan 2018 23:29:56 +0800 From: "Zhang, Helin" To: "Zhao1, Wei" , "dev@dpdk.org" , "Zhang, Qi Z" Thread-Topic: [PATCH v4] net/i40e: fix port segmentation fault when restart Thread-Index: AQHTi3QDb/JYEn27W0y06947sK63LqNx724g Date: Sat, 13 Jan 2018 15:29:56 +0000 Message-ID: References: <20180103071721.51986-1-wei.zhao1@intel.com> <20180112065919.64982-1-wei.zhao1@intel.com> In-Reply-To: <20180112065919.64982-1-wei.zhao1@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v4] net/i40e: fix port segmentation fault when restart X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Jan 2018 15:30:00 -0000 > -----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 >=20 > 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 befo= re, > so this is a bug, it may cause error. So add code to check if there is qu= eue > configuration exist when flush queue region config and remove this proces= s > when device stop. Queue region clear only do when device initialization o= r > PMD get flush command. >=20 > Fixes: 7cbecc2f742 ("net/i40e: support queue region set and flush") >=20 > Signed-off-by: Wei Zhao > Acked-by: Qi Zhang 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 l= og a bit. Sorry for any confusing! /Helin >=20 > --- >=20 > v2: > -fix patch check warning. >=20 > v3: > -add more log message. >=20 > 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(-) >=20 > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethde= v.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 =3D false; >=20 > - /* Remove all the queue region configuration */ > - i40e_flush_queue_region_all_conf(dev, hw, pf, 0); > - > hw->adapter_stopped =3D 1; > } >=20 > 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; > } >=20 > - info->queue_region_number =3D 1; > - info->region[0].queue_num =3D main_vsi->nb_used_qps; > - info->region[0].queue_start_index =3D 0; > + if (info->queue_region_number) { > + info->queue_region_number =3D 1; > + info->region[0].queue_num =3D main_vsi->nb_used_qps; > + info->region[0].queue_start_index =3D 0; >=20 > - ret =3D i40e_vsi_update_queue_region_mapping(hw, pf); > - if (ret !=3D I40E_SUCCESS) > - PMD_DRV_LOG(INFO, "Failed to flush queue region mapping."); > - > - ret =3D i40e_dcb_init_configure(dev, TRUE); > - if (ret !=3D I40E_SUCCESS) { > - PMD_DRV_LOG(INFO, "Failed to flush dcb."); > - pf->flags &=3D ~I40E_FLAG_DCB; > - } > + ret =3D i40e_vsi_update_queue_region_mapping(hw, pf); > + if (ret !=3D I40E_SUCCESS) > + PMD_DRV_LOG(INFO, "Failed to flush queue region > mapping."); >=20 > - i40e_init_queue_region_conf(dev); > + ret =3D i40e_dcb_init_configure(dev, TRUE); > + if (ret !=3D I40E_SUCCESS) { > + PMD_DRV_LOG(INFO, "Failed to flush dcb."); > + pf->flags &=3D ~I40E_FLAG_DCB; > + } >=20 > + i40e_init_queue_region_conf(dev); > + } > return 0; > } >=20 > -- > 2.9.3