* [dpdk-dev] [PATCH] net/mlx: replace hardcoded value with macro
@ 2020-02-09 21:17 Thomas Monjalon
2020-02-10 6:32 ` Matan Azrad
2020-02-11 8:29 ` Raslan Darawsheh
0 siblings, 2 replies; 6+ messages in thread
From: Thomas Monjalon @ 2020-02-09 21:17 UTC (permalink / raw)
To: Matan Azrad, Shahaf Shuler, Viacheslav Ovsiienko; +Cc: dev
Replace checking against 65535 limit,
with a simpler form using RTE_MIN and UINT16_MAX macros.
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
drivers/net/mlx4/mlx4_ethdev.c | 5 ++---
drivers/net/mlx5/mlx5_ethdev.c | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c
index e500ec422c..9ff05c6738 100644
--- a/drivers/net/mlx4/mlx4_ethdev.c
+++ b/drivers/net/mlx4/mlx4_ethdev.c
@@ -645,9 +645,8 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
*/
max = ((priv->device_attr.max_cq > priv->device_attr.max_qp) ?
priv->device_attr.max_qp : priv->device_attr.max_cq);
- /* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
- if (max >= 65535)
- max = 65535;
+ /* max_rx_queues is uint16_t. */
+ max = RTE_MIN(max, (unsigned int)UINT16_MAX);
info->max_rx_queues = max;
info->max_tx_queues = max;
info->max_mac_addrs = RTE_DIM(priv->mac);
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 86923aa7af..d7d3bc73ce 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -619,9 +619,8 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
*/
max = RTE_MIN(priv->sh->device_attr.orig_attr.max_cq,
priv->sh->device_attr.orig_attr.max_qp);
- /* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
- if (max >= 65535)
- max = 65535;
+ /* max_rx_queues is uint16_t. */
+ max = RTE_MIN(max, (unsigned int)UINT16_MAX);
info->max_rx_queues = max;
info->max_tx_queues = max;
info->max_mac_addrs = MLX5_MAX_UC_MAC_ADDRESSES;
--
2.25.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] net/mlx: replace hardcoded value with macro
2020-02-09 21:17 [dpdk-dev] [PATCH] net/mlx: replace hardcoded value with macro Thomas Monjalon
@ 2020-02-10 6:32 ` Matan Azrad
2020-02-10 8:52 ` Thomas Monjalon
2020-02-11 8:29 ` Raslan Darawsheh
1 sibling, 1 reply; 6+ messages in thread
From: Matan Azrad @ 2020-02-10 6:32 UTC (permalink / raw)
To: Thomas Monjalon, Shahaf Shuler, Slava Ovsiienko; +Cc: dev
Hi Thomas
From: Thomas Monjalon
> Sent: Sunday, February 9, 2020 11:17 PM
> To: Matan Azrad <matan@mellanox.com>; Shahaf Shuler
> <shahafs@mellanox.com>; Slava Ovsiienko <viacheslavo@mellanox.com>
> Cc: dev@dpdk.org
> Subject: [PATCH] net/mlx: replace hardcoded value with macro
>
> Replace checking against 65535 limit,
> with a simpler form using RTE_MIN and UINT16_MAX macros.
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> drivers/net/mlx4/mlx4_ethdev.c | 5 ++--- drivers/net/mlx5/mlx5_ethdev.c
> | 5 ++---
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/mlx4/mlx4_ethdev.c
> b/drivers/net/mlx4/mlx4_ethdev.c index e500ec422c..9ff05c6738 100644
> --- a/drivers/net/mlx4/mlx4_ethdev.c
> +++ b/drivers/net/mlx4/mlx4_ethdev.c
> @@ -645,9 +645,8 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct
> rte_eth_dev_info *info)
> */
> max = ((priv->device_attr.max_cq > priv->device_attr.max_qp) ?
> priv->device_attr.max_qp : priv->device_attr.max_cq);
> - /* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
> - if (max >= 65535)
> - max = 65535;
> + /* max_rx_queues is uint16_t. */
> + max = RTE_MIN(max, (unsigned int)UINT16_MAX);
> info->max_rx_queues = max;
> info->max_tx_queues = max;
> info->max_mac_addrs = RTE_DIM(priv->mac); diff --git
> a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index
> 86923aa7af..d7d3bc73ce 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -619,9 +619,8 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct
> rte_eth_dev_info *info)
> */
> max = RTE_MIN(priv->sh->device_attr.orig_attr.max_cq,
> priv->sh->device_attr.orig_attr.max_qp);
> - /* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
> - if (max >= 65535)
> - max = 65535;
> + /* max_rx_queues is uint16_t. */
> + max = RTE_MIN(max, (unsigned int)UINT16_MAX);
> info->max_rx_queues = max;
> info->max_tx_queues = max;
> info->max_mac_addrs = MLX5_MAX_UC_MAC_ADDRESSES;
No more misusing of *_MAX \ RTE_MIN\RTE_MAX in the mlx PMDs?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] net/mlx: replace hardcoded value with macro
2020-02-10 6:32 ` Matan Azrad
@ 2020-02-10 8:52 ` Thomas Monjalon
2020-02-10 9:52 ` Thomas Monjalon
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Monjalon @ 2020-02-10 8:52 UTC (permalink / raw)
To: Matan Azrad; +Cc: Shahaf Shuler, Slava Ovsiienko, dev
10/02/2020 07:32, Matan Azrad:
> From: Thomas Monjalon
>
> > Replace checking against 65535 limit,
> > with a simpler form using RTE_MIN and UINT16_MAX macros.
> >
> > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > ---
>
> No more misusing of *_MAX \ RTE_MIN\RTE_MAX in the mlx PMDs?
Sorry I don't understand your question.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] net/mlx: replace hardcoded value with macro
2020-02-10 8:52 ` Thomas Monjalon
@ 2020-02-10 9:52 ` Thomas Monjalon
2020-02-10 9:57 ` Matan Azrad
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Monjalon @ 2020-02-10 9:52 UTC (permalink / raw)
To: Matan Azrad; +Cc: Shahaf Shuler, Slava Ovsiienko, dev
10/02/2020 09:52, Thomas Monjalon:
> 10/02/2020 07:32, Matan Azrad:
> > From: Thomas Monjalon
> >
> > > Replace checking against 65535 limit,
> > > with a simpler form using RTE_MIN and UINT16_MAX macros.
> > >
> > > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > > ---
> >
> > No more misusing of *_MAX \ RTE_MIN\RTE_MAX in the mlx PMDs?
>
> Sorry I don't understand your question.
If you are asking if there are more hardcoded constants,
the answer is yes but they are masks.
I think the masks can remain hardcoded.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] net/mlx: replace hardcoded value with macro
2020-02-10 9:52 ` Thomas Monjalon
@ 2020-02-10 9:57 ` Matan Azrad
0 siblings, 0 replies; 6+ messages in thread
From: Matan Azrad @ 2020-02-10 9:57 UTC (permalink / raw)
To: Thomas Monjalon; +Cc: Shahaf Shuler, Slava Ovsiienko, dev
From: Thomas Monjalon
> 10/02/2020 09:52, Thomas Monjalon:
> > 10/02/2020 07:32, Matan Azrad:
> > > From: Thomas Monjalon
> > >
> > > > Replace checking against 65535 limit, with a simpler form using
> > > > RTE_MIN and UINT16_MAX macros.
> > > >
> > > > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > > > ---
> > >
> > > No more misusing of *_MAX \ RTE_MIN\RTE_MAX in the mlx PMDs?
> >
> > Sorry I don't understand your question.
>
> If you are asking if there are more hardcoded constants, the answer is yes
> but they are masks.
> I think the masks can remain hardcoded.
Agree.
Acked-by: Matan Azrad <matan@mellanox.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH] net/mlx: replace hardcoded value with macro
2020-02-09 21:17 [dpdk-dev] [PATCH] net/mlx: replace hardcoded value with macro Thomas Monjalon
2020-02-10 6:32 ` Matan Azrad
@ 2020-02-11 8:29 ` Raslan Darawsheh
1 sibling, 0 replies; 6+ messages in thread
From: Raslan Darawsheh @ 2020-02-11 8:29 UTC (permalink / raw)
To: Thomas Monjalon, Matan Azrad, Shahaf Shuler, Slava Ovsiienko; +Cc: dev
Hi,
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Thomas Monjalon
> Sent: Sunday, February 9, 2020 11:17 PM
> To: Matan Azrad <matan@mellanox.com>; Shahaf Shuler
> <shahafs@mellanox.com>; Slava Ovsiienko <viacheslavo@mellanox.com>
> Cc: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/mlx: replace hardcoded value with macro
>
> Replace checking against 65535 limit,
> with a simpler form using RTE_MIN and UINT16_MAX macros.
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> drivers/net/mlx4/mlx4_ethdev.c | 5 ++---
> drivers/net/mlx5/mlx5_ethdev.c | 5 ++---
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/mlx4/mlx4_ethdev.c
> b/drivers/net/mlx4/mlx4_ethdev.c
> index e500ec422c..9ff05c6738 100644
> --- a/drivers/net/mlx4/mlx4_ethdev.c
> +++ b/drivers/net/mlx4/mlx4_ethdev.c
> @@ -645,9 +645,8 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct
> rte_eth_dev_info *info)
> */
> max = ((priv->device_attr.max_cq > priv->device_attr.max_qp) ?
> priv->device_attr.max_qp : priv->device_attr.max_cq);
> - /* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
> - if (max >= 65535)
> - max = 65535;
> + /* max_rx_queues is uint16_t. */
> + max = RTE_MIN(max, (unsigned int)UINT16_MAX);
> info->max_rx_queues = max;
> info->max_tx_queues = max;
> info->max_mac_addrs = RTE_DIM(priv->mac);
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c
> b/drivers/net/mlx5/mlx5_ethdev.c
> index 86923aa7af..d7d3bc73ce 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -619,9 +619,8 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct
> rte_eth_dev_info *info)
> */
> max = RTE_MIN(priv->sh->device_attr.orig_attr.max_cq,
> priv->sh->device_attr.orig_attr.max_qp);
> - /* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
> - if (max >= 65535)
> - max = 65535;
> + /* max_rx_queues is uint16_t. */
> + max = RTE_MIN(max, (unsigned int)UINT16_MAX);
> info->max_rx_queues = max;
> info->max_tx_queues = max;
> info->max_mac_addrs = MLX5_MAX_UC_MAC_ADDRESSES;
> --
> 2.25.0
Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-02-11 8:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-09 21:17 [dpdk-dev] [PATCH] net/mlx: replace hardcoded value with macro Thomas Monjalon
2020-02-10 6:32 ` Matan Azrad
2020-02-10 8:52 ` Thomas Monjalon
2020-02-10 9:52 ` Thomas Monjalon
2020-02-10 9:57 ` Matan Azrad
2020-02-11 8:29 ` Raslan Darawsheh
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).