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 0D12CA0350 for ; Mon, 28 Feb 2022 22:21:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 07E3240140; Mon, 28 Feb 2022 22:21:59 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 3CB0A411AB for ; Mon, 28 Feb 2022 22:21:56 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id y5so6467279wmi.0 for ; Mon, 28 Feb 2022 13:21:56 -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=huZIebH6S/LVATJAMyF6dlHVuo6k3QOSPiqlY3vz+UU=; b=LvJj7psuBILAGgkX1HIhCTXOdERI0MX8QqhbrSc+C9N4Xd/k9jUsxvodxhFKUdHQCf A2HcvF7N6lz6+0xLH6aOoRoBPEJjb9yHn4H10/eHE3pPZXTrP2GNLBoKrE5O0aE8WT0T u+52f5s/HDWWxRU2Uay7gzGDBPjrY5MECMdUNnMMhkTuGbD0iG5cDuxpcarLLUrcEvP6 f7RSkQy6egK4HHRsZURXOHOSp1QR45XzlqHWL6raBEc5l3qlbJnsypCu6gQG1Klxx41k MvssC3iSpLRCpaFd6hKZXe8q5H5ppyLfPm7715HaMuPAtB+Z3WOEIvzIoYN+sRpr4PQT 8N7g== 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=huZIebH6S/LVATJAMyF6dlHVuo6k3QOSPiqlY3vz+UU=; b=siOFnPj9isszcexdkQ9e8tDLQFVtWSta8Wvk5Ex2nP8LdzrG3QsB/9guzYBEkyWSj9 RCFEn06OfAo1y1u5fIMRkyMLnqDX47/RxO3Pi+XTLmxGTnL+aNcGOICThQVXDJJQmIse OyoLPERGFMHg5jII43LPGrO5I0Nj8zeJTOj23/xYzQBy1aJtCRZuHPWADlk6X1je/B0A PoD71IW66ki1cyhVO0vPfHi0YlwZL7EcAyB1KlgByIoRntKdsPBx72g44uEd6ddYLFW4 MEZu6Y9VEAXI69q/K42xltQ2SfoajOWVguhj/j4TbBrPD40A4XnSHum4ISVu6sz6meMy 6IVw== X-Gm-Message-State: AOAM531wglxty8d2NLQ5iG2Wuug8uiEcNvbAKzc2iILGraMF51SXW6AS YA8DwD/SIVY/XUOi9NZLU7Q= X-Google-Smtp-Source: ABdhPJwDqoTjAu86rSRLAnwgXjjDov9ffBwW3EgdrHFq2tJ8zoCdgPkt/4QaxvSLSwF0F8ZaKCT7+A== X-Received: by 2002:a1c:4b17:0:b0:380:e44f:426e with SMTP id y23-20020a1c4b17000000b00380e44f426emr14648656wma.150.1646083315865; Mon, 28 Feb 2022 13:21:55 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id e8-20020a5d5308000000b001e3139a79f9sm11530555wrv.40.2022.02.28.13.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:21:55 -0800 (PST) From: luca.boccassi@gmail.com To: Martin Spinler Cc: dpdk stable Subject: patch 'net/nfb: fix multicast/promiscuous mode switching' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:20:18 +0000 Message-Id: <20220228212047.3341966-22-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-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 03/02/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/3a4dd2649ffc6fafafd9990f561856ba49005f1c Thanks. Luca Boccassi --- >From 3a4dd2649ffc6fafafd9990f561856ba49005f1c 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 d7c0879ef5..6740bc65c5 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -516,7 +516,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; 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 @@ -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; @@ -67,6 +62,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); @@ -83,13 +80,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:55.754979786 +0000 +++ 0022-net-nfb-fix-multicast-promiscuous-mode-switching.patch 2022-02-28 21:17:53.868929845 +0000 @@ -1 +1 @@ -From 6685343c4805fcae80bad449903d848409193bd8 Mon Sep 17 00:00:00 2001 +From 3a4dd2649ffc6fafafd9990f561856ba49005f1c 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 d7c0879ef5..6740bc65c5 100644 @@ -39 +40 @@ -@@ -534,7 +534,6 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) +@@ -516,7 +516,6 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)