From: Shahaf Shuler <shahafs@mellanox.com>
To: nelio.laranjeiro@6wind.com, adrien.mazarguil@6wind.com,
yskoh@mellanox.com
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 2/2] net/mlx5: fix probe return value polarity
Date: Thu, 3 May 2018 10:59:37 +0300 [thread overview]
Message-ID: <58bf3a469720a2b1cad4c84cb8ca971b756a2215.1525334236.git.shahafs@mellanox.com> (raw)
In-Reply-To: <20180501111806.112319-1-shahafs@mellanox.com>
mlx5 prefixed function returns a negative errno value.
the error handler on mlx5_pci_probe is doing the same.
Fixes: a6d83b6a9209 ("net/mlx5: standardize on negative errno values")
Cc: nelio.laranjeiro@6wind.com
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
---
On v2:
- fixed more polarity issues on different mlx5_* functions.
- aligned verb calls return values.
---
drivers/net/mlx5/mlx5.c | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 46cb370a29..7afdae863f 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -751,8 +751,9 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
DRV_LOG(WARNING,
"tunnel offloading disabled due to old OFED/rdma-core version");
#endif
- if (mlx5_glue->query_device_ex(attr_ctx, NULL, &device_attr)) {
- err = errno;
+ err = mlx5_glue->query_device_ex(attr_ctx, NULL, &device_attr);
+ if (err) {
+ DRV_LOG(ERR, "ibv_query_device_ex() failed");
goto error;
}
DRV_LOG(INFO, "%u port(s) detected",
@@ -800,16 +801,22 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
eth_dev->device = &pci_dev->device;
eth_dev->dev_ops = &mlx5_dev_sec_ops;
err = mlx5_uar_init_secondary(eth_dev);
- if (err)
+ if (err) {
+ err = rte_errno;
goto error;
+ }
/* Receive command fd from primary process */
err = mlx5_socket_connect(eth_dev);
- if (err < 0)
+ if (err < 0) {
+ err = rte_errno;
goto error;
+ }
/* Remap UAR for Tx queues. */
err = mlx5_tx_uar_remap(eth_dev, err);
- if (err)
+ if (err) {
+ err = rte_errno;
goto error;
+ }
/*
* Ethdev pointer is still required as input since
* the primary device is not accessible from the
@@ -873,11 +880,12 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
if (err) {
DRV_LOG(ERR, "failed to process device arguments: %s",
strerror(err));
+ err = rte_errno;
goto port_error;
}
- if (mlx5_glue->query_device_ex(ctx, NULL, &device_attr_ex)) {
+ err = mlx5_glue->query_device_ex(ctx, NULL, &device_attr_ex);
+ if (err) {
DRV_LOG(ERR, "ibv_query_device_ex() failed");
- err = errno;
goto port_error;
}
config.hw_csum = !!(device_attr_ex.device_cap_flags_ex &
@@ -952,8 +960,10 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->device->driver = &mlx5_driver.driver;
err = mlx5_uar_init_primary(eth_dev);
- if (err)
+ if (err) {
+ err = rte_errno;
goto port_error;
+ }
/* Configure the first MAC address by default. */
if (mlx5_get_mac(eth_dev, &mac.addr_bytes)) {
DRV_LOG(ERR,
@@ -983,8 +993,10 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
#endif
/* Get actual MTU if possible. */
err = mlx5_get_mtu(eth_dev, &priv->mtu);
- if (err)
+ if (err) {
+ err = rte_errno;
goto port_error;
+ }
DRV_LOG(DEBUG, "port %u MTU is %u", eth_dev->data->port_id,
priv->mtu);
/*
@@ -1031,6 +1043,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
if (err) {
DRV_LOG(ERR, "port %u drop queue allocation failed: %s",
eth_dev->data->port_id, strerror(rte_errno));
+ err = rte_errno;
goto port_error;
}
/* Supported Verbs flow priority number detection. */
--
2.12.0
next prev parent reply other threads:[~2018-05-03 8:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-01 11:18 [dpdk-dev] [PATCH 1/2] net/mlx5: fix socket connection return value Shahaf Shuler
2018-05-01 11:18 ` [dpdk-dev] [PATCH 2/2] net/mlx5: fix probe return value polarity Shahaf Shuler
2018-05-02 1:54 ` Yongseok Koh
2018-05-02 6:49 ` Nélio Laranjeiro
2018-05-03 7:40 ` Shahaf Shuler
2018-05-02 6:50 ` [dpdk-dev] [PATCH 1/2] net/mlx5: fix socket connection return value Nélio Laranjeiro
2018-05-03 7:59 ` [dpdk-dev] [PATCH v2 " Shahaf Shuler
2018-05-03 10:33 ` Shahaf Shuler
2018-05-03 7:59 ` Shahaf Shuler [this message]
2018-05-03 9:53 ` [dpdk-dev] [PATCH v2 2/2] net/mlx5: fix probe return value polarity Nélio Laranjeiro
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=58bf3a469720a2b1cad4c84cb8ca971b756a2215.1525334236.git.shahafs@mellanox.com \
--to=shahafs@mellanox.com \
--cc=adrien.mazarguil@6wind.com \
--cc=dev@dpdk.org \
--cc=nelio.laranjeiro@6wind.com \
--cc=yskoh@mellanox.com \
/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).