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 742A1A054A for ; Tue, 25 Oct 2022 17:09:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7067842C41; Tue, 25 Oct 2022 17:09:50 +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 39CC642C38 for ; Tue, 25 Oct 2022 17:09:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710587; 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=GFI3IYEh+d74sg9Gk1+1gwXaGIX/BbDUBQKOG9cBrgQ=; b=NiLxgPM+Qws3nB9hblATeQdh018qbk16IasIDWmQH38Wqn+usbSD09PyQcW5KK5wFwhCPk MRPsQFnkzhNuAcL2lu6dqrgExPoodEEiES/MeGzT4+ooeg5Z0vV6uulOo0m1Tj9439LFzY JEdTNAnkrd9StYp7peNX9QsFajc2LE4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-330-0nKtYjfEPtOhwhNzUfuyJw-1; Tue, 25 Oct 2022 11:09:44 -0400 X-MC-Unique: 0nKtYjfEPtOhwhNzUfuyJw-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 36907800B30; Tue, 25 Oct 2022 15:09:44 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5BDDB49BB62; Tue, 25 Oct 2022 15:09:43 +0000 (UTC) From: Kevin Traynor To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: save segment data in scattered Rx' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:12 +0100 Message-Id: <20221025150734.142189-77-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/fb442d0c0f2c81663ab7c61551fde83616b60ffa Thanks. Kevin --- >From fb442d0c0f2c81663ab7c61551fde83616b60ffa 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 968602bdff..1de5b29f06 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -418,4 +418,9 @@ next_desc: 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) { @@ -423,4 +428,5 @@ next_desc: first_seg = NULL; rte_pktmbuf_free(mbuf); + rxq->saved_mbuf = NULL; rxq->errors++; eop = 0; @@ -501,4 +507,8 @@ err_set: } + /* 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 2a330339cd..2da3095547 100644 --- a/drivers/net/axgbe/axgbe_rxtx.h +++ b/drivers/net/axgbe/axgbe_rxtx.h @@ -66,4 +66,10 @@ struct axgbe_rx_queue { /* 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; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.292195656 +0100 +++ 0077-net-axgbe-save-segment-data-in-scattered-Rx.patch 2022-10-25 14:18:58.505798428 +0100 @@ -1 +1 @@ -From 91907ec24783fedb28c7ebd82b88942caf0863ca Mon Sep 17 00:00:00 2001 +From fb442d0c0f2c81663ab7c61551fde83616b60ffa 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 968602bdff..1de5b29f06 100644 @@ -23 +24 @@ -@@ -417,4 +417,9 @@ next_desc: +@@ -418,4 +418,9 @@ next_desc: @@ -33 +34 @@ -@@ -422,4 +427,5 @@ next_desc: +@@ -423,4 +428,5 @@ next_desc: @@ -39 +40 @@ -@@ -500,4 +506,8 @@ err_set: +@@ -501,4 +507,8 @@ err_set: