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 5DC44A00C2 for ; Thu, 3 Nov 2022 10:28:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 59D2440694; Thu, 3 Nov 2022 10:28:31 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id B86BF40693 for ; Thu, 3 Nov 2022 10:28:29 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id c3-20020a1c3503000000b003bd21e3dd7aso2876312wma.1 for ; Thu, 03 Nov 2022 02:28:29 -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=ZMgKO7zZhvo9DFKynVYw3Ig27toQYlef1CZ5wbTvxkQ=; b=RQLfq+Q8fR8mEr91guQa7F+qiCKXmhgzP2kgnhexc3ginNcjKgBun0OAwTvbEERong VS7rIv7jbvtPVaqcWZWGwINxiAM+CyrnewZ+3E4ZgjycA8WE1PWZIRj5/05s+J5axe5e YI2dC8HybuUI6pJf2Lv+vl7uEozJirh8JLZph7cx3yFpX8iuqJ0beLHt0rGIkmoT1i9a XTwssPzvv19dVd4wo8iZsbp1RMye9GHF5hFTqjFfZUWMEcJALSy+48dURu6ixYVA2Pr3 KiSoP0ofOXUJJ07v/PWHLHc0r9/KKfILJuwXaaI0ACbW0BPg9jHmTHMpTsAd83Wo8hG3 jqbw== 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=ZMgKO7zZhvo9DFKynVYw3Ig27toQYlef1CZ5wbTvxkQ=; b=Z2kldOqw6IeBTUD9z7HYWIvMW4Cch0FcYUux7OuBEHU3n/zPfaUNQ666ZIQ4UQM7Im F99hEInemiuLEOAqLiQGnDqcPA5FHi41/7kHcDQeSrs86QmmhEbVT7VbX1dcniukCWaO CUfP/Ge7Ah+SfyhPrR0owYnBeDa8zk4q2zpnSgE1vwZpA6Ka+wPIQ5/ep7YkHkjtmQlY 568rna2D49iXSGBnvp/JhjIs5VuLBpeDMnSKflO9rxTQwT4nB2e+q1/1jogwPFoPQPW7 jh+I2evxZGYys/nPd5PpEgHhydl7E3kAgFmberCXkwSHd8lLWkE6xe94L51tsyVFBAab DwEg== X-Gm-Message-State: ACrzQf3XpS4csLQTSQk09MssJffH+URDxoUc7pWrqpOZoOkre6nGw505 GH8mDBDWebjYJb9WvN/YN1hE4lsET18gkQ== X-Google-Smtp-Source: AMsMyM7OFBetW+h/sl8SPYteeS/1ooQd3SYPyWjNrqqRI5fR/Vmj8w6eYbpnm8lfxnKiBEI14PXnCA== X-Received: by 2002:a05:600c:524c:b0:3cc:ed19:707 with SMTP id fc12-20020a05600c524c00b003cced190707mr19056516wmb.80.1667467709488; Thu, 03 Nov 2022 02:28:29 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id 19-20020a05600c021300b003c6b874a0dfsm755469wmi.14.2022.11.03.02.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:28:28 -0700 (PDT) From: luca.boccassi@gmail.com To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: optimise scattered Rx' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:26:28 +0000 Message-Id: <20221103092758.1099402-10-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/5423479bd366d73212f0efc91e68dbdc32ac9cfc Thanks. Luca Boccassi --- >From 5423479bd366d73212f0efc91e68dbdc32ac9cfc 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 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 6696f49a1e..8449eb9b63 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -321,7 +321,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, struct axgbe_rx_queue *rxq = 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; unsigned int err = 0; @@ -332,8 +331,7 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, while (nb_rx < nb_pkts) { 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]; @@ -412,12 +410,11 @@ 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) { rte_pktmbuf_free(mbuf); @@ -460,12 +457,13 @@ err_set: /* Save receive context.*/ 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:26.107132939 +0000 +++ 0010-net-axgbe-optimise-scattered-Rx.patch 2022-11-03 09:27:25.309421202 +0000 @@ -1 +1 @@ -From 2770163844038ed4fe862c438a7e65443be0c817 Mon Sep 17 00:00:00 2001 +From 5423479bd366d73212f0efc91e68dbdc32ac9cfc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2770163844038ed4fe862c438a7e65443be0c817 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14,2 +15,2 @@ - drivers/net/axgbe/axgbe_rxtx.c | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) + drivers/net/axgbe/axgbe_rxtx.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) @@ -18 +19 @@ -index 2bad638f79..8b43e8160b 100644 +index 6696f49a1e..8449eb9b63 100644 @@ -21 +22 @@ -@@ -340,7 +340,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, +@@ -321,7 +321,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, @@ -28,2 +29,2 @@ - unsigned int err = 0, etlt; -@@ -352,8 +351,7 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, + unsigned int err = 0; +@@ -332,8 +331,7 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, @@ -39,10 +40 @@ -@@ -446,19 +444,19 @@ next_desc: - ~RTE_MBUF_F_RX_VLAN_STRIPPED; - } 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; - } - } +@@ -412,12 +410,11 @@ next_desc: @@ -62 +54 @@ -@@ -501,12 +499,13 @@ err_set: +@@ -460,12 +457,13 @@ err_set: