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 1EBF9A054A for ; Tue, 25 Oct 2022 17:09:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1BA2A42C4C; Tue, 25 Oct 2022 17:09:37 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 20E3042C42 for ; Tue, 25 Oct 2022 17:09:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710575; 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=hjUv0RB8WJCqbFGQfXO0frhq1CuP80dIW+Jd3kuKR4U=; b=N2XxzFTTJuGy2E4OXOmuo+BPWdR4ETR52RKBjhTh1COoexbjMJV/W3LH264Hu96KYiO6Qc qz0dBFixM4JOO19hs8CXLHXWXGy4UI/+uejyS8q0BWm88GRIz8TLHld6W5SdGB+x4QIIwq zuLJwV5ctENX5toX/YskpBw6HP5UewY= 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-62-_phaS3ANNgW63FyK9w17bw-1; Tue, 25 Oct 2022 11:09:32 -0400 X-MC-Unique: _phaS3ANNgW63FyK9w17bw-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 C43773826A53; Tue, 25 Oct 2022 15:09:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1206E47505E; Tue, 25 Oct 2022 15:09:30 +0000 (UTC) From: Kevin Traynor To: Viacheslav Ovsiienko Cc: dpdk stable Subject: patch 'net/mlx5: fix single not inline packet storing' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:02 +0100 Message-Id: <20221025150734.142189-67-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/517c25053b125c88135b09040c2e264e2ecb58d9 Thanks. Kevin --- >From 517c25053b125c88135b09040c2e264e2ecb58d9 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 17 Aug 2022 10:04:25 +0300 Subject: [PATCH] net/mlx5: fix single not inline packet storing [ upstream commit 166f185fefcd53d2d41499cadc5e1467e040d0cc ] The mlx5 PMD can inline packet data into transmitting descriptor (WQE) and free mbuf immediately as data no longer needed, for non-inline packets the mbuf pointer should be stored in elts array for coming freeing on send completion. There was an optimization on storing pointers in batch and there was missed storing mbuf for single packet if non-inline was explicitly requested by flag. Fixes: cacb44a09962 ("net/mlx5: add no-inline Tx flag") Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_tx.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h index bd3a060963..7bebe8f9ab 100644 --- a/drivers/net/mlx5/mlx5_tx.h +++ b/drivers/net/mlx5/mlx5_tx.h @@ -3271,5 +3271,7 @@ single_no_inline: * by calling routine in a batch copy. */ - MLX5_ASSERT(!MLX5_TXOFF_CONFIG(INLINE)); + if (MLX5_TXOFF_CONFIG(INLINE)) + txq->elts[txq->elts_head++ & txq->elts_m] = + loc->mbuf; --loc->elts_free; #ifdef MLX5_PMD_SOFT_COUNTERS -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.062205650 +0100 +++ 0067-net-mlx5-fix-single-not-inline-packet-storing.patch 2022-10-25 14:18:58.476798324 +0100 @@ -1 +1 @@ -From 166f185fefcd53d2d41499cadc5e1467e040d0cc Mon Sep 17 00:00:00 2001 +From 517c25053b125c88135b09040c2e264e2ecb58d9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 166f185fefcd53d2d41499cadc5e1467e040d0cc ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index f081921ffc..8e113e3778 100644 +index bd3a060963..7bebe8f9ab 100644 @@ -25 +26 @@ -@@ -3323,5 +3323,7 @@ single_no_inline: +@@ -3271,5 +3271,7 @@ single_no_inline: