diff mbox

[dpdk-dev,v2,03/15] virtio: use eth_linkstatus_set

Message ID 20180106010656.9167-4-stephen@networkplumber.org (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Stephen Hemminger Jan. 6, 2018, 1:06 a.m. UTC 
  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 | 67 ++++++++------------------------------
 1 file changed, 14 insertions(+), 53 deletions(-)

Comments

Tiwei Bie Jan. 6, 2018, 3:10 a.m. UTC | #1 
Hi Stephen,

On Fri, Jan 05, 2018 at 05:06:44PM -0800, Stephen Hemminger wrote:
> Use the new comon code in ethdev to handle link status update.

Typo: comon -> common

> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
[...]
>  static void
>  virtio_update_stats(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
>  {
> @@ -1913,8 +1872,13 @@ 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_speed = SPEED_10G,

SPEED_10G has been removed on dpdk-next-virtio:

http://dpdk.org/browse/next/dpdk-next-virtio/commit/?id=ed85aab5ee68d9be552e10fa123e9a0e35590389

I think you could use ETH_SPEED_NUM_10G directly.

> +		.link_duplex = ETH_LINK_FULL_DUPLEX,
> +		.link_autoneg = ETH_LINK_SPEED_FIXED,
> +		.link_status = ETH_LINK_DOWN,
> +	};
[...]
>  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  = SPEED_10G,

Ditto.

Thanks for the work!

Best regards,
Tiwei Bie
Stephen Hemminger Jan. 8, 2018, 5:03 p.m. UTC | #2 
On Sat, 6 Jan 2018 11:10:08 +0800
Tiwei Bie <tiwei.bie@intel.com> wrote:

> Hi Stephen,
> 
> On Fri, Jan 05, 2018 at 05:06:44PM -0800, Stephen Hemminger wrote:
> > Use the new comon code in ethdev to handle link status update.  
> 
> Typo: comon -> common
> 
> > 
> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>  
> [...]
> >  static void
> >  virtio_update_stats(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
> >  {
> > @@ -1913,8 +1872,13 @@ 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_speed = SPEED_10G,  
> 
> SPEED_10G has been removed on dpdk-next-virtio:

Patch was intended for current release so not looking at -next
diff mbox

Patch

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 21f2131a9efd..748d40188e5d 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -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,13 @@  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_speed = SPEED_10G,
+		.link_duplex = ETH_LINK_FULL_DUPLEX,
+		.link_autoneg = ETH_LINK_SPEED_FIXED,
+		.link_status = ETH_LINK_DOWN,
+	};
 
 	PMD_INIT_LOG(DEBUG, "stop");
 
@@ -1922,21 +1886,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  = SPEED_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 +1919,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