Skip to contentSkip to conversation

Use num_possible_cpus() instead of NR_CPUS for timer distribution

PATCH In review john stultz 2 participants 2 messages Aug 15, 2007 Nohz, dynticks support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Use num_possible_cpus() instead of NR_CPUS for timer distribution

Andrew requested this fixup awhile back, and I just now got to it (apologies for being slow).

To avoid lock contention, we distribute the sched_timer calls across the cpus so they do not trigger at the same instant. However, I used NR_CPUS, which can cause needless grouping on small smp systems depending on your kernel config. This patch converts to using num_possible_cpus() so we spread it as evenly as possible on every machine.

Briefly tested w/ NR_CPUS=255 and verified reduced contention.

kernel/time/tick-sched.c +1 -1
Index: 2.6-rt/kernel/time/tick-sched.c
===================================================================
@@ -586,7 +586,7 @@ void tick_setup_sched_timer(void)
 	/* Get the next period (per cpu) */
 	ts->sched_timer.expires = tick_init_jiffy_update();
 	offset = ktime_to_ns(tick_period) >> 1;
-	do_div(offset, NR_CPUS);
+	do_div(offset, num_possible_cpus());
 	offset *= smp_processor_id();
 	ts->sched_timer.expires = ktime_add_ns(ts->sched_timer.expires, offset);
 
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · john stultz

Andrew requested this fixup awhile back, and I just now got to it (apologies for being slow).

To avoid lock contention, we distribute the sched_timer calls across the cpus so they do not trigger at the same instant. However, I used NR_CPUS, which can cause needless grouping on small smp systems depending on your kernel config. This patch converts to using num_possible_cpus() so we spread it as evenly as possible on every machine.

Quoted 3 lines

Briefly tested w/ NR_CPUS=255 and verified reduced contention.

Doh, I missed this as well

Quoted 13 lines

Index: 2.6-rt/kernel/time/tick-sched.c
===================================================================

kernel/time/tick-sched.c +1 -1
@@ -586,7 +586,7 @@ void tick_setup_sched_timer(void)
 	/* Get the next period (per cpu) */
 	ts->sched_timer.expires = tick_init_jiffy_update();
 	offset = ktime_to_ns(tick_period) >> 1;
-	do_div(offset, NR_CPUS);
+	do_div(offset, num_possible_cpus());
 	offset *= smp_processor_id();
 	ts->sched_timer.expires = ktime_add_ns(ts->sched_timer.expires, offset);