Skip to contentSkip to conversation

tipc: Replace msecs_to_jiffies() with secs_to_jiffies()

PATCH In review Thorsten Blum 2 participants 4 messages Apr 26, 2025 – Apr 28, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tipc: Replace msecs_to_jiffies() with secs_to_jiffies()

Use secs_to_jiffies() instead of msecs_to_jiffies() and avoid scaling 'delay' to milliseconds in tipc_crypto_rekeying_sched(). Compared to msecs_to_jiffies(), secs_to_jiffies() expands to simpler code and reduces the size of 'tipc.ko'.

Remove unnecessary parentheses around the local variable 'now'.

No functional changes intended.

---
 net/tipc/crypto.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
net/tipc/crypto.c +7 -7
index c524421ec652..45edb29b6bd7 100644
@@ -41,10 +41,10 @@
 #include "msg.h"
 #include "bcast.h"
 
-#define TIPC_TX_GRACE_PERIOD	msecs_to_jiffies(5000) /* 5s */
-#define TIPC_TX_LASTING_TIME	msecs_to_jiffies(10000) /* 10s */
-#define TIPC_RX_ACTIVE_LIM	msecs_to_jiffies(3000) /* 3s */
-#define TIPC_RX_PASSIVE_LIM	msecs_to_jiffies(15000) /* 15s */
+#define TIPC_TX_GRACE_PERIOD	secs_to_jiffies(5)
+#define TIPC_TX_LASTING_TIME	secs_to_jiffies(10)
+#define TIPC_RX_ACTIVE_LIM	secs_to_jiffies(3)
+#define TIPC_RX_PASSIVE_LIM	secs_to_jiffies(15)
 
 #define TIPC_MAX_TFMS_DEF	10
 #define TIPC_MAX_TFMS_LIM	1000
@@ -2348,7 +2348,7 @@ static void tipc_crypto_work_rx(struct work_struct *work)
 	struct delayed_work *dwork = to_delayed_work(work);
 	struct tipc_crypto *rx = container_of(dwork, struct tipc_crypto, work);
 	struct tipc_crypto *tx = tipc_net(rx->net)->crypto_tx;
-	unsigned long delay = msecs_to_jiffies(5000);
+	unsigned long delay = secs_to_jiffies(5);
 	bool resched = false;
 	u8 key;
 	int rc;
@@ -2418,8 +2418,8 @@ void tipc_crypto_rekeying_sched(struct tipc_crypto *tx, bool changed,
 	}
 
 	if (tx->rekeying_intv || now) {
-		delay = (now) ? 0 : tx->rekeying_intv * 60 * 1000;
-		queue_delayed_work(tx->wq, &tx->work, msecs_to_jiffies(delay));
+		delay = now ? 0 : tx->rekeying_intv * 60;
+		queue_delayed_work(tx->wq, &tx->work, secs_to_jiffies(delay));
 	}
 }
 
Signature · 1 line
2.49.0
#1 lore raw
Quoted 1 line

Subject: [PATCH net-next] tipc: Replace msecs_to_jiffies() with secs_to_jiffies()

This subject is confusing because we still use msecs_to_jiffies() for seconds-to-jiffies conversion in many other places, not just in crypto.c

Quoted 3 lines

Use secs_to_jiffies() instead of msecs_to_jiffies() and avoid scaling 'delay' to milliseconds in tipc_crypto_rekeying_sched(). Compared to msecs_to_jiffies(), secs_to_jiffies() expands to simpler code and reduces the size of 'tipc.ko'.

I observed an opposite result after applying your patch, an increasement of 320 bytes. Before patch:
969392 Apr 28 08:53 tipc.ko

After patch:
969712 Apr 28 09:11 tipc.ko

So, your patch is not necessary.

Quoted 55 lines

Remove unnecessary parentheses around the local variable 'now'.

No functional changes intended.

---
net/tipc/crypto.c | 14 +++++++-------

1 file changed, 7 insertions(+), 7 deletions(-)
net/tipc/crypto.c index renamed from net/tipc/crypto.c +0 -0

c524421ec652..45edb29b6bd7 100644

net/tipc/crypto.c +5 -5
@@ -41,10 +41,10 @@
 #include "msg.h"
 #include "bcast.h"
 
-#define TIPC_TX_GRACE_PERIOD	msecs_to_jiffies(5000) /* 5s */
-#define TIPC_TX_LASTING_TIME	msecs_to_jiffies(10000) /* 10s */
-#define TIPC_RX_ACTIVE_LIM	msecs_to_jiffies(3000) /* 3s */
-#define TIPC_RX_PASSIVE_LIM	msecs_to_jiffies(15000) /* 15s */
+#define TIPC_TX_GRACE_PERIOD	secs_to_jiffies(5)
+#define TIPC_TX_LASTING_TIME	secs_to_jiffies(10)
+#define TIPC_RX_ACTIVE_LIM	secs_to_jiffies(3)
+#define TIPC_RX_PASSIVE_LIM	secs_to_jiffies(15)
 
 #define TIPC_MAX_TFMS_DEF	10
 #define TIPC_MAX_TFMS_LIM	1000
@@ -2348,7 +2348,7 @@ static void tipc_crypto_work_rx(struct work_struct
 *work)
 	struct delayed_work *dwork = to_delayed_work(work);
 	struct tipc_crypto *rx = container_of(dwork, struct tipc_crypto, work);
 	struct tipc_crypto *tx = tipc_net(rx->net)->crypto_tx;
-	unsigned long delay = msecs_to_jiffies(5000);
+	unsigned long delay = secs_to_jiffies(5);
 	bool resched = false;
 	u8 key;
	int rc;
net/tipc/crypto.c +2 -2
@@ -2418,8 +2418,8 @@ void tipc_crypto_rekeying_sched(struct tipc_crypto
 *tx, bool changed,
 	}
 
 	if (tx->rekeying_intv || now) {
-		delay = (now) ? 0 : tx->rekeying_intv * 60 * 1000;
-		queue_delayed_work(tx->wq, &tx->work,
 msecs_to_jiffies(delay));
+		delay = now ? 0 : tx->rekeying_intv * 60;
+		queue_delayed_work(tx->wq, &tx->work,
 secs_to_jiffies(delay));
	}
}

--
2.49.0

#2 lore raw
Quoted 9 lines · Tung Quang Nguyen
Quoted 3 lines

Use secs_to_jiffies() instead of msecs_to_jiffies() and avoid scaling 'delay' to milliseconds in tipc_crypto_rekeying_sched(). Compared to msecs_to_jiffies(), secs_to_jiffies() expands to simpler code and reduces the size of 'tipc.ko'.

I observed an opposite result after applying your patch, an increasement of 320 bytes. Before patch:
969392 Apr 28 08:53 tipc.ko

After patch:
969712 Apr 28 09:11 tipc.ko

Which architecture and config did you use?

For x86_64 using LLVM, defconfig, and CONFIG_TIPC=m I get 929960 bytes before and 929864 bytes after my patch, so 96 bytes less than before.

For arm64 using LLVM, defconfig, and CONFIG_TIPC=m, I get 8005616 bytes before and 8005304 bytes after my patch, so 312 bytes less than before.

Thanks,
Thorsten

#3 lore raw
Quoted 1 line

Which architecture and config did you use?

It is x86_64, gcc, CONFIG_TIPC=m, CONFIG_TIPC_CRYPTO=y