[V2] virtio-net: init link state correctly
diff mbox series

Message ID 20101105025008.3277.87697.stgit@dhcp-91-158.nay.redhat.com
State New, archived
Headers show
Series
  • [V2] virtio-net: init link state correctly
Related show

Commit Message

Jason Wang Nov. 5, 2010, 2:50 a.m. UTC
For device that supports VIRTIO_NET_F_STATUS, there's no need to
assume the link is up and we need to call nerif_carrier_off() before
querying device status, otherwise we may get wrong operstate after
diver was loaded because the link watch event was not fired as
expected.

For device that does not support VIRITO_NET_F_STATUS, we could not get
its status through virtnet_update_status() and what we can only do is
always assuming the link is up.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 drivers/net/virtio_net.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Comments

Jason Wang Nov. 5, 2010, 3 a.m. UTC | #1
Jason Wang writes:

CC netdev missed in the original patch.
 > For device that supports VIRTIO_NET_F_STATUS, there's no need to
 > assume the link is up and we need to call nerif_carrier_off() before
 > querying device status, otherwise we may get wrong operstate after
 > diver was loaded because the link watch event was not fired as
 > expected.
 > 
 > For device that does not support VIRITO_NET_F_STATUS, we could not get
 > its status through virtnet_update_status() and what we can only do is
 > always assuming the link is up.
 > 
 > Signed-off-by: Jason Wang <jasowang@redhat.com>
 > ---
 >  drivers/net/virtio_net.c |   12 +++++++++---
 >  1 files changed, 9 insertions(+), 3 deletions(-)
 > 
 > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
 > index bb6b67f..b6d4028 100644
 > --- a/drivers/net/virtio_net.c
 > +++ b/drivers/net/virtio_net.c
 > @@ -986,9 +986,15 @@ static int virtnet_probe(struct virtio_device *vdev)
 >  		goto unregister;
 >  	}
 >  
 > -	vi->status = VIRTIO_NET_S_LINK_UP;
 > -	virtnet_update_status(vi);
 > -	netif_carrier_on(dev);
 > +	/* Assume link up if device can't report link status,
 > +	   otherwise get link status from config. */
 > +	if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) {
 > +		netif_carrier_off(dev);
 > +		virtnet_update_status(vi);
 > +	} else {
 > +		vi->status = VIRTIO_NET_S_LINK_UP;
 > +		netif_carrier_on(dev);
 > +	}
 >  
 >  	pr_debug("virtnet: registered device %s\n", dev->name);
 >  	return 0;
 > 
 > --
 > To unsubscribe from this list: send the line "unsubscribe kvm" in
 > the body of a message to majordomo@vger.kernel.org
 > More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Michael S. Tsirkin Nov. 5, 2010, 8:45 a.m. UTC | #2
On Fri, Nov 05, 2010 at 10:50:08AM +0800, Jason Wang wrote:
> For device that supports VIRTIO_NET_F_STATUS, there's no need to
> assume the link is up and we need to call nerif_carrier_off() before
> querying device status, otherwise we may get wrong operstate after
> diver was loaded because the link watch event was not fired as
> expected.
> 
> For device that does not support VIRITO_NET_F_STATUS, we could not get
> its status through virtnet_update_status() and what we can only do is
> always assuming the link is up.
> 
> Signed-off-by: Jason Wang <jasowang@redhat.com>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  drivers/net/virtio_net.c |   12 +++++++++---
>  1 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index bb6b67f..b6d4028 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -986,9 +986,15 @@ static int virtnet_probe(struct virtio_device *vdev)
>  		goto unregister;
>  	}
>  
> -	vi->status = VIRTIO_NET_S_LINK_UP;
> -	virtnet_update_status(vi);
> -	netif_carrier_on(dev);
> +	/* Assume link up if device can't report link status,
> +	   otherwise get link status from config. */
> +	if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) {
> +		netif_carrier_off(dev);
> +		virtnet_update_status(vi);
> +	} else {
> +		vi->status = VIRTIO_NET_S_LINK_UP;
> +		netif_carrier_on(dev);
> +	}
>  
>  	pr_debug("virtnet: registered device %s\n", dev->name);
>  	return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Michael S. Tsirkin Nov. 5, 2010, 8:47 a.m. UTC | #3
On Fri, Nov 05, 2010 at 11:00:53AM +0800, Jason Wang wrote:
> Jason Wang writes:
> 
> CC netdev missed in the original patch.

