From patchwork Tue Aug 17 13:44:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 96993 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0AFBFA0548; Tue, 17 Aug 2021 15:45:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D4071411BD; Tue, 17 Aug 2021 15:45:23 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2040.outbound.protection.outlook.com [40.107.93.40]) by mails.dpdk.org (Postfix) with ESMTP id AA48E411B6; Tue, 17 Aug 2021 15:45:21 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=josNKzYUXOitTGuuqfuY2NvZOMaZ+hM446zk6SivB/QtYJEL16HkWF5wj/YOEXR9wNOW/eNn0meEOxgc3hsphMjWCJRkP0c2Ezae1Iry6HLkv1kOnB9fb8tmgXQp7xU+AD8kD/4/w7180Pfd9ej632Nh8cd39WC0rSs6x7tTILL2VkLgx3DOad7ZZmlIBbiXAvbk7OEqWew2ehQd7KYbkL2CMcu5sncVPrdMdsGUwgBdBX0YZwoSrrb4PtD2QfhduU9slIBMGwz+MCQZ0cUOqLchhsLYceBchEP2+fSaC+JH2xb4dDE720X2RShtwcMnwuvnuWeDl5jSM3tluVPh1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K4LgXbnLSi+y7JrIJvSI2QtzJXe8m+1yWHKToS1s3BU=; b=KIpNfwVZ/EosaKkzSaVIDvCxnfjmZ6197ex61VmOOVf4SJtnnlcYf1P9ehT7g+tRG5URFoobv5QcFahwH4gH72ADRwCiciJ1VGxpchATjwusaD1thN6AQOISImBUa2AQ3x2m/+QRxFIUkhW4E8AQj7vE3sqpPdZup3HueNgCWL6fd7VTq9HRbMGRR8b6B76ZjTcxE0GdhxdHwSnBGK3vFAz5jloV1tSkuppCbJOTBTZ3a0RK7tyi/PpbfN6d8Mrf74sUxCVH77Xwl9YEm6KS3Edely4i6Kgl08wfe0kzOqW7UpZMlZ2pfVOUkCGWy5uaKM1PCFzqiN2GVNGAr5QSfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.36) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none 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=K4LgXbnLSi+y7JrIJvSI2QtzJXe8m+1yWHKToS1s3BU=; b=lUUubme9iSDo2ZX2upQY/FwIZTWffWiLbn5eXK7cmLI82vrERq35Q5P/CF5GNeoZy62FscqEenuuWUQm+8lVU/OIP+uMUGf+n/UdLCePVgoANu0gHyUL07DGYD3P6p99OeQcEVuN+KsOBBh8+KhFwJWRMdIF2n4NJWzCEebEPwd3t8RIOW7lYmpZKUpP8SpUU5sPPln9HiQyWty9D5FgZn2AngdrBMzCZHdCGF5sIU4fARsnNC7bKoeYuduY87t1a5ChkMTtcEQnQ8OFcrlYsQbRXF8euB+VgI+mYde5xtCxx1LXV6Yr4WVBY5Ngac4MHyrXrhd2A6hGNpNa4DXQtA== Received: from BN9PR03CA0285.namprd03.prod.outlook.com (2603:10b6:408:f5::20) by CY4PR1201MB0104.namprd12.prod.outlook.com (2603:10b6:910:1d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.21; Tue, 17 Aug 2021 13:45:20 +0000 Received: from BN8NAM11FT062.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f5:cafe::7d) by BN9PR03CA0285.outlook.office365.com (2603:10b6:408:f5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Tue, 17 Aug 2021 13:45:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.36) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.36 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.36; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.36) by BN8NAM11FT062.mail.protection.outlook.com (10.13.177.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Tue, 17 Aug 2021 13:45:19 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 17 Aug 2021 13:45:18 +0000 Received: from nvidia.com (172.20.187.6) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 17 Aug 2021 13:45:17 +0000 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Date: Tue, 17 Aug 2021 16:44:22 +0300 Message-ID: <20210817134441.1966618-3-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210817134441.1966618-1-michaelba@nvidia.com> References: <20210817134441.1966618-1-michaelba@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee72ca34-8876-4b73-3abd-08d9618540f9 X-MS-TrafficTypeDiagnostic: CY4PR1201MB0104: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PVt138q5FObe8Yk4EYC2visWT3YVVDxIPCZjGTsG4eslMFMIZ1WBeeXHR9Aq0CihgQTD9LfsYiO0vFwtlM191SJnDUwl2VBl+h5Gx5VYWJTj1tu855OaZMO4+TRD+ohKPXmZbD2n5lEEf87FQ6geTYrAeZgbOjxuC3ae/R7yyKJDTrcSe0r56nnhs2Xh7oBoW58Vsd4rhpnGlP7+7dmgAd/noCPyaFa/egYCSBFKZQtIHRr4r/AGrF9AuuBeeK5naRQgrLHsjzr5MiqpsjUsht3hhpg+IufjYt5Nf4+w++tbvZ7OJIiE3BBpITp4DV6h+DThkG0XKbTh9x2e/MqrjLJiRKYvKUyRsj7N/if8kdPAarhzTr0IBdjV5AYIkiVZfOduuJxSGkSgiCWsbdQGWANP+N6RAiW0AqBVcw8e/A3C88mvEh4oo4OuZw1llwReCqRnjRUkRHgV1rlTS7VIAt4JmOhVLw3xGb60ANMDDServIdjjeMozdq4p1qqkU2WJXsdZ+ohRBDInp3PhtmX9sqvGQ36kJLKyGpCUYlmxvvQmrudjy+o58QRYYyN1ZcmmqYdSSLF3QPWdkk4YtsZsCQQnZW4cD7Yqck7oasIcoBlqkoWGxC55bWWBEesNo9wdwi6f8gv91lJtyT7DZq9+gogzFN8h59+06cD2lakIPoCvQbe3LzUjt9jaZd99gkub+vfr+UcyH2fkpPVOEUqXQ== X-Forefront-Antispam-Report: CIP:216.228.112.36; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid05.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(136003)(376002)(39860400002)(346002)(46966006)(36840700001)(316002)(450100002)(4326008)(478600001)(186003)(26005)(8936002)(336012)(7696005)(426003)(54906003)(36860700001)(6286002)(55016002)(16526019)(8676002)(70586007)(70206006)(2906002)(6916009)(82740400003)(1076003)(5660300002)(47076005)(7636003)(83380400001)(356005)(82310400003)(36756003)(2616005)(6666004)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2021 13:45:19.6696 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee72ca34-8876-4b73-3abd-08d9618540f9 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.36]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT062.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0104 Subject: [dpdk-dev] [RFC 02/21] net/mlx5: fix PCI probing error flow X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In PCI probing, there is internal probe function that is called several times for several PFs. When one of them fails, the previous PFs are not destroyed what nay cause a memory leak. Destroy them. Fixes: 08c2772fc747 ("net/mlx5: support list of representor PF") Cc: stable@dpdk.org Signed-off-by: Michael Baum --- drivers/net/mlx5/linux/mlx5_os.c | 13 ++++++++++++- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/mlx5/mlx5.h | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 5f8766aa48..3d204f99f7 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2700,9 +2700,20 @@ mlx5_os_pci_probe(struct rte_pci_device *pci_dev) if (eth_da.nb_ports > 0) { /* Iterate all port if devargs pf is range: "pf[0-1]vf[...]". */ - for (p = 0; p < eth_da.nb_ports; p++) + for (p = 0; p < eth_da.nb_ports; p++) { ret = mlx5_os_pci_probe_pf(pci_dev, ð_da, eth_da.ports[p]); + if (ret) + break; + } + if (ret) { + DRV_LOG(ERR, "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(&pci_dev->device); + } } else { ret = mlx5_os_pci_probe_pf(pci_dev, ð_da, 0); } diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index f0ec2d1279..02ea2e781e 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -2386,7 +2386,7 @@ mlx5_eth_find_next(uint16_t port_id, struct rte_device *odev) * @return * 0 on success, the function cannot fail. */ -static int +int mlx5_net_remove(struct rte_device *dev) { uint16_t port_id; diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index e02714e231..3581414b78 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1483,6 +1483,7 @@ int mlx5_udp_tunnel_port_add(struct rte_eth_dev *dev, struct rte_eth_udp_tunnel *udp_tunnel); uint16_t mlx5_eth_find_next(uint16_t port_id, struct rte_device *odev); int mlx5_dev_close(struct rte_eth_dev *dev); +int mlx5_net_remove(struct rte_device *dev); bool mlx5_is_hpf(struct rte_eth_dev *dev); bool mlx5_is_sf_repr(struct rte_eth_dev *dev); void mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh);