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 18071A0524 for ; Fri, 5 Feb 2021 12:24:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 10FD14067B; Fri, 5 Feb 2021 12:24:13 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 2F83C4067B for ; Fri, 5 Feb 2021 12:24:11 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id f16so5709800wmq.5 for ; Fri, 05 Feb 2021 03:24:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W8rt1RnIefH80K8qS7Sx1R3Ci+jxl5lP/tUMBe7gtDc=; b=r8laFsFmwNzreirh3BZSvKVJucnwbSq5SRl/BhMp6EdLppft9AU9RW2RspqsqyyDuB gVDjxoVq9sqGDRQASanXx6eayZ1zyQrci+Ro+upnrLkUmPm6LO1S6fBlhPPwf9zLDMGa w5q/B6J1cwmk3RQwCjWmrfTQIbhCtBnxSlm/p4WBKpsDmWd1oXYqojHl0VvCQXO85fP3 i4B1SwBYW5r/qfwhE6rIZgjRocZHgX0RohVb9hyC48gnZPBkP2ArfLXshx78ysj3lX+L TDGsMlYZUtqPUZu7uXqLQ9ZhYpcGUKKsgobYP81DSrC9AzAmvLDbYJFew/pScCVgoMNl YgtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W8rt1RnIefH80K8qS7Sx1R3Ci+jxl5lP/tUMBe7gtDc=; b=goXXZjdRj5IOAjgcxL1oBQ8csjaonvJFa5ghHG4s5uEJhvjf9qjpPqJGMSRZRvd1LA ziYi9jISiWtGkQKGe3H/oHJa9rk1+33sGkogE6VxOaXyZR4tNTOWNzHSyYeZQUsosiqG goBnwoV5zZucGbOSDy5A0ptMosTRlA5AdVJQ4p9DmP0KsLPkP+qSwEY31xfLEHmGTst1 V0RpKlmhsDJCw/XqBz48knUlI/2mLrbuoqjSrcW1Ou4JoT23qGqvBjpOPKwHbthVmXMF 5zESyM5ymhFFesPTS6ZDX86MSSrGkbO9a7tUahNTOeSxiEvHtd/gkrvOYpCrG9EpHKf2 95Gw== X-Gm-Message-State: AOAM531rhXYq/rd0arn9f4Nbn8dOVx8uqsxowSt80ysjLGudIty9OMlO My0hgzrZp70QnA/6fI7PFE872I2kQSkV+LTf X-Google-Smtp-Source: ABdhPJyS+aulYA9zMPdycSjxHs1t+/6tB5C8mAubNX32YCh8kVAzE29IcdfA5FsYdb/e63wSawaaxA== X-Received: by 2002:a05:600c:19c8:: with SMTP id u8mr3112513wmq.59.1612524249976; Fri, 05 Feb 2021 03:24:09 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v6sm12058548wrx.32.2021.02.05.03.24.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:24:09 -0800 (PST) From: luca.boccassi@gmail.com To: Michael Baum Cc: Matan Azrad , dpdk stable Date: Fri, 5 Feb 2021 11:16:12 +0000 Message-Id: <20210205111920.1272063-86-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix leak on Tx queue creation failure' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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/0be706e99f560b0ef79fd3a8d1e7d261448e07f8 Thanks. Luca Boccassi --- >From 0be706e99f560b0ef79fd3a8d1e7d261448e07f8 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Tue, 15 Dec 2020 08:48:32 +0000 Subject: [PATCH] net/mlx5: fix leak on Tx queue creation failure [ upstream commit b689b00dd253356567c4d95f55921ce6c0e87d80 ] In Tx queue creation, there are two validations for the Tx configuration. When one of them fails, the MR btree memory was not freed what caused a memory leak. Free it. Fixes: f6d9ab4e769f ("net/mlx5: check Tx queue size overflow") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_txq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index d96abef883..b81bb4a12d 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -1146,6 +1146,7 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, LIST_INSERT_HEAD(&priv->txqsctrl, tmpl, next); return tmpl; error: + mlx5_mr_btree_free(&tmpl->txq.mr_ctrl.cache_bh); mlx5_free(tmpl); return NULL; } -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:33.144799934 +0000 +++ 0086-net-mlx5-fix-leak-on-Tx-queue-creation-failure.patch 2021-02-05 11:18:28.934693549 +0000 @@ -1 +1 @@ -From b689b00dd253356567c4d95f55921ce6c0e87d80 Mon Sep 17 00:00:00 2001 +From 0be706e99f560b0ef79fd3a8d1e7d261448e07f8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b689b00dd253356567c4d95f55921ce6c0e87d80 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org