OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

softirq: Make serving softirqs a task flag 

Avoid the percpu softirq_runner pointer magic by using a task flag.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2012-10-04 14:30:25 +01:00 committed by Alibek Omarov
parent 3466500c8c
commit 2285aafeb8
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/sched.h
View File

@ -1875,6 +1875,7 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut,
/*
* Per process flags
*/
#define PF_IN_SOFTIRQ 0x00000001 /* Task is serving softirq */
#define PF_EXITING 0x00000004 /* getting shut down */
#define PF_EXITPIDONE 0x00000008 /* pi exit done on shut down */
#define PF_VCPU 0x00000010 /* I'm a virtual CPU */

20
kernel/softirq.c
View File

@ -397,7 +397,6 @@ static void ksoftirqd_clr_sched_params(unsigned int cpu, bool online) { }
* On RT we serialize softirq execution with a cpu local lock
*/
static DEFINE_LOCAL_IRQ_LOCK(local_softirq_lock);
static DEFINE_PER_CPU(struct task_struct *, local_softirq_runner);
static void __do_softirq_common(int need_rcu_bh_qs);
@ -476,22 +475,9 @@ void _local_bh_enable(void)
}
EXPORT_SYMBOL(_local_bh_enable);
/* For tracing */
int notrace __in_softirq(void)
{
if (__get_cpu_var(local_softirq_lock).owner == current)
return __get_cpu_var(local_softirq_lock).nestcnt;
return 0;
}
int in_serving_softirq(void)
{
int res;
preempt_disable();
res = __get_cpu_var(local_softirq_runner) == current;
preempt_enable();
return res;
return current->flags & PF_IN_SOFTIRQ;
}
EXPORT_SYMBOL(in_serving_softirq);
@ -509,7 +495,7 @@ asmlinkage void __do_softirq(void)
/* Reset the pending bitmask before enabling irqs */
set_softirq_pending(0);
__get_cpu_var(local_softirq_runner) = current;
current->flags |= PF_IN_SOFTIRQ;
lockdep_softirq_enter();
@ -520,7 +506,7 @@ asmlinkage void __do_softirq(void)
wakeup_softirqd();
lockdep_softirq_exit();
__get_cpu_var(local_softirq_runner) = NULL;
current->flags &= ~PF_IN_SOFTIRQ;
current->softirq_nestcnt--;
}