From 0fbe4b198022f5a3df28b9e4d75c23d4403f1d4b Mon Sep 17 00:00:00 2001 From: Satya Durga Srinivasu Prabhala Date: Tue, 8 Jan 2019 15:38:32 -0800 Subject: [PATCH] Revert "Mark HI and TASKLET softirq synchronous" This reverts commit 3c53776e29f81719efcf8f7a6e30cdf753bee94d. Reverting the change to match what we have on previous Kernels. Change-Id: I4af64cd7e2c4291dda5f503bf2d74ede459a76c6 [satyap@codeaurora.org: Port to 5.x and fix trivial merge conflict] Signed-off-by: Satya Durga Srinivasu Prabhala --- kernel/softirq.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/kernel/softirq.c b/kernel/softirq.c index 24cb1e699951..53ca9850d9ef 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -85,16 +85,12 @@ static void wakeup_softirqd(void) /* * 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, - * unless we're doing some of the synchronous softirqs. + * right now. Let ksoftirqd handle this at its own rate, to get fairness. */ -#define SOFTIRQ_NOW_MASK ((1 << HI_SOFTIRQ) | (1 << TASKLET_SOFTIRQ)) -static bool ksoftirqd_running(unsigned long pending) +static bool ksoftirqd_running(void) { struct task_struct *tsk = __this_cpu_read(ksoftirqd); - if (pending & SOFTIRQ_NOW_MASK) - return false; return tsk && (tsk->state == TASK_RUNNING) && !__kthread_should_park(tsk); } @@ -355,7 +351,7 @@ asmlinkage __visible void do_softirq(void) pending = local_softirq_pending(); - if (pending && !ksoftirqd_running(pending)) + if (pending && !ksoftirqd_running()) do_softirq_own_stack(); local_irq_restore(flags); @@ -382,7 +378,7 @@ void irq_enter(void) static inline void invoke_softirq(void) { - if (ksoftirqd_running(local_softirq_pending())) + if (ksoftirqd_running()) return; if (!force_irqthreads) {