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 AD8A4489EF for ; Mon, 27 Oct 2025 17:21:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A788840657; Mon, 27 Oct 2025 17:21:18 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id 2347C4064C for ; Mon, 27 Oct 2025 17:21:17 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-47103b6058fso35905865e9.1 for ; Mon, 27 Oct 2025 09:21:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761582077; x=1762186877; 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=GLOEbjyjQZ8XJwON0nIz6+OVdfwACh9YXcoOGPxg0v8=; b=ex63fgPhAB7Rp1PMRz4cKWeKhIIjsi0taInWkEfN9B18oV9Uh+BCmY4ax5ASp9Up0I JBfP7991nv/0IPvJq5zEC9hpsXP2ug86PXPIn5lKAcPYSRiN3Zvbujz0WfyK/nOLyHiQ jy4v+SGiLzKwE6aUt/dSw0KFL907iP4hP/dqi0vJ9pgXL18z/WKVELEAn3xClYVvDe9O hjvnAUQdPCT2ElMPK6C+kQMr5wq/NcWMKUe/azGiMeOl5kXMHj142j+CRIpn3pWM995z 91HMDi9JxBDrVLg0YSE8+0iEuOY557HjDD2/BrPTsUv6i2RQI/3LvKNBuO+ecyk0Kqai 7iOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761582077; x=1762186877; 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=GLOEbjyjQZ8XJwON0nIz6+OVdfwACh9YXcoOGPxg0v8=; b=nGYNrrHcus+3q2MvTfkApsyWeexnVhGsX425FE8d/fyQ9nhzxZgFTllvmrSfKV7Hgi v7OcfFMOfGoDOqKuYOaA3ZlT2O0LVMWacNV9c1GoBMouBgYoJ5LJl4zIqXB0Xiii574f e7TtH8WAZjtivKr8IL4Mv2ZSojFr2VHrhf9XmlXK5Yj8hNudCZSg4Y5ZFmfx4wHBC4GP 502xmaDD7otyTGI08/W2CEkBFUCVYbdun1s0RRm8Km+Ghr3GEI6tqwLMb5YoSYPiSQfk 7mE9jkLGrtBm0H56doyqvOuqe5gYwP5C4/QYggHsnjmk5caNSPJiTbf1mWxo44nUvtP4 1KIQ== X-Forwarded-Encrypted: i=1; AJvYcCWx3KIcYNMpZhe2823UxjuNyMRN5CWpCbTixgihVOPjp6GkOwJUTDLu4FzgqxS2zNU+i56p1GQ=@dpdk.org X-Gm-Message-State: AOJu0Yw9f6sV0c7uqr3AW6fhRAiaX/GzH5L+tNecDzPSbVZ5Z8y8YEf/ U7Epn6oBzDkAqO0ToEWdQaowVgfFnsjIuDf0KsI5RReX6zjwIK5WY3jK X-Gm-Gg: ASbGnctp+d3BpzXCNQthozJPUv8dDtL5ndrMdciem5Rn+xh9gdlu2RgPhVwxqfRd2PR Ju9IpCCf9FGxA7fQzaSaZDa6du2QkNe3zfyAvsVTcolMknuzoBq7DTuz4UsnH0D/DbAy6AJtm3g /U/gRc6dBhFT3mumsSJlNBjzn1r05NPg0SMfvz7gLHP1oTaxzlCq63+puTXKmLGcRife5rxzrVN ufpyaqvFOxWx+Axbr/SD3ZYRVP4uiwuCseOav4mAOfu3A/f9mMJTysPkH9ZUNGIiKhQyVz+BHyr UFZLBF1Row1kBRzn1LKQy0q2QXegkP7u0xB66aQ9EeCBM/nEDYC8lHorTPA4pNqCqjRsACKIYR4 IBs0jzm1xPS17Uib+7J9Ik3pWmxkV6Pe2raO6as67B98TIoz8wb+reX6pJcdZRUT0MGDFhrRAsb zmyHMSTCy1WyrnNQCaAQ19cvVWUD0= X-Google-Smtp-Source: AGHT+IHPSK0Q44g/e/qKgNligfybfFy0+zFZKu48RcwOXLb52PW6NiIqZXqjhKXdsSkiUcxa8MfWUQ== X-Received: by 2002:a05:600c:3d98:b0:471:5c0:94fc with SMTP id 5b1f17b1804b1-4771812e3bemr647795e9.6.1761582075225; Mon, 27 Oct 2025 09:21:15 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:6fc5:c3bc:147e:832c]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-475dd47853csm146566815e9.13.2025.10.27.09.21.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 09:21:14 -0700 (PDT) From: luca.boccassi@gmail.com To: Dariusz Sosnowski Cc: Bing Zhao , Raslan Darawsheh , dpdk stable Subject: patch 'net/mlx5: fix indirect flow age action handling' has been queued to stable release 22.11.11 Date: Mon, 27 Oct 2025 16:18:59 +0000 Message-ID: <20251027162001.3710450-21-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027162001.3710450-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/29/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/4d16e6e800843b5c4e5134d15a2a856dca6d56df Thanks. Luca Boccassi --- >From 4d16e6e800843b5c4e5134d15a2a856dca6d56df Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Tue, 19 Aug 2025 13:27:42 +0200 Subject: [PATCH] net/mlx5: fix indirect flow age action handling [ upstream commit 8bc72d9f277593f6d8b27278bad3a5bb92e7347f ] Indirect AGE flow actions can be created either through synchronous or asynchronous flow API. mlx5 PMD stores the queue used to create that action to support strict queueing. When action is created through synchronous API invalid queue index is stored instead. Whenever a flow rule is created with indirect AGE and direct COUNT flow actions, PMD allocates a HW counter for ageing that flow rule during rule creation. During allocation of the counter a queue index is needed to select a proper counter pool cache. In case when indirect AGE action created through synchronous API was used in that case, the associated queue index was used to select pool cache. Since queue index was invalid, PMD crashed. Counter can be allocated using the index of currently used queue and it does not have to match the queue used to create AGE action. This patch fixes the crash by using the index of currently used queue for counter allocation. This patch also adds missing validation for synchronous and asynchronous AGE flow action creation: - If strict queueing is disabled, only synchronous creation is allowed. - If strict queueing is enabled, only asynchronous creation is allowed. PMD documentation is updated accordingly. It also updates validation of synchronous query of aged flow rules in regards to strict queueing. When strict queueing is enabled, synchronous query is rejected. This aligns PMD behavior with API description. Fixes: 04a4de756e14 ("net/mlx5: support flow age action with HWS") Signed-off-by: Dariusz Sosnowski Acked-by: Bing Zhao Acked-by: Raslan Darawsheh --- doc/guides/nics/mlx5.rst | 4 ++++ drivers/net/mlx5/mlx5_flow_hw.c | 24 +++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index d2f741a472..e74c1d8e8d 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -1700,6 +1700,10 @@ applications are allowed to: This option is supported only for Tx hairpin queues. +#. With strict queueing enabled + (``RTE_FLOW_PORT_FLAG_STRICT_QUEUE`` passed to ``rte_flow_configure()``), + indirect age actions can be created only through asynchronous flow API. + Notes for testpmd ----------------- diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 7a8455baf6..5fbbd487de 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1886,6 +1886,7 @@ flow_hw_shared_action_construct(struct rte_eth_dev *dev, uint32_t queue, uint32_t idx = act_idx & ((1u << MLX5_INDIRECT_ACTION_TYPE_OFFSET) - 1); uint64_t item_flags; + uint32_t *cnt_queue; cnt_id_t age_cnt; memset(&act_data, 0, sizeof(act_data)); @@ -1931,9 +1932,8 @@ flow_hw_shared_action_construct(struct rte_eth_dev *dev, uint32_t queue, if (param == NULL) return -1; if (action_flags & MLX5_FLOW_ACTION_COUNT) { - if (mlx5_hws_cnt_pool_get(priv->hws_cpool, - ¶m->queue_id, &age_cnt, - idx) < 0) + cnt_queue = mlx5_hws_cnt_get_queue(priv, &queue); + if (mlx5_hws_cnt_pool_get(priv->hws_cpool, cnt_queue, &age_cnt, idx) < 0) return -1; flow->cnt_id = age_cnt; param->nb_cnts++; @@ -8469,6 +8469,14 @@ flow_hw_action_create(struct rte_eth_dev *dev, const struct rte_flow_action *action, struct rte_flow_error *err) { + struct mlx5_priv *priv = dev->data->dev_private; + + if (action->type == RTE_FLOW_ACTION_TYPE_AGE && priv->hws_strict_queue) { + rte_flow_error_set(err, EINVAL, RTE_FLOW_ERROR_TYPE_STATE, NULL, + "Cannot create age action synchronously with strict queueing"); + return NULL; + } + return flow_hw_action_handle_create(dev, MLX5_HW_INV_QUEUE, NULL, conf, action, NULL, err); } @@ -8640,6 +8648,8 @@ flow_hw_get_q_aged_flows(struct rte_eth_dev *dev, uint32_t queue_id, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "No aging initialized"); if (priv->hws_strict_queue) { + /* Queue is invalid in sync query. Sync query and strict queueing is disallowed. */ + MLX5_ASSERT(queue_id != MLX5_HW_INV_QUEUE); if (queue_id >= age_info->hw_q_age->nb_rings) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, @@ -8693,10 +8703,10 @@ flow_hw_get_aged_flows(struct rte_eth_dev *dev, void **contexts, struct mlx5_priv *priv = dev->data->dev_private; if (priv->hws_strict_queue) - DRV_LOG(WARNING, - "port %u get aged flows called in strict queue mode.", - dev->data->port_id); - return flow_hw_get_q_aged_flows(dev, 0, contexts, nb_contexts, error); + return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_STATE, NULL, + "Cannot get aged flows synchronously with strict queueing"); + + return flow_hw_get_q_aged_flows(dev, MLX5_HW_INV_QUEUE, contexts, nb_contexts, error); } const struct mlx5_flow_driver_ops mlx5_flow_hw_drv_ops = { -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-27 15:54:35.632116018 +0000 +++ 0021-net-mlx5-fix-indirect-flow-age-action-handling.patch 2025-10-27 15:54:34.771948947 +0000 @@ -1 +1 @@ -From 8bc72d9f277593f6d8b27278bad3a5bb92e7347f Mon Sep 17 00:00:00 2001 +From 4d16e6e800843b5c4e5134d15a2a856dca6d56df Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8bc72d9f277593f6d8b27278bad3a5bb92e7347f ] + @@ -42 +43,0 @@ -Cc: stable@dpdk.org @@ -53 +54 @@ -index 761dcad542..20056f61d6 100644 +index d2f741a472..e74c1d8e8d 100644 @@ -56,3 +57,3 @@ -@@ -2740,6 +2740,10 @@ With :ref:`HW steering `, - in addition to flow rules using only age (without count action). - - ``nb_aging_objects`` is the number of flow rules containing age action. +@@ -1700,6 +1700,10 @@ applications are allowed to: + + This option is supported only for Tx hairpin queues. @@ -65,2 +66,2 @@ - .. _mlx5_quota: - + Notes for testpmd + ----------------- @@ -68 +69 @@ -index 84f39c467e..c84ae726a7 100644 +index 7a8455baf6..5fbbd487de 100644 @@ -71,2 +72 @@ -@@ -3180,6 +3180,7 @@ flow_hw_shared_action_construct(struct rte_eth_dev *dev, uint32_t queue, - uint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET; +@@ -1886,6 +1886,7 @@ flow_hw_shared_action_construct(struct rte_eth_dev *dev, uint32_t queue, @@ -74,0 +75 @@ + uint64_t item_flags; @@ -79 +80 @@ -@@ -3230,9 +3231,8 @@ flow_hw_shared_action_construct(struct rte_eth_dev *dev, uint32_t queue, +@@ -1931,9 +1932,8 @@ flow_hw_shared_action_construct(struct rte_eth_dev *dev, uint32_t queue, @@ -89 +89,0 @@ - flow->flags |= MLX5_FLOW_HW_FLOW_FLAG_CNT_ID; @@ -91 +91,2 @@ -@@ -13142,6 +13142,14 @@ flow_hw_action_create(struct rte_eth_dev *dev, + param->nb_cnts++; +@@ -8469,6 +8469,14 @@ flow_hw_action_create(struct rte_eth_dev *dev, @@ -106 +107 @@ -@@ -13361,6 +13369,8 @@ flow_hw_get_q_aged_flows(struct rte_eth_dev *dev, uint32_t queue_id, +@@ -8640,6 +8648,8 @@ flow_hw_get_q_aged_flows(struct rte_eth_dev *dev, uint32_t queue_id, @@ -115 +116 @@ -@@ -13414,10 +13424,10 @@ flow_hw_get_aged_flows(struct rte_eth_dev *dev, void **contexts, +@@ -8693,10 +8703,10 @@ flow_hw_get_aged_flows(struct rte_eth_dev *dev, void **contexts, @@ -128,2 +129,2 @@ - /** - * Initialization function for non template API which calls + + const struct mlx5_flow_driver_ops mlx5_flow_hw_drv_ops = {