tick/nohz: avoid showing '(null)' if nohz_full= not set
v2 cover tick/nohz: avoid showing '(null)' if nohz_full= not set
In the context of CONFIG_NO_HZ_FULL=y, tick_nohz_full_mask (of type cpumask_var_t) is initialised to 0. Memory is only allocated to the cpumask data structure, when Linux kernel boot-time parameter "nohz_full=" is correctly specified (see tick_nohz_full_setup() and housekeeping_setup()). If "nohz_full=" is not set and an attempt is made to read /sys/devices/system/cpu/nohz_full, '(null)' can be displayed:
❯ cat /sys/devices/system/cpu/nohz_full
(null)
This patch changes the output to print a newline (or 0x0A) instead of '(null)', making it consistent with print_cpus_isolated() behaviour.
Changes since v1 [1]:
- Refactor to use an if statement (Greg KH)
[1]: https://lore.kernel.org/lkml/[email protected]/
Aaron Tomlin (1):
tick/nohz: avoid showing '(null)' if nohz_full= not set
drivers/base/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Signature · 1 line
2.49.0
PATCH v2 1/1 tick/nohz: avoid showing '(null)' if nohz_full= not set
In the context of CONFIG_NO_HZ_FULL=y, tick_nohz_full_mask (of type cpumask_var_t) is initialised to 0. Memory is only allocated to the cpumask data structure, in tick_nohz_full_setup(), when Linux kernel boot-time parameter "nohz_full=" is correctly specified (see housekeeping_setup()). If "nohz_full=" is not set and an attempt is made to read /sys/devices/system/cpu/nohz_full, '(null)' can be displayed:
❯ cat /sys/devices/system/cpu/nohz_full
(null)
This patch changes the output to print a newline (or 0x0A) instead of '(null)', making it consistent with print_cpus_isolated() behaviour.
--- drivers/base/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/base/cpu.c +5 -1
@@ -304,7 +304,11 @@ static DEVICE_ATTR(isolated, 0444, print_cpus_isolated, NULL);static ssize_t print_cpus_nohz_full (struct device *dev,struct device_attribute *attr,char *buf) { -return sysfs_emit (buf,"%*pbl\n" ,cpumask_pr_args (tick_nohz_full_mask)); +if (!tick_nohz_full_mask) +return sysfs_emit (buf,"\n" ); +else +return sysfs_emit (buf,"%*pbl\n" , +cpumask_pr_args (tick_nohz_full_mask)); } static DEVICE_ATTR(nohz_full, 0444, print_cpus_nohz_full, NULL);#endif
Signature · 1 line
2.49.0
Hi Aaron,
Quoted 24 lines · Aaron Tomlin
In the context of
CONFIG_NO_HZ_FULL=y,tick_nohz_full_mask(of typecpumask_var_t) is initialised to 0. Memory is only allocated to the cpumask data structure, intick_nohz_full_setup(), when Linux kernel boot-time parameter "nohz_full=" is correctly specified (seehousekeeping_setup()). If "nohz_full=" is not set and an attempt is made to read/sys/devices/system/cpu/nohz_full, '(null)' can be displayed:❯ cat
/sys/devices/system/cpu/nohz_full
(null)This patch changes the output to print a newline (or
0x0A) instead of '(null)', making it consistent withprint_cpus_isolated()behaviour.Fixes 6570a9a1ce3a1 ("show nohz_full cpus in sysfs")Signed-off-by Aaron Tomlin <[email protected]>--- drivers/base/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/base/cpu.c +0
-0
drivers/base/cpu.c static DEVICE_ATTR(isolated, 0444, print_cpus_isolated, NULL); · line 307
Quoted 5 lines
drivers/base/cpu.c +1
-1@@ -304,7 +304,11 @@ static DEVICE_ATTR(isolated, 0444, print_cpus_isolated, NULL);static ssize_t print_cpus_nohz_full (struct device *dev,struct device_attribute *attr,char *buf) { -return sysfs_emit (buf,"%*pbl\n" ,cpumask_pr_args (tick_nohz_full_mask)); +if (!tick_nohz_full_mask)
This should use cpumask_available() to avoid the warning reported at
https://lore.kernel.org/[email protected]/.
drivers/base/cpu.c static DEVICE_ATTR(isolated, 0444, print_cpus_isolated, NULL); · line 311
Quoted 4 lines
drivers/base/cpu.c +4
-0+return sysfs_emit (buf,"\n" ); + else + return sysfs_emit(buf, "%*pbl\n", +cpumask_pr_args (tick_nohz_full_mask));
You don't need the else since you return in the if, which will make the diff smaller overall.
Quoted 6 lines
drivers/base/cpu.c +0
-0} static DEVICE_ATTR(nohz_full, 0444, print_cpus_nohz_full, NULL);#endif Signature · 1 line
2.49.0