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 CA759A00C2 for ; Thu, 3 Nov 2022 10:30:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BDB9B41145; Thu, 3 Nov 2022 10:30:46 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 4BC4140693 for ; Thu, 3 Nov 2022 10:30:45 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id k8so1757616wrh.1 for ; Thu, 03 Nov 2022 02:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=Mxak91c17BueroJTshbbP9663RWgj9BWI198FmpFTGs=; b=AfKChSPSjTd1GJDFE4UGggpkzKjAh3q5K6nL1tCYEnqc8nWnLf8nTkNKzUihAd8VLz Er2gbf+P2eCE5Js1BHtKAYvB1SEJOX9iV5AI1ZalqkSed8PmZ1/aV4+uef/5QHAkBVMr JLfo+Teo6IW4eiZVYHAiZEl9JlG642RfloYXX4fovTIhYX/zj84NunGKu6z5BDySS3QX 6DiopMDpx5VFb+xEfR/iAber6OnprqguJ1o/DQ+On39bx6UCkCS/FFf+fr6XTHQ+mmNY eqpo/3e/8c4V59zbV/aK88fVIS+JjTzMqd4NH5NvbjeOsuR3Ni2C6srtfNbOmObQrdXZ ZceA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Mxak91c17BueroJTshbbP9663RWgj9BWI198FmpFTGs=; b=Rqr458QBXo5QnQF5ENh91VN0XeSQoZaVUzCns7Wdgv5FdHMobtXk75kefkIb/qRIkK 5JkkE3ODgvEj/eir9bkR3BQZJm1e6+Wl/4ZXo/nQiCDutKbibUERT0YTVX7PFpFK7p5m A8nkGzJ5WsZyQ74VIGgecIEkGqkVdwVBQKsKdel1IOquRqNDiwXy7daUykfYE+tV8Mf/ LP71zY0dmqWmRhqAXs1XXWmRzxUo9N5upf2nPAcmYXqSAxEWWT+GR9oYlGVO5XopkaMQ n1OQr6miu6uncV1ynXtnFXVN8E/k52tQJjWX4HWDOtmUAnMuwowHWpwRsQHxDDv2fzF7 d74g== X-Gm-Message-State: ACrzQf1k/J/bO9xd/g8gyWBA5jIfOTY3VdStih4DvrZlkjwgxFfNk5ul Kvidqlk1caPSODnpT0uZisYJ0EQSUjKgrRoN X-Google-Smtp-Source: AMsMyM6H1ZxlWouDhQFgKGiFm+EHEXop8+KbHG4TMWTphkQl24rhnR1X+MjH0y7N4p9ccp5LL8gI2w== X-Received: by 2002:a5d:59c3:0:b0:236:ce27:186b with SMTP id v3-20020a5d59c3000000b00236ce27186bmr12353554wry.80.1667467844977; Thu, 03 Nov 2022 02:30:44 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id v3-20020a1cac03000000b003b47e75b401sm4399100wme.37.2022.11.03.02.30.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:30:44 -0700 (PDT) From: luca.boccassi@gmail.com To: Raja Zidane Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix Tx check for hardware descriptor length' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:27:05 +0000 Message-Id: <20221103092758.1099402-47-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-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 20.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/05/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/9cf325e6a17aee9a1949b312e0899c60d61cdd20 Thanks. Luca Boccassi --- >From 9cf325e6a17aee9a1949b312e0899c60d61cdd20 Mon Sep 17 00:00:00 2001 From: Raja Zidane Date: Wed, 17 Aug 2022 17:14:33 +0300 Subject: [PATCH] net/mlx5: fix Tx check for hardware descriptor length [ upstream commit 130bb7da53ddb9677aa35dcfb2e6f9ddebc014b0 ] If hardware descriptor (WQE) length exceeds one the HW can handle, the Tx queue failure occurs. PMD does the length check but there was a bug - the length limit was expressed in 16B units (WQEBB segments), while the calculated WQE length and limit were in 64B units (WQEBBs). Fix the condition to avoid subsequent Tx queue failure. Fixes: 18a1c20 ("net/mlx5: implement Tx burst template") Signed-off-by: Raja Zidane Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 436c207281..fb4b8544ae 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -3274,7 +3274,7 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq, if (unlikely(loc->wqe_free < ((ds + 3) / 4))) return MLX5_TXCMP_CODE_EXIT; /* Check for maximal WQE size. */ - if (unlikely((MLX5_WQE_SIZE_MAX / MLX5_WSEG_SIZE) < ((ds + 3) / 4))) + if (unlikely((MLX5_WQE_SIZE_MAX / MLX5_WSEG_SIZE) < ds)) return MLX5_TXCMP_CODE_ERROR; #ifdef MLX5_PMD_SOFT_COUNTERS /* Update sent data bytes/packets counters. */ @@ -3352,7 +3352,7 @@ mlx5_tx_packet_multi_send(struct mlx5_txq_data *__rte_restrict txq, if (unlikely(loc->wqe_free < ((ds + 3) / 4))) return MLX5_TXCMP_CODE_EXIT; /* Check for maximal WQE size. */ - if (unlikely((MLX5_WQE_SIZE_MAX / MLX5_WSEG_SIZE) < ((ds + 3) / 4))) + if (unlikely((MLX5_WQE_SIZE_MAX / MLX5_WSEG_SIZE) < ds)) return MLX5_TXCMP_CODE_ERROR; /* * Some Tx offloads may cause an error if -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:28.274217533 +0000 +++ 0047-net-mlx5-fix-Tx-check-for-hardware-descriptor-length.patch 2022-11-03 09:27:25.433423603 +0000 @@ -1 +1 @@ -From 130bb7da53ddb9677aa35dcfb2e6f9ddebc014b0 Mon Sep 17 00:00:00 2001 +From 9cf325e6a17aee9a1949b312e0899c60d61cdd20 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 130bb7da53ddb9677aa35dcfb2e6f9ddebc014b0 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - drivers/net/mlx5/mlx5_tx.h | 4 ++-- + drivers/net/mlx5/mlx5_rxtx.c | 4 ++-- @@ -21,5 +22,5 @@ -diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h -index 59ebe95032..e0fc1872fe 100644 ---- a/drivers/net/mlx5/mlx5_tx.h -+++ b/drivers/net/mlx5/mlx5_tx.h -@@ -1783,7 +1783,7 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq, +diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c +index 436c207281..fb4b8544ae 100644 +--- a/drivers/net/mlx5/mlx5_rxtx.c ++++ b/drivers/net/mlx5/mlx5_rxtx.c +@@ -3274,7 +3274,7 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq, @@ -34 +35 @@ -@@ -1858,7 +1858,7 @@ mlx5_tx_packet_multi_send(struct mlx5_txq_data *__rte_restrict txq, +@@ -3352,7 +3352,7 @@ mlx5_tx_packet_multi_send(struct mlx5_txq_data *__rte_restrict txq, @@ -42 +43 @@ - * Some Tx offloads may cause an error if packet is not long enough, + * Some Tx offloads may cause an error if