summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2011-12-11 23:42:53 +0000
committerDavid S. Miller <davem@davemloft.net>2011-12-12 19:08:54 -0500
commit3f1e6d3fd37bd4f25e5b19f1c7ca21850426c33f (patch)
tree4a4c3e784973d34e3689e3fc6789ae3503db576c
parent72b36015ba43a3cca5303f5534d2c3e1899eae29 (diff)
downloadop-kernel-dev-3f1e6d3fd37bd4f25e5b19f1c7ca21850426c33f.zip
op-kernel-dev-3f1e6d3fd37bd4f25e5b19f1c7ca21850426c33f.tar.gz
sch_gred: should not use GFP_KERNEL while holding a spinlock
gred_change_vq() is called under sch_tree_lock(sch). This means a spinlock is held, and we are not allowed to sleep in this context. We might pre-allocate memory using GFP_KERNEL before taking spinlock, but this is not suitable for stable material. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/sch_gred.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index b9493a0..6cd8ddf 100644
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -385,7 +385,7 @@ static inline int gred_change_vq(struct Qdisc *sch, int dp,
struct gred_sched_data *q;
if (table->tab[dp] == NULL) {
- table->tab[dp] = kzalloc(sizeof(*q), GFP_KERNEL);
+ table->tab[dp] = kzalloc(sizeof(*q), GFP_ATOMIC);
if (table->tab[dp] == NULL)
return -ENOMEM;
}
OpenPOWER on IntegriCloud