drivers: hv: Convert open-coded timeouts to secs_to_jiffies()

We have several places where timeouts are open-coded as N (seconds) * HZ,
but best practice is to use the utility functions from jiffies.h. Convert
the timeouts to be compliant. This doesn't fix any bugs, it's a simple code
improvement.

Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
Reviewed-by: Michael Kelley <mhklinux@outlook.com>
Link: https://lore.kernel.org/r/20241030-open-coded-timeouts-v3-2-9ba123facf88@linux.microsoft.com
Signed-off-by: Wei Liu <wei.liu@kernel.org>
Message-ID: <20241030-open-coded-timeouts-v3-2-9ba123facf88@linux.microsoft.com>

diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
index c38dcdfcb914dcc3515be100cba0beb4a3f9b975..a99112e6f0b8534cf5c8c963e343019061bd34f6 100644 (file)
--- 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, unsigned 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, secs_to_jiffies(5));
                post_status(&dm_device);
        }
 }
@@ -1373,7 +1373,8 @@ static int dm_thread_func(void *dm_dev)
        struct hv_dynmem_device *dm = dm_dev;
 
        while (!kthread_should_stop()) {
-               wait_for_completion_interruptible_timeout(&dm_device.config_event, 1 * HZ);
+               wait_for_completion_interruptible_timeout(&dm_device.config_event,
+                                                               secs_to_jiffies(1));
                /*
                 * 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;
 
-       t = wait_for_completion_timeout(&dm_device.host_event, 5 * HZ);
+       t = wait_for_completion_timeout(&dm_device.host_event, secs_to_jiffies(5));
        if (t == 0) {
                ret = -ETIMEDOUT;
                goto out;
@@ -1806,7 +1807,7 @@ static int balloon_connect_vsp(struct hv_device *dev)
        if (ret)
                goto out;
 
-       t = wait_for_completion_timeout(&dm_device.host_event, 5 * HZ);
+       t = wait_for_completion_timeout(&dm_device.host_event, secs_to_jiffies(5));
        if (t == 0) {
                ret = -ETIMEDOUT;
                goto out;

diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c
index d35b60c0611486c8c909d2f8f7c730ff913df30d..29e01247a0870fdb9eebd92bdd16fd371450240c 100644 (file)
--- 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 == NEGO_NOT_STARTED) {
                        host_negotiatied = NEGO_IN_PROGRESS;
                        schedule_delayed_work(&kvp_host_handshake_work,
-                                     HV_UTIL_NEGO_TIMEOUT * HZ);
+                                               secs_to_jiffies(HV_UTIL_NEGO_TIMEOUT));
                }
                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);
+                                     secs_to_jiffies(HV_UTIL_TIMEOUT));
 
                return;
 

diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c
index 0d2184be16912559a8cfa784c762e6418ebd3279..86d87486ed40b3ca9f6674650e5a86a7184e2fa6 100644 (file)
--- a/drivers/hv/hv_snapshot.c
+++ b/drivers/hv/hv_snapshot.c
@@ -193,7 +193,8 @@ static void vss_send_op(void)
        vss_transaction.state = HVUTIL_USERSPACE_REQ;
 
        schedule_delayed_work(&vss_timeout_work, op == VSS_OP_FREEZE ?
-                       VSS_FREEZE_TIMEOUT * HZ : HV_UTIL_TIMEOUT * HZ);
+                               secs_to_jiffies(VSS_FREEZE_TIMEOUT) :
+                               secs_to_jiffies(HV_UTIL_TIMEOUT));
 
        rc = 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 6d89d37b069add5f26a408d6291ca441394d7d2d..2892b8da20a5e2b14bd390fb31c85cd20a385dca 100644 (file)
--- 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();
 
        if (wait_for_completion_timeout(
-               &vmbus_connection.ready_for_resume_event, 10 * HZ) == 0)
+               &vmbus_connection.ready_for_resume_event, secs_to_jiffies(10)) == 0)
                pr_err("Some vmbus device is missing after suspending?\n");
 
        /* Reset the event for the next suspend. */