From patchwork Tue Aug 31 20:37:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 97638 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 4011AA0C58; Tue, 31 Aug 2021 22:38:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C703410FB; Tue, 31 Aug 2021 22:38:04 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2042.outbound.protection.outlook.com [40.107.100.42]) by mails.dpdk.org (Postfix) with ESMTP id 1BDE84013F; Tue, 31 Aug 2021 22:38:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jUV0+Q+BLNQRU4wZoi9kq1CPBdHjPupp57oext0/XRruar7RDPp/D59zlkOZear7RSlx7Myl8TrL/z69lHXIliNcnYE3dl1puDv0uRISoKjetfwHwhlbLayQ1q6HGZwL0znLYPialaGgB1TN+mBrLV8L2TxH49ynrEdcYyw1CPS+BeO17zl7+T0wkyZPGmhkSSPRl/eI1MxY1vOqiRttR9/+AZ9DZUByUAztfGbIugjLWUptfnzatAsl28Uaigmf1/21HZvXqJswJ3cd/G0F9JCvGeac/zXZMrB093xZK6wyJyRSIm7331AIRleOlolHvkVNgaCjRwDbzzUy4GEWeg== 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=pfLTsK5uCZRrH8j2khvKuoTENJ3Q/Kdn0uMdAcwH9yI=; b=LiXW/Y1BwslYsdZ2VheR8M51+9bn3vZlnC/Q0hQLr9LRF3UqRPA2coq551oSaNXRmt2VPMGSnFabRJ6SnhXuWmzwin214ApmheI77uW2+ASecXTHC4qLM3cupniTr7zzmE+8ZwGwUlBmUP06m+whuLNS0RloUSHfW52k7Hh17McDNCMWFvR9S0cJcHJ3s5VGR9uEbdQkh8KQ4fkFHoiJ+TjVvog7WmHh1bhLYYC/dFDhhBPedMZoLqpx3mOkpRBaahi1lv32vP1RLmtYtIQCFNwWF3kZYUEcP+WQ2Q4ZNVzXEDSu8KS/kZcwc1QM6EyMJXownSKrxdhCvhbZbxEJ6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.35) 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=pfLTsK5uCZRrH8j2khvKuoTENJ3Q/Kdn0uMdAcwH9yI=; b=Sh9rJOm0stUsRzZhFtykFv/Ucle39RZvbRnDB8rJuoKCeVtXk2Y6UnGD7rLW2eox0AlfEodxapjPebfVgxbghHxJHy3ILBEUjEgCc1k8UwEqt5/vQ+f6q79GS7MwCAdQsUK+bp4462sf+/CotxMYDjcIMfHwltG+q5QaAQPbQA5B43r0eBIoALqoKo5Cns5rqRB7G/UrepJgz0IO4RJ3hDcBM9qUvMxowxKDBeZi0D63eENt3MFaaYZsMrlOd4CXF+SM0SWYr4nUqq1GqAD6zNaXAK53tTBV7XZoNAF+Lmolk5HGXhVBcf1Y8SKdv+2Z2myghOoYGe09dfkt+8py5Q== Received: from BN8PR12CA0025.namprd12.prod.outlook.com (2603:10b6:408:60::38) by BL1PR12MB5301.namprd12.prod.outlook.com (2603:10b6:208:31f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Tue, 31 Aug 2021 20:37:59 +0000 Received: from BN8NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:408:60:cafe::74) by BN8PR12CA0025.outlook.office365.com (2603:10b6:408:60::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17 via Frontend Transport; Tue, 31 Aug 2021 20:37:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.35) 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.35 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.35; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.35) by BN8NAM11FT010.mail.protection.outlook.com (10.13.177.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 31 Aug 2021 20:37:59 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 31 Aug 2021 20:37:58 +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, 31 Aug 2021 20:37:56 +0000 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Date: Tue, 31 Aug 2021 23:37:27 +0300 Message-ID: <20210831203732.3411134-2-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210831203732.3411134-1-michaelba@nvidia.com> References: <20210831203732.3411134-1-michaelba@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c2fd9451-66d1-4df7-ad07-08d96cbf387b X-MS-TrafficTypeDiagnostic: BL1PR12MB5301: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:127; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q8PwK0xROaiRYsWWT1TKCKu7MgR62AsGqMAnS9lza0e/P9wr2ttUgQrDZ9kC5EIl26d/VmCIFRiZR5oiaI0UIEBGWcWaqFUwz80DfkkFL66CUYMYzuuP/j8Pk2Id+kD47WWbZoUZ7+fouo6KmUei6EbXuR4NALsgdKVwHm8VDavSZlhoa8715qEydUmnE0VJsfAiqoB0gocaxcg9eWzdWmP/q6QK2oYG8p2M3HdVb9Sl6dViO6mUW+MElGtigqUFdsiRCzTDeOrTstq3RdJAInufO5r8M7iLQG5+OnQTjN+KIx1P5MO3qojw02a2zhK8P8grxQa7HMxSMq4kTVyfi6gPKO/bfUSQ6KH9Jz3OJoS771T2PKrgAFWV3kIqugk943pOcjkg9ctW6WBD9NKc16C0515cGpKGLr0WBFITa/PuIoIMRpcnUd1QuVeYCvzjHLYqLmxPJxKpk6xc/KkHPyNMqWMjriUEkFQDefjuL/AmLvUK3UpopR4lU2KfrUeslLh0p2f/j4bAR6eN/D1nzVn8yl4FRyJYuCdj4b7iMFD2yUAeBGjq4ek9yQqhR+b3WYwZkl7BMTRMqZbTxpKuk5Jrowo9dBNZGdRd14vZaW5ip4NgOLnKzrEbW4AUByQVzUDBrevQxNT6h4tWcaKdWsqEJEOKyXRVTUm7bFUpdocHm7kBww7elUGBo2ODX/Oc1EKWNCf2pXEGMlx2ZMWd+Q== X-Forefront-Antispam-Report: CIP:216.228.112.35; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid02.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(136003)(376002)(346002)(396003)(36840700001)(46966006)(426003)(478600001)(186003)(55016002)(6286002)(26005)(54906003)(8676002)(82310400003)(6666004)(4326008)(316002)(450100002)(82740400003)(36860700001)(86362001)(36906005)(8936002)(16526019)(70206006)(6916009)(356005)(4744005)(47076005)(70586007)(2616005)(7636003)(7696005)(336012)(1076003)(2906002)(5660300002)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 20:37:59.0269 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c2fd9451-66d1-4df7-ad07-08d96cbf387b 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.35]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5301 Subject: [dpdk-dev] [PATCH 1/6] net/mlx5: fix shared device context creation 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 shared device context creation, there are two validations after MR btree memory allocation. When one of them fails, the MR btree memory was not freed what caused a memory leak. Free it. Fixes: 632f0f19056f ("net/mlx5: manage shared counters in three-level table") Cc: stable@dpdk.org Signed-off-by: Michael Baum --- drivers/net/mlx5/mlx5.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index f84e061fe7..f0ec2d1279 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1254,6 +1254,8 @@ mlx5_alloc_shared_dev_ctx(const struct mlx5_dev_spawn_data *spawn, MLX5_ASSERT(sh); if (sh->cnt_id_tbl) mlx5_l3t_destroy(sh->cnt_id_tbl); + if (sh->share_cache.cache.table) + mlx5_mr_btree_free(&sh->share_cache.cache); if (sh->tis) claim_zero(mlx5_devx_cmd_destroy(sh->tis)); if (sh->td) From patchwork Tue Aug 31 20:37:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 97639 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 E9A20A0C58; Tue, 31 Aug 2021 22:38:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0728A41145; Tue, 31 Aug 2021 22:38:06 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2079.outbound.protection.outlook.com [40.107.244.79]) by mails.dpdk.org (Postfix) with ESMTP id C19EC410FA; Tue, 31 Aug 2021 22:38:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WMcjqkVShJwxNOP16FyCSqWTV+4PCfUiw462A+OIMIK7P3dxymW36lJzadIqCprA79y8NGaCciBYux7tMIZl5uw7se29E8H6zCeqeUsYLCfyGElSv0cCzCBWkH95B7A/k3VZKoVz76Ur2t3z29QARWh6DZnHTlV2gDtjzLSfEw5N3F8/90wRWymvV0G4o5Gx+pQ51lZsGE2BDhHKO/9O/c5MCHOHgC9RoNdGmWJKWqgM6lf0/PRxCUwIuRrCgeT6VCjJqawVhH5es/te49S70aHjK61K/jaMojtZP23zhxnH487QhxlMKJnhA0hexGslLVSdBzkiqTtOPsGvAuPZvQ== 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=B1HFx0KjCksIhz1cOLOsjRQyo3M8oNgjsbuwGXwkQP4=; b=dhaYWudDAuwAwX/caoTuzKu0Zg7yz+3IOT6Pa7ovLYT+QwdUgE7c7tbkBFYwK4v+FmGfN21t+0gS5ACSdhsV9AC0HFOeGAquGVQBR/IJLf50VOy+ArSFNOMqrbo7FR65fZbTPpijb+Iprk3sRpUwUZQYACz2LJSnddLg+h1GnnIDNBMVb1eQ5sDlH/2Ehjlj697toiIoM8urRGsYnlEaEDIulbpx322hSOq0PSA3nk6r6IM9kOmLm+Rrcx976qCtAGUd/I3AIAGzTF+K6M3EQ+OoALVxiVZ7sBLLa/WyfnpkGKKWVWz9brkuwpZIN79NnmUO8bBG07zlWt+X5WbSiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.32) 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=B1HFx0KjCksIhz1cOLOsjRQyo3M8oNgjsbuwGXwkQP4=; b=T+ZEBO+gL6dQTMZQb/RMDs+Y/URHBhjnYMivZyTMuA2+xn1VnhkXrSc1SYjHk3KjDF46F9XgKBUNkKdIId7K1lNfxhrZuHPrthgytX+ADjFyUfIlqaud0vI13KoDvz8XO83adEdBSB5K3CXL21EtXfIyU8gKCfswwBhbkV/tkcUBjS2Bmhm44QtKwpmIEEs60cpq66Yn6F/ozOGfGhZnNrt/y1kYfrZP9LxA/br7W6O91fkSaS0ZRerZTu1KLxWyo94Ht1rcH08nJuHL2EnbdUfCxACfDJhb+NQcymmHJ+tsIZ7j8liqX55RtpsQYPWqmj2cgVDRnPLYRiMJOa7aEg== Received: from MWHPR22CA0037.namprd22.prod.outlook.com (2603:10b6:300:69::23) by MN2PR12MB3375.namprd12.prod.outlook.com (2603:10b6:208:cc::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17; Tue, 31 Aug 2021 20:38:01 +0000 Received: from CO1NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:300:69:cafe::93) by MWHPR22CA0037.outlook.office365.com (2603:10b6:300:69::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.18 via Frontend Transport; Tue, 31 Aug 2021 20:38:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.32) 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.32 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.32; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.32) by CO1NAM11FT059.mail.protection.outlook.com (10.13.174.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4457.17 via Frontend Transport; Tue, 31 Aug 2021 20:38:00 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 31 Aug 2021 13:38:00 -0700 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, 31 Aug 2021 20:37:58 +0000 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Date: Tue, 31 Aug 2021 23:37:28 +0300 Message-ID: <20210831203732.3411134-3-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210831203732.3411134-1-michaelba@nvidia.com> References: <20210831203732.3411134-1-michaelba@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 91bcfa42-b4c4-4b60-4f5f-08d96cbf3977 X-MS-TrafficTypeDiagnostic: MN2PR12MB3375: 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: j5rF29GiSan0OwYH3xtRuuUJF+1CZacbPLmiI6UPDL63r9J5J87OUvdLaqrOMyahB3gY9iu+3GNie8fb/KJnzo6bEtDaB40pDrQqDUQs8tSvSPWFvyd8cwM70NHpYrMgSGvbsCx35v7Y59CFopio3ze4X7kUCHjKR4TjlqDTfHykRNIk7v1cUG+F/Nrd/3cYPBrNG/GQvGZAKx/dIOfUh13R/ZY4Cp6F+t95jU9Fl5Y/9hUyf7kPJY22VoUxFPYz4oYyX6KhGn4GCPh3JcGPZRGqdFyU78QTk/bQDTJePMAeabN/JEweVXDVMFJauYsUPz+eeidMpcc+MZ7b3MDLLubMF+W2XIBVtvBt0N9RQNokJDCJJIKzKGzvhkWMdfwMgsz1FZuCoBaa8NMHzY7W84ixNCNH8f1ydMPXp8U1CZ7m9LbwtgeHPFm+1ua0E5K/i9qP4eSfz6aVAIbZhKP4csY8btVZI4LM6lJOxOKnSOrEQFmLlEbE26nlaCoPw+4mTj0gmD6O/niYKjqlSOiRa613Z84pjs/PvXnrn1LtN232n5CzNLYuPdcOBI0SjKWV+5BBFyywo1cSHDeS+Vuu0Pz0KYXbl63M8l/j6FXWuq3tJaKReEBce6Wv+IaJbkGZUlK+79t5nSAEIozA55WmokJQozgbYhMBeetgz/xGPK8ii4OvXGSkwMmmxkJTvjADhvjlatD5Nu8nYvrd5dfrMQ== X-Forefront-Antispam-Report: CIP:216.228.112.32; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid01.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(39860400002)(396003)(376002)(136003)(46966006)(36840700001)(6286002)(83380400001)(36860700001)(316002)(8676002)(7636003)(86362001)(82310400003)(6666004)(5660300002)(54906003)(426003)(7696005)(47076005)(2906002)(82740400003)(16526019)(186003)(70586007)(450100002)(8936002)(1076003)(4326008)(36756003)(336012)(6916009)(26005)(478600001)(356005)(2616005)(70206006)(55016002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 20:38:00.7170 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 91bcfa42-b4c4-4b60-4f5f-08d96cbf3977 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.32]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3375 Subject: [dpdk-dev] [PATCH 2/6] 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 may 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); From patchwork Tue Aug 31 20:37:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 97640 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 39200A0C58; Tue, 31 Aug 2021 22:38:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 37E4541137; Tue, 31 Aug 2021 22:38:08 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2057.outbound.protection.outlook.com [40.107.223.57]) by mails.dpdk.org (Postfix) with ESMTP id 25101410FE; Tue, 31 Aug 2021 22:38:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AS+uZKeNMxbYYjv+XHrhcfCFenFzFTqHSWDN4T2klE/PHdT+VuJ0GS2UlfHlkQ61F0ZjCPDLsHrXHs2WMVlOr2DxvkKfHumoHYSmtki1MTb0wpl4Rwa/PAWSw5G+pZV+of9mkugiMwWyuFa6aU3gSrXX2TWvP+3ZuITZAeMe8RfbO5madU7hWCG3kjdDhHoe73a+xSxQ8xMrLl6sqWU0KbgQVrKql5LGcFubZ0JuROWOmgM8FjBoTx4xHMkTW6woWb+eCwZ0+kbBqGNxv5+lLdCMdOIgS0/p5yXPnK1VYBSBd4T6HjDJx0tTEx8CqbDOzrJ/ukiI0N0NERennrhV6w== 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=oS2RfLxacUU/TjNvqVboNTabz1CwrTVR2m3daABWZfI=; b=FWXQSs6ilGJYLrA4jXrqHnauV2t9iS4Or4vvPYtgC7pZD8hvYbuqfjqmTLLRCTvxeaSUuBazvcIKTVxsNnWtXnwPF1u2nPgQMVfNBKt7Dr3IR/jJy7AW3jz6EvBwrwFPKa06q4C8FIae+M+AwqsOa//B5FYhRHInlXd9xE2c8dl9Noii9aH+oM1bffKCuIQj088KOZephtXcsxCkyT46yoZxMuMrUDkP0fImh9g/WKXvkNxquDqYLiJUMwrS35xJpJEBQZ9nxqyEn4nTIHmeWB1PcGXXIw5yBicljCEyiUANiCAZg+Mrx9ecmH/n+s6MA6OTL8HCds9WAYERpf/0Bw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) 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=oS2RfLxacUU/TjNvqVboNTabz1CwrTVR2m3daABWZfI=; b=bNWCIUj5LUZPGVvP2uJA9eOmMdmnOjSUBJ5Bssubq2yxJHTiF7BcDXW/DluaDa/i6hpX03jAP7CPfei1hCe+8OFYKpBcpIlr7SuCC3KtkBPM+IUb3eRbaSDiI4LMGi3fmWbXhFyTn3DgIxwHE2bFXGWdkxarB7zKNaWTBU2vxYcAGs1yV5Ansvv9S6XXWK/+5nIBrDgw35+//8lGqvWYil1JaVk/X7VSmkilxaXSHrWKFbvYxVnV7Ggu8uwdBkLNSK7pAKampSLkEHz0Rv1TokAA5SolFXo8T1uwlX2TSFlBbpdcWYZC72H8wH6dNTK8z7a3DJlg2Zq/7uSNB/XxlQ== Received: from MW4PR04CA0334.namprd04.prod.outlook.com (2603:10b6:303:8a::9) by PH0PR12MB5417.namprd12.prod.outlook.com (2603:10b6:510:e1::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Tue, 31 Aug 2021 20:38:02 +0000 Received: from CO1NAM11FT033.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8a:cafe::36) by MW4PR04CA0334.outlook.office365.com (2603:10b6:303:8a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.21 via Frontend Transport; Tue, 31 Aug 2021 20:38:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT033.mail.protection.outlook.com (10.13.174.247) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 31 Aug 2021 20:38:02 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 31 Aug 2021 20:38:01 +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, 31 Aug 2021 20:38:00 +0000 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Date: Tue, 31 Aug 2021 23:37:29 +0300 Message-ID: <20210831203732.3411134-4-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210831203732.3411134-1-michaelba@nvidia.com> References: <20210831203732.3411134-1-michaelba@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c9b88441-8454-4050-a2ee-08d96cbf3a85 X-MS-TrafficTypeDiagnostic: PH0PR12MB5417: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aIvdZVa3StNpJn6YMgk28V4c3ohXh3WAmNKHu3trNXKw8v7JKBMSiqzFeLIK+S/Xyhps2i+wnyI8HTuXHdByYeKy3kiOoegQjVUvCtM3a6Q4ru00GXjvo3hMWzrbg+Fo5ORtXNi3NOweCUY3j1WRlhNq1LTLXtz7GUeFEgGKtH5wmDUSdAtNj53nuQgCL3WUmCVPW9EOJLSDr2+oMFfKxeYJTGne2pNk75hScFgOf4jAfN3rVI80XGx+utBBsCgmBSkVGapNuFUDvWdVTyFfcYFIiZ4E7+ZFzx1d88K0UBS1HH4oLVaDv1v5Al19qbAiIt58pMo/WM5eG83QdC0uwpIYogPuAB9fyfkJE+iCHpMD5+jc6/lDFs456fNCaOY7NfAu36BKy54ukqPzwKXle9QnSmiq0SibBKi9uFvzLXNyIZZAMOkuvU8Yevs60WJq2Svyen97TcRGG1vufXkDN+IW8mHEb6BtZkzr+SrKs6OSMY1edtiX6+SrqZdywLXi3pv1N2qpWpZoIaf17k+2Y2ebyG3SETk0K9hy0sEpBpFCzdbVI45lYnjpMTJt1MN3ksmSeyHWWxkx9fzA+fH//BbdETVsWahvlYh2hm04mtIg1YcpJB0N1i180ELxJd/7Ecc1q9STvGPcoDHYFPwrPthDgcN9PwfSxFc2he0entfhNp1eKm3i0fC5vEmlFf3//vHU/WJepVi9kIr3cAObCA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(6666004)(36906005)(55016002)(8936002)(82310400003)(36756003)(508600001)(54906003)(8676002)(426003)(70206006)(86362001)(6916009)(6286002)(356005)(450100002)(1076003)(47076005)(2906002)(36860700001)(7696005)(4326008)(2616005)(83380400001)(186003)(16526019)(336012)(5660300002)(7636003)(316002)(26005)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 20:38:02.4376 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c9b88441-8454-4050-a2ee-08d96cbf3a85 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.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT033.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB5417 Subject: [dpdk-dev] [PATCH 3/6] net/mlx5: fix allow duplicate pattern devarg default 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 order to allow\disallow configuring rules with identical patterns, the new device argument 'allow_duplicate_pattern' was introduced. The default is to allow, and it is initialized to 1 in PCI probe function. However, on auxiliary bus probing (for Sub-Function) it is not initialized at all, so it's actually initialized to 0 Move the initialization to default config function which is called from both. Fixes: 919488fbfa71 ("net/mlx5: support Sub-Function") Cc: stable@dpdk.org Signed-off-by: Michael Baum --- drivers/net/mlx5/linux/mlx5_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 3d204f99f7..cf4de7e6f9 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2142,6 +2142,7 @@ mlx5_os_config_default(struct mlx5_dev_config *config) config->dv_flow_en = 1; config->decap_en = 1; config->log_hp_size = MLX5_ARG_UNSET; + config->allow_duplicate_pattern = 1; } /** @@ -2564,7 +2565,6 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev, /* Default configuration. */ mlx5_os_config_default(&dev_config); dev_config.vf = dev_config_vf; - dev_config.allow_duplicate_pattern = 1; list[i].numa_node = pci_dev->device.numa_node; list[i].eth_dev = mlx5_dev_spawn(&pci_dev->device, &list[i], From patchwork Tue Aug 31 20:37:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 97641 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 6585AA0C58; Tue, 31 Aug 2021 22:38:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8890641151; Tue, 31 Aug 2021 22:38:09 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2068.outbound.protection.outlook.com [40.107.236.68]) by mails.dpdk.org (Postfix) with ESMTP id E380341137; Tue, 31 Aug 2021 22:38:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JJe0mFCKfjDSIF6C2Y2r7f86LbXBHSF6VWU+B8pN0xycjgF+90iKLVgN+BK078hvpwNz5KEw9HWMiioqd2VbCilkDG3YNjwx/B8oO9N85NAdHQNI84vu+3nDN2zCkSQFRmQ6U45xhGdK/Da1v6+GZSFQ4zqVb+QINHqaHyucBNXsbxn/05NOkfGqrbzuqL/Mqt8R1GwbvVy1e7RKi9b1p0Tm+N8hgm8WAD/6z0do6zQVIWoEf/oWBIJUbMZwvfhB0KRUBvNDBUW7ZHMPzwUXrx4MUwjOJTp9ho5j4viIbr/Wi2QjCb7IhdkEgMmMAi7K1rk1SIV72EhTOsMTk33UGw== 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=geGQFwh1a5V+p1UZKW+WYcva3SdmlkU6NwGiwTD1nd0=; b=iVlFRVUovFYnrJJtlbOzvpPr9SG3zULcHTqhL78Tn4i7BUF+AdEfEIwWJGH6P+g4WmB5uRyQBlaeugBwSxBkT/Xn/Nav/wrYX5FRnuzC6TWZE0pZ494J9Ig/pKKas1qh5oMa7cwuIo8463bnTKLjvW+o/QGELFZAeUVmc6LzkiMReOWcKXtLN6w+TpyZkV3ns68T7Tiu5g0C4qETZ9hULhBve14PigKrfBdTATzUJ/kuTEEPV2Gmy6yZ/xWmUyVwQQbk0hMmzZJYWpDsHDnU0xfO54xL0J8gUGyAGIMx6W6hBHsfscg3R+y4EgP50Mfnuncy0UFfydq4wTT/czPPrA== 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=geGQFwh1a5V+p1UZKW+WYcva3SdmlkU6NwGiwTD1nd0=; b=TGQlDhFu9MK53Z7YddPQar2F0dsrpFbKWLLKU8JP9eUKiJ4OzaZ0vNXcPYh9jmlnG8UUPYbrfDGFSx4l0BtHx2DLIsmnnKKjuHsAHv4/B9/gJPSrP+qfJ1oMvKEE1OvPQsncb7UQEBhG8KEBZw47qtCroEQEETOUUDAfHJhSeOJtYZaK8Fp+bXIVzktoLsC8U9W+vAsRH6X1tcKiscdeLpYR8AG1776F99LkGT3m314FDhWANgeOyMyjYWQin40Davb7vl9/yiVNPuJ8NS4JG5Yj4Ld8G+sBaO/Ji9nrqJobl9CG/mftA0tQu+c5FiDWlw5MqU26swpL/QBAYDcIsQ== Received: from BN6PR1401CA0002.namprd14.prod.outlook.com (2603:10b6:405:4b::12) by CH2PR12MB4117.namprd12.prod.outlook.com (2603:10b6:610:ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.21; Tue, 31 Aug 2021 20:38:04 +0000 Received: from BN8NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:405:4b:cafe::13) by BN6PR1401CA0002.outlook.office365.com (2603:10b6:405:4b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17 via Frontend Transport; Tue, 31 Aug 2021 20:38:04 +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 BN8NAM11FT057.mail.protection.outlook.com (10.13.177.49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 31 Aug 2021 20:38:04 +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, 31 Aug 2021 20:38:03 +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, 31 Aug 2021 20:38:01 +0000 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Date: Tue, 31 Aug 2021 23:37:30 +0300 Message-ID: <20210831203732.3411134-5-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210831203732.3411134-1-michaelba@nvidia.com> References: <20210831203732.3411134-1-michaelba@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b9baaffc-5271-4903-1749-08d96cbf3bb1 X-MS-TrafficTypeDiagnostic: CH2PR12MB4117: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9uQfE5JuNZ3JhWIZpsnAF1ApQwa5P9PHwCyplsgYZGwPayy47TbHnhbE1wQJ0kFZl5d4JLSl4vnqcrlhFuzwDMPSUDli78MwO0l5+Mv4f9DIvaFReIu29s1iAcvkXfOiu3D2U0mgjs7ff38JRIXgbXyV9Ic8y95Wnmbal80+AQB48wEDgP2CP7+MrTZWiBn+2YETwNWw4dsatDpN/p8TJlg2oos+C52RWRpUmRFXgkeTPFkKo6ZoSvvgcj/lMQz1NuYv1Bdm9dIhNQO2WNgdmLaWtjMCtdW4s75Hm5Ete43zk5vK7bieEBLfgYFOWNlMxziLEMGjBwaGR4jbfRdfDjReW6Gi3tgZJYdRKykjQxLT+d+IptHkMxwhYypwBuIspwayqIZuEQ070FvIVcM4FBdW//emSw8DvheenSdaIJtgBb4PSScqMGuLAACQWLKDFIYnTunAhIG4WHcXY099BMnfAj9eeKdKmhFIRwIHvZYfTNUvE4BHrAYDF6ZHRRpAPjN3KQ6F5yPEUIu4T7uf4Wr6Ec8/jJc5qhYTwYPLqDd07eUt9dO2cOK45oAQTDHhUmO1RUjMA6+85W+tuLtek5kcxUPHr4VvvPEgx49XjHF6C+721wioyrf4xuiYJJOVT4L1O6LfEahBUm/5GM/Tz0SuN1nO+aJ4MoSROd3ebmoX3QjYBFXRuYVuYa50vH2/v4788qMNwLepDxp8SZx4wQ== 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)(376002)(136003)(39860400002)(396003)(346002)(36840700001)(46966006)(6916009)(478600001)(83380400001)(4326008)(6286002)(8936002)(82310400003)(7696005)(86362001)(426003)(450100002)(1076003)(2906002)(16526019)(186003)(5660300002)(316002)(82740400003)(2616005)(6666004)(36906005)(356005)(70586007)(70206006)(7636003)(8676002)(36860700001)(55016002)(36756003)(54906003)(47076005)(336012)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 20:38:04.3991 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b9baaffc-5271-4903-1749-08d96cbf3bb1 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: BN8NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4117 Subject: [dpdk-dev] [PATCH 4/6] common/mlx5: fix class combination validation 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" The common probe function gets as a user argument the classes it should create, and checks whether the combination is valid. In case the device already exists, it checks the integration of the above with the classes that the device has. However, the function does not check the combination when the device does not exist and it has to create it. Check if the combination is valid for all cases. Fixes: ad435d320473 ("common/mlx5: add bus-agnostic layer") Cc: stable@dpdk.org Signed-off-by: Michael Baum --- drivers/common/mlx5/mlx5_common.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c index 459cf4bcc4..f6e440dca1 100644 --- a/drivers/common/mlx5/mlx5_common.c +++ b/drivers/common/mlx5/mlx5_common.c @@ -317,14 +317,16 @@ mlx5_common_dev_probe(struct rte_device *eal_dev) dev->dev = eal_dev; TAILQ_INSERT_HEAD(&devices_list, dev, next); new_device = true; - } else { - /* Validate combination here. */ - ret = is_valid_class_combination(classes | - dev->classes_loaded); - if (ret != 0) { - DRV_LOG(ERR, "Unsupported mlx5 classes combination."); - return ret; - } + } + /* + * Validate combination here. + * For new device, the classes_loaded field is 0 and it check only + * the classes given as user device arguments. + */ + ret = is_valid_class_combination(classes | dev->classes_loaded); + if (ret != 0) { + DRV_LOG(ERR, "Unsupported mlx5 classes combination."); + goto class_err; } ret = drivers_probe(dev, classes); if (ret) From patchwork Tue Aug 31 20:37:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 97642 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 5FBC9A0C58; Tue, 31 Aug 2021 22:38:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F064C41154; Tue, 31 Aug 2021 22:38:11 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2051.outbound.protection.outlook.com [40.107.237.51]) by mails.dpdk.org (Postfix) with ESMTP id 89F784113F; Tue, 31 Aug 2021 22:38:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=euCeKIND/1lmBkPac6+xpaJU6EEo092oYbJsBqZ8Xk+698pH1VbrbeKHx2VWL1lbZzwWj1BurG04zl/3RMfj4r5COwv0bo3AGaj3FSaOgJIek00fXvqYZoQ3WfCnmDjvgtgLwka1dHLApI4swnMeOZBKbMrBNxQHW8Iq1IhyUGGaHdL94KWl0qK1/s4Ty+dbwQq4VSOZ9QcnKuNdc7iEnBrFDkG+YE4dPd3/OaO6zZh/gZ4DCPE/LLy0vNuCFiBSbY6zHdaZlHUKfMc5qWuDyaUT2rxrkGYprvlGDuhoMQADq2z6opiQ9XDP2stU7QggpXxzO1npRTSTfcOgrwGLHw== 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=cZ9wdBf7CO9HLkJakwQcUzFgEzrgVi+OzLd0iPUD0Sg=; b=iRSLUQsZlrClV9MUvsrSXWJ/pjsjWZ8TM+BiLVASBg67AYonvHdEDtiJTGITWpfHTvvtsQHPtCzfysqwqJUQxPsSoVabwcA84xuFRoCweUu2z9Jj7dBPuKAYxHVRhXgyfsRiGGO9IxBDjt/AlSi1Mv5QuzfMasf3FcpTlWGp1JVWeeeJ4idDRuBISYOkzq+WFuWSPu6IN7oPcHq4Ww07OkM/BWiqTC4CbxtG4K5DLI7eMSpppYeWjgc2YNjxt7TQqrx2FCrpnkZAEb+/Vkbj7b0n8KUBZNl7FvSzSdL7A143a2XORydhwLFVOmcRnkZiyd/dSdap6UO1w2XP12HMUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.35) 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=cZ9wdBf7CO9HLkJakwQcUzFgEzrgVi+OzLd0iPUD0Sg=; b=dwrY3DPbEuq9uaMPxKUM1uk50CqqRebfu0x9JDBnzBnJTcbn7IgaEvmhRYQs8M6J/4TfNElnL0aBnC3Wuh4CMjX/tB/0RY8zYOSveVGk6s30sfMK5is2t35iwShTEkZVnv1GGiY/uFMLidSNAGTHfulFamWuzw+w8oHXwiCqIk44fhgIIjPNtMJiqbjHuafirgace3UzYhKKdNtKoOSiL81VDS3ithE1o/clbvSeIkLsdlY9SrseBYxL+xwDnfvL1buhnRiw/KzTjFuAXnZ2Dh08+XxmWICobh0w4Kxl00vikVsjh8ZuWlF1NyjFbZMRHp6HHJ86LIXN3piCgcy5mQ== Received: from BN9PR03CA0870.namprd03.prod.outlook.com (2603:10b6:408:13d::35) by DM5PR1201MB0217.namprd12.prod.outlook.com (2603:10b6:4:54::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.24; Tue, 31 Aug 2021 20:38:08 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13d:cafe::c2) by BN9PR03CA0870.outlook.office365.com (2603:10b6:408:13d::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.21 via Frontend Transport; Tue, 31 Aug 2021 20:38:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.35) 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.35 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.35; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.35) by BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4457.17 via Frontend Transport; Tue, 31 Aug 2021 20:38:07 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 31 Aug 2021 20:38:05 +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, 31 Aug 2021 20:38:03 +0000 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Date: Tue, 31 Aug 2021 23:37:31 +0300 Message-ID: <20210831203732.3411134-6-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210831203732.3411134-1-michaelba@nvidia.com> References: <20210831203732.3411134-1-michaelba@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09ff88f3-7f9a-4602-e794-08d96cbf3dca X-MS-TrafficTypeDiagnostic: DM5PR1201MB0217: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NPgmSbCdHgLex6tsw5GKMDvBhM9WlvmQq0l/oeRVeWtCW7je1yhY7mZHZAm5dRdDb/u4Ose6La4uM8FiOnrzsoLS4dJgwNguLH1odCoK4OrAuf11H0AFJTXhrkxGKuVH2HpmvhMHXpFimuLCTDYVXYDj5Hzz3WX/FLShBFqYDmRVkWxVSu0HiEjxrCHdFpd1iJAuBw5VMU0bn2wS+F5H09b2saMSGXH1dHIFAhD2r2+NbNQjPUcS1/w5u9wHE8KKLjel6JN7QYGSckrpG4+yJYv0GR+GCgZgYWVd0Ld64/sN4NSA3FtKL68KYdJM2jtKCn5eRIDP28iEZamS+Jx+SMBtFaWnwjtCbIcjTb2mQ9iu5ZRumnEeD+etO8Zg0eKsefwIlv0CE9qRV68lRfG0C82xIv5SWgtkHOLnfIVYVEOglihpizPKmUI9yqvzQx08nLo0/fsknXgwRTH0OmGSL1iEsdO+85lZL5Id2JJx4RN1y75lEFLejXcy9w185ZS7+NWiG+yGjM8UQE+7GjoZ02lZqtrzE17a0CCaOAcxN1bVwEQhRcCTlj/zcgFi6xgzu4gzckFei+Rx86betP4LlKvkXsFH0PDWk7gttwzoLXxKtdDfiC+GlHevt/oSVn5QCFs3gx8xrM2mIAQBMFuQqFQCmidRajbRqHppLjsQqcPevIlj1aO24yf+wBgef6rQiOM3Q5E+eNYuvYBDvbheog== X-Forefront-Antispam-Report: CIP:216.228.112.35; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid04.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(346002)(376002)(136003)(396003)(36840700001)(46966006)(8936002)(6916009)(6286002)(6666004)(47076005)(4326008)(450100002)(36860700001)(36756003)(426003)(186003)(1076003)(336012)(2906002)(2616005)(26005)(83380400001)(86362001)(478600001)(8676002)(7696005)(316002)(7636003)(5660300002)(82740400003)(356005)(70586007)(70206006)(16526019)(36906005)(55016002)(82310400003)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 20:38:07.9257 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09ff88f3-7f9a-4602-e794-08d96cbf3dca 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.35]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0217 Subject: [dpdk-dev] [PATCH 5/6] common/mlx5: fix device list operation concurrency 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" The MLX5 common driver has a global list of mlx5 devices which are probed. In probe function it create one and insert it to the list. Similarly it removes the device in remove function. These operations are not safe as there can be such operations in parallel, by different threads. Add global lock for the list and use it to insert or remove. Fixes: 8a41f4deccc3 ("common/mlx5: introduce layer for multiple class drivers") Cc: stable@dpdk.org Signed-off-by: Michael Baum --- drivers/common/mlx5/mlx5_common.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c index f6e440dca1..4321cb3a9c 100644 --- a/drivers/common/mlx5/mlx5_common.c +++ b/drivers/common/mlx5/mlx5_common.c @@ -50,6 +50,7 @@ static TAILQ_HEAD(mlx5_drivers, mlx5_class_driver) drivers_list = /* Head of devices. */ static TAILQ_HEAD(mlx5_devices, mlx5_common_device) devices_list = TAILQ_HEAD_INITIALIZER(devices_list); +static pthread_mutex_t devices_list_lock; static const struct { const char *name; @@ -222,7 +223,9 @@ mlx5_dev_to_pci_str(const struct rte_device *dev, char *addr, size_t size) static void dev_release(struct mlx5_common_device *dev) { + pthread_mutex_lock(&devices_list_lock); TAILQ_REMOVE(&devices_list, dev, next); + pthread_mutex_unlock(&devices_list_lock); rte_free(dev); } @@ -315,7 +318,9 @@ mlx5_common_dev_probe(struct rte_device *eal_dev) if (!dev) return -ENOMEM; dev->dev = eal_dev; + pthread_mutex_lock(&devices_list_lock); TAILQ_INSERT_HEAD(&devices_list, dev, next); + pthread_mutex_unlock(&devices_list_lock); new_device = true; } /* @@ -440,6 +445,7 @@ mlx5_common_init(void) if (mlx5_common_initialized) return; + pthread_mutex_init(&devices_list_lock, NULL); mlx5_glue_constructor(); mlx5_common_driver_init(); mlx5_common_initialized = true; From patchwork Tue Aug 31 20:37:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 97643 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 B1C9AA0C58; Tue, 31 Aug 2021 22:38:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 92C664115F; Tue, 31 Aug 2021 22:38:17 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2083.outbound.protection.outlook.com [40.107.236.83]) by mails.dpdk.org (Postfix) with ESMTP id C6482410FD; Tue, 31 Aug 2021 22:38:15 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N5T991ppt0RFYp5Wx8aG1HHhDn9b+IJn8TzF2zTImBpZnFi7yh0GxzuzHzlUYmzkZrc3YwWi0q00gtj6sZEz5Tun5V5x+7uR/ctb/NQHE/8IE/kkUBRS4ecZklXbn9suU5y5Kk4NkpZ/VRmgtwd7uziJbS21zgQ8OK+btniMqLXjAcfSxMMdHIFOPIO57AuGQrsPhkFm6EYG1VsjUEooZhED8lIl7xWmw6oSn5/oYXQK7WTbArp/gfjmj9hEWLxtI+TsWOkOARc6s8Fm2rPXHMi4sMNicQmADRoGO+adMvgyDGDmfnRASgVHayoMOY5aCDvBYrudwUwTqjrDgjz6Fw== 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=D7NUAELA2lTjvAWtcl5L9DhD7PIMyztd/grekSzaOLI=; b=JnXGQb1aIyA56Ug/xxBnGVnVDUcBILhmnaePAvQNVEwsrQ4mgPYaPqjdFnQiUuIQLHzhAI7cHTxzFU+y+y5pCE1ElRbXTXgcxBSrLSIN07Uo8nCBGa4smhpatnj4EHiCZzsBRhus0uO166f/P+hNMewkt+6VEff5SQaOVD3p7aS4r/jNJcb0szQyrmpSfWrYkA2kls+/JefiZ/eQSTe8pqIeimiNVkHyYW/2d+YREl911oy+5nWORCfbZxVJBp2tziXoYJGnhV8gfP5zyhoO/jHlxEyLvXTDIqzngE3/iXxkyvT7h2NPage1Sn6Hk+B+axpnJ1yu62+IdMVkY3mJMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.32) 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=D7NUAELA2lTjvAWtcl5L9DhD7PIMyztd/grekSzaOLI=; b=VaY0bxXF1D3FggVyAwRVZrhGfrJuuPDvbukq+/FGSUE3IFiBkOMsW95RtiP+jfrg0oaQAp6a+HAcAV/fwWIHdA6+OEh0SJ70gl7+DecMjmM043GHdtROcyyr4Pujz30EdexpHnJoTE2c1aLq+/T8PjhUAdcplRx6vrcRZjUB3xESfyWf5REawYblHs1LBR5Q1hq8lPQZAttHRV1QDYT7+n3Rk0uwNptIuzlv35QuNwJ+BgGpFX+eCGDcwxu9Gz9FhrA8iyiBAOzEZRJmJ8tRhRTknox8SWhN9wIm5VJ5/TYO+TshbXjEWqr96SrJq18i8Vspln9p1DC8aBSJBfI2GA== Received: from MWHPR13CA0014.namprd13.prod.outlook.com (2603:10b6:300:16::24) by MWHPR12MB1744.namprd12.prod.outlook.com (2603:10b6:300:111::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Tue, 31 Aug 2021 20:38:14 +0000 Received: from CO1NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:300:16:cafe::36) by MWHPR13CA0014.outlook.office365.com (2603:10b6:300:16::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.6 via Frontend Transport; Tue, 31 Aug 2021 20:38:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.32) 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.32 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.32; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.32) by CO1NAM11FT031.mail.protection.outlook.com (10.13.174.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4457.17 via Frontend Transport; Tue, 31 Aug 2021 20:38:14 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 31 Aug 2021 13:38:13 -0700 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, 31 Aug 2021 20:38:05 +0000 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Date: Tue, 31 Aug 2021 23:37:32 +0300 Message-ID: <20210831203732.3411134-7-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210831203732.3411134-1-michaelba@nvidia.com> References: <20210831203732.3411134-1-michaelba@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 67254cf2-5cf9-49e7-aa23-08d96cbf4191 X-MS-TrafficTypeDiagnostic: MWHPR12MB1744: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M4gWSEiBDba9lMgnIAuF5MaXVg3M/6e+RMti1elmSSPB3lo81EqLTk//09K17zRJDcgTiiIyeAVHl4wUqM8SXOMYQR1qlBZV33TN1MIMl0xfDkwbrHfKaAu0RifyfvAtEvy5wGX4Kp9Yl9h9rlX6hfEu9fXi13rorDFA9tZ/h4peREPsT3jESWRwiOv3YtG/Aj0xFg24Al29y8/gRTlCqc6ADuO/iVCrBe7nHkN/BlBFi+PLzS5mXjtCC4Ke0xMtzLaMdihsuVLvBpnaJVDSTxZFTZ3fmo7zoQOUoqNyLlNDmGbHyMuuTWMd8mgUp7fMNvVCl5ZMULup45WO5ksQ+g28d8rjcd/YS76hEdC72G9Azcrqzo1efIZjmtxzcdUXPuAsANnJwLTyjN7j1z+TcMpgewFEK/mQrOD07P9leUStprJAd1bkod3BdhxXSe5aBLg/yewciePth2ogyDytw9umOm3AUcUQzrHuaWOXlCmhcIUDNf6xikih5rxGpZAMgW5au4sCmZrjIB8FkvHTfB4qpMnPal8qqjfdL1xoYcYbJYvw3ZYFxCNJPxjTSfnbioIgo7H2LUVihLcYPoT5Nw4iUjKcHEuXHghxjpy7JgC+0hTrBDozuoj19r9M6+Bi6Zr5WPltID0QL8HkYV6MJ7+j0shZh3W/5MaqA9gKRE7D8sODmcmkFvFmk/FI8hPVIVyR+Q/is2RHu0VsAFXmRw== X-Forefront-Antispam-Report: CIP:216.228.112.32; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid01.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(376002)(136003)(396003)(39860400002)(36840700001)(46966006)(36860700001)(6286002)(47076005)(5660300002)(82310400003)(336012)(2906002)(8936002)(83380400001)(7636003)(450100002)(356005)(82740400003)(70206006)(186003)(316002)(55016002)(8676002)(36756003)(54906003)(70586007)(1076003)(426003)(26005)(478600001)(7696005)(86362001)(6916009)(4326008)(6666004)(16526019)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 20:38:14.3145 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67254cf2-5cf9-49e7-aa23-08d96cbf4191 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.32]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1744 Subject: [dpdk-dev] [PATCH 6/6] common/mlx5: fix resource cleanliness in a device remove 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" The common remove function call in a loop to remove function for each driver which have been registered. If all removes are succeeded, it return 0 without to free the device which allocated in probe function. Otherwise, it free the device. In fact we expect exactly the opposite behavior. If all removes are failed, it return error without to free the device which allocated in probe function. Otherwise, it free the device and return 0. Replace it with the correct behavior. Fixes: 8a41f4deccc3 ("common/mlx5: introduce layer for multiple class drivers") Cc: stable@dpdk.org Signed-off-by: Michael Baum --- drivers/common/mlx5/mlx5_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c index 4321cb3a9c..6885bbb1d2 100644 --- a/drivers/common/mlx5/mlx5_common.c +++ b/drivers/common/mlx5/mlx5_common.c @@ -354,7 +354,7 @@ mlx5_common_dev_remove(struct rte_device *eal_dev) return -ENODEV; /* Matching device found, cleanup and unload drivers. */ ret = drivers_remove(dev, dev->classes_loaded); - if (ret != 0) + if (ret == 0) dev_release(dev); return ret; }