lkml.org 
[lkml]   [2011]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 09/12] virtio: net: Add freeze, restore handlers to support S4
    Date
    Remove all the vqs, disable napi and detach from the netdev on
    hibernation.

    Re-create vqs after restoring from a hibernated image, re-enable napi
    and re-attach the netdev. This keeps networking working across
    hibernation.

    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    ---
    drivers/net/virtio_net.c | 36 ++++++++++++++++++++++++++++++++++++
    1 files changed, 36 insertions(+), 0 deletions(-)

    diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
    index 697a0fc..1378f3c 100644
    --- a/drivers/net/virtio_net.c
    +++ b/drivers/net/virtio_net.c
    @@ -1151,6 +1151,38 @@ static void __devexit virtnet_remove(struct virtio_device *vdev)
    free_netdev(vi->dev);
    }

    +#ifdef CONFIG_PM
    +static int virtnet_freeze(struct virtio_device *vdev)
    +{
    + struct virtnet_info *vi = vdev->priv;
    +
    + netif_device_detach(vi->dev);
    + if (netif_running(vi->dev))
    + napi_disable(&vi->napi);
    +
    + remove_vq_common(vi);
    +
    + return 0;
    +}
    +
    +static int virtnet_restore(struct virtio_device *vdev)
    +{
    + struct virtnet_info *vi = vdev->priv;
    + int err;
    +
    + err = init_vqs(vi);
    + if (err)
    + return err;
    +
    + try_fill_recv(vi, GFP_KERNEL);
    + if (netif_running(vi->dev))
    + virtnet_napi_enable(vi);
    +
    + netif_device_attach(vi->dev);
    + return 0;
    +}
    +#endif
    +
    static struct virtio_device_id id_table[] = {
    { VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
    { 0 },
    @@ -1175,6 +1207,10 @@ static struct virtio_driver virtio_net_driver = {
    .probe = virtnet_probe,
    .remove = __devexit_p(virtnet_remove),
    .config_changed = virtnet_config_changed,
    +#ifdef CONFIG_PM
    + .freeze = virtnet_freeze,
    + .restore = virtnet_restore,
    +#endif
    };

    static int __init init(void)
    --
    1.7.7.3


    \
     
     \ /
      Last update: 2011-12-06 20:53    [W:0.023 / U:119.496 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site