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 D939C46423 for ; Wed, 19 Mar 2025 15:22:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CFFFF4060C; Wed, 19 Mar 2025 15:22:10 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 9361D402E1 for ; Wed, 19 Mar 2025 15:22:08 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-390f5f48eafso4439725f8f.0 for ; Wed, 19 Mar 2025 07:22:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742394128; x=1742998928; 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=F9bduIePzGO/EoY5QKsE4NZ8iuz8ijZPBEnJtnQRxns=; b=VD8k7XD8RQLr3JSJwCz3n0uMnCsOMDU6uBDsR/Yv6imaMEVrGmOMkvlhnqj+AECb0A 27TSobtTYioNZ1s3b0vqZGFWCXbCIPIfOBnrrEAYcvCONIT3d09UMsWkkE89AEecttKG la2XYZsD7IRIUL2L4eornUjvniSVFGlnrBlEw5qJdgPrsrg7Bx/diSYbQ2TY+E7Lc0vf FCHwn3CrTXKCvXN/zHyF3yhxGo7S8bGlPj8wAa+LWUNgdI/fio+AeqfH9hJtxhu+9ThE kkbfTU8ZTFjW+QKDYlgZw+haweBcTbf7ktl3FB9S/sPNSJ+qD0xoGAs6j8YYGlJ5+IuI 9xyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742394128; x=1742998928; 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=F9bduIePzGO/EoY5QKsE4NZ8iuz8ijZPBEnJtnQRxns=; b=t0fKZrU9kY8xxtn053wrzmSXgi7nvQYMHia5ddX1j28vwrICgBUyMOCQkJ/WruzjE9 b988Zl+G5LR+M9IbEkNWXD+M4xuLcqNnrAwDHgx0Brq/AW2btuydXrM9jbxioK0jKPNM WXQ6+o4xu9lkzQxQ5kvKjsUQNftp7203JjAiWtRSciCxtbqpEVeeQpeVI9eHpta6Mwaf cugj+lA5+lh91RkNEu4sW1EQGi4afoTk37CpFdrO5Hk4PcqN26O4dy+Cp0rqr5TCOWm+ a7CmsLgPPZEniQ4JDHBxauVn169lprsg6kij8b8MHO5SEegTOSjWPQmDyVKszXsd0XwJ wxJw== X-Forwarded-Encrypted: i=1; AJvYcCWbvwixauOKgP4UyIQQ/9eJyxrarxw7IbVai4w2NpnozKf8z39BU+las/q2U1brpwuK06ukeoI=@dpdk.org X-Gm-Message-State: AOJu0Yyxl2iBlwuF5bXI4hBii3Q3K8wt9F+4elA6p7JokGssFIkRzJnh 3uw8yHAQ5/8JuRog2Q2rqvoU4xRCA9/jjrW3H0uLDWaOCBN6/A4KVo5krQ== X-Gm-Gg: ASbGncsy8jVtfT+mjtMnG0N9ZIHtlkXiBFdtHqxBxE9GscGCpJz/Zc1wEnAYFEDIsz7 ot5RLlKo/BiZ61YXf2GaWAG6RLOP0R8y4JtcZj5ezYhcBfIj6n8i2TybV0L9OQqykiADs4sMXut ll7amBxJ6KnkbOImRwL4zON4XKYlTbhHo4FCforDxUOLqOnL6zcJSMHUhNHP+92VCA+laA5jWvs r2uIRzwNqDN34lQNIrWx1gd+snyGzjVghLgR0/TZHcLOxCN7mzN+2yWa5/Yn3VQcGIWCK/k7Aj2 K+jTZr1eN07U/YpPFsBh1CLuRDIqLvHgvOfqXUYVjPK8jrzzzGQhDQecHABaCw== X-Google-Smtp-Source: AGHT+IEKlTxrHWOk4CRLbIqdlwS+UorFv6UXAxZQDxnxaQJhS/ANXTacepnekyiqyT2mJGkmoqV+mA== X-Received: by 2002:a5d:5e10:0:b0:391:4b8e:a200 with SMTP id ffacd0b85a97d-399739ed8dfmr1997150f8f.32.1742394127939; Wed, 19 Mar 2025 07:22:07 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:4eab:5a5d:ba39:287e]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-395cb318a5fsm21469971f8f.79.2025.03.19.07.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 07:22:07 -0700 (PDT) From: luca.boccassi@gmail.com To: Maayan Kashani Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix GRE matching on root table' has been queued to stable release 22.11.8 Date: Wed, 19 Mar 2025 14:21:20 +0000 Message-ID: <20250319142142.439602-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250319142142.439602-1-luca.boccassi@gmail.com> References: <20250307122431.1415551-28-luca.boccassi@gmail.com> <20250319142142.439602-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.8 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/21/25. 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/096ff17860629ded561311306476ef7b59a0c4a6 Thanks. Luca Boccassi --- >From 096ff17860629ded561311306476ef7b59a0c4a6 Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Wed, 12 Mar 2025 13:23:48 +0200 Subject: [PATCH] net/mlx5: fix GRE matching on root table [ upstream commit 111bde25455114e1d4ad843e7b3a03c5ffd6eca5 ] The current implementation sets a gre mask with protocol masked in case the user did not supply the protocol mask. In template mode, for group 0, the gre translation was called once with the mask and later with the value. with gre open matcher(mask/value is null) default values were assigned gre protocol mask=0xffff and gre protocol value=0. Therefore gre packet with protocol value not equal zero, will not match the rule. Changed the default protocol mask to be zero instead of 0xffff. In case of empty gre match, this fix will ignore the protocol field matching, gre will only be matched by the IP next header field in previous header in packet. Fixes: 25ab2cbba31d ("net/mlx5: fix GRE flow item translation for root table") Signed-off-by: Maayan Kashani Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 2cc7376669..73f047e41b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9121,7 +9121,7 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item, /* HWS mask logic only */ if (key_type & MLX5_SET_MATCHER_HS_M) { if (!gre_m) - gre_m = &rte_flow_item_gre_mask; + gre_m = &empty_gre; gre_v = gre_m; } else if (!gre_v) { gre_v = &empty_gre; -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-19 14:20:57.415408480 +0000 +++ 0009-net-mlx5-fix-GRE-matching-on-root-table.patch 2025-03-19 14:20:57.081289241 +0000 @@ -1 +1 @@ -From 111bde25455114e1d4ad843e7b3a03c5ffd6eca5 Mon Sep 17 00:00:00 2001 +From 096ff17860629ded561311306476ef7b59a0c4a6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 111bde25455114e1d4ad843e7b3a03c5ffd6eca5 ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -33 +34 @@ -index 8703403b8f..608c42db1d 100644 +index 2cc7376669..73f047e41b 100644 @@ -36 +37 @@ -@@ -9856,7 +9856,7 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item, +@@ -9121,7 +9121,7 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item,