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 4B84E43CAD for ; Thu, 14 Mar 2024 01:12:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 45BBD42E6A; Thu, 14 Mar 2024 01:12:18 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id 9DF7A40297 for ; Thu, 14 Mar 2024 01:12:16 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-413eede49dbso2624405e9.0 for ; Wed, 13 Mar 2024 17:12:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375136; x=1710979936; 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=pj9fA7jC6Me2tgR5O615aUgPY7v/2E/s4OMyzRF4Tzk=; b=XTzWspYfSYuwqBVoZN945FGjkwottqH+1CDeD3pOV6XQT8m86joqjqsDdACATL6LoL 60aUT+XrnJ0sV3H6Ugk2EYMOwgEi+14u237JuDEGuYhv7Nv5vILFVn0MNlytw3X9nhvQ kcwv+9iBGXYzybMJCw4C0kjlyqI/+t1h/UDlPsNAptEMUJ4VWFSkCiRBeVlPsTt8oQqg D48OEPbWeqMb+t4kT8qESwXGovgETWhPMCtiXrrPFdBTO7k68O3VY8HYloO36kAqLQdR tsDiUtKP3ALDWzPPpIWxQK3USwmQ3YHX0F/u038h0umA659yfwxn6EeSdN0shqLfH1Wa I5bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375136; x=1710979936; 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=pj9fA7jC6Me2tgR5O615aUgPY7v/2E/s4OMyzRF4Tzk=; b=BQKqGGRKP9vL1T4wyYVQDDilKEeb7ry9WK4PzTMEpkU3R9BwHKiU0I+6pRbXn4gnwf sAS3U+Iei072J1X0rzlg3CIUv2ZjerwTD9PVVc3g5oTaCJOvLUkku96V+hIu2Bt5tuEd knDOf24RWqrz0TDRhWnUW53LoIjrBC/twMfTwMUMx8J+k3gb4rkB+sDW9uW1BhtxD0BX nfM2kg8cy3O3c1C0z3XtC5SD58vgZxO6yC+kxjmY80cS8zDl19MXgKu+XUYWmgFDgjg5 xYBHdY6Tc5HlBm2aTkvag7Jh+UOlTiFcGsVE9r1530N9iEol8ytSBMthAuRiTwWHukEM bF4g== X-Forwarded-Encrypted: i=1; AJvYcCV3jOmyCa2zoWQym/q0VIPqr8KT7VR7VGe5iESdCd6o4o8bQ5twyQKdqRoWxIWmnlO41KlMlh8Yh5lP5asRVnM= X-Gm-Message-State: AOJu0YyVvmBIjlQfxxlO3z8N1I5+fmsnfTZxvqsmIvpUXFqnA+atNGnl Wxjq4mfgYxbsx1plQ2P5H8ODCNLm+fuF2gLEoXlhnP2SnLa/NNBhdmSKAzrR/8A= X-Google-Smtp-Source: AGHT+IHzZBp5MfXUakAOPZdWxCop9WmlcL3bLeVZfDS/z9JX5sLtu/EV1oiu2xEccV79m+W3a9IyBw== X-Received: by 2002:a05:600c:511d:b0:413:27ac:d2fa with SMTP id o29-20020a05600c511d00b0041327acd2famr185349wms.6.1710375136298; Wed, 13 Mar 2024 17:12:16 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id v13-20020a05600c470d00b00413f1c01a7bsm288847wmo.16.2024.03.13.17.12.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:12:15 -0700 (PDT) From: luca.boccassi@gmail.com To: Hamdan Igbaria Cc: Erez Shitrit , Suanming Mou , dpdk stable Subject: patch 'net/mlx5/hws: fix VLAN inner type' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:39 +0000 Message-Id: <20240314000957.2810803-43-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-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.5 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/16/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/38b2735798d9ced9adddfac036b01a2d246560b8 Thanks. Luca Boccassi --- >From 38b2735798d9ced9adddfac036b01a2d246560b8 Mon Sep 17 00:00:00 2001 From: Hamdan Igbaria Date: Wed, 21 Feb 2024 08:28:11 +0200 Subject: [PATCH] net/mlx5/hws: fix VLAN inner type [ upstream commit d1d350d868439357e750297d5719670f706facc2 ] Set the correct VLAN inner_type value, till today the once the VLAN inner_type field was set, an incorrect value was taken instead of the inner_type field. Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer") Signed-off-by: Hamdan Igbaria Reviewed-by: Erez Shitrit Acked-by: Suanming Mou --- drivers/net/mlx5/hws/mlx5dr_definer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 52f615d842..b3d8d9504e 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -164,7 +164,8 @@ struct mlx5dr_definer_conv_data { X(SET_BE32, gre_opt_seq, v->sequence.sequence, rte_flow_item_gre_opt) \ X(SET_BE16, gre_opt_checksum, v->checksum_rsvd.checksum, rte_flow_item_gre_opt) \ X(SET, meter_color, rte_col_2_mlx5_col(v->color), rte_flow_item_meter_color) \ - X(SET, cvlan, STE_CVLAN, rte_flow_item_vlan) + X(SET, cvlan, STE_CVLAN, rte_flow_item_vlan) \ + X(SET_BE16, inner_type, v->inner_type, rte_flow_item_vlan) /* Item set function format */ #define X(set_type, func_name, value, item_type) \ @@ -513,7 +514,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, if (m->inner_type) { fc = &cd->fc[DR_CALC_FNAME(ETH_TYPE, inner)]; fc->item_idx = item_idx; - fc->tag_set = &mlx5dr_definer_eth_type_set; + fc->tag_set = &mlx5dr_definer_inner_type_set; DR_CALC_SET(fc, eth_l2, l3_ethertype, inner); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:22.665845555 +0000 +++ 0043-net-mlx5-hws-fix-VLAN-inner-type.patch 2024-03-14 00:09:20.645615856 +0000 @@ -1 +1 @@ -From d1d350d868439357e750297d5719670f706facc2 Mon Sep 17 00:00:00 2001 +From 38b2735798d9ced9adddfac036b01a2d246560b8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d1d350d868439357e750297d5719670f706facc2 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - drivers/net/mlx5/hws/mlx5dr_definer.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + drivers/net/mlx5/hws/mlx5dr_definer.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) @@ -21 +22 @@ -index c1508e6b53..e036aca781 100644 +index 52f615d842..b3d8d9504e 100644 @@ -24,5 +25,7 @@ -@@ -224,6 +224,7 @@ struct mlx5dr_definer_conv_data { - X(SET, random_number, v->value, rte_flow_item_random) \ - X(SET, ib_l4_bth_a, v->hdr.a, rte_flow_item_ib_bth) \ - X(SET, cvlan, STE_CVLAN, rte_flow_item_vlan) \ -+ X(SET_BE16, inner_type, v->inner_type, rte_flow_item_vlan) \ +@@ -164,7 +164,8 @@ struct mlx5dr_definer_conv_data { + X(SET_BE32, gre_opt_seq, v->sequence.sequence, rte_flow_item_gre_opt) \ + X(SET_BE16, gre_opt_checksum, v->checksum_rsvd.checksum, rte_flow_item_gre_opt) \ + X(SET, meter_color, rte_col_2_mlx5_col(v->color), rte_flow_item_meter_color) \ +- X(SET, cvlan, STE_CVLAN, rte_flow_item_vlan) ++ X(SET, cvlan, STE_CVLAN, rte_flow_item_vlan) \ ++ X(SET_BE16, inner_type, v->inner_type, rte_flow_item_vlan) @@ -32,2 +35,2 @@ -@@ -990,7 +991,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, - if (m->hdr.eth_proto) { +@@ -513,7 +514,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, + if (m->inner_type) {