diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-10-09 20:45:07 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-12-20 03:13:45 +0100 |
| commit | 3c202d14a9d73fb63c3dccb18feac5618c21e1c4 (patch) | |
| tree | 53cdfe8283a913521cb567dc12872e2fd820ca52 | |
| parent | 41a15855c1ee390a0ae9d0c29d32b451dd30a600 (diff) | |
| download | pci-3c202d14a9d73fb63c3dccb18feac5618c21e1c4.tar.gz | |
prandom: remove prandom_u32_max()
Convert the final two users of prandom_u32_max() that slipped in during
6.2-rc1 to use get_random_u32_below().
Then, with no more users left, we can finally remove the deprecated
function.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | arch/x86/mm/cpu_entry_area.c | 2 | ||||
| -rw-r--r-- | include/linux/prandom.h | 6 | ||||
| -rw-r--r-- | net/ipv4/tcp_plb.c | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/mm/cpu_entry_area.c b/arch/x86/mm/cpu_entry_area.c index 8bb1aa6a7aa3af..7316a822425992 100644 --- a/arch/x86/mm/cpu_entry_area.c +++ b/arch/x86/mm/cpu_entry_area.c @@ -36,7 +36,7 @@ static __init void init_cea_offsets(void) unsigned int cea; again: - cea = prandom_u32_max(max_cea); + cea = get_random_u32_below(max_cea); for_each_possible_cpu(j) { if (cea_offset(j) == cea) diff --git a/include/linux/prandom.h b/include/linux/prandom.h index c94c02ba065cd6..f2ed5b72b3d6f2 100644 --- a/include/linux/prandom.h +++ b/include/linux/prandom.h @@ -24,12 +24,6 @@ void prandom_seed_full_state(struct rnd_state __percpu *pcpu_state); #define prandom_init_once(pcpu_state) \ DO_ONCE(prandom_seed_full_state, (pcpu_state)) -/* Deprecated: use get_random_u32_below() instead. */ -static inline u32 prandom_u32_max(u32 ep_ro) -{ - return get_random_u32_below(ep_ro); -} - /* * Handle minimum values for seeds */ diff --git a/net/ipv4/tcp_plb.c b/net/ipv4/tcp_plb.c index bb1a08fda113e1..4bcf7eff95e390 100644 --- a/net/ipv4/tcp_plb.c +++ b/net/ipv4/tcp_plb.c @@ -97,7 +97,7 @@ void tcp_plb_update_state_upon_rto(struct sock *sk, struct tcp_plb_state *plb) return; pause = READ_ONCE(net->ipv4.sysctl_tcp_plb_suspend_rto_sec) * HZ; - pause += prandom_u32_max(pause); + pause += get_random_u32_below(pause); plb->pause_until = tcp_jiffies32 + pause; /* Reset PLB state upon RTO, since an RTO causes a sk_rethink_txhash() call |