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 B8072A00C2 for ; Thu, 3 Nov 2022 10:28:24 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B083A40694; Thu, 3 Nov 2022 10:28:24 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 5EB2B40693 for ; Thu, 3 Nov 2022 10:28:23 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id l16-20020a05600c4f1000b003c6c0d2a445so718187wmq.4 for ; Thu, 03 Nov 2022 02:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/3ZoOLm9nLdijVWqp6gNVqDnc8kvZ11kUkwgip9e2rU=; b=V1+Rc0PfXJiHpjVykGEIcxGu+IeQEWZgxE3Ml0Wj2MS9bOtoiLTagPMD70MMP5/OAG jbrjLWxfcIIH+Ja7Of6gt34gXejlYoVg6qG5sd69F8RMa+LIs8tMvITK64m+hJUWD1tf AHuB7s1LyCKlmOGrJKqF6ko/azatlXgWK8Bf3Imhs/F75LcJjGuhh5Jd/h/qN46QZrEB VUry1u3WBsRKKm5wsCP07NrkvA56tWxU5R30o8H6MlYWgnl/RV3dIRlnDCDVkdY+QLpS d+khl4QTC1zUE2cDbVJhweucFvXNSUZBmKBCvtXqjtBfTObT+dO3mUgI9JC7JnACKyNw IAgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/3ZoOLm9nLdijVWqp6gNVqDnc8kvZ11kUkwgip9e2rU=; b=vGVCZMmRO8rF6Z4ziWVQYkHT+g02Jg+rQeldedoI+FZp8eX1qQsRoww/O3/CnHz0wY Y3cDBEgjZ+3sq8I4OACNHFCyBQoMiMkOtxIHSI3YgC8lNNHkFRTdk6lpv7ioCwkd/4hp AUP97YZPXFYPKwusR1utMcsyzlirYgqDShCr6yXLwwdfhvD/kuMoz/8VxcTh/zYMcJn0 ANh5ISFITLIDVdmALd0K9Aor7wO/Rs+U3oPuCT38NyN0p35gSfkAgtRxF99z8P6WskT5 DLJT4TBkEhbcJgXUiL8ityvpfp0Sk2yEqTkWG5OBPmG0VFUmn8dvH4SlJjfxjYm5dyLN 8T9w== X-Gm-Message-State: ACrzQf0w3odYGrz1o7VPk/f8TC6ga7Uuyytyjmw5biTCMAMuj2hH07y6 2Uzm6C4SysjV9dZihDMvpaM= X-Google-Smtp-Source: AMsMyM74UHpq1ndth2SCPoK5wzW4JYi459fyEBJWxM6hSdKiBH2KRqpEg9pEhDVYjYPNQP9sSXv8Nw== X-Received: by 2002:a05:600c:2215:b0:3cf:74e9:a9e0 with SMTP id z21-20020a05600c221500b003cf74e9a9e0mr12182728wml.145.1667467702977; Thu, 03 Nov 2022 02:28:22 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id m29-20020a05600c3b1d00b003b47b913901sm5003344wms.1.2022.11.03.02.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:28:22 -0700 (PDT) From: luca.boccassi@gmail.com To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: fix scattered Rx' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:26:24 +0000 Message-Id: <20221103092758.1099402-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.7 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/05/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/3ecf863830e5e5d40833a496338b51f3791e59d8 Thanks. Luca Boccassi --- >From 3ecf863830e5e5d40833a496338b51f3791e59d8 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 032e3cebce..68270bc3a6 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -324,8 +324,8 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, uint64_t old_dirty = rxq->dirty; struct rte_mbuf *first_seg = NULL; struct rte_mbuf *mbuf, *tmbuf; - unsigned int err; - uint32_t error_status; + unsigned int err = 0; + uint32_t error_status = 0; uint16_t idx, pidx, data_len = 0, pkt_len = 0; idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur); @@ -361,19 +361,6 @@ 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 *)); if (!AXGMAC_GET_BITS_LE(desc->write.desc3, @@ -386,6 +373,24 @@ next_desc: pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3, 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; + } + } + } if (first_seg != NULL) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:25.890070880 +0000 +++ 0006-net-axgbe-fix-scattered-Rx.patch 2022-11-03 09:27:25.305421124 +0000 @@ -1 +1 @@ -From 0fda97d73775ce7955bfa54216c030188357ae89 Mon Sep 17 00:00:00 2001 +From 3ecf863830e5e5d40833a496338b51f3791e59d8 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 032e3cebce..68270bc3a6 100644 @@ -22 +23 @@ -@@ -343,8 +343,8 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, +@@ -324,8 +324,8 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, @@ -26 +27 @@ -- unsigned int err, etlt; +- unsigned int err; @@ -28 +29 @@ -+ unsigned int err = 0, etlt; ++ unsigned int err = 0; @@ -31 +31,0 @@ - uint64_t offloads; @@ -33 +33,2 @@ -@@ -381,19 +381,6 @@ next_desc: + idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur); +@@ -361,19 +361,6 @@ next_desc: @@ -53 +54 @@ -@@ -406,6 +393,24 @@ next_desc: +@@ -386,6 +373,24 @@ next_desc: