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 CBB6CA0542 for ; Thu, 24 Nov 2022 15:01:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C501C42DCE; Thu, 24 Nov 2022 15:01:01 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 77E3642DBF for ; Thu, 24 Nov 2022 15:01:00 +0100 (CET) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id E08B43F460 for ; Thu, 24 Nov 2022 14:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1669298459; bh=RrP546xhidFF4ofUw9nkWWxP+wf9XcC5fAC/33+GFRk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jlY+9RqzPXiAMenIHXmDabRsfP8N6gd216NwjgaoyOGaUrDJULsxj+x4LBQeAKToN 08abuyTdPWDziYZ5IAGOCvCuNOaeb4f0GqGm2SjeqdR7pHF1f5iRBzwO6t63twio8L otonymO/9kMkTw3vw9vkfV1CUb4N+MuTCpA/IsOLLwoxdqj/Boz8TJ6mcSWwpCXHGX n3jZ3tgV6wTjoz67TkdEI9zJsAHTn7KP66WUs68J4oDveMgpELfgdXwt5bC9rVOuWY ymaMmkRZYnIwHb1plGf9yRRoKfUkPWpT6S0QEiYswR0GAzQVqqTVXuE+faZvoMBlaq pw/NKRntDP89w== Received: by mail-ej1-f70.google.com with SMTP id xh12-20020a170906da8c00b007413144e87fso1214210ejb.14 for ; Thu, 24 Nov 2022 06:00:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RrP546xhidFF4ofUw9nkWWxP+wf9XcC5fAC/33+GFRk=; b=igfn/GTPc9XUC6njmhCdpmlOonzwGp5lWq2y1OJi/57aF2NNSwjA+aIpzHpr8ZFNCa oW1SPQrvVwnkENCjKPeKJK/8R3a5mMuOclKMSDbSxb6RXdNYxsp11pQvwFOvs1LEg0rP 38K+GzXpwXge0cLrRY/oinsYlkEgEPIto/5kvG2OyEv95eMMeS1wL5CRYURvBe7LydZU 1URksU74lJizqs/C00a1Q2XgnrcX++7tUtz3ol1wK8Pg4lqlOEwPFaslJkCuxABSMskL LMYrxiPTqNAmYra84GPHpkAGcvyNVmJ3LjHyUeHnapAQv8057RRBkGCvSHIdGxsug8y2 tAjQ== X-Gm-Message-State: ANoB5pkN6RRCCZ+V6CNZ5eP9mL76tiyxZksUr8WD9JigOamjhOPenyPu cCjVNvnGSv2JnSywku5JcnYMVbj5hLIIiuElX+SDT2R1p8jdIt6BaBqgoHTTcpgw1oVPtk0i5c7 jJ/gYnjQ7syczILVsHUF8OMAB X-Received: by 2002:a17:906:2693:b0:7aa:57c3:3f26 with SMTP id t19-20020a170906269300b007aa57c33f26mr11695108ejc.195.1669298459148; Thu, 24 Nov 2022 06:00:59 -0800 (PST) X-Google-Smtp-Source: AA0mqf4bMVKMB8LNS9bvd3PxK8Vs8loZ4O4bRY8gr1uTXWyRt+8AkJHNgUrAYo95LCnBXnlgUUyO/A== X-Received: by 2002:a17:906:2693:b0:7aa:57c3:3f26 with SMTP id t19-20020a170906269300b007aa57c33f26mr11695086ejc.195.1669298458907; Thu, 24 Nov 2022 06:00:58 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39e5:dd00:978:e124:4bf:b342]) by smtp.gmail.com with ESMTPSA id u17-20020aa7d0d1000000b004617e880f52sm544478edo.29.2022.11.24.06.00.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 06:00:58 -0800 (PST) From: christian.ehrhardt@canonical.com To: Olivier Matz Cc: Wenjun Wu , dpdk stable Subject: patch 'net/ixgbevf: fix promiscuous and allmulti' has been queued to stable release 19.11.14 Date: Thu, 24 Nov 2022 15:00:32 +0100 Message-Id: <20221124140034.770192-9-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221124140034.770192-1-christian.ehrhardt@canonical.com> References: <20221124140034.770192-1-christian.ehrhardt@canonical.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 19.11.14 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/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/acb3bb3600b226617f5e1d31626dc8f316faa69f Thanks. Christian Ehrhardt --- >From acb3bb3600b226617f5e1d31626dc8f316faa69f Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Thu, 29 Sep 2022 14:21:55 +0200 Subject: [PATCH] net/ixgbevf: fix promiscuous and allmulti [ upstream commit 21e471abb548f91190479c75da0c28ebc25dec36 ] The configuration of allmulti and promiscuous modes conflicts together. For instance, if we enable promiscuous mode, then enable and disable allmulti, then the promiscuous mode is wrongly disabled. Fix this behavior by: - doing nothing when we set/unset allmulti if promiscuous mode is on - restorting the proper mode (none or allmulti) when we disable promiscuous mode Fixes: 1f4564ed7696 ("net/ixgbevf: enable promiscuous mode") Signed-off-by: Olivier Matz Acked-by: Wenjun Wu --- drivers/net/ixgbe/ixgbe_ethdev.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 65d81c6cec..9a196fb9a6 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -8718,9 +8718,13 @@ static int ixgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + int mode = IXGBEVF_XCAST_MODE_NONE; int ret; - switch (hw->mac.ops.update_xcast_mode(hw, IXGBEVF_XCAST_MODE_NONE)) { + if (dev->data->all_multicast) + mode = IXGBEVF_XCAST_MODE_ALLMULTI; + + switch (hw->mac.ops.update_xcast_mode(hw, mode)) { case IXGBE_SUCCESS: ret = 0; break; @@ -8742,6 +8746,9 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev) int ret; int mode = IXGBEVF_XCAST_MODE_ALLMULTI; + if (dev->data->promiscuous) + return 0; + switch (hw->mac.ops.update_xcast_mode(hw, mode)) { case IXGBE_SUCCESS: ret = 0; @@ -8763,6 +8770,9 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev) struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); int ret; + if (dev->data->promiscuous) + return 0; + switch (hw->mac.ops.update_xcast_mode(hw, IXGBEVF_XCAST_MODE_MULTI)) { case IXGBE_SUCCESS: ret = 0; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-24 14:58:14.355601214 +0100 +++ 0009-net-ixgbevf-fix-promiscuous-and-allmulti.patch 2022-11-24 14:58:11.841189674 +0100 @@ -1 +1 @@ -From 21e471abb548f91190479c75da0c28ebc25dec36 Mon Sep 17 00:00:00 2001 +From acb3bb3600b226617f5e1d31626dc8f316faa69f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 21e471abb548f91190479c75da0c28ebc25dec36 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index fd06ddbe35..ae9f65b334 100644 +index 65d81c6cec..9a196fb9a6 100644 @@ -28 +29 @@ -@@ -7787,9 +7787,13 @@ static int +@@ -8718,9 +8718,13 @@ static int @@ -43 +44 @@ -@@ -7811,6 +7815,9 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev) +@@ -8742,6 +8746,9 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev) @@ -53 +54 @@ -@@ -7832,6 +7839,9 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev) +@@ -8763,6 +8770,9 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)