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 3FA5FA054A for ; Tue, 25 Oct 2022 17:09:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3BD5142C48; Tue, 25 Oct 2022 17:09:39 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 535FE42C3C for ; Tue, 25 Oct 2022 17:09:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2HjMF82yuWkosJr5Cz9BL/mts3OzxSsZSfK6aWHS0CE=; b=DtAoadxRNEWh2EhUf7ehLYcBZnwzFtnv0C8U5PuSAz7QTdybh9+odQaHTOf1XT7+Vz/DJa pN6qN8p5fSiW7mORBwDSu65Tr2d85Zs0F0oGusDyK6ZqygJhWuxQUrAdiN3KoG12eExVNq qI7J1NHSYBc/Dbim2vFcjnBmrumqYe0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-665-RwNEtFW9PrKvOD95LPna5g-1; Tue, 25 Oct 2022 11:09:35 -0400 X-MC-Unique: RwNEtFW9PrKvOD95LPna5g-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A3718811E87; Tue, 25 Oct 2022 15:09:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id B376747505F; Tue, 25 Oct 2022 15:09:33 +0000 (UTC) From: Kevin Traynor 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 21.11.3 Date: Tue, 25 Oct 2022 16:07:04 +0100 Message-Id: <20221025150734.142189-69-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.3 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/01/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/ccdfdbafa489c31223cdeca4fe160854bf85c0aa Thanks. Kevin --- >From ccdfdbafa489c31223cdeca4fe160854bf85c0aa 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_tx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h index ba37dc9b66..13d6d434d7 100644 --- a/drivers/net/mlx5/mlx5_tx.h +++ b/drivers/net/mlx5/mlx5_tx.h @@ -1732,5 +1732,5 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq, 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 @@ -1807,5 +1807,5 @@ mlx5_tx_packet_multi_send(struct mlx5_txq_data *__rte_restrict txq, 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; /* -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.108186804 +0100 +++ 0069-net-mlx5-fix-Tx-check-for-hardware-descriptor-length.patch 2022-10-25 14:18:58.481798342 +0100 @@ -1 +1 @@ -From 130bb7da53ddb9677aa35dcfb2e6f9ddebc014b0 Mon Sep 17 00:00:00 2001 +From ccdfdbafa489c31223cdeca4fe160854bf85c0aa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 130bb7da53ddb9677aa35dcfb2e6f9ddebc014b0 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 59ebe95032..e0fc1872fe 100644 +index ba37dc9b66..13d6d434d7 100644 @@ -25 +26 @@ -@@ -1784,5 +1784,5 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq, +@@ -1732,5 +1732,5 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq, @@ -32 +33 @@ -@@ -1859,5 +1859,5 @@ mlx5_tx_packet_multi_send(struct mlx5_txq_data *__rte_restrict txq, +@@ -1807,5 +1807,5 @@ mlx5_tx_packet_multi_send(struct mlx5_txq_data *__rte_restrict txq,