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 DA5CCA034F for ; Tue, 1 Mar 2022 11:45:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3740426E1; Tue, 1 Mar 2022 11:45:27 +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 1A17940DF6 for ; Tue, 1 Mar 2022 11:45:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131525; 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=6lLrvp9i147JZVtcR5EvGDmR35UyvaweMDXgFKnpBcY=; b=AYlGj91Db/SLU/uQKZII6cNbhOTYlapswgRylUuWDZpKQAm4+08spdtZQG3zUAUcx+qIhC bph1X5fYAFvFQrx3qy+B6cdQB5j8tIp4ZBaPKeCrQWs/h9CLQN+Ba6PIhg0ld3y34ggY0X qO3JhBfICwVnpVVyrbMA4QtbNfDypmg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-313-nOIwWKNPPgmi2GXpuQh8KA-1; Tue, 01 Mar 2022 05:45:22 -0500 X-MC-Unique: nOIwWKNPPgmi2GXpuQh8KA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BA2851091DA1; Tue, 1 Mar 2022 10:45:21 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id B60EC6FB08; Tue, 1 Mar 2022 10:45:20 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix ASO CT object release' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:23 +0000 Message-Id: <20220301104300.334382-67-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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" 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.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 03/06/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/b6b1c3ad5df57eadada10b0957ff05c89d394e27 Thanks. Kevin --- >From b6b1c3ad5df57eadada10b0957ff05c89d394e27 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Mon, 14 Feb 2022 11:34:54 +0200 Subject: [PATCH] net/mlx5: fix ASO CT object release [ upstream commit ce12974cce72b416135d16a5fa1f4d41cd1d4163 ] The ASO connection tracking structure is initialized once for sharing device context. Its release takes place in the close function which is called for each ethdev individually. i.e. when there is more than one ethdev under the same sharing device context, it will be destroyed when one of them is closed. If the other wants to use it later, it may cause it to crash. In addition, the creation of this structure is performed in the spawn function. If one of the creations of the objects following it fails, it is supposed to be destroyed but this does not happen. This patch moves its release to the sharing device context free function and thus solves both problems. Fixes: 0af8a2298a42 ("net/mlx5: release connection tracking management") Fixes: ee9e5fad03eb ("net/mlx5: initialize connection tracking management") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 67eda41a60..d1d398f49a 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1322,4 +1322,6 @@ mlx5_free_shared_dev_ctx(struct mlx5_dev_ctx_shared *sh) **/ mlx5_flow_counters_mng_close(sh); + if (sh->ct_mng) + mlx5_flow_aso_ct_mng_close(sh); if (sh->aso_age_mng) { mlx5_flow_aso_age_mng_close(sh); @@ -1595,6 +1597,4 @@ mlx5_dev_close(struct rte_eth_dev *dev) mlx5_hlist_destroy(priv->mreg_cp_tbl); mlx5_mprq_free_mp(dev); - if (priv->sh->ct_mng) - mlx5_flow_aso_ct_mng_close(priv->sh); mlx5_os_free_shared_dr(priv); if (priv->rss_conf.rss_key != NULL) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.236599948 +0000 +++ 0067-net-mlx5-fix-ASO-CT-object-release.patch 2022-03-01 10:41:01.367244111 +0000 @@ -1 +1 @@ -From ce12974cce72b416135d16a5fa1f4d41cd1d4163 Mon Sep 17 00:00:00 2001 +From b6b1c3ad5df57eadada10b0957ff05c89d394e27 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ce12974cce72b416135d16a5fa1f4d41cd1d4163 ] + @@ -23 +24,0 @@ -Cc: stable@dpdk.org @@ -32 +33 @@ -index 5571e90677..cde8d022cd 100644 +index 67eda41a60..d1d398f49a 100644