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 B3F874569C for ; Wed, 24 Jul 2024 13:34:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ADD1842D89; Wed, 24 Jul 2024 13:34:17 +0200 (CEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id A3E0D43390 for ; Wed, 24 Jul 2024 13:34:15 +0200 (CEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4257d5fc9b7so58324215e9.2 for ; Wed, 24 Jul 2024 04:34:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721820855; x=1722425655; 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=5htUK/34MVkW9HGrpTeSnGCBaWf103WFe8qIvBQxi6w=; b=ERG2fVpc5nC3wKtvtirdGXH+7Er6rMN2UlBmp4YmglC6BP2WMFoIM0/jBmko+REiRF 5ThUBrfhFlEF6EBeGY7pvM3cYWvgzv4YnZ6Li/xE6toUVE3hY5KbMRtT4VxqVY36HL1P rByk4GwPBBd50W0PyZiWGB0VA/3jcfPmef+cNRw610Gd8Xt86U+CyxuBbXVv1+uzO4iV FAzIXDuLlYRIIemqDonBJzbIgi8QZFXLo8TKnXStjLrQanx+GAVxKHKe42oA0GfaQxoM qQNl647zB79sj3fpR8mr2mIFgcNn+Js0ff2UYgyxap4KGChL4lXW/F7GY5QqNuwMhCb3 7JrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721820855; x=1722425655; 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=5htUK/34MVkW9HGrpTeSnGCBaWf103WFe8qIvBQxi6w=; b=c3bnh1kaWh+NoC9ccxu1mou4UXqz1ZIxj8l1qslAR9U/tsn8NazkCRBjWJ3GmZDKek +6H9D3MAekwouAn59diK/3gTe3ktFsFbAS4Ulq7BRYvmWLhBrh/KAC5mvDOCt/HuR0Em farly66EOLbaOXzHkKSljpVDllbZNANOdkHNPLHGprczxu4NYRpIjZAvhy8aTCFCnJ5r mhjj0vxnvDEYOVn/wIvmaSpp4VvuzZLCzn4OU22i/uHO02/rm4+IqACpWHZoXgwFKK1O 9u3BPMi5je2GI1qbXryxQQJB3OLP+3E3OfNA+p1q7gKtd8SGvqrvIyareoxbL/aK+JTZ WpLQ== X-Forwarded-Encrypted: i=1; AJvYcCU1dnBuK4gCK1zZXF+SWFlFNPfUkM36eyiW2vCLZdxgjCU3QXmYFao8iI54lAUzj6zaw0sdZKgy5BxMYd2SzCk= X-Gm-Message-State: AOJu0Yw8F9qk31B1LP1+96Ij73Soj/YYVAMhcr27g1vu87lZPS9VjWCY G4dwaAqEqjjUEB1wSMZUXdQGUL+ZymCa2RgzoAQBAtkusFu4MBE1nkTFnccZ X-Google-Smtp-Source: AGHT+IFN9biRGXKM6WB0PiLbx2DsQB8ed+ow/59uS3PTFyvxVNlhrwqI4CD/5KF0ZoCOAVadiG6y+w== X-Received: by 2002:a05:600c:3112:b0:426:6857:3156 with SMTP id 5b1f17b1804b1-427f7ad552amr21587095e9.27.1721820855113; Wed, 24 Jul 2024 04:34:15 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427f93bc977sm24845785e9.42.2024.07.24.04.34.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 04:34:14 -0700 (PDT) From: luca.boccassi@gmail.com To: Bing Zhao Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix uplink port probing in bonding mode' has been queued to stable release 22.11.6 Date: Wed, 24 Jul 2024 12:32:55 +0100 Message-Id: <20240724113318.616754-17-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240724113318.616754-1-luca.boccassi@gmail.com> References: <20240715152704.2229503-86-luca.boccassi@gmail.com> <20240724113318.616754-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/26/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/751fa44c5198aa210b58a6335450e06be3569051 Thanks. Luca Boccassi --- >From 751fa44c5198aa210b58a6335450e06be3569051 Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Wed, 17 Jul 2024 19:35:41 +0300 Subject: [PATCH] net/mlx5: fix uplink port probing in bonding mode [ upstream commit 39d4ec8f36192b9dafbad4994cbe37f7674c7190 ] In the HW-LAG bonding mode, the representor port can be from both slave PFs. When probing a representor (REP), the UPLINK (proxy) port always needs to be probed firstly before any REP port. In the current implementation, when probing a device with the following format: -a 0000:XX:00.0,dv_flow_en=N,representor=pf1vfy Since the REP belongs to the 2nd PF in the bonding, the UPLINK would not be added into the probing ports list. 1. In dv_flow_en=1 mode, the REP itself can be probed. But it didn't obey the rules and the behaviors were inconsistent. a. When probing the REP from 1st PFs, the UPLINK was also probed. b. When detaching the UPLINK, all REPs were detached. 2. In dv_flow_en=2 mode, since some resources can only be allocated / created on the proxy port, the probing would get a failure. By removing the unneeded check of the bonding PF device index, the UPLINK will always try to be probed with any format. Fixes: 2e569a370395 ("net/mlx5: add VF LAG mode bonding device recognition") Signed-off-by: Bing Zhao Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/linux/mlx5_os.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index bdb2f6fb59..b88ae631d9 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2170,8 +2170,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev, list[ns].info.master = 0; list[ns].info.representor = 0; } - if (list[ns].info.port_name == bd) - ns++; + ns++; break; case MLX5_PHYS_PORT_NAME_TYPE_PFHPF: /* Fallthrough */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-24 12:29:22.079860620 +0100 +++ 0017-net-mlx5-fix-uplink-port-probing-in-bonding-mode.patch 2024-07-24 12:29:20.731025327 +0100 @@ -1 +1 @@ -From 39d4ec8f36192b9dafbad4994cbe37f7674c7190 Mon Sep 17 00:00:00 2001 +From 751fa44c5198aa210b58a6335450e06be3569051 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 39d4ec8f36192b9dafbad4994cbe37f7674c7190 ] + @@ -29 +30,0 @@ -Cc: stable@dpdk.org @@ -38 +39 @@ -index 5e950e9be1..11336c430b 100644 +index bdb2f6fb59..b88ae631d9 100644 @@ -41 +42 @@ -@@ -2473,8 +2473,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev, +@@ -2170,8 +2170,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,