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 94B9F42EDA for ; Fri, 21 Jul 2023 15:35:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90AB940E2D; Fri, 21 Jul 2023 15:35:37 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id DB7C240DDC for ; Fri, 21 Jul 2023 15:35:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689946536; 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=YKEc8E5UAjI+shwrOHly0ZjRHlmydJXweUXg9d7eLY0=; b=K7gd/5gSkk6fdDtbgWbBp4ONp2xRXi8dee6R9I9kXgxWwqs04Mb3TtwGYl6C6Lzb9itWZP WOyeWiJ/QhH0O5FBoU4UCJpvxPHRFvL17YKSRNVx/q0v4hIUHCVCypDyJDu6RfZPXXXdNn xQqqEYtk641+H6S1iuRJ2q4pUkREl5Q= Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-472-sDRX7GGuNG6BcCFFOHJyWw-1; Fri, 21 Jul 2023 09:35:32 -0400 X-MC-Unique: sDRX7GGuNG6BcCFFOHJyWw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BD7003C11A09; Fri, 21 Jul 2023 13:35:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B60F1454142; Fri, 21 Jul 2023 13:35:29 +0000 (UTC) From: Kevin Traynor To: Bing Zhao Cc: David Marchand , =?UTF-8?q?M=C3=A1rio=20Kuka?= , Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix drop action memory leak' has been queued to stable release 21.11.5 Date: Fri, 21 Jul 2023 14:35:03 +0100 Message-ID: <20230721133509.348959-8-ktraynor@redhat.com> In-Reply-To: <20230721133509.348959-1-ktraynor@redhat.com> References: <20230721133509.348959-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/bdcd4305c74e0870e8dca0b3928ea4ec5db69023 Thanks. Kevin --- >From bdcd4305c74e0870e8dca0b3928ea4ec5db69023 Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Thu, 13 Jul 2023 14:19:41 +0300 Subject: [PATCH] net/mlx5: fix drop action memory leak MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 177d90ddd6e0e223966c2fb8a55e036cfb47db7a ] In DV mode, when quitting an application, the default drop action and its resources should be released. The Devx action for the TIR was not destroyed and it would cause 80B memory leak. With this commit, in DV mode, the action should be destroyed in the mlx5_devx_drop_action_destroy() explicitly. Bugzilla ID: 1192 Bugzilla ID: 1255 Fixes: bc5bee028ebc ("net/mlx5: create drop queue using DevX") Reported-by: David Marchand Reported-by: Mário Kuka Signed-off-by: Bing Zhao Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_devx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c index 0d5de8303b..b59c5d81bd 100644 --- a/drivers/net/mlx5/mlx5_devx.c +++ b/drivers/net/mlx5/mlx5_devx.c @@ -1019,4 +1019,8 @@ mlx5_devx_drop_action_destroy(struct rte_eth_dev *dev) struct mlx5_hrxq *hrxq = priv->drop_queue.hrxq; +#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H) + if (hrxq->action != NULL) + mlx5_flow_os_destroy_flow_action(hrxq->action); +#endif if (hrxq->tir != NULL) mlx5_devx_tir_destroy(hrxq); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-21 14:33:59.206826566 +0100 +++ 0008-net-mlx5-fix-drop-action-memory-leak.patch 2023-07-21 14:33:59.016253259 +0100 @@ -1 +1 @@ -From 177d90ddd6e0e223966c2fb8a55e036cfb47db7a Mon Sep 17 00:00:00 2001 +From bdcd4305c74e0870e8dca0b3928ea4ec5db69023 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 177d90ddd6e0e223966c2fb8a55e036cfb47db7a ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index d286cfe864..9fa400fc48 100644 +index 0d5de8303b..b59c5d81bd 100644 @@ -34 +35 @@ -@@ -1135,4 +1135,8 @@ mlx5_devx_drop_action_destroy(struct rte_eth_dev *dev) +@@ -1019,4 +1019,8 @@ mlx5_devx_drop_action_destroy(struct rte_eth_dev *dev)