From patchwork Tue Aug 17 13:44:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 96992 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 2489EA0548; Tue, 17 Aug 2021 15:45:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82408411AB; Tue, 17 Aug 2021 15:45:21 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2070.outbound.protection.outlook.com [40.107.92.70]) by mails.dpdk.org (Postfix) with ESMTP id 4D90A411B2; Tue, 17 Aug 2021 15:45:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gn6OJlLxfHrVGnV43XI+VgTJWCAh/qpLCDVkpzCPpfGCGHwKy2pUc50GETE6VbW5fogtFO5HG68oES1rApk/NSoTs4oCRhQI+M8630fxWPKPbWNLQb6LJyT+/8tGtbS18H/FEN7HqJy6R00pAzFTJet5kKVNATiffpM9o0R+EnChhzqFhtrPDC2jiyMH0H00UfmHy9hi5S7bkTDBG4sWxqFlDMBtk+RN2bcczDIOmP3BRzu7ifei7MekXD3NRYDWpfFp1UJ3Qm5UUL8yvjki5XpCTX3M1zjZXSc+dXG1hJkP79m5qv4vzgia7bdCIQjO7VlbKp2/SXupWZZzHrmI6g== 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=J7x3UkCcQD9MfGUzJfBaiWT6B00zjdRL5CnlrW2iLAJmrH1euiQSyLmF44XW31koXxowBg/4cw6mai8cmyt283981Evo5yZ9nGLXvcK6OgTIeMABWpgC077Pw1nYl46dHu2uH7xP7EPIQ4boiFtG8IRp4On6AbMw6aBZkHBeWoEXl+0N4gMc/Mo4x7As/fiQ50LWMdXiNEjjB5/t0drwnJPEvLXWcHz6KI62+1EMxtKy7Q8oSpXPluB3v744f23uNsXSLqZFejvQarPArtEYkMm6cGRObQ3R3x4ELkBDd0jTv6tBLCsbrXFPYG5VWJdr/luuTMprCIIe5BGiT9fLlw== 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=pfLTsK5uCZRrH8j2khvKuoTENJ3Q/Kdn0uMdAcwH9yI=; b=dqknW6TVsx6MT5jH+Vn9+9+jXcwyC+4qiAx0qzthDRl8VvB3B+p88N268uPfld0LeGGjewZT7EehxyqVc9p0qf7di04NOVCXwnwIU9zU/ee9HOI01niPDyOR8nvw7wR0tbG5dTHgM4Vu+tTgJNQPpwvvIGy0S+sM6xk7Ckxc7TD5sn6JwUx/PHHkHm7wZ92gFri71AC1If+BU9IUViEKJ5cpIW+dA8CeHXLpIKeBgt3KlDCTXoSi7zkpbr+RRPrLz/+Tli/qEOazjVfnmITNaaSe1UovktXNtPUwzgul42mVGNFjVrP+Vhjmu5itOYEBBSpj4mk5g1kW9F4FLyoDXw== Received: from MWHPR12CA0058.namprd12.prod.outlook.com (2603:10b6:300:103::20) by DM6PR12MB4513.namprd12.prod.outlook.com (2603:10b6:5:2ad::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Tue, 17 Aug 2021 13:45:19 +0000 Received: from CO1NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:300:103:cafe::f7) by MWHPR12CA0058.outlook.office365.com (2603:10b6:300:103::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17 via Frontend Transport; Tue, 17 Aug 2021 13:45:19 +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 CO1NAM11FT050.mail.protection.outlook.com (10.13.174.79) 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:18 +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, 17 Aug 2021 13:45:16 +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:15 +0000 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Date: Tue, 17 Aug 2021 16:44:21 +0300 Message-ID: <20210817134441.1966618-2-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: 60ece5a3-c060-49c2-513e-08d961854061 X-MS-TrafficTypeDiagnostic: DM6PR12MB4513: 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: ER1MIEOsiuwZlSDcDLi6ppa5Ek5dO+Ol38X9gVGDl++55jHes5MfmJ3qc5OoF0c9F+coa+IQCQSAKZsUkZeVuVaGxhG11hOlGRyVQ+rdWsqBTJT+KDb3aNTbBRKoo1cwSIFL3jmwKQjsyWyHnx8+q/bXsOmolKSmc9AWuMElO7QLGEiUxjYP7BW2FpbGq04FmQS2adGN776JCOzS2dlcDi6lZd4+JlnqOirRaC5Y5fhkBD8T0qH5WAbstOnr9nyXJN1+J/nuC7Bs+x7Eto8Wa3I0/TwDNBz+9DdRCpQ4CLKfnM7wu3LBTd7Wulx3uI+G5CURapmILU+X/9bitcdgI0SFyyws2Rj7I/yPxCnf0dgCYrrDA/lsgHpWdkh/Znm86qONgaqxk3B7IGIiPpS4FvZaKKPCaqBh2vVeAmwfu/oF8K7YSLVLqgklJJA043gYKfbKTQ0XAkbpEX8nTAdf+pO3UhnQqV1WuWlBpdsO3vnGayqytVLsq8Co13roZ7BAk8bmzYKx8D/s6sbBWbr+ZivGIAXc9OanFH2Zzq5wzLo8fqkta4DNzRu9w5tnFGrT6EPmco5DbXviPPDr+DbpYaxI4hz3KyULCbFS62WY2L7VlWxiRl+CEJwNu1H4rUJqGTyZIuXaWvYowaSuqKls714t1yWNjuhIM2aCP0P9gX9sgGgUqSeUKf9m8m8f/CE67DcocdDdXYbICkr/fj8mUw== 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)(136003)(376002)(346002)(39860400002)(396003)(36840700001)(46966006)(2906002)(6666004)(86362001)(47076005)(4326008)(450100002)(82740400003)(8936002)(7636003)(8676002)(26005)(7696005)(356005)(82310400003)(36756003)(426003)(16526019)(5660300002)(2616005)(478600001)(316002)(54906003)(6916009)(1076003)(6286002)(4744005)(186003)(55016002)(36860700001)(336012)(70586007)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2021 13:45:18.7190 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60ece5a3-c060-49c2-513e-08d961854061 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: CO1NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4513 Subject: [dpdk-dev] [RFC 01/21] 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)