Skip to contentSkip to conversation

softirqs: add preempt_check_resched() in ksoftirqd()

PATCH In review Jupyung Lee 2 participants 2 messages Nov 11, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 softirqs: add preempt_check_resched() in ksoftirqd()

In its current preempt-rt kernel, ksoftirq() includes a series of primitives related with kernel preemption and irq on/off, in the following order:

preempt_disable() ... (1)
local_irq_disable() ... (2)
__preempt_enable_no_resched() ... (3)
local_irq_enable() ... (4)

A problem arises if a process is awakened between (1) and (2) because it is not given a chance to preempt the currently running process for a while since (4): since (4), the kernel is preemptible, but there is no explicit reschedule point.

A simple suggestion to resolve the problem is to add a reschedule point, preempt_check_resched(), just after (4).

---
 kernel/softirq.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
kernel/softirq.c +1 -0
index 590049c..7c1b041 100644
@@ -1037,6 +1037,7 @@ sleep_more:
 			set_softirq_pending(local_softirq_pending() & ~softirq_mask);
 			local_bh_disable();
 			local_irq_enable();
+			preempt_check_resched();
 
 			h = &softirq_vec[data->nr];
 			if (h)
Signature · 1 line
1.5.4.3
#1 lore raw

Jupyung,

Quoted 8 lines · Jupyung Lee

In its current preempt-rt kernel, ksoftirq() includes a series of primitives related with kernel preemption and irq on/off, in the following order:

preempt_disable() ... (1)
local_irq_disable() ... (2)
__preempt_enable_no_resched() ... (3)
local_irq_enable() ... (4)

Quoted 7 lines

A problem arises if a process is awakened between (1) and (2) because it is not given a chance to preempt the currently running process for a while since (4): since (4), the kernel is preemptible, but there is no explicit reschedule point.

A simple suggestion to resolve the problem is to add a reschedule point, preempt_check_resched(), just after (4).

Good catch. I applied it with a simple modification.

Thanks,

tglx
---
commit ca0b4bfa5994856bbcf4227e29f9c73722efaef2
Author: Jupyung Lee <[email protected]>

<snip>

kernel/softirq.c +1 -1
@@ -1033,10 +1033,10 @@ sleep_more:
 				goto sleep_more;
 			}
 			per_cpu(softirq_running, cpu) |= softirq_mask;
-			__preempt_enable_no_resched();
 			set_softirq_pending(local_softirq_pending() & ~softirq_mask);
 			local_bh_disable();
 			local_irq_enable();
+			preempt_enable();
 
 			h = &softirq_vec[data->nr];
 			if (h)