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 8139BA00C2 for ; Thu, 3 Nov 2022 10:30:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D73940694; Thu, 3 Nov 2022 10:30:34 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id A5E8341145 for ; Thu, 3 Nov 2022 10:30:32 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id ja4-20020a05600c556400b003cf6e77f89cso3499409wmb.0 for ; Thu, 03 Nov 2022 02:30:32 -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=CHJj6YS1z95MGJdnZwX+x2HZDd3rlG+hhASYJ19iBrQ=; b=LnjZedVLbswQEYq6+B8Ks9rDxxLwxtAU25W0tFubW77iGJazr60dP5nqdHTR7CROal 5hicKupuNs1vwNrQ6AF/Ln6+4Nm41wQ4O1hSMnmC/4xbSsUOsoakf2+neYG4MUUTGmt0 yfnVL2rIx4PG0NeTpYPH4Cyd4em5bma+l9+ycuZ7Giq/KfObElu5jiylSONWR+u1QQNO 8rhsFIo0pQ5PgSeo5a8NQtiGByQkb60tS/l7gjsNPpjDEAgPBNHD/RjSo+i1HmZP5UVp LDN6aBtaChuZmqbpIIFFpCGEi6+NNH0fUgxN4NxRPfxMyBA+TgqjoodwAMe8eSpNuAyb eeeQ== 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=CHJj6YS1z95MGJdnZwX+x2HZDd3rlG+hhASYJ19iBrQ=; b=E9ZQ5TjuiIjPGJOWDZc5K5IQ60RJpDdqJ+UUdYMRyt9U9blE+pph4dGERQcahgZW7V GMqZtIxQAPnMtQaR9aQDZiyFXoZWVfnWBSJG/VSSyZHjN8MfhaS+Gt+rg8CyWmmGIiMA K7ZSuVh7yJ7Ld0Bh/55IMR8xLcbtM1a1LzO/G74OzRRzDP4NgUV/AUSSRMuqRSaAcTHA nhb2iH8Z33fg5fcZo2dbA0zUe6aSduZYi0Eq9ZIXohzP9iQuFQo7Q1roySK/rF57KLJ5 TcEE/BYWXpJZKMDQ6Fe+EcxzRvdNIDv/yqcHaMftkLvHlM5UidQ9X3aQcaMv1JFG5lND YVkA== X-Gm-Message-State: ACrzQf3v+yCYjKo9BirsfXQd3I5azK5fC2vYn4cwSjZxbLGCITxZZm+O 2rf77gYfMbXhNSiWjyrdmAjBhYOZENHBaWi5 X-Google-Smtp-Source: AMsMyM5LaZUahxY2w/fiovlfZhRPQTZe99k6WD7YM7a7FXoSASl6XORbjd0FpWf8eecL4/7UPPwCUg== X-Received: by 2002:a1c:7c14:0:b0:3b5:1133:d2ed with SMTP id x20-20020a1c7c14000000b003b51133d2edmr18575473wmc.133.1667467832355; Thu, 03 Nov 2022 02:30:32 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id fc19-20020a05600c525300b003cf57329221sm6272015wmb.14.2022.11.03.02.30.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:30:31 -0700 (PDT) From: luca.boccassi@gmail.com To: Viacheslav Ovsiienko Cc: dpdk stable Subject: patch 'net/mlx5: fix single not inline packet storing' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:27:03 +0000 Message-Id: <20221103092758.1099402-45-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/32e5eda02606aac890aa1d1b8029e611d2f130d0 Thanks. Luca Boccassi --- >From 32e5eda02606aac890aa1d1b8029e611d2f130d0 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_rxtx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index b73ab06367..1ba70264c8 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -4822,7 +4822,9 @@ single_no_inline: * if no inlining is configured, this is done * 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 /* Update sent data bytes counter. */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:28.154967533 +0000 +++ 0045-net-mlx5-fix-single-not-inline-packet-storing.patch 2022-11-03 09:27:25.425423448 +0000 @@ -1 +1 @@ -From 166f185fefcd53d2d41499cadc5e1467e040d0cc Mon Sep 17 00:00:00 2001 +From 32e5eda02606aac890aa1d1b8029e611d2f130d0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 166f185fefcd53d2d41499cadc5e1467e040d0cc ] + @@ -14 +15,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 f081921ffc..8e113e3778 100644 ---- a/drivers/net/mlx5/mlx5_tx.h -+++ b/drivers/net/mlx5/mlx5_tx.h -@@ -3322,7 +3322,9 @@ single_no_inline: +diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c +index b73ab06367..1ba70264c8 100644 +--- a/drivers/net/mlx5/mlx5_rxtx.c ++++ b/drivers/net/mlx5/mlx5_rxtx.c +@@ -4822,7 +4822,9 @@ single_no_inline: