| Message ID | 1563719100-368-9-git-send-email-viacheslavo@mellanox.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Raslan Darawsheh |
| Headers | show |
| Series | net/mlx5: consolidate Tx datapath | expand |
| Context | Check | Description |
|---|---|---|
| ci/checkpatch | success | coding style OK |
| ci/Intel-compilation | success | Compilation OK |
> \On Jul 21, 2019, at 7:25 AM, Viacheslav Ovsiienko <viacheslavo@mellanox.com> wrote: > > This patch fills the tx_desc_lim.nb_seg_max and > tx_desc_lim.nb_mtu_seg_max fields of rte_eth_dev_info > structure to report thee maximal number of packet > segments, requested inline data configuration is > taken into account in conservative way. > > Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com> > --- Acked-by: Yongseok Koh <yskoh@mellanox.com> > drivers/net/mlx5/mlx5_ethdev.c | 37 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > > diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c > index 738d540..6c9bcf1 100644 > --- a/drivers/net/mlx5/mlx5_ethdev.c > +++ b/drivers/net/mlx5/mlx5_ethdev.c > @@ -592,6 +592,42 @@ struct ethtool_link_settings { > } > > /** > + * Sets tx mbuf limiting parameters. > + * > + * @param dev > + * Pointer to Ethernet device. > + * @param[out] info > + * Info structure output buffer. > + */ > +static void > +mlx5_set_txlimit_params(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) > +{ > + struct mlx5_priv *priv = dev->data->dev_private; > + struct mlx5_dev_config *config = &priv->config; > + unsigned int inlen; > + uint16_t nb_max; > + > + inlen = (config->txq_inline_max == MLX5_ARG_UNSET) ? > + MLX5_SEND_DEF_INLINE_LEN : > + (unsigned int)config->txq_inline_max; > + assert(config->txq_inline_min >= 0); > + inlen = RTE_MAX(inlen, (unsigned int)config->txq_inline_min); > + inlen = RTE_MIN(inlen, MLX5_WQE_SIZE_MAX + > + MLX5_ESEG_MIN_INLINE_SIZE - > + MLX5_WQE_CSEG_SIZE - > + MLX5_WQE_ESEG_SIZE - > + MLX5_WQE_DSEG_SIZE * 2); > + nb_max = (MLX5_WQE_SIZE_MAX + > + MLX5_ESEG_MIN_INLINE_SIZE - > + MLX5_WQE_CSEG_SIZE - > + MLX5_WQE_ESEG_SIZE - > + MLX5_WQE_DSEG_SIZE - > + inlen) / MLX5_WSEG_SIZE; > + info->tx_desc_lim.nb_seg_max = nb_max; > + info->tx_desc_lim.nb_mtu_seg_max = nb_max; > +} > + > +/** > * DPDK callback to get information about the device. > * > * @param dev > @@ -634,6 +670,7 @@ struct ethtool_link_settings { > info->speed_capa = priv->link_speed_capa; > info->flow_type_rss_offloads = ~MLX5_RSS_HF_MASK; > mlx5_set_default_params(dev, info); > + mlx5_set_txlimit_params(dev, info); > info->switch_info.name = dev->data->name; > info->switch_info.domain_id = priv->domain_id; > info->switch_info.port_id = priv->representor_id; > -- > 1.8.3.1 >
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 738d540..6c9bcf1 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -592,6 +592,42 @@ struct ethtool_link_settings { } /** + * Sets tx mbuf limiting parameters. + * + * @param dev + * Pointer to Ethernet device. + * @param[out] info + * Info structure output buffer. + */ +static void +mlx5_set_txlimit_params(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) +{ + struct mlx5_priv *priv = dev->data->dev_private; + struct mlx5_dev_config *config = &priv->config; + unsigned int inlen; + uint16_t nb_max; + + inlen = (config->txq_inline_max == MLX5_ARG_UNSET) ? + MLX5_SEND_DEF_INLINE_LEN : + (unsigned int)config->txq_inline_max; + assert(config->txq_inline_min >= 0); + inlen = RTE_MAX(inlen, (unsigned int)config->txq_inline_min); + inlen = RTE_MIN(inlen, MLX5_WQE_SIZE_MAX + + MLX5_ESEG_MIN_INLINE_SIZE - + MLX5_WQE_CSEG_SIZE - + MLX5_WQE_ESEG_SIZE - + MLX5_WQE_DSEG_SIZE * 2); + nb_max = (MLX5_WQE_SIZE_MAX + + MLX5_ESEG_MIN_INLINE_SIZE - + MLX5_WQE_CSEG_SIZE - + MLX5_WQE_ESEG_SIZE - + MLX5_WQE_DSEG_SIZE - + inlen) / MLX5_WSEG_SIZE; + info->tx_desc_lim.nb_seg_max = nb_max; + info->tx_desc_lim.nb_mtu_seg_max = nb_max; +} + +/** * DPDK callback to get information about the device. * * @param dev @@ -634,6 +670,7 @@ struct ethtool_link_settings { info->speed_capa = priv->link_speed_capa; info->flow_type_rss_offloads = ~MLX5_RSS_HF_MASK; mlx5_set_default_params(dev, info); + mlx5_set_txlimit_params(dev, info); info->switch_info.name = dev->data->name; info->switch_info.domain_id = priv->domain_id; info->switch_info.port_id = priv->representor_id;
This patch fills the tx_desc_lim.nb_seg_max and tx_desc_lim.nb_mtu_seg_max fields of rte_eth_dev_info structure to report thee maximal number of packet segments, requested inline data configuration is taken into account in conservative way. Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com> --- drivers/net/mlx5/mlx5_ethdev.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)