Drivers: hv: util: on deinit, don't wait the release event, if we shouldn't
PATCH 1/1 Drivers: hv: util: on deinit, don't wait the release event, if we shouldn't
From: Dexuan Cui <[email protected]>
If the daemon is NOT running at all, when we disable the util device from Hyper-V Manager (or sometimes the host can rescind a util device and then re-offer it), we'll hang in util_remove -> hv_kvp_deinit -> wait_for_completion(&release_event), because this code path doesn't run:hvt_op_release -> ... -> kvp_on_reset -> complete(&release_event).
Due to this, we even can't reboot the VM properly.
The patch tracks if the dev file is opened or not, and we only need to wait if it's opened.
--- drivers/hv/hv_fcopy.c | 5 ++++- drivers/hv/hv_kvp.c | 6 +++++- drivers/hv/hv_snapshot.c | 5 ++++- drivers/hv/hv_utils_transport.c | 2 ++ drivers/hv/hv_utils_transport.h | 1 + 5 files changed, 16 insertions(+), 3 deletions(-)
drivers/hv/hv_fcopy.c +4 -1
@@ -358,8 +358,11 @@ int hv_fcopy_init(struct hv_util_service *srv)void hv_fcopy_deinit (void ) { +bool wait = hvt->dev_opened; + fcopy_transaction.state =HVUTIL_DEVICE_DYING ;cancel_delayed_work_sync (&fcopy_timeout_work);hvutil_transport_destroy (hvt); -wait_for_completion (&release_event); +if (wait) +wait_for_completion (&release_event); }
drivers/hv/hv_kvp.c +5 -1
@@ -742,10 +742,14 @@ static void kvp_on_reset(void)void hv_kvp_deinit (void ) { +bool wait = hvt->dev_opened; + kvp_transaction.state =HVUTIL_DEVICE_DYING ;cancel_delayed_work_sync (&kvp_host_handshake_work);cancel_delayed_work_sync (&kvp_timeout_work);cancel_work_sync (&kvp_sendkey_work);hvutil_transport_destroy (hvt); -wait_for_completion (&release_event); + +if (wait) +wait_for_completion (&release_event); }
drivers/hv/hv_snapshot.c +4 -1
@@ -396,9 +396,12 @@ static void vss_on_reset(void)void hv_vss_deinit (void ) { +bool wait = hvt->dev_opened; + vss_transaction.state =HVUTIL_DEVICE_DYING ;cancel_delayed_work_sync (&vss_timeout_work);cancel_work_sync (&vss_handle_request_work);hvutil_transport_destroy (hvt); -wait_for_completion (&release_event); +if (wait) +wait_for_completion (&release_event); }
drivers/hv/hv_utils_transport.c +2 -0
@@ -153,6 +153,7 @@ static int hvt_op_open(struct inode *inode, struct file *file)if (issue_reset)hvt_reset (hvt); + hvt->dev_opened = (hvt->mode ==HVUTIL_TRANSPORT_CHARDEV ) && !ret;mutex_unlock (&hvt->lock);
@@ -182,6 +183,7 @@ static int hvt_op_release(struct inode *inode, struct file *file)* connects back. */ hvt_reset (hvt); + hvt->dev_opened = false;mutex_unlock (&hvt->lock);if (mode_old ==HVUTIL_TRANSPORT_DESTROY )
drivers/hv/hv_utils_transport.h +1 -0
@@ -32,6 +32,7 @@ struct hvutil_transport {int mode;/* hvutil_transport_mode */ struct file_operations fops;/* file operations */ struct miscdevice mdev;/* misc device */ +bool dev_opened;/* Is the device opened? */ struct cb_id cn_id;/* CN_*_IDX/CN_*_VAL */ struct list_head list;/* hvt_list */ int (*on_msg)(void *,int );/* callback on new user message */
Signature · 1 line
1.7.1
Dexuan Cui
maintainerQuoted 14 lines
From: [email protected] [mailto:[email protected]]
Sent: Tuesday, February 28, 2017 07:18
To: [email protected]; [email protected];
...
From: Dexuan Cui <[email protected]>If the daemon is NOT running at all, when we disable the util device from Hyper-V Manager (or sometimes the host can rescind a util device and then re-offer it), we'll hang in
util_remove->hv_kvp_deinit->wait_for_completion(&release_event), because this code path doesn't run:hvt_op_release-> ... ->kvp_on_reset->complete(&release_event).Due to this, we even can't reboot the VM properly.
Quoted 7 lines
The patch tracks if the dev file is opened or not, and we only need to wait if it's opened.
Fixes 5a66fecbf6aa ("Drivers: hv: util: kvp: Fix a rescind processing issue")Signed-off-by Dexuan Cui <[email protected]>...
Please ignore this patch, since Vitaly posted a better fix instead.
Thanks,
-- Dexuan
Quoted 140 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]]
Sent: Monday, February 27, 2017 3:18 PM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Dexuan Cui <[email protected]>; KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; Stephen Hemminger <[email protected]>
Subject: [PATCH 1/1] Drivers: hv: util: on deinit, don't wait the release event, if we shouldn'tThis sender failed our fraud detection&nbs p;checks and may not be who they& nbsp;appear to be. Learn about <a href="http://aka.ms/LearnAboutSpoofing">spoofing</a>
From: Dexuan Cui <[email protected]>
If the daemon is NOT running at all, when we disable the util device from Hyper-V Manager (or sometimes the host can rescind a util device and then re-offer it), we'll hang in
util_remove->hv_kvp_deinit->wait_for_completion(&release_event), because this code path doesn't run:hvt_op_release-> ... ->kvp_on_reset->complete(&release_event).Due to this, we even can't reboot the VM properly.
The patch tracks if the dev file is opened or not, and we only need to wait if it's opened.
Fixes 5a66fecbf6aa ("Drivers: hv: util: kvp: Fix a rescind processing issue")Signed-off-by Dexuan Cui <[email protected]>Cc Vitaly Kuznetsov <[email protected]>Cc "K. Y. Srinivasan" <[email protected]>Cc Haiyang Zhang <[email protected]>Cc Stephen Hemminger <[email protected]>Signed-off-by K. Y. Srinivasan <[email protected]>--- drivers/hv/hv_fcopy.c | 5 ++++- drivers/hv/hv_kvp.c | 6 +++++- drivers/hv/hv_snapshot.c | 5 ++++- drivers/hv/hv_utils_transport.c | 2 ++ drivers/hv/hv_utils_transport.h | 1 + 5 files changed, 16 insertions(+), 3 deletions(-)drivers/hv/hv_fcopy.c +4
-1@@ -358,8 +358,11 @@ int hv_fcopy_init(struct hv_util_service *srv)void hv_fcopy_deinit (void ) { +bool wait = hvt->dev_opened; + fcopy_transaction.state =HVUTIL_DEVICE_DYING ;cancel_delayed_work_sync (&fcopy_timeout_work);hvutil_transport_destroy (hvt); -wait_for_completion (&release_event); +if (wait) +wait_for_completion (&release_event); }drivers/hv/hv_kvp.c +5
-1@@ -742,10 +742,14 @@ static void kvp_on_reset(void)void hv_kvp_deinit (void ) { +bool wait = hvt->dev_opened; + kvp_transaction.state =HVUTIL_DEVICE_DYING ;cancel_delayed_work_sync (&kvp_host_handshake_work);cancel_delayed_work_sync (&kvp_timeout_work);cancel_work_sync (&kvp_sendkey_work);hvutil_transport_destroy (hvt); -wait_for_completion (&release_event); + +if (wait) +wait_for_completion (&release_event); }drivers/hv/hv_snapshot.c +4
-1@@ -396,9 +396,12 @@ static void vss_on_reset(void)void hv_vss_deinit (void ) { +bool wait = hvt->dev_opened; + vss_transaction.state =HVUTIL_DEVICE_DYING ;cancel_delayed_work_sync (&vss_timeout_work);cancel_work_sync (&vss_handle_request_work);hvutil_transport_destroy (hvt); -wait_for_completion (&release_event); +if (wait) +wait_for_completion (&release_event); }drivers/hv/hv_utils_transport.c +1
-0@@ -153,6 +153,7 @@ static int hvt_op_open(struct inode *inode, struct file *file)if (issue_reset)hvt_reset (hvt); + hvt->dev_opened = (hvt->mode ==HVUTIL_TRANSPORT_CHARDEV ) && !ret;mutex_unlock(&hvt->lock);drivers/hv/hv_utils_transport.c +1
-0@@ -182,6 +183,7 @@ static int hvt_op_release(struct inode *inode, structfile *file) * connects back. */ hvt_reset (hvt); + hvt->dev_opened = false;mutex_unlock (&hvt->lock);if (mode_old == HVUTIL_TRANSPORT_DESTROY)drivers/hv/hv_utils_transport.h +1
-1@@ -32,6 +32,7 @@ struct hvutil_transport {int mode;/* hvutil_transport_mode */ struct file_operations fops;/* file operations */ struct miscdevice mdev;/* misc device */ +bool dev_opened;/* Is the device opened? */ struct cb_id cn_id;/* CN_*_IDX/CN_*_VAL */ struct list_head list;/* hvt_list */ int (*on_msg)(void *,int );/* callback on new user message */ --
Quoted 1 line
1.7.1
Greg,
Please drop this patch.
K. Y