hv_netvsc: Add the support of hibernation
Dexuan Cui
maintainerPATCH 1/1 hv_netvsc: Add the support of hibernation
The existing netvsc_detach() and netvsc_attach() APIs make it easy to implement the suspend/resume callbacks.
---
This patch is basically a pure Hyper-V specific change and it has a build dependency on the commit 271b2224d42f ("Drivers: hv: vmbus: Implement suspend/resume for VSC drivers for hibernation"), which is on Sasha Levin's Hyper-V tree's hyperv-next branch:
https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git/log/?h=hyperv-next
I request this patch should go through Sasha's tree rather than the net-next tree.
drivers/net/hyperv/hyperv_net.h | 3 +++ drivers/net/hyperv/netvsc_drv.c | 59 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+)
drivers/net/hyperv/hyperv_net.h +3 -0
@@ -952,6 +952,9 @@ struct net_device_context {u32 vf_alloc;/* Serial number of the VF to team with */ u32 vf_serial; + +/* Used to temporarily save the config info across hibernation */ +struct netvsc_device_info *saved_netvsc_dev_info; };/* Per channel data */
drivers/net/hyperv/netvsc_drv.c +59 -0
71 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Haiyang Zhang
maintainerQuoted 75 lines
-----Original Message-----
From: Dexuan Cui <[email protected]>
Sent: Wednesday, September 11, 2019 7:38 PM
To: KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; Stephen Hemminger <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; Michael Kelley <[email protected]>
Cc: Dexuan Cui <[email protected]>
Subject: [PATCH][PATCH net-next]hv_netvsc: Add the support of hibernationThe existing
netvsc_detach()andnetvsc_attach()APIs make it easy to implement the suspend/resume callbacks.Signed-off-by Dexuan Cui <[email protected]>---
This patch is basically a pure Hyper-V specific change and it has a build dependency on the commit
271b2224d42f("Drivers: hv: vmbus:
Implement
suspend/resume for VSC drivers for hibernation"), which is on Sasha Levin's Hyper-V tree's hyperv-next branch:
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.k
ernel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Fhyperv%2Flinux.git%2 Flog%2F%3Fh%3Dhyperv- next&data=02%7C01%7Chaiyangz%40microsoft.com%7C0b84e40c446 648cc35fb08d737110e28%7C72f988bf86f141af91ab2d7cd011db47%7C1%7 C0%7C637038418703112019&sdata=qd7DGFCJZ%2BDTix0VGcCe1JucV O97E0gILpVpcxlA6EE%3D&reserved=0I request this patch should go through Sasha's tree rather than the net-next tree.
drivers/net/hyperv/hyperv_net.h | 3 +++ drivers/net/hyperv/netvsc_drv.c | 59 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+)drivers/net/hyperv/hyperv_net.h +3
-0@@ -952,6 +952,9 @@ struct net_device_context {u32 vf_alloc;/* Serial number of the VF to team with */ u32 vf_serial; + +/* Used to temporarily save the config info across hibernation */ +struct netvsc_device_info *saved_netvsc_dev_info; };/* Per channel data */ drivers/net/hyperv/netvsc_drv.c +11
-0@@ -2392,6 +2392,63 @@ static int netvsc_remove(struct hv_device *dev)return 0 ; } +static int netvsc_suspend (struct hv_device *dev) +{ +struct net_device_context *ndev_ctx; +struct net_device *vf_netdev, *net; +struct netvsc_device *nvdev; +int ret; + + net =hv_get_drvdata (dev); + + ndev_ctx =netdev_priv (net); +cancel_delayed_work_sync (&ndev_ctx->dwork);
drivers/net/hyperv/netvsc_drv.c static int netvsc_remove(struct hv_device *dev) · line 2415
Quoted 10 lines
drivers/net/hyperv/netvsc_drv.c +10
-0+ +rtnl_lock (); + + nvdev =rtnl_dereference (ndev_ctx->nvdev); +if (nvdev ==NULL ) { + ret = -ENODEV ; + goto out; + } + +cancel_work_sync (&nvdev->subchan_work);
This looks redundant because netvsc_detach() cancels subchan_work.
Thanks,
- Haiyang
Dexuan Cui
maintainerQuoted 22 lines
From: Haiyang Zhang <[email protected]>
Sent: Thursday, September 12, 2019 6:50 AMQuoted 20 lines
-----Original Message-----
From: Dexuan Cui <[email protected]>
Sent: Wednesday, September 11, 2019 7:38 PMdrivers/net/hyperv/netvsc_drv.c +16
-0+static int netvsc_suspend (struct hv_device *dev) +{ +struct net_device_context *ndev_ctx; +struct net_device *vf_netdev, *net; +struct netvsc_device *nvdev; +int ret; + + net =hv_get_drvdata (dev); + + ndev_ctx =netdev_priv (net); +cancel_delayed_work_sync (&ndev_ctx->dwork); + +rtnl_lock (); + + nvdev =rtnl_dereference (ndev_ctx->nvdev); +if (nvdev ==NULL ) {
Quoted 8 lines
drivers/net/hyperv/netvsc_drv.c static int netvsc_remove(struct hv_device *dev) · line 2415
Quoted 5 lines
drivers/net/hyperv/netvsc_drv.c +5
-0+ ret = -ENODEV ; + goto out; + } + +cancel_work_sync (&nvdev->subchan_work);This looks redundant because
netvsc_detach()cancelssubchan_work.
- Haiyang
You are right. I'll remove the superflous linecancel_work_sync(&nvdev->subchan_work);
in netvsc_suspend() in v2.
I'll wait for a few days before posting v2, in case people may have other comments.
Thanks,
-- Dexuan