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 9489DA054A for ; Tue, 25 Oct 2022 17:08:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9100542C34; Tue, 25 Oct 2022 17:08:19 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 6304C42C1D for ; Tue, 25 Oct 2022 17:08:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710497; 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=4KP0fGL05irOyyt8Uj/ydKr0h1V2z3trSBNdWbcyZPI=; b=Nc+hZFR0r0d/3nccPjUemfwer0RKRR2O3zS+WWteECfAEXbIFO2oV/bJP5lAoCNrKQiH4C vU3gEwuvQCf2N1EG41ayBQHjXmXiw3jBZCqt+38SuLj81O4Jc0VlK8ZmTGTmdipCMO6gW4 BwVhwHXnpdjEM20UBHRU19c3twA4nmM= 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-658-WQG-F5s0O3-NZaMRvOuDAQ-1; Tue, 25 Oct 2022 11:08:13 -0400 X-MC-Unique: WQG-F5s0O3-NZaMRvOuDAQ-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 9ECBA29AA3AE; Tue, 25 Oct 2022 15:08:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F05F492CA2; Tue, 25 Oct 2022 15:08:11 +0000 (UTC) From: Kevin Traynor To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: fix mbuf lengths in scattered Rx' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:05 +0100 Message-Id: <20221025150734.142189-10-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/fca744c60f26c0a6b35d45306e99fb3b388b6d3d Thanks. Kevin --- >From fca744c60f26c0a6b35d45306e99fb3b388b6d3d Mon Sep 17 00:00:00 2001 From: Bhagyada Modali Date: Fri, 2 Sep 2022 04:47:52 -0400 Subject: [PATCH] net/axgbe: fix mbuf lengths in scattered Rx [ upstream commit e73845354abce20ed9677c6519bcbe5a450fecef ] Updated pkt_len and data_len in the last segment of the packet. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu --- drivers/net/axgbe/axgbe_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index d7a4641133..cb973bb052 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -393,6 +393,6 @@ next_desc: eop = 1; pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3, - RX_NORMAL_DESC3, PL); - data_len = pkt_len - rxq->crc_len; + RX_NORMAL_DESC3, PL) - rxq->crc_len; + data_len = pkt_len % rxq->buf_size; /* Check for any errors and free mbuf*/ err = AXGMAC_GET_BITS_LE(desc->write.desc3, -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:58.808188707 +0100 +++ 0010-net-axgbe-fix-mbuf-lengths-in-scattered-Rx.patch 2022-10-25 14:18:58.361797912 +0100 @@ -1 +1 @@ -From e73845354abce20ed9677c6519bcbe5a450fecef Mon Sep 17 00:00:00 2001 +From fca744c60f26c0a6b35d45306e99fb3b388b6d3d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e73845354abce20ed9677c6519bcbe5a450fecef ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 89ed6fd74a..2c2554e900 100644 +index d7a4641133..cb973bb052 100644 @@ -21 +22 @@ -@@ -392,6 +392,6 @@ next_desc: +@@ -393,6 +393,6 @@ next_desc: