From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id D89E1A00E6
for <public@inbox.dpdk.org>; Wed, 7 Aug 2019 17:09:57 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 58F3B375B;
Wed, 7 Aug 2019 17:09:56 +0200 (CEST)
Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com
[209.85.128.67]) by dpdk.org (Postfix) with ESMTP id B42152BD3
for <stable@dpdk.org>; Wed, 7 Aug 2019 17:09:41 +0200 (CEST)
Received: by mail-wm1-f67.google.com with SMTP id s15so397365wmj.3
for <stable@dpdk.org>; Wed, 07 Aug 2019 08:09:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:in-reply-to:references;
bh=kjmIHGsCfgqSzCSWzLj6cccbRySma6yWkdPueL4fIXk=;
b=fnpkrq4qNcq6uZAmQ8wYQU4CMrm/JAgqRNUe0ikPWwO38TqBaB5drTvd+iacvEaGrz
NyoaXL0bLK7HznsEIoubGTUjs3flsmh4gCg6sGIYUKhALYGZF/iZDSV8JJcqMD9o6/be
lOLeeTU9QfDelPtDkMLOWf4fQn+6kU466i9Lb6ccIi2Dnu7bdjjuSIRbenMehTKp9wh5
fymafljA5uB584z+d8LGRnhy2faYNJF0wMzvrPr79v55BhUa+WrWrQ4zvJy4kkWZoBA0
cV0+/UMl/eEXIKFCHSm7IMT2sJFIRKebxovC1IEuYS5H52jn+h/dJykXK2CSbl8U4j6t
4t/Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:in-reply-to:references;
bh=kjmIHGsCfgqSzCSWzLj6cccbRySma6yWkdPueL4fIXk=;
b=ZyrD6EynVHEJK+a5QkGae8OqfLj6ksbY5qTgpMy60Ilj+8Lw9GhmW1Qt9RP5Phy3Jp
Lh/TvjU1p3feb6dkIGTc+/gk2zRgUWQ2VN2yNbd7fSbMJVmyYlWaLT3iQnYqa+lAl5AS
gpEFO7AlNvk3v8jzjxO9OylQmSAOTFCkbeJDjmBviy6/YNOknQjgSHjrQLRbEsauyy7P
Q9QhdiinBxqhGLyT3iBS9vL8U2zWf/UlUQQs/cv8rp+jK4IDRXO2GQdvrDrBQh+tUeYl
INPm/99madaIlXwJcwFcsRv3aIutSp+ULMvibOjSxlasYchgnxJwyM2pk9Q6DDjO5Yt2
ZZ0g==
X-Gm-Message-State: APjAAAVXSheFRrWVxQdQx1wYWE5XFWZjiDzyBrvduJiZtPxYYe3SolEg
rf7nf7JIwHNhOsXO8pA9Orc7
X-Google-Smtp-Source: APXvYqw5chacDMDDtZMpKjV7ssMja9fUW4kkFxzGDG+YAoS3grNBjax3F8muBMmRoS820fPuzYNwNw==
X-Received: by 2002:a1c:6555:: with SMTP id z82mr414257wmb.129.1565190581527;
Wed, 07 Aug 2019 08:09:41 -0700 (PDT)
Received: from ascain.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com.
[62.23.145.78])
by smtp.gmail.com with ESMTPSA id r5sm382862wmh.35.2019.08.07.08.09.40
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Wed, 07 Aug 2019 08:09:40 -0700 (PDT)
From: Thierry Herbelot <thierry.herbelot@6wind.com>
To: dev@dpdk.org
Cc: Olivier Matz <olivier.matz@6wind.com>, stable@dpdk.org,
Thomas Monjalon <thomas@monjalon.net>
Date: Wed, 7 Aug 2019 17:09:13 +0200
Message-Id: <792a739c6df952d3d132ec0b4ebc7a0e370d0277.1565190405.git.thierry.herbelot@6wind.com>
X-Mailer: git-send-email 2.11.0
In-Reply-To: <cover.1565190405.git.thierry.herbelot@6wind.com>
References: <cover.1565190405.git.thierry.herbelot@6wind.com>
In-Reply-To: <cover.1565190405.git.thierry.herbelot@6wind.com>
References: <cover.1565188248.git.thierry.herbelot@6wind.com>
<cover.1565190405.git.thierry.herbelot@6wind.com>
Subject: [dpdk-stable] [PATCH 19.11 V2 04/12] net/e1000: fix Tx descriptor
status api (em)
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
From: Olivier Matz <olivier.matz@6wind.com>
The Tx descriptor status api was not behaving as expected. This API is
used to inspect the content of the descriptors in the Tx ring to
determine the length of the Tx queue.
Since the software advances the tail pointer and the hardware advances
the head pointer, the Tx queue is located before txq->tx_tail in the
ring. Therefore, a call to rte_eth_tx_descriptor_status(..., offset=20)
should inspect the 20th descriptor before the tail, not after.
As before, we still need to take care about only checking descriptors
that have the RS bit.
Additionally, we can avoid an access to the ring if offset is greater or
equal to nb_tx_desc - nb_tx_free.
Fixes: b9082317cab3 ("net/e1000: implement descriptor status API (em)")
Cc: stable@dpdk.org
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
drivers/net/e1000/em_rxtx.c | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
index 5925e490641b..3061998c7768 100644
--- a/drivers/net/e1000/em_rxtx.c
+++ b/drivers/net/e1000/em_rxtx.c
@@ -152,6 +152,7 @@ struct em_tx_queue {
uint64_t tx_ring_phys_addr; /**< TX ring DMA address. */
struct em_tx_entry *sw_ring; /**< virtual address of SW ring. */
volatile uint32_t *tdt_reg_addr; /**< Address of TDT register. */
+ volatile uint32_t *tdh_reg_addr; /**< Address of TDH register. */
uint16_t nb_tx_desc; /**< number of TX descriptors. */
uint16_t tx_tail; /**< Current value of TDT register. */
/**< Start freeing TX buffers if there are less free descriptors than
@@ -1304,6 +1305,7 @@ eth_em_tx_queue_setup(struct rte_eth_dev *dev,
txq->port_id = dev->data->port_id;
txq->tdt_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_TDT(queue_idx));
+ txq->tdh_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_TDH(queue_idx));
txq->tx_ring_phys_addr = tz->iova;
txq->tx_ring = (struct e1000_data_desc *) tz->addr;
@@ -1557,22 +1559,33 @@ eth_em_tx_descriptor_status(void *tx_queue, uint16_t offset)
{
struct em_tx_queue *txq = tx_queue;
volatile uint8_t *status;
- uint32_t desc;
+ int32_t desc, dd;
if (unlikely(offset >= txq->nb_tx_desc))
return -EINVAL;
+ if (offset >= txq->nb_tx_desc - txq->nb_tx_free)
+ return RTE_ETH_TX_DESC_DONE;
- desc = txq->tx_tail + offset;
- /* go to next desc that has the RS bit */
- desc = ((desc + txq->tx_rs_thresh - 1) / txq->tx_rs_thresh) *
- txq->tx_rs_thresh;
- if (desc >= txq->nb_tx_desc) {
- desc -= txq->nb_tx_desc;
- if (desc >= txq->nb_tx_desc)
- desc -= txq->nb_tx_desc;
+ desc = txq->tx_tail - offset - 1;
+ if (desc < 0)
+ desc += txq->nb_tx_desc;
+
+ /* offset is too small, no other way than reading PCI reg */
+ if (unlikely(offset < txq->tx_rs_thresh)) {
+ int16_t tx_head, queue_size;
+ tx_head = e1000_read_addr(txq->tdh_reg_addr);
+ queue_size = txq->tx_tail - tx_head;
+ if (queue_size < 0)
+ queue_size += txq->nb_tx_desc;
+ return queue_size > offset ? RTE_ETH_TX_DESC_FULL :
+ RTE_ETH_TX_DESC_DONE;
}
- status = &txq->tx_ring[desc].upper.fields.status;
+ /* index of the dd bit to look at */
+ dd = (desc / txq->tx_rs_thresh + 1) * txq->tx_rs_thresh - 1;
+ dd = txq->sw_ring[dd].last_id;
+
+ status = &txq->tx_ring[dd].upper.fields.status;
if (*status & E1000_TXD_STAT_DD)
return RTE_ETH_TX_DESC_DONE;
--
2.11.0