| Message ID | 20250128-converge-secs-to-jiffies-part-two-v1-6-9a6ecf0b2308@linux.microsoft.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Converge on using secs_to_jiffies() part two | expand |
On 1/28/2025 10:21 AM, 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 > +secs_to_jiffies > (E > - * \( 1000 \| MSEC_PER_SEC \) > ) > > Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> > --- > drivers/block/rbd.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > <snip> > @@ -6283,9 +6283,9 @@ static int rbd_parse_param(struct fs_parameter *param, > break; > case Opt_lock_timeout: > /* 0 is "wait forever" (i.e. infinite timeout) */ > - if (result.uint_32 > INT_MAX / 1000) > + if (result.uint_32 > INT_MAX) > goto out_of_range; > - opt->lock_timeout = msecs_to_jiffies(result.uint_32 * 1000); > + opt->lock_timeout = secs_to_jiffies(result.uint_32); > break; > case Opt_pool_ns: > kfree(pctx->spec->pool_ns); > Hi Ilya, Dongsheng, Jens, others, Could you please review this hunk and confirm the correct range check here? I figure this is here because of the multiplier to msecs_to_jiffies() and therefore unneeded after the conversion. If so, I noticed patch 07 has similar range checks that I neglected to fix and can do in a v2. Thanks, Easwar (he/him)
On Wed, Jan 29, 2025 at 10:03 PM Easwar Hariharan <eahariha@linux.microsoft.com> wrote: > > On 1/28/2025 10:21 AM, 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 > > +secs_to_jiffies > > (E > > - * \( 1000 \| MSEC_PER_SEC \) > > ) > > > > Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> > > --- > > drivers/block/rbd.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > <snip> > > > @@ -6283,9 +6283,9 @@ static int rbd_parse_param(struct fs_parameter *param, > > break; > > case Opt_lock_timeout: > > /* 0 is "wait forever" (i.e. infinite timeout) */ > > - if (result.uint_32 > INT_MAX / 1000) > > + if (result.uint_32 > INT_MAX) > > goto out_of_range; > > - opt->lock_timeout = msecs_to_jiffies(result.uint_32 * 1000); > > + opt->lock_timeout = secs_to_jiffies(result.uint_32); > > break; > > case Opt_pool_ns: > > kfree(pctx->spec->pool_ns); > > > > Hi Ilya, Dongsheng, Jens, others, > > Could you please review this hunk and confirm the correct range check > here? I figure this is here because of the multiplier to > msecs_to_jiffies() and therefore unneeded after the conversion. If so, I Hi Easwar, I'm not sure why INT_MAX / 1000 was used for an option which is defined as fsparam_u32 and accessed through result.uint_32, but yes, this check appears to be unneeded after the conversion to me. > noticed patch 07 has similar range checks that I neglected to fix and > can do in a v2. Go ahead but note that two of them also reject 0 -- that part needs to stay ;) Thanks, Ilya
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 5b393e4a1ddfc4eba1a821b9bf8e04585bdf2190..c2389500076643b8e1e9caa75431693d12e59a5e 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -4162,7 +4162,7 @@ static void rbd_acquire_lock(struct work_struct *work) dout("%s rbd_dev %p requeuing lock_dwork\n", __func__, rbd_dev); mod_delayed_work(rbd_dev->task_wq, &rbd_dev->lock_dwork, - msecs_to_jiffies(2 * RBD_NOTIFY_TIMEOUT * MSEC_PER_SEC)); + secs_to_jiffies(2 * RBD_NOTIFY_TIMEOUT)); } } @@ -6283,9 +6283,9 @@ static int rbd_parse_param(struct fs_parameter *param, break; case Opt_lock_timeout: /* 0 is "wait forever" (i.e. infinite timeout) */ - if (result.uint_32 > INT_MAX / 1000) + if (result.uint_32 > INT_MAX) goto out_of_range; - opt->lock_timeout = msecs_to_jiffies(result.uint_32 * 1000); + opt->lock_timeout = secs_to_jiffies(result.uint_32); break; case Opt_pool_ns: kfree(pctx->spec->pool_ns);
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 +secs_to_jiffies (E - * \( 1000 \| MSEC_PER_SEC \) ) Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> --- drivers/block/rbd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)