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 0DA0AA0542 for ; Fri, 11 Nov 2022 11:34:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A1B842D0D; Fri, 11 Nov 2022 11:34:35 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 549C84014F for ; Fri, 11 Nov 2022 11:34:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162871; 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=wImsS3Ni/nAjHutJvmgaWCUTVLwcvQ7LCNBIDhZdmyk=; b=i7i7vtEDW6i0bGJ3D+d/Su1UNrbEKKPdCqG6b5OIPmPKIDn+ryz7DGNjXHFlhDgsrx9M7Y 9D37nSVThYqbEblP8ktiivlTx1yuHrsO+Sro/SpVHTikfW287dqlTbPt8XUapYGmAur6nv ue9pVHNcqNjZJ/l6/vHUKsRlO85SAAY= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-659-7dYX1wSnNHmOXE2QbB2aqw-1; Fri, 11 Nov 2022 05:34:30 -0500 X-MC-Unique: 7dYX1wSnNHmOXE2QbB2aqw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0EDF73C01DE3; Fri, 11 Nov 2022 10:34:30 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 481AB200E28F; Fri, 11 Nov 2022 10:34:29 +0000 (UTC) From: Kevin Traynor To: Dong Zhou Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix thread workspace memory leak' has been queued to stable release 21.11.3 Date: Fri, 11 Nov 2022 10:33:07 +0000 Message-Id: <20221111103337.307408-17-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 21.11.3 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/14/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c31f9fd5590ddb18e282e73184beb0b02331a01c Thanks. Kevin --- >From c31f9fd5590ddb18e282e73184beb0b02331a01c Mon Sep 17 00:00:00 2001 From: Dong Zhou Date: Thu, 13 Oct 2022 12:34:02 +0300 Subject: [PATCH] net/mlx5: fix thread workspace memory leak [ upstream commit 4df7f801fff5e4065da5c86ad05df0e48d4d3d6e ] The thread workspace push/pop should be paired. In the "flow_list_create" routine, if error happened the workspace pop was missed. This patch shares the workspace pop for all return paths. Fixes: 0064bf431899 ("net/mlx5: fix nested flow creation") Signed-off-by: Dong Zhou Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 42de516bfd..ef19ca0f18 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -6769,6 +6769,6 @@ error: ret = rte_errno; rte_errno = ret; - mlx5_flow_pop_thread_workspace(); error_before_hairpin_split: + mlx5_flow_pop_thread_workspace(); rte_free(translated_actions); return 0; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 10:32:17.493259419 +0000 +++ 0017-net-mlx5-fix-thread-workspace-memory-leak.patch 2022-11-11 10:32:17.044300647 +0000 @@ -1 +1 @@ -From 4df7f801fff5e4065da5c86ad05df0e48d4d3d6e Mon Sep 17 00:00:00 2001 +From c31f9fd5590ddb18e282e73184beb0b02331a01c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4df7f801fff5e4065da5c86ad05df0e48d4d3d6e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index e4744b0a67..6fb1d53fc5 100644 +index 42de516bfd..ef19ca0f18 100644 @@ -23 +24 @@ -@@ -7029,6 +7029,6 @@ error: +@@ -6769,6 +6769,6 @@ error: