patch "virt: vbox: Do not use wait_event_interruptible when called from" added to char-misc-testing
Subsystems (2)
This is a note to let you know that I've just added the patch titled
virt: vbox: Do not use wait_event_interruptible when called from
to my char-misc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-testing branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will be merged to the char-misc-next branch sometime soon, after it passes testing, and the merge window is open.
If you have any questions about this process, please let me know.
From c35901b39ddc20077f4ae7b9f7bf344487f62212 Mon Sep 17 00:00:00 2001
From: Hans de Goede <[email protected]>
Date: Thu, 21 Jan 2021 16:07:54 +0100
Subject: virt: vbox: Do not use wait_event_interruptible when called from
kernel context
Do not use wait_event_interruptible when vbg_hgcm_call() gets called from kernel-context, such as it being called by the vboxsf filesystem code.
This fixes some filesystem related system calls on shared folders unexpectedly failing with -EINTR.
--- drivers/virt/vboxguest/vboxguest_utils.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/virt/vboxguest/vboxguest_utils.c +12 -6
@@ -468,7 +468,7 @@ static int hgcm_cancel_call(struct vbg_dev *gdev, struct vmmdev_hgcm_call *call)* Cancellation fun. */ static int vbg_hgcm_do_call (struct vbg_dev *gdev,struct vmmdev_hgcm_call *call, -u32 timeout_ms,bool *leak_it) +u32 timeout_ms,bool interruptible,bool *leak_it) {int rc, cancel_rc, ret;long timeout;
@@ -495,10 +495,15 @@ static int vbg_hgcm_do_call(struct vbg_dev *gdev, struct vmmdev_hgcm_call *call,else timeout =msecs_to_jiffies (timeout_ms); - timeout =wait_event_interruptible_timeout ( - gdev->hgcm_wq, -hgcm_req_done (gdev, &call->header), - timeout); +if (interruptible) { + timeout =wait_event_interruptible_timeout (gdev->hgcm_wq, +hgcm_req_done (gdev, &call->header), + timeout); + }else { + timeout =wait_event_timeout (gdev->hgcm_wq, +hgcm_req_done (gdev, &call->header), + timeout); + }/* timeout > 0 means hgcm_req_done has returned true, so success */ if (timeout >0 )
@@ -631,7 +636,8 @@ int vbg_hgcm_call(struct vbg_dev *gdev, u32 requestor, u32 client_id,hgcm_call_init_call (call, client_id, function, parms, parm_count, bounce_bufs); - ret =vbg_hgcm_do_call (gdev, call, timeout_ms, &leak_it); + ret =vbg_hgcm_do_call (gdev, call, timeout_ms, + requestor &VMMDEV_REQUESTOR_USERMODE , &leak_it);if (ret ==0 ) { *vbox_status = call->header.result; ret = hgcm_call_copy_back_result(call, parms, parm_count,
Signature · 1 line
2.30.0