Skip to content

Commit 231bf1e

Browse files
troglobittroglobit
authored
Merge pull request #1318 from kernelkit/rusage
Kernel config changes and resource usage monitoring
2 parents 17d99ae + c2a9ee4 commit 231bf1e

File tree

12 files changed

+99
-24
lines changed

12 files changed

+99
-24
lines changed

‎board/aarch32/linux_defconfig‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,13 @@ CONFIG_MAGIC_SYSRQ=y
387387
CONFIG_DEBUG_FS=y
388388
CONFIG_PANIC_ON_OOPS=y
389389
CONFIG_PANIC_TIMEOUT=20
390-
CONFIG_DETECT_HUNG_TASK=y
390+
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
391+
CONFIG_HARDLOCKUP_DETECTOR=y
392+
CONFIG_HARDLOCKUP_DETECTOR_PREFER_BUDDY=y
393+
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
394+
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
395+
CONFIG_WQ_WATCHDOG=y
396+
CONFIG_WQ_CPU_INTENSIVE_REPORT=y
391397
# CONFIG_SCHED_DEBUG is not set
392398
# CONFIG_RCU_TRACE is not set
393399
CONFIG_FUNCTION_TRACER=y

‎board/aarch64/linux_defconfig‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,13 @@ CONFIG_MAGIC_SYSRQ=y
557557
CONFIG_DEBUG_FS=y
558558
CONFIG_PANIC_ON_OOPS=y
559559
CONFIG_PANIC_TIMEOUT=20
560-
CONFIG_DETECT_HUNG_TASK=y
560+
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
561+
CONFIG_HARDLOCKUP_DETECTOR=y
562+
CONFIG_HARDLOCKUP_DETECTOR_PREFER_BUDDY=y
563+
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
564+
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
565+
CONFIG_WQ_WATCHDOG=y
566+
CONFIG_WQ_CPU_INTENSIVE_REPORT=y
561567
# CONFIG_SCHED_DEBUG is not set
562568
# CONFIG_RCU_TRACE is not set
563569
CONFIG_FUNCTION_TRACER=y

