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 2A95345C9B for ; Tue, 12 Nov 2024 23:08:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 252F14064C; Tue, 12 Nov 2024 23:08:41 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 3D7C94064C for ; Tue, 12 Nov 2024 23:08:40 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43193678216so59226485e9.0 for ; Tue, 12 Nov 2024 14:08:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731449320; x=1732054120; 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=mvOzOvxUYP5LB4qzLeNPIlNb3wD3UZtABgTdvDitxCM=; b=Ncudw71q2IGPkIQuQfb3+thrjWjG/1fi+6ffRgS89b5TxN6LDlo7wvnQZElTUCx3LU P4//AzCX/FxI0N6lxvnWtep/SC/vec1n+pxW1UCeUp/xSTQHy7+BYFp1IynXARdYI7Xc DSMLkgH+VTwRAq8fFck0hM9vyUFQTLR9TMmPP9GmmMlYyfrPCXb/NvNN5eMkCrpxugc7 1LhkmA2zyeJFxoFjTMJxw9dk0MB+RMLTxdjZYfUeuLH3M6CjxkSultuvPkfJGRb5nSkX Zc9BVUAHegYyhFbxkb8/l8av3uL62JbUycFQi+xcL1sQGO4jmhof2GQQvFUiF/zKgIVt QX9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731449320; x=1732054120; 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=mvOzOvxUYP5LB4qzLeNPIlNb3wD3UZtABgTdvDitxCM=; b=MhOQHXeLbRqlmoJGUioMyqccNCg/74QRS66maEKovGJQWNGZzzzVGv9wlR8PpBo27G UEIHtSLG+OCKQb6eG0sztsKI1Zz7uS/LTpOgT3JEIpXkpZ2aL0pYD2BrAPPWJ5zIqloc rP8Po80dw5E0mz1Ux/wqgbZ1u4YOLhIMuMvuk1IjTvMZy7o426mkAhVz0HnEplN9HI/d OX1RlsPF2a+eeznWMg7FGJrEs2ginmt8l71e88+6sRHcaiWbExRhP4Bf+k5jsSvAqP3a qsWAesSgKxgubMObPSlMeb2hvCXgPsNY19J78Ndd2KkosPNek5AdSEa209HeSnlj+s1q tMMw== X-Forwarded-Encrypted: i=1; AJvYcCURN7t3bAmx5GQ5MeVvyk6tkCQKAM3kr2YeTK1LMag7zv8sOpg0HuyONxU3Zx21OXDDja+xRfg=@dpdk.org X-Gm-Message-State: AOJu0YysQ90Gqc3Kb5yoiNLuxdrmHgYyXt1+skj7Evtki/TlNGIAm4tl cOUiUXo96+j2Lr4TGe4ZIsBAgbNM8jinIPT4RdfEFWphyfqBEdF3+0Q9dw== X-Google-Smtp-Source: AGHT+IH5UMtxrMAWhdr935vnJzhsX9S6bjFcHC9a8PflVMjrPRZTan3C4On2IxgmxjVmbOYLYXntbQ== X-Received: by 2002:a05:600c:4ecc:b0:42c:c28c:e477 with SMTP id 5b1f17b1804b1-432b751688bmr151279365e9.23.1731449319776; Tue, 12 Nov 2024 14:08:39 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:e89d:e9a1:da72:2f9d]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432d54f772asm994695e9.18.2024.11.12.14.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 14:08:38 -0800 (PST) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: fix GRE flow item translation for root table' has been queued to stable release 22.11.7 Date: Tue, 12 Nov 2024 22:07:21 +0000 Message-ID: <20241112220754.666489-11-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241112220754.666489-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-79-luca.boccassi@gmail.com> <20241112220754.666489-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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/14/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/c4c995ba7b5dd12cb8084a6e6b3afcc7f3ec464d Thanks. Luca Boccassi --- >From c4c995ba7b5dd12cb8084a6e6b3afcc7f3ec464d Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Sun, 27 Oct 2024 14:39:16 +0200 Subject: [PATCH] net/mlx5: fix GRE flow item translation for root table [ upstream commit 25ab2cbba31d937e685f0cf9ecce0c680cc4083e ] Flow items translations for the root tables reuse DV code. However, the DV GRE item translation did not initialize the item mask for HWS template. Initialize the mask to fix GRE item translation for root tables when using HWS. Fixes: cd4ab742064a ("net/mlx5: split flow item matcher and value translation") Signed-off-by: Gregory Etelson Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow_dv.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8267bf9ffa..4e0ed4415f 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9108,22 +9108,23 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item, } gre_crks_rsvd0_ver_m, gre_crks_rsvd0_ver_v; uint16_t protocol_m, protocol_v; - if (key_type & MLX5_SET_MATCHER_M) + if (key_type & MLX5_SET_MATCHER_M) { MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, 0xff); - else - MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, - IPPROTO_GRE); - if (!gre_v) { - gre_v = &empty_gre; - gre_m = &empty_gre; - } else { if (!gre_m) gre_m = &rte_flow_item_gre_mask; - } - if (key_type & MLX5_SET_MATCHER_M) gre_v = gre_m; - else if (key_type == MLX5_SET_MATCHER_HS_V) - gre_m = gre_v; + } else { + MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, + IPPROTO_GRE); + if (!gre_v) { + gre_v = &empty_gre; + gre_m = &empty_gre; + } else if (!gre_m) { + gre_m = &rte_flow_item_gre_mask; + } + if (key_type == MLX5_SET_MATCHER_HS_V) + gre_m = gre_v; + } gre_crks_rsvd0_ver_m.value = rte_be_to_cpu_16(gre_m->c_rsvd0_ver); gre_crks_rsvd0_ver_v.value = rte_be_to_cpu_16(gre_v->c_rsvd0_ver); MLX5_SET(fte_match_set_misc, misc_v, gre_c_present, -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-12 22:06:59.048458368 +0000 +++ 0011-net-mlx5-fix-GRE-flow-item-translation-for-root-tabl.patch 2024-11-12 22:06:58.651306951 +0000 @@ -1 +1 @@ -From 25ab2cbba31d937e685f0cf9ecce0c680cc4083e Mon Sep 17 00:00:00 2001 +From c4c995ba7b5dd12cb8084a6e6b3afcc7f3ec464d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 25ab2cbba31d937e685f0cf9ecce0c680cc4083e ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 040727f2e8..dc5263ace3 100644 +index 8267bf9ffa..4e0ed4415f 100644 @@ -24 +25 @@ -@@ -9830,22 +9830,23 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item, +@@ -9108,22 +9108,23 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item,