patch 'reorder: invalidate buffer from ready queue in drain' has been queued to stable release 21.11.4

Kevin Traynor ktraynor at redhat.com
Thu Feb 23 16:06:25 CET 2023


Hi,

FYI, your patch has been queued to stable release 21.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/28/23. 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/68bf4f36e948865ffd6890808e1ce7a0827c50b2

Thanks.

Kevin

---
>From 68bf4f36e948865ffd6890808e1ce7a0827c50b2 Mon Sep 17 00:00:00 2001
From: Volodymyr Fialko <vfialko at marvell.com>
Date: Sat, 7 Jan 2023 16:19:38 +0100
Subject: [PATCH] reorder: invalidate buffer from ready queue in drain

[ upstream commit af12092f927d0d230b4dc051529dae88902fba1c ]

Set drained buffers from ready queue to NULL, since their ownership
returned to user. Otherwise it's possible that both user and library
will attempt to free the packet.

Fixes: b70b56032bff ("reorder: new library")

Signed-off-by: Volodymyr Fialko <vfialko at marvell.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 lib/reorder/rte_reorder.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/reorder/rte_reorder.c b/lib/reorder/rte_reorder.c
index 9445853b79..a5b9663aa5 100644
--- a/lib/reorder/rte_reorder.c
+++ b/lib/reorder/rte_reorder.c
@@ -393,4 +393,5 @@ rte_reorder_drain(struct rte_reorder_buffer *b, struct rte_mbuf **mbufs,
 	while ((drain_cnt < max_mbufs) && (ready_buf->tail != ready_buf->head)) {
 		mbufs[drain_cnt++] = ready_buf->entries[ready_buf->tail];
+		ready_buf->entries[ready_buf->tail] = NULL;
 		ready_buf->tail = (ready_buf->tail + 1) & ready_buf->mask;
 	}
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:26.065247576 +0000
+++ 0094-reorder-invalidate-buffer-from-ready-queue-in-drain.patch	2023-02-23 14:46:23.886236370 +0000
@@ -1 +1 @@
-From af12092f927d0d230b4dc051529dae88902fba1c Mon Sep 17 00:00:00 2001
+From 68bf4f36e948865ffd6890808e1ce7a0827c50b2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit af12092f927d0d230b4dc051529dae88902fba1c ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 385ee479da..b38e71f460 100644
+index 9445853b79..a5b9663aa5 100644
@@ -23 +24 @@
-@@ -390,4 +390,5 @@ rte_reorder_drain(struct rte_reorder_buffer *b, struct rte_mbuf **mbufs,
+@@ -393,4 +393,5 @@ rte_reorder_drain(struct rte_reorder_buffer *b, struct rte_mbuf **mbufs,



More information about the stable mailing list