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 153FAA00C2 for ; Thu, 3 Nov 2022 10:28:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 118C840694; Thu, 3 Nov 2022 10:28:28 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id A9A6140693 for ; Thu, 3 Nov 2022 10:28:26 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id z14so1704375wrn.7 for ; Thu, 03 Nov 2022 02:28:26 -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=p8Ok9XUnEsNIPnTg29NHL5obFPDUiS2FO8wC4G1iOvM=; b=H/r4CPtMunuCUwpLPU4Cyga0TigZyb0fImxnD8M00hjT4FpuCQHB83d4YtXL39Dfd2 LX3n4Gpt24Gi7eubykxvetcygtw+QLu/5IBz9wKq1yYVmw8KRHj+9INuoYDxoDU+CWfB Vis6GRcVEWxaj+V4iZHu7ieD/FbLrZmv844tkHHqHoixucb0XUFf4mh51/CH83r14DzX jKxF3UZUdrT3GGOHadaojCvrmYoog8KXfaFj67Zci1fIYS05ux6qvcWTRkOwik+p3NSm UyeOW5rILKLexO5g5dmkNw20wjhyarQuhDwt4jvXJ77Pdk3rNYPj8GB6/cKL3vWVj4og MqFg== 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=p8Ok9XUnEsNIPnTg29NHL5obFPDUiS2FO8wC4G1iOvM=; b=PLZ53byo6EvZVucNqMfaKDLH7pffJKPC9JO9ZISj4cenUl3Dhd8/7cXvI4RFgzT9NF xjiCzYuCAucSn1J06LFkBLDAWBIJR9He8fLxFc7M/mYyy2WWoViu35EkM05OaJ26cugE 1KpKbLzWxofHSgASdif7ZGEb5z2Sth5GmJ5zb7CBN6400Hyz5bdWvggvoyA7c3YpwvcE dnF/MuzdWCrKTHwcQzqvBXz6u/a+EEcq0Xru41bHzzIJANKfjQVFBjaAlqPPnDwhnbgJ PDrqBINYOOA7H6TTItg+4QJ/0WVjXPs+fSQGdI6xKme8GXuOxW0excaxG68l/7JGUrM9 8ZFg== X-Gm-Message-State: ACrzQf3LDEwKRbJix+tfp8OPELJR7wIpfkmuuDBEetN6KLX9RNu4mjai hEuW6uYWm5jJKYx5/47gxNuJvIcTJLhGgw== X-Google-Smtp-Source: AMsMyM6SClPQc/E4AaYwz/ny+azDRAgMp2W7V/sp8zhyrhBwIw4NzyvSIQRFV+T+F/cn468SBIlfUQ== X-Received: by 2002:a5d:4bcd:0:b0:236:6b67:a5be with SMTP id l13-20020a5d4bcd000000b002366b67a5bemr17469964wrt.81.1667467706279; Thu, 03 Nov 2022 02:28:26 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id c3-20020adffb43000000b0022e344a63c7sm298864wrs.92.2022.11.03.02.28.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:28:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: fix length of each segment in scattered Rx' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:26:26 +0000 Message-Id: <20221103092758.1099402-8-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/81a3b2b2be3551e833c1fb4dbd365d56160da605 Thanks. Luca Boccassi --- >From 81a3b2b2be3551e833c1fb4dbd365d56160da605 Mon Sep 17 00:00:00 2001 From: Bhagyada Modali Date: Fri, 2 Sep 2022 04:47:53 -0400 Subject: [PATCH] net/axgbe: fix length of each segment in scattered Rx [ upstream commit d901cc0596317a861b90a2c26b6560bde92bd2df ] Updating mbuf data_len, Pkt_len for each segment before chaining them Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu --- drivers/net/axgbe/axgbe_rxtx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index cbcbe0e682..b498f94ae2 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -392,6 +392,10 @@ next_desc: } } + /* Mbuf populate */ + mbuf->data_off = RTE_PKTMBUF_HEADROOM; + mbuf->data_len = data_len; + mbuf->pkt_len = data_len; if (first_seg != NULL) { if (rte_pktmbuf_chain(first_seg, mbuf) != 0) @@ -405,10 +409,6 @@ next_desc: if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV)) mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1); - /* Mbuf populate */ - mbuf->data_off = RTE_PKTMBUF_HEADROOM; - mbuf->data_len = data_len; - err_set: rxq->cur++; rxq->sw_ring[idx++] = tmbuf; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:25.994405255 +0000 +++ 0008-net-axgbe-fix-length-of-each-segment-in-scattered-Rx.patch 2022-11-03 09:27:25.305421124 +0000 @@ -1 +1 @@ -From d901cc0596317a861b90a2c26b6560bde92bd2df Mon Sep 17 00:00:00 2001 +From 81a3b2b2be3551e833c1fb4dbd365d56160da605 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d901cc0596317a861b90a2c26b6560bde92bd2df ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14,2 +15,2 @@ - drivers/net/axgbe/axgbe_rxtx.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) + drivers/net/axgbe/axgbe_rxtx.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) @@ -18 +19 @@ -index 2c2554e900..7c07fd90ef 100644 +index cbcbe0e682..b498f94ae2 100644 @@ -21 +22 @@ -@@ -412,6 +412,10 @@ next_desc: +@@ -392,6 +392,10 @@ next_desc: @@ -32,4 +33,4 @@ -@@ -443,9 +447,6 @@ next_desc: - mbuf->vlan_tci = 0; - } - } +@@ -405,10 +409,6 @@ next_desc: + if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV)) + mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1); + @@ -39 +40 @@ - +- @@ -41,0 +43 @@ + rxq->sw_ring[idx++] = tmbuf;