github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Timer subsystem fixes:

Browse Source 
- Clear timer_base::pending_map on CPU hot-unplug, that can
    cause temporal timeout processing anomalous on the next
    hot-replug (Liang Hao)
 
  - Fix PID refcount leak in the posix-cpu-timers do_cpu_nanosleep()
    signal path (Cen Zhang)
 
  - Require (CAP_SYS_TIME) permission to set auxiliary clocks
    via aux_clock_set() (Daehyeon Ko)
 
  - Update offsets on sequence counter retry in
    ktime_get_update_offsets_now() (Thomas Weißschuh)
 
 Signed-off-by: Ingo Molnar <mingo@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmrd560RHG1pbmdvQGtl
 cm5lbC5vcmcACgkQEnMQ0APhK1jApg//dRet/gFMBki1ZFJ4CNjM4gYUV8UeqURU
 jTkWy5jSdJVNsWlKJBEZu5LzaYkyRYkr1mbASKJ9bxXTGh+lzjt7uQn4rFGBLGww
 Ypg3fF7RCRPHdWBrA1GYdXfkx6htZSwMjjO2yYvzWZLr1i4JsscKxKU5zYUZyQpx
 wntd73HsdDhq4yRxiRDyqvJrwB4IaDOim+wsbxQJinxx63adNYXYg7x2LF90MZ+w
 eD5suxA5r7/cfajrPWkUJCr4+q0QDzcBhVvsf3FjKT170p2qjlb7UJDow8HGLbYT
 YRduTFSTJWMrVFWbx3t/YNQ/nctyTPD1Xx+hnvVA7bCcOjYofdageY4rXCLJOpOJ
 Rwfhcjdb4hjFpUiIwRuRMxtDInHVZbXOq76HUGgNt1/JCXBs8n/3WGMUBaSJy8T8
 5BS43Dyxur5wfz1OFMXLgUF2zHm8K5IFpdSlSV2hR/4FellApNb2XCSomWY2fwSs
 LyVcweSr/x7VVa0ZN8C2j4YSVXfjY4LdNkjbom+cGyi/quhrPTgTuqXghmD+9oFz
 6kBmRNGOzjfqkuv7bNiXYJ+cfKlagfi1CZw+3z0ErXubBy9LgX0MyVVgP4YUaCff
 DFLt/solj73cufeUQh6AzVoFRpklgQVuSE0XcHkYaJ/PkUJNJCwYklfbAboa19fV
 Yve+KycVM2A=
 =yfAD
 -----END PGP SIGNATURE-----

Merge tag 'timers-urgent-2026-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Ingo Molnar:

 - Clear timer_base::pending_map on CPU hot-unplug, that can
   cause temporal timeout processing anomalous on the next
   hot-replug (Liang Hao)

 - Fix PID refcount leak in the posix-cpu-timers do_cpu_nanosleep()
   signal path (Cen Zhang)

 - Require (CAP_SYS_TIME) permission to set auxiliary clocks
   via aux_clock_set() (Daehyeon Ko)

 - Update offsets on sequence counter retry in
   ktime_get_update_offsets_now() (Thomas Weißschuh)

* tag 'timers-urgent-2026-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Update offsets on sequence counter retry in ktime_get_update_offsets_now()
  timekeeping: Require permission to set auxiliary clocks
  posix-cpu-timers: Fix pid refcount leak in do_cpu_nanosleep() signal path
  timers: Clear pending_map on CPU hotplug
This commit is contained in:
Linus Torvalds 2026-10-25 17:54:02 -10:00
commit ed2bc044a7
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/time/posix-cpu-timers.c
View File

@ -1687,8 +1687,8 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags,
*/
expires = cpu_timer_getexpires(&timer.it.cpu);
error = posix_cpu_timer_set(&timer, 0, &zero_it, &it);
if (!error) {
/* Timer is now unarmed, deletion can not fail. */
if (error != TIMER_RETRY) {
/* Unarmed or target gone (-ESRCH), deletion can not fail. */
posix_cpu_timer_del(&timer);
} else {
while (error == TIMER_RETRY) {

8
kernel/time/timekeeping.c
View File

@ -14,6 +14,7 @@
#include <linux/random.h>
#include <linux/sched/clock.h>
#include <linux/sched/loadavg.h>
#include <linux/security.h>
#include <linux/static_key.h>
#include <linux/stop_machine.h>
#include <linux/syscore_ops.h>
@ -2850,6 +2851,7 @@ ktime_t ktime_get_update_offsets_now(u32 *cwsseq, ktime_t *offs_real,
ktime_t *offs_boot, ktime_t *offs_tai)
{
struct timekeeper *tk = &tk_core.timekeeper;
u32 cwsseq_orig = *cwsseq;
unsigned int seq;
ktime_t base;
u64 nsecs;
@ -2861,7 +2863,7 @@ ktime_t ktime_get_update_offsets_now(u32 *cwsseq, ktime_t *offs_real,
nsecs = timekeeping_get_ns(&tk->tkr_mono);
base = ktime_add_ns(base, nsecs);
if (*cwsseq != tk->clock_was_set_seq) {
if (cwsseq_orig != tk->clock_was_set_seq) {
*cwsseq = tk->clock_was_set_seq;
*offs_real = tk->offs_real;
*offs_boot = tk->offs_boot;
@ -3217,11 +3219,15 @@ static int aux_clock_set(const clockid_t id, const struct timespec64 *tnew)
struct tk_data *aux_tkd = aux_get_tk_data(id);
struct timekeeper *aux_tks;
ktime_t tnow, nsecs;
int ret;
if (!timespec64_valid_settod(tnew))
return -EINVAL;
if (!aux_tkd)
return -ENODEV;
ret = security_settime64(tnew, NULL);
if (ret)
return ret;
aux_tks = &aux_tkd->shadow_timekeeper;

2
kernel/time/timer.c
View File

@ -44,6 +44,7 @@
#include <linux/compat.h>
#include <linux/random.h>
#include <linux/sysctl.h>
#include <linux/bitmap.h>
#include <linux/uaccess.h>
#include <asm/unistd.h>
@ -2541,6 +2542,7 @@ int timers_dead_cpu(unsigned int cpu)
for (i = 0; i < WHEEL_SIZE; i++)
migrate_timer_list(new_base, old_base->vectors + i);
bitmap_zero(old_base->pending_map, WHEEL_SIZE);
raw_spin_unlock(&old_base->lock);
raw_spin_unlock_irq(&new_base->lock);
put_cpu_ptr(&timer_bases);