From: "Kinsella, Ray" <mdr@ashroe.eu>
To: Andrew Rybchenko <arybchenko@solarflare.com>,
Neil Horman <nhorman@tuxdriver.com>,
Thomas Monjalon <thomas@monjalon.net>,
Ferruh Yigit <ferruh.yigit@intel.com>,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Cc: dev@dpdk.org, Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>
Subject: Re: [dpdk-dev] [PATCH v2 01/11] ethdev: change eth dev stop function to return int
Date: Fri, 16 Oct 2020 12:20:20 +0100 [thread overview]
Message-ID: <c8fae37a-76ce-db4a-c272-78e95c19767c@ashroe.eu> (raw)
In-Reply-To: <1602768646-13142-2-git-send-email-arybchenko@solarflare.com>
On 15/10/2020 14:30, Andrew Rybchenko wrote:
> From: Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>
>
> Change rte_eth_dev_stop() return value from void to int
> and return negative errno values in case of error conditions.
> Also update the usage of the function in ethdev according to
> the new return type.
>
> Signed-off-by: Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> Acked-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> doc/guides/rel_notes/deprecation.rst | 1 -
> doc/guides/rel_notes/release_20_11.rst | 3 +++
> lib/librte_ethdev/rte_ethdev.c | 27 +++++++++++++++++++-------
> lib/librte_ethdev/rte_ethdev.h | 5 ++++-
> 4 files changed, 27 insertions(+), 9 deletions(-)
>
> diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
> index d1f5ed39db..2e04e24374 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -127,7 +127,6 @@ Deprecation Notices
> negative errno values to indicate various error conditions (e.g.
> invalid port ID, unsupported operation, failed operation):
>
> - - ``rte_eth_dev_stop``
> - ``rte_eth_dev_close``
>
> * ethdev: New offload flags ``DEV_RX_OFFLOAD_FLOW_MARK`` will be added in 19.11.
> diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
> index f8686a50db..c8c30937fa 100644
> --- a/doc/guides/rel_notes/release_20_11.rst
> +++ b/doc/guides/rel_notes/release_20_11.rst
> @@ -355,6 +355,9 @@ API Changes
> * vhost: Add a new function ``rte_vhost_crypto_driver_start`` to be called
> instead of ``rte_vhost_driver_start`` by crypto applications.
>
> +* ethdev: changed ``rte_eth_dev_stop`` return value from ``void`` to
> + ``int`` to provide a way to report various error conditions.
> +
>
> ABI Changes
> -----------
> diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
> index d9b82df073..b8cf04ef4d 100644
> --- a/lib/librte_ethdev/rte_ethdev.c
> +++ b/lib/librte_ethdev/rte_ethdev.c
> @@ -1661,7 +1661,7 @@ rte_eth_dev_start(uint16_t port_id)
> struct rte_eth_dev *dev;
> struct rte_eth_dev_info dev_info;
> int diag;
> - int ret;
> + int ret, ret_stop;
>
> RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
>
> @@ -1695,7 +1695,13 @@ rte_eth_dev_start(uint16_t port_id)
> RTE_ETHDEV_LOG(ERR,
> "Error during restoring configuration for device (port %u): %s\n",
> port_id, rte_strerror(-ret));
> - rte_eth_dev_stop(port_id);
> + ret_stop = rte_eth_dev_stop(port_id);
> + if (ret_stop != 0) {
> + RTE_ETHDEV_LOG(ERR,
> + "Failed to stop device (port %u): %s\n",
> + port_id, rte_strerror(-ret_stop));
> + }
> +
> return ret;
> }
>
> @@ -1708,26 +1714,28 @@ rte_eth_dev_start(uint16_t port_id)
> return 0;
> }
>
> -void
> +int
> rte_eth_dev_stop(uint16_t port_id)
> {
> struct rte_eth_dev *dev;
>
> - RTE_ETH_VALID_PORTID_OR_RET(port_id);
> + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
> dev = &rte_eth_devices[port_id];
>
> - RTE_FUNC_PTR_OR_RET(*dev->dev_ops->dev_stop);
> + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_stop, -ENOTSUP);
>
> if (dev->data->dev_started == 0) {
> RTE_ETHDEV_LOG(INFO,
> "Device with port_id=%"PRIu16" already stopped\n",
> port_id);
> - return;
> + return 0;
> }
>
> dev->data->dev_started = 0;
> (*dev->dev_ops->dev_stop)(dev);
> rte_ethdev_trace_stop(port_id);
> +
> + return 0;
> }
>
> int
> @@ -1783,7 +1791,12 @@ rte_eth_dev_reset(uint16_t port_id)
>
> RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_reset, -ENOTSUP);
>
> - rte_eth_dev_stop(port_id);
> + ret = rte_eth_dev_stop(port_id);
> + if (ret != 0) {
> + RTE_ETHDEV_LOG(ERR,
> + "Failed to stop device (port %u) before reset: %s - ignore\n",
> + port_id, rte_strerror(-ret));
ABI change is 100%,
Just question the logic of continuing here to do a reset, if you failed to stop the device.
> + }
> ret = dev->dev_ops->dev_reset(dev);
>
> return eth_err(port_id, ret);
> diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
> index a61ca115a0..b85861cf2b 100644
> --- a/lib/librte_ethdev/rte_ethdev.h
> +++ b/lib/librte_ethdev/rte_ethdev.h
> @@ -2277,8 +2277,11 @@ int rte_eth_dev_start(uint16_t port_id);
> *
> * @param port_id
> * The port identifier of the Ethernet device.
> + * @return
> + * - 0: Success, Ethernet device stopped.
> + * - <0: Error code of the driver device stop function.
> */
> -void rte_eth_dev_stop(uint16_t port_id);
> +int rte_eth_dev_stop(uint16_t port_id);
>
> /**
> * Link up an Ethernet device.
>
next prev parent reply other threads:[~2020-10-16 11:20 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 13:28 [dpdk-dev] [PATCH 00/11] ethdev: change device stop to return status Andrew Rybchenko
2020-10-14 13:28 ` [dpdk-dev] [PATCH 01/11] ethdev: change eth dev stop function to return int Andrew Rybchenko
2020-10-14 13:33 ` Thomas Monjalon
2020-10-14 13:40 ` Andrew Rybchenko
2020-10-14 17:29 ` Ferruh Yigit
2020-10-14 13:28 ` [dpdk-dev] [PATCH 02/11] test/event: check eth dev stop status Andrew Rybchenko
2020-10-14 13:28 ` [dpdk-dev] [PATCH 03/11] app: " Andrew Rybchenko
2020-10-14 17:34 ` Ferruh Yigit
2020-10-14 13:28 ` [dpdk-dev] [PATCH 04/11] examples: " Andrew Rybchenko
2020-10-14 17:38 ` Ferruh Yigit
2020-10-14 13:29 ` [dpdk-dev] [PATCH 05/11] net/bonding: " Andrew Rybchenko
2020-10-14 17:45 ` Ferruh Yigit
2020-10-14 13:29 ` [dpdk-dev] [PATCH 06/11] kni: " Andrew Rybchenko
2020-10-14 13:29 ` [dpdk-dev] [PATCH 07/11] test/bonding: " Andrew Rybchenko
2020-10-14 13:29 ` [dpdk-dev] [PATCH 08/11] app/flow-perf: " Andrew Rybchenko
2020-10-15 8:04 ` Wisam Monther
2020-10-14 13:29 ` [dpdk-dev] [PATCH 09/11] app/testpmd: " Andrew Rybchenko
2020-10-14 13:29 ` [dpdk-dev] [PATCH 10/11] net/failsafe: " Andrew Rybchenko
2020-10-15 10:37 ` [dpdk-dev] [PATCH v2] " Gaetan Rivet
2020-10-14 13:29 ` [dpdk-dev] [PATCH 11/11] ethdev: change stop device callback to return int Andrew Rybchenko
2020-10-14 18:08 ` Ferruh Yigit
2020-10-15 10:40 ` Gaëtan Rivet
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 00/11] ethdev: change device stop to return status Andrew Rybchenko
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 01/11] ethdev: change eth dev stop function to return int Andrew Rybchenko
2020-10-16 9:22 ` Ferruh Yigit
2020-10-16 11:20 ` Kinsella, Ray [this message]
2020-10-16 17:13 ` Andrew Rybchenko
2020-10-19 9:37 ` Kinsella, Ray
2020-10-16 16:20 ` Ferruh Yigit
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 02/11] test/event: check eth dev stop status Andrew Rybchenko
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 03/11] app: " Andrew Rybchenko
2020-10-16 1:28 ` Min Hu (Connor)
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 04/11] examples: " Andrew Rybchenko
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 05/11] net/bonding: " Andrew Rybchenko
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 06/11] kni: " Andrew Rybchenko
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 07/11] test/bonding: " Andrew Rybchenko
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 08/11] app/flow-perf: " Andrew Rybchenko
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 09/11] app/testpmd: " Andrew Rybchenko
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 10/11] net/failsafe: " Andrew Rybchenko
2020-10-15 13:30 ` [dpdk-dev] [PATCH v2 11/11] ethdev: change stop device callback to return int Andrew Rybchenko
2020-10-16 18:37 ` Ferruh Yigit
2020-10-18 8:55 ` Xu, Rosen
2020-10-16 18:54 ` [dpdk-dev] [PATCH v2 00/11] ethdev: change device stop to return status Ferruh Yigit
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=c8fae37a-76ce-db4a-c272-78e95c19767c@ashroe.eu \
--to=mdr@ashroe.eu \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=ivan.ilchenko@oktetlabs.ru \
--cc=nhorman@tuxdriver.com \
--cc=thomas@monjalon.net \
/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).