‎board/common/rootfs/etc/watchdogd.conf‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ reset-reason {
9090

9191
# Monitors file descriptor leaks based on /proc/sys/fs/file-nr
9292
filenr {
93-
# enabled = true
94-
interval = 300
95-
logmark = false
93+
enabled = true
94+
interval = 3600
95+
logmark = true
9696
warning = 0.9
9797
critical = 1.0
9898
# script = "/path/to/alt-reboot-action.sh"
@@ -102,33 +102,42 @@ filenr {
102102
# The script is called with fsmon as the first argument and there
103103
# are two environment variables FSMON_NAME, for the monitored path,
104104
# and FSMON_TYPE indicating either 'blocks' or 'inodes'.
105-
#fsmon /var {
106-
# enabled = true
107-
# interval = 300
108-
# logmark = false
109-
# warning = 0.95
110-
# critical = 1.0
105+
fsmon /var {
106+
enabled = true
107+
interval = 3600
108+
logmark = true
109+
warning = 0.95
110+
critical = 1.0
111111
# script = "/path/to/alt-reboot-action.sh"
112-
#}
112+
}
113+
114+
fsmon /tmp {
115+
enabled = true
116+
interval = 3600
117+
logmark = true
118+
warning = 0.95
119+
critical = 1.0
120+
# script = "/path/to/alt-reboot-action.sh"
121+
}
113122

114123
# Monitors load average based on sysinfo() from /proc/loadavg
115124
# The level is composed from the average of the 1 and 5 min marks.
116-
loadavg {
125+
#loadavg {
117126
# enabled = true
118-
interval = 300
119-
logmark = false
120-
warning = 1.0
121-
critical = 2.0
127+
# interval = 300
128+
# logmark = true
129+
# warning = 1.0
130+
# critical = 2.0
122131
# script = "/path/to/alt-reboot-action.sh"
123-
}
132+
#}
124133

125134
# Monitors free RAM based on data from /proc/meminfo
126135
meminfo {
127-
# enabled = true
128-
interval = 300
129-
logmark = false
136+
enabled = true
137+
interval = 3600
138+
logmark = true
130139
warning = 0.9
131-
critical = 0.95
140+
critical = 0.97
132141
# script = "/path/to/alt-reboot-action.sh"
133142
}
134143

‎board/riscv64/linux_defconfig‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,15 @@ CONFIG_DEBUG_FS=y
472472
# CONFIG_SLUB_DEBUG is not set
473473
CONFIG_DEBUG_RODATA_TEST=y
474474
CONFIG_DEBUG_WX=y
475-
CONFIG_SOFTLOCKUP_DETECTOR=y
475+
CONFIG_PANIC_ON_OOPS=y
476+
CONFIG_PANIC_TIMEOUT=20
477+
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
478+
CONFIG_HARDLOCKUP_DETECTOR=y
479+
CONFIG_HARDLOCKUP_DETECTOR_PREFER_BUDDY=y
480+
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
481+
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
476482
CONFIG_WQ_WATCHDOG=y
483+
CONFIG_WQ_CPU_INTENSIVE_REPORT=y
477484
# CONFIG_SCHED_DEBUG is not set
478485
CONFIG_STACKTRACE=y
479486
CONFIG_RCU_CPU_STALL_TIMEOUT=60

‎board/x86_64/linux_defconfig‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,12 @@ CONFIG_MAGIC_SYSRQ=y
263263
CONFIG_DEBUG_FS=y
264264
CONFIG_PANIC_ON_OOPS=y
265265
CONFIG_PANIC_TIMEOUT=20
266-
CONFIG_DETECT_HUNG_TASK=y
266+
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
267+
CONFIG_HARDLOCKUP_DETECTOR=y
268+
CONFIG_HARDLOCKUP_DETECTOR_PREFER_BUDDY=y
269+
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
267270
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
271+
CONFIG_WQ_WATCHDOG=y
272+
CONFIG_WQ_CPU_INTENSIVE_REPORT=y
268273
CONFIG_FUNCTION_TRACER=y
269274
CONFIG_UNWINDER_FRAME_POINTER=y

‎configs/aarch32_defconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ BR2_PACKAGE_RAUC_JSON=y
9595
BR2_PACKAGE_SYSKLOGD=y
9696
BR2_PACKAGE_SYSKLOGD_LOGGER=y
9797
BR2_PACKAGE_WATCHDOGD=y
98+
BR2_PACKAGE_WATCHDOGD_GENERIC=y
99+
BR2_PACKAGE_WATCHDOGD_LOADAVG=y
100+
BR2_PACKAGE_WATCHDOGD_FILENR=y
101+
BR2_PACKAGE_WATCHDOGD_MEMINFO=y
102+
BR2_PACKAGE_WATCHDOGD_FSMON=y
103+
BR2_PACKAGE_WATCHDOGD_TEMPMON
98104
BR2_PACKAGE_LESS=y
99105
BR2_PACKAGE_MG=y
100106
BR2_PACKAGE_NANO=y

‎configs/aarch32_minimal_defconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ BR2_PACKAGE_RAUC_JSON=y
9595
BR2_PACKAGE_SYSKLOGD=y
9696
BR2_PACKAGE_SYSKLOGD_LOGGER=y
9797
BR2_PACKAGE_WATCHDOGD=y
98+
BR2_PACKAGE_WATCHDOGD_GENERIC=y
99+
BR2_PACKAGE_WATCHDOGD_LOADAVG=y
100+
BR2_PACKAGE_WATCHDOGD_FILENR=y
101+
BR2_PACKAGE_WATCHDOGD_MEMINFO=y
102+
BR2_PACKAGE_WATCHDOGD_FSMON=y
103+
BR2_PACKAGE_WATCHDOGD_TEMPMON
98104
BR2_PACKAGE_LESS=y
99105
BR2_PACKAGE_MG=y
100106
BR2_PACKAGE_NANO=y

‎configs/aarch64_defconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ BR2_PACKAGE_RAUC_JSON=y
119119
BR2_PACKAGE_SYSKLOGD=y
120120
BR2_PACKAGE_SYSKLOGD_LOGGER=y
121121
BR2_PACKAGE_WATCHDOGD=y
122+
BR2_PACKAGE_WATCHDOGD_GENERIC=y
123+
BR2_PACKAGE_WATCHDOGD_LOADAVG=y
124+
BR2_PACKAGE_WATCHDOGD_FILENR=y
125+
BR2_PACKAGE_WATCHDOGD_MEMINFO=y
126+
BR2_PACKAGE_WATCHDOGD_FSMON=y
127+
BR2_PACKAGE_WATCHDOGD_TEMPMON
122128
BR2_PACKAGE_LESS=y
123129
BR2_PACKAGE_MG=y
124130
BR2_PACKAGE_NANO=y

‎configs/aarch64_minimal_defconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ BR2_PACKAGE_RAUC_JSON=y
9797
BR2_PACKAGE_SYSKLOGD=y
9898
BR2_PACKAGE_SYSKLOGD_LOGGER=y
9999
BR2_PACKAGE_WATCHDOGD=y
100+
BR2_PACKAGE_WATCHDOGD_GENERIC=y
101+
BR2_PACKAGE_WATCHDOGD_LOADAVG=y
102+
BR2_PACKAGE_WATCHDOGD_FILENR=y
103+
BR2_PACKAGE_WATCHDOGD_MEMINFO=y
104+
BR2_PACKAGE_WATCHDOGD_FSMON=y
105+
BR2_PACKAGE_WATCHDOGD_TEMPMON
100106
BR2_PACKAGE_LESS=y
101107
BR2_PACKAGE_MG=y
102108
BR2_PACKAGE_NANO=y

‎configs/riscv64_defconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,12 @@ BR2_PACKAGE_RAUC_JSON=y
131131
BR2_PACKAGE_SYSKLOGD=y
132132
BR2_PACKAGE_SYSKLOGD_LOGGER=y
133133
BR2_PACKAGE_WATCHDOGD=y
134+
BR2_PACKAGE_WATCHDOGD_GENERIC=y
135+
BR2_PACKAGE_WATCHDOGD_LOADAVG=y
136+
BR2_PACKAGE_WATCHDOGD_FILENR=y
137+
BR2_PACKAGE_WATCHDOGD_MEMINFO=y
138+
BR2_PACKAGE_WATCHDOGD_FSMON=y
139+
BR2_PACKAGE_WATCHDOGD_TEMPMON
134140
BR2_PACKAGE_LESS=y
135141
BR2_PACKAGE_MG=y
136142
BR2_PACKAGE_NANO=y

0 commit comments

Comments
 (0)