DPDK patches and discussions
 help / color / mirror / Atom feed
From: Matan Azrad <matan@nvidia.com>
To: <dev@dpdk.org>
Cc: Viacheslav Ovsiienko <viacheslavo@nvidia.com>, <stable@dpdk.org>,
	"Bing Zhao" <bingz@nvidia.com>
Subject: [dpdk-dev] [PATCH] net/mlx5: fix aging counter deallocation
Date: Wed, 9 Jun 2021 15:32:51 +0300	[thread overview]
Message-ID: <20210609123251.3558588-1-matan@nvidia.com> (raw)

When a counter is destroyed and used for aging action, the driver should
remove the counter object from the age-out list if it is there.

The counter memory of the list entry and of the counter shared
information is shared because, currently, shared counter cannot be used
for aging.

When the support for counter action in action handle API was added, the
counter shared information was reused and moved to be used also for
non-shared case. Wrongly, it is used for aging case too.

Remove the usage of shared information in case of aging.

Fixes: f3191849f2c2 ("net/mlx5: support flow count action handle")
Cc: stable@dpdk.org

Signed-off-by: Matan Azrad <matan@nvidia.com>
Acked-by: Bing Zhao <bingz@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 47 ++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index c9887c8376..1b2639d232 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -6110,28 +6110,33 @@ flow_dv_counter_free(struct rte_eth_dev *dev, uint32_t counter)
 		return;
 	cnt = flow_dv_counter_get_by_idx(dev, counter, &pool);
 	MLX5_ASSERT(pool);
-	/*
-	 * If the counter action is shared by ID, the l3t_clear_entry function
-	 * reduces its references counter. If after the reduction the action is
-	 * still referenced, the function returns here and does not release it.
-	 */
-	if (IS_LEGACY_SHARED_CNT(counter) &&
-	    mlx5_l3t_clear_entry(priv->sh->cnt_id_tbl, cnt->shared_info.id))
-		return;
-	/*
-	 * If the counter action is shared by indirect action API, the atomic
-	 * function reduces its references counter. If after the reduction the
-	 * action is still referenced, the function returns here and does not
-	 * release it.
-	 * When the counter action is not shared neither by ID nor by indirect
-	 * action API, shared info is 1 before the reduction, so this condition
-	 * is failed and function doesn't return here.
-	 */
-	if (!IS_LEGACY_SHARED_CNT(counter) &&
-	    __atomic_sub_fetch(&cnt->shared_info.refcnt, 1, __ATOMIC_RELAXED))
-		return;
-	if (pool->is_aged)
+	if (pool->is_aged) {
 		flow_dv_counter_remove_from_age(dev, counter, cnt);
+	} else {
+		/*
+		 * If the counter action is shared by ID, the l3t_clear_entry
+		 * function reduces its references counter. If after the
+		 * reduction the action is still referenced, the function
+		 * returns here and does not release it.
+		 */
+		if (IS_LEGACY_SHARED_CNT(counter) &&
+		    mlx5_l3t_clear_entry(priv->sh->cnt_id_tbl,
+					 cnt->shared_info.id))
+			return;
+		/*
+		 * If the counter action is shared by indirect action API,
+		 * the atomic function reduces its references counter.
+		 * If after the reduction the action is still referenced, the
+		 * function returns here and does not release it.
+		 * When the counter action is not shared neither by ID nor by
+		 * indirect action API, shared info is 1 before the reduction,
+		 * so this condition is failed and function doesn't return here.
+		 */
+		if (!IS_LEGACY_SHARED_CNT(counter) &&
+		    __atomic_sub_fetch(&cnt->shared_info.refcnt, 1,
+				       __ATOMIC_RELAXED))
+			return;
+	}
 	cnt->pool = pool;
 	/*
 	 * Put the counter back to list to be updated in none fallback mode.
-- 
2.25.1


             reply	other threads:[~2021-06-09 12:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-09 12:32 Matan Azrad [this message]
2021-06-09 15:40 ` Raslan Darawsheh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210609123251.3558588-1-matan@nvidia.com \
    --to=matan@nvidia.com \
    --cc=bingz@nvidia.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    --cc=viacheslavo@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).