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 54943A054A for ; Tue, 25 Oct 2022 17:09:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 48C5B42C3D; Tue, 25 Oct 2022 17:09:49 +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 BA83342C38 for ; Tue, 25 Oct 2022 17:09:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710587; 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=ISvhEvh/9NZ7ryVJOQ8bW3yi8isyR/qx6to64FBMFYo=; b=E1TAoCTs2EWVEdDSxKajk8y3kAg1/+Z5BTQOowgJ4hPqm2hBPUxERuuCdxTN/0lICu1Ol8 ZId1kv70TgzYmU9NPFfkYLI3e1m4bD6ra3bsdpSB8QJ9KYYdipNXT1zEE6ySvdXFa/iZot mXLOJ3/UkYHE1FL5X87AO9akkqPtCkc= 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-198-DRzjsKbfPd6yXU5irfPOMw-1; Tue, 25 Oct 2022 11:09:44 -0400 X-MC-Unique: DRzjsKbfPd6yXU5irfPOMw-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 03F12804186; Tue, 25 Oct 2022 15:09:43 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3938349BB60; Tue, 25 Oct 2022 15:09:42 +0000 (UTC) From: Kevin Traynor To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: clear buffer on scattered Rx chaining failure' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:11 +0100 Message-Id: <20221025150734.142189-76-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/9683271240f1b499ae6e94215d75a40cab7b2807 Thanks. Kevin --- >From 9683271240f1b499ae6e94215d75a40cab7b2807 Mon Sep 17 00:00:00 2001 From: Bhagyada Modali Date: Wed, 7 Sep 2022 23:31:08 -0400 Subject: [PATCH] net/axgbe: clear buffer on scattered Rx chaining failure [ upstream commit 30ff4d00d92dd4126efc8236299126e199e92461 ] Clearing mbuf, first_seg when chaining mbufs fail. Increment the error count for the same. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu --- drivers/net/axgbe/axgbe_rxtx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index d73f0ef49c..968602bdff 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -420,6 +420,8 @@ next_desc: if (first_seg != NULL) { if (rte_pktmbuf_chain(first_seg, mbuf) != 0) { - rte_mempool_put(rxq->mb_pool, - first_seg); + rte_pktmbuf_free(first_seg); + first_seg = NULL; + rte_pktmbuf_free(mbuf); + rxq->errors++; eop = 0; break; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.271871746 +0100 +++ 0076-net-axgbe-clear-buffer-on-scattered-Rx-chaining-fail.patch 2022-10-25 14:18:58.504798424 +0100 @@ -1 +1 @@ -From 30ff4d00d92dd4126efc8236299126e199e92461 Mon Sep 17 00:00:00 2001 +From 9683271240f1b499ae6e94215d75a40cab7b2807 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 30ff4d00d92dd4126efc8236299126e199e92461 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 4c16c59f37..f2136e30b0 100644 +index d73f0ef49c..968602bdff 100644 @@ -22 +23 @@ -@@ -419,6 +419,8 @@ next_desc: +@@ -420,6 +420,8 @@ next_desc: