aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/net/wireguard
diff options
context:
space:
mode:
authorYury Norov [NVIDIA] <yury.norov@gmail.com>2025-06-19 10:54:59 -0400
committerJason A. Donenfeld <Jason@zx2c4.com>2025-06-30 19:39:10 +0200
commit1c04acdb05919380fb1ab7eec93927a3fa262fac (patch)
treee5f873053361acb8287946c3cb3afdd447c0210f /drivers/net/wireguard
parentMAINTAINERS: Add myself as mlx5 core and mlx5e co-maintainer (diff)
downloadwireguard-linux-stable.tar.xz
wireguard-linux-stable.zip
wireguard: queueing: simplify wg_cpumask_next_online()HEADstable
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>
Diffstat (limited to 'drivers/net/wireguard')
-rw-r--r--drivers/net/wireguard/queueing.h13
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;
}