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 7855445C9B for ; Tue, 12 Nov 2024 23:08:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F09340673; Tue, 12 Nov 2024 23:08:44 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 6577B406BB for ; Tue, 12 Nov 2024 23:08:43 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4316e9f4a40so53921135e9.2 for ; Tue, 12 Nov 2024 14:08:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731449323; x=1732054123; 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=kRffg1vZhcdby98oqYiZ/YKWtuu7zFatPVtvAIf9rKs=; b=QDzZByvsRbSbxxDamYkUpxvegt3VRDO3/QzqIpkogKp8lgfnbcEz/oFFXRvmYJEf8B vm2Fzq4LzvKTXSdfVJGWSlAhdkbtArFEJhFy/CJ2IzSPMIYraFaGmiGekN0tcaNfIzLW YtBI4lsNfmsQxY7uh8w+akBzo4QQjeYr7ChICyIG25xhPjljPt2JJHuSTHAvBQo9zS45 kiuXYIHSo7PRcBxWqP4j9apEnrrQOeDluQH/lqY0wsh4OYenzvb/ydzZ5/3td0xblV84 vgFVX8CD2jvRH2eyfXALuRopPtaJC3kGFZ9Cs2xHU1cLj5hWyUP+8IWHFkxSZ8pPdfXO 9Pxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731449323; x=1732054123; 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=kRffg1vZhcdby98oqYiZ/YKWtuu7zFatPVtvAIf9rKs=; b=uzdeOqHozSYFfevN8TDnOiA2FlosfdNt78V+EjB4CuYgihPhM+bSqfT2skrjSMexS4 DJsOyzHJ5sbtnnAKnaTt2/r2YCB4OIN3rcOxQAUMjmeOcxS5Iwqvdl1Za3DVk5rD3isq GO7UqN88NGytZzrBn/BhulTH6k5jkPuzkv+4wvWSsPqonO5dijUNmJ//iNkKzbs+u7CV EddCViIhdlmZCebjgyYPhr2VCqnuAJernYG0uDNJy4pkqQYJaC14OjM8IqFi/SIDNi0m idVXhFNM0uIo7O/Xxm2rEbInnNDBNObnWHjjwpGhvNySwDZeBXn5xnGoR3FIT0WZFlKe 3AIA== X-Forwarded-Encrypted: i=1; AJvYcCWyx+DY+G1Z7nlbsUcxcuXuO6m3Kup2V8uJZRjpxm2KkJNQQNPnb6id3oMkHH8g0+KJ7UwFkm8=@dpdk.org X-Gm-Message-State: AOJu0YztHh4jmn5++fYGRjTtGIxYj5cPqx6+QzUp5+JOYxzMYcqz20s7 /NrIZd+nzE+shrGpWklYx/CC7p8gkCOgOPscodnm5Ci4Ra9zPR3D4r7UaQ== X-Google-Smtp-Source: AGHT+IEGmwa1be2KiMUrocZtECUGgZHCc+cbUhhTYc4zxuPveqhaYrlwYwJ/pAENpKPRlidq5HxK0A== X-Received: by 2002:a05:600c:4445:b0:431:3933:1d30 with SMTP id 5b1f17b1804b1-432b74fa9ebmr145869735e9.5.1731449322850; Tue, 12 Nov 2024 14:08:42 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:e89d:e9a1:da72:2f9d]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432d552de37sm885495e9.42.2024.11.12.14.08.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 14:08:42 -0800 (PST) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix SWS meter state initialization' has been queued to stable release 22.11.7 Date: Tue, 12 Nov 2024 22:07:23 +0000 Message-ID: <20241112220754.666489-13-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/602cc6b95d5aa91bfc977f0fabbb81d9899f7361 Thanks. Luca Boccassi --- >From 602cc6b95d5aa91bfc977f0fabbb81d9899f7361 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Sun, 27 Oct 2024 17:31:36 +0200 Subject: [PATCH] net/mlx5: fix SWS meter state initialization [ upstream commit 0c37d8f7ba2cac289896de024d9c58a65ba3ece9 ] Update the state initialization for SWS meter objects to properly monitor ASO object availability. The PMD uses the meter 'state' variable to track whether ASO objects are available for use. This ensures that the SWS meter object state is correctly initialized, allowing the PMD to accurately manage ASO resources for metering functionality. Fixes: 4359d9d1f76b ("net/mlx5: fix sync meter processing in HWS") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_meter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index 1078d6497d..0ffe738ec5 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -1636,6 +1636,7 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv, if (priv->sh->meter_aso_en) { fm->is_enable = !!is_enable; aso_mtr = container_of(fm, struct mlx5_aso_mtr, fm); + aso_mtr->state = ASO_METER_WAIT; ret = mlx5_aso_meter_update_by_wqe(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr, &priv->mtr_bulk, NULL, true); if (ret) @@ -1886,6 +1887,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, /* If ASO meter supported, update ASO flow meter by wqe. */ if (priv->sh->meter_aso_en) { aso_mtr = container_of(fm, struct mlx5_aso_mtr, fm); + aso_mtr->state = ASO_METER_WAIT; ret = mlx5_aso_meter_update_by_wqe(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr, &priv->mtr_bulk, NULL, true); if (ret) -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-12 22:06:59.119033707 +0000 +++ 0013-net-mlx5-fix-SWS-meter-state-initialization.patch 2024-11-12 22:06:58.655307014 +0000 @@ -1 +1 @@ -From 0c37d8f7ba2cac289896de024d9c58a65ba3ece9 Mon Sep 17 00:00:00 2001 +From 602cc6b95d5aa91bfc977f0fabbb81d9899f7361 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0c37d8f7ba2cac289896de024d9c58a65ba3ece9 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 98a61cbdd4..233b140785 100644 +index 1078d6497d..0ffe738ec5 100644 @@ -27,2 +28,2 @@ -@@ -1914,6 +1914,7 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv, - if (sh->meter_aso_en) { +@@ -1636,6 +1636,7 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv, + if (priv->sh->meter_aso_en) { @@ -32,4 +33,4 @@ - ret = mlx5_aso_meter_update_by_wqe(priv, MLX5_HW_INV_QUEUE, - aso_mtr, &priv->mtr_bulk, - NULL, true); -@@ -2165,6 +2166,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, + ret = mlx5_aso_meter_update_by_wqe(priv->sh, MLX5_HW_INV_QUEUE, + aso_mtr, &priv->mtr_bulk, NULL, true); + if (ret) +@@ -1886,6 +1887,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, @@ -40 +41 @@ - ret = mlx5_aso_meter_update_by_wqe(priv, MLX5_HW_INV_QUEUE, + ret = mlx5_aso_meter_update_by_wqe(priv->sh, MLX5_HW_INV_QUEUE,