Converge on using secs_to_jiffies() part two
Subsystems (7)
cover Converge on using secs_to_jiffies() part two
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.
The non-netdev patches that include the update to secs_to_jiffies.cocci to address
expressions are here: https://lore.kernel.org/all/20250203-converge-secs-to-jiffies-part-two-v2-0-d7058a01fd0e@linux.microsoft.com
This series is based on net-next.
---
Easwar Hariharan (3):
net/smc: convert timeouts to secs_to_jiffies()
netfilter: xt_IDLETIMER: convert timeouts to secs_to_jiffies()
net: ipconfig: convert timeouts to secs_to_jiffies()
net/ipv4/ipconfig.c | 6 +++--- net/netfilter/xt_IDLETIMER.c | 12 ++++++------ net/smc/af_smc.c | 3 +-- 3 files changed, 10 insertions(+), 11 deletions(-)
---
base-commit: de7a88b639d488607352a270ef2e052c4442b1b3
change-id: 20250128-netdev-secs-to-jiffies-part-2-8f0d2535096a
Best regards,
Signature · 1 line
Easwar Hariharan <[email protected]>
PATCH 1/3 net/smc: convert timeouts to secs_to_jiffies()
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)
-msecs_to_jiffies(E * MSEC_PER_SEC)
+secs_to_jiffies(E)
--- net/smc/af_smc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/smc/af_smc.c +1 -2
@@ -2730,8 +2730,7 @@ int smc_accept(struct socket *sock, struct socket *new_sock,if (lsmc->sockopt_defer_accept && !(arg->flags &O_NONBLOCK )) {/* wait till data arrives on the socket */ - timeo =msecs_to_jiffies (lsmc->sockopt_defer_accept * -MSEC_PER_SEC ); + timeo =secs_to_jiffies (lsmc->sockopt_defer_accept);if (smc_sk (nsk)->use_fallback) {struct sock *clcsk =smc_sk (nsk)->clcsock->sk;
Signature · 1 line
2.43.0
PATCH 2/3 netfilter: xt_IDLETIMER: convert timeouts to secs_to_jiffies()
In reply to Easwar HariharanCommit 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)
-msecs_to_jiffies(E * MSEC_PER_SEC)
+secs_to_jiffies(E)
--- net/netfilter/xt_IDLETIMER.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/netfilter/xt_IDLETIMER.c +6 -6
@@ -168,7 +168,7 @@ static int idletimer_tg_create(struct idletimer_tg_info *info)INIT_WORK (&info->timer->work, idletimer_tg_work);mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies);return 0 ;
@@ -229,7 +229,7 @@ static int idletimer_tg_create_v1(struct idletimer_tg_info_v1 *info) }else {timer_setup (&info->timer->timer, idletimer_tg_expired,0 );mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies); }return 0 ;
@@ -254,7 +254,7 @@ static unsigned int idletimer_tg_target(struct sk_buff *skb, info->label, info->timeout);mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies);return XT_CONTINUE ; }
@@ -275,7 +275,7 @@ static unsigned int idletimer_tg_target_v1(struct sk_buff *skb,alarm_start_relative (&info->timer->alarm, tout); }else {mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies); }return XT_CONTINUE ;
@@ -320,7 +320,7 @@ static int idletimer_tg_checkentry(const struct xt_tgchk_param *par)if (info->timer) { info->timer->refcnt++;mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies);pr_debug ("increased refcnt of timer %s to %u\n" , info->label, info->timer->refcnt);
@@ -382,7 +382,7 @@ static int idletimer_tg_checkentry_v1(const struct xt_tgchk_param *par) } }else {mod_timer (&info->timer->timer, -msecs_to_jiffies (info->timeout *1000 ) + jiffies); +secs_to_jiffies (info->timeout) + jiffies); }pr_debug ("increased refcnt of timer %s to %u\n" , info->label, info->timer->refcnt);
Signature · 1 line
2.43.0
PATCH 3/3 net: ipconfig: convert timeouts to secs_to_jiffies()
In reply to Easwar HariharanCommit 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)
-msecs_to_jiffies(E * MSEC_PER_SEC)
+secs_to_jiffies(E)
While here, manually convert a couple timeouts denominated in seconds
--- net/ipv4/ipconfig.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/ipv4/ipconfig.c +3 -3
@@ -274,9 +274,9 @@ static int __init ic_open_devs(void)/* wait for a carrier on at least one device */ start = jiffies; - next_msg = start +msecs_to_jiffies (20000 ); + next_msg = start +secs_to_jiffies (20 );while (time_before (jiffies, start + -msecs_to_jiffies (carrier_timeout *1000 ))) { +secs_to_jiffies (carrier_timeout))) {int wait, elapsed;rtnl_lock ();
@@ -295,7 +295,7 @@ static int __init ic_open_devs(void) elapsed =jiffies_to_msecs (jiffies - start); wait = (carrier_timeout *1000 - elapsed +500 ) /1000 ;pr_info ("Waiting up to %d more seconds for network.\n" , wait); - next_msg = jiffies +msecs_to_jiffies (20000 ); + next_msg = jiffies +secs_to_jiffies (20 ); } have_carrier:
Signature · 1 line
2.43.0
Jakub Kicinski
maintainerQuoted 6 lines · On Wed, 19 Feb 2025 20:30:35 +0000 Easwar Hariharan wrote:
The conversion is made with Coccinelle with the
secs_to_jiffies()script inscripts/coccinelle/misc. Attention is paid to what the best change can be rather than restricting to what the tool provides.The non-netdev patches that include the update to
secs_to_jiffies.coccito address
expressions are here: https://lore.kernel.org/all/20250203-converge-secs-to-jiffies-part-two-v2-0-d7058a01fd0e@linux.microsoft.com
Can the secs_to_jiffies cocci check script finally run in report mode?
I think that needs to be fixed first, before we start "cleaning up" existing code under net.
Signature · 1 line
pw-bot: defer
Quoted 5 lines · Jakub Kicinski
Quoted 4 lines · On Wed, 19 Feb 2025 20:30:35 +0000 Easwar Hariharan wrote:
The conversion is made with Coccinelle with the
secs_to_jiffies()script inscripts/coccinelle/misc. Attention is paid to what the best change can be rather than restricting to what the tool provides.
Quoted 7 lines
Quoted 2 lines
The non-netdev patches that include the update to
secs_to_jiffies.coccito address
expressions are here: https://lore.kernel.org/all/20250203-converge-secs-to-jiffies-part-two-v2-0-d7058a01fd0e@linux.microsoft.comCan the
secs_to_jiffiescocci check script finally run in report mode?I think that needs to be fixed first, before we start "cleaning up" existing code under net.
It does not, yet. I'm not ignoring this feedback, it's just taking a bit of wall clock time between commercial commitments. :)
Thanks,
Easwar (he/him)