| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <cc17e0d8-2909-4c01-906c-941700beecd6@ieee.org>
Date: Sun, 2 Mar 2025 11:09:21 -0600
From: Alex Elder <elder@...e.org>
To: Easwar Hariharan <eahariha@...ux.microsoft.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Christophe JAILLET <christophe.jaillet@...adoo.fr>,
Daniel Vacek <neelx@...e.com>, Ilya Dryomov <idryomov@...il.com>,
Dongsheng Yang <dongsheng.yang@...ystack.cn>, Jens Axboe <axboe@...nel.dk>,
Xiubo Li <xiubli@...hat.com>
Cc: ceph-devel@...r.kernel.org, linux-block@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v4 2/2] libceph: convert timeouts to secs_to_jiffies()
On 2/28/25 10:22 PM, Easwar Hariharan wrote:
> 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)
>
> Change the checks for range to check against HZ.
>
> Acked-by: Ilya Dryomov <idryomov@...il.com>
> Signed-off-by: Easwar Hariharan <eahariha@...ux.microsoft.com>
Much of this is fine, but I have the same comment on the changes
where you bring HZ into the checks, which is wrong. Just
convert the code more directly, factoring out 1000 *only*.
> ---
> include/linux/ceph/libceph.h | 12 ++++++------
> net/ceph/ceph_common.c | 18 ++++++++----------
> net/ceph/osd_client.c | 3 +--
> 3 files changed, 15 insertions(+), 18 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..ee701b39960e1c9778db91936ac7503467ee1162 100644
> --- a/net/ceph/ceph_common.c
> +++ b/net/ceph/ceph_common.c
> @@ -527,29 +527,27 @@ 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 || result.uint32 > INT_MAX / HZ)
if (!result.uint32 || result.uint32 > INT_MAX)
> 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 || result.uint32 > INT_MAX / HZ)
if (!result.uint32 || result.uint32 > INT_MAX)
> 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)
And so on.
-Alex
> + if (result.uint32 > INT_MAX / HZ)
> 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)
> + if (result.uint32 > INT_MAX / HZ)
> 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);
>
>
Powered by blists - more mailing lists