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 33D20A0524 for ; Fri, 5 Feb 2021 12:23:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C3491606CE; Fri, 5 Feb 2021 12:23:41 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 09B521606CE for ; Fri, 5 Feb 2021 12:23:40 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id b3so7276517wrj.5 for ; Fri, 05 Feb 2021 03:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SWA/CpcTDM9GFAFoGSoSwtJU413LHul1bWPojP+8gZw=; b=W8iUiH+dVPkdLCbZ4pq7tUVUEPz5Q25uLiQe8QVqm/Q8FfYUDrZpAwPDCCpTM+aMDm EKF3XNTTlTkNS/4Q0C494MUVqUgeRuqx+xcC4AUGG221RTq7jbA56nxIjdKsB6X6fBVR 4skvMph+F5nZhaFvMxpG4WQ2LRM21LzQ7l1kD+3r8wtlceB0Ru78UnSdFhhj2xIwaHMH wZ95HKN6IT8LuN2wbXNlwIGrI/NuKfXDvySmKwZyI7aCjfH7AU4lxJsgYAU91Jr9bznv 8HT5wtzt7RTVpIBP4G4txcNeg2dWrUo+PK5Dz4CwwneVlsbG936gpe/yVOrYyGePi/MQ WB7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SWA/CpcTDM9GFAFoGSoSwtJU413LHul1bWPojP+8gZw=; b=oXXqaBg3QXXNa+WjMC2Hqw7LvzJob0ZjlQtCmwsLniOxTSk4IC3BcFKfrRWXDsdw2O hh3nncUJHBSdgQLNrRcX9QRUiBB07phFNv8wQ2w4mxLy2pueA9M758PJ2GvcDaNJjz8r EQgvcSd7Gxf9Fy8C6hCHiTN284qaMJYMUr1oyY3kTVKm271o2W0gsPAge1C1CCqFfECR 3jcP7nIORPOxbRm2lQYliJ4veQtSlzUxzRNk2YxWy1UPMzrPu7Hx31nAEA5prdme9gs9 UfqK7UvPl8vqr1IjzzIZ4R0/nFOy9RWU+SWMAsVhPY/M3heKhQPH1tWec4WdGoQoxouv D0gA== X-Gm-Message-State: AOAM5325EcyRKrg82qNR5bxeY6trQw/Bsket4NVK3R2g8FEy3PH/I/Q9 GMob7pWuFAugD7qxHfpl+do= X-Google-Smtp-Source: ABdhPJx8aQ8OYJTRQcRFRUCv91OF4E0Z1Fv6e/9f6WTAkgBeIe9xuF7bFzMVx43kCEOFI34YWAGPHg== X-Received: by 2002:a5d:4d8d:: with SMTP id b13mr4329638wru.178.1612524219778; Fri, 05 Feb 2021 03:23:39 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 9sm12759399wra.80.2021.02.05.03.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:23:39 -0800 (PST) From: luca.boccassi@gmail.com To: Ophir Munk Cc: Matan Azrad , dpdk stable Date: Fri, 5 Feb 2021 11:16:04 +0000 Message-Id: <20210205111920.1272063-78-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix flow action destroy wrapper' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 02/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a49c923bd11c28be38038094d3d0a0c7881de194 Thanks. Luca Boccassi --- >From a49c923bd11c28be38038094d3d0a0c7881de194 Mon Sep 17 00:00:00 2001 From: Ophir Munk Date: Mon, 28 Dec 2020 11:54:15 +0200 Subject: [PATCH] net/mlx5: fix flow action destroy wrapper [ upstream commit 223f2c2162bfd8c5f9ac51dfb1eb3d8f87554880 ] Glue function destroy_flow_action() was wrapped by OS specific operation mlx5_flow_os_destroy_flow_action(). It was skipped in file mlx5.c. Fixes: b293fbf9672b ("net/mlx5: add OS specific flow actions operations") Signed-off-by: Ophir Munk Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5.c | 7 ++++--- drivers/net/mlx5/mlx5_flow_dv.c | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index ca3667a469..591750a3ff 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -37,6 +37,7 @@ #include "mlx5_autoconf.h" #include "mlx5_mr.h" #include "mlx5_flow.h" +#include "mlx5_flow_os.h" #include "rte_pmd_mlx5.h" /* Device parameter to enable RX completion queue compression. */ @@ -413,8 +414,8 @@ mlx5_flow_aso_age_mng_close(struct mlx5_dev_ctx_shared *sh) for (j = 0; j < MLX5_COUNTERS_PER_POOL; ++j) if (pool->actions[j].dr_action) claim_zero - (mlx5_glue->destroy_flow_action - (pool->actions[j].dr_action)); + (mlx5_flow_os_destroy_flow_action + (pool->actions[j].dr_action)); mlx5_free(pool); } mlx5_free(sh->aso_age_mng->pools); @@ -521,7 +522,7 @@ mlx5_flow_counters_mng_close(struct mlx5_dev_ctx_shared *sh) if (cnt->action) claim_zero - (mlx5_glue->destroy_flow_action + (mlx5_flow_os_destroy_flow_action (cnt->action)); if (fallback && MLX5_POOL_GET_CNT (pool, j)->dcs_when_free) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 7225c8074d..618e248799 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -11092,11 +11092,11 @@ flow_dv_sample_remove_cb(struct mlx5_cache_list *list __rte_unused, struct mlx5_priv *priv = dev->data->dev_private; if (cache_resource->verbs_action) - claim_zero(mlx5_glue->destroy_flow_action + claim_zero(mlx5_flow_os_destroy_flow_action (cache_resource->verbs_action)); if (cache_resource->ft_type == MLX5DV_FLOW_TABLE_TYPE_FDB) { if (cache_resource->default_miss) - claim_zero(mlx5_glue->destroy_flow_action + claim_zero(mlx5_flow_os_destroy_flow_action (cache_resource->default_miss)); } if (cache_resource->normal_path_tbl) @@ -11149,7 +11149,7 @@ flow_dv_dest_array_remove_cb(struct mlx5_cache_list *list __rte_unused, MLX5_ASSERT(cache_resource->action); if (cache_resource->action) - claim_zero(mlx5_glue->destroy_flow_action + claim_zero(mlx5_flow_os_destroy_flow_action (cache_resource->action)); for (; i < cache_resource->num_of_dest; i++) flow_dv_sample_sub_actions_release(dev, -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:32.758584521 +0000 +++ 0078-net-mlx5-fix-flow-action-destroy-wrapper.patch 2021-02-05 11:18:28.874692407 +0000 @@ -1 +1 @@ -From 223f2c2162bfd8c5f9ac51dfb1eb3d8f87554880 Mon Sep 17 00:00:00 2001 +From a49c923bd11c28be38038094d3d0a0c7881de194 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 223f2c2162bfd8c5f9ac51dfb1eb3d8f87554880 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 84123f8e3d..60301d3244 100644 +index ca3667a469..591750a3ff 100644 @@ -23 +24 @@ -@@ -38,6 +38,7 @@ +@@ -37,6 +37,7 @@ @@ -31 +32 @@ -@@ -415,8 +416,8 @@ mlx5_flow_aso_age_mng_close(struct mlx5_dev_ctx_shared *sh) +@@ -413,8 +414,8 @@ mlx5_flow_aso_age_mng_close(struct mlx5_dev_ctx_shared *sh) @@ -42 +43 @@ -@@ -523,7 +524,7 @@ mlx5_flow_counters_mng_close(struct mlx5_dev_ctx_shared *sh) +@@ -521,7 +522,7 @@ mlx5_flow_counters_mng_close(struct mlx5_dev_ctx_shared *sh) @@ -52 +53 @@ -index 4f638e24ad..20ff1fb5dd 100644 +index 7225c8074d..618e248799 100644 @@ -55 +56 @@ -@@ -11117,11 +11117,11 @@ flow_dv_sample_remove_cb(struct mlx5_cache_list *list __rte_unused, +@@ -11092,11 +11092,11 @@ flow_dv_sample_remove_cb(struct mlx5_cache_list *list __rte_unused, @@ -69 +70 @@ -@@ -11174,7 +11174,7 @@ flow_dv_dest_array_remove_cb(struct mlx5_cache_list *list __rte_unused, +@@ -11149,7 +11149,7 @@ flow_dv_dest_array_remove_cb(struct mlx5_cache_list *list __rte_unused,