From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 905E5A0353; Wed, 13 Nov 2019 03:11:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 098122BA2; Wed, 13 Nov 2019 03:11:01 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id DC7B52B8B for ; Wed, 13 Nov 2019 03:10:59 +0100 (CET) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Nov 2019 18:10:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,298,1569308400"; d="scan'208";a="235099241" Received: from yexl-server.sh.intel.com (HELO localhost) ([10.67.117.17]) by fmsmga002.fm.intel.com with ESMTP; 12 Nov 2019 18:10:57 -0800 Date: Wed, 13 Nov 2019 10:07:42 +0800 From: Ye Xiaolong To: Simei Su Cc: qi.z.zhang@intel.com, qiming.yang@intel.com, dev@dpdk.org Message-ID: <20191113020742.GA4784@intel.com> References: <1573028777-185130-1-git-send-email-simei.su@intel.com> <1573105623-231389-1-git-send-email-simei.su@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1573105623-231389-1-git-send-email-simei.su@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-dev] [PATCH v3] net/ice: fix segmentation fault with a wrong package 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 11/07, Simei Su wrote: >This patch fixes core dump issue when entering safe mode with a >wrong ice.pkg. In safe mode, rte_flow is not supported and it >won't initialize any flow engine. > >Fixes: 7615a6895009 ("net/ice: rework for generic flow enabling") > >Signed-off-by: Simei Su >--- > drivers/net/ice/ice_ethdev.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > >diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c >index d81eb5e..2a28d8e 100644 >--- a/drivers/net/ice/ice_ethdev.c >+++ b/drivers/net/ice/ice_ethdev.c >@@ -2164,10 +2164,12 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) > /* get base queue pairs index in the device */ > ice_base_queue_get(pf); > >- ret = ice_flow_init(ad); >- if (ret) { >- PMD_INIT_LOG(ERR, "Failed to initialize flow"); >- return ret; >+ if (!ad->is_safe_mode) { >+ ret = ice_flow_init(ad); >+ if (ret) { >+ PMD_INIT_LOG(ERR, "Failed to initialize flow"); >+ return ret; >+ } > } > > ret = ice_reset_fxp_resource(hw); >@@ -2311,7 +2313,8 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) > > ice_dev_stop(dev); > >- ice_flow_uninit(ad); >+ if (!ad->is_safe_mode) >+ ice_flow_uninit(ad); > > /* release all queue resource */ > ice_free_queues(dev); >-- >1.8.3.1 > Applied to dpdk-next-net-intel. Thanks.