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 1E4A34569C for ; Wed, 24 Jul 2024 13:34:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1887842EFD; Wed, 24 Jul 2024 13:34:02 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id DFE3742D28 for ; Wed, 24 Jul 2024 13:34:00 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-426717a2d12so4859975e9.0 for ; Wed, 24 Jul 2024 04:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721820840; x=1722425640; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VuywKI7/oLeMxqP1E00gcxYyWWYrD+wSsbkUDxeWEs8=; b=ajDGIGyzV0z46bB3+cUpzgl0n41ZiWkCPuEJmi8XRiNnhu4A07vLcXRJuHsIub+GwY eJ38aLCAZpAG5hDKqVU6ci3LogBLfaZ8i8D/aFpjtJCrkC8V+mgPW+PrJ1jEOiKcbCzj XdpYelWiJTWL6BPVdJI90/HGBXwc5CFZCKvo2Z/4eXVpg1dBm+x0kq1SZOwIRtzHyHPC f6AnB3Hd6Hncwy4y3AFtW0YEoyAWshCJCUfjrYMGGtZ/rBTDX/ZvZ/27AWDjzUfsa5NG HlpyFinAH/KAae0iXFqYIuizYbuX1iYJRZxiVHq8c5iUvSabC3FUQcWZ/vpEpX3Z+hZy yg1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721820840; x=1722425640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VuywKI7/oLeMxqP1E00gcxYyWWYrD+wSsbkUDxeWEs8=; b=ewxpTtPQ69beirvozIACjuJONc12i6bvDYUj4Rfw9k4Dl34rIzQ2WlQB7ZrEvUjToV 3FP3+vDk6kbpax7sgnPj89ZWZySXyWYZG+V+pfzJI8M3Esm7TCFTwu8iWJ4Pg/J6LpKA 5Ik3P7G+Ugix5k6epGFWMUZSdDsvs4Qyojip1rrnK89SK6OE+KSGLINuPm2khwlrWcBh kHfWy5af+eEny4w4Z1bZO4TNqnWkI9W0ghOibGm2YzksY6A6tc2XdvApe4GeCXUtfeBr 15x1A1jF90+CFFLRroqX6bkYKDv6uzAkl8i6qsXAycavwpDUsBV0TEdUU/t1DZ+tQS0E e6YA== X-Forwarded-Encrypted: i=1; AJvYcCUSmJt5fOVy7elFLRSk5v8EGD2PSFlI/mwO9qkQ/VvzpTSZGTtdPWGCNXreoS/qsDvVK88R+uhE+3t4nGnhgSI= X-Gm-Message-State: AOJu0YxakLn2ClfCEJ12Oorr26sbOJ4XVE0Iz5dGARmIAXzrb9wsnk63 ZsPWKRbEDaJ0Ubdt9FvpFj6i7CdeSiZmiMwNOKrRy0KyXZypbVcA X-Google-Smtp-Source: AGHT+IFabPncY64oPnsGsN2lLLODl7r3veTMIwVL3tsBKiBS9ctUXt8nrOIJzvvP+CzmRktPFFWQkQ== X-Received: by 2002:a05:600c:46d1:b0:424:a7f1:ba2 with SMTP id 5b1f17b1804b1-427f9a4d067mr12342405e9.17.1721820840358; Wed, 24 Jul 2024 04:34:00 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427f9359710sm26744475e9.1.2024.07.24.04.33.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 04:33:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Erez Shitrit Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5/hws: fix deletion of action vport' has been queued to stable release 22.11.6 Date: Wed, 24 Jul 2024 12:32:51 +0100 Message-Id: <20240724113318.616754-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240724113318.616754-1-luca.boccassi@gmail.com> References: <20240715152704.2229503-86-luca.boccassi@gmail.com> <20240724113318.616754-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 22.11.6 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/26/24. 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/6da7724d9e8b102d16c24bf390e853c94dacbae4 Thanks. Luca Boccassi --- >From 6da7724d9e8b102d16c24bf390e853c94dacbae4 Mon Sep 17 00:00:00 2001 From: Erez Shitrit Date: Tue, 9 Jul 2024 15:30:59 +0300 Subject: [PATCH] net/mlx5/hws: fix deletion of action vport [ upstream commit 29cd96c98dd999756f43715c7f3e85c44044b115 ] No more ignoring this action while destroying it. Fixes: f8c8a6d8440d ("net/mlx5/hws: add action object") Signed-off-by: Erez Shitrit Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr_action.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c index b0ae4e7693..4fb9a03d80 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.c +++ b/drivers/net/mlx5/hws/mlx5dr_action.c @@ -1593,6 +1593,7 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action) case MLX5DR_ACTION_TYP_ASO_METER: case MLX5DR_ACTION_TYP_ASO_CT: case MLX5DR_ACTION_TYP_PUSH_VLAN: + case MLX5DR_ACTION_TYP_VPORT: mlx5dr_action_destroy_stcs(action); break; case MLX5DR_ACTION_TYP_POP_VLAN: @@ -1614,6 +1615,9 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action) mlx5dr_action_destroy_stcs(action); mlx5dr_cmd_destroy_obj(action->reformat.arg_obj); break; + default: + DR_LOG(ERR, "Not supported action type: %d", action->type); + assert(false); } } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-24 12:29:21.799867647 +0100 +++ 0013-net-mlx5-hws-fix-deletion-of-action-vport.patch 2024-07-24 12:29:20.715025005 +0100 @@ -1 +1 @@ -From 29cd96c98dd999756f43715c7f3e85c44044b115 Mon Sep 17 00:00:00 2001 +From 6da7724d9e8b102d16c24bf390e853c94dacbae4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 29cd96c98dd999756f43715c7f3e85c44044b115 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16 @@ - drivers/net/mlx5/hws/mlx5dr_cmd.c | 3 ++- - 2 files changed, 6 insertions(+), 1 deletion(-) + 1 file changed, 4 insertions(+) @@ -19 +19 @@ -index b90f18df8a..0d90280a7d 100644 +index b0ae4e7693..4fb9a03d80 100644 @@ -22 +22,2 @@ -@@ -2968,6 +2968,7 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action) +@@ -1593,6 +1593,7 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action) + case MLX5DR_ACTION_TYP_ASO_METER: @@ -25 +25,0 @@ - case MLX5DR_ACTION_TYP_REMOVE_HEADER: @@ -29,4 +29,4 @@ - case MLX5DR_ACTION_TYP_DEST_ROOT: -@@ -3027,6 +3028,9 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action) - break; - case MLX5DR_ACTION_TYP_LAST: + case MLX5DR_ACTION_TYP_POP_VLAN: +@@ -1614,6 +1615,9 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action) + mlx5dr_action_destroy_stcs(action); + mlx5dr_cmd_destroy_obj(action->reformat.arg_obj); @@ -40,14 +39,0 @@ -diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.c b/drivers/net/mlx5/hws/mlx5dr_cmd.c -index 72fc9e3d91..a4f778a8a4 100644 ---- a/drivers/net/mlx5/hws/mlx5dr_cmd.c -+++ b/drivers/net/mlx5/hws/mlx5dr_cmd.c -@@ -1033,7 +1033,8 @@ int mlx5dr_cmd_generate_wqe(struct ibv_context *ctx, - - ret = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out, sizeof(out)); - if (ret) { -- DR_LOG(ERR, "Failed to write GTA WQE using FW"); -+ DR_LOG(ERR, "Failed to write GTA WQE using FW (syndrome: %#x)", -+ mlx5dr_cmd_get_syndrome(out)); - rte_errno = errno; - return rte_errno; - }