* [dpdk-dev] [PATCH 2/9] net/dpaa2: support per port Rx mbuf timestamp
2020-07-10 16:21 [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Hemant Agrawal
@ 2020-07-10 16:21 ` Hemant Agrawal
2020-07-10 16:21 ` [dpdk-dev] [PATCH 3/9] net/dpaa: add Tx/Rx burst mode info Hemant Agrawal
` (8 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Hemant Agrawal @ 2020-07-10 16:21 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, Hemant Agrawal
DEV_RX_OFFLOAD_TIMESTAMP is per port, so the internal implementation
shall enable it on per port basis only.
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
doc/guides/nics/features/dpaa2.ini | 2 ++
drivers/net/dpaa2/dpaa2_ethdev.c | 4 ++--
drivers/net/dpaa2/dpaa2_ethdev.h | 2 +-
drivers/net/dpaa2/dpaa2_rxtx.c | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/doc/guides/nics/features/dpaa2.ini b/doc/guides/nics/features/dpaa2.ini
index 3685e2e02..831883d21 100644
--- a/doc/guides/nics/features/dpaa2.ini
+++ b/doc/guides/nics/features/dpaa2.ini
@@ -21,6 +21,8 @@ VLAN offload = Y
L3 checksum offload = Y
L4 checksum offload = Y
Packet type parsing = Y
+Timesync = Y
+Timestamp offload = Y
Basic stats = Y
Extended stats = Y
FW version = Y
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index c530596cd..3e5502de5 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -64,7 +64,7 @@ static uint64_t dev_tx_offloads_nodis =
DEV_TX_OFFLOAD_MULTI_SEGS;
/* enable timestamp in mbuf */
-bool dpaa2_enable_ts;
+bool dpaa2_enable_ts[RTE_MAX_ETHPORTS];
struct rte_dpaa2_xstats_name_off {
char name[RTE_ETH_XSTATS_NAME_SIZE];
@@ -525,7 +525,7 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
#if !defined(RTE_LIBRTE_IEEE1588)
if (rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP)
#endif
- dpaa2_enable_ts = true;
+ dpaa2_enable_ts[dev->data->port_id] = true;
if (tx_offloads & DEV_TX_OFFLOAD_IPV4_CKSUM)
tx_l3_csum_offload = true;
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h
index 2e6d26d4f..e577355d5 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.h
+++ b/drivers/net/dpaa2/dpaa2_ethdev.h
@@ -91,7 +91,7 @@
#define DPAA2_PKT_TYPE_VLAN_2 0x0260
/* enable timestamp in mbuf*/
-extern bool dpaa2_enable_ts;
+extern bool dpaa2_enable_ts[];
#define DPAA2_QOS_TABLE_RECONFIGURE 1
#define DPAA2_FS_TABLE_RECONFIGURE 2
diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index 86cb95268..4dd1d5f57 100644
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -108,7 +108,7 @@ dpaa2_dev_rx_parse_new(struct rte_mbuf *m, const struct qbman_fd *fd,
m->hash.rss = fd->simple.flc_hi;
m->ol_flags |= PKT_RX_RSS_HASH;
- if (dpaa2_enable_ts) {
+ if (dpaa2_enable_ts[m->port]) {
m->timestamp = annotation->word2;
m->ol_flags |= PKT_RX_TIMESTAMP;
DPAA2_PMD_DP_DEBUG("pkt timestamp:0x%" PRIx64 "", m->timestamp);
--
2.17.1
^ permalink raw reply [flat|nested] 12+ messages in thread* [dpdk-dev] [PATCH 3/9] net/dpaa: add Tx/Rx burst mode info
2020-07-10 16:21 [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Hemant Agrawal
2020-07-10 16:21 ` [dpdk-dev] [PATCH 2/9] net/dpaa2: support per port Rx mbuf timestamp Hemant Agrawal
@ 2020-07-10 16:21 ` Hemant Agrawal
2020-07-10 16:21 ` [dpdk-dev] [PATCH 4/9] net/dpaa2: " Hemant Agrawal
` (7 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Hemant Agrawal @ 2020-07-10 16:21 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, Apeksha Gupta
From: Apeksha Gupta <apeksha.gupta@nxp.com>
Retrieve burst mode information according to the selected Rx/Tx mode
and offloads.
Signed-off-by: Apeksha Gupta <apeksha.gupta@nxp.com>
---
doc/guides/nics/features/dpaa.ini | 1 +
drivers/net/dpaa/dpaa_ethdev.c | 70 ++++++++++++++++++++++++++++++-
2 files changed, 70 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/features/dpaa.ini b/doc/guides/nics/features/dpaa.ini
index 816a6e08e..e0ed3e868 100644
--- a/doc/guides/nics/features/dpaa.ini
+++ b/doc/guides/nics/features/dpaa.ini
@@ -7,6 +7,7 @@
Speed capabilities = Y
Link status = Y
Link status event = Y
+Burst mode info = Y
Jumbo frame = Y
MTU update = Y
Scattered Rx = Y
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 3a5b319d4..62ecb112f 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -457,6 +457,73 @@ static int dpaa_eth_dev_info(struct rte_eth_dev *dev,
return 0;
}
+static int
+dpaa_dev_rx_burst_mode_get(struct rte_eth_dev *dev,
+ __rte_unused uint16_t queue_id,
+ struct rte_eth_burst_mode *mode)
+{
+ struct rte_eth_conf *eth_conf = &dev->data->dev_conf;
+ int ret = -EINVAL;
+ unsigned int i;
+ const struct burst_info {
+ uint64_t flags;
+ const char *output;
+ } rx_offload_map[] = {
+ {DEV_RX_OFFLOAD_JUMBO_FRAME, " Jumbo frame,"},
+ {DEV_RX_OFFLOAD_SCATTER, " Scattered,"},
+ {DEV_RX_OFFLOAD_IPV4_CKSUM, " IPV4 csum,"},
+ {DEV_RX_OFFLOAD_UDP_CKSUM, " UDP csum,"},
+ {DEV_RX_OFFLOAD_TCP_CKSUM, " TCP csum,"},
+ {DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM, " Outer IPV4 csum,"},
+ {DEV_RX_OFFLOAD_RSS_HASH, " RSS,"}
+ };
+
+ /* Update Rx offload info */
+ for (i = 0; i < RTE_DIM(rx_offload_map); i++) {
+ if (eth_conf->rxmode.offloads & rx_offload_map[i].flags) {
+ snprintf(mode->info, sizeof(mode->info), "%s",
+ rx_offload_map[i].output);
+ ret = 0;
+ break;
+ }
+ }
+ return ret;
+}
+
+static int
+dpaa_dev_tx_burst_mode_get(struct rte_eth_dev *dev,
+ __rte_unused uint16_t queue_id,
+ struct rte_eth_burst_mode *mode)
+{
+ struct rte_eth_conf *eth_conf = &dev->data->dev_conf;
+ int ret = -EINVAL;
+ unsigned int i;
+ const struct burst_info {
+ uint64_t flags;
+ const char *output;
+ } tx_offload_map[] = {
+ {DEV_TX_OFFLOAD_MT_LOCKFREE, " MT lockfree,"},
+ {DEV_TX_OFFLOAD_MBUF_FAST_FREE, " MBUF free disable,"},
+ {DEV_TX_OFFLOAD_IPV4_CKSUM, " IPV4 csum,"},
+ {DEV_TX_OFFLOAD_UDP_CKSUM, " UDP csum,"},
+ {DEV_TX_OFFLOAD_TCP_CKSUM, " TCP csum,"},
+ {DEV_TX_OFFLOAD_SCTP_CKSUM, " SCTP csum,"},
+ {DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM, " Outer IPV4 csum,"},
+ {DEV_TX_OFFLOAD_MULTI_SEGS, " Scattered,"}
+ };
+
+ /* Update Tx offload info */
+ for (i = 0; i < RTE_DIM(tx_offload_map); i++) {
+ if (eth_conf->txmode.offloads & tx_offload_map[i].flags) {
+ snprintf(mode->info, sizeof(mode->info), "%s",
+ tx_offload_map[i].output);
+ ret = 0;
+ break;
+ }
+ }
+ return ret;
+}
+
static int dpaa_eth_link_update(struct rte_eth_dev *dev,
int wait_to_complete __rte_unused)
{
@@ -1182,7 +1249,8 @@ static struct eth_dev_ops dpaa_devops = {
.rx_queue_release = dpaa_eth_rx_queue_release,
.tx_queue_release = dpaa_eth_tx_queue_release,
.rx_queue_count = dpaa_dev_rx_queue_count,
-
+ .rx_burst_mode_get = dpaa_dev_rx_burst_mode_get,
+ .tx_burst_mode_get = dpaa_dev_tx_burst_mode_get,
.flow_ctrl_get = dpaa_flow_ctrl_get,
.flow_ctrl_set = dpaa_flow_ctrl_set,
--
2.17.1
^ permalink raw reply [flat|nested] 12+ messages in thread* [dpdk-dev] [PATCH 4/9] net/dpaa2: add Tx/Rx burst mode info
2020-07-10 16:21 [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Hemant Agrawal
2020-07-10 16:21 ` [dpdk-dev] [PATCH 2/9] net/dpaa2: support per port Rx mbuf timestamp Hemant Agrawal
2020-07-10 16:21 ` [dpdk-dev] [PATCH 3/9] net/dpaa: add Tx/Rx burst mode info Hemant Agrawal
@ 2020-07-10 16:21 ` Hemant Agrawal
2020-07-10 16:21 ` [dpdk-dev] [PATCH 5/9] net/dpaa: report error on using deferred start Hemant Agrawal
` (6 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Hemant Agrawal @ 2020-07-10 16:21 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, Apeksha Gupta
From: Apeksha Gupta <apeksha.gupta@nxp.com>
Retrieve burst mode information according to the selected Tx/Rx mode and
offloads.
Signed-off-by: Apeksha Gupta <apeksha.gupta@nxp.com>
---
doc/guides/nics/features/dpaa2.ini | 2 +
drivers/net/dpaa2/dpaa2_ethdev.c | 73 ++++++++++++++++++++++++++++++
2 files changed, 75 insertions(+)
diff --git a/doc/guides/nics/features/dpaa2.ini b/doc/guides/nics/features/dpaa2.ini
index 831883d21..878f03d40 100644
--- a/doc/guides/nics/features/dpaa2.ini
+++ b/doc/guides/nics/features/dpaa2.ini
@@ -7,8 +7,10 @@
Speed capabilities = Y
Link status = Y
Link status event = Y
+Burst mode info = Y
Queue start/stop = Y
Jumbo frame = Y
+Scattered Rx = Y
MTU update = Y
Promiscuous mode = Y
Allmulticast mode = Y
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 3e5502de5..a7195f6c1 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -286,6 +286,77 @@ dpaa2_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
return 0;
}
+static int
+dpaa2_dev_rx_burst_mode_get(struct rte_eth_dev *dev,
+ __rte_unused uint16_t queue_id,
+ struct rte_eth_burst_mode *mode)
+{
+ struct rte_eth_conf *eth_conf = &dev->data->dev_conf;
+ int ret = -EINVAL;
+ unsigned int i;
+ const struct burst_info {
+ uint64_t flags;
+ const char *output;
+ } rx_offload_map[] = {
+ {DEV_RX_OFFLOAD_CHECKSUM, " Checksum,"},
+ {DEV_RX_OFFLOAD_SCTP_CKSUM, " SCTP csum,"},
+ {DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM, " Outer IPV4 csum,"},
+ {DEV_RX_OFFLOAD_OUTER_UDP_CKSUM, " Outer UDP csum,"},
+ {DEV_RX_OFFLOAD_VLAN_STRIP, " VLAN strip,"},
+ {DEV_RX_OFFLOAD_VLAN_FILTER, " VLAN filter,"},
+ {DEV_RX_OFFLOAD_JUMBO_FRAME, " Jumbo frame,"},
+ {DEV_RX_OFFLOAD_TIMESTAMP, " Timestamp,"},
+ {DEV_RX_OFFLOAD_RSS_HASH, " RSS,"},
+ {DEV_RX_OFFLOAD_SCATTER, " Scattered,"}
+ };
+
+ /* Update Rx offload info */
+ for (i = 0; i < RTE_DIM(rx_offload_map); i++) {
+ if (eth_conf->rxmode.offloads & rx_offload_map[i].flags) {
+ snprintf(mode->info, sizeof(mode->info), "%s",
+ rx_offload_map[i].output);
+ ret = 0;
+ break;
+ }
+ }
+ return ret;
+}
+
+static int
+dpaa2_dev_tx_burst_mode_get(struct rte_eth_dev *dev,
+ __rte_unused uint16_t queue_id,
+ struct rte_eth_burst_mode *mode)
+{
+ struct rte_eth_conf *eth_conf = &dev->data->dev_conf;
+ int ret = -EINVAL;
+ unsigned int i;
+ const struct burst_info {
+ uint64_t flags;
+ const char *output;
+ } tx_offload_map[] = {
+ {DEV_TX_OFFLOAD_VLAN_INSERT, " VLAN Insert,"},
+ {DEV_TX_OFFLOAD_IPV4_CKSUM, " IPV4 csum,"},
+ {DEV_TX_OFFLOAD_UDP_CKSUM, " UDP csum,"},
+ {DEV_TX_OFFLOAD_TCP_CKSUM, " TCP csum,"},
+ {DEV_TX_OFFLOAD_SCTP_CKSUM, " SCTP csum,"},
+ {DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM, " Outer IPV4 csum,"},
+ {DEV_TX_OFFLOAD_MT_LOCKFREE, " MT lockfree,"},
+ {DEV_TX_OFFLOAD_MBUF_FAST_FREE, " MBUF free disable,"},
+ {DEV_TX_OFFLOAD_MULTI_SEGS, " Scattered,"}
+ };
+
+ /* Update Tx offload info */
+ for (i = 0; i < RTE_DIM(tx_offload_map); i++) {
+ if (eth_conf->txmode.offloads & tx_offload_map[i].flags) {
+ snprintf(mode->info, sizeof(mode->info), "%s",
+ tx_offload_map[i].output);
+ ret = 0;
+ break;
+ }
+ }
+ return ret;
+}
+
static int
dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev)
{
@@ -2206,6 +2277,8 @@ static struct eth_dev_ops dpaa2_ethdev_ops = {
.rx_queue_release = dpaa2_dev_rx_queue_release,
.tx_queue_setup = dpaa2_dev_tx_queue_setup,
.tx_queue_release = dpaa2_dev_tx_queue_release,
+ .rx_burst_mode_get = dpaa2_dev_rx_burst_mode_get,
+ .tx_burst_mode_get = dpaa2_dev_tx_burst_mode_get,
.rx_queue_count = dpaa2_dev_rx_queue_count,
.flow_ctrl_get = dpaa2_flow_ctrl_get,
.flow_ctrl_set = dpaa2_flow_ctrl_set,
--
2.17.1
^ permalink raw reply [flat|nested] 12+ messages in thread* [dpdk-dev] [PATCH 5/9] net/dpaa: report error on using deferred start
2020-07-10 16:21 [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Hemant Agrawal
` (2 preceding siblings ...)
2020-07-10 16:21 ` [dpdk-dev] [PATCH 4/9] net/dpaa2: " Hemant Agrawal
@ 2020-07-10 16:21 ` Hemant Agrawal
2020-07-10 16:21 ` [dpdk-dev] [PATCH 6/9] net/dpaa2: report error on queue " Hemant Agrawal
` (5 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Hemant Agrawal @ 2020-07-10 16:21 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, Hemant Agrawal
This patch add support to report on error
for rx and tx deferred start config
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/net/dpaa/dpaa_ethdev.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 62ecb112f..ea178f4d4 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -723,7 +723,7 @@ static
int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
uint16_t nb_desc,
unsigned int socket_id __rte_unused,
- const struct rte_eth_rxconf *rx_conf __rte_unused,
+ const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
struct dpaa_if *dpaa_intf = dev->data->dev_private;
@@ -743,6 +743,12 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
return -rte_errno;
}
+ /* Rx deferred start is not supported */
+ if (rx_conf->rx_deferred_start) {
+ DPAA_PMD_ERR("%p:Rx deferred start not supported", (void *)dev);
+ return -EINVAL;
+ }
+
DPAA_PMD_INFO("Rx queue setup for queue index: %d fq_id (0x%x)",
queue_idx, rxq->fqid);
@@ -1006,12 +1012,17 @@ static
int dpaa_eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
uint16_t nb_desc __rte_unused,
unsigned int socket_id __rte_unused,
- const struct rte_eth_txconf *tx_conf __rte_unused)
+ const struct rte_eth_txconf *tx_conf)
{
struct dpaa_if *dpaa_intf = dev->data->dev_private;
PMD_INIT_FUNC_TRACE();
+ /* Tx deferred start is not supported */
+ if (tx_conf->tx_deferred_start) {
+ DPAA_PMD_ERR("%p:Tx deferred start not supported", (void *)dev);
+ return -EINVAL;
+ }
if (queue_idx >= dev->data->nb_tx_queues) {
rte_errno = EOVERFLOW;
DPAA_PMD_ERR("%p: queue index out of range (%u >= %u)",
--
2.17.1
^ permalink raw reply [flat|nested] 12+ messages in thread* [dpdk-dev] [PATCH 6/9] net/dpaa2: report error on queue deferred start
2020-07-10 16:21 [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Hemant Agrawal
` (3 preceding siblings ...)
2020-07-10 16:21 ` [dpdk-dev] [PATCH 5/9] net/dpaa: report error on using deferred start Hemant Agrawal
@ 2020-07-10 16:21 ` Hemant Agrawal
2020-07-10 16:21 ` [dpdk-dev] [PATCH 7/9] net/dpaa2: add support to use Tx Queue desc size Hemant Agrawal
` (4 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Hemant Agrawal @ 2020-07-10 16:21 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, Hemant Agrawal
This patch add support to reports errors on configuring
deferred start for rx or tx queues.
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/net/dpaa2/dpaa2_ethdev.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index a7195f6c1..701a6ca68 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -649,7 +649,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
uint16_t nb_rx_desc,
unsigned int socket_id __rte_unused,
- const struct rte_eth_rxconf *rx_conf __rte_unused,
+ const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool)
{
struct dpaa2_dev_priv *priv = dev->data->dev_private;
@@ -666,6 +666,13 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
DPAA2_PMD_DEBUG("dev =%p, queue =%d, pool = %p, conf =%p",
dev, rx_queue_id, mb_pool, rx_conf);
+ /* Rx deferred start is not supported */
+ if (rx_conf->rx_deferred_start) {
+ DPAA2_PMD_ERR("%p:Rx deferred start not supported",
+ (void *)dev);
+ return -EINVAL;
+ }
+
if (!priv->bp_list || priv->bp_list->mp != mb_pool) {
bpid = mempool_to_bpid(mb_pool);
ret = dpaa2_attach_bp_list(priv,
@@ -794,7 +801,7 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
uint16_t nb_tx_desc __rte_unused,
unsigned int socket_id __rte_unused,
- const struct rte_eth_txconf *tx_conf __rte_unused)
+ const struct rte_eth_txconf *tx_conf)
{
struct dpaa2_dev_priv *priv = dev->data->dev_private;
struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)
@@ -811,6 +818,13 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
PMD_INIT_FUNC_TRACE();
+ /* Tx deferred start is not supported */
+ if (tx_conf->tx_deferred_start) {
+ DPAA2_PMD_ERR("%p:Tx deferred start not supported",
+ (void *)dev);
+ return -EINVAL;
+ }
+
/* Return if queue already configured */
if (dpaa2_q->flow_id != 0xffff) {
dev->data->tx_queues[tx_queue_id] = dpaa2_q;
--
2.17.1
^ permalink raw reply [flat|nested] 12+ messages in thread* [dpdk-dev] [PATCH 7/9] net/dpaa2: add support to use Tx Queue desc size
2020-07-10 16:21 [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Hemant Agrawal
` (4 preceding siblings ...)
2020-07-10 16:21 ` [dpdk-dev] [PATCH 6/9] net/dpaa2: report error on queue " Hemant Agrawal
@ 2020-07-10 16:21 ` Hemant Agrawal
2020-07-10 16:21 ` [dpdk-dev] [PATCH 8/9] net/dpaa2: support Rxq and Txq info routines Hemant Agrawal
` (3 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Hemant Agrawal @ 2020-07-10 16:21 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, Hemant Agrawal
Add support to use Tx queue desc size to configure
congestion notification on TX queue
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/net/dpaa2/dpaa2_ethdev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 701a6ca68..33d52efd7 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -799,7 +799,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
static int
dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t tx_queue_id,
- uint16_t nb_tx_desc __rte_unused,
+ uint16_t nb_tx_desc,
unsigned int socket_id __rte_unused,
const struct rte_eth_txconf *tx_conf)
{
@@ -879,11 +879,11 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
struct dpni_congestion_notification_cfg cong_notif_cfg = {0};
cong_notif_cfg.units = DPNI_CONGESTION_UNIT_FRAMES;
- cong_notif_cfg.threshold_entry = CONG_ENTER_TX_THRESHOLD;
+ cong_notif_cfg.threshold_entry = nb_tx_desc;
/* Notify that the queue is not congested when the data in
* the queue is below this thershold.
*/
- cong_notif_cfg.threshold_exit = CONG_EXIT_TX_THRESHOLD;
+ cong_notif_cfg.threshold_exit = nb_tx_desc - 24;
cong_notif_cfg.message_ctx = 0;
cong_notif_cfg.message_iova =
(size_t)DPAA2_VADDR_TO_IOVA(dpaa2_q->cscn);
--
2.17.1
^ permalink raw reply [flat|nested] 12+ messages in thread* [dpdk-dev] [PATCH 8/9] net/dpaa2: support Rxq and Txq info routines
2020-07-10 16:21 [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Hemant Agrawal
` (5 preceding siblings ...)
2020-07-10 16:21 ` [dpdk-dev] [PATCH 7/9] net/dpaa2: add support to use Tx Queue desc size Hemant Agrawal
@ 2020-07-10 16:21 ` Hemant Agrawal
2020-07-10 16:21 ` [dpdk-dev] [PATCH 9/9] net/dpaa: " Hemant Agrawal
` (2 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Hemant Agrawal @ 2020-07-10 16:21 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, Hemant Agrawal
This patch add support for rxq_info_get and txq_info_get
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 7 ++--
drivers/net/dpaa2/dpaa2_ethdev.c | 48 ++++++++++++++++++++++++-
2 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
index be48462dd..35423df12 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
@@ -167,13 +167,16 @@ struct dpaa2_queue {
struct qbman_result *cscn;
};
struct rte_event ev;
- int32_t eventfd; /*!< Event Fd of this queue */
dpaa2_queue_cb_dqrr_t *cb;
dpaa2_queue_cb_eqresp_free_t *cb_eqresp_free;
struct dpaa2_bp_info *bp_array;
/*to store tx_conf_queue corresponding to tx_queue*/
struct dpaa2_queue *tx_conf_queue;
-};
+ int32_t eventfd; /*!< Event Fd of this queue */
+ uint16_t nb_desc;
+ uint16_t resv;
+ uint64_t offloads;
+} __rte_cache_aligned;
struct swp_active_dqs {
struct qbman_result *global_active_dqs;
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 33d52efd7..3bd435b45 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -683,6 +683,8 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
dpaa2_q = (struct dpaa2_queue *)priv->rx_vq[rx_queue_id];
dpaa2_q->mb_pool = mb_pool; /**< mbuf pool to populate RX ring. */
dpaa2_q->bp_array = rte_dpaa2_bpid_info;
+ dpaa2_q->nb_desc = UINT16_MAX;
+ dpaa2_q->offloads = rx_conf->offloads;
/*Get the flow id from given VQ id*/
flow_id = dpaa2_q->flow_id;
@@ -735,7 +737,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
struct dpni_taildrop taildrop;
taildrop.enable = 1;
-
+ dpaa2_q->nb_desc = nb_rx_desc;
/* Private CGR will use tail drop length as nb_rx_desc.
* for rest cases we can use standard byte based tail drop.
* There is no HW restriction, but number of CGRs are limited,
@@ -825,6 +827,9 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
return -EINVAL;
}
+ dpaa2_q->nb_desc = UINT16_MAX;
+ dpaa2_q->offloads = tx_conf->offloads;
+
/* Return if queue already configured */
if (dpaa2_q->flow_id != 0xffff) {
dev->data->tx_queues[tx_queue_id] = dpaa2_q;
@@ -878,6 +883,8 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
if (!(priv->flags & DPAA2_TX_CGR_OFF)) {
struct dpni_congestion_notification_cfg cong_notif_cfg = {0};
+ dpaa2_q->nb_desc = nb_tx_desc;
+
cong_notif_cfg.units = DPNI_CONGESTION_UNIT_FRAMES;
cong_notif_cfg.threshold_entry = nb_tx_desc;
/* Notify that the queue is not congested when the data in
@@ -2261,6 +2268,43 @@ dpaa2_dev_flow_ctrl(struct rte_eth_dev *dev,
return ret;
}
+static void
+dpaa2_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_rxq_info *qinfo)
+{
+ struct dpaa2_queue *rxq;
+
+ rxq = (struct dpaa2_queue *)dev->data->rx_queues[queue_id];
+
+ qinfo->mp = rxq->mb_pool;
+ qinfo->scattered_rx = dev->data->scattered_rx;
+ qinfo->nb_desc = rxq->nb_desc;
+
+ qinfo->conf.rx_free_thresh = 1;
+ qinfo->conf.rx_drop_en = 1;
+ qinfo->conf.rx_deferred_start = 0;
+ qinfo->conf.offloads = rxq->offloads;
+}
+
+static void
+dpaa2_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_txq_info *qinfo)
+{
+ struct dpaa2_queue *txq;
+
+ txq = dev->data->tx_queues[queue_id];
+
+ qinfo->nb_desc = txq->nb_desc;
+ qinfo->conf.tx_thresh.pthresh = 0;
+ qinfo->conf.tx_thresh.hthresh = 0;
+ qinfo->conf.tx_thresh.wthresh = 0;
+
+ qinfo->conf.tx_free_thresh = 0;
+ qinfo->conf.tx_rs_thresh = 0;
+ qinfo->conf.offloads = txq->offloads;
+ qinfo->conf.tx_deferred_start = 0;
+}
+
static struct eth_dev_ops dpaa2_ethdev_ops = {
.dev_configure = dpaa2_eth_dev_configure,
.dev_start = dpaa2_dev_start,
@@ -2302,6 +2346,8 @@ static struct eth_dev_ops dpaa2_ethdev_ops = {
.rss_hash_update = dpaa2_dev_rss_hash_update,
.rss_hash_conf_get = dpaa2_dev_rss_hash_conf_get,
.filter_ctrl = dpaa2_dev_flow_ctrl,
+ .rxq_info_get = dpaa2_rxq_info_get,
+ .txq_info_get = dpaa2_txq_info_get,
#if defined(RTE_LIBRTE_IEEE1588)
.timesync_enable = dpaa2_timesync_enable,
.timesync_disable = dpaa2_timesync_disable,
--
2.17.1
^ permalink raw reply [flat|nested] 12+ messages in thread* [dpdk-dev] [PATCH 9/9] net/dpaa: support Rxq and Txq info routines
2020-07-10 16:21 [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Hemant Agrawal
` (6 preceding siblings ...)
2020-07-10 16:21 ` [dpdk-dev] [PATCH 8/9] net/dpaa2: support Rxq and Txq info routines Hemant Agrawal
@ 2020-07-10 16:21 ` Hemant Agrawal
2020-07-21 1:32 ` [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Ferruh Yigit
2020-07-21 8:56 ` Ferruh Yigit
9 siblings, 0 replies; 12+ messages in thread
From: Hemant Agrawal @ 2020-07-10 16:21 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, Hemant Agrawal
This patch add support for rxq_info_get and txq_info_get
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/bus/dpaa/include/fsl_qman.h | 3 ++
drivers/net/dpaa/dpaa_ethdev.c | 51 +++++++++++++++++++++++++++--
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/drivers/bus/dpaa/include/fsl_qman.h b/drivers/bus/dpaa/include/fsl_qman.h
index 0d9cfc339..8ba37411a 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -1251,6 +1251,9 @@ struct qman_fq {
void **qman_fq_lookup_table;
u32 key;
#endif
+ u16 nb_desc;
+ u16 resv;
+ u64 offloads;
};
/*
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index ea178f4d4..c15e2b546 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -748,6 +748,8 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
DPAA_PMD_ERR("%p:Rx deferred start not supported", (void *)dev);
return -EINVAL;
}
+ rxq->nb_desc = UINT16_MAX;
+ rxq->offloads = rx_conf->offloads;
DPAA_PMD_INFO("Rx queue setup for queue index: %d fq_id (0x%x)",
queue_idx, rxq->fqid);
@@ -895,6 +897,7 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
if (dpaa_intf->cgr_rx) {
struct qm_mcc_initcgr cgr_opts = {0};
+ rxq->nb_desc = nb_desc;
/* Enable tail drop with cgr on this queue */
qm_cgr_cs_thres_set64(&cgr_opts.cgr.cs_thres, nb_desc, 0);
ret = qman_modify_cgr(dpaa_intf->cgr_rx, 0, &cgr_opts);
@@ -1015,6 +1018,7 @@ int dpaa_eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
const struct rte_eth_txconf *tx_conf)
{
struct dpaa_if *dpaa_intf = dev->data->dev_private;
+ struct qman_fq *txq = &dpaa_intf->tx_queues[queue_idx];
PMD_INIT_FUNC_TRACE();
@@ -1023,6 +1027,9 @@ int dpaa_eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
DPAA_PMD_ERR("%p:Tx deferred start not supported", (void *)dev);
return -EINVAL;
}
+ txq->nb_desc = UINT16_MAX;
+ txq->offloads = tx_conf->offloads;
+
if (queue_idx >= dev->data->nb_tx_queues) {
rte_errno = EOVERFLOW;
DPAA_PMD_ERR("%p: queue index out of range (%u >= %u)",
@@ -1031,8 +1038,8 @@ int dpaa_eth_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
}
DPAA_PMD_INFO("Tx queue setup for queue index: %d fq_id (0x%x)",
- queue_idx, dpaa_intf->tx_queues[queue_idx].fqid);
- dev->data->tx_queues[queue_idx] = &dpaa_intf->tx_queues[queue_idx];
+ queue_idx, txq->fqid);
+ dev->data->tx_queues[queue_idx] = txq;
return 0;
}
@@ -1247,6 +1254,43 @@ static int dpaa_dev_queue_intr_disable(struct rte_eth_dev *dev,
return 0;
}
+static void
+dpaa_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_rxq_info *qinfo)
+{
+ struct dpaa_if *dpaa_intf = dev->data->dev_private;
+ struct qman_fq *rxq;
+
+ rxq = dev->data->rx_queues[queue_id];
+
+ qinfo->mp = dpaa_intf->bp_info->mp;
+ qinfo->scattered_rx = dev->data->scattered_rx;
+ qinfo->nb_desc = rxq->nb_desc;
+ qinfo->conf.rx_free_thresh = 1;
+ qinfo->conf.rx_drop_en = 1;
+ qinfo->conf.rx_deferred_start = 0;
+ qinfo->conf.offloads = rxq->offloads;
+}
+
+static void
+dpaa_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+ struct rte_eth_txq_info *qinfo)
+{
+ struct qman_fq *txq;
+
+ txq = dev->data->tx_queues[queue_id];
+
+ qinfo->nb_desc = txq->nb_desc;
+ qinfo->conf.tx_thresh.pthresh = 0;
+ qinfo->conf.tx_thresh.hthresh = 0;
+ qinfo->conf.tx_thresh.wthresh = 0;
+
+ qinfo->conf.tx_free_thresh = 0;
+ qinfo->conf.tx_rs_thresh = 0;
+ qinfo->conf.offloads = txq->offloads;
+ qinfo->conf.tx_deferred_start = 0;
+}
+
static struct eth_dev_ops dpaa_devops = {
.dev_configure = dpaa_eth_dev_configure,
.dev_start = dpaa_eth_dev_start,
@@ -1262,6 +1306,9 @@ static struct eth_dev_ops dpaa_devops = {
.rx_queue_count = dpaa_dev_rx_queue_count,
.rx_burst_mode_get = dpaa_dev_rx_burst_mode_get,
.tx_burst_mode_get = dpaa_dev_tx_burst_mode_get,
+ .rxq_info_get = dpaa_rxq_info_get,
+ .txq_info_get = dpaa_txq_info_get,
+
.flow_ctrl_get = dpaa_flow_ctrl_get,
.flow_ctrl_set = dpaa_flow_ctrl_set,
--
2.17.1
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API
2020-07-10 16:21 [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Hemant Agrawal
` (7 preceding siblings ...)
2020-07-10 16:21 ` [dpdk-dev] [PATCH 9/9] net/dpaa: " Hemant Agrawal
@ 2020-07-21 1:32 ` Ferruh Yigit
2020-07-21 3:26 ` Hemant Agrawal
2020-07-21 8:56 ` Ferruh Yigit
9 siblings, 1 reply; 12+ messages in thread
From: Ferruh Yigit @ 2020-07-21 1:32 UTC (permalink / raw)
To: Hemant Agrawal, dev
On 7/10/2020 5:21 PM, Hemant Agrawal wrote:
> This experimental API is no longer required as the same
> purpose can be solved with standard DEV_RX_OFFLOAD_TIMESTAMP
>
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
<...>
> -/**
> - * @warning
> - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
> - *
> - * Enable/Disable timestamping update in mbuf for LX2160 kind of devices.
> - * For LS2088/LS1088 devices, timestamping will be updated in mbuf without
> - * calling this API.
> - *
> - * @param pmd_dpaa2_ts
> - * Enum to enable/disable timestamp update in mbuf for LX2160 devices.
> - */
> -__rte_experimental
> -void rte_pmd_dpaa2_set_timestamp(enum pmd_dpaa2_ts);
Need to remove from .map file too, I can do while merging.
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API
2020-07-21 1:32 ` [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Ferruh Yigit
@ 2020-07-21 3:26 ` Hemant Agrawal
0 siblings, 0 replies; 12+ messages in thread
From: Hemant Agrawal @ 2020-07-21 3:26 UTC (permalink / raw)
To: Ferruh Yigit, dev
-----Original Message-----
From: Ferruh Yigit <ferruh.yigit@intel.com>
Sent: Tuesday, July 21, 2020 7:03 AM
To: Hemant Agrawal <hemant.agrawal@nxp.com>; dev@dpdk.org
Subject: Re: [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API
Importance: High
On 7/10/2020 5:21 PM, Hemant Agrawal wrote:
> This experimental API is no longer required as the same purpose can be
> solved with standard DEV_RX_OFFLOAD_TIMESTAMP
>
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
<...>
> -/**
> - * @warning
> - * @b EXPERIMENTAL: this API may change, or be removed, without prior
> notice
> - *
> - * Enable/Disable timestamping update in mbuf for LX2160 kind of devices.
> - * For LS2088/LS1088 devices, timestamping will be updated in mbuf
> without
> - * calling this API.
> - *
> - * @param pmd_dpaa2_ts
> - * Enum to enable/disable timestamp update in mbuf for LX2160 devices.
> - */
> -__rte_experimental
> -void rte_pmd_dpaa2_set_timestamp(enum pmd_dpaa2_ts);
Need to remove from .map file too, I can do while merging.
[Hemant] Thanks!
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API
2020-07-10 16:21 [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Hemant Agrawal
` (8 preceding siblings ...)
2020-07-21 1:32 ` [dpdk-dev] [PATCH 1/9] net/dpaa2: remove Rx timestamp enable PMD API Ferruh Yigit
@ 2020-07-21 8:56 ` Ferruh Yigit
9 siblings, 0 replies; 12+ messages in thread
From: Ferruh Yigit @ 2020-07-21 8:56 UTC (permalink / raw)
To: Hemant Agrawal, dev
On 7/10/2020 5:21 PM, Hemant Agrawal wrote:
> This experimental API is no longer required as the same
> purpose can be solved with standard DEV_RX_OFFLOAD_TIMESTAMP
>
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Series applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 12+ messages in thread