From d13d7829fc67d53b007c00546bb0cd9ee3ae2bcb Mon Sep 17 00:00:00 2001 From: Andrew Boyer Date: Thu, 4 Feb 2021 12:37:10 -0800 Subject: [PATCH] net/ionic: fix Tx fragment limits The reported nb_seg_max should include the main fragment in the descriptor and the fragments in the accompanying SGL. Update the Tx prep check as well. These were missed when updating to the v1 Tx queue structures. Fixes: 561176361047 ("net/ionic: clean up Tx queue version support") Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_ethdev.c | 4 ++-- drivers/net/ionic/ionic_rxtx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index c9d8493f49..cffe899c07 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -74,8 +74,8 @@ static const struct rte_eth_desc_lim tx_desc_lim_v1 = { .nb_max = IONIC_MAX_RING_DESC, .nb_min = IONIC_MIN_RING_DESC, .nb_align = 1, - .nb_seg_max = IONIC_TX_MAX_SG_ELEMS_V1, - .nb_mtu_seg_max = IONIC_TX_MAX_SG_ELEMS_V1, + .nb_seg_max = IONIC_TX_MAX_SG_ELEMS_V1 + 1, + .nb_mtu_seg_max = IONIC_TX_MAX_SG_ELEMS_V1 + 1, }; static const struct eth_dev_ops ionic_eth_dev_ops = { diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index 5ae9ecf400..99920109eb 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -596,7 +596,7 @@ ionic_prep_pkts(void *tx_queue __rte_unused, struct rte_mbuf **tx_pkts, for (i = 0; i < nb_pkts; i++) { txm = tx_pkts[i]; - if (txm->nb_segs > IONIC_TX_MAX_SG_ELEMS) { + if (txm->nb_segs > IONIC_TX_MAX_SG_ELEMS_V1 + 1) { rte_errno = -EINVAL; break; } -- 2.20.1