From nobody Tue Nov 26 15:20:06 2024 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9CC251D279F; Wed, 16 Oct 2024 22:37:35 +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=1729118257; cv=none; b=Eo1SjaaRPSwHHMcT/dH/AVPxuT656AkKOjn1P4bh9EdM+dQ8ijc/ukDJSoqNK4HEuSilqGCWBfC6W8LHcLZHvc2jIhDHRyY4jqneCIFbQmKm0e5vGbrmY298BaurU+9lA70+zm/5S+qeaXB3kaPkuEwiFpXxey1xa3FO7D5RGpQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729118257; c=relaxed/simple; bh=EQ4ml+O4TX3BjSDvRSV0hoFCLWMb87Ys4GS55Jll2xs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=P42rOlrRKk6KGCZS9L8kLhfUdMUTMYDxjK/LPsCGWEGAYWptn/XSvD4C88gNOTm66wuNssKfTxCfVrrFekFUrAv6ZwRMg1lCxbpKPEJFA7H/0CQueKzM9tbsHt7sHowZzOIFNn8qkz5okmccVtC7DpHlKyuzJK8dsGJJypbgHzk= 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=BN0Ikvoq; 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="BN0Ikvoq" Received: from rrs24-12-35.corp.microsoft.com (unknown [131.107.159.201]) by linux.microsoft.com (Postfix) with ESMTPSA id 3836D20E1AAE; Wed, 16 Oct 2024 15:37:35 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 3836D20E1AAE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1729118255; bh=NWGATxjJC59rbkT0n4WXCatYd0kHKSQicgKPOVfHyH8=; h=From:To:Cc:Subject:Date:From; b=BN0Ikvoq0ZxCI0swOSjhsZKZUuYFNh1fd6t9j8zIqpLj2+1fZVIy/L2a73tOrjzWJ nugcNpwOxxEyUbbf1G0g9/l1mga2EjdAjPeFoP8wJDNK2k4ldbgt7jGhGj5O0MKB/P uf0zjCxKJ8LUQYoBg7hOUTwcON/kpN+4xxnMKdVc= From: Easwar Hariharan To: lkp@intel.com, "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , linux-hyperv@vger.kernel.org (open list:Hyper-V/Azure CORE AND DRIVERS), linux-kernel@vger.kernel.org (open list) Cc: Naman Jain , Easwar Hariharan Subject: [RFC PATCH] drivers: hv: Convert open-coded timeouts to msecs_to_jiffies() Date: Wed, 16 Oct 2024 22:37:27 +0000 Message-ID: <20241016223730.531861-1-eahariha@linux.microsoft.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We have several places where timeouts are open-coded as N (seconds) * HZ, but best practice is to use msecs_to_jiffies(). Convert the timeouts to make them HZ invariant. Signed-off-by: Easwar Hariharan --- drivers/hv/hv_balloon.c | 9 +++++---- drivers/hv/hv_kvp.c | 4 ++-- drivers/hv/hv_snapshot.c | 6 ++++-- drivers/hv/vmbus_drv.c | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c index c38dcdfcb914d..3017d41f12681 100644 --- a/drivers/hv/hv_balloon.c +++ b/drivers/hv/hv_balloon.c @@ -756,7 +756,7 @@ static void hv_mem_hot_add(unsigned long start, unsigne= d long size, * adding succeeded, it is ok to proceed even if the memory was * not onlined in time. */ - wait_for_completion_timeout(&dm_device.ol_waitevent, 5 * HZ); + wait_for_completion_timeout(&dm_device.ol_waitevent, msecs_to_jiffies(5 = * 1000)); post_status(&dm_device); } } @@ -1373,7 +1373,8 @@ static int dm_thread_func(void *dm_dev) struct hv_dynmem_device *dm =3D dm_dev; =20 while (!kthread_should_stop()) { - wait_for_completion_interruptible_timeout(&dm_device.config_event, 1 * H= Z); + wait_for_completion_interruptible_timeout(&dm_device.config_event, + msecs_to_jiffies(1 * 1000)); /* * The host expects us to post information on the memory * pressure every second. @@ -1748,7 +1749,7 @@ static int balloon_connect_vsp(struct hv_device *dev) if (ret) goto out; =20 - t =3D wait_for_completion_timeout(&dm_device.host_event, 5 * HZ); + t =3D wait_for_completion_timeout(&dm_device.host_event, msecs_to_jiffies= (5 * 1000)); if (t =3D=3D 0) { ret =3D -ETIMEDOUT; goto out; @@ -1806,7 +1807,7 @@ static int balloon_connect_vsp(struct hv_device *dev) if (ret) goto out; =20 - t =3D wait_for_completion_timeout(&dm_device.host_event, 5 * HZ); + t =3D wait_for_completion_timeout(&dm_device.host_event, msecs_to_jiffies= (5 * 1000)); if (t =3D=3D 0) { ret =3D -ETIMEDOUT; goto out; diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c index d35b60c061148..8d9ae1b0e8788 100644 --- a/drivers/hv/hv_kvp.c +++ b/drivers/hv/hv_kvp.c @@ -655,7 +655,7 @@ void hv_kvp_onchannelcallback(void *context) if (host_negotiatied =3D=3D NEGO_NOT_STARTED) { host_negotiatied =3D NEGO_IN_PROGRESS; schedule_delayed_work(&kvp_host_handshake_work, - HV_UTIL_NEGO_TIMEOUT * HZ); + msecs_to_jiffies(HV_UTIL_NEGO_TIMEOUT * 1000)); } return; } @@ -724,7 +724,7 @@ void hv_kvp_onchannelcallback(void *context) */ schedule_work(&kvp_sendkey_work); schedule_delayed_work(&kvp_timeout_work, - HV_UTIL_TIMEOUT * HZ); + msecs_to_jiffies(HV_UTIL_TIMEOUT * 1000)); =20 return; =20 diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c index 0d2184be16912..be4955613db35 100644 --- a/drivers/hv/hv_snapshot.c +++ b/drivers/hv/hv_snapshot.c @@ -192,8 +192,10 @@ static void vss_send_op(void) =20 vss_transaction.state =3D HVUTIL_USERSPACE_REQ; =20 - schedule_delayed_work(&vss_timeout_work, op =3D=3D VSS_OP_FREEZE ? - VSS_FREEZE_TIMEOUT * HZ : HV_UTIL_TIMEOUT * HZ); + schedule_delayed_work(&vss_timeout_work, + op =3D=3D VSS_OP_FREEZE ? + msecs_to_jiffies(VSS_FREEZE_TIMEOUT * 1000) : + msecs_to_jiffies(HV_UTIL_TIMEOUT * 1000)); =20 rc =3D hvutil_transport_send(hvt, vss_msg, sizeof(*vss_msg), NULL); if (rc) { diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 9b15f7daf5059..e35e0a615cb58 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -2507,7 +2507,7 @@ static int vmbus_bus_resume(struct device *dev) vmbus_request_offers(); =20 if (wait_for_completion_timeout( - &vmbus_connection.ready_for_resume_event, 10 * HZ) =3D=3D 0) + &vmbus_connection.ready_for_resume_event, msecs_to_jiffies(10 * 1000)) = =3D=3D 0) pr_err("Some vmbus device is missing after suspending?\n"); =20 /* Reset the event for the next suspend. */ --=20 2.43.0