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 EB8CEA0524 for ; Fri, 5 Feb 2021 12:24:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E30674067B; Fri, 5 Feb 2021 12:24:00 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 0E4D4188742 for ; Fri, 5 Feb 2021 12:23:59 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id f16so5709336wmq.5 for ; Fri, 05 Feb 2021 03:23:59 -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=L969Jsm4lZZoDzF7rkb4ogPjZnsm5E5Ti/6CgKPEMWQ=; b=T+7mAbZTwlPtnOODCEcAl3ut/f+slz77/dsBTRT7bRD6gFq108HQHzrjUrP9piOji3 2Sg1aySUpethSFNj2IQTFwVYY2BqerfUxpQS/+XyKHfQC1iXnGQW1O1jC7XXY7p6lJqr GzRvFjEWH7Jm2JW7WnXT650M7Q0OfMBjZtTE8J7xjKohNQKbae+FZFpEabQxJf14qJmD B44Qxm0QgKJrVKsE1DDKNGX6h7co0B58sU8ATHoM5i8QTLjyWxQP8tlFKfh2k7JijxeA KibSLd2y1Zq8viACoT8GgHqWtS8Fnej/jyKUPmTEzRn1qMenj5jWEL9bleOZ0e00IjX2 0X0w== 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=L969Jsm4lZZoDzF7rkb4ogPjZnsm5E5Ti/6CgKPEMWQ=; b=pPi8xcJBL5xpT2Plpa0ZSJawNFFTbQqOW39ix6J/u94zwBEreTtaSBTItQa6Sggm5d g9avu+tHEPyl29WDv9lQKEFcRqXjdjQuu1nic2Qmnyj2LonOpFvQExTxLDBFlPXHn/3W JEoZk0UXKfVpEMz+Rs1w+n7wv3nWYSGmTPuAJ86vighglEr8wV8L4ImzuF5Fz86zrCtS YlKC8kjbI3TeSo96VBRjSVGBzZ0QOYiYYD+iYeud+1Ia8S3ZsC9nQ5T1McofGM/PhgC8 Fa5nr9GU1/JbNZCc1iObOq+7nrRXVK4JL8ift4abOIjIVMb9YjWWvqotNis2+/P7LXxR 2qkw== X-Gm-Message-State: AOAM530R6OubXj2aZCFZMKoIiqniazXgwFVjxrXD/jei03v9khIFjuFa tBavSFDOrSGPy1Tkspk8B2A= X-Google-Smtp-Source: ABdhPJzN9k8RhrA2671nDPvsVa+1Dt9ZxdAPwGJEg0mKj/kKxg0VRDtNlrmxL8RTzgNhsg24HiVNQA== X-Received: by 2002:a7b:c842:: with SMTP id c2mr3195693wml.100.1612524238803; Fri, 05 Feb 2021 03:23:58 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l2sm8701908wmf.15.2021.02.05.03.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:23:58 -0800 (PST) From: luca.boccassi@gmail.com To: Michael Baum Cc: Matan Azrad , dpdk stable Date: Fri, 5 Feb 2021 11:16:11 +0000 Message-Id: <20210205111920.1272063-85-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 Rx 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/5c53bc1ac215b01ee2d3e12f05d96f218c1d74b9 Thanks. Luca Boccassi --- >From 5c53bc1ac215b01ee2d3e12f05d96f218c1d74b9 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Tue, 15 Dec 2020 08:48:31 +0000 Subject: [PATCH] net/mlx5: fix leak on Rx queue creation failure [ upstream commit e28e6c63a99d67929dedd9e4cdaeaa6d9a9a995d ] In Rx queue creation, there are some validations for the Rx configuration. When one of them fails, the MR btree memory was not freed what caused a memory leak. Free it. Fixes: 974f1e7ef146 ("net/mlx5: add new memory region support") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_rxq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 4d788788e1..e4cbe6430b 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1691,6 +1691,7 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, LIST_INSERT_HEAD(&priv->rxqsctrl, tmpl, next); return tmpl; error: + mlx5_mr_btree_free(&tmpl->rxq.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.104955540 +0000 +++ 0085-net-mlx5-fix-leak-on-Rx-queue-creation-failure.patch 2021-02-05 11:18:28.930693473 +0000 @@ -1 +1 @@ -From e28e6c63a99d67929dedd9e4cdaeaa6d9a9a995d Mon Sep 17 00:00:00 2001 +From 5c53bc1ac215b01ee2d3e12f05d96f218c1d74b9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e28e6c63a99d67929dedd9e4cdaeaa6d9a9a995d ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index df08f977bf..787b2b74dd 100644 +index 4d788788e1..e4cbe6430b 100644 @@ -27 +28 @@ -@@ -1620,6 +1620,7 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, +@@ -1691,6 +1691,7 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,