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 CB2EA457A1 for ; Mon, 12 Aug 2024 14:58:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C59A7402C3; Mon, 12 Aug 2024 14:58:19 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2073.outbound.protection.outlook.com [40.107.93.73]) by mails.dpdk.org (Postfix) with ESMTP id DF3DE4029C for ; Mon, 12 Aug 2024 14:58:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TyMX7VRqRcWS+DE7JaSBcOZDMmiyuyeOQNBFz41KMytoBpX5Fhh1vUO0nKfjacAj3u99RUxqSxZkmWFMf3Ytq6bNbP3BcUJy2+LeJl9W0fwvqfvxLyiGTWCzikriR0k6Cp9nTXrbiyM5sXj0YiUuvICQtmYDyJI4m5hQMiLtsx5rBERcsT48GAesiqIpQRKo5Fa5RMulNdPD8TNkRVR55etsEPGdFaiF1eSMH7IKAVNFir9iBrKD6D5Z9R8PwQU23IMymKHZJMRtm0lF3Nnuh0q/fytk3t9wm9NcFAY68yv1O1/x6iEIyzrlx9xPkgFhl+hST3nWFnXMo9P/j4+SMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JjKLFi6+W/X/3Sn7pfXf5DgqYNb2t/XspV7vGCZeino=; b=n7sgw2B5kqV5qhAm3amjr/Q+CVJEHb1vGun6Z+SlsCIl/B4R6tdP+wt1QnvadnTpCZqYuGnQqv5YvVLsr5nRGhj1H/WUJE3YPvhxMrFh23ISM1/Dcj4TGZm3X+tuDHFPSupY10Edhjh6WRVwv5OP5wpoxEG7NltNdfTsjBPFle/p9oqhtficI94gYQ8P5+eu236I6yodrUswZeAk6vfuIP2/An9i1BD7nsqqR0X0q+2/76EV+hXWIjdai78OV8nu70+5sRrSKWbvoupRBrfFFQslpNb6xOaYFrni3qAyVRpn2vRsDobylzfDhxYcLFtuv359pzoXUp9WGlKcvE+hTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=trustnetic.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JjKLFi6+W/X/3Sn7pfXf5DgqYNb2t/XspV7vGCZeino=; b=MaPOUFKpFuOO6vlBGwtgbiIZ//buT6teZ2IUysMZXMAD07hcxtHt+4c+/1R4z47wM5ijuwL3X5KiSsvCYaSMxqmYXMa/QY9K8Z7zQaVPxs/56ikE2tPVnrfF4e/7REywPSiC1u7m3t754ekJbkRtZF5OQPDECjoVeuRpbAzSU1cZ7Hs+t4vYsOnlGkprgSkpphkU5u1a3dYQlyILtuHVI5Dic1Y1JfbsLlT/f9tV4HGl9mGMCes+Id0qW+0hEnTf6WyvF54xIknQMXLM4XtPXEJB9TaBup4eZvbx/ZpWBtcfueKP++cXND8up+3B0Fw6uAJ9R0j5WzVx0aWokk589g== Received: from BL0PR0102CA0069.prod.exchangelabs.com (2603:10b6:208:25::46) by DS7PR12MB8232.namprd12.prod.outlook.com (2603:10b6:8:e3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:58:14 +0000 Received: from BL02EPF0001A0FF.namprd03.prod.outlook.com (2603:10b6:208:25:cafe::30) by BL0PR0102CA0069.outlook.office365.com (2603:10b6:208:25::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:58:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF0001A0FF.mail.protection.outlook.com (10.167.242.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:58:14 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:58:01 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:57:59 -0700 From: Xueming Li To: Jiawen Wu CC: , dpdk stable Subject: patch 'net/txgbe: fix VF promiscuous and allmulticast' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:12 +0800 Message-ID: <20240812125035.389667-76-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FF:EE_|DS7PR12MB8232:EE_ X-MS-Office365-Filtering-Correlation-Id: a121c51a-6d25-449c-0180-08dcbace6d9d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?c7d/WnVcRFNsFrbFXYwUYcMpJaOMD/1jfO/d/mdmg11L73jWkW7PJYS/8kG+?= =?us-ascii?Q?J6bdcCkIRAaex9EN8rhuFEpNbyq9pu3WhY6f6f7Xz4I7CVU1kci01VteMZS+?= =?us-ascii?Q?gs7/bwRtcfdU8oWZV+O5PwbCwrkZ86WfmPBokGVMYaFdBLiShRrpaGcjxYnn?= =?us-ascii?Q?bdIaeFWMLIMJpnew1Q3F0l4muTUyIemlZyIS2I7j7JknL4ADIfkVxtnLagcn?= =?us-ascii?Q?8ySv2aKW1GnTdBtI6BP6hdSPsX59gHgPhhFT6uGca/0hXCkussi2dtgxFc6U?= =?us-ascii?Q?svrXZSj+Zv+cfPOqxXh1/bXGufOB1upW6RORi+boxiLtnORQqm+nk8oMAPR7?= =?us-ascii?Q?/ZykmXY9RQ78gqhWY8AAHF7eds+ZwMpw+7JMO6YI2h8tgSacSUYG2Er34aK3?= =?us-ascii?Q?F9wU5SoC93Jqncvdqg5B+t95kMEu4NYWGSGk+BNoMaYJCu3qVsopiP4fu7mr?= =?us-ascii?Q?MjUKIfxu7mHQOTTgeg6dtL0po7qexmyCwHyLqJzG3SFHfG95M7AbOXOZmzz2?= =?us-ascii?Q?G0VXhKqDXQ74FQWqfDCm42iekYASDqfmAoCJw859niCkLIgjfJIoRYqqgXi7?= =?us-ascii?Q?Aj9jOYmk+kwzH3Df6KHZHl1D+58W2fsCgy6zw9iwpEgK08bsKY6InaCN9cPn?= =?us-ascii?Q?ueY4RRw1ToSPg5tWIPRFPawUttkgA5cyr06Q+siob44JomZJmjo4GzJncRFa?= =?us-ascii?Q?YpIcr0jSCSpdm4u1dwDQttOEQz/0D8PuEz0cHi4diqSgzGu7dR/Z3+AMtjHY?= =?us-ascii?Q?XctNp8ttYWd4ZDVJyPcW97fO5CRIti+x94QqEW0LNAvgOI6C+U2PqAleAUXA?= =?us-ascii?Q?gogGTyn+WRqne3YZZtF97bdpf/Ti6o79EBTTa1b1EuO143OdyWkHI6DWynWE?= =?us-ascii?Q?n2zrZDTCQ5ou9iuHWXBCmU5Q1HPPsN76j4uZAZBFoIK7K2p0vP/VW9P7PFpN?= =?us-ascii?Q?Cl93houCbSwqizGdzViwkyZNQkJZcgfWNIs6hyHKcskCSIPHWzdq/Y8+IFBK?= =?us-ascii?Q?HcIj2DolfzdKvBCvLTLIBj3OxvFsDMd09VdC3oawNtNwIHJzPsWtbQoSML3G?= =?us-ascii?Q?ruO7KaKPUQJ8AHHBxY9eiioi4rAeGy8gCl+sfsuTZ9lLBxIwOhIwjKrxLY8f?= =?us-ascii?Q?+y2N1TI9W5HxcoFc7YkIlmMSLQAMPsyB2v9gSwZeQCi00d2TJTrPZZHwo4Tp?= =?us-ascii?Q?/IVY5W1b1UXLhpvf776EpeJjdKuJxPcIqnx49KTVSp6B6WpAHfmLKTGiGHLI?= =?us-ascii?Q?z04m2C9VwOb1LXZ+D+lW61wEX9/889JVU62uqHJeZAwba9Up1QQE6zDUWrpi?= =?us-ascii?Q?mLCrTcJAPB4SC+yfu9zF0JzWmrMtrl72lyeGaUqs6/LFza1ykJZHpGyc/I5S?= =?us-ascii?Q?KjbyxOyJSDqvZPpUYbg8e9DFAH7qokA8/iDBSgPPJvWttn7CWg=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:58:14.2771 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a121c51a-6d25-449c-0180-08dcbace6d9d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A0FF.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8232 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 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=85bd339e194d0ad1a3162616f3c3a4a66d397148 Thanks. Xueming Li --- >From 85bd339e194d0ad1a3162616f3c3a4a66d397148 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 Cc: Xueming Li [ 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:04.990859402 +0800 +++ 0075-net-txgbe-fix-VF-promiscuous-and-allmulticast.patch 2024-08-12 20:44:02.235069322 +0800 @@ -1 +1 @@ -From 055a51ff85112200706a07e99b92c9459774080a Mon Sep 17 00:00:00 2001 +From 85bd339e194d0ad1a3162616f3c3a4a66d397148 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 055a51ff85112200706a07e99b92c9459774080a ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index ec40419289..6ac34058ab 100644 +index f1341fbf7e..1d7f1dcd15 100644 @@ -27 +29 @@ -@@ -1202,9 +1202,13 @@ static int +@@ -1201,9 +1201,13 @@ static int @@ -42 +44 @@ -@@ -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 +54 @@ -@@ -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)