From 384cdfa4ef28415c3df50d1759951a20c6f0661f Mon Sep 17 00:00:00 2001 From: caomeng Date: Thu, 4 Jul 2019 03:47:20 +0800 Subject: [PATCH] bugfix-fix-two-same-irq-insert-to-list When the function force_rebalance_irq is executed,the same irq may be added into rebalance_irq_list again, resulting in failed irqbalance service. Thus, a function named irq_in_rebalance_list which is used to check if the irq is in rebalance_irq_list will be executed before force_rebalance_irq. And this patch fixex the bug introduced by feature-introduce-verifyhint-to-detect-hint-variation.patch. --- classify.c | 11 +++++++++++ irqbalance.h | 2 +- procinterrupts.c | 8 ++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/classify.c b/classify.c index 0951c72..4d699da 100644 --- a/classify.c +++ b/classify.c @@ -288,6 +288,17 @@ static void add_banned_irq(int irq, GList **list) return; } +int irq_in_rebalance_list(int irq) +{ + GList *entry = NULL; + struct irq_info find = {0}; + + find.irq = irq; + entry = g_list_find_custom(rebalance_irq_list, &find, compare_ints); + + return entry ? 1 : 0; +} + void add_cl_banned_irq(int irq) { add_banned_irq(irq, &cl_banned_irqs); diff --git a/irqbalance.h b/irqbalance.h index 80ec017..821de0e 100644 --- a/irqbalance.h +++ b/irqbalance.h @@ -107,7 +107,7 @@ extern void free_cl_opts(void); extern void add_cl_banned_module(char *modname); #define irq_numa_node(irq) ((irq)->numa_node) extern void force_rebalance_irq(struct irq_info *info, void *data __attribute__((unused))); - +int irq_in_rebalance_list(int irq); /* huawei */ extern struct irq_info *build_one_dev_entry(const char *dirname, GList *tmp_list); extern void find_irq_dev_path(int irq, char *dirname, int length); diff --git a/procinterrupts.c b/procinterrupts.c index fc4641a..9e38e49 100644 --- a/procinterrupts.c +++ b/procinterrupts.c @@ -348,7 +348,9 @@ void parse_proc_interrupts(void) */ if (count < info->irq_count) { log(TO_CONSOLE, LOG_INFO, "Removed and reinserted IRQ %d added into rebalance list\n", number); - force_rebalance_irq(info, NULL); + if (!irq_in_rebalance_list(info->irq)) { + force_rebalance_irq(info, NULL); + } } info->last_irq_count = info->irq_count; @@ -602,7 +604,9 @@ void update_affinity_hint(struct irq_info *info, void *data __attribute__((unuse cpumask_parse_user(line, len, current_affinity_hint); if (!cpus_equal(current_affinity_hint, info->affinity_hint)) { cpumask_copy(info->affinity_hint, current_affinity_hint); - force_rebalance_irq(info, data); + if (!irq_in_rebalance_list(info->irq)) { + force_rebalance_irq(info, data); + } log(TO_ALL, LOG_INFO, "IRQ(%d): affinity hint modified\n", info->irq); } } -- 1.8.3.1