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 73302A034C for ; Fri, 25 Feb 2022 18:17:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4CEB4410FD; Fri, 25 Feb 2022 18:17:56 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 6EFAA410FD for ; Fri, 25 Feb 2022 18:17:55 +0100 (CET) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 46C023FCA6 for ; Fri, 25 Feb 2022 17:17:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809475; bh=gKnH5/XsdkSa3hpSpquT+iVZdR7Qtmd+peG2t6xcxhk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=O+X4kkS9H8vWCAxAXC51H9/Xr4m3k8dtLYWxjIyUiNzjXcZtjw8FMnN2c09GAvuA2 7ZLgIy2wtle0ROTLt7M3CnT0I10d23+Uj42cW50NuIUm1rOtQAL8IAozpT9I7thb9a NXe2o2e9uoCujwcvPvYQqwbRV45cUIa1+NWKaOPEsu26XvUnnhx3elVL6zAjrAFY8z ElJb7Aq+/tItCGkJ0urvWHgw1kHXgxGu2UQ1G6HcHshelr4VpqwKGFUxszfijmd2+E /sGPHigr9NMHMPnAX4Qllc9HqGmPNWFeo0kHOm9BH8I0X/zrbx8b8Q+2zBba3q3/O0 xTv/bCrla5OzA== Received: by mail-wm1-f70.google.com with SMTP id h206-20020a1c21d7000000b003552c13626cso1845794wmh.3 for ; Fri, 25 Feb 2022 09:17:55 -0800 (PST) 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=gKnH5/XsdkSa3hpSpquT+iVZdR7Qtmd+peG2t6xcxhk=; b=04P+uKHnfjtkBdnMWmb/TlpteZc/iLc9FU3IjhpYO0OFBVT8Ark9S1QuQbeiRsi4Wg k4IvmoqIUKLnsFliOpLKCjbq7NvWF3f5RKcBnlW8NcG3jiJcYozlYWjurzUWIPknozDv VgMYj+Q/AIRmew/FuanEQJy/S5Yd/sr1J1vlumLFvnb0Mw/Fzqw547qdZPmfqwS5mCXc HceNPHaG0U9DzqyRBFiZWULuQbb4I9tAEKkOhDwzJhQsNv+uXau/SSkVSDe1Xwttai4x QKLUEXLqx2vRS6gUsbM10nUuqofofs0UAJUKLPQPgP2D49WOLk8yfuREi61iyLy4sSwL htyw== X-Gm-Message-State: AOAM531ldSZDc3criHx1vosIfD0OFOQImI1FJaCqnzBzOGEUFPdRdBBs keu+JZP7k63X6AXtOEx3zA+vKHEHf/qEIooS1Ly7Ta2+DWbz3Tc9AUMsbOnvLpsOO4KcDNy6cLq H/Mf7nURfEi7vbQn+CSW3IQkm X-Received: by 2002:a05:600c:4f03:b0:37c:b58:9c35 with SMTP id l3-20020a05600c4f0300b0037c0b589c35mr3483907wmq.118.1645809474537; Fri, 25 Feb 2022 09:17:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKJuLIR4vmTZWE2c1CWoIf1o9bgk3HWooHQ3I8NsQhLIuzKx5GcaXttLTflEwNb1mBss7bxw== X-Received: by 2002:a05:600c:4f03:b0:37c:b58:9c35 with SMTP id l3-20020a05600c4f0300b0037c0b589c35mr3483893wmq.118.1645809474271; Fri, 25 Feb 2022 09:17:54 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id p18-20020adfba92000000b001e4ae791663sm2899611wrg.62.2022.02.25.09.17.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:17:53 -0800 (PST) From: christian.ehrhardt@canonical.com To: "Min Hu (Connor)" Cc: dpdk stable Subject: patch 'net/bonding: fix promiscuous and allmulticast state' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:34 +0100 Message-Id: <20220225171550.3499040-41-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.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 19.11.12 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/27/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/98417a7b4f1d90977032660b7c4c509161ce8485 Thanks. Christian Ehrhardt --- >From 98417a7b4f1d90977032660b7c4c509161ce8485 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 4ec90c0422..95e8cbaa57 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2651,6 +2651,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) { @@ -2764,6 +2797,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) { @@ -2853,6 +2919,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); @@ -2882,6 +2950,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.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.816928992 +0100 +++ 0041-net-bonding-fix-promiscuous-and-allmulticast-state.patch 2022-02-25 16:58:44.268990437 +0100 @@ -1 +1 @@ -From ac5341f5f9bab7b87b1a71761c40d204a7e6ab86 Mon Sep 17 00:00:00 2001 +From 98417a7b4f1d90977032660b7c4c509161ce8485 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 4ec90c0422..95e8cbaa57 100644 @@ -30 +31 @@ -@@ -2691,6 +2691,39 @@ bond_ethdev_promiscuous_disable(struct rte_eth_dev *dev) +@@ -2651,6 +2651,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) +@@ -2764,6 +2797,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, +@@ -2853,6 +2919,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, +@@ -2882,6 +2950,8 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,