Message ID | 20250128-converge-secs-to-jiffies-part-two-v1-0-9a6ecf0b2308@linux.microsoft.com |
---|---|
Headers | show |
Series | Converge on using secs_to_jiffies() part two | expand |
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
This is the second series (part 1*) that converts users of msecs_to_jiffies() that either use the multiply pattern of either of: - msecs_to_jiffies(N*1000) or - msecs_to_jiffies(N*MSEC_PER_SEC) where N is a constant or an expression, to avoid the multiplication. The conversion is made with Coccinelle with the secs_to_jiffies() script in scripts/coccinelle/misc. Attention is paid to what the best change can be rather than restricting to what the tool provides. Andrew has kindly agreed to take the series through mm.git modulo the patches maintainers want to pick through their own trees. This series is based on next-20250128 Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> * https://lore.kernel.org/all/20241210-converge-secs-to-jiffies-v3-0-ddfefd7e9f2a@linux.microsoft.com/ --- Easwar Hariharan (16): coccinelle: misc: secs_to_jiffies: Patch expressions too scsi: lpfc: convert timeouts to secs_to_jiffies() accel/habanalabs: convert timeouts to secs_to_jiffies() ALSA: ac97: convert timeouts to secs_to_jiffies() btrfs: convert timeouts to secs_to_jiffies() rbd: convert timeouts to secs_to_jiffies() libceph: convert timeouts to secs_to_jiffies() libata: zpodd: convert timeouts to secs_to_jiffies() xfs: convert timeouts to secs_to_jiffies() power: supply: da9030: convert timeouts to secs_to_jiffies() nvme: convert timeouts to secs_to_jiffies() spi: spi-fsl-lpspi: convert timeouts to secs_to_jiffies() spi: spi-imx: convert timeouts to secs_to_jiffies() platform/x86/amd/pmf: convert timeouts to secs_to_jiffies() platform/x86: thinkpad_acpi: convert timeouts to secs_to_jiffies() RDMA/bnxt_re: convert timeouts to secs_to_jiffies() .../accel/habanalabs/common/command_submission.c | 2 +- drivers/accel/habanalabs/common/debugfs.c | 2 +- drivers/accel/habanalabs/common/device.c | 2 +- drivers/accel/habanalabs/common/habanalabs_drv.c | 2 +- drivers/ata/libata-zpodd.c | 3 +-- drivers/block/rbd.c | 6 +++--- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 2 +- drivers/nvme/host/core.c | 6 ++---- drivers/platform/x86/amd/pmf/acpi.c | 3 ++- drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/power/supply/da9030_battery.c | 3 +-- drivers/scsi/lpfc/lpfc_init.c | 4 ++-- drivers/scsi/lpfc/lpfc_scsi.c | 12 +++++------ drivers/scsi/lpfc/lpfc_sli.c | 24 ++++++++-------------- drivers/scsi/lpfc/lpfc_vport.c | 2 +- drivers/spi/spi-fsl-lpspi.c | 2 +- drivers/spi/spi-imx.c | 2 +- fs/btrfs/disk-io.c | 6 +++--- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_sysfs.c | 7 +++---- net/ceph/ceph_common.c | 10 ++++----- net/ceph/osd_client.c | 3 +-- scripts/coccinelle/misc/secs_to_jiffies.cocci | 22 ++++++++++++++------ sound/pci/ac97/ac97_codec.c | 3 +-- 24 files changed, 63 insertions(+), 69 deletions(-) --- base-commit: 9a87ce288fe30f268b3a598422fe76af9bb2c2d2 change-id: 20241217-converge-secs-to-jiffies-part-two-f44017aa6f67 Best regards,