From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 1EC95A0471
for <public@inbox.dpdk.org>; Mon, 9 Sep 2019 14:13:52 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id E07521ECBD;
Mon, 9 Sep 2019 14:13:33 +0200 (CEST)
Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com
[67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 3A23C1EC89
for <dev@dpdk.org>; Mon, 9 Sep 2019 14:13:23 +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-us5.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 3A61258005F;
Mon, 9 Sep 2019 12:13:22 +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 05:13:19 -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 05:13:18 -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 x89CDHxn012205;
Mon, 9 Sep 2019 13:13:17 +0100
Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])
by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id B52641613D1;
Mon, 9 Sep 2019 13:13:17 +0100 (BST)
From: Andrew Rybchenko <arybchenko@solarflare.com>
To: Chas Williams <chas3@att.com>
CC: <dev@dpdk.org>, Ivan Ilchenko <Ivan.Ilchenko@oktetlabs.ru>
Date: Mon, 9 Sep 2019 13:13:05 +0100
Message-ID: <1568031190-16510-4-git-send-email-arybchenko@solarflare.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1568031190-16510-1-git-send-email-arybchenko@solarflare.com>
References: <1568031190-16510-1-git-send-email-arybchenko@solarflare.com>
MIME-Version: 1.0
Content-Type: text/plain
X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1010-24898.005
X-TM-AS-Result: No-3.175500-4.000000-10
X-TMASE-MatchedRID: W3Uy/33lI/nbS0m47m6fSn84FZpy/6JVAPiR4btCEeYd0WOKRkwsh0kx
APClfhN02tmoqiGUvaLMdHm3E7kFwCHhSBQfglfsA9lly13c/gHLvfc3C6SWwgMADm5EdqKWZeB
4wkR7kKaL3iHRJPtE8+61RPfZag7IF/5MvE19+DrM0ihsfYPMYULjV7Jaiy6pJLfQYoCQHFYdUH
C5Q8mbEcchePS4fwpUWR+qPiBvoN5ccQ8eam5EfRRFJJyf5BJe3QfwsVk0UbsIoUKaF27lxRxKE
06FB44b1iwFbv0H4axSiy+pYxUqiwYCniWKDs9Ud5ly9Rs9zLGt6zDcpCflCIyCKDQG7OJu13so
URAiG9GfKdNnV/NycA9cvEd/Et5dVEc5IqztENReYfSkFq6uAb7jE6+wkCSe+rL5VW+ofZc=
X-TM-AS-User-Approved-Sender: No
X-TM-AS-User-Blocked-Sender: No
X-TMASE-Result: 10-3.175500-4.000000
X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24898.005
X-MDID: 1568031202-IdivCjBQSt_B
Subject: [dpdk-dev] [PATCH 3/7] net/bonding: check code of allmulticast mode
switch
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Ivan Ilchenko <Ivan.Ilchenko@oktetlabs.ru>
rte_eth_allmulticast_enable()/rte_eth_allmulticast_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 <Ivan.Ilchenko@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
drivers/net/bonding/rte_eth_bond_8023ad.c | 13 +++++++--
drivers/net/bonding/rte_eth_bond_pmd.c | 33 +++++++++++++++++++----
2 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index 7189a84585..e64fb6e41d 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -915,7 +915,12 @@ bond_mode_8023ad_register_lacp_mac(uint16_t slave_id)
{
int ret;
- rte_eth_allmulticast_enable(slave_id);
+ ret = rte_eth_allmulticast_enable(slave_id);
+ if (ret != 0) {
+ RTE_BOND_LOG(ERR,
+ "failed to enable allmulti mode for port %u: %s",
+ slave_id, rte_strerror(-ret));
+ }
if (rte_eth_allmulticast_get(slave_id)) {
RTE_BOND_LOG(DEBUG, "forced allmulti for port %u",
slave_id);
@@ -949,7 +954,11 @@ bond_mode_8023ad_unregister_lacp_mac(uint16_t slave_id)
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);
- rte_eth_allmulticast_disable(slave_id);
+ ret = rte_eth_allmulticast_disable(slave_id);
+ if (ret != 0)
+ RTE_BOND_LOG(ERR,
+ "failed to disable allmulti mode for port %u: %s",
+ slave_id, rte_strerror(-ret));
break;
case BOND_8023AD_FORCED_PROMISC:
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index f9b7b595df..f2ef4c3341 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2601,6 +2601,8 @@ bond_ethdev_allmulticast_enable(struct rte_eth_dev *eth_dev)
{
struct bond_dev_private *internals = eth_dev->data->dev_private;
int i;
+ int ret;
+ uint16_t port_id;
switch (internals->mode) {
/* allmulti mode is propagated to all slaves */
@@ -2609,9 +2611,13 @@ bond_ethdev_allmulticast_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_allmulticast_enable(port_id);
+ ret = rte_eth_allmulticast_enable(port_id);
+ if (ret != 0)
+ RTE_BOND_LOG(ERR,
+ "Failed to enable allmulti mode for port %u: %s",
+ port_id, rte_strerror(-ret));
}
break;
/* allmulti mode is propagated only to primary slave */
@@ -2622,7 +2628,12 @@ bond_ethdev_allmulticast_enable(struct rte_eth_dev *eth_dev)
/* Do not touch allmulti when there cannot be primary ports */
if (internals->slave_count == 0)
break;
- rte_eth_allmulticast_enable(internals->current_primary_port);
+ port_id = internals->current_primary_port;
+ ret = rte_eth_allmulticast_enable(port_id);
+ if (ret != 0)
+ RTE_BOND_LOG(ERR,
+ "Failed to enable allmulti mode for port %u: %s",
+ port_id, rte_strerror(-ret));
}
}
@@ -2631,6 +2642,8 @@ bond_ethdev_allmulticast_disable(struct rte_eth_dev *eth_dev)
{
struct bond_dev_private *internals = eth_dev->data->dev_private;
int i;
+ int ret;
+ uint16_t port_id;
switch (internals->mode) {
/* allmulti mode is propagated to all slaves */
@@ -2645,7 +2658,12 @@ bond_ethdev_allmulticast_disable(struct rte_eth_dev *eth_dev)
bond_mode_8023ad_ports[port_id].forced_rx_flags ==
BOND_8023AD_FORCED_ALLMULTI)
continue;
- rte_eth_allmulticast_disable(port_id);
+
+ ret = rte_eth_allmulticast_disable(port_id);
+ if (ret != 0)
+ RTE_BOND_LOG(ERR,
+ "Failed to disable allmulti mode for port %u: %s",
+ port_id, rte_strerror(-ret));
}
break;
/* allmulti mode is propagated only to primary slave */
@@ -2656,7 +2674,12 @@ bond_ethdev_allmulticast_disable(struct rte_eth_dev *eth_dev)
/* Do not touch allmulti when there cannot be primary ports */
if (internals->slave_count == 0)
break;
- rte_eth_allmulticast_disable(internals->current_primary_port);
+ port_id = internals->current_primary_port;
+ ret = rte_eth_allmulticast_disable(port_id);
+ if (ret != 0)
+ RTE_BOND_LOG(ERR,
+ "Failed to disable allmulti mode for port %u: %s",
+ port_id, rte_strerror(-ret));
}
}
--
2.17.1