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 06E71A054A for ; Tue, 25 Oct 2022 17:09:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 031B242C3D; Tue, 25 Oct 2022 17:09:46 +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 3808742C3C for ; Tue, 25 Oct 2022 17:09:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710583; 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=reshvls1G1fD80Ms+czI9PmwvxHbvCu5+VzVbmsPipI=; b=T1XIiklx01lP+uIbdbkhi2JtuBZDRQk41I7XU4kyOfkmRZSFawetYv3Q5yj9X2rMOIRuS4 RZB9CNUpcVWjorSelqdd9fgh2qoJtMgVHolDXELMfXZ46fp5s/nDLG+TXqForedomtRB3Q 6dexnCx36Pq4v+DsYQQjVlLkI2iBFro= 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-122-slPb-6MyPu6ywWwOmPQPBg-1; Tue, 25 Oct 2022 11:09:42 -0400 X-MC-Unique: slPb-6MyPu6ywWwOmPQPBg-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 CCD6F101A54E; Tue, 25 Oct 2022 15:09:41 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id C915049BB60; Tue, 25 Oct 2022 15:09:40 +0000 (UTC) From: Kevin Traynor To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: reset end of packet in scattered Rx' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:10 +0100 Message-Id: <20221025150734.142189-75-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/18895ee575c74388c6cd54dfa476f6209f252bc7 Thanks. Kevin --- >From 18895ee575c74388c6cd54dfa476f6209f252bc7 Mon Sep 17 00:00:00 2001 From: Bhagyada Modali Date: Wed, 7 Sep 2022 23:31:07 -0400 Subject: [PATCH] net/axgbe: reset end of packet in scattered Rx [ upstream commit 2a761aec228caf66025cacf07c7c9662ae021e03 ] Reset the EOP in the failure scenario and also after the last segment. Remove updating the packet length explicitly as it is done in chaining. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu --- drivers/net/axgbe/axgbe_rxtx.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 7bac482e92..d73f0ef49c 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -348,8 +348,9 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, uint16_t idx, pidx, data_len = 0, pkt_len = 0; uint64_t offloads; + bool eop = 0; idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur); + while (nb_rx < nb_pkts) { - bool eop = 0; next_desc: idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur); @@ -418,7 +419,10 @@ next_desc: if (first_seg != NULL) { - if (rte_pktmbuf_chain(first_seg, mbuf) != 0) + if (rte_pktmbuf_chain(first_seg, mbuf) != 0) { rte_mempool_put(rxq->mb_pool, first_seg); + eop = 0; + break; + } } else { first_seg = mbuf; @@ -462,6 +466,6 @@ err_set: if (!eop) goto next_desc; + eop = 0; - first_seg->pkt_len = pkt_len; rxq->bytes += pkt_len; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.251205288 +0100 +++ 0075-net-axgbe-reset-end-of-packet-in-scattered-Rx.patch 2022-10-25 14:18:58.504798424 +0100 @@ -1 +1 @@ -From 2a761aec228caf66025cacf07c7c9662ae021e03 Mon Sep 17 00:00:00 2001 +From 18895ee575c74388c6cd54dfa476f6209f252bc7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2a761aec228caf66025cacf07c7c9662ae021e03 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index d4224992ee..4c16c59f37 100644 +index 7bac482e92..d73f0ef49c 100644 @@ -22 +23 @@ -@@ -347,8 +347,9 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, +@@ -348,8 +348,9 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, @@ -33 +34 @@ -@@ -417,7 +418,10 @@ next_desc: +@@ -418,7 +419,10 @@ next_desc: @@ -45 +46 @@ -@@ -461,6 +465,6 @@ err_set: +@@ -462,6 +466,6 @@ err_set: