From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id E9D7225E5 for ; Sun, 16 Jul 2017 14:33:44 +0200 (CEST) Received: from pure.maildistiller.com (unknown [10.110.50.29]) by dispatch1-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTP id 672EB6005E; Sun, 16 Jul 2017 12:33:44 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx2-us3.ppe-hosted.com (unknown [10.110.49.251]) by pure.maildistiller.com (Proofpoint Essentials ESMTP Server) with ESMTPS id DD0E260049; Sun, 16 Jul 2017 12:33:43 +0000 (UTC) Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2-us3.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 910426005C; Sun, 16 Jul 2017 12:33:43 +0000 (UTC) Received: from [192.168.239.128] (85.187.13.33) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Sun, 16 Jul 2017 05:33:39 -0700 To: Stephen Hemminger , CC: Stephen Hemminger , Thomas Monjalon References: <20170714183027.16021-1-stephen@networkplumber.org> <20170714183027.16021-3-stephen@networkplumber.org> From: Andrew Rybchenko Message-ID: Date: Sun, 16 Jul 2017 15:33:26 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170714183027.16021-3-stephen@networkplumber.org> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Originating-IP: [85.187.13.33] X-ClientProxiedBy: ocex03.SolarFlarecom.com (10.20.40.36) To ocex03.SolarFlarecom.com (10.20.40.36) X-MDID: 1500208424-ejd8DeyhNGhI Subject: Re: [dpdk-dev] [RFC 02/14] virtio: use eth_link_read/write (and bug fix) X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jul 2017 12:33:45 -0000 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 > --- > 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 > #include > #include > -#include > #include > #include > #include > @@ -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