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 6376043CAD for ; Thu, 14 Mar 2024 01:12:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B29F42E40; Thu, 14 Mar 2024 01:12:04 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 93D1E42E40 for ; Thu, 14 Mar 2024 01:12:01 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-413f1853bf3so1017085e9.0 for ; Wed, 13 Mar 2024 17:12:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375121; x=1710979921; 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=7gw+tLb4dCmtnHO9jvXbfC+QRXh9hK+1JzK2bagwsDY=; b=DDFaqRVNldRiQFFmmX4bOvQn3nVLyriv7NFqU9jcGa0q7RlU7w/0+VKgYUe8alWYhq JcTam77Dcpyvi4yj7tu+oKaFsrhGCTGL0XqVqORJ1qs4oFMccBn+oZT+mUghyYprzHv8 feaEppzhbhIr678e6DPYL6bsfFZ82L6ohEk5eFYvSWCwWp3VVxhH77JVJTaJkzblsuMc ahGiKbLTn7/FXsy3daI61qoAcsE6fR9JpxrF77ZmaeliiH2EUDoO5XZKzFoIeG3V81Nb 0x8LfNwF+KFXE2UikYg992Z59AYSh7ieZ5apFzBXd/8vHjngEe04/SEp3W49C287gG35 4Nhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375121; x=1710979921; 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=7gw+tLb4dCmtnHO9jvXbfC+QRXh9hK+1JzK2bagwsDY=; b=jI//PLXkAvEDYEFImOS+V5CsV2kZC3PYdfoK6S1OXcn+Uk3GTW7SRJRPtFgbsLkHrb xZ9IhczJNkaD5WYXF7kHQcXMjPNGUNUp3tCPDRzjfC96yEgptIPI+Cg87jNtyBHvf9m4 It1sJ/sLUT4xReaes8NgLhOayXi5cHt4x39npAb4L6kNKu4Zw3CeFaRo651eKuuQQr6b zROci6o+AlYigGvpHFYG+pQGQIJJ2TDvCrUpSSdMPgKm1Fhqda+inl/gIo7yXL2HGbED 1zA+DosMHesYHaett1Ft07Mk+fdoUdB/Ya1V+do4jhK/FDOPigdPjyYq3MbZJrEm1Giy MIlQ== X-Forwarded-Encrypted: i=1; AJvYcCU4VRS0dlBqHdnf1ttswRLTJZrJo3L7LcBy8UMxQqIMVU4bmXrQL4S71007CRrFxvYjU50JpJPwOQ2M1INJPCs= X-Gm-Message-State: AOJu0YzY3g1Jo62/2aFQFgZf6oFgGG/m4JVEMicenqty1Ao+UV3sAeD5 ioAl0CjZEXZL6FC0mS1iFunOWJeeVORfdZ9Rtlo2xsMZ0x4fyoP3CCkAhoY8Z08= X-Google-Smtp-Source: AGHT+IFi6O7tpUd/1fX4MjFnpn0NfdczCWAUPigeqwKf2tSUayyIvxOfY68KVWWtpJTKJg+PcFiBRA== X-Received: by 2002:a05:600c:358a:b0:412:f979:587b with SMTP id p10-20020a05600c358a00b00412f979587bmr225754wmq.17.1710375121185; Wed, 13 Mar 2024 17:12:01 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id dd12-20020a0560001e8c00b0033dd9b050f9sm294359wrb.14.2024.03.13.17.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:12:00 -0700 (PDT) From: luca.boccassi@gmail.com To: Hamdan Igbaria Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5/hws: fix VLAN item in non-relaxed mode' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:35 +0000 Message-Id: <20240314000957.2810803-39-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/c3d7ceece3712d9e30d7f6d24eb8b228a338ca5d Thanks. Luca Boccassi --- >From c3d7ceece3712d9e30d7f6d24eb8b228a338ca5d Mon Sep 17 00:00:00 2001 From: Hamdan Igbaria Date: Sun, 18 Feb 2024 07:11:20 +0200 Subject: [PATCH] net/mlx5/hws: fix VLAN item in non-relaxed mode [ upstream commit 0aacd886e93df862f010a45ed333d08355f4bca8 ] If a VLAN item was passed with null mask, the item handler would return immediately and thus won't set default values for non relax mode. Also change the non relax default set to single-tagged (CVLAN). Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer") Signed-off-by: Hamdan Igbaria Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr_definer.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 9637281a1e..52f615d842 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -163,7 +163,8 @@ struct mlx5dr_definer_conv_data { X(SET_BE32, gre_opt_key, v->key.key, rte_flow_item_gre_opt) \ 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, meter_color, rte_col_2_mlx5_col(v->color), rte_flow_item_meter_color) \ + X(SET, cvlan, STE_CVLAN, rte_flow_item_vlan) /* Item set function format */ #define X(set_type, func_name, value, item_type) \ @@ -477,6 +478,15 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, struct mlx5dr_definer_fc *fc; bool inner = cd->tunnel; + if (!cd->relaxed) { + /* Mark packet as tagged (CVLAN) */ + fc = &cd->fc[DR_CALC_FNAME(VLAN_TYPE, inner)]; + fc->item_idx = item_idx; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->tag_set = &mlx5dr_definer_cvlan_set; + DR_CALC_SET(fc, eth_l2, first_vlan_qualifier, inner); + } + if (!m) return 0; @@ -485,8 +495,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, return rte_errno; } - if (!cd->relaxed || m->has_more_vlan) { - /* Mark packet as tagged (CVLAN or SVLAN) even if TCI is not specified.*/ + if (m->has_more_vlan) { fc = &cd->fc[DR_CALC_FNAME(VLAN_TYPE, inner)]; fc->item_idx = item_idx; fc->tag_mask_set = &mlx5dr_definer_ones_set; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:22.483803527 +0000 +++ 0039-net-mlx5-hws-fix-VLAN-item-in-non-relaxed-mode.patch 2024-03-14 00:09:20.629615539 +0000 @@ -1 +1 @@ -From 0aacd886e93df862f010a45ed333d08355f4bca8 Mon Sep 17 00:00:00 2001 +From c3d7ceece3712d9e30d7f6d24eb8b228a338ca5d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0aacd886e93df862f010a45ed333d08355f4bca8 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - drivers/net/mlx5/hws/mlx5dr_definer.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) + drivers/net/mlx5/hws/mlx5dr_definer.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) @@ -21 +22 @@ -index eb788a772a..b8a546989a 100644 +index 9637281a1e..52f615d842 100644 @@ -24,5 +25,7 @@ -@@ -223,6 +223,7 @@ struct mlx5dr_definer_conv_data { - X(SET, ib_l4_opcode, v->hdr.opcode, rte_flow_item_ib_bth) \ - 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) \ +@@ -163,7 +163,8 @@ struct mlx5dr_definer_conv_data { + X(SET_BE32, gre_opt_key, v->key.key, rte_flow_item_gre_opt) \ + 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, meter_color, rte_col_2_mlx5_col(v->color), rte_flow_item_meter_color) \ ++ X(SET, cvlan, STE_CVLAN, rte_flow_item_vlan) @@ -32 +35 @@ -@@ -864,6 +865,15 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, +@@ -477,6 +478,15 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, @@ -48 +51 @@ -@@ -872,8 +882,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd, +@@ -485,8 +495,7 @@ mlx5dr_definer_conv_item_vlan(struct mlx5dr_definer_conv_data *cd,