From nobody Thu Oct 9 06:13:37 2025 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35725226520; Thu, 19 Jun 2025 14:55:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344907; cv=none; b=REvLOCgFBn9sHBW7Fjcz4aigLczEg1by9Hi7EycpNYnWpbvXqDlNzUGzHoAcrvYE5IhWxLTHwogAnR32KKqAqiVtSqNrRHXJvhUJdyryhULIKYLldiEo26lEg1WyxZGmwWpOS6P7BVIP4NWlgqVi+fb369+BVoGVDuKxSiCTg/c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750344907; c=relaxed/simple; bh=2kvm4JxzYNtTLaRaIThJydIL+hEEYReBidtatR2KnlE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=dFu1ejR7vNbhDnvbZLlFBF3awSl2V7TnRdroiMhvORjZ0Bep+exzL7UHITCLeaiCR5opJX1CPrNaMW/MWuFFyYzmbz1xYLuULQOtAKheagrwcjy5Z5K5//4CZ8hrYsetK2A1KDKOPJPWOAyKT07t66g4ZMjyG7yrRjNn+bs46Y4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ibd/sC9b; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ibd/sC9b" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-3138e64b42aso928227a91.0; Thu, 19 Jun 2025 07:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750344905; x=1750949705; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fCc8wvcGt1Bzj1+8h/7it2Sg3YOCUwTqtEA7c0OIsck=; b=ibd/sC9bRA1p/EdOC6dlUcfd2PHh5luotWfqXmQUIEnFuKXWtAAHmyNiztKpJJ4XRZ Z4cXWXiK2jqUHLL5fNC6uRafVLSviIVPjUY07rlD8cpD0T7om5btkty/4ZxwBp+QJpSk Pyp3zE8pmHfCoQ309MwaUIKYexMHGkvlJFf5NXx40zd1Xf1Fxz703oY4Vpd1nHxXLUam 1I358DzqBSYwAHnwIo4MqwnUY12I6UkTTCc6fw4+ga+TAEGCICRJySA1ltp6M5kp5b+c lA9C7l0S2pCnDJ4/z9SaDamiu9s/eNKJTzPS8nm+qs1fEN39EbmRsTWrHW/+rQp9L0YI x19A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750344905; x=1750949705; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fCc8wvcGt1Bzj1+8h/7it2Sg3YOCUwTqtEA7c0OIsck=; b=FJye4lKbwk3SxFSpu02YokMOqxWmbYAEU0OcAIOOx+fpkex3upeEfgpfLQ9yTswh0M qxG2y5tlXBtzVL+5lkC1Do/kWTFHJoXj6yW8BCfH/d5Ntu4PypTZGI6IUfhAipsgXjSj 08gynMbnxtLt7gkaNA+HKA2BAA/tu8m5Y4Ba/QxYXFNztaJ5hQ3lpEaDc47ErYnfZbPY 0/VdpmlM59zxS1ghswubhpdQs9iyt2gj2azTvxjulewXBZ1jEPgGwxxME7+t52UL01HH t1SSZouCMBFmRe7HtVhcNRlEdg2IGkAfjTj3batBx9pRLKUn8vu/RFPI1iwrYuDV9GpL nTGQ== X-Forwarded-Encrypted: i=1; AJvYcCUbnkVOJQ1BX2ubgzvqQ/j8vzTuNyYDC7ZS2WEzH79bCSsYdeph3vcMsK3uI0jM+K6gg7/OnPcC@vger.kernel.org, AJvYcCWWrPRxDuN+eL4flzSByt7WXvAymdyxd/mIUgRBktpychE9tTnKKuAoyxRI3KnGA74J7vZcWjGhqfuCoxw=@vger.kernel.org X-Gm-Message-State: AOJu0YzFFSP2duU+VpkWXE7i4ltc9TRtxm8fCgcJ3lJUknoOjZ9U3cAM 7HNHFL9gGJyFBJgk98ENp4jvW5kp9jBuW3ZbrKBn8dDnX8EzRDEwYnwk X-Gm-Gg: ASbGnctEdzat7tB2ppfx2wBdsGx3ZXiqe38a07yoPCt2VfjjFkI8CCeq+6LXMsGS0B7 7wmPpP4jESrFbcOcumijIc15RzCUfK8sIvFu8ciYppzA12e6R+iCGxt65ZOYqA+cbEr+lRXIafI ddU8amom3AMgGC85AWx8hOOq7EbR5xEe9inKRIfueDaILPdRUoymBz0kSlXYZE5V/Q7p+lQn6rf jRy+vqcOUaLWN7TlsA8ne5aCAr7ztp3LoyeDHp7Rb32rIdy8giutAemgYldSbc7mXMXWjVjsBiS Kbe/WfaYfJM/Q2HXT7lYMKk8RgvcywUbm2zGo/jd7f00TEsPQ3wRc/QECL0YQvqcxJao1IU4 X-Google-Smtp-Source: AGHT+IHFRai+eXLqEsx2ey+Wqt2gXo8kOT6meJ0aM2dbnVCHxPE9uC9Md/iQOR7yx7gT07xj188dPw== X-Received: by 2002:a17:90b:2dcc:b0:311:9c1f:8516 with SMTP id 98e67ed59e1d1-313f1c3fb20mr36050743a91.15.1750344905433; Thu, 19 Jun 2025 07:55:05 -0700 (PDT) Received: from localhost ([216.228.127.128]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3158a24cac2sm2506610a91.27.2025.06.19.07.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 07:55:04 -0700 (PDT) From: Yury Norov To: "Jason A. Donenfeld" , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , wireguard@lists.zx2c4.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Yury Norov [NVIDIA]" Subject: [PATCH v2] wireguard: queueing: simplify wg_cpumask_next_online() Date: Thu, 19 Jun 2025 10:54:59 -0400 Message-ID: <20250619145501.351951-1-yury.norov@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Yury Norov [NVIDIA] 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 [NVIDIA] Reviewed-by: Simon Horman --- v1: https://lore.kernel.org/all/20250604233656.41896-1-yury.norov@gmail.com/ v2: - fix 'cpu' undeclared; - change subject (Jason); - keep the original function structure (Jason); drivers/net/wireguard/queueing.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireguard/queueing.h b/drivers/net/wireguard/queue= ing.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 *sk= b, bool encapsulating) =20 static inline int wg_cpumask_choose_online(int *stored_cpu, unsigned int i= d) { - unsigned int cpu =3D *stored_cpu, cpu_index, i; + unsigned int cpu =3D *stored_cpu; + + if (unlikely(cpu >=3D nr_cpu_ids || !cpu_online(cpu))) + cpu =3D *stored_cpu =3D cpumask_nth(id % num_online_cpus(), cpu_online_m= ask); =20 - if (unlikely(cpu >=3D nr_cpu_ids || - !cpumask_test_cpu(cpu, cpu_online_mask))) { - cpu_index =3D id % cpumask_weight(cpu_online_mask); - cpu =3D cpumask_first(cpu_online_mask); - for (i =3D 0; i < cpu_index; ++i) - cpu =3D cpumask_next(cpu, cpu_online_mask); - *stored_cpu =3D cpu; - } return cpu; } =20 --=20 2.43.0