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 887AFA00C2 for ; Thu, 3 Nov 2022 10:31:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8470C40DF7; Thu, 3 Nov 2022 10:31:02 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 7199440DF7 for ; Thu, 3 Nov 2022 10:31:01 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id j15so1741558wrq.3 for ; Thu, 03 Nov 2022 02:31:01 -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=cODDVZ9kl/PkXtjBaT6sffTtb1N8ca8hRzC/+5x/cKM=; b=UwkCBzD3DAnqHlfVuIw50kaLNcH4P1MXGskmV1Pn2UCIw6T8kSQxTxiktpcwusp2zK ULnbFR5Z4Nx7ReyMZSVOkhdgbN08ksbD7Fx+e1lA/7chlK1QD4sLZkd5qwgqSYsbaACi aIci0vBtto87Iu4KTg+FZJ+wp9U2BWzviSVo3VXkDiQai86tKe3bw/mKkpixiqADocfX XMxkOQpxyT3WXrKfft8Z/+Lm2cykQokzFLDXP8oeU7VpFAVGGX6ooU4ZkPzPw/d4HtJs YgwZkFWPhhpnuTS8MScD3aYjgDFOA3sclYTnOdZtcgiSOtwmy3oLLUlpc+YNqwGPBzUj a4rw== 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=cODDVZ9kl/PkXtjBaT6sffTtb1N8ca8hRzC/+5x/cKM=; b=J/2CBp9hpzlEZicqMkUh1MNlc8I8Pi8hSi4xfwA9oSSlO02RhPxADG/peTE0SgQoRs AxGbc3JlCl8TUZ34m2/hsj+zBiOgQY2d1bdCrg5iYo2lWj0OQK90Zs2fBpsJt26tqZp9 BDutP6y/NT1pKkycgahf1pmZp1bW/p56LXJchlNG/gsPEbX9MzWDepL+mHeYrok69dG2 9Uy0x3V+qoRuCiQx0JSTTabeOXZLWjXv+Jnr1BM3Z8mxaFhZ0jGLzIwXuonf94r268JN DQD5wSNyqmaskIqAN+SOLbOkjIWXsjyTfiDAqmYGhPjKDoWg+tz3JTe0G2bWCCt8XyhY 0KPA== X-Gm-Message-State: ACrzQf0lxFSL1f/GiKkopGj1orch6Y+izUGA7piqqN/Ssp+TS9Ev6TzH i1jPMlT3v9+i+2sdkU+npInDYLZxjkJlT0aN X-Google-Smtp-Source: AMsMyM6cMxD4O4dxmTMGN9PQBM65K9p1j9aDpAz4Jltj8T2AqsYRDwqQKIUQcu4vufQnifS/5jPEDw== X-Received: by 2002:a5d:40d1:0:b0:236:786d:611e with SMTP id b17-20020a5d40d1000000b00236786d611emr18554918wrq.355.1667467861175; Thu, 03 Nov 2022 02:31:01 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id b3-20020adff903000000b00228d52b935asm331735wrr.71.2022.11.03.02.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:31:00 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.7 Date: Thu, 3 Nov 2022 09:27:10 +0000 Message-Id: <20221103092758.1099402-52-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/c8fbd023ef95008f1a0f5ea8caeef0489584c99e Thanks. Luca Boccassi --- >From c8fbd023ef95008f1a0f5ea8caeef0489584c99e 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 55aed1e73b..3875348f97 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -326,10 +326,11 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, unsigned int err = 0; uint32_t error_status = 0; uint16_t idx, pidx, data_len = 0, pkt_len = 0; + 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); @@ -396,9 +397,12 @@ next_desc: mbuf->pkt_len = data_len; 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; } @@ -418,8 +422,8 @@ err_set: if (!eop) goto next_desc; + eop = 0; - first_seg->pkt_len = pkt_len; rxq->bytes += pkt_len; first_seg->port = rxq->port_id; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:28.580658796 +0000 +++ 0052-net-axgbe-reset-end-of-packet-in-scattered-Rx.patch 2022-11-03 09:27:25.457424066 +0000 @@ -1 +1 @@ -From 2a761aec228caf66025cacf07c7c9662ae021e03 Mon Sep 17 00:00:00 2001 +From c8fbd023ef95008f1a0f5ea8caeef0489584c99e 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 55aed1e73b..3875348f97 100644 @@ -22 +23,2 @@ -@@ -346,10 +346,11 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, +@@ -326,10 +326,11 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, + unsigned int err = 0; @@ -25 +26,0 @@ - uint64_t offloads; @@ -35 +36 @@ -@@ -416,9 +417,12 @@ next_desc: +@@ -396,9 +397,12 @@ next_desc: @@ -49 +50 @@ -@@ -460,8 +464,8 @@ err_set: +@@ -418,8 +422,8 @@ err_set: