The patch titled
Subject: tasklet: ignore disabled tasklet in tasklet_action v2
has been added to the -mm tree. Its filename is
tasklet-ignore-disabled-tasklet-in-tasklet_action-v2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Xiaotian Feng <xtfeng@xxxxxxxxx>
Subject: 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 <dannyfeng@xxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/jme.c | 16 ++++++++--------
include/linux/interrupt.h | 6 ------
kernel/softirq.c | 1 +
3 files changed, 9 insertions(+), 14 deletions(-)
diff -puN drivers/net/ethernet/jme.c~tasklet-ignore-disabled-tasklet-in-tasklet_action-v2 drivers/net/ethernet/jme.c
--- a/drivers/net/ethernet/jme.c~tasklet-ignore-disabled-tasklet-in-tasklet_action-v2
+++ a/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
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 -puN include/linux/interrupt.h~tasklet-ignore-disabled-tasklet-in-tasklet_action-v2 include/linux/interrupt.h
--- a/include/linux/interrupt.h~tasklet-ignore-disabled-tasklet-in-tasklet_action-v2
+++ a/include/linux/interrupt.h
@@ -604,12 +604,6 @@ static inline void tasklet_enable(struct
}
}
-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 -puN kernel/softirq.c~tasklet-ignore-disabled-tasklet-in-tasklet_action-v2 kernel/softirq.c
--- a/kernel/softirq.c~tasklet-ignore-disabled-tasklet-in-tasklet_action-v2
+++ a/kernel/softirq.c
@@ -417,6 +417,7 @@ void __tasklet_schedule(struct tasklet_s
*__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);
}
_
Patches currently in -mm which might be from xtfeng@xxxxxxxxx are
linux-next.patch
tasklet-ignore-disabled-tasklet-in-tasklet_action.patch
tasklet-ignore-disabled-tasklet-in-tasklet_action-v2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
