Re: [PATCH v3 07/16] libceph: convert timeouts to secs_to_jiffies()

Christophe JAILLET
2025-02-25T21:26:05Z

Le 25/02/2025 à 21:17, Easwar Hariharan a écrit :
> Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced
> secs_to_jiffies(). As the value here is a multiple of 1000, use
> secs_to_jiffies() instead of msecs_to_jiffies() to avoid the multiplication
>
> This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with
> the following Coccinelle rules:
>
> @depends on patch@ expression E; @@
>
> -msecs_to_jiffies(E * 1000)
> +secs_to_jiffies(E)
>
> @depends on patch@ expression E; @@
>
> -msecs_to_jiffies(E * MSEC_PER_SEC)
> +secs_to_jiffies(E)
>
> While here, remove the no-longer necessary checks for range since there's
> no multiplication involved.

No sure it is correct.

Same comment as on patch 06/16, available at [1].

CJ

[1]:
https://lore.kernel.org/linux-kernel/e53d7586-b278-4338-95a2-fa768d5d8b5e@wanadoo.fr/

>
> Acked-by: Ilya Dryomov <idryomov@gmail.com>
> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
> ---
> include/linux/ceph/libceph.h | 12 ++++++------
> net/ceph/ceph_common.c | 18 ++++++------------
> net/ceph/osd_client.c | 3 +--
> 3 files changed, 13 insertions(+), 20 deletions(-)
>
> diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
> index 733e7f93db66a7a29a4a8eba97e9ebf2c49da1f9..5f57128ef0c7d018341c15cc59288aa47edec646 100644
> --- a/include/linux/ceph/libceph.h
> +++ b/include/linux/ceph/libceph.h
> @@ -72,15 +72,15 @@ struct ceph_options {
> /*
> * defaults
> */
> -#define CEPH_MOUNT_TIMEOUT_DEFAULT msecs_to_jiffies(60 * 1000)
> -#define CEPH_OSD_KEEPALIVE_DEFAULT msecs_to_jiffies(5 * 1000)
> -#define CEPH_OSD_IDLE_TTL_DEFAULT msecs_to_jiffies(60 * 1000)
> +#define CEPH_MOUNT_TIMEOUT_DEFAULT secs_to_jiffies(60)
> +#define CEPH_OSD_KEEPALIVE_DEFAULT secs_to_jiffies(5)
> +#define CEPH_OSD_IDLE_TTL_DEFAULT secs_to_jiffies(60)
> #define CEPH_OSD_REQUEST_TIMEOUT_DEFAULT 0 /* no timeout */
> #define CEPH_READ_FROM_REPLICA_DEFAULT 0 /* read from primary */
>
> -#define CEPH_MONC_HUNT_INTERVAL msecs_to_jiffies(3 * 1000)
> -#define CEPH_MONC_PING_INTERVAL msecs_to_jiffies(10 * 1000)
> -#define CEPH_MONC_PING_TIMEOUT msecs_to_jiffies(30 * 1000)
> +#define CEPH_MONC_HUNT_INTERVAL secs_to_jiffies(3)
> +#define CEPH_MONC_PING_INTERVAL secs_to_jiffies(10)
> +#define CEPH_MONC_PING_TIMEOUT secs_to_jiffies(30)
> #define CEPH_MONC_HUNT_BACKOFF 2
> #define CEPH_MONC_HUNT_MAX_MULT 10
>
> diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
> index 4c6441536d55b6323f4b9d93b5d4837cd4ec880c..c2a2c3bcc4e91a628c99bd1cef1211d54389efa2 100644
> --- a/net/ceph/ceph_common.c
> +++ b/net/ceph/ceph_common.c
> @@ -527,29 +527,23 @@ int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt,
>
> case Opt_osdkeepalivetimeout:
> /* 0 isn't well defined right now, reject it */
> - if (result.uint_32 < 1 || result.uint_32 > INT_MAX / 1000)
> + if (result.uint_32 < 1)
> goto out_of_range;
> - opt->osd_keepalive_timeout =
> - msecs_to_jiffies(result.uint_32 * 1000);
> + opt->osd_keepalive_timeout = secs_to_jiffies(result.uint_32);
> break;
> case Opt_osd_idle_ttl:
> /* 0 isn't well defined right now, reject it */
> - if (result.uint_32 < 1 || result.uint_32 > INT_MAX / 1000)
> + if (result.uint_32 < 1)
> goto out_of_range;
> - opt->osd_idle_ttl = msecs_to_jiffies(result.uint_32 * 1000);
> + opt->osd_idle_ttl = secs_to_jiffies(result.uint_32);
> break;
> case Opt_mount_timeout:
> /* 0 is "wait forever" (i.e. infinite timeout) */
> - if (result.uint_32 > INT_MAX / 1000)
> - goto out_of_range;
> - opt->mount_timeout = msecs_to_jiffies(result.uint_32 * 1000);
> + opt->mount_timeout = secs_to_jiffies(result.uint_32);
> break;
> case Opt_osd_request_timeout:
> /* 0 is "wait forever" (i.e. infinite timeout) */
> - if (result.uint_32 > INT_MAX / 1000)
> - goto out_of_range;
> - opt->osd_request_timeout =
> - msecs_to_jiffies(result.uint_32 * 1000);
> + opt->osd_request_timeout = secs_to_jiffies(result.uint_32);
> break;
>
> case Opt_share:
> diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
> index b24afec241382b60d775dd12a6561fa23a7eca45..ba61a48b4388c2eceb5b7a299906e7f90191dd5d 100644
> --- a/net/ceph/osd_client.c
> +++ b/net/ceph/osd_client.c
> @@ -4989,8 +4989,7 @@ int ceph_osdc_notify(struct ceph_osd_client *osdc,
> linger_submit(lreq);
> ret = linger_reg_commit_wait(lreq);
> if (!ret)
> - ret = linger_notify_finish_wait(lreq,
> - msecs_to_jiffies(2 * timeout * MSEC_PER_SEC));
> + ret = linger_notify_finish_wait(lreq, secs_to_jiffies(2 * timeout));
> else
> dout("lreq %p failed to initiate notify %d\n", lreq, ret);
>
>