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 74B5DA00E6
for <public@inbox.dpdk.org>; Thu, 8 Aug 2019 10:23:05 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 81FB12C02;
Thu, 8 Aug 2019 10:23:04 +0200 (CEST)
Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com
[209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 6F9BB2B87
for <stable@dpdk.org>; Thu, 8 Aug 2019 10:22:55 +0200 (CEST)
Received: by mail-wr1-f67.google.com with SMTP id x1so44091007wrr.9
for <stable@dpdk.org>; Thu, 08 Aug 2019 01:22:55 -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=XrSoM7sWYMW5j5IWtXBl1iCLMJlzGsHmiPbeDmS+43JpPLJpeYOrefDDIrCks7+8wk
8jdWKXHmpCOGSEaoT12mYxvsITzrVJgH8i0aCo6uLXo66qkj2rorfEgaLATy5/7otaZ2
h4+A5222xF43dswxLL2QWoK+CVMHj9cc8nZosENMtkMxyvLkPjThUYTcbJdKKRSMxDwU
f58t7bGrgoE0mqC5xA3eEK2S8Rg5QbHdgDUlvjCfZlQZEbhhlSocDfpz8eXg/w582jKZ
UHqMhvuwjSxi4IKqMnlbDj9c8zoB5FIvXJEzhIEhZecJEeDTvCIQ58j5oVnrx/RcvV5S
gxCw==
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=YlX7zbh1f/hny4vvKEr97qlOW6JQwWcUbie/lhpZG2h6h56h4GpO6MynAscFPhsAUI
XMfsvr8TKAdTJmdbStyamaNFq12k5wg5EdLpNl4u4EtyOTYcI5WuA/eu5gg2MbeoQMSI
Ni4kFPVrJV8Dp8fA/JtqsGtC0BmU56F8NvK216N5na3zmkYi+aSL7Lp5DVp2e+hrHb7E
qAvtVZqD/r7HZBuIJlRZG1o0ZaWW6gXpjUEcoAQ9OjHo7EFScuEt8/Sj2RwPa+HVifSE
JBER18aIXySwuoNDfLKoohrNnEjm05zmWBCuSwmwokAyAZ4U0CHy0FH6D3Ls3Nb4Cq0S
0GdA==
X-Gm-Message-State: APjAAAWEIj2yb0mRmpqnqYUexNYusAayZF5xHA29FCI/G9DqYKnRbf5P
6+HT8Wq3i8HS0/JAUaMK+LAc
X-Google-Smtp-Source: APXvYqxO0ia4eDa3gMWwuBVnKXeLBonG7tjHczT9hRAeiuCufZzH1B+/Ns7ex3eM0XPhYNEuvk5fKw==
X-Received: by 2002:adf:ef10:: with SMTP id e16mr2981012wro.33.1565252575217;
Thu, 08 Aug 2019 01:22:55 -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 t13sm111437018wrr.0.2019.08.08.01.22.54
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Thu, 08 Aug 2019 01:22:54 -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: Thu, 8 Aug 2019 10:22:09 +0200
Message-Id: <60cc9d06e52d4a574be950720c37fd0dc6abc55f.1565252336.git.thierry.herbelot@6wind.com>
X-Mailer: git-send-email 2.11.0
In-Reply-To: <cover.1565252336.git.thierry.herbelot@6wind.com>
References: <cover.1565252336.git.thierry.herbelot@6wind.com>
In-Reply-To: <cover.1565252336.git.thierry.herbelot@6wind.com>
References: <cover.1565190405.git.thierry.herbelot@6wind.com>
<cover.1565252336.git.thierry.herbelot@6wind.com>
Subject: [dpdk-stable] [PATCH 19.11 V3 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