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 C01CEA0093 for ; Wed, 9 Mar 2022 12:02:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBE9B410DC; Wed, 9 Mar 2022 12:02:11 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 6996040150 for ; Wed, 9 Mar 2022 12:02:11 +0100 (CET) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (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-1.canonical.com (Postfix) with ESMTPS id 430D13FA7E for ; Wed, 9 Mar 2022 11:02:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823731; bh=IXvd0754ZApRR8JDRzAC/C+z+fYXOqRhsITpAk5qGxg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Z7SZo/7cY1g5f9/JNSA1OBWgFA1P0RlM/TmzWq3rTgx2J81DSxGvswtABQ5vG6FLk 61Q/uKIiAHM+UXPx6ODz8uqrjcd23dh3JgwyN8+ASi7dmLqQIFCjGCwQ9+b3kP64gr WAQeXLWisXmqeLgT8m0dz68HE5qXkrAH0GnIdPlqT58SuxXP7Jq+EPNBX9kTOPNmJI gTZZ7jI7u2g+QwU5Xowcx3AeKeQ2CqjxrEPoKIBZGmInQ8TmJc9dObowXlum/OHp3p 6eR7he3fjD0bKZWc0u/kOXYCDV2yXK1rCuraEanbWLUJAnspeHF5H42yIP7rV7s9l5 81c0SSNM2L20w== Received: by mail-wr1-f69.google.com with SMTP id t8-20020adfa2c8000000b001e8f6889404so639683wra.0 for ; Wed, 09 Mar 2022 03:02:11 -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=IXvd0754ZApRR8JDRzAC/C+z+fYXOqRhsITpAk5qGxg=; b=IhSrJW/a/3+diW0N5Tyn8c0/4/HtIpFiIUJXL6csM3yDGOdXEqTGAp++z2zQIU5Lu4 iNypIH7ehPMdp8pLFDaAHc4sG4gQatLt1zs03QUwJS0kA7I2NtY8kueFGlyyo/MPvMNv Zy1NbXnHIXyxSSKIQMV5IsEibvouhg9FPYBHzdrvtClBQM2IRfGLZ1l1irSlwiwHlo6b RrjqgJWZec9EEFu2CAcUmJHDR41WCfeMe75nLxKRSx3gVbOV5mgvnwQSeyfh53GQh+7s bxyrAfdJm20OZbqJACg+qIZxBoAO0OAWV8B/L+puWfG20CC5bgu31RmYXHEUHZn6oB7y QVAQ== X-Gm-Message-State: AOAM530VDuSb/AqGgUpwW6y/rSWoInAxHxTyxMYGyS58TpsZBaA2gZF/ W+1B1iPV+sE1JzRkIp0TzUrugsjA+sBoTJWKmSSlI8yCcZ8CrlInhHwp0DBjM/WJ7UP5D8EPZZ/ aE4Pntka7waXKzmV2mqbhPMHR X-Received: by 2002:a5d:66c3:0:b0:203:7b33:30c7 with SMTP id k3-20020a5d66c3000000b002037b3330c7mr1135400wrw.74.1646823730429; Wed, 09 Mar 2022 03:02:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJyOvgdBnJel7NljgzLU8OIkwqN29tGSlCKhOVEWKxs/MaqbHQO/z6EbDuP9+pNGoGiFXbnoGA== X-Received: by 2002:a5d:66c3:0:b0:203:7b33:30c7 with SMTP id k3-20020a5d66c3000000b002037b3330c7mr1135382wrw.74.1646823730194; Wed, 09 Mar 2022 03:02:10 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id l12-20020a05600012cc00b001f059bcbd7asm1332253wrx.31.2022.03.09.03.02.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:02:09 -0800 (PST) From: christian.ehrhardt@canonical.com To: Martin Spinler Cc: dpdk stable Subject: patch 'net/nfb: fix multicast/promiscuous mode switching' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:00:44 +0100 Message-Id: <20220309110116.1295395-13-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-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 03/11/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/9cbe350522625db7ee72b0c77e8bb43312cbba81 Thanks. Christian Ehrhardt --- >From 9cbe350522625db7ee72b0c77e8bb43312cbba81 Mon Sep 17 00:00:00 2001 From: Martin Spinler Date: Tue, 15 Feb 2022 13:55:42 +0100 Subject: [PATCH] net/nfb: fix multicast/promiscuous mode switching [ upstream commit 6685343c4805fcae80bad449903d848409193bd8 ] In the firmware, the promisc mode overrides the multicast mode. So when the promisc mode is turned off, driver must check if the multicast mode was active before and conditionally reactivate it. Fixes: 6435f9a0ac22 ("net/nfb: add new netcope driver") Signed-off-by: Martin Spinler --- drivers/net/nfb/nfb.h | 4 ---- drivers/net/nfb/nfb_ethdev.c | 1 - drivers/net/nfb/nfb_rxmode.c | 20 ++++++++------------ 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/net/nfb/nfb.h b/drivers/net/nfb/nfb.h index 59d3ab4986..96c44c3a45 100644 --- a/drivers/net/nfb/nfb.h +++ b/drivers/net/nfb/nfb.h @@ -48,10 +48,6 @@ struct pmd_internals { char nfb_dev[PATH_MAX]; struct nfb_device *nfb; - /* Place to remember if filter was promiscuous or filtering by table, - * when disabling allmulticast - */ - enum nc_rxmac_mac_filter rx_filter_original; }; #endif /* _NFB_H_ */ diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c index 697d4af1c3..f4958067c0 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -515,7 +515,6 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) data->promiscuous = nfb_eth_promiscuous_get(dev); data->all_multicast = nfb_eth_allmulticast_get(dev); - internals->rx_filter_original = data->promiscuous; RTE_LOG(INFO, PMD, "NFB device (" PCI_PRI_FMT ") successfully initialized\n", diff --git a/drivers/net/nfb/nfb_rxmode.c b/drivers/net/nfb/nfb_rxmode.c index 3327c8272b..53894accc1 100644 --- a/drivers/net/nfb/nfb_rxmode.c +++ b/drivers/net/nfb/nfb_rxmode.c @@ -14,8 +14,6 @@ nfb_eth_promiscuous_enable(struct rte_eth_dev *dev) dev->data->dev_private; uint16_t i; - internals->rx_filter_original = RXMAC_MAC_FILTER_PROMISCUOUS; - for (i = 0; i < internals->max_rxmac; ++i) { nc_rxmac_mac_filter_enable(internals->rxmac[i], RXMAC_MAC_FILTER_PROMISCUOUS); @@ -30,16 +28,13 @@ nfb_eth_promiscuous_disable(struct rte_eth_dev *dev) struct pmd_internals *internals = (struct pmd_internals *) dev->data->dev_private; uint16_t i; + enum nc_rxmac_mac_filter filter = RXMAC_MAC_FILTER_TABLE_BCAST; - internals->rx_filter_original = RXMAC_MAC_FILTER_TABLE; - - /* if promisc is not enabled, do nothing */ - if (!nfb_eth_promiscuous_get(dev)) - return 0; + if (dev->data->all_multicast) + filter = RXMAC_MAC_FILTER_TABLE_BCAST_MCAST; for (i = 0; i < internals->max_rxmac; ++i) { - nc_rxmac_mac_filter_enable(internals->rxmac[i], - RXMAC_MAC_FILTER_TABLE); + nc_rxmac_mac_filter_enable(internals->rxmac[i], filter); } return 0; @@ -66,6 +61,8 @@ nfb_eth_allmulticast_enable(struct rte_eth_dev *dev) dev->data->dev_private; uint16_t i; + if (dev->data->promiscuous) + return 0; for (i = 0; i < internals->max_rxmac; ++i) { nc_rxmac_mac_filter_enable(internals->rxmac[i], RXMAC_MAC_FILTER_TABLE_BCAST_MCAST); @@ -82,13 +79,12 @@ nfb_eth_allmulticast_disable(struct rte_eth_dev *dev) uint16_t i; - /* if multicast is not enabled do nothing */ - if (!nfb_eth_allmulticast_get(dev)) + if (dev->data->promiscuous) return 0; for (i = 0; i < internals->max_rxmac; ++i) { nc_rxmac_mac_filter_enable(internals->rxmac[i], - internals->rx_filter_original); + RXMAC_MAC_FILTER_TABLE_BCAST); } return 0; -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:44.050842537 +0100 +++ 0013-net-nfb-fix-multicast-promiscuous-mode-switching.patch 2022-03-09 11:57:43.336938030 +0100 @@ -1 +1 @@ -From 6685343c4805fcae80bad449903d848409193bd8 Mon Sep 17 00:00:00 2001 +From 9cbe350522625db7ee72b0c77e8bb43312cbba81 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6685343c4805fcae80bad449903d848409193bd8 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 4de9006ac0..7dc5bd29e4 100644 +index 59d3ab4986..96c44c3a45 100644 @@ -24 +25 @@ -@@ -47,10 +47,6 @@ struct pmd_internals { +@@ -48,10 +48,6 @@ struct pmd_internals { @@ -36 +37 @@ -index 53a98642b3..5d503e131a 100644 +index 697d4af1c3..f4958067c0 100644 @@ -39 +40 @@ -@@ -534,7 +534,6 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) +@@ -515,7 +515,6 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) @@ -45,2 +46,2 @@ - dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; - + RTE_LOG(INFO, PMD, "NFB device (" + PCI_PRI_FMT ") successfully initialized\n", @@ -48 +49 @@ -index 2d0b613d21..ca6e4d5578 100644 +index 3327c8272b..53894accc1 100644 @@ -81 +82 @@ -@@ -67,6 +62,8 @@ nfb_eth_allmulticast_enable(struct rte_eth_dev *dev) +@@ -66,6 +61,8 @@ nfb_eth_allmulticast_enable(struct rte_eth_dev *dev) @@ -90 +91 @@ -@@ -83,13 +80,12 @@ nfb_eth_allmulticast_disable(struct rte_eth_dev *dev) +@@ -82,13 +79,12 @@ nfb_eth_allmulticast_disable(struct rte_eth_dev *dev)