| Message ID | 20241210-converge-secs-to-jiffies-v3-0-ddfefd7e9f2a@linux.microsoft.com |
|---|---|
| Headers | show |
| Series | Converge on using secs_to_jiffies() | expand |
On 12/10/2024 2:02 PM, Easwar Hariharan wrote: > This is a series that follows up on my previous series to introduce > secs_to_jiffies() and convert a few initial users.[1] In the review for > that series, Anna-Maria requested converting other users with > Coccinelle. [2] This is part 1 that converts users of msecs_to_jiffies() > that 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, to avoid the multiplication. > > The entire conversion is made with Coccinelle in the script added in > patch 2. Some changes suggested by Coccinelle have been deferred to > later parts that will address other possible variant patterns. > > CC: Anna-Maria Behnsen <anna-maria@linutronix.de> > Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> I have the same question as before: How do you expect these to land? Do you now have a maintainer who will take all of them? Or do you want individual maintainers to take the ones applicable to them? /jeff
On Tue, 10 Dec 2024 15:14:22 -0800 Jeff Johnson <jeff.johnson@oss.qualcomm.com> wrote: > On 12/10/2024 2:02 PM, Easwar Hariharan wrote: > > This is a series that follows up on my previous series to introduce > > secs_to_jiffies() and convert a few initial users.[1] In the review for > > that series, Anna-Maria requested converting other users with > > Coccinelle. [2] This is part 1 that converts users of msecs_to_jiffies() > > that 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, to avoid the multiplication. > > > > The entire conversion is made with Coccinelle in the script added in > > patch 2. Some changes suggested by Coccinelle have been deferred to > > later parts that will address other possible variant patterns. > > > > CC: Anna-Maria Behnsen <anna-maria@linutronix.de> > > Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> > > I have the same question as before: How do you expect these to land? > Do you now have a maintainer who will take all of them? > Or do you want individual maintainers to take the ones applicable to them? I'll just grab everything and see if anyone complains ;)
On Tue, 10 Dec 2024 22:02:31 +0000 Easwar Hariharan <eahariha@linux.microsoft.com> wrote: > This is a series that follows up on my previous series to introduce > secs_to_jiffies() and convert a few initial users. Thanks, I added this to mm.git. I suppressed the usual added-to-mm emails because soooo many cc's! I'd ask relevant maintainers to send in any acks and I'll paste them into the relevant changelogs.
On 12/10/2024 4:35 PM, Andrew Morton wrote: > On Tue, 10 Dec 2024 22:02:31 +0000 Easwar Hariharan <eahariha@linux.microsoft.com> wrote: > >> This is a series that follows up on my previous series to introduce >> secs_to_jiffies() and convert a few initial users. > > Thanks, I added this to mm.git. I suppressed the usual added-to-mm > emails because soooo many cc's! > > I'd ask relevant maintainers to send in any acks and I'll paste them > into the relevant changelogs. Thank you, Andrew! - Easwar
On Tue, 10 Dec 2024 15:36:04 -0800 Andrew Morton wrote: > > I have the same question as before: How do you expect these to land? > > Do you now have a maintainer who will take all of them? > > Or do you want individual maintainers to take the ones applicable to them? > > I'll just grab everything and see if anyone complains ;) I may, if this leads to a conflict :( Easwar, please break this up per subsystem.
On Tue, 10 Dec 2024 17:35:48 -0800 Jakub Kicinski <kuba@kernel.org> wrote: > On Tue, 10 Dec 2024 15:36:04 -0800 Andrew Morton wrote: > > > I have the same question as before: How do you expect these to land? > > > Do you now have a maintainer who will take all of them? > > > Or do you want individual maintainers to take the ones applicable to them? > > > > I'll just grab everything and see if anyone complains ;) > > I may, if this leads to a conflict :( Very unlikely, and any such conflict will be trivial. > Easwar, please break this up per subsystem. The series is already one-patch-per-changed-file.
On Tue, 10 Dec 2024 18:31:30 -0800 Andrew Morton wrote: > > > I'll just grab everything and see if anyone complains ;) > > > > I may, if this leads to a conflict :( > > Very unlikely, and any such conflict will be trivial. Agreed, mainly I don't understand why we'd make an exception and take the patchset via a special tree. > > Easwar, please break this up per subsystem. > > The series is already one-patch-per-changed-file. More confusingly still, they did send one standalone patch for an Ethernet driver: https://lore.kernel.org/all/20241210-converge-secs-to-jiffies-v3-20-59479891e658@linux.microsoft.com/ And yet another Ethernet driver (drivers/net/ethernet/google/gve/) is converted in this series.
On Tue, 10 Dec 2024 18:41:29 -0800 Jakub Kicinski <kuba@kernel.org> wrote: > On Tue, 10 Dec 2024 18:31:30 -0800 Andrew Morton wrote: > > > > I'll just grab everything and see if anyone complains ;) > > > > > > I may, if this leads to a conflict :( > > > > Very unlikely, and any such conflict will be trivial. > > Agreed, mainly I don't understand why we'd make an exception > and take the patchset via a special tree. It saves work for everyone? The patches are super-simple. If a maintainer chooses to merge one of them, Stephen tells us and I drop the mm.git copy. It's all so easy.
On Tue, 10 Dec 2024 18:50:40 -0800 Andrew Morton wrote: > > > Very unlikely, and any such conflict will be trivial. > > > > Agreed, mainly I don't understand why we'd make an exception > > and take the patchset via a special tree. > > It saves work for everyone? > > The patches are super-simple. If a maintainer chooses to merge one of > them, Stephen tells us and I drop the mm.git copy. It's all so easy. If it's just to save work - we're fine. Please don't apply the networking changes.
On 12/10/2024 6:41 PM, Jakub Kicinski wrote: > On Tue, 10 Dec 2024 18:31:30 -0800 Andrew Morton wrote: >>>> I'll just grab everything and see if anyone complains ;) >>> >>> I may, if this leads to a conflict :( >> >> Very unlikely, and any such conflict will be trivial. > > Agreed, mainly I don't understand why we'd make an exception > and take the patchset via a special tree. > >>> Easwar, please break this up per subsystem. >> >> The series is already one-patch-per-changed-file. > > More confusingly still, they did send one standalone patch for > an Ethernet driver: > https://lore.kernel.org/all/20241210-converge-secs-to-jiffies-v3-20-59479891e658@linux.microsoft.com/ > And yet another Ethernet driver (drivers/net/ethernet/google/gve/) > is converted in this series. Sorry about the confusion, I missed pulling the gve patch from this series. I'll send that (and ath11k) separately as well. I'll pull all these together into a series so you can merge them together if you prefer. Thanks, Easwar
Le 10/12/2024 à 23:02, 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: > > @@ constant C; @@ > > - msecs_to_jiffies(C * 1000) > + secs_to_jiffies(C) > > @@ constant C; @@ > > - msecs_to_jiffies(C * MSEC_PER_SEC) > + secs_to_jiffies(C) > > Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> > --- > samples/livepatch/livepatch-callbacks-busymod.c | 3 +-- > samples/livepatch/livepatch-shadow-fix1.c | 3 +-- > samples/livepatch/livepatch-shadow-mod.c | 15 +++++---------- > 3 files changed, 7 insertions(+), 14 deletions(-) > > diff --git a/samples/livepatch/livepatch-callbacks-busymod.c b/samples/livepatch/livepatch-callbacks-busymod.c > index 378e2d40271a9717d09eff51d3d3612c679736fc..69105596e72e6826aa2815cb2599eea56a0055ba 100644 > --- a/samples/livepatch/livepatch-callbacks-busymod.c > +++ b/samples/livepatch/livepatch-callbacks-busymod.c > @@ -44,8 +44,7 @@ static void busymod_work_func(struct work_struct *work) > static int livepatch_callbacks_mod_init(void) > { > pr_info("%s\n", __func__); > - schedule_delayed_work(&work, > - msecs_to_jiffies(1000 * 0)); > + schedule_delayed_work(&work, 0); This hunk is not in line with the patch description. This is probably OK to have in this patch, but you should add additional description to mention that special case with a 0 delay. Allthough you should probably change it to schedule_work() instead of using a 0 delay. Christophe
Easwar Hariharan <eahariha@linux.microsoft.com> writes: > 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: > > @@ constant C; @@ > > - msecs_to_jiffies(C * 1000) > + secs_to_jiffies(C) > > @@ constant C; @@ > > - msecs_to_jiffies(C * MSEC_PER_SEC) > + secs_to_jiffies(C) > > Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> > Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> > --- > drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I assume we can take this to our ath.git tree, please let us know if that's not the case.
Kalle Valo <kvalo@kernel.org> writes: > Easwar Hariharan <eahariha@linux.microsoft.com> writes: > >> 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: >> >> @@ constant C; @@ >> >> - msecs_to_jiffies(C * 1000) >> + secs_to_jiffies(C) >> >> @@ constant C; @@ >> >> - msecs_to_jiffies(C * MSEC_PER_SEC) >> + secs_to_jiffies(C) >> >> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> >> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> >> --- >> drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > I assume we can take this to our ath.git tree, please let us know if > that's not the case. Nevermind, I now saw the discussion in the cover letter and assume that this patch will be sent separately.
On Tue, 17 Dec 2024 12:53:22 -0800 Easwar Hariharan <eahariha@linux.microsoft.com> wrote: > There have been a couple of comments[1][2] that came in after you queued > the series to mm. Would you rather I send individual patches addressing > these, or just send a v4 of the entire series (-netdev of course) so you > can replace it wholesale? Individual small fixes would be preferable please. Mainly to preserve the validity of current review efforts.
This is a series that follows up on my previous series to introduce secs_to_jiffies() and convert a few initial users.[1] In the review for that series, Anna-Maria requested converting other users with Coccinelle. [2] This is part 1 that converts users of msecs_to_jiffies() that 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, to avoid the multiplication. The entire conversion is made with Coccinelle in the script added in patch 2. Some changes suggested by Coccinelle have been deferred to later parts that will address other possible variant patterns. CC: Anna-Maria Behnsen <anna-maria@linutronix.de> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> [1] https://lore.kernel.org/all/20241030-open-coded-timeouts-v3-0-9ba123facf88@linux.microsoft.com/ [2] https://lore.kernel.org/all/8734kngfni.fsf@somnus/ --- Changes in v3: - Rebase on next-20241210 - Fix typo'ed timeout in net/netfilter/nf_conntrack_proto_sctp.c (Stephen Rothwell) - Use Coccinelle operation modes for Coccinelle script (Markus Elfring) - Remove redundant comments in arch/arm/mach-pxa/sharpsl_pm.c (Christophe Leroy) - Remove excess line breaks (Heiko Carstens, Christophe Leroy) - Add more detail into the commit messages throughout (Christophe Leroy) - Pick up Reviewed-by Thomas Hellström for drm/xe - Drop drm/etnaviv patch already queued into etnaviv/next - Replace call to [m]secs_to_jiffies(0) with just 0 for livepatch (Dan Carpenter, Christophe Leroy) - Split out nfp patch to send to net-next (Christophe Leroy) - Pick up Acked-by from Jeff Johnson for ath11k - Link to v2: https://lore.kernel.org/r/20241115-converge-secs-to-jiffies-v2-0-911fb7595e79@linux.microsoft.com Changes in v2: - Exclude already accepted patch adding secs_to_jiffies() https://git.kernel.org/tip/b35108a51cf7bab58d7eace1267d7965978bcdb8 - Link to v1: https://lore.kernel.org/r/20241115-converge-secs-to-jiffies-v1-0-19aadc34941b@linux.microsoft.com --- Easwar Hariharan (19): netfilter: conntrack: Cleanup timeout definitions coccinelle: misc: Add secs_to_jiffies script arm: pxa: Convert timeouts to use secs_to_jiffies() s390: kernel: Convert timeouts to use secs_to_jiffies() powerpc/papr_scm: Convert timeouts to secs_to_jiffies() mm: kmemleak: Convert timeouts to secs_to_jiffies() accel/habanalabs: Convert timeouts to secs_to_jiffies() drm/xe: Convert timeout to secs_to_jiffies() scsi: lpfc: Convert timeouts to secs_to_jiffies() scsi: arcmsr: Convert timeouts to secs_to_jiffies() scsi: pm8001: Convert timeouts to secs_to_jiffies() xen/blkback: Convert timeouts to secs_to_jiffies() gve: Convert timeouts to secs_to_jiffies() wifi: ath11k: Convert timeouts to secs_to_jiffies() Bluetooth: MGMT: Convert timeouts to secs_to_jiffies() staging: vc04_services: Convert timeouts to secs_to_jiffies() ceph: Convert timeouts to secs_to_jiffies() livepatch: Convert timeouts to secs_to_jiffies() ALSA: line6: Convert timeouts to secs_to_jiffies() arch/arm/mach-pxa/sharpsl_pm.c | 8 ++++---- arch/powerpc/platforms/pseries/papr_scm.c | 2 +- arch/s390/kernel/lgr.c | 2 +- arch/s390/kernel/time.c | 4 ++-- arch/s390/kernel/topology.c | 2 +- drivers/accel/habanalabs/common/device.c | 2 +- drivers/accel/habanalabs/common/habanalabs_drv.c | 3 +-- drivers/block/xen-blkback/blkback.c | 2 +- drivers/gpu/drm/xe/xe_device.c | 2 +- drivers/net/ethernet/google/gve/gve_tx_dqo.c | 6 ++---- drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- drivers/scsi/lpfc/lpfc_init.c | 18 +++++++++--------- drivers/scsi/lpfc/lpfc_nportdisc.c | 8 ++++---- drivers/scsi/lpfc/lpfc_nvme.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 4 ++-- drivers/scsi/lpfc/lpfc_vmid.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 2 +- fs/ceph/quota.c | 2 +- mm/kmemleak.c | 4 ++-- net/bluetooth/mgmt.c | 2 +- net/netfilter/nf_conntrack_proto_sctp.c | 21 ++++++++------------- samples/livepatch/livepatch-callbacks-busymod.c | 3 +-- samples/livepatch/livepatch-shadow-fix1.c | 3 +-- samples/livepatch/livepatch-shadow-mod.c | 15 +++++---------- scripts/coccinelle/misc/secs_to_jiffies.cocci | 22 ++++++++++++++++++++++ sound/usb/line6/toneport.c | 2 +- 28 files changed, 78 insertions(+), 71 deletions(-) --- base-commit: 1b2ab8149928c1cea2d7eca30cd35bb7fe014053 change-id: 20241112-converge-secs-to-jiffies-d99d1016bd11 Best regards,