From: Peng Liu <[email protected]>
The ts->sched_timer initialization work of tick_nohz_switch_to_nohz()
is almost the same as that of tick_setup_sched_timer(), so adjust the
latter to get it reused by tick_nohz_switch_to_nohz().
Signed-off-by: Peng Liu <[email protected]>
---
kernel/time/hrtimer.c | 2 +-
kernel/time/tick-sched.c | 28 ++++++++++++----------------
kernel/time/tick-sched.h | 2 +-
3 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 760793998cdd..355b5a957f7f 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -746,7 +746,7 @@ static void hrtimer_switch_to_hres(void)
base->hres_active = 1;
hrtimer_resolution = HIGH_RES_NSEC;
- tick_setup_sched_timer();
+ tick_setup_sched_timer(NOHZ_MODE_HIGHRES);
/* "Retrigger" the interrupt to get things going */
retrigger_next_event(NULL);
}
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index be77b021e5d6..cdebb6240efe 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -1430,9 +1430,6 @@ static inline void tick_nohz_activate(struct tick_sched *ts, int mode)
*/
static void tick_nohz_switch_to_nohz(void)
{
- struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
- ktime_t next;
-
if (!tick_nohz_enabled)
return;
@@ -1441,16 +1438,9 @@ static void tick_nohz_switch_to_nohz(void)
/*
* Recycle the hrtimer in 'ts', so we can share the
- * hrtimer_forward_now() function with the highres code.
+ * highres code.
*/
- hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
- /* Get the next period */
- next = tick_init_jiffy_update();
-
- hrtimer_set_expires(&ts->sched_timer, next);
- hrtimer_forward_now(&ts->sched_timer, TICK_NSEC);
- tick_program_event(hrtimer_get_expires(&ts->sched_timer), 1);
- tick_nohz_activate(ts, NOHZ_MODE_LOWRES);
+ tick_setup_sched_timer(NOHZ_MODE_LOWRES);
}
static inline void tick_nohz_irq_enter(void)
@@ -1539,18 +1529,21 @@ static int __init skew_tick(char *str)
return 0;
}
early_param("skew_tick", skew_tick);
+#endif /* HIGH_RES_TIMERS */
+#if defined CONFIG_NO_HZ_COMMON || defined CONFIG_HIGH_RES_TIMERS
/**
* tick_setup_sched_timer - setup the tick emulation timer
*/
-void tick_setup_sched_timer(void)
+void tick_setup_sched_timer(int mode)
{
struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
ktime_t now = ktime_get();
/* Emulate tick processing via per-CPU hrtimers: */
hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
- ts->sched_timer.function = tick_nohz_highres_handler;
+ if (mode == NOHZ_MODE_HIGHRES)
+ ts->sched_timer.function = tick_nohz_highres_handler;
/* Get the next period (per-CPU) */
hrtimer_set_expires(&ts->sched_timer, tick_init_jiffy_update());
@@ -1564,8 +1557,11 @@ void tick_setup_sched_timer(void)
}
hrtimer_forward(&ts->sched_timer, now, TICK_NSEC);
- hrtimer_start_expires(&ts->sched_timer, HRTIMER_MODE_ABS_PINNED_HARD);
- tick_nohz_activate(ts, NOHZ_MODE_HIGHRES);
+ if (mode == NOHZ_MODE_HIGHRES)
+ hrtimer_start_expires(&ts->sched_timer, HRTIMER_MODE_ABS_PINNED_HARD);
+ else
+ tick_program_event(hrtimer_get_expires(&ts->sched_timer), 1);
+ tick_nohz_activate(ts, mode);
}
#endif /* HIGH_RES_TIMERS */
diff --git a/kernel/time/tick-sched.h b/kernel/time/tick-sched.h
index 5ed5a9d41d5a..35808bbb8a47 100644
--- a/kernel/time/tick-sched.h
+++ b/kernel/time/tick-sched.h
@@ -102,7 +102,7 @@ struct tick_sched {
extern struct tick_sched *tick_get_tick_sched(int cpu);
-extern void tick_setup_sched_timer(void);
+extern void tick_setup_sched_timer(int mode);
#if defined CONFIG_NO_HZ_COMMON || defined CONFIG_HIGH_RES_TIMERS
extern void tick_cancel_sched_timer(int cpu);
#else
--
2.34.1
Hi Peng,
kernel test robot noticed the following build warnings:
[auto build test WARNING on tip/timers/core]
[also build test WARNING on linus/master v6.7-rc3 next-20231127]
[cannot apply to tip/timers/nohz]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Peng-Liu/tick-nohz-Remove-duplicate-between-tick_nohz_lowres_handler-and-tick_nohz_highres_handler/20231127-163637
base: tip/timers/core
patch link: https://lore.kernel.org/r/TYCP286MB21464B3653B956AF71806931C6BDA%40TYCP286MB2146.JPNP286.PROD.OUTLOOK.COM
patch subject: [PATCH 1/2] tick/nohz: Remove duplicate between tick_nohz_switch_to_nohz() and tick_setup_sched_timer()
config: arc-defconfig (https://download.01.org/0day-ci/archive/20231127/[email protected]/config)
compiler: arc-elf-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231127/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
kernel/time/tick-sched.c:650: warning: Function parameter or member 'now' not described in 'tick_nohz_update_jiffies'
kernel/time/tick-sched.c:1282: warning: Function parameter or member 'cpu' not described in 'tick_nohz_get_idle_calls_cpu'
>> kernel/time/tick-sched.c:1539: warning: Function parameter or member 'mode' not described in 'tick_setup_sched_timer'
vim +1539 kernel/time/tick-sched.c
62cf20b32aee4a Thomas Gleixner 2012-05-25 1533
de667c3b095eed Peng Liu 2023-11-27 1534 #if defined CONFIG_NO_HZ_COMMON || defined CONFIG_HIGH_RES_TIMERS
79bf2bb335b85d Thomas Gleixner 2007-02-16 1535 /**
79bf2bb335b85d Thomas Gleixner 2007-02-16 1536 * tick_setup_sched_timer - setup the tick emulation timer
79bf2bb335b85d Thomas Gleixner 2007-02-16 1537 */
de667c3b095eed Peng Liu 2023-11-27 1538 void tick_setup_sched_timer(int mode)
79bf2bb335b85d Thomas Gleixner 2007-02-16 @1539 {
22127e93c587af Christoph Lameter 2014-08-17 1540 struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
79bf2bb335b85d Thomas Gleixner 2007-02-16 1541 ktime_t now = ktime_get();
79bf2bb335b85d Thomas Gleixner 2007-02-16 1542
6c774377359923 Ingo Molnar 2023-09-28 1543 /* Emulate tick processing via per-CPU hrtimers: */
902a9f9c509053 Sebastian Andrzej Siewior 2019-07-26 1544 hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
de667c3b095eed Peng Liu 2023-11-27 1545 if (mode == NOHZ_MODE_HIGHRES)
dba428a678c726 Frederic Weisbecker 2023-09-12 1546 ts->sched_timer.function = tick_nohz_highres_handler;
79bf2bb335b85d Thomas Gleixner 2007-02-16 1547
0de7611a1031f2 Ingo Molnar 2016-07-01 1548 /* Get the next period (per-CPU) */
cc584b213f252b Arjan van de Ven 2008-09-01 1549 hrtimer_set_expires(&ts->sched_timer, tick_init_jiffy_update());
79bf2bb335b85d Thomas Gleixner 2007-02-16 1550
6c774377359923 Ingo Molnar 2023-09-28 1551 /* Offset the tick to avert 'jiffies_lock' contention. */
5307c9556bc17e Mike Galbraith 2012-05-08 1552 if (sched_skew_tick) {
b9965449164299 Thomas Gleixner 2020-11-17 1553 u64 offset = TICK_NSEC >> 1;
5307c9556bc17e Mike Galbraith 2012-05-08 1554 do_div(offset, num_possible_cpus());
5307c9556bc17e Mike Galbraith 2012-05-08 1555 offset *= smp_processor_id();
5307c9556bc17e Mike Galbraith 2012-05-08 1556 hrtimer_add_expires_ns(&ts->sched_timer, offset);
5307c9556bc17e Mike Galbraith 2012-05-08 1557 }
5307c9556bc17e Mike Galbraith 2012-05-08 1558
b9965449164299 Thomas Gleixner 2020-11-17 1559 hrtimer_forward(&ts->sched_timer, now, TICK_NSEC);
de667c3b095eed Peng Liu 2023-11-27 1560 if (mode == NOHZ_MODE_HIGHRES)
902a9f9c509053 Sebastian Andrzej Siewior 2019-07-26 1561 hrtimer_start_expires(&ts->sched_timer, HRTIMER_MODE_ABS_PINNED_HARD);
de667c3b095eed Peng Liu 2023-11-27 1562 else
de667c3b095eed Peng Liu 2023-11-27 1563 tick_program_event(hrtimer_get_expires(&ts->sched_timer), 1);
de667c3b095eed Peng Liu 2023-11-27 1564 tick_nohz_activate(ts, mode);
79bf2bb335b85d Thomas Gleixner 2007-02-16 1565 }
3c4fbe5e01d7e5 Miao Xie 2008-08-20 1566 #endif /* HIGH_RES_TIMERS */
79bf2bb335b85d Thomas Gleixner 2007-02-16 1567
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Peng,
kernel test robot noticed the following build errors:
[auto build test ERROR on tip/timers/core]
[also build test ERROR on linus/master v6.7-rc3 next-20231127]
[cannot apply to tip/timers/nohz]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Peng-Liu/tick-nohz-Remove-duplicate-between-tick_nohz_lowres_handler-and-tick_nohz_highres_handler/20231127-163637
base: tip/timers/core
patch link: https://lore.kernel.org/r/TYCP286MB21464B3653B956AF71806931C6BDA%40TYCP286MB2146.JPNP286.PROD.OUTLOOK.COM
patch subject: [PATCH 1/2] tick/nohz: Remove duplicate between tick_nohz_switch_to_nohz() and tick_setup_sched_timer()
config: i386-buildonly-randconfig-004-20231127 (https://download.01.org/0day-ci/archive/20231127/[email protected]/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231127/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
kernel/time/tick-sched.c: In function 'tick_setup_sched_timer':
kernel/time/tick-sched.c:1546:44: error: 'tick_nohz_highres_handler' undeclared (first use in this function); did you mean 'tick_nohz_lowres_handler'?
1546 | ts->sched_timer.function = tick_nohz_highres_handler;
| ^~~~~~~~~~~~~~~~~~~~~~~~~
| tick_nohz_lowres_handler
kernel/time/tick-sched.c:1546:44: note: each undeclared identifier is reported only once for each function it appears in
>> kernel/time/tick-sched.c:1552:13: error: 'sched_skew_tick' undeclared (first use in this function); did you mean 'scheduler_tick'?
1552 | if (sched_skew_tick) {
| ^~~~~~~~~~~~~~~
| scheduler_tick
vim +1552 kernel/time/tick-sched.c
62cf20b32aee4a Thomas Gleixner 2012-05-25 1533
de667c3b095eed Peng Liu 2023-11-27 1534 #if defined CONFIG_NO_HZ_COMMON || defined CONFIG_HIGH_RES_TIMERS
79bf2bb335b85d Thomas Gleixner 2007-02-16 1535 /**
79bf2bb335b85d Thomas Gleixner 2007-02-16 1536 * tick_setup_sched_timer - setup the tick emulation timer
79bf2bb335b85d Thomas Gleixner 2007-02-16 1537 */
de667c3b095eed Peng Liu 2023-11-27 1538 void tick_setup_sched_timer(int mode)
79bf2bb335b85d Thomas Gleixner 2007-02-16 1539 {
22127e93c587af Christoph Lameter 2014-08-17 1540 struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
79bf2bb335b85d Thomas Gleixner 2007-02-16 1541 ktime_t now = ktime_get();
79bf2bb335b85d Thomas Gleixner 2007-02-16 1542
6c774377359923 Ingo Molnar 2023-09-28 1543 /* Emulate tick processing via per-CPU hrtimers: */
902a9f9c509053 Sebastian Andrzej Siewior 2019-07-26 1544 hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
de667c3b095eed Peng Liu 2023-11-27 1545 if (mode == NOHZ_MODE_HIGHRES)
dba428a678c726 Frederic Weisbecker 2023-09-12 1546 ts->sched_timer.function = tick_nohz_highres_handler;
79bf2bb335b85d Thomas Gleixner 2007-02-16 1547
0de7611a1031f2 Ingo Molnar 2016-07-01 1548 /* Get the next period (per-CPU) */
cc584b213f252b Arjan van de Ven 2008-09-01 1549 hrtimer_set_expires(&ts->sched_timer, tick_init_jiffy_update());
79bf2bb335b85d Thomas Gleixner 2007-02-16 1550
6c774377359923 Ingo Molnar 2023-09-28 1551 /* Offset the tick to avert 'jiffies_lock' contention. */
5307c9556bc17e Mike Galbraith 2012-05-08 @1552 if (sched_skew_tick) {
b9965449164299 Thomas Gleixner 2020-11-17 1553 u64 offset = TICK_NSEC >> 1;
5307c9556bc17e Mike Galbraith 2012-05-08 1554 do_div(offset, num_possible_cpus());
5307c9556bc17e Mike Galbraith 2012-05-08 1555 offset *= smp_processor_id();
5307c9556bc17e Mike Galbraith 2012-05-08 1556 hrtimer_add_expires_ns(&ts->sched_timer, offset);
5307c9556bc17e Mike Galbraith 2012-05-08 1557 }
5307c9556bc17e Mike Galbraith 2012-05-08 1558
b9965449164299 Thomas Gleixner 2020-11-17 1559 hrtimer_forward(&ts->sched_timer, now, TICK_NSEC);
de667c3b095eed Peng Liu 2023-11-27 1560 if (mode == NOHZ_MODE_HIGHRES)
902a9f9c509053 Sebastian Andrzej Siewior 2019-07-26 1561 hrtimer_start_expires(&ts->sched_timer, HRTIMER_MODE_ABS_PINNED_HARD);
de667c3b095eed Peng Liu 2023-11-27 1562 else
de667c3b095eed Peng Liu 2023-11-27 1563 tick_program_event(hrtimer_get_expires(&ts->sched_timer), 1);
de667c3b095eed Peng Liu 2023-11-27 1564 tick_nohz_activate(ts, mode);
79bf2bb335b85d Thomas Gleixner 2007-02-16 1565 }
3c4fbe5e01d7e5 Miao Xie 2008-08-20 1566 #endif /* HIGH_RES_TIMERS */
79bf2bb335b85d Thomas Gleixner 2007-02-16 1567
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Peng,
kernel test robot noticed the following build errors:
[auto build test ERROR on tip/timers/core]
[also build test ERROR on linus/master v6.7-rc3 next-20231127]
[cannot apply to tip/timers/nohz]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Peng-Liu/tick-nohz-Remove-duplicate-between-tick_nohz_lowres_handler-and-tick_nohz_highres_handler/20231127-163637
base: tip/timers/core
patch link: https://lore.kernel.org/r/TYCP286MB21464B3653B956AF71806931C6BDA%40TYCP286MB2146.JPNP286.PROD.OUTLOOK.COM
patch subject: [PATCH 1/2] tick/nohz: Remove duplicate between tick_nohz_switch_to_nohz() and tick_setup_sched_timer()
config: x86_64-randconfig-004-20231127 (https://download.01.org/0day-ci/archive/20231127/[email protected]/config)
compiler: clang version 16.0.4 (https://github.com/llvm/llvm-project.git ae42196bc493ffe877a7e3dff8be32035dea4d07)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231127/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
kernel/time/tick-sched.c:1546:30: error: use of undeclared identifier 'tick_nohz_highres_handler'; did you mean 'tick_nohz_lowres_handler'?
ts->sched_timer.function = tick_nohz_highres_handler;
^~~~~~~~~~~~~~~~~~~~~~~~~
tick_nohz_lowres_handler
kernel/time/tick-sched.c:1395:13: note: 'tick_nohz_lowres_handler' declared here
static void tick_nohz_lowres_handler(struct clock_event_device *dev)
^
>> kernel/time/tick-sched.c:1552:6: error: use of undeclared identifier 'sched_skew_tick'; did you mean 'scheduler_tick'?
if (sched_skew_tick) {
^~~~~~~~~~~~~~~
scheduler_tick
include/linux/sched.h:294:13: note: 'scheduler_tick' declared here
extern void scheduler_tick(void);
^
2 errors generated.
vim +1552 kernel/time/tick-sched.c
62cf20b32aee4a Thomas Gleixner 2012-05-25 1533
de667c3b095eed Peng Liu 2023-11-27 1534 #if defined CONFIG_NO_HZ_COMMON || defined CONFIG_HIGH_RES_TIMERS
79bf2bb335b85d Thomas Gleixner 2007-02-16 1535 /**
79bf2bb335b85d Thomas Gleixner 2007-02-16 1536 * tick_setup_sched_timer - setup the tick emulation timer
79bf2bb335b85d Thomas Gleixner 2007-02-16 1537 */
de667c3b095eed Peng Liu 2023-11-27 1538 void tick_setup_sched_timer(int mode)
79bf2bb335b85d Thomas Gleixner 2007-02-16 1539 {
22127e93c587af Christoph Lameter 2014-08-17 1540 struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
79bf2bb335b85d Thomas Gleixner 2007-02-16 1541 ktime_t now = ktime_get();
79bf2bb335b85d Thomas Gleixner 2007-02-16 1542
6c774377359923 Ingo Molnar 2023-09-28 1543 /* Emulate tick processing via per-CPU hrtimers: */
902a9f9c509053 Sebastian Andrzej Siewior 2019-07-26 1544 hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
de667c3b095eed Peng Liu 2023-11-27 1545 if (mode == NOHZ_MODE_HIGHRES)
dba428a678c726 Frederic Weisbecker 2023-09-12 1546 ts->sched_timer.function = tick_nohz_highres_handler;
79bf2bb335b85d Thomas Gleixner 2007-02-16 1547
0de7611a1031f2 Ingo Molnar 2016-07-01 1548 /* Get the next period (per-CPU) */
cc584b213f252b Arjan van de Ven 2008-09-01 1549 hrtimer_set_expires(&ts->sched_timer, tick_init_jiffy_update());
79bf2bb335b85d Thomas Gleixner 2007-02-16 1550
6c774377359923 Ingo Molnar 2023-09-28 1551 /* Offset the tick to avert 'jiffies_lock' contention. */
5307c9556bc17e Mike Galbraith 2012-05-08 @1552 if (sched_skew_tick) {
b9965449164299 Thomas Gleixner 2020-11-17 1553 u64 offset = TICK_NSEC >> 1;
5307c9556bc17e Mike Galbraith 2012-05-08 1554 do_div(offset, num_possible_cpus());
5307c9556bc17e Mike Galbraith 2012-05-08 1555 offset *= smp_processor_id();
5307c9556bc17e Mike Galbraith 2012-05-08 1556 hrtimer_add_expires_ns(&ts->sched_timer, offset);
5307c9556bc17e Mike Galbraith 2012-05-08 1557 }
5307c9556bc17e Mike Galbraith 2012-05-08 1558
b9965449164299 Thomas Gleixner 2020-11-17 1559 hrtimer_forward(&ts->sched_timer, now, TICK_NSEC);
de667c3b095eed Peng Liu 2023-11-27 1560 if (mode == NOHZ_MODE_HIGHRES)
902a9f9c509053 Sebastian Andrzej Siewior 2019-07-26 1561 hrtimer_start_expires(&ts->sched_timer, HRTIMER_MODE_ABS_PINNED_HARD);
de667c3b095eed Peng Liu 2023-11-27 1562 else
de667c3b095eed Peng Liu 2023-11-27 1563 tick_program_event(hrtimer_get_expires(&ts->sched_timer), 1);
de667c3b095eed Peng Liu 2023-11-27 1564 tick_nohz_activate(ts, mode);
79bf2bb335b85d Thomas Gleixner 2007-02-16 1565 }
3c4fbe5e01d7e5 Miao Xie 2008-08-20 1566 #endif /* HIGH_RES_TIMERS */
79bf2bb335b85d Thomas Gleixner 2007-02-16 1567
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki