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 9F8ADA0526; Tue, 21 Jul 2020 10:08:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 653D11C00D; Tue, 21 Jul 2020 10:08:17 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 38E6F1BFFD; Tue, 21 Jul 2020 10:08:15 +0200 (CEST) IronPort-SDR: gI3usOnSjwUsCG0+jrOUEKTw5bVuSPNmbMiWUVwA5KnRxMf5DqyJUgrFKXYiBKZlk4ZbZu2j0W r2nZlBfJ5B8A== X-IronPort-AV: E=McAfee;i="6000,8403,9688"; a="234941658" X-IronPort-AV: E=Sophos;i="5.75,378,1589266800"; d="scan'208";a="234941658" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2020 01:08:14 -0700 IronPort-SDR: z9nvaIiLBfkZdpU5H56WbM1TDHEhx9BWd0zPX8WIrbSg+OW+lrNTCHsIiOWkr9rKkfDZTLg0gg y7DvhEmsyFQw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,378,1589266800"; d="scan'208";a="301542519" Received: from dut85.sh.intel.com ([10.240.183.157]) by orsmga002.jf.intel.com with ESMTP; 21 Jul 2020 01:08:12 -0700 From: Jiang Mao To: qi.z.zhang@intel.com Cc: dev@dpdk.org, stable@dpdk.org, Jiang Mao Date: Wed, 22 Jul 2020 03:51:43 +0800 Message-Id: <20200721195143.18023-1-maox.jiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200708195239.4543-1-maox.jiang@intel.com> References: <20200708195239.4543-1-maox.jiang@intel.com> Subject: [dpdk-dev] [PATCH] net/i40e: fix fdir allocating msix resource error 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" Fdir allocating msix resource is not strictly necessary, if no resource left, jump the error. Fixes: 4861cde461 (i40e: new poll mode driver) Cc: stable@dpdk.org Signed-off-by: Jiang Mao --- drivers/net/i40e/i40e_ethdev.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- V2: Move type I40E_VSI_FDIR branch into !I40E_VSI_SRIOV branch. diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 777e14926f..a606409172 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -5721,10 +5721,14 @@ i40e_vsi_setup(struct i40e_pf *pf, ret = i40e_res_pool_alloc(&pf->msix_pool, 1); if (ret < 0) { PMD_DRV_LOG(ERR, "VSI %d get heap failed %d", vsi->seid, ret); - goto fail_queue_alloc; + if (type != I40E_VSI_FDIR) + goto fail_queue_alloc; + vsi->msix_intr = 0; + vsi->nb_msix = 0; + } else { + vsi->msix_intr = ret; + vsi->nb_msix = 1; } - vsi->msix_intr = ret; - vsi->nb_msix = 1; } else { vsi->msix_intr = 0; vsi->nb_msix = 0; -- 2.17.1