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 88E61A034E for ; Mon, 21 Feb 2022 16:38:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 842644013F; Mon, 21 Feb 2022 16:38:53 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 629764013F for ; Mon, 21 Feb 2022 16:38:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457929; 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=SWHNusqcT1aWOkizL/RAcA1DtiVISArmVqJZZkUJclY=; b=ar3sl3a6c3FeFizmzTvFGYi5QraolScdb0IycGcgdFA9FLz5mypr/9oX4uG+eUlZCx7yWl fURtUHCimQ/1+/hG2lPrJwwI8mn8yCSl2KWr0XYeZ4UDjv4uU4sPH0d7JpVkZKOSkupoFD VTRP8QvA2gA+NXPFF54/eOgEklado00= 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-67-hWKWj0MjNym8vuFVPKxqFw-1; Mon, 21 Feb 2022 10:38:46 -0500 X-MC-Unique: hWKWj0MjNym8vuFVPKxqFw-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B88915730; Mon, 21 Feb 2022 15:38:45 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 801A57E2F1; Mon, 21 Feb 2022 15:38:44 +0000 (UTC) From: Kevin Traynor To: Asaf Ravid Cc: Jerin Jacob , dpdk stable Subject: patch 'net/cnxk: fix promiscuous mode in multicast enable flow' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:15 +0000 Message-Id: <20220221153625.152324-66-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 02/26/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/661587eaae533a6a394ee8cdbab84abf94e1baa4 Thanks. Kevin --- >From 661587eaae533a6a394ee8cdbab84abf94e1baa4 Mon Sep 17 00:00:00 2001 From: Asaf Ravid Date: Wed, 1 Dec 2021 15:59:53 +0530 Subject: [PATCH] net/cnxk: fix promiscuous mode in multicast enable flow [ upstream commit b922883be94bac9b5c72417349f2f5d25dade0bb ] When multicast promiscuous was being enabled it caused the unicast promiscuous to be disabled. This fix resolves this by setting NIX_RX_MODE_PROMISC when eth_dev->data->promiscuous is set, regardless. Fixes: 325d79c00a5a ("net/cnxk: support all multicast") Signed-off-by: Asaf Ravid Acked-by: Jerin Jacob --- drivers/common/cnxk/roc_nix_npc.c | 2 +- drivers/net/cnxk/cnxk_ethdev_ops.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/common/cnxk/roc_nix_npc.c b/drivers/common/cnxk/roc_nix_npc.c index c0666c87d5..ad8839dde8 100644 --- a/drivers/common/cnxk/roc_nix_npc.c +++ b/drivers/common/cnxk/roc_nix_npc.c @@ -97,5 +97,5 @@ roc_nix_npc_mcast_config(struct roc_nix *roc_nix, bool mcast_enable, if (mcast_enable) req->mode = NIX_RX_MODE_ALLMULTI; - else if (prom_enable) + if (prom_enable) req->mode = NIX_RX_MODE_PROMISC; diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c index ce5f1f7240..34e4809650 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -518,5 +518,6 @@ cnxk_nix_allmulticast_enable(struct rte_eth_dev *eth_dev) struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); - return roc_nix_npc_mcast_config(&dev->nix, true, false); + return roc_nix_npc_mcast_config(&dev->nix, true, + eth_dev->data->promiscuous); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.088494257 +0000 +++ 0066-net-cnxk-fix-promiscuous-mode-in-multicast-enable-fl.patch 2022-02-21 15:22:44.145704247 +0000 @@ -1 +1 @@ -From b922883be94bac9b5c72417349f2f5d25dade0bb Mon Sep 17 00:00:00 2001 +From 661587eaae533a6a394ee8cdbab84abf94e1baa4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b922883be94bac9b5c72417349f2f5d25dade0bb ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org