[dpdk-dev,v3,03/15] net/virtio: use eth_linkstatus_set
Checks
Commit Message
Use the new comon code in ethdev to handle link status update.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/virtio/virtio_ethdev.c | 64 +++++++-------------------------------
1 file changed, 11 insertions(+), 53 deletions(-)
Comments
On 1/8/2018 5:45 PM, Stephen Hemminger wrote:
> Use the new comon code in ethdev to handle link status update.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
<...>
> 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;
> - 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;
> + uint16_t status;
> + struct rte_eth_link link = {
> + .link_speed = ETH_SPEED_NUM_10G,
> + .link_duplex = ETH_LINK_FULL_DUPLEX,
> + .link_autoneg = ETH_LINK_SPEED_FIXED,
With a new cleanup commit [1] ETH_LINK_FIXED used for autoneg value (instead of
ETH_LINK_SPEED_FIXED). And since is ETH_LINK_FIXED is 0, setting autoneg to it
can be omitted.
[1]
93dd7b328a9b ("ethdev: fix link autonegotiation value")
This commit is in next-net.
Unlike Linux "net-next" sub-tree which is for next release development tree,
dpdk next-net is for current release network drivers which this patch seems fits
into.
I already rebased this patchset to next-net, I will share it to continue
discussion from that point.
> + };
>
> if (hw->started == 0) {
> link.link_status = ETH_LINK_DOWN;
> @@ -1957,9 +1916,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_linkstatus_set(dev, &link);
> }
>
> static int
>
@@ -14,7 +14,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_bus_pci.h>
@@ -771,46 +770,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)
{
@@ -1913,8 +1872,10 @@ static void
virtio_dev_stop(struct rte_eth_dev *dev)
{
struct virtio_hw *hw = dev->data->dev_private;
- struct rte_eth_link link;
struct rte_intr_conf *intr_conf = &dev->data->dev_conf.intr_conf;
+ struct rte_eth_link link = {
+ .link_status = ETH_LINK_DOWN,
+ };
PMD_INIT_LOG(DEBUG, "stop");
@@ -1922,21 +1883,19 @@ virtio_dev_stop(struct rte_eth_dev *dev)
virtio_intr_disable(dev);
hw->started = 0;
- memset(&link, 0, sizeof(link));
- virtio_dev_atomic_write_link_status(dev, &link);
+ _rte_eth_linkstatus_set(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;
- 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;
+ uint16_t status;
+ struct rte_eth_link link = {
+ .link_speed = ETH_SPEED_NUM_10G,
+ .link_duplex = ETH_LINK_FULL_DUPLEX,
+ .link_autoneg = ETH_LINK_SPEED_FIXED,
+ };
if (hw->started == 0) {
link.link_status = ETH_LINK_DOWN;
@@ -1957,9 +1916,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_linkstatus_set(dev, &link);
}
static int