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 A66ECA0093 for ; Tue, 10 May 2022 14:30:41 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A1C964069D; Tue, 10 May 2022 14:30:41 +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 5BB144069D for ; Tue, 10 May 2022 14:30:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185839; 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=K1TXrUpp7YiF0+jPrciW+wC5HFRsu/cSKMNW+NYL2Fw=; b=VR9hcr8j5TsZBaGoYbPYyzzIazVQvtrOp16OH5/mdvfjrGZhNG0OunsXI0+BulSo4hwmhj Lvqg7lACyn66ekdbCJzbnqvJtF/npihPIxKkqUASybYXkNaERjzkMOYBjlDlDs7sXWSVtg pj/hbDG5CCiUcFktI8xPo/hnHgi4wMg= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-399-ByqIyQTdP3S1lTWyJ-4JHg-1; Tue, 10 May 2022 08:30:36 -0400 X-MC-Unique: ByqIyQTdP3S1lTWyJ-4JHg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6F8D22949BC2; Tue, 10 May 2022 12:30:36 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id A698C401012B; Tue, 10 May 2022 12:30:35 +0000 (UTC) From: Kevin Traynor To: Dmitry Kozlyuk Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix Tx when inlining is impossible' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:29:49 +0100 Message-Id: <20220510123010.159523-12-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/15/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/1430ccb1db805caf522e9a0d5a210f22b9684361 Thanks. Kevin --- >From 1430ccb1db805caf522e9a0d5a210f22b9684361 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Thu, 31 Mar 2022 17:38:41 +0300 Subject: [PATCH] net/mlx5: fix Tx when inlining is impossible [ upstream commit e2259f93ef455c75bfeda9a7349689b7e9be5981 ] When txq_inline_max is too large and an mbuf is multi-segment it may be impossible to inline data and build a valid WQE, because WQE length would be larger then HW can represent. It is impossible to detect misconfiguration at startup, because the condition depends on the mbuf composition. The check on the data path to prevent the error treated the length limit as expressed in 64B units, while the calculated length and limit are in 16B units. Fix the condition to avoid subsequent TxQ failure and recovery. Fixes: 18a1c20044c0 ("net/mlx5: implement Tx burst template") Signed-off-by: Dmitry Kozlyuk Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_tx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h index 398cadfeaa..6be3684bb3 100644 --- a/drivers/net/mlx5/mlx5_tx.h +++ b/drivers/net/mlx5/mlx5_tx.h @@ -2019,5 +2019,5 @@ do_build: 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 -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:21.918564773 +0100 +++ 0012-net-mlx5-fix-Tx-when-inlining-is-impossible.patch 2022-05-10 13:24:21.576646325 +0100 @@ -1 +1 @@ -From e2259f93ef455c75bfeda9a7349689b7e9be5981 Mon Sep 17 00:00:00 2001 +From 1430ccb1db805caf522e9a0d5a210f22b9684361 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e2259f93ef455c75bfeda9a7349689b7e9be5981 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 89dac0c65a..dfa04612ff 100644 +index 398cadfeaa..6be3684bb3 100644 @@ -29 +30 @@ -@@ -2071,5 +2071,5 @@ do_build: +@@ -2019,5 +2019,5 @@ do_build: