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 984194624E for ; Mon, 17 Feb 2025 18:06:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F72A400D6; Mon, 17 Feb 2025 18:06:41 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 1D28F400D6 for ; Mon, 17 Feb 2025 18:06:40 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-439846bc7eeso7289375e9.3 for ; Mon, 17 Feb 2025 09:06:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812000; x=1740416800; 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=8N6vOIA5e41KSlY9Ym+xcqGFSfXtXHBz00xxHcnu1Bg=; b=md9fMcjs1381B02UtTfv48wQoLl4xPrmJN0sCDEh/uJQly7yRY9Y7MsKvS/volJawq uPpYhWoxyR56FF19ok/AlU9Jey0LHJm0pyi5sL6Q7tKINJZTPfYWDBZJX2bkWeEJHxf4 T3w68Lh1Qw+w1CupxfGVIOLSynUUjgqwMJ8sFxifNd+VuR8EgUFJunHOEzBpR7WIijf1 jm0v+mCGX3i0I9nnsd4eI8/OK32tzfL1j015soHEgjzDxUYjAl2Y5MTYLkpgrnHxxykp Wn88mbznnWOXYTqwDjxQMSYbxz30LmiIk/qyYN26EGFYAVaHW7ufG3GMrbGrx5YUMUQn JZEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812000; x=1740416800; 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=8N6vOIA5e41KSlY9Ym+xcqGFSfXtXHBz00xxHcnu1Bg=; b=uOxxiWGJCHfYlv7ykrTQCwOymfKlumdegREFwahuVSz0sDjqEkQguhAbyjotn5V1eP +0q92K6jXe9x8rNeqRMPopt+yLjq5rCrptY6muvuvW+HxZa6+Y/YMnKPER0su/kfVYH9 GsN5rNhFjUOdzQFD2I0D0m1ObosoAlLDTKsvz4vL5o+fJlrkGh/mBEg1KJ5xO/Jh1zS1 PiRlQQiBMLs8FBu9Bwl2uFg4727KATVcbOvsssRFqlY769VqYcECAP2fcL7z51ahzTO5 jjj8cBikhsXVVYj1xntAH2Q0deVcsjQMDea6rKGFWMvo+6QTb6kvtGBLoLSOHVCPBX09 nLZg== X-Forwarded-Encrypted: i=1; AJvYcCUPZiMg98AMMec55R6jNRzAE7AFXP4KxFkwQKaQ3Q18qysVq/SIeV5v/lROGZA1562D5c6agOg=@dpdk.org X-Gm-Message-State: AOJu0YxpkIesHbBpP+T3dpCGqtdl893a9sX+gpX+FOf9C8RrwiD/GaiI g3xY5CDdBq35ykRR72Ojq3z5y1DaCHxsNDWyu8krpHI7q8dDyXi+ X-Gm-Gg: ASbGncsFB2s2oB5eOhUEbUFIzRi186FXpecTOaFzf+lsMkbDrA+fLSOgObYLgfWjCrX ITQZerQ2XUWmzjFJS0gqpJOLZcpLuc3qoMT98HHHyWqwgEICbQKbpL9MXLZuVwKHDteoM+b/j/D 8+OzsnCUUf101RWywX23QwGpMEOKlBfwAxJl3At8PivCFMylGnWeFrqFrUU6okXDJiXc65DO00x jyGGfyDSC9KkSBJPm5BMlu1MAx3EsKZNkxg/1+5GnaMO12y9a90ZPjvGOLhpTIPu3ynGzXKLMbh 0PR1d6JjJInIC/Qp/E4egw== X-Google-Smtp-Source: AGHT+IHjWqSUZVK9H0xBmVrRV2LhUaY3l6Po2AQW+B8ZQPsrdMtWHk+42xpgvwJt4kp+9sWsc+vFYQ== X-Received: by 2002:a05:600c:46cd:b0:439:9274:81db with SMTP id 5b1f17b1804b1-439927483cbmr1654385e9.5.1739811999306; Mon, 17 Feb 2025 09:06:39 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43984dd042fsm33647055e9.12.2025.02.17.09.06.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:06:38 -0800 (PST) From: luca.boccassi@gmail.com To: Maayan Kashani Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: adjust actions per rule limitation' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:04 +0000 Message-ID: <20250217170456.1068278-31-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-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 02/19/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/30ea2c29d16d0858e3032746492974494400763a Thanks. Luca Boccassi --- >From 30ea2c29d16d0858e3032746492974494400763a Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Tue, 28 Jan 2025 09:54:03 +0200 Subject: [PATCH] net/mlx5: adjust actions per rule limitation [ upstream commit ab54e17fe2f5207d7b988d568344570e156551ad ] HWS implementation added a limitation of 16 actions per rule, which was incompatible with SWS limitation of 32 actions per rule. Changing the hard coded limitation in PMD to 32. Fixes: f13fab23922b ("net/mlx5: add flow jump action") Signed-off-by: Maayan Kashani Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow.h | 2 +- drivers/net/mlx5/mlx5_flow_hw.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index fb2eb05c06..eb7040ee4d 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1282,7 +1282,7 @@ struct mlx5_hw_modify_header_action { }; /* The maximum actions support in the flow. */ -#define MLX5_HW_MAX_ACTS 16 +#define MLX5_HW_MAX_ACTS 32 /* DR action set struct. */ struct mlx5_hw_actions { diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 047af4a0c9..42d5d6ada6 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -12,9 +12,6 @@ #if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H) #include "mlx5_hws_cnt.h" -/* The maximum actions support in the flow. */ -#define MLX5_HW_MAX_ACTS 16 - /* * The default ipool threshold value indicates which per_core_cache * value to set. -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:17.955092501 +0000 +++ 0031-net-mlx5-adjust-actions-per-rule-limitation.patch 2025-02-17 16:13:16.822441593 +0000 @@ -1 +1 @@ -From ab54e17fe2f5207d7b988d568344570e156551ad Mon Sep 17 00:00:00 2001 +From 30ea2c29d16d0858e3032746492974494400763a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ab54e17fe2f5207d7b988d568344570e156551ad ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 93c2406abc..445c9cdb4b 100644 +index fb2eb05c06..eb7040ee4d 100644 @@ -25 +26 @@ -@@ -1583,7 +1583,7 @@ struct mlx5_hw_modify_header_action { +@@ -1282,7 +1282,7 @@ struct mlx5_hw_modify_header_action { @@ -35 +36 @@ -index 2b62711413..501bf33f94 100644 +index 047af4a0c9..42d5d6ada6 100644 @@ -38,3 +39,3 @@ -@@ -21,9 +21,6 @@ - /** Fast path async flow API functions. */ - static struct rte_flow_fp_ops mlx5_flow_hw_fp_ops; +@@ -12,9 +12,6 @@ + #if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H) + #include "mlx5_hws_cnt.h"