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 45F4DA054A for ; Tue, 25 Oct 2022 17:08:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4182D42C34; Tue, 25 Oct 2022 17:08:27 +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 1B26442C34 for ; Tue, 25 Oct 2022 17:08:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710504; 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=aiq1bHKyoW9+Dha/tyDJQ2BOGN88fwiumHl/p8CrTZE=; b=NbYEnATXZjFfcGSf6EQDFLckgitV8pVRBkvjHF4/rDMZR1XQ42VUl5cnAPbNJuzUc9Y1xs KvAK7F4BMh+5DxfqXF3eQXp2hx/aOwIciOIdl4eQrKWRvb0FjVpXAZZ3eoYh/7XgwS/Gwt T5RgBuphoKgfvXO0s001YnykGnTe6u4= 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-202-e0VH5L4FOKWiJTDq8_lEpg-1; Tue, 25 Oct 2022 11:08:18 -0400 X-MC-Unique: e0VH5L4FOKWiJTDq8_lEpg-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 0BF6F185A7AE; Tue, 25 Oct 2022 15:08:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03A034A9255; Tue, 25 Oct 2022 15:08:15 +0000 (UTC) From: Kevin Traynor To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: optimise scattered Rx' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:08 +0100 Message-Id: <20221025150734.142189-13-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/c57a09f16a5cf3c47127fa43bdbb695970094f63 Thanks. Kevin --- >From c57a09f16a5cf3c47127fa43bdbb695970094f63 Mon Sep 17 00:00:00 2001 From: Bhagyada Modali Date: Tue, 6 Sep 2022 07:59:15 -0400 Subject: [PATCH] net/axgbe: optimise scattered Rx [ upstream commit 2770163844038ed4fe862c438a7e65443be0c817 ] Updated the logic to remove the extra increments of the variables. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu --- drivers/net/axgbe/axgbe_rxtx.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 9d6ea38f45..7a95a1c437 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -342,5 +342,4 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, volatile union axgbe_rx_desc *desc; - uint64_t old_dirty = rxq->dirty; struct rte_mbuf *first_seg = NULL; struct rte_mbuf *mbuf, *tmbuf; @@ -354,6 +353,5 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, bool eop = 0; next_desc: - if (unlikely(idx == rxq->nb_desc)) - idx = 0; + idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur); desc = &rxq->desc[idx]; @@ -448,5 +446,6 @@ next_desc: } else { first_seg->ol_flags &= - ~(RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED); + ~(RTE_MBUF_F_RX_VLAN | + RTE_MBUF_F_RX_VLAN_STRIPPED); first_seg->vlan_tci = 0; } @@ -455,10 +454,9 @@ next_desc: err_set: rxq->cur++; - rxq->sw_ring[idx++] = tmbuf; + rxq->sw_ring[idx] = tmbuf; desc->read.baddr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(tmbuf)); memset((void *)(&desc->read.desc2), 0, 8); AXGMAC_SET_BITS_LE(desc->read.desc3, RX_NORMAL_DESC3, OWN, 1); - rxq->dirty++; if (!eop) { @@ -503,10 +501,11 @@ err_set: rxq->pkts += nb_rx; - if (rxq->dirty != old_dirty) { + if (rxq->dirty != rxq->cur) { rte_wmb(); - idx = AXGBE_GET_DESC_IDX(rxq, rxq->dirty - 1); + idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur - 1); AXGMAC_DMA_IOWRITE(rxq, DMA_CH_RDTR_LO, low32_value(rxq->ring_phys_addr + (idx * sizeof(union axgbe_rx_desc)))); + rxq->dirty = rxq->cur; } return nb_rx; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:58.869446248 +0100 +++ 0013-net-axgbe-optimise-scattered-Rx.patch 2022-10-25 14:18:58.363797919 +0100 @@ -1 +1 @@ -From 2770163844038ed4fe862c438a7e65443be0c817 Mon Sep 17 00:00:00 2001 +From c57a09f16a5cf3c47127fa43bdbb695970094f63 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2770163844038ed4fe862c438a7e65443be0c817 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 2bad638f79..8b43e8160b 100644 +index 9d6ea38f45..7a95a1c437 100644 @@ -21 +22 @@ -@@ -341,5 +341,4 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, +@@ -342,5 +342,4 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, @@ -27 +28 @@ -@@ -353,6 +352,5 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, +@@ -354,6 +353,5 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, @@ -35 +36 @@ -@@ -447,5 +445,6 @@ next_desc: +@@ -448,5 +446,6 @@ next_desc: @@ -43 +44 @@ -@@ -454,10 +453,9 @@ next_desc: +@@ -455,10 +454,9 @@ next_desc: @@ -55 +56 @@ -@@ -502,10 +500,11 @@ err_set: +@@ -503,10 +501,11 @@ err_set: