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 A9BADA0032 for ; Fri, 18 Feb 2022 13:44:08 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A2C2A41143; Fri, 18 Feb 2022 13:44:08 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 77D6840395 for ; Fri, 18 Feb 2022 13:44:07 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id j9-20020a05600c190900b0037bff8a24ebso8511900wmq.4 for ; Fri, 18 Feb 2022 04:44:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1R5QvckHqc+hvSkm98tT7OZbpPoFVdsxZj1TLVyxGw8=; b=F4S58qVE/K84JzIepIzSLy1T1aCxzptP8lULnJG0p9jFm+mnQ2iM2jknwFz8XmReAi wr/E/zIluvXFrItuqhMP75a0fT7zSbTLdPl+HmVjDCgWkvxYV55ZqIMalllWJ6pjVkm6 e9PzoapRXv1Geqfd1wbqtqZoM3kJhWvzeWWfPOIgFboIytCb455xshqgHBp+d/S9Yq0x mV+f4K6PyvhITE1+FmJGWKIERtPaSY5Cw8+CALtbPmoVdpzv4ne89Hrn6MMYKqmUmCf3 2H4fjIfT9wM8Y1brMCJD9jdZyfs3KoZJC6/dhi42LNOTc/XqCuQt2JSZxROCx5br2aWm Bdng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1R5QvckHqc+hvSkm98tT7OZbpPoFVdsxZj1TLVyxGw8=; b=j4j4tLJxXum0Gd9hTmV/XNk+B+mHcCkU5VeiJDEc1d2GyVLB6NE9X8t30ABgj5idzT 4+T3DSt350O5OTSIc2hm7p1J6CtOxw/j3lRmB+Q9bYCPHYKVdHYtOWECwB4IwvWOVa9n 0qQEIVGMMzOUfw1vlVEgSAGeYBuOVmGF0XX3FgsJEOJJo/hTriMc9CvUlN2szFZBICRS NOxIm9oe+vQuIVEZzs3Tw/8Z1tNk4n/8aaMi/MZ1dhyZMm1Um7fH9vSdEsjxWYH/24en 7qi5eBftkG709cUFyybTIPAi++AGFyeLVNze2krUfjHk48a1PzoCs7Etq37ij5301Sxe aq2A== X-Gm-Message-State: AOAM530T9eqyfHSMAngIRwArNDeQyK4XSTWUEYvQn5MNcndN7IL6AYXD fI3/HdVFPXy7+prqCRpMcpA= X-Google-Smtp-Source: ABdhPJxVzbU0hiSe/0/TKePcYjp4IzssrTaa2WO0+cMdrInvW18PfgIRN2Bh6jDyd5Zn97xGQm0Ufw== X-Received: by 2002:a1c:a942:0:b0:37b:e02c:5ac2 with SMTP id s63-20020a1ca942000000b0037be02c5ac2mr10573014wme.12.1645188247199; Fri, 18 Feb 2022 04:44:07 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id n6sm23540435wru.114.2022.02.18.04.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:44:06 -0800 (PST) From: luca.boccassi@gmail.com To: "Min Hu (Connor)" Cc: dpdk stable Subject: patch 'net/bonding: fix promiscuous and allmulticast state' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:58 +0000 Message-Id: <20220218123931.1749595-89-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/78ee1995c908215d312b8ef55516800eceebeaaf Thanks. Luca Boccassi --- >From 78ee1995c908215d312b8ef55516800eceebeaaf Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Fri, 28 Jan 2022 10:25:32 +0800 Subject: [PATCH] net/bonding: fix promiscuous and allmulticast state [ upstream commit ac5341f5f9bab7b87b1a71761c40d204a7e6ab86 ] Currently, promiscuous or allmulticast state of bonding port will not be passed to the new primary slave when active/standby switch-over. 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 switch-over, 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") 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 3962d04b1a..6857b474af 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2688,6 +2688,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) { @@ -2801,6 +2834,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) { @@ -2890,6 +2956,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); @@ -2919,6 +2987,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.294808541 +0000 +++ 0089-net-bonding-fix-promiscuous-and-allmulticast-state.patch 2022-02-18 12:37:37.794794243 +0000 @@ -1 +1 @@ -From ac5341f5f9bab7b87b1a71761c40d204a7e6ab86 Mon Sep 17 00:00:00 2001 +From 78ee1995c908215d312b8ef55516800eceebeaaf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ac5341f5f9bab7b87b1a71761c40d204a7e6ab86 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index e5abe90e07..d2fcfad676 100644 +index 3962d04b1a..6857b474af 100644 @@ -30 +31 @@ -@@ -2691,6 +2691,39 @@ bond_ethdev_promiscuous_disable(struct rte_eth_dev *dev) +@@ -2688,6 +2688,39 @@ bond_ethdev_promiscuous_disable(struct rte_eth_dev *dev) @@ -70 +71 @@ -@@ -2804,6 +2837,39 @@ bond_ethdev_allmulticast_disable(struct rte_eth_dev *eth_dev) +@@ -2801,6 +2834,39 @@ bond_ethdev_allmulticast_disable(struct rte_eth_dev *eth_dev) @@ -110 +111 @@ -@@ -2893,6 +2959,8 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, +@@ -2890,6 +2956,8 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, @@ -119 +120 @@ -@@ -2922,6 +2990,8 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type, +@@ -2919,6 +2987,8 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,