From patchwork Mon Sep 9 11:58:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 58994 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 22DBE1EB86; Mon, 9 Sep 2019 13:59:10 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 86F5A1BE91 for ; Mon, 9 Sep 2019 13:59:05 +0200 (CEST) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us3.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 2D0ABB4005A; Mon, 9 Sep 2019 11:59:04 +0000 (UTC) Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 9 Sep 2019 04:59:00 -0700 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Mon, 9 Sep 2019 04:59:00 -0700 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id x89Bwxuv027715; Mon, 9 Sep 2019 12:58:59 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 82CFB1613D3; Mon, 9 Sep 2019 12:58:59 +0100 (BST) From: Andrew Rybchenko To: Chas Williams CC: , Ivan Ilchenko Date: Mon, 9 Sep 2019 12:58:40 +0100 Message-ID: <1568030331-16526-4-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1568030331-16526-1-git-send-email-arybchenko@solarflare.com> References: <1567699852-31693-1-git-send-email-arybchenko@solarflare.com> <1568030331-16526-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1010-24898.005 X-TM-AS-Result: No-2.168200-4.000000-10 X-TMASE-MatchedRID: HGvy3W1xOqbbS0m47m6fSn84FZpy/6JVAPiR4btCEeYd0WOKRkwsh0kx APClfhN02tmoqiGUvaLMdHm3E7kFwCHhSBQfglfsA9lly13c/gHLvfc3C6SWwlVkJxysad/IwIU 6Bt4BsREz6eewRqV4ykOs8C47gjy/DCED/Oc5L9tH+PTjR9EWkgKflB9+9kWVvGAx/1ATZ5sbYc VjvRCqvgBEAy7Pj7gVAe4kQmlw6tLd2kK37TYfrOIfK/Jd5eHmfS0Ip2eEHnz3IzXlXlpamPoLR 4+zsDTtrXT/QMyU2NxSGyaRRx+WSBNUbMJCRdXzIs8JMAWOMh2wAIurdR/1WtDOCg+9GYQVgC0K /MkHMjIKq69wOeRKvv/av+rzbLSqtRH+zJD0boHaQLtLC8aUqEPBvsmCWGHWUWQ7Bol0IqC+I8S pxyUS3FXK9tOD+u6c X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10-2.168200-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24898.005 X-MDID: 1568030344-EUm1g9RnejUD Subject: [dpdk-dev] [PATCH v2 03/13] net/bonding: check code of promiscuous mode switch 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" From: Ivan Ilchenko rte_eth_promiscuous_enable()/rte_eth_promiscuous_disable() return value was changed from void to int, so this patch modify usage of these functions across net/bonding according to new return type. Signed-off-by: Ivan Ilchenko Signed-off-by: Andrew Rybchenko --- drivers/net/bonding/rte_eth_bond_8023ad.c | 17 ++++++++++-- drivers/net/bonding/rte_eth_bond_pmd.c | 34 +++++++++++++++++++---- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index fbc69051a9..7189a84585 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -913,6 +913,8 @@ bond_mode_8023ad_periodic_cb(void *arg) static int bond_mode_8023ad_register_lacp_mac(uint16_t slave_id) { + int ret; + rte_eth_allmulticast_enable(slave_id); if (rte_eth_allmulticast_get(slave_id)) { RTE_BOND_LOG(DEBUG, "forced allmulti for port %u", @@ -922,7 +924,12 @@ bond_mode_8023ad_register_lacp_mac(uint16_t slave_id) return 0; } - rte_eth_promiscuous_enable(slave_id); + ret = rte_eth_promiscuous_enable(slave_id); + if (ret != 0) { + RTE_BOND_LOG(ERR, + "failed to enable promiscuous mode for port %u: %s", + slave_id, rte_strerror(-ret)); + } if (rte_eth_promiscuous_get(slave_id)) { RTE_BOND_LOG(DEBUG, "forced promiscuous for port %u", slave_id); @@ -937,6 +944,8 @@ bond_mode_8023ad_register_lacp_mac(uint16_t slave_id) static void bond_mode_8023ad_unregister_lacp_mac(uint16_t slave_id) { + int ret; + switch (bond_mode_8023ad_ports[slave_id].forced_rx_flags) { case BOND_8023AD_FORCED_ALLMULTI: RTE_BOND_LOG(DEBUG, "unset allmulti for port %u", slave_id); @@ -945,7 +954,11 @@ bond_mode_8023ad_unregister_lacp_mac(uint16_t slave_id) case BOND_8023AD_FORCED_PROMISC: RTE_BOND_LOG(DEBUG, "unset promisc for port %u", slave_id); - rte_eth_promiscuous_disable(slave_id); + ret = rte_eth_promiscuous_disable(slave_id); + if (ret != 0) + RTE_BOND_LOG(ERR, + "failed to disable promiscuous mode for port %u: %s", + slave_id, rte_strerror(-ret)); break; default: diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index a994c9abd2..edf660db34 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2487,6 +2487,8 @@ bond_ethdev_promiscuous_enable(struct rte_eth_dev *eth_dev) { struct bond_dev_private *internals = eth_dev->data->dev_private; int i; + int ret = 0; + uint16_t port_id; switch (internals->mode) { /* Promiscuous mode is propagated to all slaves */ @@ -2495,9 +2497,13 @@ bond_ethdev_promiscuous_enable(struct rte_eth_dev *eth_dev) case BONDING_MODE_BROADCAST: case BONDING_MODE_8023AD: for (i = 0; i < internals->slave_count; i++) { - uint16_t port_id = internals->slaves[i].port_id; + port_id = internals->slaves[i].port_id; - rte_eth_promiscuous_enable(port_id); + ret = rte_eth_promiscuous_enable(port_id); + if (ret != 0) + RTE_BOND_LOG(ERR, + "Failed to enable promiscuous mode for port %u: %s", + port_id, rte_strerror(-ret)); } break; /* Promiscuous mode is propagated only to primary slave */ @@ -2508,7 +2514,12 @@ bond_ethdev_promiscuous_enable(struct rte_eth_dev *eth_dev) /* Do not touch promisc when there cannot be primary ports */ if (internals->slave_count == 0) break; - rte_eth_promiscuous_enable(internals->current_primary_port); + port_id = internals->current_primary_port; + ret = rte_eth_promiscuous_enable(port_id); + if (ret != 0) + RTE_BOND_LOG(ERR, + "Failed to enable promiscuous mode for port %u: %s", + port_id, rte_strerror(-ret)); } } @@ -2517,6 +2528,8 @@ bond_ethdev_promiscuous_disable(struct rte_eth_dev *dev) { struct bond_dev_private *internals = dev->data->dev_private; int i; + int ret; + uint16_t port_id; switch (internals->mode) { /* Promiscuous mode is propagated to all slaves */ @@ -2525,13 +2538,17 @@ bond_ethdev_promiscuous_disable(struct rte_eth_dev *dev) case BONDING_MODE_BROADCAST: case BONDING_MODE_8023AD: for (i = 0; i < internals->slave_count; i++) { - uint16_t port_id = internals->slaves[i].port_id; + port_id = internals->slaves[i].port_id; if (internals->mode == BONDING_MODE_8023AD && bond_mode_8023ad_ports[port_id].forced_rx_flags == BOND_8023AD_FORCED_PROMISC) continue; - rte_eth_promiscuous_disable(port_id); + ret = rte_eth_promiscuous_disable(port_id); + if (ret != 0) + RTE_BOND_LOG(ERR, + "Failed to disable promiscuous mode for port %u: %s", + port_id, rte_strerror(-ret)); } break; /* Promiscuous mode is propagated only to primary slave */ @@ -2542,7 +2559,12 @@ bond_ethdev_promiscuous_disable(struct rte_eth_dev *dev) /* Do not touch promisc when there cannot be primary ports */ if (internals->slave_count == 0) break; - rte_eth_promiscuous_disable(internals->current_primary_port); + port_id = internals->current_primary_port; + ret = rte_eth_promiscuous_disable(port_id); + if (ret != 0) + RTE_BOND_LOG(ERR, + "Failed to disable promiscuous mode for port %u: %s", + port_id, rte_strerror(-ret)); } }