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 87AE1A0093 for ; Tue, 10 May 2022 14:30:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8294D42837; Tue, 10 May 2022 14:30:40 +0200 (CEST) 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 BF6E64069D for ; Tue, 10 May 2022 14:30:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185839; 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=h9dVb+vWZVn9nRAj1O8RGO7Ci6P+wE8LOYbyHFyjaB8=; b=NMAWmur+MMYYNdyZqWsuOYQoNZwC+cCzo/XjLL7ZvRFehdXtUDd0rRxQv0a2XbUbplaJSe nSn/PiluqLY51zs8DqSSVz30MYX21IJb7DjTx59djfhsG5ctbIrG3jaYVYxn32IOgAhkwo QgFVWEur/MhWOZk0wykxW3ocu7KUzoQ= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-29-SUo6b2BKO5-mInQGOo39Rg-1; Tue, 10 May 2022 08:30:38 -0400 X-MC-Unique: SUo6b2BKO5-mInQGOo39Rg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D1A111C3E981; Tue, 10 May 2022 12:30:37 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5CEC40CFD06; Tue, 10 May 2022 12:30:36 +0000 (UTC) From: Kevin Traynor To: Rongwei Liu Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix probing with secondary bonding member' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:29:50 +0100 Message-Id: <20220510123010.159523-13-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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-default=true 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.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 05/15/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/99ba358268c8bd8d1bb387ea842a88ca45ffdbe1 Thanks. Kevin --- >From 99ba358268c8bd8d1bb387ea842a88ca45ffdbe1 Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Wed, 6 Apr 2022 10:12:24 +0300 Subject: [PATCH] net/mlx5: fix probing with secondary bonding member [ upstream commit f956d3d4c33cdfac5e352f457050029bd5c9b8a8 ] Users can probe primary or secondary PCIe id when bonding is configured. 1. -a 0a:00.0,representor=pf[0-1]vf[0-1], PMD probes 5 ports totally: bonding device plus 4 representor ports. 2. -a 0a:00.1,representor=pf[0-1]vf[0-1], PMD only probes 2 representor ports. Under the 2nd condition, bonding IB device doesn't have the same PCIe id and PMD needs to check bonding relationship otherwise probe failure. Fixes: 6856efa54eea ("net/mlx5: fix PF leak on PCI probing failure") Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/linux/mlx5_common_os.c | 26 ++++++++++++++++------ drivers/net/mlx5/linux/mlx5_os.c | 24 ++++++++++---------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c index 25e09bb55b..eeb583a553 100644 --- a/drivers/common/mlx5/linux/mlx5_common_os.c +++ b/drivers/common/mlx5/linux/mlx5_common_os.c @@ -457,19 +457,31 @@ mlx5_os_get_ibv_device(const struct rte_pci_addr *addr) struct ibv_device **ibv_list = mlx5_glue->get_device_list(&n); struct ibv_device *ibv_match = NULL; + uint8_t guid1[32] = {0}; + uint8_t guid2[32] = {0}; + int ret1, ret2 = -1; + struct rte_pci_addr paddr; - if (ibv_list == NULL) { + if (ibv_list == NULL || !n) { rte_errno = ENOSYS; + if (ibv_list) + mlx5_glue->free_device_list(ibv_list); return NULL; } + ret1 = mlx5_get_device_guid(addr, guid1, sizeof(guid1)); while (n-- > 0) { - struct rte_pci_addr paddr; - DRV_LOG(DEBUG, "Checking device \"%s\"..", ibv_list[n]->name); if (mlx5_get_pci_addr(ibv_list[n]->ibdev_path, &paddr) != 0) continue; - if (rte_pci_addr_cmp(addr, &paddr) != 0) - continue; - ibv_match = ibv_list[n]; - break; + if (ret1 > 0) + ret2 = mlx5_get_device_guid(&paddr, guid2, sizeof(guid2)); + /* Bond device can bond secondary PCIe */ + if ((strstr(ibv_list[n]->name, "bond") && + ((ret1 > 0 && ret2 > 0 && !memcmp(guid1, guid2, sizeof(guid1))) || + (addr->domain == paddr.domain && addr->bus == paddr.bus && + addr->devid == paddr.devid))) || + !rte_pci_addr_cmp(addr, &paddr)) { + ibv_match = ibv_list[n]; + break; + } } if (ibv_match == NULL) { diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 6c76a30e8c..792dd2cb22 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2190,7 +2190,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev, /* No device matches, just complain and bail out. */ DRV_LOG(WARNING, - "No Verbs device matches PCI device " PCI_PRI_FMT "," + "PF %u doesn't have Verbs device matches PCI device " PCI_PRI_FMT "," " are kernel drivers loaded?", - owner_pci.domain, owner_pci.bus, + owner_id, owner_pci.domain, owner_pci.bus, owner_pci.devid, owner_pci.function); rte_errno = ENOENT; @@ -2613,14 +2613,14 @@ mlx5_os_pci_probe(struct mlx5_common_device *cdev) ret = mlx5_os_pci_probe_pf(cdev, ð_da, eth_da.ports[p]); - if (ret) - break; - } - if (ret) { - DRV_LOG(ERR, "Probe of PCI device " PCI_PRI_FMT " " - "aborted due to prodding failure of PF %u", - pci_dev->addr.domain, pci_dev->addr.bus, - pci_dev->addr.devid, pci_dev->addr.function, - eth_da.ports[p]); - mlx5_net_remove(cdev); + if (ret) { + DRV_LOG(INFO, "Probe of PCI device " PCI_PRI_FMT " " + "aborted due to proding failure of PF %u", + pci_dev->addr.domain, pci_dev->addr.bus, + pci_dev->addr.devid, pci_dev->addr.function, + eth_da.ports[p]); + mlx5_net_remove(cdev); + if (p != 0) + break; + } } } else { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:21.965977325 +0100 +++ 0013-net-mlx5-fix-probing-with-secondary-bonding-member.patch 2022-05-10 13:24:21.579646328 +0100 @@ -1 +1 @@ -From f956d3d4c33cdfac5e352f457050029bd5c9b8a8 Mon Sep 17 00:00:00 2001 +From 99ba358268c8bd8d1bb387ea842a88ca45ffdbe1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f956d3d4c33cdfac5e352f457050029bd5c9b8a8 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 030ceb561f..d40cfd5cd1 100644 +index 25e09bb55b..eeb583a553 100644 @@ -31 +32 @@ -@@ -560,19 +560,31 @@ mlx5_os_get_ibv_device(const struct rte_pci_addr *addr) +@@ -457,19 +457,31 @@ mlx5_os_get_ibv_device(const struct rte_pci_addr *addr) @@ -71 +72 @@ -index ff65efb2a2..a821153b35 100644 +index 6c76a30e8c..792dd2cb22 100644 @@ -74 +75 @@ -@@ -1980,7 +1980,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev, +@@ -2190,7 +2190,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev, @@ -84 +85 @@ -@@ -2388,14 +2388,14 @@ mlx5_os_pci_probe(struct mlx5_common_device *cdev, +@@ -2613,14 +2613,14 @@ mlx5_os_pci_probe(struct mlx5_common_device *cdev) @@ -86 +87 @@ - eth_da.ports[p], mkvlist); + eth_da.ports[p]);