From ce72af09500476168155494eae96d50d9fd80fae Mon Sep 17 00:00:00 2001 From: Xiaotian Feng Date: Fri, 9 Nov 2012 14:03:52 +1100 Subject: [PATCH] tasklet: ignore disabled tasklet in tasklet_action v2 v2 changes: - clear TASKLET_STATE_HI bit in tasklet_schedule - remove tasklet_hi_enable() as it is exactly the same as tasklet_enable() Signed-off-by: Xiaotian Feng Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Eric Dumazet Signed-off-by: Andrew Morton --- drivers/net/ethernet/jme.c | 16 ++++++++-------- include/linux/interrupt.h | 6 ------ kernel/softirq.c | 1 + 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index 92317e9c0f73..76a91f6c40cf 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -1364,8 +1364,8 @@ err_out_free_rx_resources: jme_free_rx_resources(jme); out_enable_tasklet: tasklet_enable(&jme->txclean_task); - tasklet_hi_enable(&jme->rxclean_task); - tasklet_hi_enable(&jme->rxempty_task); + tasklet_enable(&jme->rxclean_task); + tasklet_enable(&jme->rxempty_task); out: atomic_inc(&jme->link_changing); } @@ -1862,8 +1862,8 @@ jme_open(struct net_device *netdev) tasklet_enable(&jme->linkch_task); tasklet_enable(&jme->txclean_task); - tasklet_hi_enable(&jme->rxclean_task); - tasklet_hi_enable(&jme->rxempty_task); + tasklet_enable(&jme->rxclean_task); + tasklet_enable(&jme->rxempty_task); rc = jme_request_irq(jme); if (rc) @@ -2375,8 +2375,8 @@ static inline void jme_resume_rx(struct jme_adapter *jme) if (test_bit(JME_FLAG_POLL, &jme->flags)) { JME_NAPI_ENABLE(jme); } else { - tasklet_hi_enable(&jme->rxclean_task); - tasklet_hi_enable(&jme->rxempty_task); + tasklet_enable(&jme->rxclean_task); + tasklet_enable(&jme->rxempty_task); } dpi->cur = PCC_P1; dpi->attempt = PCC_P1; @@ -3276,8 +3276,8 @@ jme_suspend(struct device *dev) } tasklet_enable(&jme->txclean_task); - tasklet_hi_enable(&jme->rxclean_task); - tasklet_hi_enable(&jme->rxempty_task); + tasklet_enable(&jme->rxclean_task); + tasklet_enable(&jme->rxempty_task); jme_powersave_phy(jme); diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 7e5bb00a3a67..f6178ee2983a 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -604,12 +604,6 @@ static inline void tasklet_enable(struct tasklet_struct *t) } } -static inline void tasklet_hi_enable(struct tasklet_struct *t) -{ - smp_mb__before_atomic_dec(); - atomic_dec(&t->count); -} - extern void tasklet_kill(struct tasklet_struct *t); extern void tasklet_kill_immediate(struct tasklet_struct *t, unsigned int cpu); extern void tasklet_init(struct tasklet_struct *t, diff --git a/kernel/softirq.c b/kernel/softirq.c index cb62330f5dad..b95202b51e07 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -417,6 +417,7 @@ void __tasklet_schedule(struct tasklet_struct *t) *__this_cpu_read(tasklet_vec.tail) = t; __this_cpu_write(tasklet_vec.tail, &(t->next)); raise_softirq_irqoff(TASKLET_SOFTIRQ); + clear_bit(TASKLET_STATE_HI, &t->state); local_irq_restore(flags); } -- 2.39.5