From: Billy McFall <bmcfall@redhat.com>
To: thomas.monjalon@6wind.com, wenzhuo.lu@intel.com
Cc: dev@dpdk.org, Billy McFall <bmcfall@redhat.com>
Subject: [dpdk-dev] [PATCH 1/3] ethdev: New API to free consumed buffers in TX ring
Date: Fri, 16 Dec 2016 07:48:49 -0500 [thread overview]
Message-ID: <20161216124851.2640-2-bmcfall@redhat.com> (raw)
In-Reply-To: <20161216124851.2640-1-bmcfall@redhat.com>
Add a new API to force free consumed buffers on TX ring. API will return
the number of packets freed (0-n) or error code if feature not supported
(-ENOTSUP) or input invalid (-ENODEV).
Because rte_eth_tx_buffer() may be used, and mbufs may still be held
in local buffer, the API also accepts *buffer and *sent. Before
attempting to free, rte_eth_tx_buffer_flush() is called to make sure
all mbufs are sent to Tx ring. rte_eth_tx_buffer_flush() is called even
if threshold is not met.
Signed-off-by: Billy McFall <bmcfall@redhat.com>
---
lib/librte_ether/rte_ethdev.h | 56 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 9678179..e3f2be4 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1150,6 +1150,9 @@ typedef uint32_t (*eth_rx_queue_count_t)(struct rte_eth_dev *dev,
typedef int (*eth_rx_descriptor_done_t)(void *rxq, uint16_t offset);
/**< @internal Check DD bit of specific RX descriptor */
+typedef int (*eth_tx_done_cleanup_t)(void *txq, uint32_t free_cnt);
+/**< @internal Force mbufs to be from TX ring. */
+
typedef void (*eth_rxq_info_get_t)(struct rte_eth_dev *dev,
uint16_t rx_queue_id, struct rte_eth_rxq_info *qinfo);
@@ -1467,6 +1470,7 @@ struct eth_dev_ops {
eth_rx_disable_intr_t rx_queue_intr_disable;
eth_tx_queue_setup_t tx_queue_setup;/**< Set up device TX queue.*/
eth_queue_release_t tx_queue_release;/**< Release TX queue.*/
+ eth_tx_done_cleanup_t tx_done_cleanup;/**< Free tx ring mbufs */
eth_dev_led_on_t dev_led_on; /**< Turn on LED. */
eth_dev_led_off_t dev_led_off; /**< Turn off LED. */
flow_ctrl_get_t flow_ctrl_get; /**< Get flow control. */
@@ -2943,6 +2947,58 @@ rte_eth_tx_buffer(uint8_t port_id, uint16_t queue_id,
}
/**
+ * Request the driver to free mbufs currently cached by the driver. The
+ * driver will only free the mbuf if it is no longer in use.
+ *
+ * @param port_id
+ * The port identifier of the Ethernet device.
+ * @param queue_id
+ * The index of the transmit queue through which output packets must be
+ * sent.
+ * The value must be in the range [0, nb_tx_queue - 1] previously supplied
+ * to rte_eth_dev_configure().
+ * @param free_cnt
+ * Maximum number of packets to free. Use 0 to indicate all possible packets
+ * should be freed. Note that a packet may be using multiple mbufs.
+ * @param buffer
+ * Buffer used to collect packets to be sent. If provided, the buffer will
+ * be flushed, even if the current length is less than buffer->size. Pass NULL
+ * if buffer has already been flushed.
+ * @param sent
+ * Pointer to return number of packets sent if buffer has packets to be sent.
+ * If *buffer is supplied, *sent must also be supplied.
+ * @return
+ * Failure: < 0
+ * -ENODEV: Invalid interface
+ * -ENOTSUP: Driver does not support function
+ * Success: >= 0
+ * 0-n: Number of packets freed. More packets may still remain in ring that
+ * are in use.
+ */
+
+static inline int
+rte_eth_tx_done_cleanup(uint8_t port_id, uint16_t queue_id, uint32_t free_cnt,
+ struct rte_eth_dev_tx_buffer *buffer, uint16_t *sent)
+{
+ struct rte_eth_dev *dev = &rte_eth_devices[port_id];
+
+ /* Validate Input Data. Bail if not valid or not supported. */
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+ RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_done_cleanup, -ENOTSUP);
+
+ /*
+ * If transmit buffer is provided and there are still packets to be
+ * sent, then send them before attempting to free pending mbufs.
+ */
+ if (buffer && sent)
+ *sent = rte_eth_tx_buffer_flush(port_id, queue_id, buffer);
+
+ /* Call driver to free pending mbufs. */
+ return (*dev->dev_ops->tx_done_cleanup)(dev->data->tx_queues[queue_id],
+ free_cnt);
+}
+
+/**
* Configure a callback for buffered packets which cannot be sent
*
* Register a specific callback to be called when an attempt is made to send
--
2.9.3
next prev parent reply other threads:[~2016-12-16 12:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-16 12:48 [dpdk-dev] [PATCH 0/3] " Billy McFall
2016-12-16 12:48 ` Billy McFall [this message]
2016-12-16 16:28 ` [dpdk-dev] [PATCH 1/3] ethdev: " Stephen Hemminger
2016-12-20 11:27 ` Adrien Mazarguil
2016-12-20 12:17 ` Ananyev, Konstantin
2016-12-20 12:58 ` Adrien Mazarguil
2016-12-20 14:15 ` Billy McFall
2016-12-23 9:45 ` Adrien Mazarguil
2016-12-16 12:48 ` [dpdk-dev] [PATCH 2/3] driver: e1000 igb support to free consumed buffers Billy McFall
2016-12-16 12:48 ` [dpdk-dev] [PATCH 3/3] driver: vHost " Billy McFall
2016-12-16 16:24 ` Stephen Hemminger
2017-01-11 19:54 ` Billy McFall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161216124851.2640-2-bmcfall@redhat.com \
--to=bmcfall@redhat.com \
--cc=dev@dpdk.org \
--cc=thomas.monjalon@6wind.com \
--cc=wenzhuo.lu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).