From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ktraynor@redhat.com> Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 29A981B49C for <stable@dpdk.org>; Thu, 22 Nov 2018 17:52:47 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 871D93097071; Thu, 22 Nov 2018 16:52:46 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1596E1693A; Thu, 22 Nov 2018 16:52:44 +0000 (UTC) From: Kevin Traynor <ktraynor@redhat.com> To: Huaibin Wang <huaibin.wang@6wind.com> Cc: Laurent Hardy <laurent.hardy@6wind.com>, Qi Zhang <qi.z.zhang@intel.com>, dpdk stable <stable@dpdk.org> Date: Thu, 22 Nov 2018 16:49:35 +0000 Message-Id: <20181122164957.13003-43-ktraynor@redhat.com> In-Reply-To: <20181122164957.13003-1-ktraynor@redhat.com> References: <20181122164957.13003-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 22 Nov 2018 16:52:46 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: keep promiscuous on if allmulticast is enabled' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches <stable.dpdk.org> List-Unsubscribe: <https://mails.dpdk.org/options/stable>, <mailto:stable-request@dpdk.org?subject=unsubscribe> List-Archive: <http://mails.dpdk.org/archives/stable/> List-Post: <mailto:stable@dpdk.org> List-Help: <mailto:stable-request@dpdk.org?subject=help> List-Subscribe: <https://mails.dpdk.org/listinfo/stable>, <mailto:stable-request@dpdk.org?subject=subscribe> X-List-Received-Date: Thu, 22 Nov 2018 16:52:47 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 11/28/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From de24609e11599ecbacf0257c91d2662d45160039 Mon Sep 17 00:00:00 2001 From: Huaibin Wang <huaibin.wang@6wind.com> Date: Fri, 19 Oct 2018 11:45:21 +0200 Subject: [PATCH] net/i40e: keep promiscuous on if allmulticast is enabled [ upstream commit 815037b92b3437754183fb256a967a7e82d3820a ] Promisc should not be disabled if the all multicast mode is enabled. Patch keeps the promiscuous on if all multicast mode is on, this behavior is also consistent with the implementation done on ixgbe pmd. Signed-off-by: Huaibin Wang <huaibin.wang@6wind.com> Signed-off-by: Laurent Hardy <laurent.hardy@6wind.com> Acked-by: Qi Zhang <qi.z.zhang@intel.com> --- drivers/net/i40e/i40e_ethdev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 12ac6cde0..541bab7d0 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2499,4 +2499,8 @@ i40e_dev_promiscuous_disable(struct rte_eth_dev *dev) PMD_DRV_LOG(ERR, "Failed to disable unicast promiscuous"); + /* must remain in all_multicast mode */ + if (dev->data->all_multicast == 1) + return; + status = i40e_aq_set_vsi_multicast_promiscuous(hw, vsi->seid, false, NULL); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-22 16:47:33.374430623 +0000 +++ 0043-net-i40e-keep-promiscuous-on-if-allmulticast-is-enab.patch 2018-11-22 16:47:32.000000000 +0000 @@ -1,15 +1,15 @@ -From 815037b92b3437754183fb256a967a7e82d3820a Mon Sep 17 00:00:00 2001 +From de24609e11599ecbacf0257c91d2662d45160039 Mon Sep 17 00:00:00 2001 From: Huaibin Wang <huaibin.wang@6wind.com> Date: Fri, 19 Oct 2018 11:45:21 +0200 Subject: [PATCH] net/i40e: keep promiscuous on if allmulticast is enabled +[ upstream commit 815037b92b3437754183fb256a967a7e82d3820a ] + Promisc should not be disabled if the all multicast mode is enabled. Patch keeps the promiscuous on if all multicast mode is on, this behavior is also consistent with the implementation done on ixgbe pmd. -Cc: stable@dpdk.org - Signed-off-by: Huaibin Wang <huaibin.wang@6wind.com> Signed-off-by: Laurent Hardy <laurent.hardy@6wind.com> Acked-by: Qi Zhang <qi.z.zhang@intel.com> @@ -18,10 +18,10 @@ 1 file changed, 4 insertions(+) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c -index f7a685c8c..6c503debc 100644 +index 12ac6cde0..541bab7d0 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c -@@ -2588,4 +2588,8 @@ i40e_dev_promiscuous_disable(struct rte_eth_dev *dev) +@@ -2499,4 +2499,8 @@ i40e_dev_promiscuous_disable(struct rte_eth_dev *dev) PMD_DRV_LOG(ERR, "Failed to disable unicast promiscuous"); + /* must remain in all_multicast mode */