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 C01E8A034F for ; Tue, 1 Mar 2022 11:44:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBECD407FF; Tue, 1 Mar 2022 11:44:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 895E2407FF for ; Tue, 1 Mar 2022 11:44:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rQ+1LFWW1bA89XVq4i+3VU14bZgcznkDmCmoH5y2MTg=; b=Z2U1g8jKgUW195Z7XpdgKbHmUPuKNQdtIz8VNIAW8xXTSjd3UfpJJiyJmus1R12wb6uEGN fD+Y3Yw5mXsjGTDqwQ6st4d3/7lM0K0ZKjYo6nDnvFWKHeXJ9DxyW7FnV/Bh6Z34Ln8pqh d16/vosJ+BHJ9t6e+HKmHWr8N2aw7S0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-56-_zbW2ggjO-iUzD-FR_WkMw-1; Tue, 01 Mar 2022 05:44:09 -0500 X-MC-Unique: _zbW2ggjO-iUzD-FR_WkMw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B94E100C610; Tue, 1 Mar 2022 10:44:08 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id B74CA6FB08; Tue, 1 Mar 2022 10:44:07 +0000 (UTC) From: Kevin Traynor To: Martin Spinler Cc: dpdk stable Subject: patch 'net/nfb: fix multicast/promiscuous mode switching' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:53 +0000 Message-Id: <20220301104300.334382-37-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 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/06/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/967cb497480d8cefb63eec51b4705ce647175ff8 Thanks. Kevin --- >From 967cb497480d8cefb63eec51b4705ce647175ff8 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 @@ -49,8 +49,4 @@ 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; }; diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c index 0b27fe78cc..d9e43bc027 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -517,5 +517,4 @@ 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; dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; diff --git a/drivers/net/nfb/nfb_rxmode.c b/drivers/net/nfb/nfb_rxmode.c index 2d0b613d21..ca6e4d5578 100644 --- a/drivers/net/nfb/nfb_rxmode.c +++ b/drivers/net/nfb/nfb_rxmode.c @@ -15,6 +15,4 @@ nfb_eth_promiscuous_enable(struct rte_eth_dev *dev) 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], @@ -31,14 +29,11 @@ nfb_eth_promiscuous_disable(struct rte_eth_dev *dev) 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); } @@ -68,4 +63,6 @@ nfb_eth_allmulticast_enable(struct rte_eth_dev *dev) 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], @@ -84,11 +81,10 @@ 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); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:02.325049159 +0000 +++ 0037-net-nfb-fix-multicast-promiscuous-mode-switching.patch 2022-03-01 10:41:01.290244095 +0000 @@ -1 +1 @@ -From 6685343c4805fcae80bad449903d848409193bd8 Mon Sep 17 00:00:00 2001 +From 967cb497480d8cefb63eec51b4705ce647175ff8 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 @@ -@@ -48,8 +48,4 @@ struct pmd_internals { +@@ -49,8 +49,4 @@ struct pmd_internals { @@ -34 +35 @@ -index 53a98642b3..5d503e131a 100644 +index 0b27fe78cc..d9e43bc027 100644 @@ -37 +38 @@ -@@ -535,5 +535,4 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) +@@ -517,5 +517,4 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)