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 502F041D52 for ; Thu, 23 Feb 2023 16:08:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 45BB6432CC; Thu, 23 Feb 2023 16:08:46 +0100 (CET) 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 E0830432BA for ; Thu, 23 Feb 2023 16:08:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164924; 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=AbquDxuFV3zBwLXd1FpcpaTELgWgpWZ+KX71hLOwCSI=; b=Sh9cZ7x5quUSBr0qXWadB1YPgGwMe8lll5/LlM5wXpcXJDhCYpflDwkZ3SdUe/xLQKwfhS iq1BQmdBDboa2WeQDPyEvFiAtavfQpGMw7R4uGessvQzUIUR/Cgve+Wl58VnKiT+YONtqy OzIlosd1wq4TdaSamiQBY+ngqnSJDIg= 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-115-EzFnYYGbOsmgk1v3vbxBdQ-1; Thu, 23 Feb 2023 10:08:43 -0500 X-MC-Unique: EzFnYYGbOsmgk1v3vbxBdQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F2C89800050; Thu, 23 Feb 2023 15:08:42 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20BF42166B2B; Thu, 23 Feb 2023 15:08:42 +0000 (UTC) From: Kevin Traynor To: Volodymyr Fialko Cc: Stephen Hemminger , dpdk stable Subject: patch 'reorder: invalidate buffer from ready queue in drain' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:06:25 +0000 Message-Id: <20230223150631.723699-94-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.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 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 Acked-by: Stephen Hemminger --- 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@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,