[PATCH openEuler-1.0-LTS 0/2] Revert irq reentrant warm log
There is no need print this warm log since a95cc4dafae34(genirq: introduce handle_fasteoi_edge_irq flow handler) has been merged. Yipeng Zou (2): Revert "genirq: add printk safe in irq context" Revert "genirq: Introduce warn log when irq be reentrant" kernel/irq/chip.c | 14 -------------- 1 file changed, 14 deletions(-) -- 2.34.1
hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I88NEK CVE: NA -------------------------------- This reverts commit db0bbc90d1fcecb9e947da03cb95eef1b10efe1f. --- kernel/irq/chip.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index b194d923b3c8..967b08ab7676 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -513,19 +513,9 @@ static bool irq_may_run(struct irq_desc *desc) if (!irqd_has_set(&desc->irq_data, mask)) return true; - if (irqd_get(&desc->irq_data) & IRQD_IRQ_INPROGRESS) { - const char *name = NULL; - - if (desc->name) - name = desc->name; - else if (desc->action) - name = desc->action->name; - - printk_safe_enter(); - pr_warn("irq %u(%s) may be reentrant in multiple cpus.\n", - desc->irq_data.irq, name == NULL ? "NULL" : name); - printk_safe_exit(); - } + if (irqd_get(&desc->irq_data) & IRQD_IRQ_INPROGRESS) + pr_warn_ratelimited("irq %u(%lu) may be reentrant in multiple cpus.\n", + desc->irq_data.irq, desc->irq_data.hwirq); /* * If the interrupt is an armed wakeup source, mark it pending -- 2.34.1
hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I88NEK CVE: NA -------------------------------- This reverts commit bdc370d64dc4df46670f2c2d2891dbfad6645d02. --- kernel/irq/chip.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 967b08ab7676..b71940c50189 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -513,10 +513,6 @@ static bool irq_may_run(struct irq_desc *desc) if (!irqd_has_set(&desc->irq_data, mask)) return true; - if (irqd_get(&desc->irq_data) & IRQD_IRQ_INPROGRESS) - pr_warn_ratelimited("irq %u(%lu) may be reentrant in multiple cpus.\n", - desc->irq_data.irq, desc->irq_data.hwirq); - /* * If the interrupt is an armed wakeup source, mark it pending * and suspended, disable it and notify the pm core about the -- 2.34.1
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://gitee.com/openeuler/kernel/pulls/2472 邮件列表地址：https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/C... FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://gitee.com/openeuler/kernel/pulls/2472 Mailing list address: https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/C...
participants (2)
-
patchwork bot -
Yipeng Zou