From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BA7A9A00C4; Fri, 28 Jan 2022 03:25:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1106F42805; Fri, 28 Jan 2022 03:25:24 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id D2DF342761 for ; Fri, 28 Jan 2022 03:25:21 +0100 (CET) Received: from dggeme756-chm.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4JlLrD0SM4zcct3; Fri, 28 Jan 2022 10:24:28 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggeme756-chm.china.huawei.com (10.3.19.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.21; Fri, 28 Jan 2022 10:25:19 +0800 From: "Min Hu (Connor)" To: CC: , Subject: [PATCH 1/2] net/bonding: fix promiscuous and allmulticast state Date: Fri, 28 Jan 2022 10:25:32 +0800 Message-ID: <20220128022533.44249-2-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220128022533.44249-1-humin29@huawei.com> References: <20220128022533.44249-1-humin29@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggeme756-chm.china.huawei.com (10.3.19.102) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Currently, promiscuous or allmulticast state of bonding port will not be passed to the new primary slave when active/standby switchover. It causes bugs in some scenario. For example, promiscuous state of bonding port is off now, primary slave (called A) is off but secondary slave(called B) is on. Then active/standby switchover, promiscuous state of the bonding port is off, but the new primary slave turns to be B and its promiscuous state is still on. It is not consistent with bonding port. And this patch will fix it. Fixes: 2efb58cbab6e ("bond: new link bonding library") Fixes: 68218b87c184 ("net/bonding: prefer allmulti to promiscuous for LACP") Cc: stable@dpdk.org Signed-off-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_pmd.c | 70 ++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index c72fc64806..ba587e60bf 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2691,6 +2691,39 @@ bond_ethdev_promiscuous_disable(struct rte_eth_dev *dev) return ret; } +static int +bond_ethdev_promiscuous_update(struct rte_eth_dev *dev) +{ + struct bond_dev_private *internals = dev->data->dev_private; + uint16_t port_id = internals->current_primary_port; + + switch (internals->mode) { + case BONDING_MODE_ROUND_ROBIN: + case BONDING_MODE_BALANCE: + case BONDING_MODE_BROADCAST: + case BONDING_MODE_8023AD: + /* As promiscuous mode is propagated to all slaves for these + * mode, no need to update for bonding device. + */ + break; + case BONDING_MODE_ACTIVE_BACKUP: + case BONDING_MODE_TLB: + case BONDING_MODE_ALB: + default: + /* As promiscuous mode is propagated only to primary slave + * for these mode. When active/standby switchover, promiscuous + * mode should be set to new primary slave according to bonding + * device. + */ + if (rte_eth_promiscuous_get(internals->port_id) == 1) + rte_eth_promiscuous_enable(port_id); + else + rte_eth_promiscuous_disable(port_id); + } + + return 0; +} + static int bond_ethdev_allmulticast_enable(struct rte_eth_dev *eth_dev) { @@ -2804,6 +2837,39 @@ bond_ethdev_allmulticast_disable(struct rte_eth_dev *eth_dev) return ret; } +static int +bond_ethdev_allmulticast_update(struct rte_eth_dev *dev) +{ + struct bond_dev_private *internals = dev->data->dev_private; + uint16_t port_id = internals->current_primary_port; + + switch (internals->mode) { + case BONDING_MODE_ROUND_ROBIN: + case BONDING_MODE_BALANCE: + case BONDING_MODE_BROADCAST: + case BONDING_MODE_8023AD: + /* As allmulticast mode is propagated to all slaves for these + * mode, no need to update for bonding device. + */ + break; + case BONDING_MODE_ACTIVE_BACKUP: + case BONDING_MODE_TLB: + case BONDING_MODE_ALB: + default: + /* As allmulticast mode is propagated only to primary slave + * for these mode. When active/standby switchover, allmulticast + * mode should be set to new primary slave according to bonding + * device. + */ + if (rte_eth_allmulticast_get(internals->port_id) == 1) + rte_eth_allmulticast_enable(port_id); + else + rte_eth_allmulticast_disable(port_id); + } + + return 0; +} + static void bond_ethdev_delayed_lsc_propagation(void *arg) { @@ -2893,6 +2959,8 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, lsc_flag = 1; mac_address_slaves_update(bonded_eth_dev); + bond_ethdev_promiscuous_update(bonded_eth_dev); + bond_ethdev_allmulticast_update(bonded_eth_dev); } activate_slave(bonded_eth_dev, port_id); @@ -2922,6 +2990,8 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, else internals->current_primary_port = internals->primary_port; mac_address_slaves_update(bonded_eth_dev); + bond_ethdev_promiscuous_update(bonded_eth_dev); + bond_ethdev_allmulticast_update(bonded_eth_dev); } } -- 2.33.0