From 0d118e31780349beb5ffa1777fd77058cc464ad6 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Wed, 17 Jan 2018 13:54:41 +0000 Subject: [PATCH 178/277] Revert "softirq: Let ksoftirqd do its job" This reverts commit 4cd13c21b207e80ddb1144c576500098f2d5f882. --- kernel/softirq.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/kernel/softirq.c b/kernel/softirq.c index 4e09821f9d9e..58bb6f6359f4 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -77,17 +77,6 @@ static void wakeup_softirqd(void) wake_up_process(tsk); } -/* - * If ksoftirqd is scheduled, we do not want to process pending softirqs - * right now. Let ksoftirqd handle this at its own rate, to get fairness. - */ -static bool ksoftirqd_running(void) -{ - struct task_struct *tsk = __this_cpu_read(ksoftirqd); - - return tsk && (tsk->state == TASK_RUNNING); -} - /* * preempt_count and SOFTIRQ_OFFSET usage: * - preempt_count is changed by SOFTIRQ_OFFSET on entering or leaving @@ -324,7 +313,7 @@ asmlinkage __visible void do_softirq(void) pending = local_softirq_pending(); - if (pending && !ksoftirqd_running()) + if (pending) do_softirq_own_stack(); local_irq_restore(flags); @@ -351,9 +340,6 @@ void irq_enter(void) static inline void invoke_softirq(void) { - if (ksoftirqd_running()) - return; - if (!force_irqthreads) { #ifdef CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK /* -- 2.16.1