[RFC PATCH v1 18/50] net/ipv6/addrconf.c: Use prandom_u32_max for rfc3315 backoff time computation

[George Spelvin]

There's no need for 64-bit intermediate values and do_div.

(Actually, the algorithm isn't changing much, except that the old
code used a scaling factor of 1 million.  prandom_u32_max uses
a factor of 2^32, making the final division more efficient.)

One thing that concerns me a bit is that the data types are all
signed.  The old code cast the inputs to unsigned and produced
strange overflowed results if they were negative, so presumably
that never happens in practice.

The new code works the same for positive inputs, but produces
different strange overflowed results if fed negative inputs.

Signed-off-by: George Spelvin <lkml@xxxxxxx>
Cc: Maciej Åenczykowski <maze@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Alexey Kuznetsov <kuznet@xxxxxxxxxxxxx>
Cc: Hideaki YOSHIFUJI <yoshfuji@xxxxxxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
---
 net/ipv6/addrconf.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index ec3f472bc5a8f..5172f1f874363 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -103,20 +103,19 @@ static inline u32 cstamp_delta(unsigned long cstamp)
 static inline s32 rfc3315_s14_backoff_init(s32 irt)
 {
 	/* multiply 'initial retransmission time' by 0.9 .. 1.1 */
-	u64 tmp = (900000 + prandom_u32() % 200001) * (u64)irt;
-	do_div(tmp, 1000000);
-	return (s32)tmp;
+	s32 range = irt / 5;
+	return irt - (s32)(range/2) + (s32)prandom_u32_max(range);
 }
 
 static inline s32 rfc3315_s14_backoff_update(s32 rt, s32 mrt)
 {
 	/* multiply 'retransmission timeout' by 1.9 .. 2.1 */
-	u64 tmp = (1900000 + prandom_u32() % 200001) * (u64)rt;
-	do_div(tmp, 1000000);
-	if ((s32)tmp > mrt) {
+	s32 range = rt / 5;
+	s32 tmp = 2*rt - (s32)(range/2) + (s32)prandom_u32_max(range);
+	if (tmp > mrt) {
 		/* multiply 'maximum retransmission time' by 0.9 .. 1.1 */
-		tmp = (900000 + prandom_u32() % 200001) * (u64)mrt;
-		do_div(tmp, 1000000);
+		range = mrt / 5;
+		tmp = mrt - (s32)(range/2) + (s32)prandom_u32_max(range);
 	}
 	return (s32)tmp;
 }
-- 
2.26.0