From patchwork Tue Dec 17 04:17:07 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: 13910964 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C22FB14D456; Tue, 17 Dec 2024 04:17:19 +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=1734409041; cv=none; b=ShOGPbXiApmvqp927koMHiUvuTuxuq4MPeuNs/fVB7s0583b8ImUQvLcNfeeqs/+jF694MDmCw9Byi+h8dolztvA5j9rcelUAsz+cmd91Bpc35L1XTnPzyNtTqzZI5CwkkBbEEaxdqLqLmWwTjq1wj0URqwBNEcScq49y6sTK2s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734409041; c=relaxed/simple; bh=wbI0mKMWdKJTpHoGI+h2MBkSNibVAgdQ8V1iBKzfkQE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=c58aChuyGMH347g6mfSRqKqrSsMgVRbRRWOwKjoRFmBzzyqeonbcWCXr88kczH73P7P8x5eD/w3+xT7J4Tj2Kj5drSfe6u8eL0XuUgJp701CRoID7izuh17XW/0GeUJCYb/x64M+1DKL0e9/cJEJbhkr8AyCmpPVwzNJA0oLUoA= 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=TnM3iiaH; 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="TnM3iiaH" Received: by linux.microsoft.com (Postfix, from userid 1173) id 63230204720E; Mon, 16 Dec 2024 20:17:19 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 63230204720E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1734409039; bh=rohi30jQued/musal8jVbkH2QFLeJasEFrkrbds2La4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TnM3iiaHo7K6UE6HpBYOL6z9JRnTJrJmB6bvFlL44sb+TTPgoU4J2WYJobgIlGRgw bIlda3ThmedYRWVkwyAWQk0ur+gGzCDPZjBSVbqmSkrjru+oiazGhiHI6VqnapKMsf QKd2Dfau95SHALpUSGdzZfYvzlZNuXm8L6T/YTxs= 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, linux-hyperv@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Erni Sri Satya Vennela , stable@vger.kernel.org, Saurabh Sengar Subject: [PATCH v4 1/3] Drivers: hv: vmbus: Disable Suspend-to-Idle for VMBus Date: Mon, 16 Dec 2024 20:17:07 -0800 Message-Id: <1734409029-10419-2-git-send-email-ernis@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1734409029-10419-1-git-send-email-ernis@linux.microsoft.com> References: <1734409029-10419-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 VM user. 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. 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 v4: * No change Changes in v3: * Add "Cc: stable@vger.kernel.org" in sign-off area. Changes in v2: * Add "#define vmbus_freeze NULL" when CONFIG_PM_SLEEP is not enabled. --- 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 6d89d37b069a..4df6b12bf6a1 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 Tue Dec 17 04:17:08 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: 13910965 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 00B6B13DDB9; Tue, 17 Dec 2024 04:17:26 +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=1734409048; cv=none; b=XkhvMsCVUjxiTyLm7jxTGGMkw9SIE9s6wH4NnORvKjZTQlJ/rMb8RYC4jPbp/4VZsHXfu+h6R0IG+1A1YqFaqUWlAF4Fa14dc4AKq9V5SK5DrdyBxwKx0dGIWvgu5jJ+sgb0dS14SpyBxLjHv/ItNgXCUywfKcPMy+I0Wzf7S4E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734409048; c=relaxed/simple; bh=AdrUadjhSx97doxIAfVk9I6cDW4O2hldGinLswbkeIo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=ErKXjBhJNfdAYcBU/SL7HJOvU3WIU6hThmLQqe/aRDp2Wbxg4bb37CYmhWL2y7L9eWLXPm9tHjExYceAapT1ZRfoFvBS9CLAoDidjzGnAG6xw5XNDGGCEOQG0jCUcHoZJe4rD+jo7GgX+wU15298myeBWS+pZy2HtYYTk1j/I8A= 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=LXLOJl7L; 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="LXLOJl7L" Received: by linux.microsoft.com (Postfix, from userid 1173) id A13FB204720E; Mon, 16 Dec 2024 20:17:26 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com A13FB204720E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1734409046; bh=uSjkqG/GU6kBlj8gGZKTEqQn5LvmkpbdjNJqKjHZLfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LXLOJl7LxeD7xxHsLpexHbFw2c3zdoiCTsRBoAuBRsaJ9ygL7kIpyngmDupEHo6Dm hmdzm7KzJXBsSjavFEICWVHUXMo2B27SJNbolR6b/OROtb07Gp3s5wpoT3qzFx+Dc5 SMghudy+UehzWcKBGsGulVc0zt8x+gw5lcXDTi6E= 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, linux-hyperv@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Erni Sri Satya Vennela Subject: [PATCH v4 2/3] Input: hyperv-keyboard - disable as wakeup source Date: Mon, 16 Dec 2024 20:17:08 -0800 Message-Id: <1734409029-10419-3-git-send-email-ernis@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1734409029-10419-1-git-send-email-ernis@linux.microsoft.com> References: <1734409029-10419-1-git-send-email-ernis@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Do not enable keyboard as wakeup device since Suspend-to-Idle feature is no longer supported. Signed-off-by: Erni Sri Satya Vennela --- Changes in v4: * Replace device_init_wakeup() with device_set_wakeup_capable() without reverting "Input: hyperv-keyboard - register as a wakeup source" Changes in v3, v2: * No change. --- drivers/input/serio/hyperv-keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c index 0ee7505427ac..b32047f36321 100644 --- a/drivers/input/serio/hyperv-keyboard.c +++ b/drivers/input/serio/hyperv-keyboard.c @@ -355,7 +355,7 @@ static int hv_kbd_probe(struct hv_device *hv_dev, serio_register_port(kbd_dev->hv_serio); - device_init_wakeup(&hv_dev->device, true); + device_set_wakeup_capable(&hv_dev->device, true); return 0; From patchwork Tue Dec 17 04:17:09 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: 13910966 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 E491C14AD3D; Tue, 17 Dec 2024 04:17:33 +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=1734409055; cv=none; b=aFDpGi4ZIX9VZ5EBQdUO2wQO9IFhDEX2+0Ox1GIn7kl7Zy1bR318L9hpee1X76qea1wRS8ILdmmmLWQQ+DI5kXhwl43X6JedZWxNf8sMfd2GHEZBzayLLPWr7j+jru+kHg6PEGPkC5mgQOG9YaTGUQaC5y1+GVv9f2m+YMb6wws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734409055; c=relaxed/simple; bh=iVw5SMSq1NnWd4cIbhU6o+1lcS5G5m/Bqf3klkFU5f0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=dGF7DXBhgGYTnIZN1QagmdIHLEx75UrzPjYqRYhE7J5Ec9TfkUvPn0EjD5TCMXwpGPCMZ6GhBzbg032j/8zgpMkwNXQu51S3M6nkPwcPtYBsNXCl1EmbnkEvOvx12Z5SiMqVH8oHkc1fvcCYd3SequegOOz/N4UdP3RLoDzj4w0= 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=l4+ut4HI; 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="l4+ut4HI" Received: by linux.microsoft.com (Postfix, from userid 1173) id 91153204720E; Mon, 16 Dec 2024 20:17:33 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 91153204720E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1734409053; bh=HaIOnEhQhv1FKYbJuCbPN8zIaM65OendeLE6+LccWGo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l4+ut4HI44HF6eigzGyh9Mosvf4gvsztgMysVyNYgANc2KDXOw5Z2r9Z3FOxetcAc Vq/YmqQdPIqmYw1WARscUwKVBQWy3WP7KYWJzLBE1qo1uCp/nZqIIO96W44oOh7yt4 a2H8KIxun1Ysy9IpFQMdF6FfT+ZpzNByoMTv/Q0I= 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, linux-hyperv@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Erni Sri Satya Vennela Subject: [PATCH v4 3/3] HID: hyperv: disable as wakeup source Date: Mon, 16 Dec 2024 20:17:09 -0800 Message-Id: <1734409029-10419-4-git-send-email-ernis@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1734409029-10419-1-git-send-email-ernis@linux.microsoft.com> References: <1734409029-10419-1-git-send-email-ernis@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Do not enable mouse as wakeup device since Suspend-to-Idle feature is no longer supported. Calling device_init_wakeup in the remove function is unnecessary since the device is going away, and thus won't be able to cause any wakeups under any circumstances. Besides, the driver cleanup code already handles the necessary cleanup. Signed-off-by: Erni Sri Satya Vennela --- Changes in v4: * Replace device_init_wakeup() with device_set_wakeup_capable without reverting "HID: hyperv: register as a wakeup source". * Remove device_init_wakeup() in mousevsc_remove(). ref: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=f20b161f59b73d40043199b3bff362e656a9c673 Changes in v3, v2: * No change --- drivers/hid/hid-hyperv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c index 0fb210e40a41..05215e79eac8 100644 --- a/drivers/hid/hid-hyperv.c +++ b/drivers/hid/hid-hyperv.c @@ -515,7 +515,7 @@ static int mousevsc_probe(struct hv_device *device, if (ret) goto probe_err2; - device_init_wakeup(&device->device, true); + device_set_wakeup_capable(&device->device, true); input_dev->connected = true; input_dev->init_complete = true; @@ -539,7 +539,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);