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 77092A054A for ; Tue, 25 Oct 2022 17:08:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 723C142C34; Tue, 25 Oct 2022 17:08:16 +0200 (CEST) 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 128C542C1D for ; Tue, 25 Oct 2022 17:08:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710494; 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=7d7wHkJP0nPS7u7O09wj6ktHZb2ysjlIowpZWFX1jwg=; b=Kt8wSfpKMiOB+494VP3xSLg/D8GX0x50uXFW2SavZCpmcTGVe2vOt/U4JNS8xsjHFymTxS KgYsnOKg/6ZIGjoPvYQ7u7C1IVa8NXB3LT6QBocKluP6ITjPNHUYCWsAb6pFMfPkBVJU7y RRxxnjtNFrEBZXv8P2IS8BF8bj4HZaQ= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-651-872t93PkMKukLMWfHe1mJQ-1; Tue, 25 Oct 2022 11:08:12 -0400 X-MC-Unique: 872t93PkMKukLMWfHe1mJQ-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 4CE0A3C0F236; Tue, 25 Oct 2022 15:08:11 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D7E0492CA2; Tue, 25 Oct 2022 15:08:10 +0000 (UTC) From: Kevin Traynor To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: fix scattered Rx' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:04 +0100 Message-Id: <20221025150734.142189-9-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/77c3e4194b0850a178247dd4a2562e2fcabac0d0 Thanks. Kevin --- >From 77c3e4194b0850a178247dd4a2562e2fcabac0d0 Mon Sep 17 00:00:00 2001 From: Bhagyada Modali Date: Fri, 2 Sep 2022 04:47:51 -0400 Subject: [PATCH] net/axgbe: fix scattered Rx [ upstream commit 0fda97d73775ce7955bfa54216c030188357ae89 ] Error check needs to be done only for last segment of Jumbo packet. Freed first_seg and reset eop to 0 in error case Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu --- drivers/net/axgbe/axgbe_rxtx.c | 35 +++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 6bd41d3002..d7a4641133 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -345,6 +345,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, struct rte_mbuf *first_seg = NULL; struct rte_mbuf *mbuf, *tmbuf; - unsigned int err, etlt; - uint32_t error_status; + unsigned int err = 0, etlt; + uint32_t error_status = 0; uint16_t idx, pidx, data_len = 0, pkt_len = 0; uint64_t offloads; @@ -383,17 +383,4 @@ next_desc: mbuf = rxq->sw_ring[idx]; - /* Check for any errors and free mbuf*/ - err = AXGMAC_GET_BITS_LE(desc->write.desc3, - RX_NORMAL_DESC3, ES); - error_status = 0; - if (unlikely(err)) { - error_status = desc->write.desc3 & AXGBE_ERR_STATUS; - if ((error_status != AXGBE_L3_CSUM_ERR) - && (error_status != AXGBE_L4_CSUM_ERR)) { - rxq->errors++; - rte_pktmbuf_free(mbuf); - goto err_set; - } - } rte_prefetch1(rte_pktmbuf_mtod(mbuf, void *)); @@ -408,4 +395,22 @@ next_desc: RX_NORMAL_DESC3, PL); data_len = pkt_len - rxq->crc_len; + /* Check for any errors and free mbuf*/ + err = AXGMAC_GET_BITS_LE(desc->write.desc3, + RX_NORMAL_DESC3, ES); + error_status = 0; + if (unlikely(err)) { + error_status = desc->write.desc3 & + AXGBE_ERR_STATUS; + if (error_status != AXGBE_L3_CSUM_ERR && + error_status != AXGBE_L4_CSUM_ERR) { + rxq->errors++; + rte_pktmbuf_free(mbuf); + rte_pktmbuf_free(first_seg); + first_seg = NULL; + eop = 0; + goto err_set; + } + } + } -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:58.787976668 +0100 +++ 0009-net-axgbe-fix-scattered-Rx.patch 2022-10-25 14:18:58.361797912 +0100 @@ -1 +1 @@ -From 0fda97d73775ce7955bfa54216c030188357ae89 Mon Sep 17 00:00:00 2001 +From 77c3e4194b0850a178247dd4a2562e2fcabac0d0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0fda97d73775ce7955bfa54216c030188357ae89 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index f38bb64fab..89ed6fd74a 100644 +index 6bd41d3002..d7a4641133 100644 @@ -22 +23 @@ -@@ -344,6 +344,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, +@@ -345,6 +345,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, @@ -31 +32 @@ -@@ -382,17 +382,4 @@ next_desc: +@@ -383,17 +383,4 @@ next_desc: @@ -49 +50 @@ -@@ -407,4 +394,22 @@ next_desc: +@@ -408,4 +395,22 @@ next_desc: