From patchwork Thu Nov 30 23:25:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Doherty, Declan" X-Patchwork-Id: 31845 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 668A51B1A1; Fri, 1 Dec 2017 00:31:27 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id AED041B19E for ; Fri, 1 Dec 2017 00:31:25 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Nov 2017 15:31:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,343,1508828400"; d="scan'208";a="13967701" Received: from dwdohert-dpdk.ir.intel.com ([163.33.210.152]) by orsmga002.jf.intel.com with ESMTP; 30 Nov 2017 15:31:23 -0800 From: Declan Doherty To: dev@dpdk.org Cc: klarose@sandvine.com, Declan Doherty Date: Thu, 30 Nov 2017 23:25:35 +0000 Message-Id: <20171130232535.27835-1-declan.doherty@intel.com> X-Mailer: git-send-email 2.9.4 Subject: [dpdk-dev] [PATCH] net/bond: don't drop lacpdu's on slaves tx failure 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" In message (http://dpdk.org/ml/archives/dev/2017-November/081557.html) it was noted that under congestion that the LACPDU's are dropped under load. This patch changes the drop logic to re-enqueue the LACPDU to the slaves control message queue. This will allow resend attempt's to be made in subsequent tx_burst() calls on the bonded device. Signed-off-by: Declan Doherty --- drivers/net/bonding/rte_eth_bond_pmd.c | 35 ++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index fe23289..d1d3663 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1258,12 +1258,10 @@ bond_ethdev_tx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint8_t distributing_count; uint16_t num_tx_slave, num_tx_total = 0, num_tx_fail_total = 0; - uint16_t i, j, op_slave_idx; - const uint16_t buffs_size = nb_pkts + BOND_MODE_8023AX_SLAVE_TX_PKTS + 1; + uint16_t i, op_slave_idx; /* Allocate additional packets in case 8023AD mode. */ - struct rte_mbuf *slave_bufs[RTE_MAX_ETHPORTS][buffs_size]; - void *slow_pkts[BOND_MODE_8023AX_SLAVE_TX_PKTS] = { NULL }; + struct rte_mbuf *slave_bufs[RTE_MAX_ETHPORTS][nb_pkts]; /* Total amount of packets in slave_bufs */ uint16_t slave_nb_pkts[RTE_MAX_ETHPORTS] = { 0 }; @@ -1285,14 +1283,6 @@ bond_ethdev_tx_burst_8023ad(void *queue, struct rte_mbuf **bufs, for (i = 0; i < num_of_slaves; i++) { struct port *port = &mode_8023ad_ports[slaves[i]]; - slave_slow_nb_pkts[i] = rte_ring_dequeue_burst(port->tx_ring, - slow_pkts, BOND_MODE_8023AX_SLAVE_TX_PKTS, - NULL); - slave_nb_pkts[i] = slave_slow_nb_pkts[i]; - - for (j = 0; j < slave_slow_nb_pkts[i]; j++) - slave_bufs[i][j] = slow_pkts[j]; - if (ACTOR_STATE(port, DISTRIBUTING)) distributing_offsets[distributing_count++] = i; } @@ -1334,6 +1324,27 @@ bond_ethdev_tx_burst_8023ad(void *queue, struct rte_mbuf **bufs, } } + /* Check for LACP control packets and send if available */ + for (i = 0; i < num_of_slaves; i++) { + struct port *port = &mode_8023ad_ports[slaves[i]]; + struct rte_mbuf *ctrl_pkt = NULL; + + int pkt_avail = rte_ring_dequeue(port->tx_ring, + (void **)&ctrl_pkt); + + if (unlikely(pkt_avail == 0)) { + num_tx_slave = rte_eth_tx_burst(slaves[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 (num_tx_slave != nb_pkts) + rte_ring_enqueue(port->tx_ring, ctrl_pkt); + } + } + return num_tx_total; }