*** Detect interrupt storm in softlockup ***
v4 cover *** Detect interrupt storm in softlockup ***
Hi, guys.
I have implemented a low-overhead method for detecting interrupt storm in softlockup. Please review it, all comments are welcome.
Changes from v3 to v4:
- Renaming some variable and function names to make the code logic more readable.
- Change the code location to avoid predeclaring.
- Just swap rather than a double loop in tabulate_irq_count.
- Since nr_irqs has the potential to grow at runtime, bounds-check logic has been implemented.
- Add SOFTLOCKUP_DETECTOR_INTR_STORM Kconfig knob.
Changes from v2 to v3:
- From Liu Song, using enum instead of macro for cpu_stats, shortening the name 'idx_to_stat' to 'stats', adding 'get_16bit_precesion' instead of using right shift operations, and using 'struct irq_counts'.
- From kernel robot test, using '__this_cpu_read' and '__this_cpu_write' instead of accessing to an per-cpu array directly, in order to avoid this warning.
'sparse: incorrect type in initializer (different modifiers)'
Changes from v1 to v2:
- From Douglas, optimize the memory of cpustats. With the maximum number of CPUs, that's now this.
2 * 8192 * 4 + 1 * 8192 * 5 * 4 + 1 * 8192 = 237,568 bytes.
- From Liu Song, refactor the code format and add necessary comments.
- From Douglas, use interrupt counts instead of interrupt time to determine the cause of softlockup.
- Remove the cmdline parameter added in PATCHv1.
Bitao Hu (3):
watchdog/softlockup: low-overhead detection of interrupt watchdog/softlockup: report the most frequent interrupts watchdog/softlockup: add SOFTLOCKUP_DETECTOR_INTR_STORM Kconfig knob
kernel/watchdog.c | 247 ++++++++++++++++++++++++++++++++++++++++++++++ lib/Kconfig.debug | 13 +++ 2 files changed, 260 insertions(+)
Signature · 1 line
2.37.1 (Apple Git-137.1)
PATCH v4 1/3 watchdog/softlockup: low-overhead detection of interrupt
The following softlockup is caused by interrupt storm, but it cannot be identified from the call tree. Because the call tree is just a snapshot and doesn't fully capture the behavior of the CPU during the soft lockup.
watchdog: BUG: soft lockup - CPU#28 stuck for 23s! [fio:83921]
...
Call trace:
__do_softirq+0xa0/0x37c
__irq_exit_rcu+0x108/0x140
irq_exit+0x14/0x20
__handle_domain_irq+0x84/0xe0
gic_handle_irq+0x80/0x108
el0_irq_naked+0x50/0x58Therefore,I think it is necessary to report CPU utilization during the softlockup_thresh period (report once every sample_period, for a total of 5 reportings), like this:
watchdog: BUG: soft lockup - CPU#28 stuck for 23s! [fio:83921]
CPU#28 Utilization every 4s during lockup:
#1: 0% system, 0% softirq, 100% hardirq, 0% idle
#2: 0% system, 0% softirq, 100% hardirq, 0% idle
#3: 0% system, 0% softirq, 100% hardirq, 0% idle
#4: 0% system, 0% softirq, 100% hardirq, 0% idle
#5: 0% system, 0% softirq, 100% hardirq, 0% idle
...This would be helpful in determining whether an interrupt storm has occurred or in identifying the cause of the softlockup. The criteria for determination are as follows:
a. If the hardirq utilization is high, then interrupt storm should be considered and the root cause cannot be determined from the call tree. b. If the softirq utilization is high, then we could analyze the call tree but it may cannot reflect the root cause.
c. If the system utilization is high, then we could analyze the root cause from the call tree.
--- kernel/watchdog.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+)
kernel/watchdog.c +91 -0
@@ -16,6 +16,8 @@#include <linux/cpu.h> #include <linux/nmi.h> #include <linux/init.h> +#include <linux/kernel_stat.h> +#include <linux/math64.h> #include <linux/module.h> #include <linux/sysctl.h> #include <linux/tick.h>
@@ -333,6 +335,92 @@ __setup("watchdog_thresh=", watchdog_thresh_setup);static void __lockup_detector_cleanup (void ); +#ifdef CONFIG_IRQ_TIME_ACCOUNTING +#define NUM_STATS_GROUPS 5 +enum stats_per_group { +STATS_SYSTEM , +STATS_SOFTIRQ , +STATS_HARDIRQ , +STATS_IDLE , +NUM_STATS_PER_GROUP , +}; +static const enum cpu_usage_stat tracked_stats[NUM_STATS_PER_GROUP ] = { +CPUTIME_SYSTEM , +CPUTIME_SOFTIRQ , +CPUTIME_IRQ , +CPUTIME_IDLE , +}; +static DEFINE_PER_CPU(u16, cpustat_old[NUM_STATS_PER_GROUP]); +static DEFINE_PER_CPU(u8, cpustat_util[NUM_STATS_GROUPS][NUM_STATS_PER_GROUP]); +static DEFINE_PER_CPU(u8, cpustat_tail); + +/* +* We don't need nanosecond resolution. A granularity of 16ms is +* sufficient for our precision, allowing us to use u16 to store +* cpustats, which will roll over roughly every ~1000 seconds. +* 2^24 ~= 16 * 10^6 +*/ +static u16 get_16bit_precision (u64 data_ns) +{ +return data_ns >>24LL ;/* 2^24ns ~= 16.8ms */ +} + +static void update_cpustat (void ) +{ +int i; +u8 util; +u16 old_stat; +u16 new_stat; +u8 tail =__this_cpu_read (cpustat_tail); +struct kernel_cpustat kcpustat; +u64 *cpustat = kcpustat.cpustat; +u16 sample_period_16 =get_16bit_precision (sample_period); + +kcpustat_cpu_fetch (&kcpustat,smp_processor_id ()); +for (i =0 ; i <NUM_STATS_PER_GROUP ; i++) { + old_stat =__this_cpu_read (cpustat_old[i]); + new_stat =get_16bit_precision (cpustat[tracked_stats[i]]); + util =DIV_ROUND_UP (100 * (new_stat - old_stat), sample_period_16); +__this_cpu_write (cpustat_util[tail][i], util); +__this_cpu_write (cpustat_old[i], new_stat); + } +__this_cpu_write (cpustat_tail, (tail +1 ) %NUM_STATS_GROUPS ); +} + +static void print_cpustat (void ) +{ +int i; +int group; +u8 tail =__this_cpu_read (cpustat_tail); +u64 sample_period_second = sample_period; + +do_div (sample_period_second,NSEC_PER_SEC ); +/* +* We do not want the "watchdog: " prefix on every line, +* hence we use "printk" instead of "pr_crit". +*/ +printk (KERN_CRIT "CPU#%d Utilization every %llus during lockup:\n" , +smp_processor_id (), sample_period_second); +for (i =0 ; i <NUM_STATS_GROUPS ; i++) { + group = (tail + i) %NUM_STATS_GROUPS ; +printk (KERN_CRIT "\t#%d: %3u%% system,\t%3u%% softirq,\t" +"%3u%% hardirq,\t%3u%% idle\n" , i+1 , +__this_cpu_read (cpustat_util[group][STATS_SYSTEM ]), +__this_cpu_read (cpustat_util[group][STATS_SOFTIRQ ]), +__this_cpu_read (cpustat_util[group][STATS_HARDIRQ ]), +__this_cpu_read (cpustat_util[group][STATS_IDLE ])); + } +} + +static void report_cpu_status (void ) +{ +print_cpustat (); +} +#else +static inline void update_cpustat (void ) { } +static inline void report_cpu_status (void ) { } +#endif +/* * Hard-lockup warnings should be triggered after just a few seconds. Soft- * lockups can have false positives under extreme conditions. So we generally
@@ -504,6 +592,8 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)*/ period_ts =READ_ONCE (*this_cpu_ptr (&watchdog_report_ts)); +update_cpustat (); +/* Reset the interval when touched by known problematic code. */ if (period_ts ==SOFTLOCKUP_DELAY_REPORT ) {if (unlikely (__this_cpu_read (softlockup_touch_sync))) {
@@ -539,6 +629,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)pr_emerg ("BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n" ,smp_processor_id (), duration, current->comm,task_pid_nr (current)); +report_cpu_status ();print_modules ();print_irqtrace_events (current);if (regs)
Signature · 1 line
2.37.1 (Apple Git-137.1)
Re: [PATCHv4 1/3] watchdog/softlockup: low-overhead detection of interrupt
Quoted 156 lines · Bitao Hu
The following softlockup is caused by interrupt storm, but it cannot be identified from the call tree. Because the call tree is just a snapshot and doesn't fully capture the behavior of the CPU during the soft lockup.
watchdog: BUG: soft lockup - CPU#28 stuck for 23s! [fio:83921] ... Call trace: __do_softirq+0xa0/0x37c __irq_exit_rcu+0x108/0x140 irq_exit+0x14/0x20 __handle_domain_irq+0x84/0xe0 gic_handle_irq+0x80/0x108 el0_irq_naked+0x50/0x58Therefore,I think it is necessary to report CPU utilization during the
softlockup_threshperiod (report once everysample_period, for a total of 5 reportings), like this:watchdog: BUG: soft lockup - CPU#28 stuck for 23s! [fio:83921] CPU#28 Utilization every 4s during lockup: #1: 0% system, 0% softirq, 100% hardirq, 0% idle #2: 0% system, 0% softirq, 100% hardirq, 0% idle #3: 0% system, 0% softirq, 100% hardirq, 0% idle #4: 0% system, 0% softirq, 100% hardirq, 0% idle #5: 0% system, 0% softirq, 100% hardirq, 0% idle ...This would be helpful in determining whether an interrupt storm has occurred or in identifying the cause of the softlockup. The criteria for determination are as follows:
a. If the hardirq utilization is high, then interrupt storm should be considered and the root cause cannot be determined from the call tree. b. If the softirq utilization is high, then we could analyze the call tree but it may cannot reflect the root cause.
c. If the system utilization is high, then we could analyze the root cause from the call tree.Signed-off-by Bitao Hu <[email protected]>--- kernel/watchdog.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+)kernel/watchdog.c +90
-0@@ -16,6 +16,8 @@#include <linux/cpu.h> #include <linux/nmi.h> #include <linux/init.h> +#include <linux/kernel_stat.h> +#include <linux/math64.h> #include <linux/module.h> #include <linux/sysctl.h> #include <linux/tick.h> @@ -333,6 +335,92 @@ __setup("watchdog_thresh=", watchdog_thresh_setup);static void __lockup_detector_cleanup (void ); +#ifdef CONFIG_IRQ_TIME_ACCOUNTING +#define NUM_STATS_GROUPS 5 +enum stats_per_group { +STATS_SYSTEM , +STATS_SOFTIRQ , +STATS_HARDIRQ , +STATS_IDLE , +NUM_STATS_PER_GROUP , +}; +static const enum cpu_usage_stat tracked_stats[NUM_STATS_PER_GROUP ] = { +CPUTIME_SYSTEM , +CPUTIME_SOFTIRQ , +CPUTIME_IRQ , +CPUTIME_IDLE , +}; +static DEFINE_PER_CPU(u16, cpustat_old[NUM_STATS_PER_GROUP]); +static DEFINE_PER_CPU(u8, cpustat_util[NUM_STATS_GROUPS][NUM_STATS_PER_GROUP]); +static DEFINE_PER_CPU(u8, cpustat_tail); + +/* +* We don't need nanosecond resolution. A granularity of 16ms is +* sufficient for our precision, allowing us to use u16 to store +* cpustats, which will roll over roughly every ~1000 seconds. +* 2^24 ~= 16 * 10^6 +*/ +static u16 get_16bit_precision (u64 data_ns) +{ +return data_ns >>24LL ;/* 2^24ns ~= 16.8ms */ +} + +static void update_cpustat (void ) +{ +int i; +u8 util; +u16 old_stat; +u16 new_stat; +u8 tail =__this_cpu_read (cpustat_tail); +struct kernel_cpustat kcpustat; +u64 *cpustat = kcpustat.cpustat; +u16 sample_period_16 =get_16bit_precision (sample_period); + +kcpustat_cpu_fetch (&kcpustat,smp_processor_id ()); +for (i =0 ; i <NUM_STATS_PER_GROUP ; i++) { + old_stat =__this_cpu_read (cpustat_old[i]); + new_stat =get_16bit_precision (cpustat[tracked_stats[i]]); + util =DIV_ROUND_UP (100 * (new_stat - old_stat), sample_period_16); +__this_cpu_write (cpustat_util[tail][i], util); +__this_cpu_write (cpustat_old[i], new_stat); + } +__this_cpu_write (cpustat_tail, (tail +1 ) %NUM_STATS_GROUPS ); +} + +static void print_cpustat (void ) +{ +int i; +int group; +u8 tail =__this_cpu_read (cpustat_tail); +u64 sample_period_second = sample_period; + +do_div (sample_period_second,NSEC_PER_SEC ); +/* +* We do not want the "watchdog: " prefix on every line, +* hence we use "printk" instead of "pr_crit". +*/ +printk (KERN_CRIT "CPU#%d Utilization every %llus during lockup:\n" , +smp_processor_id (), sample_period_second); +for (i =0 ; i <NUM_STATS_GROUPS ; i++) { + group = (tail + i) %NUM_STATS_GROUPS ; +printk (KERN_CRIT "\t#%d: %3u%% system,\t%3u%% softirq,\t" +"%3u%% hardirq,\t%3u%% idle\n" , i+1 , +__this_cpu_read (cpustat_util[group][STATS_SYSTEM ]), +__this_cpu_read (cpustat_util[group][STATS_SOFTIRQ ]), +__this_cpu_read (cpustat_util[group][STATS_HARDIRQ ]), +__this_cpu_read (cpustat_util[group][STATS_IDLE ])); + } +} + +static void report_cpu_status (void ) +{ +print_cpustat (); +} +#else +static inline void update_cpustat (void ) { } +static inline void report_cpu_status (void ) { } +#endif +/* * Hard-lockup warnings should be triggered after just a few seconds. Soft- * lockups can have false positives under extreme conditions. So we generally @@ -504,6 +592,8 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)*/ period_ts =READ_ONCE (*this_cpu_ptr (&watchdog_report_ts)); +update_cpustat (); +/* Reset the interval when touched by known problematic code. */ if (period_ts ==SOFTLOCKUP_DELAY_REPORT ) {if (unlikely (__this_cpu_read (softlockup_touch_sync))) {
kernel/watchdog.c static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) · line 635
Quoted 7 lines
kernel/watchdog.c +1
-0@@ -539,6 +629,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)pr_emerg ("BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n" ,smp_processor_id (), duration, current->comm,task_pid_nr (current)); +report_cpu_status ();print_modules ();print_irqtrace_events (current);if (regs)
Looks good, and advisable to combine declarations of variables of the same type into one line to save on the number of lines.
PATCH v4 2/3 watchdog/softlockup: report the most frequent interrupts
In reply to Bitao HuWhen the watchdog determines that the current soft lockup is due to an interrupt storm based on CPU utilization, reporting the most frequent interrupts could be good enough for further troubleshooting.
Below is an example of interrupt storm. The call tree does not provide useful information, but we can analyze which interrupt caused the soft lockup by comparing the counts of interrupts.
[ 2987.488075] watchdog: BUG: soft lockup - CPU#9 stuck for 23s! [kworker/9:1:214] [ 2987.488607] CPU#9 Utilization every 4s during lockup: [ 2987.488941] #1: 0% system, 0% softirq, 100% hardirq, 0% idle [ 2987.489357] #2: 0% system, 0% softirq, 100% hardirq, 0% idle [ 2987.489771] #3: 0% system, 0% softirq, 100% hardirq, 0% idle [ 2987.490186] #4: 0% system, 0% softirq, 100% hardirq, 0% idle [ 2987.490601] #5: 0% system, 0% softirq, 100% hardirq, 0% idle [ 2987.491034] CPU#9 Detect HardIRQ Time exceeds 50%. Most frequent HardIRQs: [ 2987.491493] #1: 330985 irq#7(IPI) [ 2987.491743] #2: 5000 irq#10(arch_timer) [ 2987.492039] #3: 9 irq#91(nvme0q2) [ 2987.492318] #4: 3 irq#118(virtio1-output.12) ... [ 2987.492728] Call trace: [ 2987.492729] __do_softirq+0xa8/0x364
--- kernel/watchdog.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+)
kernel/watchdog.c +156 -0
@@ -19,6 +19,9 @@#include <linux/kernel_stat.h> #include <linux/math64.h> #include <linux/module.h> +#include <linux/irq.h> +#include <linux/irqdesc.h> +#include <linux/bitops.h> #include <linux/sysctl.h> #include <linux/tick.h> #include <linux/sched/clock.h>
@@ -412,13 +415,153 @@ static void print_cpustat(void) } } +#define HARDIRQ_PERCENT_THRESH 50 +#define NUM_HARDIRQ_REPORT 5 +static DECLARE_BITMAP(softlockup_hardirq_cpus, CONFIG_NR_CPUS); +static DEFINE_PER_CPU(u32 *, hardirq_counts); +static DEFINE_PER_CPU(int, actual_nr_irqs); +struct irq_counts { +int irq; +u32 counts; +}; + +/* Tabulate the most frequent interrupts. */ +static void tabulate_irq_count (struct irq_counts *irq_counts,int irq,u32 counts,int rank) +{ +int i; +struct irq_counts new_count = {irq, counts}; + +for (i =0 ; i < rank; i++) { +if (counts > irq_counts[i].counts) +swap (new_count, irq_counts[i]); + } +} + +/* +* If the hardirq time exceeds HARDIRQ_PERCENT_THRESH% of the sample_period, +* then the cause of softlockup might be interrupt storm. In this case, it +* would be useful to start interrupt counting. +*/ +static bool need_counting_irqs (void ) +{ +int tail =__this_cpu_read (cpustat_tail); +u8 util; + + tail = (tail +NUM_HARDIRQ_REPORT -1 ) %NUM_HARDIRQ_REPORT ; + util =__this_cpu_read (cpustat_util[tail][STATS_HARDIRQ ]); +return util >HARDIRQ_PERCENT_THRESH ; +} + +static void start_counting_irqs (void ) +{ +int i; +u32 *counts =__this_cpu_read (hardirq_counts); +int cpu =smp_processor_id (); +struct irq_desc *desc; + +if (!test_bit (cpu, softlockup_hardirq_cpus)) { +/* +* nr_irqs has the potential to grow at runtime. We should read +* it and store locally to avoid array out-of-bounds access. +*/ +__this_cpu_write (actual_nr_irqs, nr_irqs); + counts =kmalloc_array (__this_cpu_read (actual_nr_irqs), +sizeof (u32), +GFP_ATOMIC ); +if (!counts) +return ; +for (i =0 ; i <__this_cpu_read (actual_nr_irqs); i++) { + desc =irq_to_desc (i); +if (!desc) +continue ; + counts[i] = desc->kstat_irqs ? + *this_cpu_ptr (desc->kstat_irqs) :0 ; + } +__this_cpu_write (hardirq_counts, counts); +set_bit (cpu, softlockup_hardirq_cpus); + } +} + +static void stop_counting_irqs (void ) +{ +u32 *counts =__this_cpu_read (hardirq_counts); +int cpu =smp_processor_id (); + +if (test_bit (cpu, softlockup_hardirq_cpus)) { +kfree (counts); + counts =NULL ; +__this_cpu_write (hardirq_counts, counts); +clear_bit (cpu, softlockup_hardirq_cpus); + } +} + +static void print_irq_counts (void ) +{ +int i; +struct irq_desc *desc; +u32 counts_diff; +u32 *counts =__this_cpu_read (hardirq_counts); +int cpu =smp_processor_id (); +struct irq_counts irq_counts_sorted[NUM_HARDIRQ_REPORT ] = { + {-1 ,0 }, {-1 ,0 }, {-1 ,0 }, {-1 ,0 }, + }; + +if (test_bit (cpu, softlockup_hardirq_cpus)) { +for_each_irq_desc (i, desc) { +if (!desc) +continue ; +/* +* We need to bounds-check in case someone on a different CPU +* expanded nr_irqs. +*/ +if (i <__this_cpu_read (actual_nr_irqs)) + counts_diff = desc->kstat_irqs ? + *this_cpu_ptr (desc->kstat_irqs) - counts[i] :0 ; +else + counts_diff = desc->kstat_irqs ? + *this_cpu_ptr (desc->kstat_irqs) :0 ; +tabulate_irq_count (irq_counts_sorted, i, counts_diff, +NUM_HARDIRQ_REPORT ); + } +/* +* We do not want the "watchdog: " prefix on every line, +* hence we use "printk" instead of "pr_crit". +*/ +printk (KERN_CRIT "CPU#%d Detect HardIRQ Time exceeds %d%%. Most frequent HardIRQs:\n" , +smp_processor_id (),HARDIRQ_PERCENT_THRESH ); +for (i =0 ; i <NUM_HARDIRQ_REPORT ; i++) { +if (irq_counts_sorted[i].irq ==-1 ) +break ; + desc =irq_to_desc (irq_counts_sorted[i].irq); +if (desc && desc->action) +printk (KERN_CRIT "\t#%u: %-10u\tirq#%d(%s)\n" , + i+1 , irq_counts_sorted[i].counts, + irq_counts_sorted[i].irq, desc->action->name); +else +printk (KERN_CRIT "\t#%u: %-10u\tirq#%d\n" , + i+1 , irq_counts_sorted[i].counts, + irq_counts_sorted[i].irq); + } +/* +* If the hardirq time is less than HARDIRQ_PERCENT_THRESH% in the last +* sample_period, then we suspect the interrupt storm might be subsiding. +*/ +if (!need_counting_irqs ()) +stop_counting_irqs (); + } +} +static void report_cpu_status (void ) {print_cpustat (); +print_irq_counts (); }#else static inline void update_cpustat (void ) { }static inline void report_cpu_status (void ) { } +static inline bool need_counting_irqs (void ) {return false; } +static inline void start_counting_irqs (void ) { } +static inline void stop_counting_irqs (void ) { }#endif /*
@@ -522,6 +665,18 @@ static int is_softlockup(unsigned long touch_ts, unsigned long now) {if ((watchdog_enabled &WATCHDOG_SOFTOCKUP_ENABLED ) && watchdog_thresh) { +/* +* If period_ts has not been updated during a sample_period, then +* in the subsequent few sample_periods, period_ts might also not +* be updated, which could indicate a potential softlockup. In +* this case, if we suspect the cause of the potential softlockup +* might be interrupt storm, then we need to count the interrupts +* to find which interrupt is storming. +*/ +if (time_after_eq (now, period_ts +get_softlockup_thresh () /5 ) && +need_counting_irqs ()) +start_counting_irqs (); +/* Warn about unreasonable delays. */ if (time_after (now, period_ts +get_softlockup_thresh ()))return now - touch_ts;
@@ -544,6 +699,7 @@ static DEFINE_PER_CPU(struct cpu_stop_work, softlockup_stop_work);static int softlockup_fn (void *data) {update_touch_ts (); +stop_counting_irqs ();complete (this_cpu_ptr (&softlockup_completion));return 0 ;
Signature · 1 line
2.37.1 (Apple Git-137.1)
Re: [PATCHv4 2/3] watchdog/softlockup: report the most frequent interrupts
Quoted 218 lines · Bitao Hu
When the watchdog determines that the current soft lockup is due to an interrupt storm based on CPU utilization, reporting the most frequent interrupts could be good enough for further troubleshooting.
Below is an example of interrupt storm. The call tree does not provide useful information, but we can analyze which interrupt caused the soft lockup by comparing the counts of interrupts.
[ 2987.488075] watchdog: BUG: soft lockup - CPU#9 stuck for 23s! [kworker/9:1:214] [ 2987.488607] CPU#9 Utilization every 4s during lockup: [ 2987.488941] #1: 0% system, 0% softirq, 100% hardirq, 0% idle [ 2987.489357] #2: 0% system, 0% softirq, 100% hardirq, 0% idle [ 2987.489771] #3: 0% system, 0% softirq, 100% hardirq, 0% idle [ 2987.490186] #4: 0% system, 0% softirq, 100% hardirq, 0% idle [ 2987.490601] #5: 0% system, 0% softirq, 100% hardirq, 0% idle [ 2987.491034] CPU#9 Detect HardIRQ Time exceeds 50%. Most frequent HardIRQs: [ 2987.491493] #1: 330985 irq#7(IPI) [ 2987.491743] #2: 5000 irq#10(arch_timer) [ 2987.492039] #3: 9 irq#91(nvme0q2) [ 2987.492318] #4: 3 irq#118(virtio1-output.12) ... [ 2987.492728] Call trace: [ 2987.492729] __do_softirq+0xa8/0x364Signed-off-by Bitao Hu <[email protected]>--- kernel/watchdog.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+)kernel/watchdog.c +155
-0@@ -19,6 +19,9 @@#include <linux/kernel_stat.h> #include <linux/math64.h> #include <linux/module.h> +#include <linux/irq.h> +#include <linux/irqdesc.h> +#include <linux/bitops.h> #include <linux/sysctl.h> #include <linux/tick.h> #include <linux/sched/clock.h> @@ -412,13 +415,153 @@ static void print_cpustat(void) } } +#define HARDIRQ_PERCENT_THRESH 50 +#define NUM_HARDIRQ_REPORT 5 +static DECLARE_BITMAP(softlockup_hardirq_cpus, CONFIG_NR_CPUS); +static DEFINE_PER_CPU(u32 *, hardirq_counts); +static DEFINE_PER_CPU(int, actual_nr_irqs); +struct irq_counts { +int irq; +u32 counts; +}; + +/* Tabulate the most frequent interrupts. */ +static void tabulate_irq_count (struct irq_counts *irq_counts,int irq,u32 counts,int rank) +{ +int i; +struct irq_counts new_count = {irq, counts}; + +for (i =0 ; i < rank; i++) { +if (counts > irq_counts[i].counts) +swap (new_count, irq_counts[i]); + } +} + +/* +* If the hardirq time exceeds HARDIRQ_PERCENT_THRESH% of the sample_period, +* then the cause of softlockup might be interrupt storm. In this case, it +* would be useful to start interrupt counting. +*/ +static bool need_counting_irqs (void ) +{ +int tail =__this_cpu_read (cpustat_tail); +u8 util; + + tail = (tail +NUM_HARDIRQ_REPORT -1 ) %NUM_HARDIRQ_REPORT ; + util =__this_cpu_read (cpustat_util[tail][STATS_HARDIRQ ]); +return util >HARDIRQ_PERCENT_THRESH ; +} + +static void start_counting_irqs (void ) +{ +int i; +u32 *counts =__this_cpu_read (hardirq_counts); +int cpu =smp_processor_id (); +struct irq_desc *desc; + +if (!test_bit (cpu, softlockup_hardirq_cpus)) { +/* +* nr_irqs has the potential to grow at runtime. We should read +* it and store locally to avoid array out-of-bounds access. +*/ +__this_cpu_write (actual_nr_irqs, nr_irqs); + counts =kmalloc_array (__this_cpu_read (actual_nr_irqs), +sizeof (u32), +GFP_ATOMIC ); +if (!counts) +return ; +for (i =0 ; i <__this_cpu_read (actual_nr_irqs); i++) { + desc =irq_to_desc (i); +if (!desc) +continue ; + counts[i] = desc->kstat_irqs ? + *this_cpu_ptr (desc->kstat_irqs) :0 ; + } +__this_cpu_write (hardirq_counts, counts); +set_bit (cpu, softlockup_hardirq_cpus); + } +} + +static void stop_counting_irqs (void ) +{ +u32 *counts =__this_cpu_read (hardirq_counts); +int cpu =smp_processor_id (); + +if (test_bit (cpu, softlockup_hardirq_cpus)) { +kfree (counts); + counts =NULL ; +__this_cpu_write (hardirq_counts, counts); +clear_bit (cpu, softlockup_hardirq_cpus); + } +} + +static void print_irq_counts (void ) +{ +int i; +struct irq_desc *desc; +u32 counts_diff; +u32 *counts =__this_cpu_read (hardirq_counts); +int cpu =smp_processor_id (); +struct irq_counts irq_counts_sorted[NUM_HARDIRQ_REPORT ] = { + {-1 ,0 }, {-1 ,0 }, {-1 ,0 }, {-1 ,0 }, + }; + +if (test_bit (cpu, softlockup_hardirq_cpus)) { +for_each_irq_desc (i, desc) { +if (!desc) +continue ; +/* +* We need to bounds-check in case someone on a different CPU +* expanded nr_irqs. +*/ +if (i <__this_cpu_read (actual_nr_irqs)) + counts_diff = desc->kstat_irqs ? + *this_cpu_ptr (desc->kstat_irqs) - counts[i] :0 ; +else + counts_diff = desc->kstat_irqs ? + *this_cpu_ptr (desc->kstat_irqs) :0 ; +tabulate_irq_count (irq_counts_sorted, i, counts_diff, +NUM_HARDIRQ_REPORT ); + } +/* +* We do not want the "watchdog: " prefix on every line, +* hence we use "printk" instead of "pr_crit". +*/ +printk (KERN_CRIT "CPU#%d Detect HardIRQ Time exceeds %d%%. Most frequent HardIRQs:\n" , +smp_processor_id (),HARDIRQ_PERCENT_THRESH ); +for (i =0 ; i <NUM_HARDIRQ_REPORT ; i++) { +if (irq_counts_sorted[i].irq ==-1 ) +break ; + desc =irq_to_desc (irq_counts_sorted[i].irq); +if (desc && desc->action) +printk (KERN_CRIT "\t#%u: %-10u\tirq#%d(%s)\n" , + i+1 , irq_counts_sorted[i].counts, + irq_counts_sorted[i].irq, desc->action->name); +else +printk (KERN_CRIT "\t#%u: %-10u\tirq#%d\n" , + i+1 , irq_counts_sorted[i].counts, + irq_counts_sorted[i].irq); + } +/* +* If the hardirq time is less than HARDIRQ_PERCENT_THRESH% in the last +* sample_period, then we suspect the interrupt storm might be subsiding. +*/ +if (!need_counting_irqs ()) +stop_counting_irqs (); + } +} +static void report_cpu_status (void ) {print_cpustat (); +print_irq_counts (); }#else static inline void update_cpustat (void ) { }static inline void report_cpu_status (void ) { } +static inline bool need_counting_irqs (void ) {return false; } +static inline void start_counting_irqs (void ) { } +static inline void stop_counting_irqs (void ) { }#endif /* @@ -522,6 +665,18 @@ static int is_softlockup(unsigned long touch_ts, unsigned long now) {if ((watchdog_enabled &WATCHDOG_SOFTOCKUP_ENABLED ) && watchdog_thresh) { +/* +* If period_ts has not been updated during a sample_period, then +* in the subsequent few sample_periods, period_ts might also not +* be updated, which could indicate a potential softlockup. In +* this case, if we suspect the cause of the potential softlockup +* might be interrupt storm, then we need to count the interrupts +* to find which interrupt is storming. +*/ +if (time_after_eq (now, period_ts +get_softlockup_thresh () /5 ) && +need_counting_irqs ()) +start_counting_irqs (); +/* Warn about unreasonable delays. */ if (time_after (now, period_ts +get_softlockup_thresh ()))return now - touch_ts;
kernel/watchdog.c static DEFINE_PER_CPU(struct cpu_stop_work, softlockup_stop_work); · line 705
Quoted 7 lines
kernel/watchdog.c +1
-0@@ -544,6 +699,7 @@ static DEFINE_PER_CPU(struct cpu_stop_work, softlockup_stop_work);static int softlockup_fn (void *data) {update_touch_ts (); +stop_counting_irqs ();complete (this_cpu_ptr (&softlockup_completion));return 0 ;
Looks good.
Here is a personal suggestion: within a function body, if there are variable declarations and declarations with assignments, it is recommended to place the declarations with assignments after those that are simply declarations, as this looks neater.
PATCH v4 3/3 watchdog/softlockup: add SOFTLOCKUP_DETECTOR_INTR_STORM Kconfig knob
In reply to Bitao HuThe interrupt storm detection mechanism we implemented requires a considerable amount of global storage space when configured for the maximum number of CPUs.
Therefore, adding a SOFTLOCKUP_DETECTOR_INTR_STORM Kconfig knob that defaults to "yes" if the max number of CPUs is <= 128.
--- kernel/watchdog.c | 2 +- lib/Kconfig.debug | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)
kernel/watchdog.c +1 -1
@@ -338,7 +338,7 @@ __setup("watchdog_thresh=", watchdog_thresh_setup);static void __lockup_detector_cleanup (void ); -#ifdef CONFIG_IRQ_TIME_ACCOUNTING +#ifdef CONFIG_SOFTLOCKUP_DETECTOR_INTR_STORM #define NUM_STATS_GROUPS 5enum stats_per_group { STATS_SYSTEM,
lib/Kconfig.debug +13 -0
@@ -1029,6 +1029,19 @@ config SOFTLOCKUP_DETECTOR chance to run. The current stack trace is displayed upon detection and the system will stay locked up. +config SOFTLOCKUP_DETECTOR_INTR_STORM + bool "Detect Interrupt Storm in Soft Lockups" + depends on SOFTLOCKUP_DETECTOR && IRQ_TIME_ACCOUNTING + default y if NR_CPUS <= 128 + help + Say Y here to enable the kernel to detect interrupt storm + during "soft lockups". + + "soft lockups" can be caused by a variety of reasons. If one is caused by + an interrupt storm, then the storming interrupts will not be on the + callstack. To detect this case, it is necessary to report the CPU stats + and the interrupt counts during the "soft lockups". + config BOOTPARAM_SOFTLOCKUP_PANIC bool "Panic (Reboot) On Soft Lockups" depends on SOFTLOCKUP_DETECTOR
Signature · 1 line
2.37.1 (Apple Git-137.1)