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 EE28243C60 for ; Thu, 7 Mar 2024 02:37:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E7CB642F2D; Thu, 7 Mar 2024 02:37:50 +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 C8BE442F43 for ; Thu, 7 Mar 2024 02:37:48 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-412f1fc5613so3662385e9.2 for ; Wed, 06 Mar 2024 17:37:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775468; x=1710380268; 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=PMLDz586CVUGJGugy3krtUUnv7QwefZKk/eachilCsc=; b=TSGPIQ5WuYu9D5glHwsqHthPX9S3Xs210H1qnsNY5TyKiYUemAkbV6F6b5/13UGkkP Cz+wGgZAffPPTUCPpSRBmte+NBCJfLQeUmig+TzTqrmdIptGZ0PL/USeEcNJ0D10zwjv L5v/CeUNVUOSG5V3GbYqsmFadA757p+5xbt2pC4GHXO8WMsaSbhv93zBBvF/mcS1GBNG Sh+KXY4eZO7i29GH/D5lq5sZmy3LRUTbyXnOEmsWt5PgCE0jTNhKQnt6xTPgmFTY76BP H8xDE9iNy0wYnJ7xofdQOrrxzRwyKzyJVa04AxggI7X/ckun6wSy7wmBce2KsUDwo2wi 0mQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775468; x=1710380268; 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=PMLDz586CVUGJGugy3krtUUnv7QwefZKk/eachilCsc=; b=eLCVuUEkfQzMnvGAFHh2qI7y7Ab1r58XTMLJwSSNuQGvQ+VjWJXv8dQjA/Q06ebfmY yzG463thpKdbVuV1VCyirAjtUb+GfTl2lqje+4Ci2IB0fk5TCnp4UWjt1QVGtPsVyq4z 6tOOJMQ1sTo7PhrTiJKGVKj6yndjcUcLVH+AyHmNzxFlTLMBCjxoITmkIGmL4QZCLbm+ zOdIJuKXrye4BSVcs4yWPVm1tBhxZkKdOq/ayZ+oK6qITkm9NRMgu02zkBPWK4hUl3wV ODt0YhMHjjR62ClaU1hfiKIXsqv7BhGjRzKmq1E6K4MeQHisEHT77nj19Ag/+jdVkQCK THng== X-Forwarded-Encrypted: i=1; AJvYcCWNaDywAQqZcipxwyAt2HG+xwoPoHALzIey/TZLP5/N22pFbf1/bnN7dIQEA/z41Qy7BUJLYE5LgvHowprM2lU= X-Gm-Message-State: AOJu0YyA2Xixutg6bVyDdvQai7Npa0IFuz9xPsR0xxMi3dMSxfqYCqgI xkHmk4uJmGlh0ikO4MDZkaaQDXGsUCn8PwWRRd1IqXa06oHcqhgx X-Google-Smtp-Source: AGHT+IFquOS0+qpMfljU5SDNgOhELbV+GnyM+zqQ41BcaR2wBgJodrx1TQcOEX2zY4GSveUYk2L0EQ== X-Received: by 2002:adf:f7d2:0:b0:33d:6ede:1149 with SMTP id a18-20020adff7d2000000b0033d6ede1149mr11802950wrq.35.1709775468408; Wed, 06 Mar 2024 17:37:48 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id az23-20020adfe197000000b0033e4403c6a9sm8185629wrb.22.2024.03.06.17.37.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:37:48 -0800 (PST) From: luca.boccassi@gmail.com To: Michael Baum Cc: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: remove GENEVE options length limitation' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:56 +0000 Message-Id: <20240307013159.1735343-99-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-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/09/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/37b1f135bfe4e706eb62bd5f167624fd4d148d24 Thanks. Luca Boccassi --- >From 37b1f135bfe4e706eb62bd5f167624fd4d148d24 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Thu, 25 Jan 2024 15:30:24 +0200 Subject: [PATCH] net/mlx5: remove GENEVE options length limitation [ upstream commit 48adbc80ba650aab12c00a7545cc33daff83976a ] GENEVE header has field named "opt_len" describing the total length of all GENEVE options in 4-byte granularity. In SW sreering implementation, only single option with single DW data is supported. When matching on GENEVE option data is requested, matching on "opt_len" field is added according to given option length. This behaveior assumes that only packets with single option can be matched, but it is wrong, packet with a few option can be matched but only one of them can match its value. This patch removes the "opt_len" matching unless user ask it explicitly. Fixes: e440d6cf589e ("net/mlx5: add GENEVE TLV option flow translation") Signed-off-by: Michael Baum Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow_dv.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index a566e61f49..ccb760cdf6 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9608,7 +9608,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key, const struct rte_flow_item_geneve_opt *geneve_opt_m; const struct rte_flow_item_geneve_opt *geneve_opt_v; const struct rte_flow_item_geneve_opt *geneve_opt_vv = item->spec; - void *misc_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters); void *misc3_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters_3); rte_be32_t opt_data_key = 0, opt_data_mask = 0; uint32_t *data; @@ -9627,21 +9626,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key, return ret; } } - /* - * Set the option length in GENEVE header if not requested. - * The GENEVE TLV option length is expressed by the option length field - * in the GENEVE header. - * If the option length was not requested but the GENEVE TLV option item - * is present we set the option length field implicitly. - */ - if (!MLX5_GET16(fte_match_set_misc, misc_v, geneve_opt_len)) { - if (key_type & MLX5_SET_MATCHER_M) - MLX5_SET(fte_match_set_misc, misc_v, geneve_opt_len, - MLX5_GENEVE_OPTLEN_MASK); - else - MLX5_SET(fte_match_set_misc, misc_v, geneve_opt_len, - geneve_opt_v->option_len + 1); - } /* Set the data. */ if (key_type == MLX5_SET_MATCHER_SW_V) data = geneve_opt_vv->data; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:43.136092872 +0000 +++ 0099-net-mlx5-remove-GENEVE-options-length-limitation.patch 2024-03-07 01:05:35.102946468 +0000 @@ -1 +1 @@ -From 48adbc80ba650aab12c00a7545cc33daff83976a Mon Sep 17 00:00:00 2001 +From 37b1f135bfe4e706eb62bd5f167624fd4d148d24 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 48adbc80ba650aab12c00a7545cc33daff83976a ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index c31f726edb..4f8062d0ab 100644 +index a566e61f49..ccb760cdf6 100644 @@ -32 +33 @@ -@@ -10104,7 +10104,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key, +@@ -9608,7 +9608,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key, @@ -40 +41 @@ -@@ -10123,21 +10122,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key, +@@ -9627,21 +9626,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key,