From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 75C03A04B1 for ; Thu, 5 Nov 2020 13:42:15 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6C917C7EE; Thu, 5 Nov 2020 13:42:14 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id D1C6BC7FA for ; Thu, 5 Nov 2020 13:42:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Nk/ypb5RwuViq+S6+mj91DGIG6j3agTYL4TutIHLhYY=; b=DNl1AHTHalVxhBaQtQAbGA0CynyP2Ciac2ahKAlLGIFFUYRlydRzxJNOXHWOhWDw499nNo NagoFPQcY8/8r7vpE1AylI1BM0Ecx9yJhX0LQBBL1T9b8dj01n9ysNynFvwybUuLcz63V5 Wk0VKwXyidOOGqlL+qvx/Dgipuv5lzs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-399-LeWW7ZvsONawxOeQEzJZLA-1; Thu, 05 Nov 2020 07:42:06 -0500 X-MC-Unique: LeWW7ZvsONawxOeQEzJZLA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 789DB805F1E; Thu, 5 Nov 2020 12:42:05 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78E02508E8; Thu, 5 Nov 2020 12:42:04 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Xiao Wang , dpdk stable Date: Thu, 5 Nov 2020 12:40:00 +0000 Message-Id: <20201105124015.306404-53-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/fm10k: fix memory leak when Tx thresh check fails' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/906e74e7c669decc8ef33f546156096cd090a4a8 Thanks. Kevin. --- >From 906e74e7c669decc8ef33f546156096cd090a4a8 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Wed, 7 Oct 2020 15:36:46 +0800 Subject: [PATCH] net/fm10k: fix memory leak when Tx thresh check fails [ upstream commit 9e4f075bc500dafe4568edf99b9a1161b554316e ] In fm10k_tx_queue_setup(), we allocate memory for the queue structure but not released when Tx thresh check fails. Fixes: 98068e0e044e ("fm10k: add Tx queue setup/release") Signed-off-by: Yunjian Wang Acked-by: Xiao Wang --- drivers/net/fm10k/fm10k_ethdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index 4b57a96c8b..71a3ebed9a 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -2045,6 +2045,8 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, q->tail_ptr = (volatile uint32_t *) &((uint32_t *)hw->hw_addr)[FM10K_TDT(queue_id)]; - if (handle_txconf(q, conf)) + if (handle_txconf(q, conf)) { + rte_free(q); return -EINVAL; + } /* allocate memory for the software ring */ -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.247358338 +0000 +++ 0053-net-fm10k-fix-memory-leak-when-Tx-thresh-check-fails.patch 2020-11-05 12:38:54.254896031 +0000 @@ -1 +1 @@ -From 9e4f075bc500dafe4568edf99b9a1161b554316e Mon Sep 17 00:00:00 2001 +From 906e74e7c669decc8ef33f546156096cd090a4a8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9e4f075bc500dafe4568edf99b9a1161b554316e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 3096370718..c4a6fdf7f0 100644 +index 4b57a96c8b..71a3ebed9a 100644 @@ -22 +23 @@ -@@ -2025,6 +2025,8 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, +@@ -2045,6 +2045,8 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id,