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 A603FA054A for ; Tue, 25 Oct 2022 17:09:41 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A1EBC42C51; Tue, 25 Oct 2022 17:09:41 +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 4B8C242C4A for ; Tue, 25 Oct 2022 17:09:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710578; 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=wErbryarXONOkXGX71QlUDB9NxegXwNWhz/3vbucZn8=; b=Cwc7OYiAvhTzFq5BqmoQ9qvxRxBntVB+ujP2fHXvRCcteswMTQJBKEZNTtzc3TNDO/ppuJ kWRSxgAsMlQGUe7O5bp15OaMAJUN2F/CeCBS1buCNcQIHCHou0Sh3fgo813I3MIguOFxwJ eUahfUesUe9+NDjjGqJs5dFe/Ytgx1U= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-590-ynkY0aXwMmeFbTromfaebA-1; Tue, 25 Oct 2022 11:09:37 -0400 X-MC-Unique: ynkY0aXwMmeFbTromfaebA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 03657858F17; Tue, 25 Oct 2022 15:09:37 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F1AF47505E; Tue, 25 Oct 2022 15:09:35 +0000 (UTC) From: Kevin Traynor To: Shun Hao Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix meter profile delete after disable' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:06 +0100 Message-Id: <20221025150734.142189-71-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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/01/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/6a68e9ad38ca18d1a785ae671a26bd24487d7b12 Thanks. Kevin --- >From 6a68e9ad38ca18d1a785ae671a26bd24487d7b12 Mon Sep 17 00:00:00 2001 From: Shun Hao Date: Sun, 18 Sep 2022 03:58:02 +0300 Subject: [PATCH] net/mlx5: fix meter profile delete after disable [ upstream commit 9b7fcf395cd9f92e45bb322f983a3b9ead0d47e7 ] If a meter's profile is changed after meter disabled, there's an issue that will fail when deleting the old profile. This patch fixes this by adding the correct process to decrease the old profile's reference count when changing profile. Fixes: 63ffeb2ff2 ("net/mlx5: support meter profile update") Signed-off-by: Shun Hao Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_meter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index a58e30dc83..fd3f993892 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -1625,5 +1625,5 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev, /* Update meter params in HW (if not disabled). */ if (fm->active_state == MLX5_FLOW_METER_DISABLE) - return 0; + goto dec_ref_cnt; ret = mlx5_flow_meter_action_modify(priv, fm, &fm->profile->srtcm_prm, modify_bits, fm->active_state, 1); @@ -1635,4 +1635,5 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev, " parameters in hardware."); } +dec_ref_cnt: old_fmp->ref_cnt--; fmp->ref_cnt++; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.162003845 +0100 +++ 0071-net-mlx5-fix-meter-profile-delete-after-disable.patch 2022-10-25 14:18:58.494798388 +0100 @@ -1 +1 @@ -From 9b7fcf395cd9f92e45bb322f983a3b9ead0d47e7 Mon Sep 17 00:00:00 2001 +From 6a68e9ad38ca18d1a785ae671a26bd24487d7b12 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9b7fcf395cd9f92e45bb322f983a3b9ead0d47e7 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 7c0d84907a..d4aafe4eea 100644 +index a58e30dc83..fd3f993892 100644 @@ -25 +26 @@ -@@ -1657,5 +1657,5 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev, +@@ -1625,5 +1625,5 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev, @@ -32 +33 @@ -@@ -1667,4 +1667,5 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev, +@@ -1635,4 +1635,5 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev,