From patchwork Wed Jan 24 13:11:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Radu Nicolau X-Patchwork-Id: 34407 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7592F1B017; Wed, 24 Jan 2018 14:16:36 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 81E881B03C; Wed, 24 Jan 2018 14:16:35 +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 fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jan 2018 05:16:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,407,1511856000"; d="scan'208";a="12676472" Received: from silpixa00383879.ir.intel.com (HELO silpixa00383879.ger.corp.intel.com) ([10.237.223.127]) by fmsmga007.fm.intel.com with ESMTP; 24 Jan 2018 05:16:32 -0800 From: Radu Nicolau To: dev@dpdk.org Cc: marko.kovacevic@intel.com, john.mcnamara@intel.com, declan.doherty@intel.com, ferruh.yigit@intel.com, Radu Nicolau , stable@dpdk.org Date: Wed, 24 Jan 2018 13:11:13 +0000 Message-Id: <1516799473-16079-1-git-send-email-radu.nicolau@intel.com> X-Mailer: git-send-email 2.7.5 In-Reply-To: <1516639436-15040-1-git-send-email-radu.nicolau@intel.com> References: <1516639436-15040-1-git-send-email-radu.nicolau@intel.com> Subject: [dpdk-dev] [PATCH v2] net/bonding: check dequeue result before proceeding 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" Fixes: 09150784a776 ("net/bonding: burst mode hash calculation") Coverity issue: 257015 Cc: stable@dpdk.org Signed-off-by: Radu Nicolau --- v2: updated commit message drivers/net/bonding/rte_eth_bond_pmd.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 158f3aa..cc06ff4 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1435,17 +1435,17 @@ bond_ethdev_tx_burst_8023ad(void *queue, struct rte_mbuf **bufs, if (likely(rte_ring_empty(port->tx_ring))) continue; - rte_ring_dequeue(port->tx_ring, (void **)&ctrl_pkt); - - slave_tx_count = rte_eth_tx_burst(slave_port_ids[i], + if (rte_ring_dequeue(port->tx_ring, + (void **)&ctrl_pkt) != -ENOENT) { + slave_tx_count = rte_eth_tx_burst(slave_port_ids[i], bd_tx_q->queue_id, &ctrl_pkt, 1); - - /* - * re-enqueue LAG control plane packets to buffering - * ring if transmission fails so the packet isn't lost. - */ - if (slave_tx_count != 1) - rte_ring_enqueue(port->tx_ring, ctrl_pkt); + /* + * re-enqueue LAG control plane packets to buffering + * ring if transmission fails so the packet isn't lost. + */ + if (slave_tx_count != 1) + rte_ring_enqueue(port->tx_ring, ctrl_pkt); + } } return total_tx_count;