From patchwork Mon Sep 30 08:41:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erni Sri Satya Vennela X-Patchwork-Id: 13815609 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0322517BED6; Mon, 30 Sep 2024 08:41:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727685712; cv=none; b=fdKnFxkDH5ILaRqD79RPzP+lo+gfQfAzUPYJscxbg57P5QsrnNZPjKvWoCBIcfsOa8SxuedTMMX04BJL6SKMHaYYU1kPwyhVaBsJD3Cf45l5whyJUikTCotG5iQxRGzbYnA/smktonsmbQfYlMDpBXXZiHqni6jjWBITBEe3p5k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727685712; c=relaxed/simple; bh=+YGaNF4FO3cX1vlao6rYtqjzOGhG8HKZmGpJ/sq0YDo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=XPp8KoDRtnL2p3NUFXd3k1VMViNk+9btiyisth9vpRel0px9OxIlmkrNEe1uoUzDGHQjfOxPWmsoCXEV+o5+gfdJbhiPnO6gqRtc9P/bhqks4lISgc42F2Cd16+c2m0rCdV+Wl8G+OUZuJbU5LcU+/pOBCtpCMFYwImK4PerAiE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=a3rX9lz7; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="a3rX9lz7" Received: by linux.microsoft.com (Postfix, from userid 1173) id A87D820C8C63; Mon, 30 Sep 2024 01:41:50 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com A87D820C8C63 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1727685710; bh=N2pr1JnBEbZjhT/+blNm+E4qrbSBpWcm4Sv7x6ysoK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a3rX9lz7H7C+IQGHr1kFxEUIksbuNIApmf1UWN3iGz1fJdeWcsoTm69i5+EvQ8mWZ MI/9+fjB6I9YSxNT/M8h4CT5aSrUBjuvBv9phHhQt/uOOOU8IoS61N6+5dTEuWwbLO LPyUqb57y4ZMpP90pYDFdefpvxuj82sP3Uzygbfw= From: Erni Sri Satya Vennela To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, jikos@kernel.org, bentiss@kernel.org, dmitry.torokhov@gmail.com, mikelley@microsoft.com, linux-hyperv@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ernis@microsoft.com, Erni Sri Satya Vennela , stable@vger.kernel.org, Saurabh Sengar Subject: [PATCH v3 1/3] Drivers: hv: vmbus: Disable Suspend-to-Idle for VMBus Date: Mon, 30 Sep 2024 01:41:46 -0700 Message-Id: <1727685708-3524-2-git-send-email-ernis@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1727685708-3524-1-git-send-email-ernis@linux.microsoft.com> References: <1727685708-3524-1-git-send-email-ernis@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: This change is specific to Hyper-V based VMs. If the Virtual Machine Connection window is focused, a Hyper-V VM user can unintentionally touch the keyboard/mouse when the VM is hibernating or resuming, and consequently the hibernation or resume operation can be aborted unexpectedly. Fix the issue by no longer registering the keyboard/mouse as wakeup devices (see the other two patches for the changes to drivers/input/serio/hyperv-keyboard.c and drivers/hid/hid-hyperv.c). The keyboard/mouse were registered as wakeup devices because the VM needs to be woken up from the Suspend-to-Idle state after a user runs "echo freeze > /sys/power/state". It seems like the Suspend-to-Idle feature has no real users in practice, so let's no longer support that by returning -EOPNOTSUPP if a user tries to use that. $echo freeze > /sys/power/state > bash: echo: write error: Operation not supported Fixes: 1a06d017fb3f ("Drivers: hv: vmbus: Fix Suspend-to-Idle for Generation-2 VM") Cc: stable@vger.kernel.org Signed-off-by: Saurabh Sengar Signed-off-by: Erni Sri Satya Vennela --- Changes in v2: * Add "#define vmbus_freeze NULL" when CONFIG_PM_SLEEP is not enabled. * Change commit message to clarify that this change is specifc to Hyper-V based VMs. Changes in v3: * Add 'Cc: stable@vger.kernel.org' in sign-off area. --- drivers/hv/vmbus_drv.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 965d2a4efb7e..8f445c849512 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -900,6 +900,19 @@ static void vmbus_shutdown(struct device *child_device) } #ifdef CONFIG_PM_SLEEP +/* + * vmbus_freeze - Suspend-to-Idle + */ +static int vmbus_freeze(struct device *child_device) +{ +/* + * Do not support Suspend-to-Idle ("echo freeze > /sys/power/state") as + * that would require registering the Hyper-V synthetic mouse/keyboard + * devices as wakeup devices, which can abort hibernation/resume unexpectedly. + */ + return -EOPNOTSUPP; +} + /* * vmbus_suspend - Suspend a vmbus device */ @@ -938,6 +951,7 @@ static int vmbus_resume(struct device *child_device) return drv->resume(dev); } #else +#define vmbus_freeze NULL #define vmbus_suspend NULL #define vmbus_resume NULL #endif /* CONFIG_PM_SLEEP */ @@ -969,7 +983,7 @@ static void vmbus_device_release(struct device *device) */ static const struct dev_pm_ops vmbus_pm = { - .suspend_noirq = NULL, + .suspend_noirq = vmbus_freeze, .resume_noirq = NULL, .freeze_noirq = vmbus_suspend, .thaw_noirq = vmbus_resume, From patchwork Mon Sep 30 08:41:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erni Sri Satya Vennela X-Patchwork-Id: 13815610 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CDD0717C9B8; Mon, 30 Sep 2024 08:41:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727685713; cv=none; b=ayWS9SXVq5Lsz/9odKJ6qwHCyZubYma75Mdh8FuIzsM9rvl3I8gDbLJthBGOruDWEQldgpb6/iuwVsX/1XvlIV/5vTyQ+V8ax8UnWCqDLl780vJ0G+BlKRc3PFU5k+niVUMBmovr13Hk09MImwKMeyCuzHpFga77Vc5YeBX6a/A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727685713; c=relaxed/simple; bh=mRQWu9Qi60Rm069HxpdDnlMKyQWzItHFvKHZXcTx8kI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=iEawM+GOZBkkXrbEvo6g+R0oyWLBeeyy+h6LplDlHUKa5EtbVCXgaYoJUkyENfk4ciop7fBCB5hk7vY8QWD2aaWQbfR2wSlzGMtT4uW7llYyTBNv7eTMS26Ogiewt4mxqOhoeNsPG4xdLT3/MnVspdGrawkuUQxNbM6HH7A7Rdk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=Akk4is6f; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="Akk4is6f" Received: by linux.microsoft.com (Postfix, from userid 1173) id 81FC120C8BD6; Mon, 30 Sep 2024 01:41:51 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 81FC120C8BD6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1727685711; bh=aJfcW+SnLrtO8B80Y7aKM3iIgHe2LRVFhMf8g7MibuM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Akk4is6fo1xCKnukAIuetHfbzuDhbr5nYQexhH8SUKfnOGB0hliSjQwW/1oioFFMD a5T4YkzaFZX+fFw1s3PrnLn37wXiFnTKceKvJYG7UGfcRWzYOoN65AtxMnU63+FT1H VzRxEF2ayueWxq4fXYENh5AJBcwI6glH+jP1muEs= From: Erni Sri Satya Vennela To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, jikos@kernel.org, bentiss@kernel.org, dmitry.torokhov@gmail.com, mikelley@microsoft.com, linux-hyperv@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ernis@microsoft.com, Erni Sri Satya Vennela Subject: [PATCH v3 2/3] Revert "Input: hyperv-keyboard - register as a wakeup source" Date: Mon, 30 Sep 2024 01:41:47 -0700 Message-Id: <1727685708-3524-3-git-send-email-ernis@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1727685708-3524-1-git-send-email-ernis@linux.microsoft.com> References: <1727685708-3524-1-git-send-email-ernis@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: This reverts commit 62238f3aadc9bc56da70100e19ec61b9f8d72a5f. Remove keyboard as wakeup source since Suspend-To-Idle feature is disabled. Signed-off-by: Erni Sri Satya Vennela --- drivers/input/serio/hyperv-keyboard.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c index 31d9dacd2fd1..b42c546636bf 100644 --- a/drivers/input/serio/hyperv-keyboard.c +++ b/drivers/input/serio/hyperv-keyboard.c @@ -162,15 +162,6 @@ static void hv_kbd_on_receive(struct hv_device *hv_dev, serio_interrupt(kbd_dev->hv_serio, scan_code, 0); } spin_unlock_irqrestore(&kbd_dev->lock, flags); - - /* - * Only trigger a wakeup on key down, otherwise - * "echo freeze > /sys/power/state" can't really enter the - * state because the Enter-UP can trigger a wakeup at once. - */ - if (!(info & IS_BREAK)) - pm_wakeup_hard_event(&hv_dev->device); - break; default: @@ -356,9 +347,6 @@ static int hv_kbd_probe(struct hv_device *hv_dev, goto err_close_vmbus; serio_register_port(kbd_dev->hv_serio); - - device_init_wakeup(&hv_dev->device, true); - return 0; err_close_vmbus: From patchwork Mon Sep 30 08:41:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erni Sri Satya Vennela X-Patchwork-Id: 13815611 X-Patchwork-Delegate: jikos@jikos.cz Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9B33E181334; Mon, 30 Sep 2024 08:41:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727685713; cv=none; b=ACfZzhqWskG95gMHKA9I8LG5aDGJqRD/ASAgU6ksTVoXbgA9Q+2mvfu4gqREDYfcr5w6aqQsqrvffw74W8yABTjLRht664/GXoInxkN4U0nUzvZZu4UYAaTBWJ9Ir03aUx06zZ58w5B6EyzaCgN/pLeRijbr0x63Re0t3u5L0pI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727685713; c=relaxed/simple; bh=kk/hgYJKzfrSyEZ63RX3OFjZ+ojTIwIQixIFkUGn+HY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=i2MAJH/XxPUpD9recsINTmQejBfzjlNh86WJeX2bgICfwFr9WaX1y6AxKCRRUq+zPrOsOIA4Gg20Jc+rjF1nvVov6kpf3E64j1JgDxVTZoh9Y9lI1Jxtyuc9wPkHG7sV2/Q5CIqN8uHsEtMKEXMCoy4UchKIJehOAXMrvm/ee0o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=OfFvgxab; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="OfFvgxab" Received: by linux.microsoft.com (Postfix, from userid 1173) id 634A320C8C66; Mon, 30 Sep 2024 01:41:52 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 634A320C8C66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1727685712; bh=6uy2HCfWrjzOK/GPEwENb235RVQzwbIIz+wXrMpaUeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OfFvgxabXFT3sT4UkGtOZKIm83ucDqKCoHWvCW0VjhdIMGhoHrIKdovekX9i3SVge FU21XiNIWZz1keSN8v2ACV5tiuPsM1ACe96s7k65CwEI8Zvc86KZ8AMBwzyOjOYRhw wSy4YgOArqdewAvA5BsQa5+TO/kKCgwbZ8/5YShw= From: Erni Sri Satya Vennela To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, jikos@kernel.org, bentiss@kernel.org, dmitry.torokhov@gmail.com, mikelley@microsoft.com, linux-hyperv@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ernis@microsoft.com, Erni Sri Satya Vennela Subject: [PATCH v3 3/3] Revert "HID: hyperv: register as a wakeup source" Date: Mon, 30 Sep 2024 01:41:48 -0700 Message-Id: <1727685708-3524-4-git-send-email-ernis@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1727685708-3524-1-git-send-email-ernis@linux.microsoft.com> References: <1727685708-3524-1-git-send-email-ernis@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: This reverts commit f1210455e78a610c7b316389b31c162c371d888c. Remove mouse as wakeup source since Suspend-To-Idle feature is disabled. Signed-off-by: Erni Sri Satya Vennela --- drivers/hid/hid-hyperv.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c index f33485d83d24..b6d0f7db4c93 100644 --- a/drivers/hid/hid-hyperv.c +++ b/drivers/hid/hid-hyperv.c @@ -293,9 +293,6 @@ static void mousevsc_on_receive(struct hv_device *device, memcpy(input_dev->input_buf, input_report->buffer, len); hid_input_report(input_dev->hid_device, HID_INPUT_REPORT, input_dev->input_buf, len, 1); - - pm_wakeup_hard_event(&input_dev->device->device); - break; default: pr_err("unsupported hid msg type - type %d len %d\n", @@ -502,8 +499,6 @@ static int mousevsc_probe(struct hv_device *device, goto probe_err2; } - device_init_wakeup(&device->device, true); - input_dev->connected = true; input_dev->init_complete = true; @@ -526,7 +521,6 @@ static void mousevsc_remove(struct hv_device *dev) { struct mousevsc_dev *input_dev = hv_get_drvdata(dev); - device_init_wakeup(&dev->device, false); vmbus_close(dev->channel); hid_hw_stop(input_dev->hid_device); hid_destroy_device(input_dev->hid_device);