diff options
| author |   Yury Norov [NVIDIA] <yury.norov@gmail.com> | 2025-06-19 10:54:59 -0400 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2025-09-08 18:37:09 +0200 |
| commit | 6e079b1210e3c79fb0c7f5e4912a16dba58b7195 (patch) | |
| tree | e25e5424e558c63480f5bf755504c63094759d6d | |
| parent | net: phy: transfer phy_config_inband() locking responsibility to phylink (diff) | |
| download | wireguard-linux-6e079b1210e3c79fb0c7f5e4912a16dba58b7195.tar.xz wireguard-linux-6e079b1210e3c79fb0c7f5e4912a16dba58b7195.zip | |
wireguard: queueing: simplify wg_cpumask_next_online()
wg_cpumask_choose_online() opencodes cpumask_nth(). Use it and make the
function significantly simpler. While there, fix opencoded cpu_online()
too.
Signed-off-by: Yury Norov <yury.norov@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | drivers/net/wireguard/queueing.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/wireguard/queueing.h b/drivers/net/wireguard/queueing.h index 7eb76724b3ed..56314f98b6ba 100644 --- a/drivers/net/wireguard/queueing.h +++ b/drivers/net/wireguard/queueing.h @@ -104,16 +104,11 @@ static inline void wg_reset_packet(struct sk_buff *skb, bool encapsulating) static inline int wg_cpumask_choose_online(int *stored_cpu, unsigned int id) { - unsigned int cpu = *stored_cpu, cpu_index, i; + unsigned int cpu = *stored_cpu; + + if (unlikely(cpu >= nr_cpu_ids || !cpu_online(cpu))) + cpu = *stored_cpu = cpumask_nth(id % num_online_cpus(), cpu_online_mask); - if (unlikely(cpu >= nr_cpu_ids || - !cpumask_test_cpu(cpu, cpu_online_mask))) { - cpu_index = id % cpumask_weight(cpu_online_mask); - cpu = cpumask_first(cpu_online_mask); - for (i = 0; i < cpu_index; ++i) - cpu = cpumask_next(cpu, cpu_online_mask); - *stored_cpu = cpu; - } return cpu; } |