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 9DC4A46A9C for ; Mon, 30 Jun 2025 14:26:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5414540654; Mon, 30 Jun 2025 14:26:03 +0200 (CEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 2CE354064E for ; Mon, 30 Jun 2025 14:26:02 +0200 (CEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-3a54700a463so2620884f8f.1 for ; Mon, 30 Jun 2025 05:26:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751286362; x=1751891162; 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=fkbf0HJsVUJC1aP/GkgDg87Iz7O0W+nv9V4U7mOn3SQ=; b=jWK3CZo0ixx9rIbrofECetDe8EwCHSh79aM+Cd6YXoARmaq6aeAmQRrfp1PPTbYCSg PFeRN6NYUj2gHJkrtIlSMi4q+VYo84l3sjpFWmi75c1hocicLWzsBY91AfHER0MYKJju g7sKrzmm/fryz2g5xRonrUzp7/bkkSQjrvJKRLpoUApzy2c2uiaqRWcNu5R7cGLMsbq0 drPRtKSl5pUQZZtpKLnmVoFj6ksLwrj+2f3Pf89tu7v52FjaCcZeIcdML/HfpJsTprzz 5ea6qeqndncMWGyuuPA/zt/9+YLepHmYOKZfNcTeci+uQ4UbitvhiNmndJ5/Wqgq2FW9 Jxrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751286362; x=1751891162; 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=fkbf0HJsVUJC1aP/GkgDg87Iz7O0W+nv9V4U7mOn3SQ=; b=OgR5ZS137xbIOs7Zoz8v+h4xFpTP1sN5INtiFjbt6UtK6/EhhuyZTW90G1f+N8rAb8 F6VzTq1/dO8U0Dg0RIHV5C8HQJs57FYHhZtX8w1gtu2PCOt5vNzKexmV2SB1d0xpPhlE GoSYqD/4xxmhGcM6727e3W1jWRG7vYTaritvB/zG8/5ruYJKMgh7YMJ2innPyOBSQxzu A96AUp1Yd9myMC589GW7bvGVPEIgMW7aHUtFfY4QvO+Yvi1vrbeHJdlJburciJMCD8ab jG/qairHZ5xqDlEQ9eijJSI/dRuM6K3yLrFc6s6JOM9pt0aOmEGHr6jV46lhJrvpVVon 0yxg== X-Forwarded-Encrypted: i=1; AJvYcCUmGC3CJtDBBctxlOMf7Pr1Ka66dVL6pet0gYCpoFFq4un+IH6b8hgph0+oF+s2E9Lhy8qM4DU=@dpdk.org X-Gm-Message-State: AOJu0YyWBzGc6I0oKEl/6Ug7Vi1CZPuAzXBN+L+WRKcsPl/GZafrWeIV DgVs8JE13yhKzsTBgBfz2onJZoGP2k5XzUUWttcgW849QiMI1Ka58u6y X-Gm-Gg: ASbGncvuKDFNvdJuIVvFSEj2JjZO7dhWUBI41jRKeFk2tUO8JK6woDt2j9N20Gchn/4 E/pcsRbqwo563MlZKHWPV598UekUG1hvdx4MUttpTXNmEcV3T0WmzrMsTrW2vc+bUlupAfs/prO s5ZgRfE4FmrMFn1Njaxtr3tXTvEfPZJFxZseMI+Fw4OaoO0UbQzquOXkkr31VKS79Co8EBCygwJ jKkjhGIwvzBbATAhaHN+waH91Y6l8qkiB4iUL2w1LLzbK659p8PaJIM228b47R+9WlC/2GYPCeS jNFK54PHhPDb6/oI2qmQL0nyLTyW55dtcaSSWqI7vDQg37pGLH9mrh9rsxRRmmsslfI= X-Google-Smtp-Source: AGHT+IHS17lKsqPukqZbSdZZbjVvx+hDEIQ7GU3Af6GfRVUUA/LY01tf8ZJAHqdjWqKgEktNATk5Lg== X-Received: by 2002:a5d:64e5:0:b0:3a5:7991:fd3 with SMTP id ffacd0b85a97d-3a9802974e2mr10922463f8f.11.1751286361329; Mon, 30 Jun 2025 05:26:01 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:ded1:f637:68f:c2a6]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a88c7e6f8bsm10634391f8f.17.2025.06.30.05.26.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jun 2025 05:26:00 -0700 (PDT) From: luca.boccassi@gmail.com To: Bing Zhao Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix WQE size calculation for Tx queue' has been queued to stable release 22.11.9 Date: Mon, 30 Jun 2025 13:25:33 +0100 Message-ID: <20250630122556.1133654-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250630122556.1133654-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-72-luca.boccassi@gmail.com> <20250630122556.1133654-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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/02/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/1bdb2fc21a4b7cba3a9cec69357a4136eaca243b Thanks. Luca Boccassi --- >From 1bdb2fc21a4b7cba3a9cec69357a4136eaca243b Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Fri, 27 Jun 2025 11:25:02 +0300 Subject: [PATCH] net/mlx5: fix WQE size calculation for Tx queue [ upstream commit 5c0c1a13c34aa57c6e18f9ba852a9b5807c58b72 ] The txq_calc_wqebb_cnt() should be consistent with the calculation in the function mlx5_txq_devx_obj_new(). Or when the input descriptor number is 512, the WQE size will be wrongly considered to be 30 when no max_inline_data is zero in some cases. The total number of WQE will be considered as 256 and that is incorrect. Adjusting the WQE size will solve the wrong calculation when the calculated WQE size is less than 64B. Fixes: 38b4b397a57d ("net/mlx5: add Tx configuration and setup") Signed-off-by: Bing Zhao Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_txq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 9869cd4577..62105a3e54 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -707,6 +707,7 @@ txq_calc_wqebb_cnt(struct mlx5_txq_ctrl *txq_ctrl) MLX5_WSEG_SIZE - MLX5_ESEG_MIN_INLINE_SIZE + txq_ctrl->max_inline_data; + wqe_size = RTE_MAX(wqe_size, MLX5_WQE_SIZE); return rte_align32pow2(wqe_size * desc) / MLX5_WQE_SIZE; } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-30 13:21:21.897658665 +0100 +++ 0003-net-mlx5-fix-WQE-size-calculation-for-Tx-queue.patch 2025-06-30 13:21:21.739057181 +0100 @@ -1 +1 @@ -From 5c0c1a13c34aa57c6e18f9ba852a9b5807c58b72 Mon Sep 17 00:00:00 2001 +From 1bdb2fc21a4b7cba3a9cec69357a4136eaca243b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5c0c1a13c34aa57c6e18f9ba852a9b5807c58b72 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 5db12f5c64..8ee8108497 100644 +index 9869cd4577..62105a3e54 100644 @@ -28 +29 @@ -@@ -709,6 +709,7 @@ txq_calc_wqebb_cnt(struct mlx5_txq_ctrl *txq_ctrl) +@@ -707,6 +707,7 @@ txq_calc_wqebb_cnt(struct mlx5_txq_ctrl *txq_ctrl)