From: Shahaf Shuler <shahafs@mellanox.com>
To: thomas@monjalon.net
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 4/4] ethdev: add helpers to move to the new offloads API
Date: Mon, 4 Sep 2017 10:12:18 +0300 [thread overview]
Message-ID: <810c1d26724f82f0d9fc9d6684dc4b1c62fd5f62.1504508375.git.shahafs@mellanox.com> (raw)
In-Reply-To: <cover.1504508374.git.shahafs@mellanox.com>
A new offloads API was introduced by commits:
commit 121fff673172 ("ethdev: introduce Rx queue offloads API")
commit 35ac80d92f29 ("ethdev: introduce Tx queue offloads API")
In order to enable the PMDs to support only one of the APIs,
a conversion functions from the old to new API were added.
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
---
lib/librte_ether/rte_ethdev.c | 99 +++++++++++++++++++++++++++++++++++++-
1 file changed, 97 insertions(+), 2 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 50f8aa98d..1aa21a129 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1006,6 +1006,34 @@ rte_eth_dev_close(uint8_t port_id)
dev->data->tx_queues = NULL;
}
+/**
+ * A conversion function from rxmode offloads API to rte_eth_rxq_conf
+ * offloads API.
+ */
+static void
+rte_eth_convert_rxmode_offloads(struct rte_eth_rxmode *rxmode,
+ struct rte_eth_rxq_conf *rxq_conf)
+{
+ if (rxmode->header_split == 1)
+ rxq_conf->offloads |= DEV_RX_OFFLOAD_HEADER_SPLIT;
+ if (rxmode->hw_ip_checksum == 1)
+ rxq_conf->offloads |= DEV_RX_OFFLOAD_CHECKSUM;
+ if (rxmode->hw_vlan_filter == 1)
+ rxq_conf->offloads |= DEV_RX_OFFLOAD_VLAN_FILTER;
+ if (rxmode->hw_vlan_strip == 1)
+ rxq_conf->offloads |= DEV_RX_OFFLOAD_VLAN_STRIP;
+ if (rxmode->hw_vlan_extend == 1)
+ rxq_conf->offloads |= DEV_RX_OFFLOAD_VLAN_EXTEND;
+ if (rxmode->jumbo_frame == 1)
+ rxq_conf->offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
+ if (rxmode->hw_strip_crc == 1)
+ rxq_conf->offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
+ if (rxmode->enable_scatter == 1)
+ rxq_conf->offloads |= DEV_RX_OFFLOAD_SCATTER;
+ if (rxmode->enable_lro == 1)
+ rxq_conf->offloads |= DEV_RX_OFFLOAD_TCP_LRO;
+}
+
int
rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
uint16_t nb_rx_desc, unsigned int socket_id,
@@ -1016,6 +1044,8 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
uint32_t mbp_buf_size;
struct rte_eth_dev *dev;
struct rte_eth_dev_info dev_info;
+ struct rte_eth_rxq_conf rxq_trans_conf;
+ /* Holds translated configuration to be passed to the PMD */
void **rxq;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
@@ -1062,6 +1092,11 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
return -EINVAL;
}
+ if ((!(dev->data->dev_flags & RTE_ETH_DEV_RXQ_OFFLOAD)) &&
+ (dev->data->dev_conf.rxmode.ignore_offloads == 1)) {
+ return -ENOTSUP;
+ }
+
if (nb_rx_desc > dev_info.rx_desc_lim.nb_max ||
nb_rx_desc < dev_info.rx_desc_lim.nb_min ||
nb_rx_desc % dev_info.rx_desc_lim.nb_align != 0) {
@@ -1086,8 +1121,15 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
if (rx_conf == NULL)
rx_conf = &dev_info.default_rxconf;
+ rxq_trans_conf = *rx_conf;
+ if ((dev->data->dev_flags & RTE_ETH_DEV_RXQ_OFFLOAD) &&
+ (dev->data->dev_conf.rxmode.ignore_offloads == 0)) {
+ rte_eth_convert_rxmode_offloads(&dev->data->dev_conf.rxmode,
+ &rxq_trans_conf);
+ }
+
ret = (*dev->dev_ops->rx_queue_setup)(dev, rx_queue_id, nb_rx_desc,
- socket_id, rx_conf, mp);
+ socket_id, &rxq_trans_conf, mp);
if (!ret) {
if (!dev->data->min_rx_buf_size ||
dev->data->min_rx_buf_size > mbp_buf_size)
@@ -1097,6 +1139,49 @@ rte_eth_rx_queue_setup(uint8_t port_id, uint16_t rx_queue_id,
return ret;
}
+/**
+ * A conversion function from txq_flags to rte_eth_txq_conf offloads API.
+ */
+static void
+rte_eth_convert_txq_flags(struct rte_eth_txq_conf *txq_conf)
+{
+ uint32_t txq_flags = txq_conf->txq_flags;
+ uint64_t *offloads = &txq_conf->offloads;
+
+ if (!(txq_flags & ETH_TXQ_FLAGS_NOMULTSEGS))
+ *offloads |= DEV_TX_OFFLOAD_MULTI_SEGS;
+ if (!(txq_flags & ETH_TXQ_FLAGS_NOVLANOFFL))
+ *offloads |= DEV_TX_OFFLOAD_VLAN_INSERT;
+ if (!(txq_flags & ETH_TXQ_FLAGS_NOXSUMSCTP))
+ *offloads |= DEV_TX_OFFLOAD_SCTP_CKSUM;
+ if (!(txq_flags & ETH_TXQ_FLAGS_NOXSUMUDP))
+ *offloads |= DEV_TX_OFFLOAD_UDP_CKSUM;
+ if (!(txq_flags & ETH_TXQ_FLAGS_NOXSUMTCP))
+ *offloads |= DEV_TX_OFFLOAD_TCP_CKSUM;
+}
+
+/**
+ * A conversion function between rte_eth_txq_conf offloads API to txq_flags
+ * offloads API.
+ */
+static void
+rte_eth_convert_txq_offloads(struct rte_eth_txq_conf *txq_conf)
+{
+ uint32_t *txq_flags = &txq_conf->txq_flags;
+ uint64_t offloads = txq_conf->offloads;
+
+ if (!(offloads & DEV_TX_OFFLOAD_MULTI_SEGS))
+ *txq_flags |= ETH_TXQ_FLAGS_NOMULTSEGS;
+ if (!(offloads & DEV_TX_OFFLOAD_VLAN_INSERT))
+ *txq_flags |= ETH_TXQ_FLAGS_NOVLANOFFL;
+ if (!(offloads & DEV_TX_OFFLOAD_SCTP_CKSUM))
+ *txq_flags |= ETH_TXQ_FLAGS_NOXSUMSCTP;
+ if (!(offloads & DEV_TX_OFFLOAD_UDP_CKSUM))
+ *txq_flags |= ETH_TXQ_FLAGS_NOXSUMUDP;
+ if (!(offloads & DEV_TX_OFFLOAD_TCP_CKSUM))
+ *txq_flags |= ETH_TXQ_FLAGS_NOXSUMTCP;
+}
+
int
rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,
uint16_t nb_tx_desc, unsigned int socket_id,
@@ -1104,6 +1189,8 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,
{
struct rte_eth_dev *dev;
struct rte_eth_dev_info dev_info;
+ struct rte_eth_txq_conf txq_trans_conf;
+ /* Holds translated configuration to be passed to the PMD */
void **txq;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
@@ -1148,8 +1235,16 @@ rte_eth_tx_queue_setup(uint8_t port_id, uint16_t tx_queue_id,
if (tx_conf == NULL)
tx_conf = &dev_info.default_txconf;
+ txq_trans_conf = *tx_conf;
+ if ((dev->data->dev_flags & RTE_ETH_DEV_TXQ_OFFLOAD) &&
+ (!(tx_conf->txq_flags & ETH_TXQ_FLAGS_IGNORE)))
+ rte_eth_convert_txq_flags(&txq_trans_conf);
+ else if (!(dev->data->dev_flags & RTE_ETH_DEV_TXQ_OFFLOAD) &&
+ (tx_conf->txq_flags & ETH_TXQ_FLAGS_IGNORE))
+ rte_eth_convert_txq_offloads(&txq_trans_conf);
+
return (*dev->dev_ops->tx_queue_setup)(dev, tx_queue_id, nb_tx_desc,
- socket_id, tx_conf);
+ socket_id, &txq_trans_conf);
}
void
--
2.12.0
next prev parent reply other threads:[~2017-09-04 7:12 UTC|newest]
Thread overview: 134+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-04 7:12 [dpdk-dev] [PATCH 0/4] ethdev " Shahaf Shuler
2017-09-04 7:12 ` [dpdk-dev] [PATCH 1/4] ethdev: rename Rx and Tx configuration structs Shahaf Shuler
2017-09-04 12:06 ` Ananyev, Konstantin
2017-09-04 12:45 ` Shahaf Shuler
2017-09-04 7:12 ` [dpdk-dev] [PATCH 2/4] ethdev: introduce Rx queue offloads API Shahaf Shuler
2017-09-04 7:12 ` [dpdk-dev] [PATCH 3/4] ethdev: introduce Tx " Shahaf Shuler
2017-09-04 7:12 ` Shahaf Shuler [this message]
2017-09-04 12:13 ` [dpdk-dev] [PATCH 4/4] ethdev: add helpers to move to the new " Ananyev, Konstantin
2017-09-04 13:25 ` Ananyev, Konstantin
2017-09-04 13:53 ` Thomas Monjalon
2017-09-04 14:18 ` Ananyev, Konstantin
2017-09-05 7:48 ` Thomas Monjalon
2017-09-05 8:09 ` Ananyev, Konstantin
2017-09-05 10:51 ` Shahaf Shuler
2017-09-05 13:50 ` Thomas Monjalon
2017-09-05 15:31 ` Ananyev, Konstantin
2017-09-06 6:01 ` Shahaf Shuler
2017-09-06 9:33 ` Ananyev, Konstantin
2017-09-13 9:27 ` Thomas Monjalon
2017-09-13 11:16 ` Shahaf Shuler
2017-09-13 12:41 ` Thomas Monjalon
2017-09-13 12:56 ` Ananyev, Konstantin
2017-09-13 13:20 ` Thomas Monjalon
2017-09-13 21:42 ` Ananyev, Konstantin
2017-09-14 8:02 ` Thomas Monjalon
2017-09-18 10:31 ` Bruce Richardson
2017-09-18 10:57 ` Ananyev, Konstantin
2017-09-18 11:04 ` Bruce Richardson
2017-09-18 11:27 ` Thomas Monjalon
2017-09-18 11:04 ` Bruce Richardson
2017-09-18 11:11 ` Ananyev, Konstantin
2017-09-18 11:32 ` Thomas Monjalon
2017-09-18 11:37 ` Bruce Richardson
2017-09-18 14:27 ` Shahaf Shuler
2017-09-18 14:42 ` Thomas Monjalon
2017-09-18 14:44 ` Bruce Richardson
2017-09-18 18:18 ` Shahaf Shuler
2017-09-18 21:08 ` Thomas Monjalon
2017-09-19 7:33 ` Shahaf Shuler
2017-09-19 7:56 ` Thomas Monjalon
2017-09-13 12:56 ` Shahaf Shuler
2017-09-04 14:02 ` Shahaf Shuler
2017-09-04 15:55 ` Ananyev, Konstantin
2017-09-10 12:07 ` [dpdk-dev] [PATCH v2 0/2] ethdev " Shahaf Shuler
2017-09-10 12:07 ` [dpdk-dev] [PATCH v2 1/2] ethdev: introduce Rx queue " Shahaf Shuler
2017-09-10 12:07 ` [dpdk-dev] [PATCH v2 2/2] ethdev: introduce Tx " Shahaf Shuler
2017-09-10 17:48 ` Stephen Hemminger
2017-09-11 5:52 ` Shahaf Shuler
2017-09-11 6:21 ` Jerin Jacob
2017-09-11 7:56 ` Shahaf Shuler
2017-09-11 8:06 ` Jerin Jacob
2017-09-11 8:46 ` Shahaf Shuler
2017-09-11 9:05 ` Jerin Jacob
2017-09-11 11:02 ` Ananyev, Konstantin
2017-09-12 4:01 ` Jerin Jacob
2017-09-12 5:25 ` Shahaf Shuler
2017-09-12 5:51 ` Jerin Jacob
2017-09-12 6:35 ` Shahaf Shuler
2017-09-12 6:46 ` Andrew Rybchenko
2017-09-12 7:17 ` Jerin Jacob
2017-09-12 8:03 ` Shahaf Shuler
2017-09-12 10:27 ` Andrew Rybchenko
2017-09-12 14:26 ` Ananyev, Konstantin
2017-09-12 14:36 ` Jerin Jacob
2017-09-12 14:43 ` Andrew Rybchenko
2017-09-12 6:43 ` Andrew Rybchenko
2017-09-12 6:59 ` Shahaf Shuler
2017-09-11 8:03 ` Andrew Rybchenko
2017-09-11 12:27 ` Shahaf Shuler
2017-09-11 13:10 ` Andrew Rybchenko
2017-09-13 6:37 ` [dpdk-dev] [PATCH v3 0/2] ethdev new " Shahaf Shuler
2017-09-13 6:37 ` [dpdk-dev] [PATCH v3 1/2] ethdev: introduce Rx queue " Shahaf Shuler
2017-09-13 8:13 ` Andrew Rybchenko
2017-09-13 12:49 ` Shahaf Shuler
2017-09-13 8:49 ` Andrew Rybchenko
2017-09-13 9:13 ` Andrew Rybchenko
2017-09-13 12:33 ` Shahaf Shuler
2017-09-13 12:34 ` Andrew Rybchenko
2017-09-13 6:37 ` [dpdk-dev] [PATCH v3 2/2] ethdev: introduce Tx " Shahaf Shuler
2017-09-13 8:40 ` Andrew Rybchenko
2017-09-13 12:51 ` Shahaf Shuler
2017-09-13 9:10 ` [dpdk-dev] [PATCH v3 0/2] ethdev new " Andrew Rybchenko
2017-09-17 6:54 ` [dpdk-dev] [PATCH v4 0/3] " Shahaf Shuler
2017-09-17 6:54 ` [dpdk-dev] [PATCH v4 1/3] ethdev: introduce Rx queue " Shahaf Shuler
2017-09-17 6:54 ` [dpdk-dev] [PATCH v4 2/3] ethdev: introduce Tx " Shahaf Shuler
2017-09-18 7:50 ` Andrew Rybchenko
2017-09-17 6:54 ` [dpdk-dev] [PATCH v4 3/3] doc: add details on ethdev " Shahaf Shuler
2017-09-18 7:51 ` Andrew Rybchenko
2017-09-18 13:40 ` Mcnamara, John
2017-09-18 7:51 ` [dpdk-dev] [PATCH v4 0/3] ethdev new " Andrew Rybchenko
2017-09-28 18:54 ` [dpdk-dev] [PATCH v5 " Shahaf Shuler
2017-09-28 18:54 ` [dpdk-dev] [PATCH v5 1/3] ethdev: introduce Rx queue " Shahaf Shuler
2017-10-03 0:32 ` Ferruh Yigit
2017-10-03 6:25 ` Shahaf Shuler
2017-10-03 19:46 ` Ferruh Yigit
2017-09-28 18:54 ` [dpdk-dev] [PATCH v5 2/3] ethdev: introduce Tx " Shahaf Shuler
2017-10-03 19:50 ` Ferruh Yigit
2017-10-04 8:06 ` Shahaf Shuler
2017-09-28 18:54 ` [dpdk-dev] [PATCH v5 3/3] doc: add details on ethdev " Shahaf Shuler
2017-10-04 8:17 ` [dpdk-dev] [PATCH v6 0/4] ethdev new " Shahaf Shuler
2017-10-04 8:17 ` [dpdk-dev] [PATCH v6 1/4] ethdev: introduce Rx queue " Shahaf Shuler
2017-10-04 8:17 ` [dpdk-dev] [PATCH v6 2/4] ethdev: introduce Tx " Shahaf Shuler
2017-10-04 8:18 ` [dpdk-dev] [PATCH v6 3/4] ethdev: add mbuf fast free Tx offload Shahaf Shuler
2017-10-04 8:18 ` [dpdk-dev] [PATCH v6 4/4] doc: add details on ethdev offloads API Shahaf Shuler
2017-10-04 13:46 ` Mcnamara, John
2018-03-15 1:58 ` Patil, Harish
2018-03-15 6:05 ` Shahaf Shuler
2018-03-16 15:51 ` [dpdk-dev] [PATCH] doc: update new ethdev offload API description Ferruh Yigit
2018-03-17 0:16 ` Patil, Harish
2018-03-18 5:52 ` Shahaf Shuler
2018-03-21 9:47 ` Andrew Rybchenko
2018-03-21 10:54 ` Ferruh Yigit
2018-03-21 11:08 ` Andrew Rybchenko
2018-03-21 11:10 ` Shahaf Shuler
2018-03-21 11:19 ` Andrew Rybchenko
2018-03-21 11:23 ` Shahaf Shuler
2018-03-21 11:37 ` Andrew Rybchenko
2018-03-21 11:40 ` Shahaf Shuler
2018-03-21 12:52 ` Ferruh Yigit
2018-03-21 13:06 ` Shahaf Shuler
2018-03-21 13:11 ` Ananyev, Konstantin
2018-03-21 12:03 ` Ananyev, Konstantin
2018-03-21 12:29 ` Shahaf Shuler
2018-03-21 12:34 ` Andrew Rybchenko
2018-03-21 12:37 ` Ananyev, Konstantin
2018-03-21 14:08 ` Thomas Monjalon
2018-03-21 14:28 ` Ferruh Yigit
2018-03-21 14:40 ` Thomas Monjalon
2018-03-21 15:26 ` Bruce Richardson
2018-03-21 15:29 ` Shahaf Shuler
2018-03-21 15:44 ` Bruce Richardson
2018-05-08 12:33 ` Ferruh Yigit
2017-10-04 16:12 ` [dpdk-dev] [PATCH v6 0/4] ethdev new offloads API Ananyev, Konstantin
2017-10-05 0:55 ` Ferruh Yigit
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=810c1d26724f82f0d9fc9d6684dc4b1c62fd5f62.1504508375.git.shahafs@mellanox.com \
--to=shahafs@mellanox.com \
--cc=dev@dpdk.org \
--cc=thomas@monjalon.net \
/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).