From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CAEDAA0518 for ; Fri, 24 Jul 2020 14:05:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C30951C039; Fri, 24 Jul 2020 14:05:22 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id F173D1C039 for ; Fri, 24 Jul 2020 14:05:21 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id f18so8054385wml.3 for ; Fri, 24 Jul 2020 05:05:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fjnbHPvOJXDU1PzjOc6I6Qcbb6/77YWFzoXeDlAMnRg=; b=CH3JCe+27lBQOBFF/1wANV31SUNzGZ9kVpuO/KWnCSuSiIJHAheJJHpbZZui7NgtxB wglCi/UhWLKuRVBDv7h/61DeCoMibQi3YhUjlJuCkv1qa/u/G8AcUjcATxsfwK0scJEp V3HSVhHvCH4OxBh9zHEGnZdgsCAkMDa8uWn0eqL3bVzFZwE1NelkcD/AWgNzGGypy2P8 pbGpkwqL+X6lSWETyVs75xZHpTc85feVRNh06MSbhMO1ShXI1+C2mUzk6pByzDiofVVj nlRQ5PLHLXYhCmvxeCAh5JF2FXSC+OtgwQwHp+G2zxWDCS/mmFHnzkau461PcnBpFBYR py9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fjnbHPvOJXDU1PzjOc6I6Qcbb6/77YWFzoXeDlAMnRg=; b=Tivdk6Qmuj5Go+Y1NZqPg6opDHMZ8ukfRuT7ZtVGie/EI3h5z5tfxolncSJKo3Pax2 1J/07RwSEXweUsNffLJqhM+hfGryUFQqilzcEBt0iwURErV3jxXwtTRZTTL+clDs8XWR 14XYsGilbshggHzk02nVhMlCbnufs1OtZ4U3mecQ6tW8kbLOf+9SE9w5ysQP3Ydowxjs odrsOebjZghmWV7xeNt9q2/l/T8lquZ36uRC9U623QI0CNf0hJy2XFhxeHP6OZfirA7X IiH1hdpLZ1MpB3x+3B+f5QKe6bFt4HhXeIh/cYak9lMwymfRVuGtcvtBIMIyOeNOkzek ymUQ== X-Gm-Message-State: AOAM5333baW+yw4mD0vJnkU3y/GiplZiWqGEWrV3caE34/7x1Z3PWGoK 8iWzB8vA8syc9jCHt3C4QEiv5MHkbVvMQQ== X-Google-Smtp-Source: ABdhPJxsgSnna0h5cLMmSq8fTqrED1f6bqdNZhcdUbnlgkKD4/5aR885q4S6juJ9pJV7tIn1C/adtQ== X-Received: by 2002:a1c:964d:: with SMTP id y74mr8787641wmd.80.1595592321678; Fri, 24 Jul 2020 05:05:21 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b186sm7334736wme.1.2020.07.24.05.05.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:05:20 -0700 (PDT) From: luca.boccassi@gmail.com To: Harman Kalra Cc: Sunil Kumar Kori , Jerin Jacob , dpdk stable Date: Fri, 24 Jul 2020 12:58:25 +0100 Message-Id: <20200724120030.1863487-67-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx2: fix DMAC filtering' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. 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. Thanks. Luca Boccassi --- >From 2789a4d75c75e811d05f59ef0152d1f7de8315e5 Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Wed, 3 Jun 2020 20:22:13 +0530 Subject: [PATCH] net/octeontx2: fix DMAC filtering [ upstream commit 987984204bdc982e0f58393678dd50ba91c639c4 ] Issue has been observed where packets are getting dropped at DMAC filtering if a new dmac address is added before starting of port. Fixes: c43adf61682f ("net/octeontx2: add unicast MAC filter") Signed-off-by: Harman Kalra Acked-by: Sunil Kumar Kori Acked-by: Jerin Jacob --- drivers/net/octeontx2/otx2_ethdev.h | 1 + drivers/net/octeontx2/otx2_ethdev_ops.c | 4 +++- drivers/net/octeontx2/otx2_mac.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h index 864356e36..0aadaecf7 100644 --- a/drivers/net/octeontx2/otx2_ethdev.h +++ b/drivers/net/octeontx2/otx2_ethdev.h @@ -267,6 +267,7 @@ struct otx2_eth_dev { uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; uint8_t mkex_pfl_name[MKEX_NAME_LEN]; uint8_t max_mac_entries; + bool dmac_filter_enable; uint8_t lf_tx_stats; uint8_t lf_rx_stats; uint16_t flags; diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c index 8f1635dba..93ef04803 100644 --- a/drivers/net/octeontx2/otx2_ethdev_ops.c +++ b/drivers/net/octeontx2/otx2_ethdev_ops.c @@ -148,8 +148,10 @@ otx2_nix_promisc_enable(struct rte_eth_dev *eth_dev) int otx2_nix_promisc_disable(struct rte_eth_dev *eth_dev) { - otx2_nix_promisc_config(eth_dev, 0); + struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev); + otx2_nix_promisc_config(eth_dev, dev->dmac_filter_enable); nix_cgx_promisc_config(eth_dev, 0); + dev->dmac_filter_enable = false; return 0; } diff --git a/drivers/net/octeontx2/otx2_mac.c b/drivers/net/octeontx2/otx2_mac.c index 262d185e5..49a700ca1 100644 --- a/drivers/net/octeontx2/otx2_mac.c +++ b/drivers/net/octeontx2/otx2_mac.c @@ -76,6 +76,8 @@ otx2_nix_mac_addr_add(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr, /* Enable promiscuous mode at NIX level */ otx2_nix_promisc_config(eth_dev, 1); + dev->dmac_filter_enable = true; + eth_dev->data->promiscuous = 0; done: return rc; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:51.173175258 +0100 +++ 0067-net-octeontx2-fix-DMAC-filtering.patch 2020-07-24 12:53:48.291006534 +0100 @@ -1,14 +1,15 @@ -From 987984204bdc982e0f58393678dd50ba91c639c4 Mon Sep 17 00:00:00 2001 +From 2789a4d75c75e811d05f59ef0152d1f7de8315e5 Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Wed, 3 Jun 2020 20:22:13 +0530 Subject: [PATCH] net/octeontx2: fix DMAC filtering +[ upstream commit 987984204bdc982e0f58393678dd50ba91c639c4 ] + Issue has been observed where packets are getting dropped at DMAC filtering if a new dmac address is added before starting of port. Fixes: c43adf61682f ("net/octeontx2: add unicast MAC filter") -Cc: stable@dpdk.org Signed-off-by: Harman Kalra Acked-by: Sunil Kumar Kori @@ -20,10 +21,10 @@ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h -index 0fbf68b8e..16b0d8163 100644 +index 864356e36..0aadaecf7 100644 --- a/drivers/net/octeontx2/otx2_ethdev.h +++ b/drivers/net/octeontx2/otx2_ethdev.h -@@ -271,6 +271,7 @@ struct otx2_eth_dev { +@@ -267,6 +267,7 @@ struct otx2_eth_dev { uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; uint8_t mkex_pfl_name[MKEX_NAME_LEN]; uint8_t max_mac_entries; @@ -32,7 +33,7 @@ uint8_t lf_rx_stats; uint16_t flags; diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c -index 80ac2b96e..faecf216c 100644 +index 8f1635dba..93ef04803 100644 --- a/drivers/net/octeontx2/otx2_ethdev_ops.c +++ b/drivers/net/octeontx2/otx2_ethdev_ops.c @@ -148,8 +148,10 @@ otx2_nix_promisc_enable(struct rte_eth_dev *eth_dev)