You'll have to repost it properly. Patches with a >
at start can't be applied :)
You can add my ack when you do.

>  > For device that supports VIRTIO_NET_F_STATUS, there's no need to
>  > assume the link is up and we need to call nerif_carrier_off() before
>  > querying device status, otherwise we may get wrong operstate after
>  > diver was loaded because the link watch event was not fired as
>  > expected.
>  > 
>  > For device that does not support VIRITO_NET_F_STATUS, we could not get
>  > its status through virtnet_update_status() and what we can only do is
>  > always assuming the link is up.
>  > 
>  > Signed-off-by: Jason Wang <jasowang@redhat.com>
>  > ---
>  >  drivers/net/virtio_net.c |   12 +++++++++---
>  >  1 files changed, 9 insertions(+), 3 deletions(-)
>  > 
>  > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
>  > index bb6b67f..b6d4028 100644
>  > --- a/drivers/net/virtio_net.c
>  > +++ b/drivers/net/virtio_net.c
>  > @@ -986,9 +986,15 @@ static int virtnet_probe(struct virtio_device *vdev)
>  >  		goto unregister;
>  >  	}
>  >  
>  > -	vi->status = VIRTIO_NET_S_LINK_UP;
>  > -	virtnet_update_status(vi);
>  > -	netif_carrier_on(dev);
>  > +	/* Assume link up if device can't report link status,
>  > +	   otherwise get link status from config. */
>  > +	if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) {
>  > +		netif_carrier_off(dev);
>  > +		virtnet_update_status(vi);
>  > +	} else {
>  > +		vi->status = VIRTIO_NET_S_LINK_UP;
>  > +		netif_carrier_on(dev);
>  > +	}
>  >  
>  >  	pr_debug("virtnet: registered device %s\n", dev->name);
>  >  	return 0;
>  > 
>  > --
>  > To unsubscribe from this list: send the line "unsubscribe kvm" in
>  > the body of a message to majordomo@vger.kernel.org
>  > More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
David Miller Nov. 12, 2010, 8:25 p.m. UTC | #4
From: Jason Wang <jasowang@redhat.com>
Date: Fri, 05 Nov 2010 10:50:08 +0800

> For device that supports VIRTIO_NET_F_STATUS, there's no need to
> assume the link is up and we need to call nerif_carrier_off() before
> querying device status, otherwise we may get wrong operstate after
> diver was loaded because the link watch event was not fired as
> expected.
> 
> For device that does not support VIRITO_NET_F_STATUS, we could not get
> its status through virtnet_update_status() and what we can only do is
> always assuming the link is up.
> 
> Signed-off-by: Jason Wang <jasowang@redhat.com>

I've applied Rusty's submission of this patch which has Michael T.'s
ACK, etc.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Patch
diff mbox series

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index bb6b67f..b6d4028 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -986,9 +986,15 @@  static int virtnet_probe(struct virtio_device *vdev)
 		goto unregister;
 	}
 
-	vi->status = VIRTIO_NET_S_LINK_UP;
-	virtnet_update_status(vi);
-	netif_carrier_on(dev);
+	/* Assume link up if device can't report link status,
+	   otherwise get link status from config. */
+	if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) {
+		netif_carrier_off(dev);
+		virtnet_update_status(vi);
+	} else {
+		vi->status = VIRTIO_NET_S_LINK_UP;
+		netif_carrier_on(dev);
+	}
 
 	pr_debug("virtnet: registered device %s\n", dev->name);
 	return 0;