From: Andrew Rybchenko <arybchenko@solarflare.com>
To: Stephen Hemminger <stephen@networkplumber.org>, <dev@dpdk.org>
Cc: Stephen Hemminger <sthemmin@microsoft.com>,
Thomas Monjalon <thomas@monjalon.net>
Subject: Re: [dpdk-dev] [RFC 02/14] virtio: use eth_link_read/write (and bug fix)
Date: Sun, 16 Jul 2017 15:33:26 +0300 [thread overview]
Message-ID: <d1aab73b-bd85-5d9b-f8d3-cd38adda6ae8@solarflare.com> (raw)
In-Reply-To: <20170714183027.16021-3-stephen@networkplumber.org>
On 07/14/2017 09:30 PM, Stephen Hemminger wrote:
> Use the new code in ethdev to handle link status update.
> Also, virtio was not correctly setting the autoneg flags
> since its speed should be marked as fixed.
>
> Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
> ---
> drivers/net/virtio/virtio_ethdev.c | 54 +++++---------------------------------
> 1 file changed, 6 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
> index 00a3122780ba..776ad4961a37 100644
> --- a/drivers/net/virtio/virtio_ethdev.c
> +++ b/drivers/net/virtio/virtio_ethdev.c
> @@ -43,7 +43,6 @@
> #include <rte_string_fns.h>
> #include <rte_memzone.h>
> #include <rte_malloc.h>
> -#include <rte_atomic.h>
> #include <rte_branch_prediction.h>
> #include <rte_pci.h>
> #include <rte_ether.h>
> @@ -794,46 +793,6 @@ static const struct eth_dev_ops virtio_eth_dev_ops = {
> .mac_addr_set = virtio_mac_addr_set,
> };
>
> -static inline int
> -virtio_dev_atomic_read_link_status(struct rte_eth_dev *dev,
> - struct rte_eth_link *link)
> -{
> - struct rte_eth_link *dst = link;
> - struct rte_eth_link *src = &(dev->data->dev_link);
> -
> - if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
> - *(uint64_t *)src) == 0)
> - return -1;
> -
> - return 0;
> -}
> -
> -/**
> - * Atomically writes the link status information into global
> - * structure rte_eth_dev.
> - *
> - * @param dev
> - * - Pointer to the structure rte_eth_dev to read from.
> - * - Pointer to the buffer to be saved with the link status.
> - *
> - * @return
> - * - On success, zero.
> - * - On failure, negative value.
> - */
> -static inline int
> -virtio_dev_atomic_write_link_status(struct rte_eth_dev *dev,
> - struct rte_eth_link *link)
> -{
> - struct rte_eth_link *dst = &(dev->data->dev_link);
> - struct rte_eth_link *src = link;
> -
> - if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
> - *(uint64_t *)src) == 0)
> - return -1;
> -
> - return 0;
> -}
> -
> static void
> virtio_update_stats(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
> {
> @@ -1829,20 +1788,20 @@ virtio_dev_stop(struct rte_eth_dev *dev)
>
> hw->started = 0;
> memset(&link, 0, sizeof(link));
> - virtio_dev_atomic_write_link_status(dev, &link);
> + _rte_eth_link_update(dev, &link);
> }
>
> static int
> virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete)
> {
> - struct rte_eth_link link, old;
> - uint16_t status;
> struct virtio_hw *hw = dev->data->dev_private;
> + struct rte_eth_link link;
> + uint16_t status;
> +
> memset(&link, 0, sizeof(link));
> - virtio_dev_atomic_read_link_status(dev, &link);
> - old = link;
> link.link_duplex = ETH_LINK_FULL_DUPLEX;
> link.link_speed = SPEED_10G;
> + link.link_autoneg = ETH_LINK_SPEED_FIXED;
As I understand link_autoneg is 1 bit field with boolean semantics. I.e. 0/false - no autoneg, 1/true - autoneg.
It looks like it has wrong comment:
uint16_t link_autoneg : 1; /**< ETH_LINK_SPEED_[AUTONEG/FIXED] */
since
#define ETH_LINK_SPEED_AUTONEG (0 << 0) /**< Autonegotiate (all speeds) */
#define ETH_LINK_SPEED_FIXED (1 << 0) /**< Disable autoneg (fixed speed) */
whereas
#define ETH_LINK_FIXED 0 /**< No autonegotiation. */
#define ETH_LINK_AUTONEG 1 /**< Autonegotiated. */
In general this attempt to introduce bug is the result of wrong comment which is caused by very similar
defines with opposite values.
> if (hw->started == 0) {
> link.link_status = ETH_LINK_DOWN;
> @@ -1863,9 +1822,8 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet
> } else {
> link.link_status = ETH_LINK_UP;
> }
> - virtio_dev_atomic_write_link_status(dev, &link);
>
> - return (old.link_status == link.link_status) ? -1 : 0;
> + return _rte_eth_link_update(dev, &link);
> }
>
> static void
next prev parent reply other threads:[~2017-07-16 12:33 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-14 18:30 [dpdk-dev] [RFC 00/14] link status API improvement and bugfixes Stephen Hemminger
2017-07-14 18:30 ` [dpdk-dev] [RFC 01/14] ethdev: add link status read/write functions Stephen Hemminger
2017-07-16 13:26 ` Andrew Rybchenko
2017-07-17 15:58 ` Stephen Hemminger
2017-07-17 16:12 ` Andrew Rybchenko
2017-07-17 16:21 ` Stephen Hemminger
2017-07-17 16:31 ` Andrew Rybchenko
2017-10-11 8:32 ` Yang, Qiming
2017-10-13 15:12 ` Stephen Hemminger
2018-01-05 14:24 ` Thomas Monjalon
2018-01-05 20:15 ` Stephen Hemminger
2017-07-14 18:30 ` [dpdk-dev] [RFC 02/14] virtio: use eth_link_read/write (and bug fix) Stephen Hemminger
2017-07-16 12:33 ` Andrew Rybchenko [this message]
2017-07-17 16:01 ` Stephen Hemminger
2017-07-17 16:14 ` [dpdk-dev] ***Spam*** " Andrew Rybchenko
2017-07-17 16:28 ` [dpdk-dev] " Stephen Hemminger
2018-01-05 15:04 ` Thomas Monjalon
2017-07-14 18:30 ` [dpdk-dev] [RFC 03/14] bnxt: use rte_link_update Stephen Hemminger
2017-07-14 18:30 ` [dpdk-dev] [RFC 04/14] vmxnet3: use rte_eth_link_update Stephen Hemminger
2017-07-14 18:30 ` [dpdk-dev] [RFC 05/14] dpaa2: " Stephen Hemminger
2017-07-14 18:30 ` [dpdk-dev] [RFC 06/14] nfp: " Stephen Hemminger
2017-07-14 18:30 ` [dpdk-dev] [RFC 07/14] e1000: " Stephen Hemminger
2017-07-14 18:30 ` [dpdk-dev] [RFC 08/14] ixgbe: " Stephen Hemminger
2017-07-14 18:30 ` [dpdk-dev] [RFC 09/14] sfc: use new rte_eth_link helpers Stephen Hemminger
2017-07-16 13:48 ` Andrew Rybchenko
2017-07-17 16:02 ` Stephen Hemminger
2017-07-17 16:19 ` Andrew Rybchenko
2017-07-14 18:30 ` [dpdk-dev] [RFC 10/14] i40e: use rte_eth_link_update (and bug fix) Stephen Hemminger
2017-07-14 18:30 ` [dpdk-dev] [RFC 11/14] liquidio: use _rte_eth_link_update Stephen Hemminger
2017-07-18 10:17 ` Shijith Thotton
2017-07-14 18:30 ` [dpdk-dev] [RFC 12/14] thunderx: " Stephen Hemminger
2017-07-14 18:30 ` [dpdk-dev] [RFC 13/14] szedata: " Stephen Hemminger
2017-07-16 12:46 ` Andrew Rybchenko
2017-07-14 18:30 ` [dpdk-dev] [RFC 14/14] enic: " Stephen Hemminger
2017-07-16 13:55 ` [dpdk-dev] [RFC 00/14] link status API improvement and bugfixes Andrew Rybchenko
2018-01-05 14:29 ` Thomas Monjalon
2018-01-05 20:18 ` Stephen Hemminger
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=d1aab73b-bd85-5d9b-f8d3-cd38adda6ae8@solarflare.com \
--to=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=stephen@networkplumber.org \
--cc=sthemmin@microsoft.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).