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 7F501455AD for ; Mon, 15 Jul 2024 17:30:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A72C40BA0; Mon, 15 Jul 2024 17:30:34 +0200 (CEST) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by mails.dpdk.org (Postfix) with ESMTP id DA65640A71 for ; Mon, 15 Jul 2024 17:30:30 +0200 (CEST) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-52e96d4986bso4447312e87.3 for ; Mon, 15 Jul 2024 08:30:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057430; x=1721662230; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ucsfBBFLkvn1XXcG2hFALB3/mB3An7wqnT82rPSXVNI=; b=DXDZdI1RIsIx0W+Ehf/YO7lohEAnfmvHm9rSkwuGjOKIWoFK/x3HeNCHm4E1JFx0TW FcuiGv5xDmaAMlY1RQTohhciQ2REgzTCFeVJ6OxjCdXV3KJdIo4PmwWTKGHKpVHER6WW 0hCf6QAoCy3W2pxWk+X2/f/8gk8YxyI5AuG71Dly29tmmDJ5aJZG6zidnN4kXTfVE7rZ W5W6HCQ+flO2OVLjZslNA9/k9zJrVPKsCCphqQagQ3VDyzKXFUaB55EiSd2vvGe0QVcM sdUFsjsHIJcx9Ta4bpsyJ2jkzwkq/6NGdPzoWuNqNXSVkv6pM5T0BD8v7E2KCQJ41VjY eG0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057430; x=1721662230; 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=ucsfBBFLkvn1XXcG2hFALB3/mB3An7wqnT82rPSXVNI=; b=vYofAnyeD3oqsppCQJC3uM2KhqRN9HO1OSPOStE3IpFUjZn47o6ZuGFZ85UFRZAqwU 82EKATgK2SDwKtXvfaG/9AGypBZH1fbn8O0rbc3Yb1UYWJFyHzclzuXcY4cCpjG3KJhF mu1NxwgGlywzgrwO1FBxc/tN6wzwIeSFo0yLbfjgZLyThQI2GXaIaIHIX+nLviTkVm8k BkD2LeqNISJMAac3e91UulxQRoe+gH6mnl0DnQ+TBoiZI/kh+1NFpYrfAclMU2JXlN2u 14KJIqenrDZTDWJwMjShrf/89gFeGdZeX21PaHluPn1IgtLKFBcox0wbsbFZDhxSTEky Rk2A== X-Gm-Message-State: AOJu0YwwxOyFwH01mKfEp1gt3frRKGVp9+vYX0OUP+arS6IwOTl5ijQt WhrCMqEnVetlL3/aP/j3nYQLxw5DGrRzBSzbmVIumTqL1+FLxDkaHkxjyee/PyA= X-Google-Smtp-Source: AGHT+IHBukYx81pObarB0fibC0XgwoCbYz8azB1K6N1gbeLerK4F3OBZ6U3v7HQlFBbni0xBldy/aA== X-Received: by 2002:a05:6512:114d:b0:52c:dbee:bdb0 with SMTP id 2adb3069b0e04-52eb99d4e86mr15330966e87.59.1721057430249; Mon, 15 Jul 2024 08:30:30 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427a5ef4617sm89844655e9.41.2024.07.15.08.30.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:30:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: fix VF promiscuous and allmulticast' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:26:43 +0100 Message-Id: <20240715152704.2229503-65-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-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 22.11.6 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/17/24. 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/ee530d3ee42218d887a596d1f6df4fbff9074f13 Thanks. Luca Boccassi --- >From ee530d3ee42218d887a596d1f6df4fbff9074f13 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 18 Jun 2024 15:11:37 +0800 Subject: [PATCH] net/txgbe: fix VF promiscuous and allmulticast [ upstream commit 055a51ff85112200706a07e99b92c9459774080a ] 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: 29072d593fe4 ("net/txgbe: support VF promiscuous and allmulticast") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev_vf.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c index f1341fbf7e..1d7f1dcd15 100644 --- a/drivers/net/txgbe/txgbe_ethdev_vf.c +++ b/drivers/net/txgbe/txgbe_ethdev_vf.c @@ -1201,9 +1201,13 @@ static int txgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev) { struct txgbe_hw *hw = TXGBE_DEV_HW(dev); + int mode = TXGBEVF_XCAST_MODE_NONE; int ret; - switch (hw->mac.update_xcast_mode(hw, TXGBEVF_XCAST_MODE_NONE)) { + if (dev->data->all_multicast) + mode = TXGBEVF_XCAST_MODE_ALLMULTI; + + switch (hw->mac.update_xcast_mode(hw, mode)) { case 0: ret = 0; break; @@ -1224,6 +1228,9 @@ txgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev) struct txgbe_hw *hw = TXGBE_DEV_HW(dev); int ret; + if (dev->data->promiscuous) + return 0; + switch (hw->mac.update_xcast_mode(hw, TXGBEVF_XCAST_MODE_ALLMULTI)) { case 0: ret = 0; @@ -1245,6 +1252,9 @@ txgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev) struct txgbe_hw *hw = TXGBE_DEV_HW(dev); int ret; + if (dev->data->promiscuous) + return 0; + switch (hw->mac.update_xcast_mode(hw, TXGBEVF_XCAST_MODE_MULTI)) { case 0: ret = 0; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:37.862151928 +0100 +++ 0065-net-txgbe-fix-VF-promiscuous-and-allmulticast.patch 2024-07-15 16:19:34.676208769 +0100 @@ -1 +1 @@ -From 055a51ff85112200706a07e99b92c9459774080a Mon Sep 17 00:00:00 2001 +From ee530d3ee42218d887a596d1f6df4fbff9074f13 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 055a51ff85112200706a07e99b92c9459774080a ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index ec40419289..6ac34058ab 100644 +index f1341fbf7e..1d7f1dcd15 100644 @@ -27 +28 @@ -@@ -1202,9 +1202,13 @@ static int +@@ -1201,9 +1201,13 @@ static int @@ -42 +43 @@ -@@ -1225,6 +1229,9 @@ txgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev) +@@ -1224,6 +1228,9 @@ txgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev) @@ -52 +53 @@ -@@ -1246,6 +1253,9 @@ txgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev) +@@ -1245,6 +1252,9 @@ txgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)