sch_gred: should not use GFP_KERNEL while holding a spinlock
authorEric Dumazet <eric.dumazet@gmail.com>
Sun, 11 Dec 2011 23:42:53 +0000 (23:42 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Dec 2011 00:08:54 +0000 (19:08 -0500)
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>
net/sched/sch_gred.c

index b9493a09a870343fe90444bea4b1fac547d42e46..6cd8ddfb512d78ac0b77f24f5a2e1ceb3330968c 100644 (file)
@@ -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;
        }