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 F2103A00C2 for ; Thu, 3 Nov 2022 10:31:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ED7D940694; Thu, 3 Nov 2022 10:31:05 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 1419A40693 for ; Thu, 3 Nov 2022 10:31:04 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id a14so1725625wru.5 for ; Thu, 03 Nov 2022 02:31:04 -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=art8627kdJX8n2giITGGHK5J+qpEfSOM11FaA6Vp78I=; b=qt0kj5wKuiUBrP0m/4nujkq8qBvB4Ms3wlLe80YGXX//LEb8lmGrQtr/+Bwc5AzIRO 4yCuaVf2EY+ralHKdpQl185GG7MxUxFBhmNXsRSmo7U5DI9wNZnY4vKkEXuFdsFRMYFs i9JtkG1/VVSpU28vjNV9PJBWLmblHRExD2rVQAoSzuY+GcZxmzfhc9IdVjxkDYOorTWm RVK96FABZXNKJ0k5EB5xle4gezZtg9NyiejCpuX5Ue8cUAyXoEUw8tE3AwWK6yjw+Aae TatU734HgV0P6CQlytU3MiOWWJlB36Y1OUS6ftXv8qALnAIkZKDGzHiPkY2o2qpnIpLo 3yRg== 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=art8627kdJX8n2giITGGHK5J+qpEfSOM11FaA6Vp78I=; b=rDUJvUjsnWjwXKbvVJWtddGbH5pcMx6S4jAthkOvq1e5xTPu2wAyyn46iZpZjEOHKm 4oSOuS/O2yStJtRettEePEEcJu0Ku2TJwDiojq/+05hI7Nzqaeihgk2SrJytwvbddaSm GY2Za6l3LcnW0+4pUKcH8y1QlbdlWg1FEvoV8ppro6Rgg8gincPJ2U6JVXFhAZThSdUt WsbY2E3om8jnrenxN8M2/lwgpjukkBV5pKC9pf3kQG2cCo9teNiCWheIP7YI1pSKDWRB sqAuBC9kzhTLEdZa7P83hfVw/v+tvduFHP8mMjGZOe9Rn1E9OCE0Fvy5OZzsNEdeoBBY Mi7w== X-Gm-Message-State: ACrzQf2AP81qOsIU0DgmT5Ns77kC3Opl7DZ6gydbuKn9gweONv23+Css eYe5vACKG9fgDf9Gp20Ax923p4seLNtnltjA X-Google-Smtp-Source: AMsMyM5VFrLS8sQYdUUCZ8QF9mWifyVx0WkHP6NQH1/PrEsBrpVRA4Hfz7hb8kesqerfHZ68Zdenvw== X-Received: by 2002:a05:6000:1ac7:b0:232:b68c:9e0 with SMTP id i7-20020a0560001ac700b00232b68c09e0mr18781401wry.54.1667467863758; Thu, 03 Nov 2022 02:31:03 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id t16-20020adfe110000000b002366e3f1497sm394898wrz.6.2022.11.03.02.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:31:03 -0700 (PDT) From: luca.boccassi@gmail.com To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: save segment data in scattered Rx' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:27:12 +0000 Message-Id: <20221103092758.1099402-54-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/f7b1922b93acfc46b00d19b35aa8d21e21e3c8fe Thanks. Luca Boccassi --- >From f7b1922b93acfc46b00d19b35aa8d21e21e3c8fe Mon Sep 17 00:00:00 2001 From: Bhagyada Modali Date: Wed, 7 Sep 2022 23:31:09 -0400 Subject: [PATCH] net/axgbe: save segment data in scattered Rx [ upstream commit 91907ec24783fedb28c7ebd82b88942caf0863ca ] Saving the current segments of the packet, when the next segment data is not ready. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu --- drivers/net/axgbe/axgbe_rxtx.c | 10 ++++++++++ drivers/net/axgbe/axgbe_rxtx.h | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 35925d3a7f..edc0844a25 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -396,11 +396,17 @@ next_desc: mbuf->data_len = data_len; mbuf->pkt_len = data_len; + if (rxq->saved_mbuf) { + first_seg = rxq->saved_mbuf; + rxq->saved_mbuf = NULL; + } + if (first_seg != NULL) { if (rte_pktmbuf_chain(first_seg, mbuf) != 0) { rte_pktmbuf_free(first_seg); first_seg = NULL; rte_pktmbuf_free(mbuf); + rxq->saved_mbuf = NULL; rxq->errors++; eop = 0; break; @@ -457,6 +463,10 @@ err_set: first_seg = NULL; } + /* Check if we need to save state before leaving */ + if (first_seg != NULL && eop == 0) + rxq->saved_mbuf = first_seg; + /* Save receive context.*/ rxq->pkts += nb_rx; diff --git a/drivers/net/axgbe/axgbe_rxtx.h b/drivers/net/axgbe/axgbe_rxtx.h index f2fbe9299d..54eaca1be5 100644 --- a/drivers/net/axgbe/axgbe_rxtx.h +++ b/drivers/net/axgbe/axgbe_rxtx.h @@ -65,6 +65,12 @@ struct axgbe_rx_queue { uint16_t crc_len; /* address of s/w rx buffers */ struct rte_mbuf **sw_ring; + + /* For segemented packets - save the current state + * of packet, if next descriptor is not ready yet + */ + struct rte_mbuf *saved_mbuf; + /* Port private data */ struct axgbe_port *pdata; /* Number of Rx descriptors in queue */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:28.683741179 +0000 +++ 0054-net-axgbe-save-segment-data-in-scattered-Rx.patch 2022-11-03 09:27:25.457424066 +0000 @@ -1 +1 @@ -From 91907ec24783fedb28c7ebd82b88942caf0863ca Mon Sep 17 00:00:00 2001 +From f7b1922b93acfc46b00d19b35aa8d21e21e3c8fe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 91907ec24783fedb28c7ebd82b88942caf0863ca ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index f2136e30b0..a1a463bc79 100644 +index 35925d3a7f..edc0844a25 100644 @@ -23 +24 @@ -@@ -416,11 +416,17 @@ next_desc: +@@ -396,11 +396,17 @@ next_desc: @@ -41 +42 @@ -@@ -499,6 +505,10 @@ err_set: +@@ -457,6 +463,10 @@ err_set: @@ -53 +54 @@ -index 2a330339cd..2da3095547 100644 +index f2fbe9299d..54eaca1be5 100644